centaline-data-driven 1.4.68 → 1.4.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.4.68",
+  "version": "1.4.69",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/centaline/dynamicCheckbox/src/dynamicCheckbox.vue

@@ -66,7 +66,12 @@
         this.model = data;
       },
       clearClickHandle: function (event) {
-        this.model.checkedItemArr = [];
+        if(this.model.isScreen){
+          this.model.reset();
+        }
+        else{
+          this.model.checkedItemArr = [];
+        }
         this.inputHandler(this.model.checkedItemArr);
         this.changeHandler(this.model.checkedItemArr);
         this.model.updateCode1();

package/src/centaline/dynamicComboBoxWithTextBox/src/dynamicComboBoxWithTextBox.vue

@@ -222,7 +222,12 @@
         this.$set(this, 'showClear', false);
       },
       clearClickHandle: function () {
-        this.model.value = '';
+        if(this.model.isScreen){
+          this.model.reset();
+        }
+        else{
+          this.model.value = '';
+        }
         this.soChange();
       }
     }

package/src/centaline/dynamicInputNumber/src/dynamicInputNumber.vue

@@ -67,8 +67,13 @@
         this.model = data;
         this.model.self=this;
       },
-      clearClickHandle: function (event) {
-        this.model.value = '';
+      clearClickHandle: function (event) {        
+        if(this.model.isScreen){
+          this.model.reset();
+        }
+        else{
+          this.model.value = '';
+        }
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);
         this.$emit('blur',event);

package/src/centaline/dynamicIti/src/dynamicIti.vue

@@ -121,8 +121,13 @@
         return true;
       },
       clearClickHandle: function (event,id) {
-        this.model['value'] ='';
-        this.model['value1'] ='';
+        if(this.model.isScreen){
+          this.model.reset();
+        }
+        else{
+          this.model['value'] ='';
+          this.model['value1'] ='';
+        }
         this.isShowClear(id);
       },
       mouseOverHandle: function (id) {

package/src/centaline/dynamicMo/src/dynamicMo.vue

@@ -298,7 +298,12 @@
         this.$set(this, 'showClear', false);
       },
       clearClickHandle: function (event) {
-        this.model.value.splice(0);
+        if(this.model.isScreen){
+          this.model.reset();
+        }
+        else{
+          this.model.value.splice(0);
+        }
         this.resize();
         this.tagsChange();
         event.stopPropagation();

package/src/centaline/dynamicSearchList/src/dynamicSearchCategory.vue

@@ -59,7 +59,12 @@
         this.$emit('loadedCategoryError');
       },
       clearClickHandle: function (event) {
-        this.model.value = '';
+        if(this.model.isScreen){
+          this.model.reset();
+        }
+        else{
+          this.model.value = '';
+        }
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);
       },

package/src/centaline/dynamicSearchList/src/dynamicSearchScreen.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="st-serach-screen">
-    <div v-bind="model.attrs" style="width:100%" v-if="!isLoading && model">
+    <div v-bind="model.attrs" style="width:100%" v-if="!isLoading && model" :key="keyScreen">
       <div :class="isLayout === true ? 'ct-ptl0 max-ptb5' : 'ct-ptb5 max-ptb5'" v-if="showScreen">
         <template v-for="(col, index) in model.screen" v-if="col.show !== false">
           <br v-if="col.is === 'ct-linefeed'" />
@@ -52,6 +52,7 @@
         highScreen: false,
         showScreen: true,
         isLayout: false,
+        keyScreen:1,
       }
     },
     mounted() {
@@ -198,8 +199,8 @@
           // this.$common.excute.call(this.model.scripts, field.change);
         }
 
-        self.model.isChanged = true;
-        self.model.hiddenHandle(field);
+        this.model.isChanged = true;
+        this.model.hiddenHandle(field);
         // self.model.requiredHandle(field);
         //self.model.validMrf(field);
 
@@ -210,7 +211,8 @@
         //   self.clickHandler(router);
         // }
 
-        self.$forceUpdate();
+        // self.$forceUpdate();
+        this.keyScreen++;
       },
     }
   }

package/src/centaline/dynamicSeg/src/dynamicSeg.vue

@@ -83,8 +83,13 @@
         this.model.self = this;
       },
       clearClickHandle: function (event) {
-        this.model.value = '';
-        this.model.name1='';
+        if(this.model.isScreen){
+          this.model.reset();
+        }
+        else{
+          this.model.value = '';
+          this.model.name1='';
+        }
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);
         if(this.model.autoSearch) this.$emit('click');

package/src/centaline/dynamicSo/src/dynamicSo.vue

@@ -230,8 +230,13 @@
       mouseOutHandle: function () {
         this.$set(this, 'showClear', false);
       },
