centaline-data-driven 1.4.13 → 1.4.14

package/package.json

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

package/src/SearchList.vue

@@ -11,10 +11,10 @@
       :searchStatsApi="'/ProfileWorklistList/getListStats'">
     </ct-searchlist> -->
 
-    <ct-searchlist 
+    <!-- <ct-searchlist 
       :searchConditionApi="'/api/distribution/distributionList/getLayoutOfSearch'" 
       :searchDataApi="'/api/distribution/distributionList'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist 
       :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" 
@@ -22,11 +22,11 @@
       :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
       :searchStatsApi="'/PropertyRETList/getListStats'">
-    </ct-searchlist> -->
+    </ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyOFIList/getListOfSearchModel'"

package/src/centaline/css/max.css

@@ -202,6 +202,9 @@
   .cover-list-item .el-checkbox__input.is-checked + .el-checkbox__label,.cover-list-item .el-checkbox__input.is-checked .el-checkbox__inner{
       color: #409eff;
   }
+  .ct-inputNumber input.el-range-input {
+    color: #409eff!important;
+  }
   .cover-list-item .el-checkbox__input.is-checked .el-checkbox__inner{
     background-color:#409eff;
     border-color: #409eff;

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

@@ -7,10 +7,32 @@
       <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div max-input-group" :class="[model.labelClass]">
         <span>{{model.label}}</span>
       </div>
+
       <div ref="highlights" v-if="model.forbiddenWords" class="backdrop" :style="{width:forbiddenWordsWidth+'px',height:forbiddenWordsHeight+'px',left:forbiddenWordsLeft+'px',top:forbiddenWordsTop+'px'}">
         <div  class="highlights" v-html="forbiddenWordsValue"></div>
       </div>
-      <el-input ref="input" :title="model.lock?model.value:''" :type="model.inputType" v-model="model.value" v-bind="model.attrs" @input="inputHandler($event);isShowClear();applyHighlights()" @change="changeHandler($event)"
+
+      <el-popover v-if="model.autoFill && model.paramName" placement="bottom-start" v-model="showDrop" :trigger="'manual'" class="autoFill">
+        <div>
+          <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
+        </div>
+        <el-input slot="reference" ref="input" :title="model.lock?model.value:''" :type="model.inputType" v-model="model.value" v-bind="model.attrs" 
+                @input="inputHandler($event);showDropHandle();isShowClear();applyHighlights()" @change="changeHandler($event)"
+                class="ct-flex-div-input max-input" :class="[model.showLabel?'showLabel':'',!valid?'inputError':'',model.forbiddenWords?'inputHighlights':'']" 
+                :disabled="model.lock" :rows="model.rows" :resize="model.forbiddenWords?'none':'vertical'"
+                :readonly="model.readonly" :show-password="model.isPassword" autocomplete="on" :maxlength="model.max" :show-word-limit="model.showWordLimit"
+                @keyup.enter.native="search()" style="z-index: 3;background-color: transparent;">
+          <span slot="suffix" v-if="model.unitName" class="ct-unitname" :class="showClear?'unitName-20':'unitName-0'">{{model.unitName}}</span>
+
+          <span slot="suffix" class="el-input__suffix el-input--mini is-show-Span" v-if="!model.isPassword&&showClear" :class="model.unitName?'ct-right-10':'ct-right-0'">
+            <span class="el-input__suffix-inner ct-close">
+              <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event)"></i>
+            </span>
+          </span>
+        </el-input>    
+      </el-popover>
+
+      <el-input v-else ref="input" :title="model.lock?model.value:''" :type="model.inputType" v-model="model.value" v-bind="model.attrs" @input="inputHandler($event);isShowClear();applyHighlights()" @change="changeHandler($event)"
                 class="ct-flex-div-input max-input" :class="[model.showLabel?'showLabel':'',!valid?'inputError':'',model.forbiddenWords?'inputHighlights':'']" 
                 :disabled="model.lock" :rows="model.rows" :resize="model.forbiddenWords?'none':'vertical'"
                 :readonly="model.readonly" :show-password="model.isPassword" autocomplete="on" :maxlength="model.max" :show-word-limit="model.showWordLimit"
@@ -22,10 +44,10 @@
             <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event)"></i>
           </span>
         </span>
-      </el-input>
+      </el-input>      
       <span v-if="this.minText" :style="{left: minTextLeft+'px'}" style="color: #909399;background: #FFF;position: absolute;font-size: 12px;bottom: 5px;z-index: 3;">{{this.minText}}</span>
       <span v-if="model.sufLabel" class="spanMessage ct-flex-div-span">{{model.sufLabel}}</span>
