centaline-data-driven 1.5.28 → 1.5.29

package/package.json

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

package/release-log.md

@@ -1,3 +1,12 @@
+## v1.5.29
+2023-06-30
+
+bug修复
+
+列表没有数据，新增数据后，右侧详情页不展开bug处理
+
+列表统计栏点击查询时tab顺序变动问题处理
+
 ## v1.5.28
 2023-06-30
 
@@ -11,6 +20,8 @@
 
 列表合并行，滚动加载后要重新计算
 
+呼叫任务右侧栏固定按钮左对齐优化
+
 ## v1.5.27
 2023-06-27
 

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/loader/src/ctl/SearchTable.js

@@ -885,7 +885,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
 
               source.page.rows = source.page.rows + response.content.length;
               rtn.setRow(rtn.listData);
-              rtn.$vue.calculatingRowHeight()
+              rtn.$vue.calculatingRowHeight();
+              rtn.$vue.$emit("searchComplate");
             }
             else{
               rtn.$vue.updateCurrentRow({flagAddRowAfterAction:true},{responseData:response});