-      clearClickHandle: function (event) {
-        this.model.value = '';
+      clearClickHandle: function (event) {        
+        if(this.model.isScreen){
+          this.model.reset();
+        }
+        else{
+          this.model.value = '';
+        }
         this.soChange();
         event.stopPropagation();
       }

package/src/centaline/dynamicSos/src/dynamicSos.vue

@@ -241,7 +241,12 @@
         this.$set(this, 'showClear', false);
       },
       clearClickHandle: function (event) {
-        this.model.value = '';
+        if(this.model.isScreen){
+          this.model.reset();
+        }
+        else{
+          this.model.value = '';
+        }
         this.soChange();
         event.stopPropagation();
       },

package/src/centaline/dynamicSosTt/src/dynamicSosTt.vue

@@ -262,7 +262,12 @@
         return true;
       },
       clearClickHandle: function (event) {
-        this.model.value = '';
+        if(this.model.isScreen){
+          this.model.reset();
+        }
+        else{
+          this.model.value = '';
+        }
         this.soChange();
         event.stopPropagation();
       },

package/src/centaline/dynamicT/src/dynamicT.vue

@@ -157,7 +157,12 @@
         this.search();
       },
       clearClickHandle: function (event) {
-        this.model.value = '';
+        if(this.model.isScreen){
+          this.model.reset();
+        }
+        else{
+          this.model.value = '';
+        }
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);
         this.isShowClear();

package/src/centaline/dynamicTags/src/dynamicTags.vue

@@ -324,7 +324,12 @@
       },
       clearClickHandle: function (event) {
         var self =this;
-        this.model.value.splice(0);
+        if(this.model.isScreen){
+          this.model.reset();
+        }
+        else{
+          this.model.value.splice(0);
+        }
         if(this.model.lockedValue.length>0){
           this.model.lockedValue.forEach((v) => {
             self.model.value.push(v);

package/src/centaline/loader/src/ctl/SearchScreen.js

@@ -296,6 +296,7 @@ const SearchScreen = function (source, callBack, screenPara) {
           
           if (item instanceof Object) {
             item.form = rtn;
+            item.isScreen=true;
             rtn.hiddenHandle(item);//是否隐藏关联组件
             rtnscreens.push(item);
           }
@@ -353,11 +354,10 @@ const SearchScreen = function (source, callBack, screenPara) {
         }
       },
       //隐藏关联组件
-      hiddenHandle(item, update) {
+      hiddenHandle(item) {
         if (item.id) {
-          let sign = false;
           let field = null;
-
+          
           if(rtn.sourceFieldsArr){
             for (var i in rtn.sourceFieldsArr) {
               if (rtn.sourceFieldsArr[i].hiddenRelationField === item.id) {
@@ -371,11 +371,6 @@ const SearchScreen = function (source, callBack, screenPara) {
                   else {
                     field.show = true;
                   }
-                  sign = true;
-
-                  if (update && rtn.self && sign) {
-                    rtn.self.$forceUpdate();
-                  }
                 }
               }
             }
@@ -394,11 +389,6 @@ const SearchScreen = function (source, callBack, screenPara) {
                   else {
                     field.show = true;
                   }
-                  sign = true;
-
-                  if (update && rtn.self && sign) {
-                    rtn.self.$forceUpdate();
-                  }
                 }
               }
             }
@@ -417,16 +407,10 @@ const SearchScreen = function (source, callBack, screenPara) {
                   else {
                     field.show = true;
                   }
-                  sign = true;
-
-                  if (update && rtn.self && sign) {
-                    rtn.self.$forceUpdate();
-                  }
                 }
               }
             }
           }
-
         }
       },
     };

package/src/main.js

@@ -48,7 +48,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '3ba3f510-93fd-4103-9249-73c13f3f6fc2',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEzjsOwjAQRdG9uGYkZ_5D58SkYRGIRC6gQhAkEGLvBDZBe4r73ivd7lPapkBTZyYYdj0B12LQa5dh0ChSvKD2ctBRKqIZkI0OQ5cJEEuF7NVGqhRq-VA5iuNaWmktYbcD76kACjvTKBwmaZPa45K2nVpkRFfapNNx-YEHKX_hfmvXfXv-49x5Oa2zgpjRZofZvQGbzeBNMshkIXGc8uya3h8AAAD__w.-YYww1TP8xFOBRi6Z5m-EdRD5lKgsvRr83bsRQIcV_A',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEzjsOwjAQRdG9uGYke2Y8HzonJg2LQEkIElSIBAmE2DtBLIL2FPe9V5jvQ9gGRxVjJmh3DQHXotBIitCKl1ysoDT5IF2uiKpA2hm0KRIglgrRqnZUyUXjobIXw7W00lrCtANrqABmNqYus2sOmzA9rmGbRD0lQvdNOPfLDyKKfeE-T7f99PzHuctyXmcndRwZCVzRgTVnGI6nI0jseRzFokQP7w8AAAD__w.6TJZpYdC_fgDwgmjurh6Lyktk3Ga2DC1JUu5C6GxktA',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',