From 6ff4cbe34de57fd5adbca8c6a0dc33a4cb47f13e Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Thu, 1 Feb 2024 00:04:09 +0400
Subject: [PATCH] Up getModelValue

---
 src/trait_manager/model/Trait.ts    | 10 +++++++---
 src/trait_manager/view/TraitView.ts | 14 +-------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/trait_manager/model/Trait.ts b/src/trait_manager/model/Trait.ts
index 56ae9493d..5b89337a4 100644
--- a/src/trait_manager/model/Trait.ts
+++ b/src/trait_manager/model/Trait.ts
@@ -63,6 +63,10 @@ export default class Trait extends Model<TraitProperties> {
     return this.target;
   }
 
+  get changeProp() {
+    return !!this.get('changeProp');
+  }
+
   setTarget(component: Component) {
     if (component) {
       const { name, changeProp, value: initValue, getValue } = this.attributes;
@@ -268,7 +272,7 @@ export default class Trait extends Model<TraitProperties> {
         trait: this,
         component,
       });
-    } else if (this.get('changeProp')) {
+    } else if (this.changeProp) {
       value = component.get(name);
     } else {
       value = component.getAttributes()[name];
@@ -301,7 +305,7 @@ export default class Trait extends Model<TraitProperties> {
       }
     }
 
-    if (this.get('changeProp')) {
+    if (this.changeProp) {
       component.set(name, valueToSet, opts);
     } else {
       component.addAttributes({ [name]: valueToSet }, opts);
@@ -326,7 +330,7 @@ export default class Trait extends Model<TraitProperties> {
 
     if (component) {
       const attrs = component.get('attributes')!;
-      value = this.get('changeProp') ? component.get(name) : attrs[name];
+      value = this.changeProp ? component.get(name) : attrs[name];
     }
 
     return value || this.get('value') || this.get('default');
diff --git a/src/trait_manager/view/TraitView.ts b/src/trait_manager/view/TraitView.ts
index 2584f3271..9ab7fc23f 100644
--- a/src/trait_manager/view/TraitView.ts
+++ b/src/trait_manager/view/TraitView.ts
@@ -212,19 +212,7 @@ export default class TraitView extends View<Trait> {
   }
 
   getModelValue() {
-    let value;
-    const model = this.model;
-    const target = this.target;
-    const name = model.getName();
-
-    if (model.get('changeProp')) {
-      value = target.get(name);
-    } else {
-      const attrs = target.get('attributes')!;
-      value = model.get('value') || attrs[name];
-    }
-
-    return !isUndefined(value) ? value : '';
+    return this.model.getValue();
   }
 
   getElInput() {