centaline-data-driven 1.1.47 → 1.1.48

package/package.json

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

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

@@ -17,7 +17,7 @@
             </span>
           </div>
           <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']"
-                      :trigger="(model.popupSearchListType > 0 || model.lock) ? 'manual' : 'click'" :disabled="model.lock">
+                      :trigger="(!model.paramName || model.lock) ? 'manual' : 'click'" :disabled="model.lock">
             <div>
               <ct-select-option :model="model" :optionRowCount="optionRowCount" @click="selectOption($event)"></ct-select-option>
             </div>
@@ -180,20 +180,18 @@
         if (this.model.lock) {
           return false;
         }
-        if (this.model.popupSearchListType === 1) {
+        if (this.model.paramName) {
+          this.$set(this, 'showDrop', !this.showDrop);
+          if (this.showDrop) {
+            this.getOptions();
+          }
+          this.focusHandle();
+        }
+        else if (this.model.popupSearchListType === 1) {
           this.popupSearchListHandle();
         }
-        else {
-          if (this.model.paramName) {
-            this.$set(this, 'showDrop', !this.showDrop);
-            if (this.showDrop) {
-              this.getOptions();
-            }
-            this.focusHandle();
-          }
-          else if ((this.model.popupSearchListType === 0)) {
-            this.$message.warning("请配置参数paramName1");
-          }
+        else if ((this.model.popupSearchListType === 0)) {
+          this.$message.warning("请配置参数paramName1");
         }
       },
       popupSearchListHandle: function () {

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

@@ -10,7 +10,7 @@
       <div class="ct-radios" :class="[model.showLabel?'showLabel':'',model.value !== ''?'hasValue':'']">
         <el-radio-group v-model="model.value" @change="changeHandler1($event)">
           <el-radio-button v-bind="model.attrs" v-for="(value, index) in model.segmentValue" :key="index" v-model="model.value"
-                    :label="value[model.optionAttrs.value]" :disabled="model.lock">
+                    :label="value[model.optionAttrs.value]" :displayLabel="value[model.optionAttrs.displayLabel]" :disabled="model.lock">
             {{value[model.optionAttrs.label]}}
           </el-radio-button >
         </el-radio-group>
@@ -61,6 +61,12 @@
         this.changeHandler(this.model.value);
       },
       changeHandler1: function (event) {
+        var self=this;
+        this.model.segmentValue.forEach((v, i) => {
+          if(v[self.model.optionAttrs.value]==event && v[self.model.optionAttrs.displayLabel]){
+            self.model.label=v[self.model.optionAttrs.displayLabel];
+          }
+        });
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);
         let parm={};

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -192,7 +192,7 @@
             self.colHasWidth[vi] = 'nowidth';
           }
         });
-        debugger;
+        
         self.isLoading = false;
         self.$forceUpdate();
         this.model.scripts.formData = this.model.formData;

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

@@ -7,7 +7,7 @@
           <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
             {{model.label}}
           </div>
-          <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(model.popupSearchListType > 0 || model.lock) ? 'manual' : 'click'">
+          <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(!model.paramName || model.lock) ? 'manual' : 'click'">
             <div>
               <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
             </div>
@@ -165,20 +165,18 @@
         if (this.model.lock) {
           return false;
         }
