centaline-data-driven 1.6.43 → 1.6.44

package/package.json

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

package/release-log.md

@@ -1,3 +1,10 @@
+# v1.6.44
+2024-05-30
+
+BUG
+
+列表操作返回刷新时，必须禁用查询按钮，避免用户点查询按钮造成重复数据
+
 # v1.6.43
 2024-05-20
 
@@ -5,7 +12,11 @@ BUG
 
 扫码上传，附件大小判断错误
 
+优化
+
+附件上传编辑的时候没有判断附件数量优化
 
+表单页面计算滚动条添加是否有Element的判断
 
 # v1.6.42
 2024-05-07

package/src/SearchList.vue

@@ -15,7 +15,7 @@
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/finance/invoice-apply/layout'"  :searchDataApi="'/api/finance/invoice-apply/list'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/approveManage/contractBatchOperation/getLayoutOfSearch'"  :searchDataApi="'/api/approveManage/contractBatchOperation/getTableList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/distribution/standing-book/layout'"  :searchDataApi="'/api/distribution/standing-book/list'"></ct-searchlist> -->
-    <ct-searchlist :apiParam="para" :searchConditionApi="'/api/commission-role-period/commissionRoleLayout'"  :searchDataApi="'/api/commission-role-period/commissionRoleList'"></ct-searchlist>
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/commission-role-period/commissionRoleLayout'"  :searchDataApi="'/api/commission-role-period/commissionRoleList'"></ct-searchlist> -->
 
     <!-- CCES -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist> -->
@@ -26,7 +26,7 @@
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/ProjectCustomerList/getLayoutOfSearch'"  :searchDataApi="'/customermanage/ProjectCustomerList/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/MyCustomerList/getLayoutOfSearch'"  :searchDataApi="'/customermanage/MyCustomerList/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/CustomerList/getLayoutOfSearch'"  :searchDataApi="'/customermanage/CustomerList/getList'"></ct-searchlist> -->
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/CustomerList/getLayoutOfSearch'"  :searchDataApi="'/customermanage/CustomerList/getList'"></ct-searchlist> -->
+    <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/customerfollowlist/getLayoutOfSearch'"  :searchDataApi="'/customermanage/customerfollowlist/getList'"></ct-searchlist>
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customerquery/publiccustcalltaskreferrallist/getLayoutOfSearch'"  :searchDataApi="'/customerquery/publiccustcalltaskreferrallist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customerquery/publiccustcalltaskreferrallist/getLayoutOfSearch'"  :searchDataApi="'/customerquery/publiccustcalltaskreferrallist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist> -->
@@ -157,7 +157,7 @@
         // appRootUrl:'http://10.88.22.13:6060/onecard-api/',
         appRootUrl:'',
         para:{
-          "periodId":"1922907834183155713","startDate":"2018-01-01","endDate":"2025-03-10","columnName":"startDate","actionType":1,"pageStyle":2,"pageTitle":"计佣角色配置查看","pageOnly":true
+          "type":"top"
         },
       }
     },

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

@@ -506,15 +506,15 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       set listFooter(v1) {
         source.content.bottomText = v1;
       },
