centaline-data-driven 1.1.24 → 1.1.28

package/config/dev.env.js

@@ -5,8 +5,8 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://10.88.1.151:8085/v1/form/router"',//aplus黄兰
-  // BASE_API: '"http://10.88.22.46:7070/v1/form/router"',//max本地
+  BASE_API: '"http://10.88.22.46:7070/v1/form/router"',//max本地
   //BASE_API: '"http://10.88.22.71:5008/api/doaction/router"',
-  BASE_API: '"http://tjcptest.centaline.com.cn/v1/form/router"',
+  // BASE_API: '"http://tjcptest.centaline.com.cn/v1/form/router"',
   // BASE_API: '"http://10.88.200.31:5000/gateway/redirect"',
 })

package/package.json

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

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
-    <!-- <ct-form :api="'/api/selfProject/selfProjectListLayout'" :apiParam="apiParam"></ct-form> -->
+    <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
     <!--:api="'FormSample/formdata'"-->
     <!--<ct-form :source="formdata.content"></ct-form>-->
     <!--<ct-form :api="'/api/form/formdata/contractDetail'" :apiParam="apiParam"></ct-form>-->
@@ -17,6 +17,7 @@
       return {
         apiParam: {originalTraId: "1475658732246241281", actionType: 3, pageTitle: "成交报告", pageOnly: true} ,
         // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
+        // apiParam: {SN: "13557_132", UserID: "wuhan3"},
       }
     },
     methods: {

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="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getList'"></ct-searchlist> -->
+    <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" :searchDataApi="'/api/third-dept-tran/tran-list'"></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-iti .ct-input_inner {
+   border-top-left-radius: 6px !important;
+   border-bottom-left-radius: 6px !important;
    text-align: left !important;
  }
  .ct-Seg .showLabel.ct-radios {
@@ -417,9 +417,9 @@ html {
  
  
  /*主要按钮*/
- .el-button{
+ /* .el-button{
   border: none;
-}
+} */
 /*.el-button:active {
   background-color: #b3caf5;
   border: none;
@@ -433,31 +433,31 @@ html {
 } */
  .el-button--primary {
    background-color: #EE6B6B ;
-   /* border-color: #EE6B6B ; */
+   border-color: #EE6B6B ;
  }
  .el-button--primary:hover ,.el-button--warning:hover{
    background: #f1706b;
-   /* border-color: #f1706b; */
+   border-color: #f1706b;
    color: #FFF;
  }
  .el-button--primary:focus {
    background: #de534d;
-   /* border-color: #de534d; */
+   border-color: #de534d;
    color: #FFF;
  }
  .el-button--success {
    background-color: #EE6B6B ;
-   /* border-color: #EE6B6B ; */
+   border-color: #EE6B6B ;
  }
  
  .el-button--success:focus {
    background: #de534d;
-   /* border-color: #de534d; */
+   border-color: #de534d;
    color: #FFF;
  }
  .el-button--success:hover {
    background: #f1706b;
-   /* border-color: #f1706b; */
+   border-color: #f1706b;
    color: #FFF;
  }
 /* 工具栏按钮置灰 */
@@ -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,12 @@
 }
 .max-cover-list-item .el-input__icon{
     line-height: 40px!important;
-}
+}
+.el-card{
+    border: none;
+}
+.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;
+  }

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/dynamicForm/src/dynamicForm.vue

@@ -224,7 +224,7 @@
         this.model.scripts.$fd = field.id;
         this.model.scripts.$result = [];
 
