centaline-data-driven 1.5.44 → 1.5.46

package/package.json

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

package/release-log.md

@@ -1,3 +1,21 @@
+## v1.5.46
+2023-08-08
+
+优化
+
+右侧弹窗关闭后需要支持刷新列表行数据
+
+## v1.5.45
+2023-08-08
+
+优化
+
+tableStats组件宽度计算优化和更多图标鼠标移上样式优化
+
+参数缓存关闭后报错处理
+
+列表小于1024打开后，再放大时，右侧没有显示处理
+
 ## v1.5.44
 2023-08-04
 

package/src/SearchTree.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="app-Tree" style="height:100%;position: fixed;width:100%">
     <ct-treelist :flagsearch="true" :apiParam="apiParam" :leftWidth="'280'"
-                 :searchConditionApi="'/DepartmentList/getLayoutOfSearch'"
-                 :searchDataApi="'/DepartmentList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
+                 :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'"
+                 :searchDataApi="'/SystemParameterCatalogList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>

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

@@ -339,7 +339,7 @@ export default {
       let self = this;
       this.$nextTick(() => {
         if (this.$refs.main) {
-          if (this.model.routerForQRCode) {
+          if (this.model && this.model.routerForQRCode) {
             this.topWidth = this.$refs.main.clientWidth - 140;
           }
           else {
@@ -636,6 +636,9 @@ export default {
                     if (field.id != "Favorite") {
                       self.$emit('simpleRouterclickHandler', field, ev);
                     }
+                  },                  
+                  closeDialog(ev) {
+                    self.$emit('simpleRouterclickHandler', field, ev);
                   }
                 }
               }]
@@ -668,6 +671,7 @@ export default {
                     if (field.id == "Favorite" && callBack) {
                       callBack();
                     }
+                    self.$emit('simpleRouterclickHandler', field, ev);
                   }
                 }
               }]

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

@@ -504,6 +504,9 @@ export default {
                     if (field.id != "Favorite") {
                       self.$emit('simpleRouterclickHandler', field, ev);
                     }
+                  },                  
+                  closeDialog(ev) {
+                    self.$emit('simpleRouterclickHandler', field, ev);
                   }
                 }
               }]
@@ -536,6 +539,7 @@ export default {
                     if (field.id == "Favorite" && callBack) {
                       callBack();
                     }
+                    self.$emit('simpleRouterclickHandler', field, ev);
                   }
                 }
               }]

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

@@ -503,6 +503,9 @@ export default {
                     if (field.id != "Favorite") {
                       self.$emit('simpleRouterclickHandler', field, ev);
                     }
+                  },
+                  closeDialog(ev) {
+                    self.$emit('simpleRouterclickHandler', field, ev);
                   }
                 }
               }]
@@ -535,6 +538,7 @@ export default {
                     if (field.id == "Favorite" && callBack) {
                       callBack();
                     }
+                    self.$emit('simpleRouterclickHandler', field, ev);
                   }
                 }
               }]

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

@@ -151,6 +151,7 @@
         }
         if(this.$refs.table){
           this.$refs.table.resetScrollActivated();
+          this.$refs.table.setTableHeight();
         }
       })
     },
