centaline-data-driven 1.1.28 → 1.1.29

package/package.json

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

package/src/centaline/css/common.css

@@ -101,9 +101,9 @@ html {
  
  .ct-tags .showLabel .ct-input_inner, .ct-so .showLabel .ct-input_inner, .ct-iti-editor input,
  .ct-date-editor input, .ct-mt .el-input-group--prepend textarea, .ct-text .showLabel input, .ct-Dtd .ct-datepicker.showLabel .el-range-input,
- .ct-Seg .showLabel.ct-radios, .ct-so .showLabel .ct-input_inner,.ct-iti .ct-input_inner {
-   border-top-left-radius: 6px !important;
-   border-bottom-left-radius: 6px !important;
+ .ct-Seg .showLabel.ct-radios, .ct-so .showLabel .ct-input_inner,.ct-Dtd .el-input__inner {
+   border-top-left-radius: 4px !important;
+   border-bottom-left-radius: 4px !important;
    text-align: left !important;
  }
  .ct-Seg .showLabel.ct-radios {

package/src/centaline/css/max.css

@@ -149,8 +149,38 @@
 .el-card{
     border: none;
 }
+.ct-tags .showLabel .ct-input_inner, .ct-so .showLabel .ct-input_inner, .ct-iti-editor input,
+.ct-date-editor input, .ct-mt .el-input-group--prepend textarea, .ct-text .showLabel input, .ct-Dtd .ct-datepicker.showLabel .el-range-input,
+.ct-Seg .showLabel.ct-radios, .ct-so .showLabel .ct-input_inner,.ct-Dtd .el-input__inner {
+  border-top-left-radius: 6px !important;
+  border-bottom-left-radius: 6px !important;
+  text-align: left !important;
+}
 .ct-iti .el-input-group--prepend .el-input__inner{
     border-top-left-radius: 6px !important;
     border-bottom-left-radius: 6px !important;
     text-align: left !important;
+  }
+/* 重置input默认颜色 选中文字颜色 */
+  .ct-search-list input::-webkit-input-placeholder{
+      color: #666666!important;
+  }
+  .ct-search-list .el-date-editor .el-range-input,.ct-search-list .el-input__inner{
+      color: #409eff;
+  }
+  .ct-so .ct-input_inner {
+    color: #409eff!important;
+  }
+  .cover-list-item .el-checkbox__input.is-checked + .el-checkbox__label,.cover-list-item .el-checkbox__input.is-checked .el-checkbox__inner{
+      color: #409eff;
+  }
+  .cover-list-item .el-checkbox__input.is-checked .el-checkbox__inner{
+    background-color:#409eff;
+    border-color: #409eff;
+  }
+  .ct-search-list .el-input-group__append, .el-input-group__prepend{
+    color: #666666!important;
+  }
+  .ct-so .ct-input_inner,.el-input__inner{
+      border-radius: 6px!important;
   }

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

@@ -12,7 +12,7 @@
          <div style="width:39%" class="ct-position-relative" @mouseout="mouseOutHandle('input2')">
           <input style="text-align:left;width:100%" class="el-range-input" :placeholder="model.attrs.placeholder1"
                  v-model="model.value" @change="changeHandler($event)" @input="onInputHandler($event);isShowClear('input2')" @focus="focusHandler" @blur="blurHandler('value','decimals')"
-                 :class="model.lock ? 'ct-is-disabled' : ''" :disabled="model.lock" />
+                 :class="model.lock ? 'ct-is-disabled' : ''" :disabled="model.lock" @keyup.enter="search()"/>
            
            <!-- <span  class="el-input__suffix el-input--mini"  v-if="showClear.input1">
             <span  class="el-input__suffix-inner ct-close">
@@ -24,7 +24,7 @@
           <div style="width:39%" class="ct-position-relative" @mouseout="mouseOutHandle('input2')">
           <input style="text-align:left;width:100%;" class="el-range-input" :placeholder="model.attrs.placeholder2"
                  v-model="model.value1" @change="changeHandler($event);" @input="onInputHandler($event);isShowClear('input2')" @focus="focusHandler" @blur="blurHandler('value1','decimals1')"
-                 :class="model.lock ? 'ct-is-disabled' : ''" :disabled="model.lock" />
+                 :class="model.lock ? 'ct-is-disabled' : ''" :disabled="model.lock" @keyup.enter="search()"/>
           </div>
           <span  class="el-input__suffix el-input--mini"  v-if="showClear.input2">
             <span  class="el-input__suffix-inner ct-close" style="display: flex;">
@@ -140,6 +140,9 @@
            this.showClear[id]=false;
         }
       },
+      search() {
+        if(this.model.autoSearch) this.$emit('click');
+      },
     }
   }
 </script>

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

