centaline-data-driven 1.5.63 → 1.5.65

package/package.json

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

package/release-log.md

@@ -1,7 +1,19 @@
+## v1.5.65
+2023-09-12
+
+优化
+
+解决CCES复选框鼠标以上高度变动问题
+## v1.5.64
+2023-09-07
+
+优化
+
+修复a标签点击变红色
 ## v1.5.63
 2023-09-05
 
-优化
+优化 
 
 文本label超长溢出显示省略号，鼠标移上显示label
 

package/src/SearchList.vue

@@ -14,6 +14,8 @@
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/shift-approver/layout'"  :searchDataApi="'/api/shift-approver/list'"></ct-searchlist> -->
 
 
+    <!-- <ct-searchlist :searchConditionApi="'/mainlandsecond/CustAndContractRegSumList/getLayoutOfSearch'"  :searchDataApi="'/mainlandsecond/CustAndContractRegSumList/getList'"></ct-searchlist> -->
+
      <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/filemanage/batchdownlist/getLayoutOfSearch'"  :searchDataApi="'/filemanage/batchdownlist/getList'"></ct-searchlist> -->
 
 
@@ -50,7 +52,7 @@
       :searchDataApi="'/RightValueList/getListOfSearchModel'">
     </ct-searchlist> -->
 
-    <ct-searchlist :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" :searchStatsApi="'/PropertyPublishList/getListStatsForRET'" :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'"></ct-searchlist>
+    <!-- <ct-searchlist :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" :searchStatsApi="'/PropertyPublishList/getListStatsForRET'" :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'"></ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
@@ -58,11 +60,11 @@
       :searchStatsApi="'/PropertyRETList/getListStats'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
+    <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyOFIList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyOFIList/getLayoutOfSearchCategory'"
       :searchStatsApi="'/PropertyOFIList/getListStats'">
-    </ct-searchlist> -->
+    </ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/EstateList/getLayoutOfSearch'" :searchDataApi="'/EstateList/getListOfSearchModel'"></ct-searchlist> -->
     

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

@@ -66,12 +66,7 @@
         this.model = data;
       },
       clearClickHandle: function (event) {
-        if(this.model.isScreen){
-          this.model.reset();
-        }
-        else{
-          this.model.checkedItemArr = [];
-        }
+        this.model.reset();
         this.inputHandler(this.model.checkedItemArr);
         this.changeHandler(this.model.checkedItemArr);
         this.model.updateCode1();
@@ -123,7 +118,9 @@
     min-height: 26px;
     font-size: 12px;
   }
-
+  .cover-list-item-span .el-input__icon {
+  line-height: initial;
+}
   .ct-checkbox .ct-checkbox-mian .el-icon-circle-close:hover {
     color: #606266;
   }

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

@@ -90,14 +90,6 @@
       else {
         this.model = this.vmodel;
       }
-      this.$watch('model.value', (n, o) => {
-        if (typeof this.model.child !== 'undefined') {
-          for (var item of this.model.child) {
-            item.value = item.defaultValue || '';
-            item.text = item.defaultText || '';
-          }
-        }
-      });
     },
     computed: {
       soPlaceholder: {
@@ -137,8 +129,9 @@
         var self = this;
         if (typeof this.model.child !== 'undefined') {
           for (var item of this.model.child) {
-            item.value = item.defaultValue || '';
-            item.text = item.defaultText || '';
+            if(typeof item.reset !== 'undefined'){
+              item.reset();
+            }
           }
         }
         this.inputHandler(self.model.value);
@@ -222,12 +215,7 @@
         this.$set(this, 'showClear', false);
       },
       clearClickHandle: function () {
-        if(this.model.isScreen){
-          this.model.reset();
-        }
-        else{
-          this.model.value = '';
-        }
+        this.model.reset();
         this.soChange();
       }
     }

package/src/centaline/dynamicContact/src/dynamicContact.vue

