centaline-data-driven 1.6.41 → 1.6.43

package/package.json

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

package/release-log.md

@@ -1,10 +1,26 @@
-# v1.6.41
+# v1.6.43
+2024-05-20
+
+BUG
+
+扫码上传，附件大小判断错误
+
+
+
+# v1.6.42
 2024-05-07
 
 优化
 
 附件上传添加上传文件大小的限制[code2,单位M]，默认不限制
 
+# v1.6.41
+2024-05-07
+
+优化
+
+样式使用 ::v-deep 替代 >>>
+
 # v1.6.40
 2024-04-10
 

package/src/SearchList.vue

@@ -2,32 +2,20 @@
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
 
     <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/transaction-workflow/getLayoutOfSearch'" :searchDataApi="'/api/third-dept-tran/transaction-workflow/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/layout'"  :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->    
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/profit-return/layout'"  :searchDataApi="'/api/third-dept-tran/profit-return'"></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/finance/tran-commission-allocate/process-layout'"  :searchDataApi="'/api/finance/tran-commission-allocate/process-list'"></ct-searchlist> -->
-
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/shift-approver/layout'"  :searchDataApi="'/api/shift-approver/list'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/api/necessaryFile/importTransFile/getLayoutOfSearch'" :searchDataApi="'/api/necessaryFile/importTransFile/getTableList'"></ct-searchlist> -->
-    
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/api/necessaryFile/importTransFile/getLayoutOfSearch'" :searchDataApi="'/api/necessaryFile/importTransFile/getTableList'"></ct-searchlist> -->    
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/taskManagement/WorkingCalendarList/getLayoutOfSearch'" :searchDataApi="'//taskManagement/WorkingCalendarList/getList'"></ct-searchlist> -->
-
     <!-- <ct-searchlist :searchConditionApi="'/mainlandsecond/CustAndContractRegSumList/getLayoutOfSearch'"  :searchDataApi="'/mainlandsecond/CustAndContractRegSumList/getList'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/filemanage/batchdownlist/getLayoutOfSearch'"  :searchDataApi="'/filemanage/batchdownlist/getList'"></ct-searchlist> -->
- 
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/filemanage/batchdownlist/getLayoutOfSearch'"  :searchDataApi="'/filemanage/batchdownlist/getList'"></ct-searchlist> --> 
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/finance/tran-commission-allocate/process-layout'"  :searchDataApi="'/api/finance/tran-commission-allocate/process-list'"></ct-searchlist> -->
-
     <!-- <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>
 
     <!-- CCES -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist> -->
@@ -38,6 +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="'/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> -->
@@ -46,7 +35,7 @@
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/employeelist/getLayoutOfSearch'"  :searchDataApi="'/employeelist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/estatemanage/estatlist/getLayoutOfSearch'"  :searchDataApi="'/estatemanage/estatlist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/system/AreaList/getLayoutOfSearch'"  :searchDataApi="'/system/AreaList/getList'"></ct-searchlist> -->
-    <ct-searchlist :apiParam="para" :searchConditionApi="'/selectionactivitymanage/EvaluationActWorksList/getLayoutOfSearch'"  :searchDataApi="'/selectionactivitymanage/EvaluationActWorksList/getListOfSearchModel'"></ct-searchlist>
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/selectionactivitymanage/EvaluationActWorksList/getLayoutOfSearch'"  :searchDataApi="'/selectionactivitymanage/EvaluationActWorksList/getListOfSearchModel'"></ct-searchlist> -->
     <!-- CCES -->
 
     <!-- <ct-searchlist :apiParam="para"
@@ -168,18 +157,7 @@
         // appRootUrl:'http://10.88.22.13:6060/onecard-api/',
         appRootUrl:'',
         para:{
-          type: "left",
-  "deleteRight": 0,
-  "editRight": 0,
-  "browseRight": 0,
-  "auditRight": 0,
-  "addRight": 0,
-  "deptId": "E5A389CB-8665-4BFD-8C97-3A70CEA28604",
-  "cityName": "深圳",
-  "name": "深圳中原",
-  "path": "001",
-  "code": "001",
-  "new": false
+          "periodId":"1922907834183155713","startDate":"2018-01-01","endDate":"2025-03-10","columnName":"startDate","actionType":1,"pageStyle":2,"pageTitle":"计佣角色配置查看","pageOnly":true
         },
       }
     },

package/src/centaline/dynamicDetail/src/dynamicEstateBuildingDetail.vue

@@ -1610,11 +1610,11 @@ export default {
   background-clip: content-box;
   cursor: pointer;
 }