-      <ctQuickInputSos v-if="!model.lock && model.paramName" class="ct-flex-div-span" :pn="model.paramName" :action="api" :flagNew="true" @click="quickSelect"></ctQuickInputSos>      
+      <ctQuickInputSos v-if="!model.lock && model.paramName && !model.autoFill" class="ct-flex-div-span" :pn="model.paramName" :action="api" :flagNew="true" @click="quickSelect"></ctQuickInputSos>      
       
       <div v-if="model.moreActionRouter && !model.lock">
         <img v-if="model.moreActionRouter.imgUrl" class="ct-tablecurrencyImg ct-tablecurrencyItem" 
@@ -46,14 +68,17 @@
 <script>
   import dynamicElement from '../../mixins/dynamicElement';
   import ctQuickInputSos from '../../quickInputSos/src/quickInput'
+  import ctSelectOptionVertical from '../../selectOption/src/selectOptionVertical'
   export default {
     name: 'ct-text',
     mixins: [dynamicElement],
     components: {
       'ctQuickInputSos': ctQuickInputSos,
+      'ctSelectOptionVertical': ctSelectOptionVertical
     },
     props: {
-      vmodel: Object
+      vmodel: Object,
+      api: String,
     },
     data() {
       return {
@@ -65,6 +90,8 @@
         forbiddenWordsHeight:0,
         forbiddenWordsLeft:0,
         forbiddenWordsTop:0,
+        showDrop:false,
+        searchText:'',
       }
     },
     created() {
@@ -103,11 +130,38 @@
       mouseOutHandle: function () {
         this.$set(this, 'showClear', false);
       },
+      showDropHandle:function(){
+        var self = this;
+        if (this.model.value === undefined || this.model.value === null || this.model.value === '') {
+          this.showDrop=false;
+        }
+        else{
+          if (this.model.value !== this.searchText) {
+            setTimeout(function () {
+              self.searchText=self.model.value;
+              self.model.getOptions(self.api, self.model.value,function(){
+                if(self.model.options && self.model.options.length>0){
+                  self.showDrop=true;
+                }
+                else{
+                  self.showDrop=false;
+                }
+              });
+            }, self.model.searchTick);
+          }
+        }
+      },
+      selectOption(value) {
+        this.showDrop=false;
+        this.model.value = value;        
+        this.search();
+      },
       clearClickHandle: function (event) {
         this.model.value = '';
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);
         this.isShowClear();
+        this.showDropHandle();
         event.stopPropagation();
       },
       isShowClear() {
@@ -228,4 +282,7 @@
   padding: 5px 15px 5px 15px;
   line-height: 1.5;
 }
+.autoFill{
+  width: 100%;
+}
 </style>

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

@@ -307,6 +307,15 @@ const Base = function (source) {
     get joinChar() {
       return source.joinChar;
     },
+    get autoFill() {
+      return source.autoFill;
+    },
+    get searchTick() {
+      return parseInt(source.searchTick) || 250;
+    },
+    set searchTick(v) {
+      source.searchTick = v;
+    },
   };
 
   return rtn;

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

@@ -79,12 +79,6 @@ const Sos = function (source, moreActionRouter) {
     set clearable(v) {
       source.clear = v;
     },
-    get searchTick() {
-      return parseInt(source.searchTick) || 250;
-    },
-    set searchTick(v) {
-      source.searchTick = v;
-    },
     getOptions(paramsAction,key) {     
       var self = this;
       var apiAddrs = paramsAction || this.api;

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

@@ -1,6 +1,8 @@
 import base from '../../index';
 import Base from './Base';
 import valid from '../../../validate/index';
+import common from '../../../common';
+import Vue from 'vue';
 const T = function (source, inputType, readonly, isPassword,moreActionRouter) {
   var rtn = {
     optionAttrs: {
@@ -62,6 +64,28 @@ const T = function (source, inputType, readonly, isPassword,moreActionRouter) {
       return false;
     },
     moreActionRouter: moreActionRouter,//更多高级查询
+    options: [{ code: source.code1, name: source.code1 }],
+    getOptions(paramsAction,key,back) {
+      var self = this;
+      var apiAddrs = paramsAction || this.api;
+      var params = {
+        action: apiAddrs,
+        para: {
+          paramName: self.paramName,
+          parentValue: rtn.getFormParentFieldPara(),
+          key: key,
+          extraData: rtn.getFormRefFieldPara()
+        }
+      };
+      Vue.prototype.$api.postHandler(common.globalUri(), params).then((response) => {
+        if (response.rtnCode === 200) {
+          self.options = response.content;
+          if(back){
+            back();
+          }
+        }
+      });
+    },
   };
   rtn = base.copy(Base(source), rtn);
   rtn = base.copy(rtn, valid.Init(rtn));