+      isdisabledSearchScreen: false,
       apiData(callback) {
         var self = this;
         if(self.$vue && self.$vue.searchStrat && self.$vue.searchEnd){
           self.$vue.searchStrat=Date.now();
         }
         this.isLoading = true;
-        if (self.searchModel) {
-          //不需要禁用查询按钮
-          // self.searchModel.setBtnLoading(true);
+        if (self.isdisabledSearchScreen) {
+          self.searchModel.setBtnLoading(true);
         }
 
         var newSearchModel = this.getSearchData();
@@ -596,8 +596,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               callback(false);
             }
 
-            if (self.searchModel) {
-              // self.searchModel.setBtnLoading(false);
+            if (self.isdisabledSearchScreen) {
+              self.isdisabledSearchScreen = false;
+              self.searchModel.setBtnLoading(false);
             }
           })
           .catch((error) => {
@@ -944,6 +945,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             break;
 
           case Enum.ActionType.Refersh: //刷新
+            rtn.isdisabledSearchScreen = true;
+            rtn.searchModel.setBtnLoading(true);
             rtn.$vue.getPage(1,true);
             break;
 

package/src/main.js

@@ -29,7 +29,7 @@ Vue.use(centaline, {
   // baseUrl: "http://10.25.10.67:9999/service-api/",
   // baseUrl: "http://10.25.10.69:8080/",
   // baseUrl: "https://ccesutest.centaline.com.cn/service-api/v1/form/router", 
-  baseUrl: "http://10.88.22.80:8080/", 
+  // baseUrl: "http://10.88.22.80:8080/", 
   // baseUrl: "http://10.88.22.42:9999/service-api/",
   // baseUrl: "http://10.1.245.111:38908/service-api/",
   // baseUrl: "http://10.1.245.111:31574/service-api/",
@@ -75,8 +75,8 @@ Vue.use(centaline, {
         EstateInfo: '{"estateId":"1c581b7c-d629-4670-8a7c-6d622860bc58","estateName":"0%E9%87%91%E9%9A%85%E4%BA%91%E7%AD%91%E5%A4%A9%E6%B4%A5","estDeptPath":"009.014.001.001"}',
         estateId: '',
 
-        authObject: '{"currentEstate":{"estateId":"20240321160007CA81F9878FA0B1CB53","estateName":"0%E6%B5%8B%E8%AF%95%E6%A5%BC","estDeptPath":"001.058.001"},"platform":1,"osVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"6YUOH","time":1746693822169,"sign":"0edfda1eb427827a5b8a9d8b87083e52","systemSource":"CCESU","empNo":"cs0","empId":"201804231035296D8646770E1ECD32CD","clientVersion":"25.02.10.1","empName":"Thomas%E7%AE%A1%E7%90%86%E5%91%98","roleName":"%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86%E5%91%98","deptFullName":"%E4%BA%8B%E4%B8%9A%E4%BA%94%E9%83%A8%2F%E4%BA%8B%E4%B8%9A%E4%BA%94%E9%83%A8A%E7%BB%84%2F%E5%8D%8E%E4%B8%B0%E5%89%8D%E6%B5%B7%E6%B9%BE5A%E6%A5%BC%E7%9B%98"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijg5MmYyYjljLTdlZWYtNDkzOS05ZjhhLTA0NjNkZjI1YjUwZCJ9.0Qa41MFSNZAJqTR6mmOJTI_ZGppcMypSVc6a7_JLtErLptOVL4K__L5AQ-MqJG9yyrZLVTDe6jF4gtFBHqKSbg',
+        authObject: '{"currentEstate":{},"platform":1,"osVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"7Y0R7s","time":1747898817322,"sign":"1504b27c1f85894e7455899feb027859","systemSource":"CCESU","empNo":"hqxtgl","empId":"2411121446336B97FBEB7FD54905A903","clientVersion":"12.5","empName":"hq%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86","roleName":"%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86%E5%91%98","deptFullName":"%E6%9C%AA%E5%8C%B9%E9%85%8DCCHR%E4%B8%ADHROC%E9%83%A8%E9%97%A8%2F%E9%9B%86%E5%9B%A2IT%2FCCES%E7%BB%84"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImEyNzAwZjdkLThiNmUtNDlmNS1iMzRhLTYzODcxOTYxZDc3MiJ9.6sBUgoPllhuhBcLespy8OuTj63cvTgJLEw6tRdmqTLi2A9xVyTyYTv_0HILD5AW6mqfzZOO8NhY6DKNOTusUvA',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作

package/wwwroot/static/centaline/centaline-data-driven.js

@@ -59666,15 +59666,15 @@ var SearchTable = function SearchTable(data, callBack, searchModel, flagSearch,
       set listFooter(v1) {
         source.content.bottomText = v1;
       },
+      isdisabledSearchScreen: false,
       apiData: function apiData(callback) {
         var self = this;
         if (self.$vue && self.$vue.searchStrat && self.$vue.searchEnd) {
           self.$vue.searchStrat = Date.now();
         }
         this.isLoading = true;
-        if (self.searchModel) {
-          //不需要禁用查询按钮
-          // self.searchModel.setBtnLoading(true);
+        if (self.isdisabledSearchScreen) {
+          self.searchModel.setBtnLoading(true);
         }
 
         var newSearchModel = this.getSearchData();
@@ -59752,8 +59752,9 @@ var SearchTable = function SearchTable(data, callBack, searchModel, flagSearch,
             callback(false);
           }
 
-          if (self.searchModel) {
-            // self.searchModel.setBtnLoading(false);
+          if (self.isdisabledSearchScreen) {
+            self.isdisabledSearchScreen = false;
+            self.searchModel.setBtnLoading(false);
           }
         }).catch(function (error) {
           self.isLoading = false;
@@ -60095,6 +60096,8 @@ var SearchTable = function SearchTable(data, callBack, searchModel, flagSearch,
 
           case __WEBPACK_IMPORTED_MODULE_6__lib_Enum__["default"].ActionType.Refersh:
             //刷新
+            rtn.isdisabledSearchScreen = true;
+            rtn.searchModel.setBtnLoading(true);
             rtn.$vue.getPage(1, true);
             break;