centaline-data-driven 1.3.71 → 1.3.73

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

@@ -17,7 +17,7 @@
       <template v-if="showData.length === 1">
         <div
           v-for="(item, index) in showData[0]"
-          @click="handleClick($event, item)"
+          @click="handleClick($event, item,true)"
         >
           <ul class="btnTab">
             <li
@@ -44,7 +44,7 @@
       <template v-else-if="showData.length > 1">
         <div
           v-for="(item, index) in showData[0]"
-          @click="handleClick($event, item)"
+          @click="handleClick($event, item,true)"
         >
           <ul class="btnTab">
             <li
@@ -82,7 +82,7 @@
             <div
               class="popovertablf"
               v-for="(item, index) in showData[1]"
-              @click="handleClick($event, item)"
+              @click="handleClick($event, item,true)"
             >
               <ul class="popoverbtnTab" style="padding: 0px">
                 <li
@@ -169,8 +169,7 @@ export default {
         );
 
         if (i == -1 || self.selectStats == []) {
-          self.selectStats =
-            self.data[0].fieldName1 + "*" + self.data[0].code1;
+          self.handleClick(null, self.data[0], false);
         }
         self.FlagStatistics = true;
         self.showStats();
@@ -216,7 +215,7 @@ export default {
         self.$emit("setTableHeight");
       });
     },
-    handleClick(ev, obj) {
+    handleClick(ev, obj, flagRefreshTable) {
       var self = this;
       self.selectStats = obj.fieldName1 + "*" + obj.code1 
       var fields = self.model.searchData(
@@ -228,7 +227,7 @@ export default {
       var model = {
         searchData: fields,
       };
-      self.$emit("searchStats", model);
+      self.$emit("searchStats", model, flagRefreshTable);
     },
     searchStatsComplate(selectItem) {
       var self = this;

package/src/centaline/dynamicViewerFile/src/dynamicViewerFile.vue

@@ -142,7 +142,7 @@
                   </a>
                 </template>
                 <a v-if="itemFile.rightDownload"
-                   :href="resultObject.replace(/\/preview$/,'')" target="_blank"
+                   :href="resultObject" target="_blank"
                    class="magnify-btn el-icon-download"
                    title="下载"
                    :download="(itemFile.mediaLabelName || itemFile.fileName)"></a>

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

@@ -4,7 +4,7 @@ import valid from '../../../validate/index';
 import Enum from './lib/Enum';
 import common from '../../../common';
 import Vue from 'vue';
-const SearchCategory = function (source, callBack) {
+const SearchCategory = function (source, callBack,callBackError) {
   var init = function (data) {
     var rtn = {
       showLabel:true,
@@ -44,6 +44,11 @@ const SearchCategory = function (source, callBack) {
             callBack(rtn);
           }
         }
+        else{
+          if (callBackError) {
+            callBackError();
+          }
+        }
       }
     );
   }

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

@@ -12,8 +12,9 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.46:7070/v1/form/router",
+  // baseUrl: "http://10.88.22.46:7070/v1/form/router",
   // baseUrl: "http://10.88.23.25:9999/v1/form/router",
+  baseUrl: "http://10.88.22.42:9999/v1/form/router", 
   // baseUrl: "http://10.88.22.40:8080/", 
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // flagRouterSelf: true,
@@ -42,12 +43,14 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '42ccd644-040d-4e01-9521-1623f1884058',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZPs7AzDLp0u2HgIortLgpURSDTGu6sROnpf8YrX_P-EcT5DDdUCbmil8wu4oZWOSHxF2uLOVwFFhdFRcBhEgxyalsO-gQLy_Qo1qTKTKX1ZwHCafsFaoW-Yx3w75sc_zl2m4TMrSSlyn9BxIpRoFJ33jDEyG0Nq-tLC6w0AAP__.LCDLmwb3vICVdDcNIJhJO9N3M1wsu3srY-dsG5CxyUc',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZMwu-PsDp0u2HgIsitLgpURSDTGu6sROnpf8YrX_P-EcU5QgVvADa20uoAbWmmJWB1Jg3t1AVnYoqfgMbAEPtaNDYcaCsj3K1QkYq0nY1wBQ5x-wSj7b5jHfDvlxz_OXabhM5tdjLGkjEq9ImtMqHLuUZxoyruu60qC1xsAAP__.MSfJsiY9RKazxrFK7Tti9qCpFUH2tJtbkf_V7d_yNMQ',
+        
         originalRequestURL: 'http://10.88.22.67:8080',
-        EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
+        EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',
         estateId: '20210729104021C49F04B55C50F6AF58',
-        authObject: '{"currentEstate":{"estateId":"20111122105652A2A701D48134542934","estateName":"%E9%BE%99%E5%85%89%E5%9F%8E"},"platform":1,"OSVersion":"","clientVersion":"","machineCode":""}',
-        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjdjZjU3ZDhlLTUzNDItNGFhZC1iYThjLTg3OGNjNTcwZTc5MCJ9.X_b6c_D69_IX8dvQ90cfOqIXi-hTy449sJvzFw_rsXbyVc9obiybHSDycdJ6bgdbJW94XRjbqj9hPwiWyL3XSg',
+
+        authObject: '{"currentEstate":{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"},"platform":1,"OSVersion":"","clientVersion":"","machineCode":""}',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjA2MGI3YmMzLTI1NjgtNDYzNS1iMmM4LTBlM2NlMmUyYjQzMyJ9.hZOUnj7eGNlpjNmdQbfGbZsSWJgF-PUNyn8dgUMtOUjV0pRwKUQU60lc5H0JllH2AuecDe0dhx4iwm5_HndB1A',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作