cnhis-design-vue 2.0.19-beta.2 → 2.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.0.19-beta.2",
+  "version": "2.0.21",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

package/packages/multi-chat/chat/quickReply.vue

@@ -327,8 +327,8 @@ export default {
       }
     }
     &:not(.quick-input):hover {
-      background-color: #5585f5;
-      color: #fff;
+      background-color: #5585f5 !important;
+      color: #fff !important;
       .operate {
         display: block;
       }

package/packages/scale-view/formitem/r-choice.vue

@@ -246,34 +246,7 @@ export default {
       deep: true,
       handler(value) {
         if (!value || !Object.keys(value).length) return;
-        let options = value.options || [];
-        if (this.isEvaluation(value.type)) {
-          options = value.scoreConfigs?.scoreRules || [];
-        }
-        if (value.type === 'RADIO_BLOCK' || value.type === 'EVALUATE_RADIO_BLOCK') {
-          const defVal = value.dbValue || value.setting.defaultValue || this.value;
-          this.handleRadioDef(value, defVal, options);
-          return;
-        }
-        if (value.type === 'CHECKBOX_BLOCK' || value.type === 'EVALUATE_CHECKBOX_BLOCK') {
-          let defVal = [];
-          if (utils.isJSON(value.setting.defaultValue)) {
-            defVal = JSON.parse(value.setting.defaultValue);
-          } else {
-            defVal = this.value;
-          }
-          this.handleCheckboxDef(value, value.dbValue || defVal, options);
-          return;
-        }
-        if (value.type == 'SELECT' || value.type == 'SEARCH_CASCADE' || value.type === 'EVALUATE_SELECT') {
-          this.cloneItem = JSON.parse(JSON.stringify(value));
-          let options = this.cloneItem.options || [];
-          if (this.isEvaluation(value.type)) {
-            options = this.cloneItem.scoreConfigs?.scoreRules || [];
-          }
-          this.curOptions = options;
-          this.initSelectOptions();
-        }
+        this.init(JSON.parse(JSON.stringify(value)));
       }
     }
   },
@@ -297,6 +270,36 @@ export default {
     };
   },
   methods: {
+    init(value) {
+      let options = value.options || [];
+      if (this.isEvaluation(value.type)) {
+        options = value.scoreConfigs?.scoreRules || [];
+      }
+      if (value.type === 'RADIO_BLOCK' || value.type === 'EVALUATE_RADIO_BLOCK') {
+        const defVal = value.dbValue || value.setting.defaultValue || this.value;
+        this.handleRadioDef(value, defVal, options);
+        return;
+      }
+      if (value.type === 'CHECKBOX_BLOCK' || value.type === 'EVALUATE_CHECKBOX_BLOCK') {
+        let defVal = [];
+        if (utils.isJSON(value.setting.defaultValue)) {
+          defVal = JSON.parse(value.setting.defaultValue);
+        } else {
+          defVal = this.value;
+        }
+        this.handleCheckboxDef(value, value.dbValue || defVal, options);
+        return;
+      }
+      if (value.type == 'SELECT' || value.type == 'SEARCH_CASCADE' || value.type === 'EVALUATE_SELECT') {
+        this.cloneItem = JSON.parse(JSON.stringify(value));
+        let options = this.cloneItem.options || [];
+        if (this.isEvaluation(value.type)) {
+          options = this.cloneItem.scoreConfigs?.scoreRules || [];
+        }
+        this.curOptions = options;
+        this.initSelectOptions();
+      }
+    },
     handleRadioDef(item, curValue, options) {
       this.curOptions = this.handleOptions(options, item.type);
       if (!options.length || !curValue) return;

package/packages/scale-view/scaleView.vue

@@ -1474,8 +1474,15 @@ export default create({
               hasValue = choiceValue === value;
             }
 
-            formItem.__isLogic__ = hasValue;
-            formItem.__lastSeq__ = seq + 1;
+            // 添加非响应式key __isLogic__ __lastSeq__
+            Object.defineProperty(formItem, '__isLogic__', {
+              value: hasValue,
+              writable: true
+            });
+            Object.defineProperty(formItem, '__lastSeq__', {
+              value: seq + 1,
+              writable: true
+            });
 
             if (hasValue) {
               formArray.forEach(item => {
@@ -1499,8 +1506,15 @@ export default create({
           } else if (nextLogic.next_logic == 'uncondition') {
             let res = utils.isEmpty(choiceValue);
 
-            formItem.__isLogic__ = !res;
-            formItem.__lastSeq__ = seq + 1;
+            // 添加非响应式key __isLogic__ __lastSeq__
+            Object.defineProperty(formItem, '__isLogic__', {
+              value: !res,
+              writable: true
+            });
+            Object.defineProperty(formItem, '__lastSeq__', {
+              value: seq + 1,
+              writable: true
+            });
 
             formArray.forEach(item => {
               const key = this.formKey(item);