-        var clickAcion = function (field) {
+        var clickAcion = function (field) {  
           if (field.isSubmit) {
             let verified = true;
             if (self.validExcute()) {
@@ -234,7 +234,7 @@
 
               if (verified) {
                 //action有值，提交到后台
-                if (field.action) {                 
+                if (field.action) {
                   field.disabled = true;//提交按钮禁用
                   self.model.pageDisabled= true;
                   field.doAction(self.getFormObj(), (data) => {
@@ -513,7 +513,7 @@
       getFormObj()
       {
         let formData=this.model.getFormObj();
-        if(this.$route.query.pageStyle)
+        if(this.$route && this.$route.query && this.$route.query.pageStyle)
         {
            return Object.assign(formData,{'pageStyle':this.$route.query.pageStyle});
         }

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')"
+                 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" />
            
-           <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')"
+                 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" />
-            <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>
+          </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,25 +118,25 @@
         }
         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;
         }
       },

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

@@ -35,7 +35,7 @@
                   column.fixed === 'left'?'left-fixation-th':null,
                   column.fixed === 'right'?'right-fixation-th':null,
                   typeof column.fixed === 'undefined'?'right-no-fixation-th':null]"
-                  @mousemove="thMouseMoveHandle($event)" @mousedown="thMouseDownHandle($event,colIndex)"                 
+                  @mousemove="thMouseMoveHandle($event)" @mousedown="thMouseDownHandle($event,colIndex)"
                   v-bind="column.attrs">
 
                 <span>{{column.name}}</span>
@@ -46,21 +46,21 @@
               </th>
 
               <!--<th v-if="model.rowRouter.length > 0" class="ct-td tdFiexd" :class="[-1 === rightShadow?'shadowRight':null]" :style="{'min-width':'20px','transform':'translate('+scrollRight+'px, '+scrollTop+'px)'}">
-              操作
-            </th>-->
+                操作
+              </th>-->
             </tr>
           </thead>
           <!--表体-->
           <tbody>
             <!--这一行仅用于设置未加载数据时的列宽-->
             <!--<tr v-if="model.listData.length === 0" class="ct-tr" style="visibility: hidden;">
-            <td v-if="model.isMulti">
-            </td>
-            <td v-for="(column,colIndex) in model.dataFieldcolumns" class="ct-td" v-if="column.show">
-              <div :style="{'width': column.width + 'px'}">
-              </div>
-            </td>
-          </tr>-->
+              <td v-if="model.isMulti">
+              </td>
+              <td v-for="(column,colIndex) in model.dataFieldcolumns" class="ct-td" v-if="column.show">
+                <div :style="{'width': column.width + 'px'}">
+                </div>
+              </td>
+            </tr>-->
             <!--可视区域的行数据-->
             <tr v-for="(row,rowindex) in model.listData"
                 v-if="pageRowMin <= rowindex && rowindex <= pageRowMax"
@@ -100,10 +100,10 @@
 
                 <!--模版列(启用)-->
                 <!--<component v-else :is="column.template(row).component" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" :vmodel="column.template(row)" :style="{'width': column.width + 'px'}">
-                <template slot="value">
-                  {{row[column.id]}}
-                </template>
-              </component>-->
+                  <template slot="value">
+                    {{row[column.id]}}
+                  </template>
+                </component>-->
               </td>
             </tr>
 
@@ -481,9 +481,8 @@
             var h4 = this.$refs.footer.$el.offsetHeight | 0;
             var h5 = this.$refs.listHeader.$el.offsetHeight | 0;
             var h6 = this.$refs.listFooter.$el.offsetHeight | 0;
-            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - 30;
-            console.log(h1);
-            this.model.tableHeight = tableHeight < 50 ? 350 : tableHeight;
+            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - 22;
+            this.model.tableHeight = tableHeight < 40 ? 350 : tableHeight;
             this.$nextTick(() => {
               self.getScrollAttr();
             });
@@ -641,15 +640,14 @@
       routerClickHandler(field, submitData, action) {
         let self = this;
         action = action || field.action;
-        
+
         var clickAcion = function () {
           //若不是客户端方法，则直接访问接口
           if (!field.isClientFuntion) {
             if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
               submitData = field.getActionPara(submitData).para;
-               if(field.pageStyle)
-              {
-                 submitData.pageStyle=field.pageStyle;
+              if (field.pageStyle) {
+                submitData.pageStyle = field.pageStyle;
               }
               self.$common.getDataDrivenOpts().handler.openTab(action, submitData, field.pageTitle, self.model);
             }
@@ -791,15 +789,14 @@
       calculatingRowHeight() {
         let self = this;
         let count = 0;
-      
+
         //查询出所有没有设置$heigth的数据并重新设置$heigth
-       let notHeigthData=  self.model.listData.filter(item=>{
-           return item.$heigth=== undefined || item.$heigth<=0
+        let notHeigthData = self.model.listData.filter(item => {
+          return item.$heigth === undefined || item.$heigth <= 0
         })
-        if(notHeigthData&&notHeigthData.length>0)
-        {
-           notHeigthData.forEach((v, i) => {
-           if (self.$refs["rows." + i] && self.$refs["rows." + i].length > 0) {
+        if (notHeigthData && notHeigthData.length > 0) {
+          notHeigthData.forEach((v, i) => {
+            if (self.$refs["rows." + i] && self.$refs["rows." + i].length > 0) {
               self.$set(v, "$heigth", self.$refs["rows." + i][0].clientHeight);
             }
           });
@@ -853,7 +850,7 @@
         if (self.model.checkCloseTabThen(ev.notification)) {
           self.model.doAction(ev);
           self.$forceUpdate();
-          self.$refs.footer.$forceUpdate();        
+          self.$refs.footer.$forceUpdate();
         }
       }
     },
@@ -1049,7 +1046,8 @@
     width: 20px;
     left: 0px;
   }
-  .ct-table .checkbox-td .checkbox-td-1{
-    vertical-align: inherit;
-  }
+
+    .ct-table .checkbox-td .checkbox-td-1 {
+      vertical-align: inherit;
+    }
 </style>

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/dynamicSos/src/dynamicSos.vue

@@ -166,7 +166,6 @@
         this.$set(this, 'focus', false);
       },
       clickHandle: function () {
-         debugger;
         if (this.model.lock) {
           return false;
         }
@@ -223,7 +222,6 @@
         }
       },
       selectOption(value) {
-        debugger;
         if (this.model.value === value) {
           //this.model.value = '';
           this.$set(this, 'showDrop', false);

package/src/centaline/dynamicTree/src/dynamicTreeList.vue

@@ -1,11 +1,13 @@
 <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:#eceff2">
+  <div id="app-Tree" style="height:100%;">
+    <el-container style="height:  calc(100vh - 98px);width:100vw; border: 1px solid #eee">
+      <el-aside width="200px" style="background-color:white">
         <ct-searchtree :flagsearch="true" :searchConditionApi="searchConditionApi" :searchDataApi="searchDataApi" @loaded="loaded"></ct-searchtree>
       </el-aside>
       <el-main v-if="isShowSearchlist">
-        <ct-searchlist :searchConditionApi="searchTableConditionApi" :searchDataApi="searchTableDataApi" :api-param="apiParam"></ct-searchlist>
+        <div style="height: calc(100vh - 98px);overflow-y: auto;">
+          <ct-searchlist :searchConditionApi="searchTableConditionApi" :searchDataApi="searchTableDataApi" :api-param="apiParam"></ct-searchlist>
+        </div>
       </el-main>
     </el-container>
   </div>
@@ -42,10 +44,10 @@
       loaded(data) {
         var self = this;
         self.isShowSearchlist = false;
-        if (data&&data.rowRouter) {
+        if (data && data.rowRouter) {
           self.searchTableConditionApi = data.rowRouter.getLayoutOfSearch;
           self.searchTableDataApi = data.rowRouter.getList;
-          var defaultPara = self.$common.deepClone(data); 
+          var defaultPara = self.$common.deepClone(data);
           delete defaultPara.rowRouter;
           delete defaultPara.getLayoutOfSearch;
           delete defaultPara.getList;
@@ -55,7 +57,7 @@
           });
         }
       },
-      
+
     },
     created() {
       this.model = this.vmodel;
@@ -63,3 +65,13 @@
   }
 
 </script>
+<style lang="scss">
+  #app-Tree .el-main {
+    padding: 0 0px 0px 10px;
+  }
+    #app-Tree .el-main .ct-searchtable {
+      margin-top: 0px;
+    }
+
+ 
+</style>

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

@@ -233,11 +233,15 @@ const Base = function (source) {
     getFormParentFieldPara() {
       if (rtn.form && typeof rtn.parentField !== 'undefined' && rtn.parentField.length > 0) {
         if (typeof rtn.form.getRefFieldPara === 'function') {
-          return JSON.stringify(rtn.form.getParentFieldPara(rtn.parentField));
+          return rtn.form.getParentFieldPara(rtn.parentField);
         }
       }
       return null;
     },
+    /*选择搜索条件后是否默认显示标签*/
+    get dlfs() {
+      return source.dlfs;
+    },
   };
 
   return rtn;

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

@@ -624,7 +624,18 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         parentFieldNameArr.forEach((v) => {
           submitData[v] = tempFormData[v];
         });
-        return submitData;
+        
+        if(JSON.stringify(submitData) == "{}"){
+          return '';
+        }
+        else{
+          if(parentFieldNameArr.length>1){
+            return JSON.stringify(submitData);
+          }
+          else{
+            return submitData[parentFieldNameArr[0]];
+          }
+        }
       },
       //检查是否关闭tab后触发来源页面操作
       checkCloseTabThen(notification) {

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

@@ -20,7 +20,7 @@ const Iti = function (source) {
     },
     
     get value1() {
-      return source.code2;
+      return source.code2||'';
     },
     set value1(v) {
       source.code2 = v;

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

@@ -185,7 +185,17 @@ const SearchScreen = function (source, callBack, screenPara) {
             if(n.fieldName1==v)submitData[v] = n.searchValue1;
           });
         });
-        return submitData;
+        if(JSON.stringify(submitData) == "{}"){
+          return '';
+        }
+        else{
+          if(parentFieldNameArr.length>1){
+            return JSON.stringify(submitData);
+          }
+          else{
+            return submitData[parentFieldNameArr[0]];
+          }
+        }
       },
     };
     return rtn;
@@ -195,8 +205,6 @@ 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.title='XXXXXXXXXXX';
-          response.content.flagShowTitle=true;
           var rtn = init(response);
           if (callBack) {
             callBack(rtn);

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 && source.dlfs) {
         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 && source.dlfs) {
         return rtn.attrs.placeholder + ":" + source.name1;
       }
       return source.name1;

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';

package/src/main.js

@@ -27,7 +27,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'faefb8a4-f885-4f49-a0fc-dc6c0943bf4a',
+        oldToken: 'd09609ec-e13a-4b97-8c15-e003b1c36cbc',
         estateId: '20210729104021C49F04B55C50F6AF58',
       };
     },