centaline-data-driven 1.5.27 → 1.5.29

package/package.json

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

package/release-log.md

@@ -1,3 +1,27 @@
+## v1.5.29
+2023-06-30
+
+bug修复
+
+列表没有数据，新增数据后，右侧详情页不展开bug处理
+
+列表统计栏点击查询时tab顺序变动问题处理
+
+## v1.5.28
+2023-06-30
+
+优化
+
+电话拨号控件
+
+表单列表弹层新增修改时，数字区间、时间区间、多选等控件显示优化
+
+表单列表的列是组类型过滤不显示
+
+列表合并行，滚动加载后要重新计算
+
+呼叫任务右侧栏固定按钮左对齐优化
+
 ## v1.5.27
 2023-06-27
 
@@ -11,6 +35,8 @@ formData添加submit方法
 
 列表行删除完后，要关闭右侧
 
+呼叫任务右侧栏固定按钮左对齐优化
+
 ## v1.5.26
 2023-06-21
 

package/src/SearchList.vue

@@ -4,10 +4,10 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     
-    <!-- <ct-searchlist :apiParam="para"
-      :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" 
-      :searchDataApi="'/api/third-dept-tran/tran-list'">
-    </ct-searchlist> -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/tran-list/layout'"  :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
+
+    <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-layout'"  :searchDataApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-list'"></ct-searchlist>
+
 
     <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/api/transaction/adjustRecord/getLayoutOfSearch'" 
@@ -60,6 +60,8 @@
       :searchStatsApi="'/PropertyOFIList/getListStats'">
     </ct-searchlist> -->
 
+    <!-- <ct-searchlist :searchConditionApi="'/CustomerList/getLayoutOfSearch'" :searchStatsApi="'/CustomerList/getListStats'" :searchDataApi="'/CustomerList/getListOfSearchModel'"></ct-searchlist> -->
+
     <!-- <ct-searchlist :searchConditionApi="'/EstateList/getLayoutOfSearch'" :searchDataApi="'/EstateList/getListOfSearchModel'"></ct-searchlist> -->
     
     <!-- <ct-searchlist :searchConditionApi="'/EstateBuildingList/getLayoutOfSearch'" :searchDataApi="'/EstateBuildingList/getListOfSearchModel'"></ct-searchlist> -->
@@ -68,7 +70,7 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/CustomerImportList/getLayoutOfSearch'" :searchDataApi="'/CustomerImportList/getListOfSearchModel'"></ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" :searchDataApi="'/CallTaskList/getListOfSearchModel'"></ct-searchlist>
+    <!-- <ct-searchlist :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" :searchDataApi="'/CallTaskList/getListOfSearchModel'"></ct-searchlist> -->
     
     <!-- <ct-searchlist :searchConditionApi="'/RoleList/getLayoutOfSearch'" :searchStatsApi="'/RoleList/getListStats'" :searchDataApi="'/RoleList/getListOfSearchModel'"></ct-searchlist> -->
 

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

@@ -1,8 +1,9 @@
 <template>
-  <div ref="contact" id="contactWidth" v-if="apiRouter !== {} && model && model.listData.length > 0" style="border: 1px solid #ECEFF2;box-shadow: 0 2px 4px 0 rgba(0,0,0,0.06);border-radius: 6px;
-    padding-bottom: 10px;padding-top: 10px;padding-left: 10px;display: flex;font-size: 12px;width:100%">
-    <div class="ct-so"
-      style="width:auto;margin-right: 10px;flex:1;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+  <div ref="contact" id="contactWidth" v-if="model && model.listData.length > 0" :class="[from=='form'?'ct-contact-form':'ct-contact']">
+    <div v-if="from=='form' && model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
+      {{model.label}}
+    </div>
+    <div class="ct-so" style="width:auto;margin-right: 10px;flex:1;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
       <el-popover ref="pop" placement="bottom-start" v-model="showDrop" trigger="click">
         <div>
           <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
@@ -14,7 +15,7 @@
           @change="changeHandler($event)" :disabled="model.lock"
           :class="model.lock ? 'ct-is-disabled' : 'ct-input_inner'"></div>
       </el-popover>
-      <span class="el-input__suffix" @click="clickHandle"
+      <span class="el-input__suffix" @click="clickHandle" :style="{top:'-4px'}"
         :class="[model.attrs.size ? 'el-input--' + model.attrs.size : '']">
         <span class="el-input__suffix-inner">
           <i class="el-select__caret el-input__icon el-icon-arrow-up" :class="{ 'is-reverse': showDrop }"></i>
