centaline-data-driven 1.3.32 → 1.3.35

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

@@ -558,7 +558,11 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         var self = this;
         var searchFields = {
           fields: []
-        }; //this.searchModel ? this.searchModel.searchData : { fields: [] };
+        }; 
+        //this.searchModel ? this.searchModel.searchData : { fields: [] };
+        if(this.searchModel && this.searchModel.searchDataOfHide){
+          searchFields=this.searchModel.searchDataOfHide
+        }
         var searchValue1 = router.flagAddRowAfterAction ? rtnData.responseData.content : rtn.listData[rtn.selectIndex][self.primaryKey];
         if (self.primaryKey) {
           searchFields.fields.push({
@@ -835,12 +839,6 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
           }
         });
       },
-      export (btn, submitData) {
-        Vue.prototype.$api.postHandler(common.globalUri(), {
-          action: btn.action,
-          para: submitData
-        });
-      },
       _scripts: null,
       get scripts() {
         if (rtn._scripts !== null) {
@@ -914,7 +912,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         }
       }
     );
-  } else {
+  } 
+  else {
     return init(data);
   }
 }

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

@@ -1,8 +1,8 @@
 <template>
   <div class="ct-progress">
-    <div>
-      <el-progress :text-inside="true" :stroke-width="18" :percentage="percentage"></el-progress>
-      <span>{{message}}</span>
+    <div style="padding: 5px;">
+      <el-progress type="circle" :percentage="percentage"></el-progress>
+      <span class="progressMsg">{{ message }}</span>
     </div>
   </div>
 </template>
@@ -13,6 +13,10 @@
     props: {
       progressAction: String,
       progressKey: String,
+      progressType:  {
+        type: String,
+        default: 'export'
+      },
     },
     data() {
       return {
@@ -39,21 +43,31 @@
 
         this.$api.postHandler(this.$common.globalUri(), params, null).then((response) => {
           const data = response.content;
-          if (data && data.rtnMsg) {
-            self.message = data.rtnMsg;
+          if (data) {
+            if(data.processTaskName){
+              self.message = data.processTaskName;
+            }
+            else if(data.rtnMsg){
+              self.message = data.rtnMsg;
+            }
+            else if(response.rtnMsg){
+              self.message = response.rtnMsg;
+            }
           }
-          if (response.rtnCode === 200) {
+          if (response.rtnCode === 200 && data.rtnCode === 200) {
             this.percentage = data.percentage;
             if (data.flagFinished) {
-              window.open(data.content, "_blank");
-              setTimeout(() => { self.$emit('finished'); }, 800);
+              if(this.progressType=='export'){
+                window.open(data.content, "_blank");
+              }
+              setTimeout(() => { self.$emit('finished',data); }, 800);
             }
             else {
               setTimeout(() => { self.getApiData() }, 1000);
             }
           }
           else {
-            
+            self.$emit('error',data);
           }
         });
       }
@@ -67,4 +81,12 @@
   }
 </script>
 <style>
+.ct-progress {
+  text-align: center;
+}
+
+.progressMsg {
+  margin-top: 5px;
+  display: block;
+}
 </style>

package/src/main.js

@@ -12,11 +12,11 @@ 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.22:9999/v1/form/router",
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
-  baseUrl: "http://10.88.22.69:8080/", 
-  flagRouterSelf: true,
+  // baseUrl: "http://10.88.22.69:8080/", 
+  // flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
   showRequestErrorMessage: true,
@@ -41,7 +41,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '6c09a5a6-8bb2-46af-beed-9efd51a28263',
+        oldToken: 'a0c6a2be-f79e-47ea-8490-212d5f4f4ff4',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: ' {"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjYzMzZiMDJiLTZjOGEtNDIzNC05MGQ5LTliYWI2MTIyNTQzNyJ9.hOxMvGLm03QMPu9C4lgRzkEHC7ECqxJ_L6mfqQRqv39xJ42I8gzSRO-E68vWp-A99ewnxnqvTZ6H_6fOQ9DljQ',