@@ -168,6 +168,7 @@
         }
         this.inputHandler(self.model.value);
         this.changeHandler(self.model.value);
+        if(this.model.autoSearch) this.$emit('click');
       },
       focusHandle: function () {
         this.$set(this, 'focus', true);

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

@@ -152,6 +152,7 @@
         }
         this.inputHandler(self.model.value);
         this.changeHandler(self.model.value);
+        if(this.model.autoSearch) this.$emit('click');
       },
       focusHandle: function () {
         this.$refs['ct-input'].focus();
@@ -212,7 +213,6 @@
       },
       selectOption(value) {
         if (this.model.value === value) {
-          //this.model.value = '';
           this.$set(this, 'showDrop', false);
           return;
         }

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

@@ -158,6 +158,7 @@
         }
         this.inputHandler(self.model.value);
         this.changeHandler(self.model.value);
+        if(this.model.autoSearch) this.$emit('click');
       },
       focusHandle: function () {
         this.$set(this, 'focus', true);
@@ -223,7 +224,6 @@
       },
       selectOption(value) {
         if (this.model.value === value) {
-          //this.model.value = '';
           this.$set(this, 'showDrop', false);
           return;
         }

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

@@ -7,7 +7,8 @@
       </div>
       <el-input :title="model.lock?model.value:''" :type="model.inputType" v-model="model.value" v-bind="model.attrs" @input="inputHandler($event);isShowClear()" @change="changeHandler($event)"
                 class="ct-flex-div-input max-input" :class="[model.showLabel?'showLabel':'',!valid?'inputError':'']" :disabled="model.lock" :rows="model.rows"
-                :readonly="model.readonly" :show-password="model.isPassword" autocomplete="on" :maxlength="model.max" :show-word-limit="model.showWordLimit">
+                :readonly="model.readonly" :show-password="model.isPassword" autocomplete="on" :maxlength="model.max" :show-word-limit="model.showWordLimit"
+                @keyup.enter.native="search()">
         <span slot="suffix" v-if="model.unitName" class="ct-unitname">{{model.unitName}}</span>
 
         <span slot="suffix" class="el-input__suffix el-input--mini" v-if="showClear" :class="model.unitName?'ct-right-10':'ct-right-0'">
@@ -69,6 +70,9 @@
           this.$set(this, 'showClear', false);
         }
       },
+      search() {
+        if(this.model.autoSearch) this.$emit('click');
+      },
     },
   }</script>
 <style>

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

@@ -173,9 +173,9 @@
         else {
           this.model.text = [];
         }
-        //this.$emit('change', this.model.value);
         this.inputHandler(self.model.value);
         this.changeHandler(self.model.value);
