centaline-data-driven 1.5.43 → 1.5.45

package/package.json

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

package/release-log.md

@@ -1,3 +1,21 @@
+## v1.5.45
+2023-08-08
+
+优化
+
+角色管理右侧边栏tabs宽度计算优化
+
+参数缓存关闭后报错处理
+
+列表小于1024打开后，再放大时，右侧没有显示处理
+
+## v1.5.44
+2023-08-04
+
+优化
+
+列表底部右侧增加companyName
+
 ## v1.5.43
 2023-08-03
 

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/data-driven-file/downTemplate'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/task'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "key":"excel:12be9cb7-fd3a-4f82-a583-d7e240dc7aab"
+          "stepId":"1686982560817586178","businessId":"1686982455918043138","actionType":1,"pageStyle":2,"pageOnly":true
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -62,11 +62,11 @@
       :searchStatsApi="'/PropertyRETList/getListStats'">
     </ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyOFIList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyOFIList/getLayoutOfSearchCategory'"
       :searchStatsApi="'/PropertyOFIList/getListStats'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/EstateList/getLayoutOfSearch'" :searchDataApi="'/EstateList/getListOfSearchModel'"></ct-searchlist> -->
     
@@ -76,7 +76,7 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/CustomerImportList/getLayoutOfSearch'" :searchDataApi="'/CustomerImportList/getListOfSearchModel'"></ct-searchlist> -->
     
-    <!-- <ct-searchlist :searchConditionApi="'/CustomerList/getLayoutOfSearch'" :searchStatsApi="'/CustomerList/getListStats'" :searchDataApi="'/CustomerList/getListOfSearchModel'"></ct-searchlist> -->
+    <ct-searchlist :searchConditionApi="'/CustomerList/getLayoutOfSearch'" :searchStatsApi="'/CustomerList/getListStats'" :searchDataApi="'/CustomerList/getListOfSearchModel'"></ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" :searchDataApi="'/CallTaskList/getListOfSearchModel'"></ct-searchlist> -->
     

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 {

package/src/centaline/dynamicInputNumber/src/dynamicInputNumber.vue

@@ -92,7 +92,9 @@
       onChangeHandler: function (val) {
         this.changeHandler(this.model.value);
         this.isShowClear();
-        this.model.value.dispatchEvent(new Event("val")); //更新v-model的值
+        if(this.model.value.dispatchEvent){
+          this.model.value.dispatchEvent(new Event("val")); //更新v-model的值
+        }
       },
       onBlurHandler:function(event){
         this.model.value = this.$common.numToFloat(this.model.value, this.model.decimals);//保留n位小数

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

@@ -193,7 +193,7 @@
 
     <ct-tabletip ref="listFooter" class="ct-search-table-list-footer" :tip="model.listFooter"
                  v-if="!isLoading && !isLayout && model"></ct-tabletip>
-    <ct-tabletip ref="footer" class="ct-search-table-footer" :tip="model.footer"
+    <ct-tabletip ref="footer" class="ct-search-table-footer" style="width: 100%;" :tip="model.footer+model.companyName"
                  v-if="!isLoading && !isLayout && model"></ct-tabletip>
     <div ref="popupButton" v-if="flagPopupSearchlist"
          style="margin-top: 10px;width: 100%;display: inline-block;height: 30px;margin-bottom: 10px;">

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

@@ -29,6 +29,12 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         if (source.flagShowTitle) v = source.flagShowTitle;
         return v;
       },
+      get companyName(){
+        if(source.companyName){
+          return '<span style="float: right;color:#999999;margin-right: 5px;">'+source.companyName+'</span>'|| '';
+        }
+        return '';
+      },
       get source() {
         return source;
       },

package/src/main.js

@@ -56,9 +56,9 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'f328eca3-7e3d-41ef-beff-5533e83a8bb9',
+        oldToken: 'cd6060fd-36e5-47f1-8cb9-7fc6f61e645c',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOwiAURf-FuS_hwYMH3Qq0ix_RQIuJTsa2icb472rUzd0z3OEs597EshXRiuQ6SXHQEHtlgBIb6AZ2EKJzMijWFNzoP8CP-TIikme0PXSeI5AlDQ6jg0g20pB6HUMSjaiXk2jRekS0km0jDnl9C6m8fYltqeddvf7j3HE9PLM8m3nSswFbCwFx1pCrqbAvRbNRU66Zxf0BAAD__w.3cqB0NwvL1l4yxTBGksheR5nNGIHGpLQdGWakHWixMM"}',
+        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"}',