@@ -135,8 +135,9 @@ export default {
       var self = this;
       if (typeof this.model.child !== 'undefined') {
         for (var item of this.model.child) {
-          item.value = item.defaultValue || '';
-          item.text = item.defaultText || '';
+          if(typeof item.reset !== 'undefined'){
+            item.reset();
+          }
         }
       }
       var currentOption = this.model.options.find((value) => {

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

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

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

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

package/src/centaline/dynamicLayout/src/dynamicLayoutLabel.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="model.routerKey&&model.visibility!='0'">
     <div v-if="model.rightRouter&&model.value!=''" class="wb" :style="model.styleObject">
-      <a href="javascript:void(0);" @click="clickHandler($event)" class="ct-tablecurrencyItem">
+      <a href="javascript:void(0);" @click="clickHandler($event)" class="ct-tablecurrencyItem" :class="cuttentColor">
         {{model.value}}
       </a>
     </div>
@@ -25,6 +25,7 @@
     },
     data() {
       return {
+        cuttentColor:'',
       }
     },
     created() {
@@ -34,6 +35,7 @@
     methods: {
       clickHandler(ev) {
         this.$emit('click', this.model.routerKey, this.rowindex, this.forname, this.forrowindex);
+        this.cuttentColor='centerRed';
       }
     },
     computed: {
@@ -64,7 +66,7 @@
   .wb {
     word-break: break-all;
   }
-  .mazarine {
-    color: #cb452f;
+  .centerRed {
+    color: #cb452f !important;
   }
 </style>

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

@@ -87,8 +87,9 @@
       this.$watch('model.value', (n, o) => {
         if (typeof this.model.child !== 'undefined') {
           for (var item of this.model.child) {
-            item.value = item.defaultValue || '';
-            item.text = item.defaultText || '';
+            if(typeof item.reset !== 'undefined'){
+              item.reset();
+            }
           }
         }
       });
@@ -154,13 +155,7 @@
         this.model.getOptions(this.api);
       },
       tagsChange: function () {
-        var self = this;
-        if (typeof this.model.child !== 'undefined') {
-          for (var item of this.model.child) {
-            item.value = item.defaultValue || '';
-            item.text = item.defaultText || '';
-          }
-        }
+        var self = this;        
         var currentOptions = this.globalOptions.filter((value) => {
           return self.model.value.indexOf(value[self.model.optionAttrs.value]) >= 0;
         });
@@ -302,12 +297,7 @@
         this.$set(this, 'showClear', false);
       },
       clearClickHandle: function (event) {
-        if(this.model.isScreen){
-          this.model.reset();
-        }
-        else{
-          this.model.value.splice(0);
-        }
+        this.model.reset();
         this.resize();
         this.tagsChange();
         event.stopPropagation();

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

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

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

@@ -36,7 +36,6 @@
       };
     },
     created() {
-     
     },
     mounted() {
       var self = this;
@@ -58,8 +57,9 @@
         self.$watch('model.value', (n, o) => {
           if (typeof self.model.child !== 'undefined') {
             for (var item of self.model.child) {
-              item.value = item.defaultValue || '';
-              item.text = item.defaultText || '';
+              if(typeof item.reset !== 'undefined'){
+                item.reset();
+              }
             }
           }
         });
@@ -83,13 +83,7 @@
         this.model.self = this;
       },
       clearClickHandle: function (event) {
-        if(this.model.isScreen){
-          this.model.reset();
-        }
-        else{
-          this.model.value = '';
-          this.model.name1='';
-        }
+        this.model.reset();
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);
         if(this.model.autoSearch) this.$emit('click');

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

@@ -77,8 +77,9 @@
       this.$watch('model.value', (n, o) => {
         if (typeof this.model.child !== 'undefined') {
           for (var item of this.model.child) {
-            item.value = item.defaultValue || '';
-            item.text = item.defaultText || '';
+            if(typeof item.reset !== 'undefined'){
+              item.reset();
+            }
           }
         }
       });
@@ -139,13 +140,7 @@
         this.model.getOptions(this.api);
       },
       soChange: function () {
-        var self = this;
-        if (typeof this.model.child !== 'undefined') {
-          for (var item of this.model.child) {
-            item.value = item.defaultValue || '';
-            item.text = item.defaultText || '';
-          }
-        }
+        var self = this;        
         var currentOption = this.model.options.find((value) => {
           return self.model.value === value[self.model.optionAttrs.value];
         });
@@ -234,13 +229,8 @@
       mouseOutHandle: function () {
         this.$set(this, 'showClear', false);
       },
-      clearClickHandle: function (event) {        
-        if(this.model.isScreen){
-          this.model.reset();
-        }
-        else{
-          this.model.value = '';
-        }
+      clearClickHandle: function (event) {
+        this.model.reset();
         this.soChange();
         event.stopPropagation();
       }

package/src/centaline/dynamicSo/src/dynamicSo/345/211/257/346/234/254.vue

@@ -50,8 +50,11 @@
       soChange: function () {
         var self = this;
         if (typeof this.model.child !== 'undefined') {
-          this.model.child.value = this.model.child.defaultValue || '';
-          this.model.child.text = this.model.child.defaultValue || '';
+          for (var item of this.model.child) {
+            if(typeof item.reset !== 'undefined'){
+              item.reset();
+            }
+          }
         }
         var currentOption = this.model.options.find((value) => {
           return value[self.model.optionAttrs.value] === self.model.value

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

@@ -81,8 +81,9 @@
       this.$watch('model.value', (n, o) => {
         if (typeof this.model.child !== 'undefined' && this.model.enableRelationFields) {
           for (var item of this.model.child) {
-            item.value = item.defaultValue || '';
-            item.text = item.defaultText || '';
+            if(typeof item.reset !== 'undefined'){
+              item.reset();
+            }
             item.enableRelationFields = this.model.enableRelationFields;
           }
         }
@@ -152,8 +153,9 @@
         this.model.enableRelationFields = true;
         if (typeof this.model.child !== 'undefined') {
           for (var item of this.model.child) {
-            item.value = item.defaultValue || '';
-            item.text = item.defaultText || '';
+            if(typeof item.reset !== 'undefined'){
+              item.reset();
+            }
           }
         }
         var currentOption = this.model.options.find((value) => {
@@ -247,12 +249,7 @@
         this.$set(this, 'showClear', false);
       },
       clearClickHandle: function (event) {
-        if(this.model.isScreen){
-          this.model.reset();
-        }
-        else{
-          this.model.value = '';
-        }
+        this.model.reset();
         this.soChange();
         event.stopPropagation();
       },

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

@@ -90,14 +90,6 @@
       else {
         this.model = this.vmodel;
       }
-      this.$watch('model.value', (n, o) => {
-        if (typeof this.model.child !== 'undefined') {
-          for (var item of this.model.child) {
-            item.value = item.defaultValue || '';
-            item.text = item.defaultText || '';
-          }
-        }
-      });
       this.inputHeight = this.inputLineHeight;
       this.model.searchInputHeight = 26;
       this.model.$self=this;
@@ -162,8 +154,9 @@
         var self = this;
         if (typeof this.model.child !== 'undefined') {
           for (var item of this.model.child) {
-            item.value = item.defaultValue || '';
-            item.text = item.defaultText || '';
+            if(typeof item.reset !== 'undefined'){
+              item.reset();
+            }
           }
         }
         var currentOption = this.model.options.find((value) => {
@@ -274,12 +267,7 @@
         return true;
       },
       clearClickHandle: function (event) {
-        if(this.model.isScreen){
-          this.model.reset();
-        }
-        else{
-          this.model.value = '';
-        }
+        this.model.reset();
         this.soChange();
         event.stopPropagation();
       },

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

@@ -168,12 +168,7 @@
         this.search();
       },
       clearClickHandle: function (event) {
-        if(this.model.isScreen){
-          this.model.reset();
-        }
-        else{
-          this.model.value = '';
-        }
+        this.model.reset();
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);
         this.isShowClear();
@@ -251,7 +246,6 @@
           // let h=this.$refs.input.$el.children[0].offsetHeight;
           // let hs=this.$refs.input.$el.children[0].scrollHeight;
           // let ht=this.$refs.input.$el.children[0].scrollTop;
-          // console.log(ht+','+h+','+hs)
           let appoint='\n';
           let strat=self.forbiddenWordsValue.length-appoint.length;
           let char=self.forbiddenWordsValue.substr(strat,appoint.length);

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

@@ -90,14 +90,6 @@
       else {
         this.model = this.vmodel;
       }
-      this.$watch('model.value', (n, o) => {
-        if (typeof this.model.child !== 'undefined') {
-          for (var item of this.model.child) {
-            item.value = item.defaultValue || '';
-            item.text = item.defaultText || '';
-          }
-        }
-      });
       this.inputHeight = this.inputLineHeight;
       this.model.searchInputHeight = 26;
       this.model.$self=this;
@@ -166,8 +158,9 @@
         var self = this;
         if (typeof this.model.child !== 'undefined') {
           for (var item of this.model.child) {
-            item.value = item.defaultValue || '';
-            item.text = item.defaultText || '';
+            if(typeof item.reset !== 'undefined'){
+              item.reset();
+            }
           }
         }
         var currentOptions = this.globalOptions.filter((value) => {
@@ -329,12 +322,7 @@
       },
       clearClickHandle: function (event) {
         var self =this;
-        if(this.model.isScreen){
-          this.model.reset();
-        }
-        else{
-          this.model.value.splice(0);
-        }
+        this.model.reset();
         if(this.model.lockedValue.length>0){
           this.model.lockedValue.forEach((v) => {
             self.model.value.push(v);

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

@@ -193,10 +193,66 @@ const Base = function (source) {
     },
     reset() {
       if(this.type!==Enum.ControlType.Hidden 
+        && this.isScreen
         && this.type!==Enum.ControlType.Label 
         && this.type!==Enum.ControlType.MultiLineLabel){
-        this.value = this.defaultValue;
+        if(this.type===Enum.ControlType.DateRange || this.type===Enum.ControlType.DateTimeRange){
+          this.value = this.defaultFormat[0];
+          this.value1 = this.defaultFormat[1];
+        }
+        else if(this.type===Enum.ControlType.CheckBox || this.type===Enum.ControlType.CheckBoxList){
+          this.value = this.defaultValue;
+          this.forceUpdate();
+        }
+        else if(this.type===Enum.ControlType.MultiSelectNoSearch){
+          this.value.splice(0);
+          this.defaultValue.forEach((v1) => {
+            this.value.push(v1);
+          });
+          this.text = rtn.defaultText === '' ? [] : JSON.parse(rtn.defaultText);
+        }
+        else if(this.type===Enum.ControlType.MultiSelectWithSearch){
+          this.value.splice(0);
+          if(this.model && this.model.lockedValue != undefined && this.model.lockedValue.length>0){
+            this.model.lockedValue.forEach((v) => {
+              this.model.value.push(v);
+            });          
+          }
+          this.defaultValue.forEach((v1) => {
+            this.value.push(v1);
+          });
+          this.text = rtn.defaultText === '' ? [] : JSON.parse(rtn.defaultText);
+        }
+        else{
+          this.value = this.defaultValue;
+          this.value1 = this.defaultValue1;
+          this.text = this.defaultText;
+        }
       }
+      else{
+        if(this.type===Enum.ControlType.DateRange || this.type===Enum.ControlType.DateTimeRange){
+          this.value = '';
+          this.value1 = '';
+        }
+        else if(this.type===Enum.ControlType.CheckBox || this.type===Enum.ControlType.CheckBoxList){
+          this.checkedItemArr = [];
+          this.updateCode1();
+        }
+        else if(this.type===Enum.ControlType.MultiSelectNoSearch){
+          this.value.splice(0);
+          this.text = [];
+        }
+        else if(this.type===Enum.ControlType.MultiSelectWithSearch){
+          this.value.splice(0);
+          this.text = [];
+        }
+        else{
+          this.value = '';
+          this.value1 = '';
+          this.text = '';
+        }
+      }      
+      if(this.$self && this.$self.searchText) this.$self.searchText='';
     },
     searchObj:{
       get dataType() { return source.dearchDataTyp; },

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

@@ -127,10 +127,6 @@ const box = function (source, callBack) {
         }
         this.forceUpdate();
       },
-      reset() {
-        this.value = this.defaultValue;
-        this.forceUpdate();
-      },
       optionAttrs: {
         value: 'code',
         label: 'name',

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

@@ -101,10 +101,6 @@ const cbwt = function (source) {
     set clearable(v) {
       source.clear = v;
     },
-    reset() {
-      this.value = this.defaultValue;
-      this.text = this.defaultText;
-    },
     defaultText: source.defaultName1,
     getOptions(paramsAction, numStr, parentValue) {
       var self = this;

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

@@ -61,10 +61,6 @@ const Dtd = function (source, dateType) {
       get id1() {
         return source.fieldName2;
       },
-      reset() {
-        source.code1 = rtn.defaultFormat[0];
-        source.code2 = rtn.defaultFormat[1];
-      },
       getFormObj() {
         var rtnFormObj = {};
         Object.defineProperty(rtnFormObj, source.fieldName1, {

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

@@ -71,12 +71,6 @@ const Dtd = function (source, dateType) {
       set id1(v) {
         source.fieldName2 = v;
       },
-      reset() {
-        this.formatValue = this.defaultFormat;
-        //this.setFormatValue(this.defaultFormat);
-        source.code1 = this.formatValue[0];
-        source.code2 = this.formatValue[1];
-      },
       getFormObj() {
         var rtnFormObj = {};
         Object.defineProperty(rtnFormObj, source.fieldName1, {

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

@@ -47,10 +47,6 @@ const Iti = function (source) {
     get decimals1() {
       return source.decimals2;
     },
-    reset() {
-      this.value = this.defaultValue;
-      this.value1 = this.defaultValue1;
-    },
     get max1() {
       return source.maxValue2;
     },

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

@@ -89,13 +89,6 @@ const Mo = function (source, moreActionRouter) {
         return '';
       }
     },
-    reset() {
-      this.value.splice(0);
-      this.defaultValue.forEach((v1) => {
-        this.value.push(v1);
-      });
-      this.text = rtn.defaultText === '' ? [] : JSON.parse(rtn.defaultText);
-    },
     searchObj: {
      get searchValue1() {
        var rtnStr = "";

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

@@ -30,11 +30,6 @@ const QuickInput = function (source, moreActionRouter) {
     get parentName() {
       return source.parentField;
     },
-    reset() {
-      this.value = this.defaultValue;
-      this.text = this.defaultText;
-      if(this.$self && this.$self.searchText) this.$self.searchText='';
-    },
     defaultText: source.defaultName1,
     get labelValue() {
       if (source.name1) {