centaline-data-driven 1.3.70 → 1.3.72

package/package.json

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

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

@@ -18,11 +18,11 @@
                :limit="parseInt(model.max || 999)"
                :on-exceed="handleExceed">
       <i slot="default" class="el-icon-plus"></i>
-      <!--<i slot="default" class="el-icon-plus" style="position: relative;"><div @click="testss($event)" class="max-ewmsc"></div></i>-->
-
       <div slot="tip" class="el-upload__tip errorMessage" v-show="!valid">
         {{ validMessage }}
       </div>
+      <div slot="tip" v-show="model.description" v-html="model.description">
+      </div>
       <div slot="file" slot-scope="{ file }" :title="file.fileName">
         <div class="cover-list-item">
           <el-image fit="fill" :src="file.url" style="width: 100px; height: 100px" :z-index="previewZIndex" @click="viewerfile(file)">

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

@@ -288,7 +288,7 @@ export default {
       this.selectAllType = this.model.getSelectAll();
 
       this.$nextTick(() => {
-        self.loadStats();
+       self.loadStats();
         window.addEventListener("resize", (ev) => {
           self.setTableHeight();
         });
@@ -433,6 +433,9 @@ export default {
       self.tableLoading = true;
 
       this.model.getPage(index, next);
+      self.$nextTick(() => {
+        self.loadStats();
+      });
     },
     toSort(ev, col, action) {
       var self = this;
@@ -796,7 +799,7 @@ export default {
       }
 
       if (field.flagAttachSearchCondition) {
-        submitData["searchFields"] = self.model.searchModel.searchData;
+        submitData["searchFields"] = self.model.getSearchData();
       }
 
       this.routerClickHandler(field, submitData, action);

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

@@ -298,6 +298,9 @@ const Base = function (source) {
     get routerKeyForEnterKey() {
       return source.routerKeyForEnterKey;
     },
+    get description() {
+      return source.description;
+    },
   };
 
   return rtn;

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

@@ -481,13 +481,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
           // self.searchModel.setBtnLoading(true);
         }
 
-        var newSearchModel = common.deepClone(this.searchModel.searchData ? this.searchModel.searchData : {});
-        if (self.searchStats && self.searchStats.searchData && self.searchStats.searchData.fields) {
-
-          self.searchStats.searchData.fields.forEach((v) => {
-            newSearchModel.fields.push(v);
-          });
-        }
+        var newSearchModel = this.getSearchData();
 
         Vue.prototype.$api.postHandler(common.globalUri(), {
             action: data,
@@ -555,6 +549,16 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             console.error(error);
           });
       },
+      getSearchData(){
+        var self = this;
+        var newSearchModel = common.deepClone(this.searchModel.searchData ? this.searchModel.searchData : {});
+        if (self.searchStats && self.searchStats.searchData && self.searchStats.searchData.fields) {
+          self.searchStats.searchData.fields.forEach((v) => {
+            newSearchModel.fields.push(v);
+          });
+        }
+        return newSearchModel;
+      },
       getCurrentRowApiData(callback, rtnData, router, cellindex) {
         var self = this;
         var searchFields = {

package/src/main.js

@@ -42,7 +42,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '42ccd644-040d-4e01-9521-1623f1884058',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVby2rv-pCNOaDhEFBsXoUIkkUCIuwMi6dIzxRTTvPeEaUlQg1vBHW30YQV3tNETcXBkOzwEF5EtG_QUPUa2kY9tZ2LTQgXlfoWarDVakxWpYBzmXyAj-huWqdxO5fGPc5d5_MwGCUqS9phTUsisFQ5ZGSyFg850FhGG1xsAAP__._bIs6F-PKatDpGVpnwJkgA9y7oaWPycWYjSN5gFSsI8',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZPs7AzDLp0u2HgIortLgpURSDTGu6sROnpf8YrX_P-EcT5DDdUCbmil8wu4oZWOSHxF2uLOVwFFhdFRcBhEgxyalsO-gQLy_Qo1qTKTKX1ZwHCafsFaoW-Yx3w75sc_zl2m4TMrSSlyn9BxIpRoFJ33jDEyG0Nq-tLC6w0AAP__.LCDLmwb3vICVdDcNIJhJO9N3M1wsu3srY-dsG5CxyUc',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
         estateId: '20210729104021C49F04B55C50F6AF58',