@@ -43,11 +44,16 @@ export default {
   },
   props: {
     vmodel: Object,
+    source: Object,
     api: String,
     apiParam: Object,
     apiRouter: {
       Object,
-      default: {}
+      default: null
+    },
+    from: {
+      String,
+      default: ''
     },
   },
   data() {
@@ -71,9 +77,7 @@ export default {
       else if (typeof self.api !== 'undefined' && self.apiParam) {
         self.loaderObj.Contact(self.api, self.apiParam, self.load);
       }
-
     });
-
   },
   activated() {
     this.$nextTick(() => {
@@ -340,4 +344,20 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.ct-contact{
+  border: 1px solid #ECEFF2;
+  box-shadow: 0 2px 4px 0 rgba(0,0,0,0.06);
+  border-radius: 6px;
+  padding-bottom: 10px;
+  padding-top: 10px;
+  padding-left: 10px;
+  display: flex;
+  font-size: 12px;
+  width:100%
+}
+.ct-contact-form{
+  display: flex;
+  font-size: 12px;
+  width:100%
+}
 </style>

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

@@ -1141,6 +1141,7 @@
     z-index: 100;
     /* bottom: 6px; */
     bottom: 0;
+    left: 0;
     border-radius: 0 0 4px 4px;
     position: absolute;
     line-height: 34px;
@@ -1148,6 +1149,5 @@
     width: 100%;
     margin: auto;
     box-shadow: 0 2px 20px 0 rgb(0 0 0 / 10%);
-    margin-left: -20px;
   }
 </style>

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

@@ -17,7 +17,7 @@
           <el-table size="mini" class="max-table--border" :data="model.tableData" :key="itemKey" border 
             style="width: 100%" highlight-current-row :show-summary="model.showSummary" :summary-method="getSummaries">
              <!--数据列-->
-            <el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" v-if="v.show !== false" :render-header="renderHeader" :min-width="tableColumnWith">
+            <el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" v-if="v.show !== false && v.type!==13" :render-header="renderHeader" :min-width="tableColumnWith">
               <template slot="header" slot-scope="scope">
                 <div :class="[{'ct-table-required':v.required&&model.rows[0].edit&& model.rows[0].delete&&!model.tableDisabled},getHeadClass(v)]">
                   {{v.label}}
@@ -93,18 +93,58 @@
       },
       getLableShow(){
         let labelShow=this.vmodel.labelValue;
-        if(this.vmodel.unitName){
+        if(labelShow && this.vmodel.unitName){
           labelShow=labelShow+this.vmodel.unitName;
         }
-        if(this.vmodel.type===6){
-          if(this.vmodel.code2){
-            labelShow=this.vmodel.labelValue+this.vmodel.code2;
-          }
-        }
-        else if(this.vmodel.type===4){
-          if(this.vmodel.name1){
-            labelShow=this.vmodel.name1;
-          }
+        switch(this.vmodel.type){
+          case 6:
+          case 7:
+            if(this.vmodel.code2){
+              labelShow=this.vmodel.labelValue+this.vmodel.code2;
+            }
+            break;
+          case 4:
+          case 24:
+            if(this.vmodel.name1){
+              labelShow=this.vmodel.name1;
+            }
+            break;
+          case 19:
+            if(this.vmodel.code1 && this.vmodel.code2){              
+            }
+            else if(this.vmodel.code1){
+              labelShow=this.vmodel.code1+(this.vmodel.unitName?this.vmodel.unitName:'')+'以上';
+            }
+            else if(this.vmodel.code2){
+              labelShow=this.vmodel.code2+(this.vmodel.unitName?this.vmodel.unitName:'')+'以下';
+            }
+            break;
+          case 20:
+          case 21:
+            if(this.vmodel.code1 && this.vmodel.code2){              
+            }
+            else if(this.vmodel.code1){
+              labelShow=this.vmodel.code1+(this.vmodel.unitName?this.vmodel.unitName:'')+'以后';
+            }
+            else if(this.vmodel.code2){
+              labelShow=this.vmodel.code2+(this.vmodel.unitName?this.vmodel.unitName:'')+'以前';
+            }
+            break;
+          case 11:
+          case 22:
+            labelShow=this.vmodel.getFormListTableShow();
+            break;
+          case 31:
+            labelShow=this.vmodel.getCheckedName();;
+            break;
+          case 30:
+            labelShow=this.vmodel.value?'开启':'关闭';
+            break;
+          case 43:
+            labelShow=this.vmodel.value?'是':'否';
+            break;
+          default:
+            break;
         }
         return labelShow;
       },

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

@@ -251,21 +251,22 @@
         if (typeof this.$refs.table.model.cellLayout !== "undefined") {
           this.$refs.screen.LoadLayout();
         }
+
+        this.flagSideBar=this.$refs.table.model.flagSideBar;
+        this.flagDefaultDisplaySideBar=this.$refs.table.model.flagDefaultDisplaySideBar;
+        if(this.$refs.table.model.rowSelectRouter){
+          this.sideBarApi=this.$refs.table.model.rowSelectRouter.action;
+          this.sideBarSearchConditionApi=this.$refs.table.model.rowSelectRouter.actionForSearchLayout;
+          this.sideBarSearchStatsApi=this.$refs.table.model.rowSelectRouter.actionForSearchStats;
+          this.sideBarSearchDataApi=this.$refs.table.model.rowSelectRouter.actionForSearch;
+          this.sideBarPageType=this.$refs.table.model.rowSelectRouter.actionSource;
+        }
+        else{
+          this.flagSideBar=false;
+        }
+        
         if(this.$refs.table.model.listData.length>0){
           this.flagSideBarOfData=true;
-          this.flagSideBar=this.$refs.table.model.flagSideBar;
-          this.flagDefaultDisplaySideBar=this.$refs.table.model.flagDefaultDisplaySideBar;
-
-          if(this.$refs.table.model.rowSelectRouter){
-            this.sideBarApi=this.$refs.table.model.rowSelectRouter.action;
-            this.sideBarSearchConditionApi=this.$refs.table.model.rowSelectRouter.actionForSearchLayout;
-            this.sideBarSearchStatsApi=this.$refs.table.model.rowSelectRouter.actionForSearchStats;
-            this.sideBarSearchDataApi=this.$refs.table.model.rowSelectRouter.actionForSearch;
-            this.sideBarPageType=this.$refs.table.model.rowSelectRouter.actionSource;
-          }
-          else{
-            this.flagSideBar=false;
-          }
 
           if(document.body.clientWidth && document.body.clientWidth<1024){
             this.flagSideBar=false;

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

@@ -1730,6 +1730,7 @@ export default {
           function () {
             self.$forceUpdate();
             self.tableComplate = false;
+            self.$emit("searchComplate");
           },
           data,
           router

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

@@ -23,7 +23,7 @@
             <div :style="{'width':(item.width ? item.width + 'px' : '' )}">
             <li
               :class="[
-                selectStats ==item.fieldName1 + '*' + item.code1 
+                selectStats ==item.key
                   ? 'activecolor'
                   : '',
               ]"
@@ -33,7 +33,7 @@
             <li class="tdcenter">
               <span
                 :class="[
-                  selectStats == item.fieldName1 + '*' + item.code1 
+                  selectStats == item.key
                     ? 'active'
                     : '',
                 ]"
@@ -52,7 +52,7 @@
             <div :style="{'width':(item.width ? item.width + 'px' : '' ),'white-space': 'nowrap' }">
             <li
               :class="[
-                selectStats ==item.fieldName1 + '*' + item.code1 
+                selectStats ==item.key
                   ? 'activecolor'
                   : '',
               ]"
@@ -62,7 +62,7 @@
             <li class="tdcenter">
               <span
                 :class="[
-                  selectStats == item.fieldName1 + '*' + item.code1 
+                  selectStats == item.key
                     ? 'active'
                     : '',
                 ]"
@@ -91,7 +91,7 @@
               <ul class="popoverbtnTab" style="padding: 0px">
                 <li
                   :class="[
-                    selectStats == item.fieldName1 + '*' + item.code1 
+                    selectStats == item.key
                       ? 'activecolor'
                       : '',
                   ]"
@@ -101,7 +101,7 @@
                 <li class="tdcenter">
                   <span
                     :class="[
-                      selectStats == item.fieldName1 + '*' + item.code1 
+                      selectStats == item.key
                         ? 'active'
                         : '',
                     ]"
