centaline-data-driven 1.1.27 → 1.1.31

package/package.json

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

package/src/SearchList.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app-search" style="height:100%;position: fixed;">
     <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
-    <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'" :searchDataApi="'/PropertyOFIList/getList'"></ct-searchlist>
+    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getList'"></ct-searchlist>
     <!--<ct-searchlist :searchConditionApi="'/api/invoice-info/search-condition'" :searchDataApi="'/api/invoice-info/list'" :searchDataStatisticsApi="'api/ContractList/GetLayoutOfStatisticsTool'" :apiParam="para"></ct-searchlist>-->
     <ct-dialog-list></ct-dialog-list>
   </div>

package/src/SearchTree.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app-Tree" style="height:100%;position: fixed;">
     <el-container style="height: 100vh;width:100vw; border: 1px solid #eee">
-      <el-aside width="200px" style="background-color: rgb(238, 241, 246)">
+      <el-aside width="200px" style="background-color: rgb(238, 241, 246);border-radius:6px;">
         <ct-tree :flagsearch="true" :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'" :searchDataApi="'/SystemParameterCatalogList/getList'" @loaded="loaded"></ct-tree>
       </el-aside>
       <el-main v-if="isShowSearchlist">

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 {
-   border-top-left-radius: 0px !important;
-   border-bottom-left-radius: 0px !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 {
@@ -565,7 +565,7 @@ html {
 
 .ct-searchtable{
   margin-top: 10px;
-  padding: 20px 0px 0 0px;
+  padding: 20px 10px 0 0px;
   background: #fff;
   -webkit-box-sizing: border-box;
   border-radius:6px;
@@ -596,13 +596,13 @@ html {
  }
 
 .el-input-group__append, .el-input-group__prepend {
-  background-color: #FFF; /*白色*/
+  background-color: initial!important; /*无色*/
   vertical-align: middle;
   display: table-cell;
   position: relative;
-  border: 0px solid #DCDFE6; /*无边框*/
+  border: 0px solid #DCDFE6!important; /*无边框*/
   border-radius: 4px;
-  padding: 0 5px;
+  padding: 0 5px!important;
   width: 1px;
   white-space: nowrap;
   text-align: right;
@@ -713,4 +713,7 @@ html {
 .ct-table-content{
   padding: 0 15px;
 }
+.el-card.is-always-shadow{
+  box-shadow: none!important;
+}
 

package/src/centaline/css/max.css

@@ -66,6 +66,9 @@
     border-top-left-radius: 6px;
     border-bottom-left-radius: 6px;
     line-height: 24px;
+    border: none;
+    background-color: initial;
+    padding: 0 10px;
 }
 .max-flex-div{
     display: flex;
@@ -142,4 +145,42 @@
 }
 .max-cover-list-item .el-input__icon{
     line-height: 40px!important;
-}
+}
+.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/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -128,7 +128,7 @@
                     <div class="row-i"><span>产权：</span><span>公司</span></div> 
                     <div class="row-i"><span>产权状况：</span><span>拍卖</span></div>
                     <div class="row-i"><span>现状：</span><span>空房</span></div>
-                    <div class="row-i"><span>付费</span><span>各付各税</span></div>
+                    <div class="row-i"><span>付费：</span><span>各付各税</span></div>
                     <div class="row-i"><span>佣金：</span><span>600元</span></div>
                   </div>
               </div>

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

@@ -1,37 +1,37 @@
 <template>
   <div class="field-top">
-    <div style="width:100%;display:flex" class="ct-iti" :class="[model.attrs.size?'ct-iti-'+model.attrs.size:'']">
+    <div style="width:100%;display:flex" class="ct-iti" :class="[model.attrs.size?'ct-iti-'+model.attrs.size:'']" @mouseover="mouseOverHandle('input2')">
       <div :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']" style="flex:1">
         <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
           {{model.label}}
         </div>
-        <div style="padding-left:15px" v-bind="model.attrs" class="el-date-editor el-range-editor el-input__inner el-date-editor--daterange"
+        <div style="padding-left:5px" v-bind="model.attrs" class="el-date-editor el-range-editor el-input__inner el-date-editor--daterange"
              v-bind:class="[model.attrs.size?'el-range-editor--'+model.attrs.size:'',
          model.showLabel?'ct-iti-editor':'',isFocus?'isfocus':'',model.lock ? 'ct-is-disabled' : '']">
 
-         <div style="width:39%" class="ct-position-relative" @mouseover="mouseOverHandle('input1','value')" @mouseout="mouseOutHandle('input1')">
+         <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('input1','value')" @focus="focusHandler" @blur="blurHandler('value','decimals')"
-                 :class="model.lock ? 'ct-is-disabled' : ''" :disabled="model.lock" />
+                 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" @keyup.enter="search()"/>
            
-           <span  class="el-input__suffix el-input--mini"  v-if="showClear.input1">
+           <!-- <span  class="el-input__suffix el-input--mini"  v-if="showClear.input1">
             <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,'input1','value')"></i>
             </span>
-         </span>
+         </span> -->
           </div>
           <span style="width:5%" class="el-range-separator">-</span>
-          <div style="width:39%" class="ct-position-relative" @mouseover="mouseOverHandle('input2','value1')" @mouseout="mouseOutHandle('input2')">
+          <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','value1')" @focus="focusHandler" @blur="blurHandler('value1','decimals1')"
-                 :class="model.lock ? 'ct-is-disabled' : ''" :disabled="model.lock" />
-            <span  class="el-input__suffix el-input--mini"  v-if="showClear.input2">
-            <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,'input2','value1')"></i>
+                 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" @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;">
+              <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event,'input2')"></i>
             </span>
