centaline-data-driven 1.5.40 → 1.5.42

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

@@ -297,7 +297,8 @@ export default {
       theadTitleShow:false,
       theadTitleTop:0,
       theadTitleLeft:0,
-      theadTitleWidth:0
+      theadTitleWidth:0,
+      updateTableColumnsKey:0,
     };
   },
   deactivated(){
@@ -590,9 +591,12 @@ export default {
     },
     toSort(ev, col, action) {
       var self = this;
+      self.tableLoading = true;
       this.model.toSort(col, action, () => {
+        self.tableLoading = false;
         self.$forceUpdate();
         self.getScrollAttr();
+        self.$emit("simpleRouterRefreshHandler");
       });
       ev.cancelBubble = true;
       ev.stopPropagation();
@@ -741,7 +745,7 @@ export default {
           });
         }
         else {
-          if (this.$parent.$parent.$vnode.componentOptions.tag === "ct-PropertySimpleDetailRET") {
+          if (this.$parent.$parent.$vnode.componentOptions.tag === "ct-PropertySimpleDetailRET" || this.from=='simpleDetail') {
             var h1 = 0;
             if (this.$parent.$parent.$parent.$parent.$refs.sidebar) {
               h1 = this.$parent.$parent.$parent.$parent.$refs.sidebar.offsetHeight | 0;
@@ -776,7 +780,8 @@ export default {
             let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 - 290 -7;
             if(this.flagAppMode){
               tableHeight = tableHeight + 40;
-            }else{
+            }
+            else{
               tableHeight = tableHeight  - 40;
             }
             if (h2 == 0) {
@@ -1235,29 +1240,33 @@ export default {
             }
             else {
               if (field.action.indexOf("http://") === 0 || field.action.indexOf("https://") === 0) {
-                if (field.action.indexOf("?") > -1) {
-                  self.downloadUrl = field.action + "&" + Math.random();
+                if(field.action.indexOf(".zip") > -1){
+                  window.location.href = encodeURI(field.action);
                 }
-                else {
-                  self.downloadUrl = field.action + "?" + Math.random();
+                else{
+                  if (field.action.indexOf("?") > -1) {
+                    self.downloadUrl = field.action + "&" + Math.random();
+                  }
+                  else {
+                    self.downloadUrl = field.action + "?" + Math.random();
+                  }
                 }
-                // document.body.addEventListener('click', function() {
-                //   window.open(field.action, "_blank");
-                // });
               }
               else {
                 field.doAction(submitData, (data) => {
                   if (data.content) {
                     if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {
-                      if (data.content.indexOf("?") > -1) {
-                        self.downloadUrl = data.content + "&" + Math.random();
+                      if(data.action.indexOf(".zip") > -1){
+                        window.location.href = encodeURI(data.action);
                       }
-                      else {
-                        self.downloadUrl = data.content + "?" + Math.random();
+                      else{
+                        if (data.content.indexOf("?") > -1) {
+                          self.downloadUrl = data.content + "&" + Math.random();
+                        }
+                        else {
+                          self.downloadUrl = data.content + "?" + Math.random();
+                        }
                       }
-                      // document.body.addEventListener('click', function() {
-                      //   window.open(data.content, "_blank");
-                      // });
                     }
                     else {
                     }
@@ -1796,7 +1805,7 @@ export default {
         }
       });
     },
-    updateCurrentRow(router, data) {
+    updateCurrentRow(router, data,flagSimple) {
       let self = this;
       if (router.flagFreshCurrentRow || router.flagAddRowAfterAction) {
         self.tableComplate = true;
@@ -1805,6 +1814,9 @@ export default {
             self.$forceUpdate();
             self.tableComplate = false;
             self.$emit("searchComplate");
+            if(data && !flagSimple){
+              self.$emit("simpleRouterRefreshHandler");
+            }
           },
           data,
           router
@@ -1944,14 +1956,15 @@ export default {
         }
         self.$forceUpdate();
         self.$refs.footer.$forceUpdate();
-        self.updateCurrentRow(field, data);
-      } else {
+        self.updateCurrentRow(field, data,true);
+      } 
+      else {
         if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
           self.model.doAction({ responseData: data });
         }
         self.$forceUpdate();
         self.$refs.footer.$forceUpdate();
-        self.updateCurrentRow(field, data);
+        self.updateCurrentRow(field, data,true);
       }
     },
     refreshTableColumns(data) {
@@ -1974,6 +1987,8 @@ export default {
       else {
         self.loaderObj.SearchTable(self.api, self.load, self.model.searchModel, true);
       }
+      this.updateTableColumnsKey = this.updateTableColumnsKey + 1;
+      this.model.toolbarKey = this.updateTableColumnsKey;
     },
     popupClickHandler() {
       var tempListData = this.model.getSelectRowData({ isMulti: this.model.isMulti });

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

@@ -2,7 +2,7 @@
   <div ref="main" style="width: 100%;height: 100%;display: flex;" :class="{'domDisabled':pageDisabled}">
     <div class="ct-search-list" :style="{'height': pageHeight? pageHeight:'100%','width':searchWidth?searchWidth+'px':'100%'}" >
       <ct-searchscreen ref="screen" :api="searchConditionApi" :key="reloadKeyScreen"
-      @loaded="screenLoaded" :screenPara="screenPara" :prevParam="prevParam" 
+      @loaded="screenLoaded" :screenPara="screenPara" :prevParam="prevParam" @resetSearch="resetSearch()"
       :categoryLoaded="loaded.categoryLoaded" @search="search()" @saveShortcut="saveShortcut" 
       @showTitle="showTitleScreenHandler"></ct-searchscreen>
 
@@ -10,7 +10,7 @@
       @loaded="tableLoaded" :documentWidth="documentWidth" :flagPopupSearchlist="flagPopupSearchlist" :screenTop="screenTop" :flagAppMode="flagAppMode"
       @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate" 
       @rowClickHandle="rowClickHandle" @scrollHandle="scrollHandle" @refreshRowHandle="refreshRowHandle" @doClosePopoverHandle="doClosePopoverHandle" 
-      @showTitle="showTitleHandler" @popupClickHandler="popupClickHandler"></ct-searchtable>      
+      @showTitle="showTitleHandler" @popupClickHandler="popupClickHandler" @simpleRouterRefreshHandler="simpleRouterRefreshHandler"></ct-searchtable>      
     </div>
     <div ref="sidebar" v-if="flagSideBar && flagSideBarOfData" 
     :style="{'height': pageHeight? pageHeight:'100%','width':sideBarWidth+'px',right:sideBarRight+'px'}" 
@@ -167,6 +167,15 @@
           this.$refs.table.searchComplate(this.$refs.screen.model,this.$refs.screen.model.defaultSearch);
         }
       },
+      resetSearch() {
+        if (this.$refs.table.model) {
+          this.$refs.table.model.sortData = [];
+          this.$refs.table.model.columns.forEach((v1) => {
+            v1.sortAction = "";
+          });
+          this.search();
+        }
+      },
       searchComplate(index) {
         this.pageDisabled=false;
         if(this.flagSideBar && this.$refs.table.model.listData.length>0){
@@ -338,6 +347,10 @@
         this.selectIndex=-1;
         this.rowClickHandle();
       },
+      simpleRouterRefreshHandler() {
+        this.selectIndex=-1;
+        this.rowClickHandle();
+      },
       saveShortcut(){
         this.$refs.table.getPage(1);
       },

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

@@ -130,7 +130,9 @@ export default {
           self.$refs.Tree.setCurrentKey(self.model.modeltree[0].code)
         }
      });
-     self.handleNodeClick(self.model.modeltree[0],true);
+    if (self.model.modeltree&&self.model.modeltree[0]) {
+      self.handleNodeClick(self.model.modeltree[0],true);
+    }
 
       }
   

package/src/centaline/formData/index.js

@@ -88,7 +88,7 @@ const formData = {
         else {
             if (this.excuteData !== null) {
                 this._excuteListData = this.excuteData.filter((v) => {
-                    return typeof v.is !== undefined && v.is === 'ct-form-list-table';
+                    return typeof v.is !== undefined && (v.is === 'ct-form-list-table'||v.is === 'ct-repeat');
                 });
             }
         }
@@ -99,7 +99,7 @@ const formData = {
         if (fields !== null) {
             this.excuteData=fields;
             this._excuteListData = fields.filter((v) => {
-                return typeof v.is !== undefined && v.is === 'ct-form-list-table';
+                return typeof v.is !== undefined && (v.is === 'ct-form-list-table'||v.is === 'ct-repeat');
             });
         }
     },

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

@@ -34,6 +34,7 @@ const Detail = function (source, para, callBack) {
       _searchConditionApiTags1: null,
       _searchDataApiTags1: null,
       _paramDataTags1: null,
+      _appIDTags1: null,
       _operationApiRouter: null,
       _operationList: null,
       _operationRouters: [],
@@ -440,6 +441,18 @@ const Detail = function (source, para, callBack) {
         rtn._paramDataTags1 = {};
         if (v) rtn._paramDataTags1 = JSON.parse(v);
       },
+      get appIDTags1() {
+        if (rtn._searchConditionApiTags1 !== null) {
+          return rtn._appIDTags1;
+        }
+        else if (rtn.tags1 && rtn.tags1.length > 0) {
+          rtn._appIDTags1 = rtn.tags1[0].appID;
+          return rtn._appIDTags1;
+        }
+      },
+      set appIDTags1(v) {
+        rtn._appIDTags1 = v;
+      },
       get tags2() {
         return data.tags2;
       },

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

@@ -292,7 +292,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           else {
               if (this.excuteData !== null) {
                   this._excuteListData = this.excuteData.filter((v) => {
-                      return typeof v.is !== undefined && v.is === 'ct-form-list-table';
+                      return typeof v.is !== undefined && (v.is === 'ct-form-list-table'||v.is === 'ct-repeat');
                   });
               }
           }
@@ -303,7 +303,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           if (fields !== null) {
               this.excuteData=fields;
               this._excuteListData = fields.filter((v) => {
-                  return typeof v.is !== undefined && v.is === 'ct-form-list-table';
+                  return typeof v.is !== undefined && (v.is === 'ct-form-list-table'||v.is === 'ct-repeat');
               });
           }
         },

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

@@ -10,6 +10,8 @@ const Repeat = function (source, master, formobj) {
     form: null,
     refField: Object,
     refFieldsLabel: Object,
+    currentRowIndex: null,
+    currentEventField: null,
     get id() {
       return source.name;
     },
@@ -77,7 +79,7 @@ const Repeat = function (source, master, formobj) {
       }
       else {
         if (master.maxValue1) {
-          t = t + "（" + this.tableData.length + "/" + master.maxValue1 + "）";
+          t = t + "（" + this.tableData.filter((v) => {return v.deleted !== true;}).length + "/" + master.maxValue1 + "）";
         }
       }
       return t;
@@ -151,14 +153,16 @@ const Repeat = function (source, master, formobj) {
       else {
         this._rows = [];
         //遍历每一行
-        source.rows.forEach((r) => {
-          var row = rtn.initRow(r);
+        source.rows.forEach((r, i) => {
+          var gid = rtn.guid();
+          r.$sourceIndex = gid;
+          var row = rtn.initRow(r, i);
           this._rows.push(row);
         });
         return this._rows;
       }
     },
-    initRow(r) {
+    initRow(r, index) {
       var row = {
         field: [],
         get delete() {//删除权限
@@ -178,11 +182,11 @@ const Repeat = function (source, master, formobj) {
             r.flagDeleted = false;
           }
         },
-        get guid() {
-          return rtn.guid();
+        get $sourceIndex() {
+          return r.$sourceIndex||"";
         },
-        set guid(v) {
-          r.guid = v;
+        set $sourceIndex(v) {
+          r.$sourceIndex = v;
         },
       };
       //遍历每一列
@@ -192,7 +196,7 @@ const Repeat = function (source, master, formobj) {
         //let value = source.fields[key];
         value.onChanged = value.onChange ? value.onChange : source.rows[0].columns[rowIndex].onChanged;//事件使用第一条的
         value.onBlur = value.onBlur ? value.onBlur : source.rows[0].columns[rowIndex].onBlur;//事件使用第一条的
-        rowIndex++;
+
         let showLabel = true;
         if (typeof master.spanCols !== "undefined") {
           source.colSpan = master.spanCols;
@@ -200,16 +204,19 @@ const Repeat = function (source, master, formobj) {
         else {
           source.colSpan = formobj.colSpan;
         }
-        let item = LibFunction.GetControl(value, source, showLabel, false);
-        item.locked=!r.rightEdit;
+        let item = LibFunction.GetControl(value, formobj, showLabel, false);
         if (item instanceof Object) {
           item.form = rtn.form;
+          item.rowKey=Math.random();
           row.field.push(item);
         }
+        //rtn.allRequiredHandle(index);
+        rowIndex++;
       });
       //}
       return row;
     },
+    currentRow: null,
     _tableData: undefined,
     get tableData() {
       if (this._tableData) {
@@ -225,28 +232,128 @@ const Repeat = function (source, master, formobj) {
         }
         else {
           let newRow = this.getCloneRowData(0)
-          this.tableData.push(newRow);
-          this.addSourceRow();
+          this._tableData.push(newRow);
+          this.addSourceRow(newRow.$sourceIndex);
         }
         return this._tableData;
       }
     },
-    addSourceRow() {
+    addSourceRow($sourceIndex) {
       let sourceRow = JSON.parse(JSON.stringify(source.rows[0]));
+      sourceRow.$sourceIndex = $sourceIndex;
       source.rows.push(sourceRow);
-      let iRow = this.initRow(sourceRow);
+      let iRow = this.initRow(sourceRow, rtn.tableData.length - 1);
       iRow.isNewFlag = true;
-      iRow.guid = this.guid();
+      iRow.$sourceIndex = $sourceIndex;
       rtn._rows.push(iRow);
     },
     getCloneRowData(index) {
       let sourceRow = source.rows[index];
-      let rowData = rtn.initRow(JSON.parse(JSON.stringify(sourceRow)));
+      let rowData = rtn.initRow(JSON.parse(JSON.stringify(sourceRow)), rtn.tableData.length - 1);
       rowData.isNewFlag = true;
-      rowData.guid = this.guid();
+      rowData.$sourceIndex = this.guid();
       return rowData;
     },
-   
+    getCurrentRowData(index) {
+      let row = {};
+      let i = rtn.tableData.findIndex(v => v.$sourceIndex ===index);
+      let rowData =rtn.tableData[i];
+      for (let j = 0; j < rowData.field.length; j++) {//遍历每一列
+        row[rowData.field[j].id] = rowData.field[j];
+      }
+      row.$sourceIndex =  rowData.$sourceIndex+"";
+      return row;
+    },
+    //隐藏关联组件
+    hiddenHandle(item, index, update) {
+      if (item.id) {
+        let sign = false;
+        let field = null;
+        if (rtn.tableData.length > 0) {
+          for (var i in rtn.tableData[index].field) {
+            if (rtn.tableData[index].field[i].hiddenId === item.id) {
+              field = rtn.tableData[index].field[i];
+              if (field) {
+                let hiddenValueArr = field.hiddenValue.split(',');
+                if (hiddenValueArr.indexOf(item.code1) > -1) {
+                  field.show = false;
+                }
+                else {
+                  field.show = true;
+                }
+                sign = true;
+
+                if (update && rtn.self && sign) {
+                  rtn.self.$forceUpdate();
+                }
+              }
+            }
+          }
+
+        }
+
+      }
+    },
+     //验证必填关联组件
+     validMrf(item,index) {
+      let field = rtn.tableData[index].field[item.mrf];
+
+      if (field && field.self) {
+        if (field.type === Enum.ControlType.List) {
+          //f.required = '0';
+        }
+        else {
+          field.self.validExcute();
+        }
+      }
+    },
+    allRequiredHandle(index) {
+      if (rtn.tableData.length > 0) {
+        rtn.tableData[index].field.forEach(v => {
+          rtn.requiredHandle(v, index, null, false);
+        });
+      }
+
+    },
+    //处理必填关联组件
+    requiredHandle(item, index, update, doMrf) {
+      if (item.id) {
+        let field = null;
+        let value = rtn.getFieldValue(item);
+        if (rtn.tableData.length > 0) {
+          for (var i in rtn.tableData[index].field) {
+            if (rtn.tableData[index].field[i].mrf === item.id) {
+              field = rtn.tableData[index].field[i];
+
+              if (field) {
+                let hiddenValueArr = field.mrv.split(',');
+                if (hiddenValueArr.indexOf(value) > -1) {
+                  field.required = true;
+                }
+                else {
+                  field.required = false;
+                }
+               
+                if (update && rtn.self) {
+                  rtn.self.$forceUpdate();
+                }
+              }
+            }
+          }
+
+          if (doMrf !== false) {
+            rtn.validMrf(item,index);
+          }
+        }
+      }
+    },
+    getFieldValue(field) {
+      if (field.type == Enum.ControlType.Switch
+        || field.type == Enum.ControlType.CheckBox) {
+        return field.value ? '1' : '0';
+      }
+      return field.value;
+    },
     get formListChange() {
       return master.onChanged;
     },
@@ -273,7 +380,7 @@ const Repeat = function (source, master, formobj) {
     S4() {
       return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
     }
-  
+
   };
   return rtn;
 };

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

@@ -329,10 +329,10 @@ const SearchScreen = function (source, callBack, screenPara, prevParam) {
         this.screen.forEach((v) => {
           if (v.type !== Enum.ControlType.Hidden) {
             var tempObj = common.deepClone(v.searchObj);
+            if (that.isHandle(v.type)) {
+              tempObj.searchValue1 = that.getNewSearchValue(tempObj);
+            }
             if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
-              if (that.isHandle(v.type)) {
-                tempObj.searchValue1 = that.getNewSearchValue(tempObj);
-              }
               rtn.fields.push(tempObj);
             }
           }
@@ -340,10 +340,10 @@ const SearchScreen = function (source, callBack, screenPara, prevParam) {
         this.highScreen.forEach((v) => {
           if (v.type !== Enum.ControlType.Hidden) {
             var tempObj = common.deepClone(v.searchObj);
+            if (that.isHandle(v.type)) {
+              tempObj.searchValue1 = that.getNewSearchValue(tempObj);
+            }
             if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
-              if (that.isHandle(v.type)) {
-                tempObj.searchValue1 = that.getNewSearchValue(tempObj);
-              }
               rtn.fields.push(tempObj);
             }
           }

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

@@ -816,7 +816,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             if (equalNum === rtn.rowMergedColumns.length) {
               row.$rowspan = 0;
               rtn._lastRowspan.$rowspan++;
-              if(rtn._lastRowspan.$rowsMerged==undefined){
+              if(rtn._lastRowspan.$rowsMerged==undefined || rtn._lastRowspan.$rowsMerged==''){
                 rtn._lastRowspan.$rowsMerged=[];
                 if(rtn._lastRowIndex>-1){
                   rtn._lastRowspan.$rowsMerged.push(rtn._lastRowIndex);

package/src/centaline/progress/src/progress.vue

@@ -75,11 +75,16 @@ export default {
           this.percentage = data.percentage;
           if (data.flagFinished) {
             if (this.progressType == 'export' && data.content) {
-              if (data.content.indexOf("?") > -1) {
-                self.downloadUrl = data.content + "&" + Math.random();
+              if(data.content.indexOf(".zip") > -1){
+                window.location.href = encodeURI(data.content);
               }
-              else {
-                self.downloadUrl = data.content + "?" + Math.random();
+              else{
+                if (data.content.indexOf("?") > -1) {
+                  self.downloadUrl = data.content + "&" + Math.random();
+                }
+                else {
+                  self.downloadUrl = data.content + "?" + Math.random();
+                }
               }
               // document.body.addEventListener('click', function() {
               //   window.open(data.content, "_blank");

package/src/main.js

@@ -17,11 +17,11 @@ Vue.use(centaline, {
   baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
   // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
-  // baseUrl: "http://10.25.10.67:9999/service-api/v1/form/router",
+  // baseUrl: "http://10.25.10.63:9999/service-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:8080/",
   // baseUrl: "http://10.88.22.42:9999/service-api/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
-  // baseUrl: "http://10.88.22.40:8080/api/",
+  // baseUrl: "http://10.88.22.39:8080/",
   // baseUrl: "http://10.58.2.108:8080/",
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // baseUrl: "http://tjcpuat.centaline.com.cn:9090/",
@@ -56,16 +56,16 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'e9e9bcf4-4350-451d-9d5c-0fd175ca07b1',
+        oldToken: 'f328eca3-7e3d-41ef-beff-5533e83a8bb9',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVbyZ22v08WbpOEQkfOTQoVIIoEQdwcEdPRM8Ypp5t1g3XsooeZKkbQWpTEOqQ4OqzYwJmFWyQRLibv4AX_Ml05rikH7BqsYBMmTRdbCKOSF2rqxkmooYLqcoNSeI2sfoypgydtbBKvcS-zrdD5M13-cO27LM5sds86B0Bo3Ig0Ukb3N2Gfj5mFUZg4O7g8AAAD__w.HflXdzrl_bPMLnbiJfIQCXukU2WW-FZRrz-JR2q7eTE"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVbyZ-2108V20nCICIMthQqRRAIh7k4Q0NEzxSumeXOHec3QQnKdoDhojL0ySIkNdgM7DNE5ERRrCm70H_DHfBmlJM_S9th5jkiWNDoZHUaykYbU6xgSNFCuZ2il9cIKZS03MO2XtzDSqpdY53LZlds_4k7LtN0eFVUjWGI1B49UNOOWW5BE5my4lpoVPJ4AAAD__w.OX5oLp238UuHYjqOl2oF0wSleZV7Y500kQSjeRpTOIw"}',
 
         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"}',
         estateId: '201806071109550C867184E8BCA56EC3',
 
-        // authObject: '{"currentEstate":{"estateId":"20191114134322C29C9B83A84F192964","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"ce04f173da7df2e78a9da25595111387","token":"","random":"XNEYyu","time":1683686365201,"sign":"79be68006872c6a088eb49f7e3dab45a"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjYyOTk5ZDhjLTYwY2MtNGM0OS05MzM4LWY1MTBhNjI5OGVjYiJ9.A7lCMb4mBHjse6DlvFLVV5jEQSWzREtlbeZJ6StCW4kVyyRG4RlkhRl2FJvaBZEdtoEItI52IEgBsX4X_H1m4w',
+        // authObject: '{"currentEstate":{},"platform":1,"osVersion":"","clientVersion":"","machineCode":"470cac848b892484b949c6135dff97d6","token":"","random":"IVMfRJ","time":1689822719042,"sign":"19a04c54292bd44dfa5187983e27c530"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijc5OTlkYWY4LTAzN2ItNDMyMi1iMTRmLTA1OGU4OTgxMzk3OCJ9.6ltiN_svSpuTIi45IHktKTVZLpP2Y1w3oJsjPGFKaNaZ51XDvhhqkEe_0GhnNsJWLxQc4FX4Lpfhgne0SmJjHA',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作