+        if(this.model.autoSearch) this.$emit('click');
       },
       focusHandle: function () {
         this.$set(this, 'focus', true);

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

@@ -155,7 +155,12 @@ const Base = function (source) {
     searchObj:{
       get dataType() { return source.dearchDataTyp; },
       get fieldName1() { return source.fieldName1; },
-      get fieldName2() { return source.fieldName2; },
+      get fieldName2() { 
+        if(source.controlType === Enum.ControlType.NumericRange){
+          if(!source.fieldName2) return source.fieldName1; 
+        }
+        return source.fieldName2; 
+      },
       get groupName() { return source.groupName || source.fieldName1; },
       get operation() { return source.searchOperation; },
       get searchDataType() { return source.searchDataType; } ,
@@ -239,8 +244,12 @@ const Base = function (source) {
       return null;
     },
     /*选择搜索条件后是否默认显示标签*/
-    get dlfs() {
-      return source.dlfs;
+    get displayLabelAfterSelected() {
+      return source.displayLabelAfterSelected==undefined? false:source.displayLabelAfterSelected;
+    },
+    /*选择搜索条件后是否触发搜索*/
+    get autoSearch() {
+      return source.autoSearch==undefined? false:source.autoSearch;
     },
   };
 

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

@@ -3,7 +3,6 @@ import Base from './Base';
 import valid from '../../../validate/index';
 const Iti = function (source) {
   var rtn = {
-
     get clearable() {
       if (typeof source.clear === 'undefined'&&!source.locked) {
         return true;
@@ -17,8 +16,7 @@ const Iti = function (source) {
     },
     set clearable(v) {
       source.clear = v;
-    },
-    
+    },    
     get value1() {
       return source.code2||'';
     },
@@ -60,13 +58,6 @@ const Iti = function (source) {
     set min1(v) {
       source.minValue2 = v;
     },
-    //searchObj: {
-    //  get searchValue() {
-    //    if (source.code1 || source.code2) {
-    //      return source.code1 + '^' + source.code2;
-    //    }
-    //  }
-    //},
     getFormObj() {
       var rtnFormObj = {};
       Object.defineProperty(rtnFormObj, source.fieldName1, {

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

@@ -67,6 +67,9 @@ const SearchScreen = function (source, callBack, screenPara) {
         });
 
         rtnscreens = this.initScreen(screens);
+        rtnscreens.forEach((v)=>{
+          v.action='search';
+        });
         this._screen = rtnscreens;
         return rtnscreens;
       },
@@ -106,6 +109,9 @@ const SearchScreen = function (source, callBack, screenPara) {
           return advIndex !== -1 && i > advIndex;
         });
         rtnscreens = this.initScreen(screens);
+        rtnscreens.forEach((v)=>{
+          v.action='search';
+        });
         this._highScreen = rtnscreens;
         return rtnscreens;
       },
@@ -205,6 +211,10 @@ const SearchScreen = function (source, callBack, screenPara) {
     Vue.prototype.$api.postHandler(common.globalUri(), { action: source, para: screenPara }).then(
       function (response) {
         if (response.rtnCode === Enum.ReturnCode.Successful) {
+          response.content.fields[0].displayLabelAfterSelected=true;
+          response.content.fields[0].autoSearch=true;
+          response.content.fields[4].autoSearch=true;
+          response.content.fields[5].autoSearch=true;
           var rtn = init(response);
           if (callBack) {
             callBack(rtn);

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

@@ -8,7 +8,7 @@ const So = function (source, moreActionRouter) {
   var rtn = {
     options: [{ code: source.code1, name: source.name1 }],
     get text() {      
-      if (source.isList && source.name1 && rtn.attrs.placeholder && source.dlfs) {
+      if (source.isList && source.name1 && rtn.attrs.placeholder && rtn.displayLabelAfterSelected) {
         return rtn.attrs.placeholder + ":" + source.name1;
       }
       return source.name1;

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

@@ -8,7 +8,7 @@ const Sos = function (source, moreActionRouter) {
   var rtn = {
     options: [{ code: source.code1, name: source.name1 }],
     get text() {
-      if (source.isList && source.name1 && rtn.attrs.placeholder && source.dlfs) {
+      if (source.isList && source.name1 && rtn.attrs.placeholder && rtn.displayLabelAfterSelected) {
         return rtn.attrs.placeholder + ":" + source.name1;
       }
       return source.name1;
@@ -31,7 +31,6 @@ const Sos = function (source, moreActionRouter) {
     get parentName() {
       return source.parentField;
     },
-
     reset() {
       this.value = this.defaultValue;
       this.text = this.defaultText;