->>>.el-tabs__nav-prev {
+::v-deep.el-tabs__nav-prev {
   display: none;
 }
 
->>>.el-tabs__nav-next {
+::v-deep.el-tabs__nav-next {
   display: none;
 }
 
@@ -1647,10 +1647,10 @@ export default {
   border-bottom: 3px solid var(--chinaRed);
 }
 
->>>.el-tabs--bottom .el-tabs__item.is-bottom:last-child,
->>>.el-tabs--bottom .el-tabs__item.is-top:last-child,
->>>.el-tabs--top .el-tabs__item.is-bottom:last-child,
->>>.el-tabs--top .el-tabs__item.is-top:last-child {
+::v-deep.el-tabs--bottom .el-tabs__item.is-bottom:last-child,
+::v-deep.el-tabs--bottom .el-tabs__item.is-top:last-child,
+::v-deep.el-tabs--top .el-tabs__item.is-bottom:last-child,
+::v-deep.el-tabs--top .el-tabs__item.is-top:last-child {
   padding-right: 15px;
 }
 

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -1835,11 +1835,11 @@ export default {
   background-clip: content-box;
   cursor: pointer;
 }
->>>.el-tabs__nav-prev {
+::v-deep.el-tabs__nav-prev {
   display: none;
 }
 
->>>.el-tabs__nav-next {
+::v-deep.el-tabs__nav-next {
   display: none;
 }
 
@@ -1872,10 +1872,10 @@ export default {
   border-bottom: 3px solid var(--chinaRed);
 }
 
->>>.el-tabs--bottom .el-tabs__item.is-bottom:last-child,
->>>.el-tabs--bottom .el-tabs__item.is-top:last-child,
->>>.el-tabs--top .el-tabs__item.is-bottom:last-child,
->>>.el-tabs--top .el-tabs__item.is-top:last-child {
+::v-deep.el-tabs--bottom .el-tabs__item.is-bottom:last-child,
+::v-deep.el-tabs--bottom .el-tabs__item.is-top:last-child,
+::v-deep.el-tabs--top .el-tabs__item.is-bottom:last-child,
+::v-deep.el-tabs--top .el-tabs__item.is-top:last-child {
   padding-right: 15px;
 }
 

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -1853,10 +1853,10 @@ export default {
   cursor: pointer;
 }
 
->>> .el-tabs__nav-prev {
+::v-deep .el-tabs__nav-prev {
   display: none;
 }
->>> .el-tabs__nav-next {
+::v-deep .el-tabs__nav-next {
   display: none;
 }
 .more-dropdown {
@@ -1884,10 +1884,10 @@ export default {
   color: var(--chinaRed);
   border-bottom: 3px solid var(--chinaRed);
 }
->>> .el-tabs--bottom .el-tabs__item.is-bottom:last-child,
->>> .el-tabs--bottom .el-tabs__item.is-top:last-child,
->>> .el-tabs--top .el-tabs__item.is-bottom:last-child,
->>> .el-tabs--top .el-tabs__item.is-top:last-child {
+::v-deep .el-tabs--bottom .el-tabs__item.is-bottom:last-child,
+::v-deep .el-tabs--bottom .el-tabs__item.is-top:last-child,
+::v-deep .el-tabs--top .el-tabs__item.is-bottom:last-child,
+::v-deep .el-tabs--top .el-tabs__item.is-top:last-child {
   padding-right: 15px;
 }
 .svgIcon {

package/src/centaline/dynamicDragSort/src/dynamicDragSort.vue

@@ -233,7 +233,4 @@ export default {
     overflow-x: hidden;
 }
 
-/* .checkbox-common>>>span.el-checkbox__label {
-    padding-left: 30px;
-} */
 </style>

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -347,8 +347,11 @@ export default {
         });
       }
       this.disableUpload = this.model.lock;
-
-
+      if (!this.disableUpload && this.model.max && this.model.max > 0) {
+        if (this.model.getfileListLength() >= this.model.max) {
+          this.disableUpload = true;
+        }
+      }
     });
   },
   methods: {
@@ -383,7 +386,7 @@ export default {
       }).then(() => {
         this.model.deleteFile(file, false);
         this.selfValidExcute("remove");
-        this.timeoutHandle1=setTimeout(() => {
+        this.timeoutHandle1 = setTimeout(() => {
           this.QRCodeLocate();
         }, 1080);
 
@@ -490,7 +493,7 @@ export default {
     handleDownload(file) {
     },
     handleChange(file, fileList) {
-      if (this.model.maxSize && file.size > this.model.maxSize) {
+      if (file && this.model.maxSize && file.size > this.model.maxSize) {
         this.$message.error(`文件大小不能超过 ${this.model.maxSize / (1024 * 1024)}MB`);
         fileList.pop(); // 移除不符合要求的文件
       }
@@ -507,7 +510,7 @@ export default {
       file.loadProgress = parseInt(event.percent); // 动态获取文件上传进度
       if (file.loadProgress >= 100) {
         file.loadProgress = 100;
-        this.timeoutHandle2=setTimeout(() => {
+        this.timeoutHandle2 = setTimeout(() => {
           file.progressFlag = false;
         }, 1000); // 一秒后关闭进度条
       }
@@ -872,12 +875,12 @@ export default {
         let fileSum = 0;
 
         for (let index in items) {
-          const item = items[index]; 
+          const item = items[index];
           if (item.kind === 'file') {
             ++fileSum;
           }
         }
-        
+
         if (fileSum == items.length) {
 
           for (let index in items) {
@@ -905,7 +908,7 @@ export default {
           window.uploads = { count: 0, length: uploads.length };
         }
         if (uploads.length > 1) {
-         
+
         }
         else if (uploads.length == 1) {
           window.uploads = null;
@@ -916,10 +919,10 @@ export default {
   },
   beforeDestroy() {
     clearTimeout(this.qrtimer);
-    if(this.timeoutHandle1){
+    if (this.timeoutHandle1) {
       clearTimeout(this.timeoutHandle1)
     }
-    if(this.timeoutHandle2){
+    if (this.timeoutHandle2) {
       clearTimeout(this.timeoutHandle2)
     }
     window.removeEventListener('scroll', this.QRCodeLocate, true)

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

@@ -283,10 +283,12 @@
     methods: {
       computeScroll(){
         this.$nextTick(() => {
-          let parentDom=this.$el.parentElement;
-          if (parentDom && parentDom.scrollHeight > parentDom.clientHeight
-          && this.model && (!this.model.isHorizontalLayout || this.flagScroll)) {
-            this.isScroll = true;
+          if(this.$el){
+            let parentDom=this.$el.parentElement;
+            if (parentDom && parentDom.scrollHeight > parentDom.clientHeight
+            && this.model && (!this.model.isHorizontalLayout || this.flagScroll)) {
+              this.isScroll = true;
+            }
           }
         });
       },

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.69: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/",
@@ -67,7 +67,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'da18df1e-9ee2-49fd-a5ca-a3e17c8947e5',
+        oldToken: 'c827efdb-95fd-4b50-9b65-4e3f736acb53',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjksOwjAMBe-SdS05tuPE7PpJNhwCBWglWCHaSiDE3SniEGznjfTm5eb16HYuIUWltoc-sYKkYGDcF_ApGWYzjrE_CHOHKANQxAJSYgYTCYBoahaC0qAHJc6lbRW8bLuUbpNIBDS3QTJhZiHXuPFxczsfmXxCJG3cpS4_gMb6Bes83vfj8x9x1-Wy3eJ48seQJuCaziATTWDRIlSazCNrlerd-wMAAP__.93H7c7k4TLTqbKpozp0aTSU4U_WrQu3eS990iS-TCpw',
         // authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjktqAzEQBe-itRv6Oy15J3mkTQ5hxnEPOKsQ25AQcveIXCK7R_Gg6jvdn5d0TOxr174QtE4CyipzCQOi2drq6M35XEa1vKICc2mgwwfk4gJGRSrm3HrTcz4hMTKBnaqDejWoNgpIX9Qz-oqN0yHF53s6kouhEGU9pNv2-ANadP4meN7j4yW-_iPu7XGbWovd46oIsV9tatEgRwmg14V1l4tssaWfXwAAAP__.sF1LYLtwnVq8_fFcoq7FA9hy44G1H7SMCYBmZqeKnLY"}',
 
@@ -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":"241113105409757BFF2887A7472E99D2","estateName":"U%E7%89%88%E6%A5%BC%E7%9B%98%E6%8C%89%E7%82%B9%E4%BD%8D","estDeptPath":"001.200.063.001"},"platform":1,"osVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"jijlB","time":1744183725353,"sign":"528fb9ea127871dacfda5d2e56abe364","systemSource":"CCESU","empNo":"maopp","empId":"2411120940038E8B1C87525447179987","clientVersion":"12.5","empName":"%E6%AF%9B%E7%AE%A1%E7%90%86","roleName":"%E9%9B%86%E5%9B%A2IT%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"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjI1ZjYwYTJkLWEwNmMtNGRmNy1iNTQ1LTY1YTAwNjk5ZGI2OSJ9.8J9_ATCF2DYDE1wVr5cGoJgT9kNf1kajqkYtcr2se6s44PPMWOGaIzmpzVQTm1_Q9WD9laGM2BtKcfK2n2_aiw',
+        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',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作