centaline-data-driven 1.5.93 → 1.5.95

package/package.json

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

package/release-log.md

@@ -1,4 +1,17 @@
-# v1.5.92
+# v1.5.95
+2024-01-11
+优化
+
+上传支持202
+
+列表添加左边的宽度
+
+# v1.5.94
+2024-01-08
+bug修复
+点击搜索时，未调用统计栏
+
+# v1.5.93
 2024-01-04
 bug修复
 刷新列，没有统计栏时，获取统计栏查询条件报错

package/src/SearchList.vue

@@ -30,7 +30,7 @@
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/distribution/standing-book/layout'"  :searchDataApi="'/api/distribution/standing-book/list'"></ct-searchlist> -->
 
 
-    <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist>
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist> -->
 
 
     <!-- <ct-searchlist :apiParam="para"
@@ -95,6 +95,8 @@
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/RoleList/getLayoutOfSearch'" :searchStatsApi="'/RoleList/getListStats'" :searchDataApi="'/RoleList/getListOfSearchModel'"></ct-searchlist> -->
   
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/TaskList/getLayoutOfSearch'" :searchStatsApi="'/TaskList/getListStats'" :searchDataApi="'/TaskList/getListOfSearchModel'"></ct-searchlist> -->
+    
+    <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/PropertyVRRealLookBalanceList/getLayoutOfSearchForOFI'" :searchDataApi="'/PropertyVRRealLookBalanceList/getListOfSearchModel'"></ct-searchlist>
 
 
 
@@ -112,7 +114,7 @@
 
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/SystemLogList/getLayoutOfSearch'" :searchDataApi="'/SystemLogList/getListOfSearchModel'"></ct-searchlist> -->
 
-    <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/AttendanceBalanceAlertList/getLayoutOfSearch'" :searchDataApi="'/AttendanceBalanceAlertList/getListOfSearchModel'"></ct-searchlist>
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/AttendanceBalanceAlertList/getLayoutOfSearch'" :searchDataApi="'/AttendanceBalanceAlertList/getListOfSearchModel'"></ct-searchlist> -->
 
 
     <ct-dialog-list></ct-dialog-list>

package/src/centaline/dynamicBtn/src/dynamicBtn.vue

@@ -14,6 +14,7 @@
     </el-dropdown-menu>
   </el-dropdown>
   <el-upload v-else-if="model.isImport"
+              ref="fileUpload"
              :action="model.action"
              v-bind="model.attrs"
              size="mini"
@@ -154,6 +155,7 @@
             data[key] = this.fileData[key];
           }
         }