-             </span>
+          </span>
           <span v-if="model.unitName" class="ct-unitname el-input__suffix el-input__suffix-inner">{{model.unitName}}</span>
-          </div>
         </div>
       </div>
       <span v-if="model.sufLabel" class="spanMessage ct-flex-div-span">{{model.sufLabel}}</span>
@@ -118,28 +118,31 @@
         }
         return true;
       },
-      clearClickHandle: function (event,id,valName) {
-
-        this.model[valName] ='';
-        this.isShowClear(id,valName);
+      clearClickHandle: function (event,id) {
+        this.model['value'] ='';
+        this.model['value1'] ='';
+        this.isShowClear(id);
       },
-      mouseOverHandle: function (id,valName) {
-        if (this.model[valName] !== '' && this.model.clearable) {
+      mouseOverHandle: function (id) {
+        if ((this.model['value'] !== '' || this.model['value1'] !== '') && this.model.clearable) {
           this.showClear[id]=true;
         }
       },
       mouseOutHandle: function (id) {
         this.showClear[id]=false;
       },
-      isShowClear(id,valName)
+      isShowClear(id)
       {
-         if (this.model[valName] !== '' && this.model.clearable) {
+         if ((this.model['value'] !== '' || this.model['value1'] !== '') && this.model.clearable) {
           this.showClear[id]=true;
-        }else
-        {
+        }
+        else {
            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/dynamicSearchList/src/dynamicTableToolbar.vue

@@ -44,7 +44,7 @@
     width:100%;
     position:relative;
     float:left;
-    padding:0 15px 10px 15px;
+    padding:0 5px 10px 15px;
     background-color:#fff;
     border-radius: 6px;
   }

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);
@@ -222,9 +223,7 @@
         }
       },
       selectOption(value) {
-        debugger;
         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

@@ -1,3 +1,4 @@
+import Enum from '../ctl/lib/Enum';
 const Base = function (source) {
   let rtn = {
     collapseName: -1,
@@ -155,7 +156,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; } ,
@@ -238,6 +244,14 @@ const Base = function (source) {
       }
       return null;
     },
+    /*选择搜索条件后是否默认显示标签*/
+    get displayLabelAfterSelected() {
+      return source.displayLabelAfterSelected==undefined? false:source.displayLabelAfterSelected;
+    },
+    /*选择搜索条件后是否触发搜索*/
+    get autoSearch() {
+      return source.autoSearch==undefined? false:source.autoSearch;
+    },
   };
 
   return rtn;

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,10 +16,9 @@ const Iti = function (source) {
     },
     set clearable(v) {
       source.clear = v;
-    },
-    
+    },    
     get value1() {
-      return source.code2;
+      return source.code2||'';
     },
     set value1(v) {
       source.code2 = v;
@@ -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;
       },

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

@@ -7,9 +7,8 @@ import Vue from 'vue';
 const So = function (source, moreActionRouter) {
   var rtn = {
     options: [{ code: source.code1, name: source.name1 }],
-    get text() {
-      
-      if (source.isList && source.name1 && rtn.attrs.placeholder) {
+    get text() {      
+      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) {
+      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;

package/src/centaline/loader/src/ctl/lib/LibFunction.js

@@ -69,6 +69,9 @@ const LibFunction = {
         field.controlType === Enum.ControlType.ButtonAdvancedSearch) {
         field.width = '';
       }
+      else if (field.controlType === Enum.ControlType.NumericRange) {
+        field.width = field.width || 280;
+      }
       else {
         showLabel = false;
         field.width = field.width || 200;
@@ -145,10 +148,6 @@ const LibFunction = {
         item = Sw(field);
         item.is = 'ct-sw';
         break;
-      //case 'Time'://时间控件
-      //  item = TimeSelect(field, false);
-      //  item.is = 'ct-time-select';
-      //  break;
       case Enum.ControlType.TimeRange://时间区间
         item = TimeSelect(field, true, 'time');
         item.is = 'ct-time-select';