@@ -228,11 +229,29 @@
         }
       },
       resizeSearchList() {
+        if(document.body.clientWidth && document.body.clientWidth>=1024){
+          if(!this.flagSideBar && this.$refs.table){
+            this.flagSideBar=this.$refs.table.model.flagSideBar;
+            if(this.flagSideBar && this.flagSideBarOfData){
+              this.sideMenuClickHandler('close');
+            }
+          }
+        }
+        else{
+          this.flagSideBar=false;
+          this.sideBarStatus ='close';
+          this.sideBarRight=-this.sideBarWidth;
+          this.sideBarWidth=0;
+          this.searchWidth=0;
+          this.sideBarMenuRight=0;
+        }
+
         if(this.flagSideBar && this.flagSideBarOfData){
           if(this.sideBarStatus=='open' && this.$refs.main){
             this.searchWidth=this.$refs.main.clientWidth-this.sideBarWidth;
           }
         }
+
         if(this.$refs.main){
           this.listHeight=this.$refs.main.offsetHeight;
           if(this.$refs.detail){

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

@@ -1951,7 +1951,7 @@ export default {
     refreshFromSimple(field, data) {
       var self = this;
       if (field.isOpenForm) {
-        if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
+        if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction && data) {
           self.model.doAction(data);
         }
         self.$forceUpdate();
@@ -1959,7 +1959,7 @@ export default {
         self.updateCurrentRow(field, data,true);
       } 
       else {
-        if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
+        if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction && data) {
           self.model.doAction({ responseData: data });
         }
         self.$forceUpdate();

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

@@ -152,7 +152,7 @@ export default {
         isHidden: true, //是否开启操作栏隐藏设置，默认开启
         showNum: 3, //如果isHidden为true时，个数大于3就会隐藏，默认是3
         appendId: "", //将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
-        trigger: "hover", //触发方式，传值可查看Popper UI组件trigger属性
+        trigger: "click", //触发方式，传值可查看Popper UI组件trigger属性
         placement: "bottom-start", //方向，传值可查看Popper UI组件placement属性
       },
 	  iconSort: require("../../../assets/sort.png"),
@@ -160,11 +160,9 @@ export default {
   },
   mounted() {
     var self = this;
-    self.showWidth =
-      self.$refs.tableStatistics.offsetWidth || document.body.clientWidth;
-      window.addEventListener('resize', function () {
-      self.showWidth =
-        self.$refs.tableStatistics.offsetWidth || document.body.clientWidth;
+    self.showWidth = self.$refs.tableStatistics && self.$refs.tableStatistics.offsetWidth || document.body.clientWidth;
+    window.addEventListener('resize', function () {
+      self.showWidth = self.$refs.tableStatistics && self.$refs.tableStatistics.offsetWidth || document.body.clientWidth;
     });
   },
   methods: {
@@ -249,10 +247,10 @@ export default {
             } else {
               moreWidth = 0;
             }
-            if (self.showWidth < sumWidth + moreWidth) {
+            if (self.showWidth -i < sumWidth + moreWidth) {
               showIndex = i;
               break;
-            } else if (self.showWidth < nextWidth + moreWidth) {
+            } else if (self.showWidth -i < nextWidth + moreWidth) {
               showIndex = i + 1;
               break;
             }
@@ -278,6 +276,7 @@ export default {
     handleClick(ev, obj, flagRefreshTable,type,index) {
       var self = this;
       self.flagClick=true;
+      self.FlagStatistics = false;
       self.selectStats = obj.key;
       var fields = self.model.searchData(
         obj.fieldName1,
@@ -433,6 +432,7 @@ export default {
   text-align: left;
   top: 2px;
   right: 0px;
+  cursor: pointer;
 }
 .my-icon-more {
   width: 14px;

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

@@ -93,6 +93,9 @@
             this.$refs.detail.$children[0].refreshPage();
           }
         }
+        if(this.$refs.table){
+          this.$refs.table.setTableHeight();
+        }
       })
     },
     data() {
@@ -211,6 +214,23 @@
         }
       },
       resizeSearchList() {
+        if(document.body.clientWidth && document.body.clientWidth>=1024){
+          if(!this.flagSideBar && this.$refs.table){
+            this.flagSideBar=this.$refs.table.model.flagSideBar;
+            if(this.flagSideBar && this.flagSideBarOfData){
+              this.sideMenuClickHandler('close');
+            }
+          }
+        }
+        else{
+          this.flagSideBar=false;
+          this.sideBarStatus ='close';
+          this.sideBarRight=-this.sideBarWidth;
+          this.sideBarWidth=0;
+          this.searchWidth=0;
+          this.sideBarMenuRight=0;
+        }
+
         if(this.flagSideBar && this.flagSideBarOfData){
           if(this.sideBarStatus=='open' && this.$refs.main){
             this.searchWidth=this.$refs.main.clientWidth-this.sideBarWidth;

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

@@ -186,7 +186,9 @@
         this.$emit('refreshParent');
       },
       resize() {
-        this.listHeight=(this.$refs.main.offsetHeight-42)+'px';
+        if(this.$refs.main){
+          this.listHeight=(this.$refs.main.offsetHeight-42)+'px';
+        }
         if(this.$refs['searchlist'+this.activeIndex] && this.$refs['searchlist'+this.activeIndex][0]){
           this.$refs['searchlist'+this.activeIndex][0].resize();
           this.$refs['searchlist'+this.activeIndex][0].resizeSearchList();

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

@@ -43,7 +43,7 @@ export default {
         }
       });
     },
-
+    updateCurrentRow(field, ev){},
     search() {
       this.setTreeHeight();
       this.$refs.tree.search(this.$refs.treescreen.model);

package/src/main.js

@@ -58,7 +58,7 @@ Vue.use(centaline, {
       return {
         oldToken: 'cd6060fd-36e5-47f1-8cb9-7fc6f61e645c',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOwjAMRe-SuZZsx0mcbk3SLhyiakWGMiFoJRDi7oCAjZ03_OEt79_MeZtNa4p2KHmwkHt2ICU46IagkLIqJg5Wko7xA_yYLyORxEC-hy6GDOLFglJWyOKzDKW3ORXTmHo5mpZ8JCaLpI1ZpvUtiL1_ie1cT7t6_ce5w7o8s6zsVLBCdAFBWBxMhAFktpFxbxmJzf0BAAD__w.8j17kTENd-vwsdYlFXYHupmajMNlLNuXVuY2nIjs_fo"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgjAURf-lMy9p6aPvlY2-wuJHkAIlwckIJBrjv6tRN3fPcIeznHtT6z6oWkVuNEpnQdqyAoxUQdMRQxBmHUqyGLj3H-DHfOmNQU_GtdB4EkCHFtgIg6AT7GJrJURVqHw5qdo4b5CRNBZqSdtbWM_2JfY1nw_5-o9zx215Zj2lZFEbGGbUgKUfIc2ZIdPoHI5I05TV_QEAAP__.JcB2iXcfHNcB2eJQ_kEIhID-UXCMx-HDoIuv9ZIA33I"}',
 
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201806071109550C867184E8BCA56EC3","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',