+        data.flagHaveAlert=0;
         return data;
       },
       headers() {

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

@@ -212,6 +212,7 @@
         this.pageDisabled=false;
         if(this.flagSideBar && this.$refs.table.model.listData.length>0){
           if(!this.flagSideBarOfData || index===1){
+            this.refreshRowHandle();
             this.flagSideBarOfData=true;
             this.sideMenuClickHandler(this.sideBarStatus =='close'?'open':'close');
           }
@@ -238,6 +239,18 @@
         }
       },
       resizeSearchList() {
+        if(this.$refs.table && this.$refs.table.model && this.$refs.table.model.mainBarWidth){
+          this.$refs.table.model.sideBarWidth=this.$refs.main.clientWidth-this.$refs.table.model.mainBarWidth;
+          this.sideBarWidth=this.$refs.table.model.sideBarWidth;
+          this.sideBarMenuRight=this.sideBarWidth-2;
+
+          if(this.sideBarStatus=='close'){            
+            this.sideBarRight=-this.sideBarWidth;
+            this.sideBarWidth=0;
+            this.sideBarMenuRight=0;
+          }
+        }
+
         if(document.body.clientWidth && document.body.clientWidth>=1024){
           if(!this.flagSideBar && this.$refs.table){
             this.flagSideBar=this.$refs.table.model.flagSideBar;
@@ -305,6 +318,10 @@
         if(this.$refs.table.model.listData.length>0){
           this.flagSideBarOfData=true;
 
+          if(this.$refs.table.model.mainBarWidth){
+            this.$refs.table.model.sideBarWidth=this.$refs.main.clientWidth-this.$refs.table.model.mainBarWidth;
+          }
+
           if(document.body.clientWidth && document.body.clientWidth<1024){
             this.flagSideBar=false;
           }
@@ -340,44 +357,35 @@
         this.$emit('loaded', this.$refs.table.model);
       },
       rowClickHandle() {
-      var self = this;
-      if (
-        self.selectIndex !== self.$refs.table.model.selectIndex &&
-        self.$refs.table.model.rowSelectRouter
-      ) {
-        self.selectIndex = self.$refs.table.model.selectIndex;
-        self.rowCount = self.$refs.table.model.listData.length;
-        if (this.sideBarStatus && this.sideBarStatus == "open") {
-          self.sideBarApiParam = {};
-          if (self.$refs.table.model.rowSelectRouter.submitListField) {
-            self.$refs.table.model.rowSelectRouter.submitListField.forEach(
-              (k) => {
-                self.sideBarApiParam[k] =
-                  self.$refs.table.model.listData[self.selectIndex][k];
-              }
-            );
-          }
-          self.sideBarApiParam.actionType =
-            self.$refs.table.model.rowSelectRouter.actionType;
-          self.detailKey = self.detailKey + 1;
-        }
-        try {
-          let ApiParam = {};
-          if (self.$refs.table.model.rowSelectRouter.submitListField) {
-            self.$refs.table.model.rowSelectRouter.submitListField.forEach(
-              (k) => {
-                ApiParam[k] =
-                  self.$refs.table.model.listData[self.selectIndex][k];
-              }
-            );
+        var self = this;
+        if ( self.selectIndex !== self.$refs.table.model.selectIndex && self.$refs.table.model.rowSelectRouter) {
+          self.selectIndex = self.$refs.table.model.selectIndex;
+          self.rowCount = self.$refs.table.model.listData.length;
+          if (this.sideBarStatus && this.sideBarStatus == "open") {
+            self.sideBarApiParam = {};
+            if (self.$refs.table.model.rowSelectRouter.submitListField) {
+              self.$refs.table.model.rowSelectRouter.submitListField.forEach(
+                (k) => {
+                  self.sideBarApiParam[k] = self.$refs.table.model.listData[self.selectIndex][k];
+                }
+              );
+            }
+            self.sideBarApiParam.actionType = self.$refs.table.model.rowSelectRouter.actionType;
+            self.detailKey = self.detailKey + 1;
           }
+          try {
+            let ApiParam = {};
+            if (self.$refs.table.model.rowSelectRouter.submitListField) {
+              self.$refs.table.model.rowSelectRouter.submitListField.forEach((k) => {
+                ApiParam[k] = self.$refs.table.model.listData[self.selectIndex][k];
+              });
+            }
 
-          this.$emit(
-            "rowClickHandle",ApiParam
-          );
-        } catch (e) {}
-      }
-    },
+            this.$emit("rowClickHandle",ApiParam);
+          } 
+          catch (e) {}
+        }
+      },
       refreshRowHandle(){
         this.selectIndex=-1;
         this.rowClickHandle();
@@ -495,7 +503,7 @@
       }
       destroyDeep(this._vnode)
     },
-     watch: {
+    watch: {
       pageHeight: function (val) {
       if(this.pageHeight) {
           this.pageHeightReal=this.pageHeight;

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

@@ -648,7 +648,8 @@ export default {
       
       this.model.getPage(index, next);
       self.$nextTick(() => {
-       // self.loadStats();
+        //点击搜索时调用
+       self.loadStats();
       });
     },
     toSort(ev, col, action) {
@@ -2001,43 +2002,114 @@ export default {
     },
     importComplete(res, field) {
       var self = this;
-      if (field.flagAsync) {
-        if (res.content && res.content.action) {
-          var dialogOption = {
-            title: field.pageTitle || field.label,
-            content: [{
-              component: 'ct-progress',
-              attrs: {
-                progressAction: res.content.action,
-                progressKey: res.content.key,
-                progressType: 'import',
-                width: '350px',
-                height: '165px'
-              },
-              on: {
-                finished(data) {
-                  self.$common.closeDialog(dialogOption.dialog);
-                  if (data.rtnMsg) {
+      if(res && res.rtnCode && res.rtnCode===201){
+        if(res.rtnMsg){
+          self.$message({
+            message: data.rtnMsg,
+            type: 'warning',
+            showClose:true,
+          });
+        }
+        return;
+      }
+      else if(res && res.rtnCode && res.rtnCode===202 && res.rtnMsg){
+        self.$common.confirm(res.rtnMsg, '提示', {confirmButtonText: '确定',cancelButtonText: '取消',type: 'warning'}).then(() => {
+          let file = field.self.$refs.fileUpload.uploadFiles[0].raw;
+          field.self.uploadData.flagHaveAlert=1;
+          field.self.$refs.fileUpload.clearFiles();
+          self.$nextTick(() => {
+            field.self.$refs.fileUpload.handleStart(file);
+            field.self.$refs.fileUpload.isUpdateSupport = 1;
+            field.self.$refs.fileUpload.submit();            
+            field.self.uploadData.flagHaveAlert=0;
+            return; 
+          });
+        })
+        .catch(() => {
+        });
+      }
+      else if (field.flagAsync) {
+        if(res.rtnCode && res.rtnCode===202 && res.rtnMsg){
+          self.$common.confirm(res.rtnMsg, '提示', {confirmButtonText: '确定',cancelButtonText: '取消',type: 'warning'}).then(() => {
+            submitData.flagHaveAlert=1;
+            if (res.content && res.content.action) {
+              var dialogOption = {
+                title: field.pageTitle || field.label,
+                content: [{
+                  component: 'ct-progress',
+                  attrs: {
+                    progressAction: res.content.action,
+                    progressKey: res.content.key,
+                    progressType: 'import',
+                    width: '350px',
+                    height: '165px'
+                  },
+                  on: {
+                    finished(data) {
+                      self.$common.closeDialog(dialogOption.dialog);
+                      if (data.rtnMsg) {
+                        self.$message({
+                          message: data.rtnMsg,
+                          type: 'success',
+                          showClose:true,
+                        });
+                      }
+                      self.getPage(1);
+                    },
+                    error(data) {
+                      self.$common.closeDialog(dialogOption.dialog);
+                      self.$message({
+                        message: data.rtnMsg,
+                        type: 'warning',
+                        showClose:true,
+                      });
+                    }
+                  }
+                }]
+              };
+              self.$common.openDialog(dialogOption);
+            }
+          })
+          .catch(() => { });
+        }
+        else{
+          if (res.content && res.content.action) {
+            var dialogOption = {
+              title: field.pageTitle || field.label,
+              content: [{
+                component: 'ct-progress',
+                attrs: {
+                  progressAction: res.content.action,
+                  progressKey: res.content.key,
+                  progressType: 'import',
+                  width: '350px',
+                  height: '165px'
+                },
+                on: {
+                  finished(data) {
+                    self.$common.closeDialog(dialogOption.dialog);
+                    if (data.rtnMsg) {
+                      self.$message({
+                        message: data.rtnMsg,
+                        type: 'success',
+                        showClose:true,
+                      });
+                    }
+                    self.getPage(1);
+                  },
+                  error(data) {
+                    self.$common.closeDialog(dialogOption.dialog);
                     self.$message({
                       message: data.rtnMsg,
-                      type: 'success',
+                      type: 'warning',
                       showClose:true,
                     });
                   }
-                  self.getPage(1);
-                },
-                error(data) {
-                  self.$common.closeDialog(dialogOption.dialog);
-                  self.$message({
-                    message: data.rtnMsg,
-                    type: 'warning',
-                    showClose:true,
-                  });
                 }
-              }
-            }]
-          };
-          self.$common.openDialog(dialogOption);
+              }]
+            };
+            self.$common.openDialog(dialogOption);
+          }
         }
       }
       else {

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

@@ -1045,6 +1045,12 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       get sideBarWidth() {
         return source.content.sideBarWidth || 360;
       },
+      set sideBarWidth(v) {
+        source.content.sideBarWidth = v;
+      },
+      get mainBarWidth() {
+        return source.content.mainBarWidth;
+      },
       get selectedRowBackColor() {
         return source.content.selectedRowBackColor;
       },

package/src/main.js

@@ -16,14 +16,14 @@ Vue.config.productionTip = false;
 Vue.use(centaline, {
   // baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.46:6060/onecard-api/",
-  // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
+  baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.13:6060/onecard-api/",
   // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.25.10.63:22026/service-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:8080/",
   // baseUrl: "https://ccesutest.centaline.com.cn/service-api/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
-  baseUrl: "http://10.88.22.42:9999/service-api/",
+  // baseUrl: "http://10.88.22.42:9999/service-api/",
   // baseUrl: "http://10.1.245.111:38028/",
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // baseUrl: "http://tjcpuat.centaline.com.cn:9090/",
@@ -56,14 +56,14 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '1f487e18-c090-4d24-b9a7-630de58cfccc',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOwjAQBP_iOifZuYvvnC62k4ZHRDYxElSIJBII8XeCgI6eKbaYYnfval6zalWUTlMYEEJfN0CRG-gGFvBBRPuakbyM7gP8iC-jMeTY2B46xwHIEoKYIBDIBhpij8FHValyPavWsDZSO22bSh3T8hZMtX2JdS6XXbn949xpOW6znFyZChNkmQhIo4U8ZYTDfqvQyWDCoh5PAAAA__8.819W_FW6PWIm3sqKcC1EXrcMlKujBUCQj6I0-_sIa_Y',
-        authObject: '{token:"1080-1740569404179091456"}',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjtuQjEQAO_impX257e7dDbPbnII5CcciVRRAIko4u6QXCLdaJqZn3S5bWmf2NambSGojQSUVV4kDIg5r7X0Vo2P0Uv2FRWYo4J26-BhAplCCrrXVvXoByRGJsiHYqBWMpTcA6Qtao62YuW0S_P-mfZkmFEIkXfpPK5_QkN1-RW3y_x6m9__MfdxPb-yFjrG--bgMgYoLQY-TwaiOIOm8xan9HgCAAD__w.4jCyT_u3R2dSGF8JNYqo1KsN_0kjhkkkUIXARuRASfQ',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjtuQjEQAO_impX257e7dDbPbnII5CcciVRRAIko4u6QXCLdaJqZn3S5bWmf2NambSGojQSUVV4kDIg5r7X0Vo2P0Uv2FRWYo4J26-BhAplCCrrXVvXoByRGJsiHYqBWMpTcA6Qtao62YuW0S_P-mfZkmFEIkXfpPK5_QkN1-RW3y_x6m9__MfdxPb-yFjrG--bgMgYoLQY-TwaiOIOm8xan9HgCAAD__w.4jCyT_u3R2dSGF8JNYqo1KsN_0kjhkkkUIXARuRASfQ"}',
 
         // originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: ' {"estateId":"20111129152318499305689117E3B934","estateName":"%E9%BC%8E%E5%B3%B0.%E5%9B%BD%E6%B1%87%E5%B1%B1","estDeptPath":"009.010.007"}',
         estateId: '',
 
-        authObject: '{"currentEstate":{"estateId":"20111129152318499305689117E3B934","estateName":"%E9%BC%8E%E5%B3%B0.%E5%9B%BD%E6%B1%87%E5%B1%B1","estDeptPath":"009.010.007"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"9233406a0587299328ce14a5e25c25d0","token":"","random":"v9WVnK","time":1703832144841,"sign":"425035fc7fbb05a157106ae015b0e184"}',
+        // authObject: '{"currentEstate":{"estateId":"20111129152318499305689117E3B934","estateName":"%E9%BC%8E%E5%B3%B0.%E5%9B%BD%E6%B1%87%E5%B1%B1","estDeptPath":"009.010.007"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"9233406a0587299328ce14a5e25c25d0","token":"","random":"v9WVnK","time":1703832144841,"sign":"425035fc7fbb05a157106ae015b0e184"}',
         AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijk5N2NhMDY3LWI2M2EtNGE0Mi1hOTczLTY0N2EzZTA2OTZiYyJ9.lh7zmru5RGWXyZq-DvFxt4squt0M7hokv5jmBIBENKeNnMfjRJ-AntnJW9YOvmwwjGvoSk3J885H03Wjed8Pug',
       };
     },