centaline-data-driven 1.5.24 → 1.5.25

package/package.json

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

package/release-log.md

@@ -1,3 +1,28 @@
+## v1.5.25
+2023-06-19
+
+优化
+
+优化树状组件列表页表格高度计算问题
+
+时间区间组件新增单独每个时间必填校验以及placeholder显示
+
+toolButtons打开列表时，支持queryString传参
+
+Checkbox按钮
+
+详情页展开优化
+
+列表统计栏，点击更多里面的选项，体验优化
+ 
+bug修复
+
+解决侧边栏表格tab宽度计算问题
+
+解决ccai在列表和弹层中固定按钮位置不同问题
+
+mo默认值bug处理
+
 ## v1.5.24
 2023-06-13
  

package/src/SearchList.vue

@@ -14,10 +14,10 @@
       :searchDataApi="'/api/transaction/adjustRecord/getTableList'">
     </ct-searchlist> -->
 
-    <ct-searchlist :apiParam="para"
+    <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/api/transfer_subscribe_master/layout'" 
       :searchDataApi="'/api/transfer_subscribe_master/transferSubscribeMasterList'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/wf/todo/wx/layout'" 
@@ -42,11 +42,11 @@
       :searchDataApi="'/RightValueList/getListOfSearchModel'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist 
+    <ct-searchlist 
       :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" 
-      :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" 
+      :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" :searchStatsApi="'/PropertyPublishList/getListStatsForRET'"
       :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
-    </ct-searchlist> -->
+    </ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"

package/src/centaline/css/ccai.css

@@ -2,10 +2,14 @@
    padding-top: 0px;
    padding-bottom: 0;
 }
-.ccai.button-absolute{
-   bottom: 26px;
-   width: calc(100% - 47px);
+#form-app .ccai.button-absolute{
+   /* bottom: 26px; */
+   width: calc(100% - 52px);
+   margin-bottom: 20px;
 }
+.btnPadBom {
+   padding-bottom: 4px !important;
+ }
 .ccai.ct-tags .ct-tags-mini{
 font-size: 12px !important;
 }
@@ -17,4 +21,5 @@ font-size: 12px !important;
  }
 .ccai .ccai-aside.el-aside{
    padding: 0 !important;
- }
+ }
+ 

package/src/centaline/css/common.css