@@ -168,6 +168,10 @@ export default {
     });
   },
   methods: {
+    replabel(labelName){
+      let pattern =/（[^（）]*）$|\([^(（]*\)|$/; // 匹配最后一个括号及其内部内容
+       return labelName.replace(pattern, "");
+    },
     load(data) {
       var self = this;
       self.model = data;
@@ -177,15 +181,22 @@ export default {
      if (data.source.content.length > 0) {
         if (self.sortData == null) {
           self.sortData = {};
-          data.source.content.forEach((item, index) => {
-            self.sortData[item.fieldName1 + "*" + item.code1] = index;
+          data.source.content.forEach((item, index) => { 
             item.sort = index;
+            item.key=item.fieldName1 + "*" + self.replabel(item.controlLabel);
+            self.sortData[item.key] = index;
           });
         }
         else {
           data.source.content.forEach((item, index) => {
-            item.sort = self.sortData[item.fieldName1 + "*" + item.code1];
-          });
+            item.key=item.fieldName1 + "*" + self.replabel(item.controlLabel);
+            if(self.sortData[item.key]==undefined){
+              item.sort = index;
+            }else{      
+             item.sort = self.sortData[item.key];
+            }
+          }
+          );
         }
         data.source.content.sort(function (a, b) {
           if (a.sort > b.sort) {
@@ -196,7 +207,7 @@ export default {
         });
         self.data = data.source.content;
         let i = self.data.findIndex(
-          (v) => self.selectStats === v.fieldName1 + "*" + v.code1 
+          (v) => self.selectStats === v.key 
         );
         if (i == -1 || self.selectStats == []) {
           self.handleClick(null, self.data[0], false);
@@ -267,7 +278,7 @@ export default {
     handleClick(ev, obj, flagRefreshTable,type,index) {
       var self = this;
       self.flagClick=true;
-      self.selectStats = obj.fieldName1 + "*" + obj.code1 ;
+      self.selectStats = obj.key;
       var fields = self.model.searchData(
         obj.fieldName1,
         obj.code1,
@@ -283,8 +294,8 @@ export default {
        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;
+       self.sortData[lastItem.key]=obj.sort;
+       self.sortData[obj.key]=lastItem.sort;
       }
     },
     searchStatsComplate(selectItem) {
@@ -304,6 +315,7 @@ export default {
   },
   watch: {
     showWidth: function (newVal, oldVal) {
+      this.sliceIndex=null;
       this.flagClick = false;
       this.showStats();
     },

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

@@ -302,7 +302,7 @@
       right: 10px;
       cursor: pointer;
     }
-
+  
     .ct-so .el-select__caret {
       color: #BBBBBB;
       font-size: inherit;

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

@@ -110,10 +110,33 @@
       //不能共用的数据校验   单独每一个时间框的非空校验
       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;
+          if(this.model.required){
+            if(!this.model.isRange){
+              if (this.model.value== "" || this.model.value== null) {
+                this.valid = false;
+                this.validMessage = "必填"
+                return false;
+              }
+            }         
+            else if (this.model.value1 == "" || this.model.value== "" || this.model.value== null || this.model.value1== null) {
+              this.valid = false;
+              this.validMessage = "必填"
+              return false;
+            }
+          }
+          else if(this.model.value && this.model.isRange){
+            if(this.model.value1 == "" || this.model.value1== null){
+              this.valid = false;
+              this.validMessage = "必填"
+              return false;
+            }
+          }
+          else if(this.model.value1 && this.model.isRange){
+            if(this.model.value == "" || this.model.value== null){
+              this.valid = false;
+              this.validMessage = "必填"
+              return false;
+            }
           }
         }
         return true;

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

@@ -9,7 +9,7 @@ const Cb = function (source, callBack) {
       get value() {
         return data.code1 === "1";
       },
-	  get sufLabel1() {
+	    get sufLabel1() {
         return source.sufLabel1;
       },
       set value(v) {

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

@@ -68,6 +68,18 @@ const box = function (source, callBack) {
         }
         return itemArr;
       },
+      getCheckedName() {
+        var nameArr = '';
+        var checked = source.code1 === '' ? [] : [].concat(JSON.parse(source.code1));
+        checked.forEach((v) => {
+          if (v[this.optionAttrs.value]) {
+            if (!v[this.optionAttrs.flagDeleted]) {
+              nameArr = nameArr+ (nameArr?' ':'') +v[this.optionAttrs.label];
+            }
+          }
+        });
+        return nameArr;
+      },
       //手动维护code1值
       updateCode1() {
         let self = this;

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

@@ -4,7 +4,7 @@ import Enum from './lib/Enum';
 import common from '../../../common';
 import Router from './Router';
 import Vue from 'vue';
-const ContactList = function (source,para ,callBack) {
+const Contact = function (source,para ,callBack,field) {
   var init = function (data) {
     var rtn = {
       $vue: null,        
@@ -325,6 +325,9 @@ const ContactList = function (source,para ,callBack) {
         }        
       },
     };
+    if(field){
+      rtn = base.copy(Base(field), rtn);
+    }
     return rtn;
   }
   if (typeof source === 'string') {
@@ -349,6 +352,7 @@ const ContactList = function (source,para ,callBack) {
     if (callBack) {
       callBack(rtn);
     }
+    return rtn;
   }
 }
-export default ContactList;
+export default Contact;

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

@@ -33,7 +33,7 @@ const Dtd = function (source, dateType) {
       },
       get labelValue() {
         if (source.code1 && source.code2)
-          return source.code1 + ' — ' + source.code2;
+          return source.code1 + '-' + source.code2;
         else
           return '';
       },

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

@@ -54,7 +54,7 @@ const Dtd = function (source, dateType) {
       },
       get labelValue() {
         if (source.code1 && source.code2)
-          return source.code1 + ' — ' + source.code2;
+          return source.code1 + '-' + source.code2;
         else
           return '';
       },

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

@@ -368,7 +368,7 @@ const FormList = function (source, master) {
             source: {
               scripts: source.scripts,
               parameterAction: self.OptApi,
-              fields: JSON.parse(JSON.stringify(source.rows[index].columns)),
+              fields: source.rows[index].columns,
               colSpan: rtn.pageColumns,
               buttons: [
                 {
@@ -392,8 +392,17 @@ const FormList = function (source, master) {
                 for (let findex = 0; findex < row.length; findex++) {//循环所在行的列
                   Vue.set(row[findex], 'code1', ev.formData.source.fields[findex].code1);
                   Vue.set(row[findex], 'name1', ev.formData.source.fields[findex].name1);
-                  if(ev.formData.source.fields[findex].controlType===6){
-                    Vue.set(row[findex], 'code2', ev.formData.source.fields[findex].code2);
+                  switch(ev.formData.source.fields[findex].controlType){
+                    case 19:
+                    case 20:
+                    case 21:
+                    case 22:
+                    case 6:
+                    case 7:
+                      Vue.set(row[findex], 'code2', ev.formData.source.fields[findex].code2);
+                      break;
+                    default:
+                     break;  
                   }
                 }
 
@@ -463,8 +472,17 @@ const FormList = function (source, master) {
                 let field = row.columns[findex];
                 field.code1 = ev.formData.source.fields[findex].code1;
                 field.name1 = ev.formData.source.fields[findex].name1;
-                if(ev.formData.source.fields[findex].controlType===6){
-                  field.code2=ev.formData.source.fields[findex].code2;
+                switch(ev.formData.source.fields[findex].controlType){
+                  case 19:
+                  case 20:
+                  case 21:
+                  case 22:
+                  case 6:
+                  case 7:
+                    field.code2=ev.formData.source.fields[findex].code2;
+                    break;
+                  default:
+                   break;  
                 }
               }
 

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

@@ -31,7 +31,7 @@ const Iti = function (source) {
     },
     get labelValue() {
       if (source.code1 && source.code2)
-        return source.code1 + ' — ' + source.code2;
+        return source.code1 + '-' + source.code2;
       else
         return '';
     },

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

@@ -525,13 +525,14 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             self.isLoading = false;
             if (response.rtnCode === Enum.ReturnCode.Successful) {
               if (response.content.rows.length > 0) {
-                rtn.setRow(response.content.rows);
+                // rtn.setRow(response.content.rows);
                 response.content.rows.forEach((nr) => {
                   rtn.listData.push(nr);
                 });
                 rtn.dataDictionary = response.content.rows;
               }
               rtn.getSelectAll();
+              rtn.setRow(rtn.listData);
               source.page.rows = response.page.rows;
               source.page.rowCount = response.page.rowCount;
               if (typeof response.content.foot !== 'undefined') {
@@ -868,6 +869,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             if(rtn.listData.length===0){
               rtn.$vue.$emit('closeSideBar');
             }
+            else{              
+              rtn.setRow(rtn.listData);
+            }
             break;
 
           case Enum.ActionType.New: //新增
@@ -880,7 +884,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               rtn.dataDictionary = response.content;
 
               source.page.rows = source.page.rows + response.content.length;
-              rtn.$vue.calculatingRowHeight()
+              rtn.setRow(rtn.listData);
+              rtn.$vue.calculatingRowHeight();
+              rtn.$vue.$emit("searchComplate");
             }
             else{
               rtn.$vue.updateCurrentRow({flagAddRowAfterAction:true},{responseData:response});
@@ -895,6 +901,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                   rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
                 }
               });
+              rtn.setRow(rtn.listData);
             }
             else{
               rtn.$vue.updateCurrentRow({flagFreshCurrentRow:true},{responseData:response});