-        if (this.model.popupSearchListType === 1) {
+        if (this.model.paramName) {
+          this.$set(this, 'showDrop', !this.showDrop);
+          if (this.showDrop) {
+            this.getOptions();
+          }
+          this.focusHandle();
+        }
+        else if (this.model.popupSearchListType === 1) {
           this.popupSearchListHandle();
         }
-        else {
-          if (this.model.paramName) {
-            this.$set(this, 'showDrop', !this.showDrop);
-            if (this.showDrop) {
-              this.getOptions();
-            }
-            this.focusHandle();
-          }
-          else if ((this.model.popupSearchListType === 0)){
-            this.$message.warning("请配置参数paramName1");
-          }
+        else if ((this.model.popupSearchListType === 0)){
+          this.$message.warning("请配置参数paramName1");
         }
       },
       popupSearchListHandle: function () {

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

@@ -7,7 +7,7 @@
           <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
             {{model.label}}
           </div>
-          <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(model.popupSearchListType > 0 || model.lock) ? 'manual' : 'click'">
+          <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(!model.paramName || model.lock)? 'manual' : 'click'">
             <div>
               <div>
                 <el-input ref="searchInput" :size="model.attrs.size" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
@@ -170,23 +170,18 @@
         if (this.model.lock) {
           return false;
         }
-        if (this.model.popupSearchListType === 1) {
+        if (this.model.paramName) {
+          this.$set(this, 'showDrop', !this.showDrop);
+          if (this.showDrop) {
+            this.getOptions();
+          }
+          this.focusHandle();
+        }
+        else if (this.model.popupSearchListType === 1) {
           this.popupSearchListHandle();
         }
-        //else if (this.model.popupSearchListType === 1) {
-        //  //todo 以后可加上即可选单搜索 又可高级搜索
-        //}
-        else {
-          if (this.model.paramName) {
-            this.$set(this, 'showDrop', !this.showDrop);
-            if (this.showDrop) {
-              this.getOptions();
-            }
-            this.focusHandle();
-          }
-          else if ((this.model.popupSearchListType === 0)) {
-            this.$message.warning("请配置参数paramName1");
-          }
+        else if ((this.model.popupSearchListType === 0)) {
+          this.$message.warning("请配置参数paramName1");
         }
       },
       popupSearchListHandle: function () {

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

@@ -17,7 +17,7 @@
                 </span>
               </span>
             </div>
-            <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel1?'showLabel':'']" :trigger="(model.popupSearchListType > 0 || model.lock) ? 'manual' : 'click'">
+            <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel1?'showLabel':'']" :trigger="(!model.paramName || model.lock) ? 'manual' : 'click'">
               <div>
                 <div>
                   <el-input ref="searchInput" :size="model.attrs.size" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
@@ -186,21 +186,19 @@
       clickHandle: function () {
         if (this.model.lock) {
           return false;
+        }        
+        if (this.model.paramName) {
+          this.$set(this, 'showDrop', !this.showDrop);
+          if (this.showDrop) {
+            this.getOptions();
+          }
+          this.focusHandle();
         }
-        if (this.model.popupSearchListType === 1) {
+        else if(this.model.popupSearchListType === 1) {
           this.popupSearchListHandle();
         }
-        else {
-          if (this.model.paramName) {
-            this.$set(this, 'showDrop', !this.showDrop);
-            if (this.showDrop) {
-              this.getOptions();
-            }
-            this.focusHandle();
-          }
-          else if ((this.model.popupSearchListType === 0)) {
-            this.$message.warning("请配置参数paramName1");
-          }
+        else if ((this.model.popupSearchListType === 0)) {
+          this.$message.warning("请配置参数paramName1");
         }
       },
       popupSearchListHandle: function () {
@@ -281,7 +279,12 @@
         var self = this;
         optionArr.forEach((s) => {
           if (!self.model.value.find((v) => { return v === s[self.model.optionAttrs.value] })) {
-            self.model.options.push(s);
+            let op={};
+            op[self.model.optionAttrs.value]=s[self.model.optionAttrs.value];
+            op[self.model.optionAttrs.label]=s[self.model.optionAttrs.label];
+            op[self.model.optionAttrs.rowid]='';
+            op[self.model.optionAttrs.flagDeleted]=false;
+            self.model.options.push(op);
             self.model.value.push(s[self.model.optionAttrs.value]);
           }
         });

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

@@ -10,7 +10,10 @@ const SearchCategory = function (source, callBack) {
       showLabel:true,
       get value() {
         if(!data.code1){
-            return rtn.segmentValue[0].code;
+            if(rtn.segmentValue[0][rtn.optionAttrs.displayLabel]){
+              rtn.label=rtn.segmentValue[0][rtn.optionAttrs.displayLabel];
+            }
+            return rtn.segmentValue[0][rtn.optionAttrs.value];
         }
         return data.code1;
       },
@@ -24,7 +27,8 @@ const SearchCategory = function (source, callBack) {
         value: 'code',
         label: 'name',
         actionType: 'actionType',
-        flagDeleted: 'flagDeleted'
+        flagDeleted: 'flagDeleted',        
+        displayLabel: 'displayName',
       }
     };
     rtn = base.copy(Base(data), rtn);

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

@@ -9,6 +9,7 @@ const Tags = function (source, moreActionRouter) {
   var rtn = {
     options: source.code1 === '' ? [] : [].concat(JSON.parse(source.code1)),
     optionAttrs: {
+      rowid: 'rowID',
       value: 'code',
       label: 'name',
       displayLabel:'displayName',