@@ -706,6 +706,10 @@ html {
 .el-tabs__nav .el-tabs__item.is-active{
   color: var(--chinaRed);
   border-bottom: 3px solid var(--chinaRed);
+} 
+.el-tabs__item:focus.is-active.is-focus:not(:active) {
+  box-shadow: none !important;
+  border-radius: 3px;
 }
 .el-tabs__active-bar{
   background-color: var(--chinaRed);

package/src/centaline/dynamicBtn/src/dynamicBtn.vue

@@ -50,6 +50,9 @@
       <span v-else slot="reference">{{model.label}}</span>
     </el-popover>
   </el-button>
+  <el-checkbox v-else-if="model.isCheckbox" v-model="model.code1" @change="clickHandle">
+    {{model.label}}
+  </el-checkbox>
   <el-button v-else  class="max"
     :type="model.isHyperLink ? 'text' : 'primary'"
     v-bind="model.attrs" @click="clickHandle"
@@ -57,7 +60,7 @@
     :icon="model.icon"
     :disabled="model.disabled || model.locked">
     <div v-if="flagAppMode" :title="model.label">
-      <img  :src="model.imgUrl" :height="model.buttonHeight+'px'"/>
+      <img :src="model.imgUrl" :height="model.buttonHeight+'px'"/>
       <div style="margin-top:5px;" class="labelText">{{model.label}}</div>
     </div>
     <div v-else>

package/src/centaline/dynamicContact/src/dynamicContact.vue

@@ -237,7 +237,7 @@ export default {
                 attrs: {
                   searchConditionApi: field.actionForSearchLayout,
                   searchDataApi: field.actionForSearch,
-                  apiParam: submitData,
+                  apiParam: field.getActionPara(submitData).para,
                   width: field.dialogWidth + 'px',
                   height: field.dialogHeight + 'px'
                 },

package/src/centaline/dynamicDetail/src/dynamicContactList.vue

@@ -371,7 +371,7 @@
                   attrs: {
                     searchConditionApi: field.actionForSearchLayout,
                     searchDataApi: field.actionForSearch,
-                    apiParam: submitData,
+                    apiParam: field.getActionPara(submitData).para,
                     width: field.dialogWidth + 'px',
                     height: field.dialogHeight + 'px'
                   },

package/src/centaline/dynamicDetail/src/dynamicDetail.vue

@@ -22,8 +22,8 @@
       :apiParam="apiParam" :pageHeight="listHeight+'px'" @tableLoaded="loaded">
       </ct-SearchList>
 
-      <div v-if="pageType=='Form'" style="overflow: auto;" :style="{height:listHeight+'px'}">
-        <ct-form :api="api" :apiParam="apiParam" @loaded="loaded">
+      <div ref="detailForm" v-if="pageType=='Form'" style="overflow: auto;" :style="{height:(listHeight-5)+'px'}">
+        <ct-form :api="api" :apiParam="apiParam" @loaded="loaded" :flagScroll="'true'" :drowerClose="drowerClose">
         </ct-form>
       </div>
 
@@ -85,7 +85,7 @@
       simpleRouterclickHandler(field,data) {
         this.$emit('simpleRouterclickHandler',field,data);
       },
-      loaded(model) {        
+      loaded(model) {
         //通知父组件加载完成
         this.$emit('loaded',model);
       },

package/src/centaline/dynamicDetail/src/dynamicEstateBuildingDetail.vue

@@ -729,7 +729,7 @@ export default {
                   attrs: {
                     searchConditionApi: field.actionForSearchLayout,
                     searchDataApi: field.actionForSearch,
-                    apiParam: submitData,
+                    apiParam: field.getActionPara(submitData).para,
                     width: field.dialogWidth + "px",
                     height: field.dialogHeight + "px",
                   },

package/src/centaline/dynamicDetail/src/dynamicEstateSimpleDetail.vue

@@ -519,7 +519,7 @@ export default {
                 attrs: {
                   searchConditionApi: field.actionForSearchLayout,
                   searchDataApi: field.actionForSearch,
-                  apiParam: submitData,
+                  apiParam: field.getActionPara(submitData).para,
                   width: field.dialogWidth + 'px',
                   height: field.dialogHeight + 'px'
                 },

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -932,7 +932,7 @@ export default {
                   attrs: {
                     searchConditionApi: field.actionForSearchLayout,
                     searchDataApi: field.actionForSearch,
-                    apiParam: submitData,
+                    apiParam: field.getActionPara(submitData).para,
                     width: field.dialogWidth + "px",
                     height: field.dialogHeight + "px",
                   },

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -942,7 +942,7 @@ export default {
                   attrs: {
                     searchConditionApi: field.actionForSearchLayout,
                     searchDataApi: field.actionForSearch,
-                    apiParam: submitData,
+                    apiParam: field.getActionPara(submitData).para,
                     width: field.dialogWidth + "px",
                     height: field.dialogHeight + "px",
                   },

package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -519,7 +519,7 @@ export default {
                 attrs: {
                   searchConditionApi: field.actionForSearchLayout,
                   searchDataApi: field.actionForSearch,
-                  apiParam: submitData,
+                  apiParam: field.getActionPara(submitData).para,
                   width: field.dialogWidth + 'px',
                   height: field.dialogHeight + 'px'
                 },

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -74,8 +74,9 @@
         </el-row>
         <el-row v-if="model.buttons.findIndex((v)=>{return v.show}) > -1" :class="isScroll?'ccai button-absolute':'button-initial'"
                 :style="{'max-width':pageWidth?(pageWidth-20)+'px':'100%'}">
-          <el-col :span="24" style="text-align:center;padding-bottom: 1px;">
-            <component v-for="(btn, index) in model.buttons" :key="index" :is="btn.is" :vmodel="btn" @click="clickHandler" v-if="btn.show"></component>
+          <el-col :span="24" style="text-align:center;padding-bottom: 1px;padding-left: 5px;padding-right: 5px;" class="btnPadBom">
+            <component v-for="(btn, index) in model.buttons" :key="index" :is="btn.is" :vmodel="btn" @click="clickHandler" v-if="btn.show"
+              :style="{'float':btn.isCheckbox ? btn.alignCss:''}"></component>
           </el-col>
         </el-row>
         <div v-if="isScroll" style="height: 34px;"></div>
@@ -124,6 +125,10 @@
         Boolean,
         default: false,
       },
+      drowerClose:{
+        String,
+        default: 'close',
+      },
     },
     data() {
       return {
@@ -147,10 +152,13 @@
       this.setCss();
     },
     updated() {
-      if (this.$el.parentElement.scrollHeight > this.$el.parentElement.clientHeight
-        && this.model && (!this.model.isHorizontalLayout || this.flagScroll)) {
-        this.isScroll = true;
-      }
+      this.$nextTick(() => {
+        let parentDom=this.$el.parentElement;
+        if (parentDom.scrollHeight > parentDom.clientHeight
+          && this.model && (!this.model.isHorizontalLayout || this.flagScroll)) {
+          this.isScroll = true;
+        }
+      });
     },
     methods: {
       init() {
@@ -163,6 +171,9 @@
         this.independentItem.splice(0, this.independentItem.length);
 
         this.$nextTick(function () {
+          if(this.drowerClose && this.drowerClose=='open'){
+            return;
+          }
           if (typeof self.api !== 'undefined') {
             self.loaderObj.Form(self.api, self.load, this.apiParam, self.failLoad);
           }
@@ -1096,13 +1107,17 @@
       },
       tabClickHandler(){
         this.$nextTick(() => {
-          if (this.$el.parentElement.scrollHeight > this.$el.parentElement.clientHeight
-          && this.model && (!this.model.isHorizontalLayout || this.flagScroll)) {
-            this.isScroll = true;
-          }
-          else{
-            this.isScroll = false;
-          }
+          // if (this.$el.parentElement.scrollHeight > this.$el.parentElement.clientHeight
+          // && this.model && (!this.model.isHorizontalLayout || this.flagScroll)) {
+          //   this.isScroll = true;
+          // }
+          // else{
+          //   this.isScroll = false;
+          // }
+        });
+      },
+      refreshPage() {
+        this.$nextTick(() => {
         });
       },
     }

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

@@ -247,6 +247,7 @@
       },
       tableLoaded() {
         var self = this;
+        this.title=this.$refs.table.model.title;
         if (typeof this.$refs.table.model.cellLayout !== "undefined") {
           this.$refs.screen.LoadLayout();
         }
@@ -274,7 +275,7 @@
             this.selectIndex=-1;
 
             if (typeof window.localStorage !== "undefined" && !this.sideBarStatus) {
-              var tagkey = window.localStorage.getItem(this.sideBarPageType+"key");
+              var tagkey = window.localStorage.getItem(this.sideBarPageType+"key"+this.title);
               this.sideBarStatus=tagkey;
             }
 
@@ -349,7 +350,7 @@
             }
           }
         }
-        window.localStorage.setItem(this.sideBarPageType+"key", this.sideBarStatus);
+        window.localStorage.setItem(this.sideBarPageType+"key"+this.title, this.sideBarStatus);
         this.$refs.table.setTableHeight();
       },
       refreshPage(pageHeight) {

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

@@ -721,7 +721,7 @@ export default {
           var h1 = this.$refs.searchTable.parentElement.offsetHeight | 0;
           var h2 = this.$refs.searchTable.offsetTop | 0;
           if(this.from && this.from=='detail'){
-            h2=h2-this.screenTop-22;
+            h2=h2-this.screenTop - 13;
           }
           var h3 = this.$refs.toolbar.$el.offsetHeight | 0;
           var h4 = this.$refs.footer.$el.offsetHeight | 0;
@@ -729,7 +729,12 @@ export default {
           var h6 = this.$refs.listFooter.$el.offsetHeight | 0;
           var h7 = this.$refs.tableStats ? (this.$refs.tableStats.$el.offsetHeight + 7) | 0 : 0;
           var h8 = this.$refs.popupButton ? this.$refs.popupButton.offsetHeight + 21 : 0;
-          let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 - 8;
+          var h9 = 0
+          if (this.$parent.$parent.$parent.$children[0].$el.classList.contains('el-aside')) {
+            h9 = 4
+          }
+          let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 + h9 - 8 ;
+          
           this.model.tableHeight = tableHeight < 40 ? 350 : tableHeight;
           this.$nextTick(() => {
             self.getScrollAttr();
@@ -766,6 +771,8 @@ export default {
               h7 = this.$refs.listHeader.$el.offsetHeight | 0;
             }
             var h8 = this.$refs.tableStats ? (this.$refs.tableStats.$el.offsetHeight + 7) | 0 : 0;
+
+           
             let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 - 290 -7;
             if(this.flagAppMode){
               tableHeight = tableHeight + 40;
@@ -1151,11 +1158,9 @@ export default {
                               showClose:true,
                             });
                           }
-                          if(!field.isExport)
-                          {
+                          if(!field.isExport){
                              self.getPage(1);
-                          }
-                          
+                          }                          
                         },
                         error(data) {
                           self.$common.closeDialog(dialogOption.dialog);
@@ -1278,7 +1283,7 @@ export default {
                     attrs: {
                       searchConditionApi: field.actionForSearchLayout,
                       searchDataApi: field.actionForSearch,
-                      apiParam: submitData,
+                      apiParam: field.getActionPara(submitData).para,
                       width: field.dialogWidth + "px",
                       height: field.dialogHeight + "px",
                       documentHeight: self.documentHeight,
@@ -1309,7 +1314,7 @@ export default {
                     attrs: {
                       searchConditionApi: field.actionForSearchLayout,
                       searchDataApi: field.actionForSearch,
-                      apiParam: submitData,
+                      apiParam: field.getActionPara(submitData).para,
                       width: field.dialogWidth + "px",
                       height: field.dialogHeight + "px",
                     },
@@ -1562,7 +1567,7 @@ export default {
                     attrs: {
                       searchConditionApi: field.actionForSearchLayout,
                       searchDataApi: field.actionForSearch,
-                      apiParam: submitData,
+                      apiParam: field.getActionPara(submitData).para,
                       width: field.dialogWidth + "px",
                       height: field.dialogHeight + "px",
                     },
@@ -1591,7 +1596,7 @@ export default {
                     attrs: {
                       searchConditionApi: field.actionForSearchLayout,
                       searchDataApi: field.actionForSearch,
-                      apiParam: submitData,
+                      apiParam: field.getActionPara(submitData).para,
                       width: field.dialogWidth + "px",
                       height: field.dialogHeight + "px",
                     },

package/src/centaline/dynamicSearchList/src/dynamicTableStats.vue

@@ -46,7 +46,7 @@
           v-for="(item, index) in showData[0]"
           @click="handleClick($event, item,true)"
         >
-          <ul class="btnTab">
+          <ul class="btnTab" :style="{'width':(index == showData[0].length-1 ? lastWidth + 'px' : '' ),'white-space':(index == showData[0].length-1 ? 'nowrap' : '' )}">
             <li
               :class="[
                 selectStats ==item.fieldName1 + '*' + item.code1 
@@ -82,7 +82,7 @@
             <div
               class="popovertablf"
               v-for="(item, index) in showData[1]"
-              @click="handleClick($event, item,true)"
+              @click="handleClick($event, item,true,1,index)"
             >
               <ul class="popoverbtnTab" style="padding: 0px">
                 <li
@@ -140,6 +140,8 @@ export default {
       selectStats: [],
       data: [],
       showData: [],
+      lastWidth:0,
+      sortData: null,
       option: {
         isHidden: true, //是否开启操作栏隐藏设置，默认开启
         showNum: 3, //如果isHidden为true时，个数大于3就会隐藏，默认是3
@@ -154,10 +156,10 @@ export default {
     var self = this;
     self.showWidth =
       self.$refs.tableStatistics.offsetWidth || document.body.clientWidth;
-    window.onresize = () => {
+      window.addEventListener('resize', function () {
       self.showWidth =
         self.$refs.tableStatistics.offsetWidth || document.body.clientWidth;
-    };
+    });
   },
   methods: {
     load(data) {
@@ -166,12 +168,29 @@ export default {
       self.FlagStatistics = false;
       self.data = data.source.content;
       self.selectVa = "";
-      if (self.data.length > 0) {
-
+ if (self.data.length > 0) {
+        if (self.sortData == null) {
+          self.sortData = {};
+          self.data.forEach((item, index) => {
+            self.sortData[item.fieldName1 + "*" + item.code1] = index;
+            item.sort = index;
+          });
+        }
+        else {
+          self.data.forEach((item, index) => {
+            item.sort = self.sortData[item.fieldName1 + "*" + item.code1];
+          });
+        }
+        self.data.sort(function (a, b) {
+          if (a.sort > b.sort) {
+            return 1; // 交换顺序
+          } else {
+            return -1; // 顺序不变
+          }
+        });
         let i = self.data.findIndex(
           (v) => self.selectStats === v.fieldName1 + "*" + v.code1 
         );
-
         if (i == -1 || self.selectStats == []) {
           self.handleClick(null, self.data[0], false);
         }
@@ -187,13 +206,16 @@ export default {
           var sumWidth = 0;
           for (var i = 0; i < self.data.length; i++) {
             var moreWidth = 20;
-            sumWidth =
-              sumWidth + self.$refs["StatisticsItem" + i][0].offsetWidth;
+            // sumWidth =
+            //   sumWidth + self.$refs["StatisticsItem" + i][0].offsetWidth;
+              sumWidth += self.$refs["StatisticsItem" + i][0].getBoundingClientRect().width;
+              sumWidth = Math.ceil(sumWidth * 100) / 100;
             var nextWidth = 0;
             if (i + 1 < self.data.length) {
               try {
-                nextWidth =
-                  self.$refs["StatisticsItem" + (i + 1)][0].offsetWidth;
+                // nextWidth = self.$refs["StatisticsItem" + (i + 1)][0].offsetWidth;
+                nextWidth = self.$refs["StatisticsItem" + (i + 1)][0].getBoundingClientRect().width;
+                nextWidth = Math.ceil(nextWidth * 100) / 100;
               } catch (e) {}
             } else {
               moreWidth = 0;
@@ -207,6 +229,9 @@ export default {
             }
           }
           if (showIndex > 0) {
+            const ExceptShowIndexWidth = self.$refs["StatisticsItem"+(showIndex)][0].offsetLeft;
+            const preShowIndexWidth =self.$refs["StatisticsItem" + (showIndex-1)][0].getBoundingClientRect().width;
+           self.lastWidth=self.showWidth-ExceptShowIndexWidth + preShowIndexWidth -20;
             self.showData = [
               self.data.slice(0, showIndex),
               self.data.slice(showIndex),
@@ -219,9 +244,9 @@ export default {
         self.$emit("setTableHeight");
       });
     },
-    handleClick(ev, obj, flagRefreshTable) {
+    handleClick(ev, obj, flagRefreshTable,type,index) {
       var self = this;
-      self.selectStats = obj.fieldName1 + "*" + obj.code1 
+      self.selectStats = obj.fieldName1 + "*" + obj.code1 ;
       var fields = self.model.searchData(
         obj.fieldName1,
         obj.code1,
@@ -232,6 +257,14 @@ export default {
         searchData: fields,
       };
       self.$emit("searchStats", model, flagRefreshTable);
+      if (type===1) {
+       let lastItemIndex = self.showData[0].length - 1;
+       let lastItem = self.showData[0][lastItemIndex];
+       self.showData[0][lastItemIndex]=obj;
+       self.showData[1][index]=lastItem;
+       self.sortData[lastItem.fieldName1 + "*" + lastItem.code1]=obj.sort;
+       self.sortData[obj.fieldName1 + "*" + obj.code1]=lastItem.sort;
+      }
     },
     searchStatsComplate(selectItem) {
       var self = this;
@@ -272,7 +305,7 @@ export default {
 .tab-list .btnTab {
   font-size: 14px !important;
   font-weight: bold;
-  padding: 0px 20px 0px 20px;
+  padding: 0px 18px;
   cursor: pointer;
   float: left;
   list-style-type: none;

package/src/centaline/dynamicSearchListTab/src/dynamicSearchListOne.vue

@@ -218,6 +218,7 @@
       },
       tableLoaded() {
         var self = this;
+        this.title=this.$refs.table.model.title;
         if (typeof this.$refs.table.model.cellLayout !== "undefined") {
           this.$refs.screen.LoadLayout();
         }
@@ -242,7 +243,7 @@
             this.selectIndex=-1;
 
             if (typeof window.localStorage !== "undefined" && !this.sideBarStatus) {
-              var tagkey = window.localStorage.getItem(this.sideBarPageType+this.categorySource+"key");
+              var tagkey = window.localStorage.getItem(this.sideBarPageType+this.categorySource+"key"+this.title);
               this.sideBarStatus=tagkey;
             }
 
@@ -316,7 +317,7 @@
             }
           }
         }
-        window.localStorage.setItem(this.sideBarPageType+this.categorySource+"key", this.sideBarStatus);
+        window.localStorage.setItem(this.sideBarPageType+this.categorySource+"key"+this.title, this.sideBarStatus);
         this.$refs.table.setTableHeight();
       },
       closeSideHandler() {

package/src/centaline/dynamicTimeSelect/src/dynamicTimeSelect.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="field-top">
-    <div style="width:100%" v-if="model !== null" class="ct-Dtd" :class="[model.attrs.size?'ct-Dtd-'+model.attrs.size:'']">
+    <div style="width:100%;display: flex;" v-if="model !== null" class="ct-Dtd" :class="[model.attrs.size?'ct-Dtd-'+model.attrs.size:'']" >
       <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">
+        <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
           {{model.label}}
         </div>
         <div class="ct-datepicker" style="width:100%" v-if="model !== null&&model.valueFormat=='HH:mm'" :class="[model.showLabel?'showLabel':'']">
@@ -10,7 +10,7 @@
                           v-bind="model.attrs"
                           @change="changeModel($event)"
                           @clear="changeModel($event)"
-                          :placeholder="model.placeholder"
+                          :placeholder="model.attrs.placeholder1"
                           :disabled="model.lock"
                           :picker-options="{
                             start:  model.min,
@@ -23,7 +23,7 @@
                           v-bind="model.attrs"
                           @change="changeModel($event)"
                           @clear="changeModel($event)"
-                          :placeholder="model.placeholder1"
+                          :placeholder="model.attrs.placeholder2"
                           :disabled="model.lock"
                           :picker-options="{
                             start: model.min,
@@ -36,21 +36,21 @@
         <div class="ct-datepicker" style="width:100%" v-else-if="model !== null" :class="[model.showLabel?'showLabel':'']">
           <el-time-picker class="ct-date-picker-editor" v-model="model.value"
                           v-bind="model.attrs" value-format="HH:mm:ss"
-                          :placeholder="model.placeholder" :disabled="model.lock"
+                          :placeholder="model.attrs.placeholder1" :disabled="model.lock"
                           @change="changeModel($event)" @clear="changeModel($event)"      
                            >
           </el-time-picker>
           <span v-if="model.isRange" class="ct-date-picker-span">-</span>
           <el-time-picker v-if="model.isRange" class="ct-date-picker-editor" v-model="model.value1"
                           v-bind="model.attrs" value-format="HH:mm:ss"                          
-                          :placeholder="model.placeholder1" :disabled="model.lock"
+                          :placeholder="model.attrs.placeholder2" :disabled="model.lock"
                           @change="changeModel($event)" @clear="changeModel($event)"    
                           >
           </el-time-picker>
         </div>
       </div>
       <transition name="el-fade-in">
-        <span v-show="!valid" class="errorMessage">
+        <span v-show="!valid"  class="errorMessage">
           {{validMessage}}
         </span>
       </transition>
@@ -69,7 +69,7 @@
     },
     data() {
       return {
-
+        validMessage:""
       };
     },
     mounted() {
@@ -107,6 +107,17 @@
         this.inputHandler(event);
         this.changeHandler(event);
       },
+      //不能共用的数据校验   单独每一个时间框的非空校验
+      selfValidExcute: function (eventName) {
+        if (eventName === "input"||eventName === "valid") {
+          if (this.model.value1 == "" || this.model.value== ""|| this.model.value== null || this.model.value1== null) {
+            this.valid = false;
+            this.validMessage = "必填"
+            return false;
+          }
+        }
+        return true;
+      }, 
     }
   }
 </script>

package/src/centaline/dynamicTree/src/dynamicSearchTree.vue

@@ -301,7 +301,7 @@ export default {
                     attrs: {
                       searchConditionApi: field.actionForSearchLayout,
                       searchDataApi: field.actionForSearch,
-                      apiParam: submitData,
+                      apiParam: field.getActionPara(submitData).para,
                       width: field.dialogWidth + "px",
                       height: field.dialogHeight + "px",
                     },
@@ -330,7 +330,7 @@ export default {
                     attrs: {
                       searchConditionApi: field.actionForSearchLayout,
                       searchDataApi: field.actionForSearch,
-                      apiParam: submitData,
+                      apiParam: field.getActionPara(submitData).para,
                       width: field.dialogWidth + "px",
                       height: field.dialogHeight + "px",
                     },