centaline-data-driven 1.5.66 → 1.5.68

package/src/SearchList.vue

@@ -1,13 +1,25 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
+
     <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/transaction-workflow/getLayoutOfSearch'" :searchDataApi="'/api/third-dept-tran/transaction-workflow/list'"></ct-searchlist> -->
 
-     <ct-searchlist :searchConditionApi="'/TaskList/getLayoutOfSearch'" :searchDataApi="'/TaskList/getListOfSearchModel'" ></ct-searchlist> 
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/tran-list/layout'"  :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
     
-    <!-- <ct-searchlist :apiParam="para"
-      :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" 
-      :searchDataApi="'/api/third-dept-tran/tran-list'">
-    </ct-searchlist> -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/profit-return/layout'"  :searchDataApi="'/api/third-dept-tran/profit-return'"></ct-searchlist> -->
+
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-layout'"  :searchDataApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-list'"></ct-searchlist> -->
+
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/finance/tran-commission-allocate/process-layout'"  :searchDataApi="'/api/finance/tran-commission-allocate/process-list'"></ct-searchlist> -->
+
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/shift-approver/layout'"  :searchDataApi="'/api/shift-approver/list'"></ct-searchlist> -->
+
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/api/necessaryFile/importTransFile/getLayoutOfSearch'" :searchDataApi="'/api/necessaryFile/importTransFile/getTableList'"></ct-searchlist> -->
+    
+
+    <!-- <ct-searchlist :searchConditionApi="'/mainlandsecond/CustAndContractRegSumList/getLayoutOfSearch'"  :searchDataApi="'/mainlandsecond/CustAndContractRegSumList/getList'"></ct-searchlist> -->
+
+     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/filemanage/batchdownlist/getLayoutOfSearch'"  :searchDataApi="'/filemanage/batchdownlist/getList'"></ct-searchlist> -->
+
 
     <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/api/transaction/adjustRecord/getLayoutOfSearch'" 
@@ -37,16 +49,12 @@
       :searchStatsApi="'/ProfileWorklistList/getListStats'">
     </ct-searchlist> -->
 
-     <!--<ct-searchlist :apiParam="para"
-      :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" 
-      :searchDataApi="'/CallTaskList/getListOfSearchModel'">
-    </ct-searchlist>--> 
+    <!-- <ct-searchlist :apiParam="para"
+      :searchConditionApi="'/RightValueList/getLayoutOfSearch'" 
+      :searchDataApi="'/RightValueList/getListOfSearchModel'">
+    </ct-searchlist> -->
 
-    <!--<ct-searchlist 
-      :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" 
-      :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" :searchStatsApi="'/PropertyPublishList/getListStatsForRET'"
-      :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
-    </ct-searchlist>-->
+    <!-- <ct-searchlist :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" :searchStatsApi="'/PropertyPublishList/getListStatsForRET'" :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'"></ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
@@ -54,25 +62,37 @@
       :searchStatsApi="'/PropertyRETList/getListStats'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'" :appRootUrl="appRootUrl"
       :searchDataApi="'/PropertyOFIList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyOFIList/getLayoutOfSearchCategory'"
       :searchStatsApi="'/PropertyOFIList/getListStats'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/EstateList/getLayoutOfSearch'"
-      :searchDataApi="'/EstateList/getListOfSearchModel'">
-    </ct-searchlist> -->
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/EstateList/getLayoutOfSearch'" :searchDataApi="'/EstateList/getListOfSearchModel'"></ct-searchlist> -->
     
-    <!-- <ct-searchlist :searchConditionApi="'/EstateBuildingList/getLayoutOfSearch'"
-      :searchDataApi="'/EstateBuildingList/getListOfSearchModel'">
-    </ct-searchlist> -->
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/EstateBuildingList/getLayoutOfSearch'" :searchDataApi="'/EstateBuildingList/getListOfSearchModel'"></ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/DistrictList/getLayoutOfSearch'"
-      :searchDataApi="'/DistrictList/getListOfSearchModel'">
-    </ct-searchlist> -->
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/DistrictList/getLayoutOfSearch'" :searchDataApi="'/DistrictList/getListOfSearchModel'"></ct-searchlist> -->
+
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/CustomerImportList/getLayoutOfSearch'" :searchDataApi="'/CustomerImportList/getListOfSearchModel'"></ct-searchlist> -->
     
-    <!-- <ct-searchlist :searchConditionApi="'/RoleList/getLayoutOfSearch'" :searchStatsApi="'/RoleList/getListStats'" :searchDataApi="'/RoleList/getListOfSearchModel'"></ct-searchlist> -->
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/CustomerList/getLayoutOfSearch'" :searchStatsApi="'/CustomerList/getListStats'" :searchDataApi="'/CustomerList/getListOfSearchModel'"></ct-searchlist> -->
+
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" :searchDataApi="'/CallTaskList/getListOfSearchModel'"></ct-searchlist> -->
+    
+    <!-- <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="'/cache/getLayoutOfSearchForCache'" :searchDataApi="'/cache/getListOfSearchModelForCache'"></ct-searchlist> -->
+    
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/AttendanceClassList/getLayoutOfSearch'" :searchDataApi="'/AttendanceClassList/getListOfSearchModel'"></ct-searchlist> -->
+
+    <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/ReportMonthAttendanceList/getLayoutOfSearch'" :searchDataApi="'/ReportMonthAttendanceList/getListOfSearchModel'"></ct-searchlist>
+
+
 
     <ct-dialog-list></ct-dialog-list>
   </div>
@@ -84,6 +104,9 @@
     name: 'DataDrivenSearch',
     data() {
       return {
+        // appRootUrl:'http://10.88.22.13:17070/max-uplink-api/',
+        // appRootUrl:'http://10.88.22.13:6060/onecard-api/',
+        appRootUrl:'',
         para:{
           
         },

package/src/centaline/api/index.js

@@ -127,7 +127,11 @@ Axios.defaults.maxContentLength = 400000;
 
 const api = {
   get(url, params, callback) {
-    if (common.flagRouterSelf()) {
+    if(params.action.indexOf('http://')>-1||params.action.indexOf('https://')>-1){
+      url=params.action;
+      params = params.para;
+    }
+    else if (common.flagRouterSelf()) {
       url = url + (url=='' || url.substr(-1)=='/'?'':'/') + params.action;
       params = params.para;
     }
@@ -142,7 +146,11 @@ const api = {
     );
   },
   post(url, params, callback) {
-    if (common.flagRouterSelf()) {
+    if(params.action.indexOf('http://')>-1||params.action.indexOf('https://')>-1){
+      url=params.action;
+      params = params.para;
+    }
+    else if (common.flagRouterSelf()) {
       url = url + (url=='' || url.substr(-1)=='/'?'':'/') + params.action;
       params = params.para;
     }
@@ -165,7 +173,6 @@ const api = {
 
     // 执行js
     if (data.clientActionType === Enum.ClientActionType.ExcuteScript && data.content) {
-      // eval(data.content);
       common.excute.call(scripts, data.content);
     }
 
@@ -241,15 +248,21 @@ const api = {
       return Promise.reject(response);
     }
     //返回给下一个链式调用
-    return Promise.resolve(response.data);
+    return Promise.resolve(response.data,response.headers);
   },
   postHandler(url, params, scripts) {
-    if (common.flagRouterSelf()) {
+    if(params.action.indexOf('http://')>-1||params.action.indexOf('https://')>-1){
+      url=params.action;
+      params = params.para;
+    }
+    else if (common.flagRouterSelf()) {
       url = url + (url=='' || url.substr(-1)=='/'?'':'/') + params.action;
       params = params.para;
     }
+    let responseType=params.responseType || 'json';
     return Axios.post(url, params, {
-      headers: common.getDataDrivenOpts().handler.getRequestHeaders()
+      headers: common.getDataDrivenOpts().handler.getRequestHeaders(),
+      responseType:responseType
     }).then((response) => {
       return this.postThenHandler(response, scripts);
     }).catch((ex) => {
@@ -269,6 +282,38 @@ const api = {
       }
       return Promise.resolve(ex.data ? ex.data : ex);//错误处理了，直接返回成功，要判断response.rtnCode=200再处理
     });
+  },  
+  postBlobHandler(url, params, scripts) {
+    if(params.action.indexOf('http://')>-1||params.action.indexOf('https://')>-1){
+      url=params.action;
+      params = params.para;
+    }
+    else if (common.flagRouterSelf()) {
+      url = url + (url=='' || url.substr(-1)=='/'?'':'/') + params.action;
+      params = params.para;
+    }
+    return Axios.post(url, params, {
+      headers: common.getDataDrivenOpts().handler.getRequestHeaders(),
+      responseType:'blob'
+    }).then((response) => {
+      return this.postThenHandler(response, scripts);
+    }).catch((ex) => {
+      if (ex.message) {
+        Vue.prototype.$message({
+          message: ex.message,
+          type: 'error',
+          showClose:true,
+        });
+      }
+      else if (typeof ex.data === "string") {
+        Vue.prototype.$message({
+          message: ex.data,
+          type: 'error',
+          showClose:true,
+        });
+      }
+      return Promise.resolve(ex);//错误处理了，直接返回成功，要判断response.rtnCode=200再处理
+    });
   },
   SliceUpload(url, params, scripts) {
     return Axios.post(url, params, {

package/src/centaline/dynamicCb/src/dynamicCb.vue

@@ -25,7 +25,8 @@
     mixins: [dynamicElement],
     props: {
       vmodel: Object,
-      api: String
+      api: String,
+      from:String
     },
     data() {
       return {
@@ -50,6 +51,9 @@
     methods: {
       load(data) {
         this.model = data;
+        if(this.from=="form"&&this.model.code1==""){
+           this.model.code1="0";
+        }
       },
       toggleCheckbox() {
     this.model.value = !this.model.value;

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -665,7 +665,7 @@
                     field.doAction(submitData, (data) => {
                       if (data.content) {
                         if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {
-                          if(data.action.indexOf(".zip") > -1){
+                          if(data.content.indexOf(".zip") > -1){
                             window.location.href = encodeURI(data.action);
                           }
                           else{
@@ -989,7 +989,7 @@
           if (f.model && typeof f.validExcute !== 'undefined') {
             if (!f.validExcute()) {
               if (i === 0) {
-                if (f.model.is == "ct-file"||f.model.is == "ct-repeat") {
+                if (f.model.is == "ct-file"||f.model.is == "ct-repeat"||f.model.is == "ct-form-list-table") {
                   self.$message({
                     message: f.validMessage,
                     type: 'error',

package/src/centaline/dynamicForm/src/dynamicFormListTable.vue

@@ -14,7 +14,7 @@
     <div id="listTable">
       <el-row>
         <el-col :span="24">
-          <el-table size="mini" class="max-table--border" :data="model.tableData" :key="itemKey" border 
+          <el-table size="mini" class="max-table--border" :data="model.tableData" border 
             style="width: 100%" highlight-current-row :show-summary="model.showSummary" :summary-method="getSummaries">
              <!--数据列-->
             <el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" :width="v.width" :fixed="model.frozenColumns.includes(v.id)" v-if="v.show !== false && v.type!==13" :render-header="renderHeader" :min-width="tableColumnWith">
@@ -26,12 +26,12 @@
               <template slot-scope="scope">
                 <span v-if="scope.row.isSet">
                   <component ref="Fields" :is="model.currentRow.data[v.id].locked || model.currentRow.data[v.id].is!==v.is?model.currentRow.data[v.id].is:v.is" 
-                    :vmodel="model.currentRow.data[v.id]" :api="model.OptApi" :key="model.currentRow.data[v.id].rowKey"
+                    :vmodel="model.currentRow.data[v.id]" :api="model.OptApi" :key="model.currentRow.data[v.id].rowKey+itemKey"
                     @change="changeHandler(model.currentRow.data[v.id], model.currentRow.data.$sourceIndex)"
                     @input="inputHandler(model.currentRow.data[v.id], model.currentRow.data.$sourceIndex)"></component>
                 </span>
                 <span v-else-if="v.is=='ct-sensitiveeye'">
-                  <component ref="Fields" :is="v.is" :vmodel="scope.row[v.id]" :vrowmodel="scope.row" :api="model.OptApi"></component>
+                  <component ref="Fields" :is="v.is" :vmodel="scope.row[v.id]" :vrowmodel="scope.row" :api="model.OptApi" :key="model.currentRow.data[v.id].rowKey+itemKey"></component>
                 </span>
                 <!--可点击的列-->
                 <span v-else-if="v.router" :class="'cell'" style="display: flex;">
@@ -39,7 +39,7 @@
                   <ct-tablecurrency :router="v.router" :colValue="scope.row[v.id].code1" :rowData="scope.row" @click="rolRouterClickHandler">
                   </ct-tablecurrency>
                 </span>
-                <ct-span v-else :vmodel="scope.row[v.id]" :rowNum="scope.row.$sourceIndex" :rowData="scope.row" :key="scope.row[v.id].rowKey" ref="FieldsLabel"></ct-span>
+                <ct-span v-else :vmodel="scope.row[v.id]" :rowNum="scope.row.$sourceIndex" :rowData="scope.row" :key="scope.row[v.id].rowKey+itemKey" ref="FieldsLabel"></ct-span>
               </template>
             </el-table-column>
 
@@ -142,7 +142,7 @@
             break;
           case 43:
             labelShow=this.vmodel.value?'是':'否';
-            break;
+            break;            
           default:
             break;
         }
@@ -169,7 +169,6 @@
         itemKey: Math.random(),
 		    tableColumnWith: 0,
         fixedButtons:false,
-        scrollLeft:0,
       }
     },
     created() {
@@ -183,22 +182,7 @@
         self.model.refFieldsLabel = this.$refs.FieldsLabel;
       });
     },
-    mounted() {
-      let self=this;
-      this.$nextTick(function () {
-        let domT=document.querySelector('#listTable');
-        if(domT){
-          let domB=domT.querySelector('.el-table__body-wrapper');
-          if(domB && domB.scrollWidth>domB.offsetWidth){
-            this.fixedButtons='right';
-          }
-          if(domB){
-            domB.addEventListener("scroll", function(){
-              self.scrollLeft=domB.scrollLeft;
-            });
-          }
-        }
-      });
+    mounted() {      
     },
     methods: {
       getHeadClass(v) {
@@ -230,7 +214,6 @@
           app.model.currentRow.isNew = true;
           app.model.currentRow.index = app.model.tableData.length - 1;
         }
-        app.resetScroll();
       },
       //修改
       saveRow(row, index, isCancel) {
@@ -259,7 +242,6 @@
           }
           row.isSet = !row.isSet;
           app.itemKey = Math.random();
-          app.resetScroll();
           return ;
         }
 
@@ -288,7 +270,6 @@
               app.itemKey = Math.random();
               this.model.change = this.model.formListChange;
               app.$emit('change');
-              app.resetScroll();
             }
           }
         }
@@ -299,7 +280,6 @@
           app.model.currentRow.isSet = true;
           row.isSet = true;
           app.itemKey = Math.random();
-          app.resetScroll();
         }     
       },
       //删除
@@ -334,8 +314,6 @@
               fd.$forceUpdate();
             }
           });
-          self.itemKey = Math.random();
-          self.resetScroll();
         });
       },
       fieldsValidExcute() {
@@ -365,11 +343,7 @@
         };
 
         if (rtnBool && self.model.required && this.model.tableData.length === 0) {
-          self.$message({
-            message: this.model.label + " 表格不能为空",
-            type: 'warning',
-            showClose:true,
-          });
+          self.validMessage=this.model.label + " 表格不能为空";
           rtnBool = false;
         }
         self.foucus = true;
@@ -503,23 +477,6 @@
         document.body.removeChild(span);
         return h('span', column.label);
       },
-      resetScroll(){
-        let self=this;
-        this.$nextTick(function () {
-          let domT=document.querySelector('#listTable');
-          if(domT){
-            let domB=domT.querySelector('.el-table__body-wrapper');
-            if(domB){
-              if(this.scrollLeft>0){
-                domB.scrollLeft=this.scrollLeft;
-              }
-              domB.addEventListener("scroll", function(){
-                self.scrollLeft=domB.scrollLeft;
-              });
-            }
-          }
-        });
-      },
     }
   }
 </script>

package/src/centaline/dynamicHyperLink/index.js

@@ -8,4 +8,4 @@ if (typeof window !== 'undefined' && window.Vue) {
   window.Vue.use(dynamicHyperLink);
 }
 
-export default dynamicHyperLink
+export default dynamicHyperLink

package/src/centaline/dynamicLayout/src/dynamicLayoutChildren.vue

@@ -1,12 +1,12 @@
-<template>
-  <el-container  v-if="model.routerKey&&model.visibility!='0'&&model.rightRouter&&model.value!=''"  :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
-    <div  @click="clickHandlerLayout($event)">
-      <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
-    </div>
-  </el-container>
-  <el-container  v-else-if="model.value!=''&&model.visibility!='0'" :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
-    <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
-  </el-container>
+<template>
+  <el-container  v-if="model.routerKey&&model.visibility!='0'&&model.rightRouter&&model.value!=''"  :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
+    <div  @click="clickHandlerLayout($event)">
+      <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
+    </div>
+  </el-container>
+  <el-container  v-else-if="model.value!=''&&model.visibility!='0'" :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
+    <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
+  </el-container>
 </template>
 <script>
   import dynamicElement from '../../mixins/dynamicElement'
@@ -37,13 +37,13 @@
       };
     },
     created() {
-      this.model = this.loaderObj.CellLayout(this.vmodel);
+      this.model = this.loaderObj.CellLayout(this.vmodel);
     },
     methods: {
       clickHandler(routerKey, rowindex, forname, forrowindex,flagHaveAlert) {
         this.$emit('click', routerKey, rowindex, forname, forrowindex,flagHaveAlert);
-      },
-      clickHandlerLayout(ev) {
+      },
+      clickHandlerLayout(ev) {
         this.$emit(
           "click",
           this.model.routerKey,
@@ -64,16 +64,16 @@
           for (const vn of vnodes) {
             destroyDeep(vn)
           }
-        }
-        if (typeof vnode.componentInstance !== 'undefined') {
-          vnode.componentInstance.$destroy()
+        }
+        if (typeof vnode.componentInstance !== 'undefined') {
+          vnode.componentInstance.$destroy()
         }
         setTimeout(() => {
           vnode.componentInstance = undefined
           vnode.elm.innerHTML = ''
         }, 0)
       }
-      destroyDeep(this._vnode)
+      destroyDeep(this._vnode)
     },
   }
-</script>
+</script>

package/src/centaline/dynamicPlaceHolder/index.js

@@ -8,4 +8,4 @@ if (typeof window !== 'undefined' && window.Vue) {
   window.Vue.use(dynamicPlaceHolder);
 }
 
-export default dynamicPlaceHolder
+export default dynamicPlaceHolder

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

@@ -478,7 +478,7 @@ import dynamicElement from '../../mixins/dynamicElement';
                     field.doAction(submitData, (data) => {
                       if (data.content) {
                         if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {
-                          if(data.action.indexOf(".zip") > -1){
+                          if(data.content.indexOf(".zip") > -1){
                             window.location.href = encodeURI(data.action);
                           }
                           else{                          

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

@@ -691,7 +691,7 @@ export default {
             break;
           } 
           else {
-            topHeigth = topHeigth + this.model.listData[index].$heigth;
+            topHeigth = topHeigth + this.model.listData[index].$heigth||31;
           }
         }
         this.firstRow = index - 1;
@@ -1206,7 +1206,54 @@ export default {
           else if (field.isExport || field.flagAsync) {
             if (field.flagAsync) {
               field.doAction(submitData, (res) => {
-                if (res.content && res.content.action) {
+                if(res.rtnCode && res.rtnCode===202 && res.rtnMsg){
+                  self.$common.confirm(res.rtnMsg, '提示', {confirmButtonText: '确定',cancelButtonText: '取消',type: 'warning'}).then(() => {
+                    submitData.flagHaveAlert=1;
+                    field.doAction(submitData, (res) => {
+                      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: field.isExport ? 'export' : '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,
+                                  });
+                                }
+                                if(!field.isExport){
+                                  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: [{
@@ -1262,23 +1309,50 @@ export default {
                 }
               }
               else {
-                field.doAction(submitData, (data) => {
-                  if (data.content) {
-                    if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {
-                      if(data.action.indexOf(".zip") > -1){
-                        window.location.href = encodeURI(data.action);
-                      }
-                      else{
-                        if (data.content.indexOf("?") > -1) {
-                          self.downloadUrl = data.content + "&" + Math.random();
+                field.doBlobAction(submitData, (data,headers) => {
+                  if(data.type=="application/json"){
+                    const reader = new FileReader();
+                    reader.readAsText(data, 'utf-8');
+                    reader.onload=function(){
+                      data = JSON.parse(reader.result);
+                      if (data.content) {
+                        if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {
+                          if(data.content.indexOf(".zip") > -1){
+                            window.location.href = encodeURI(data.action);
+                          }
+                          else{
+                            if (data.content.indexOf("?") > -1) {
+                              self.downloadUrl = data.content + "&" + Math.random();
+                            }
+                            else {
+                              self.downloadUrl = data.content + "?" + Math.random();
+                            }
+                          }
                         }
                         else {
-                          self.downloadUrl = data.content + "?" + Math.random();
                         }
                       }
+                    };
+                  }
+                  else{
+                    if(!headers['content-disposition']){
+                      self.$message({
+                        message: '返回结果headers必须包含Access-Control-Expose-Headers和Content-Disposition！',
+                        type: 'error',
+                        showClose:true,
+                      });
+                      return false;
                     }
-                    else {
-                    }
+
+                    let blob = new Blob([data],{type:"application/octet-stream;"})
+                    const url = window.URL.createObjectURL(blob);
+                    const link = document.createElement('a');
+                    let fileName=decodeURIComponent(escape(headers['content-disposition'].split('filename=')[1]));                    
+                    link.href = url;
+                    link.setAttribute('download',fileName);
+                    document.body.appendChild(link);
+                    link.click();
+                    document.body.removeChild(link);
                   }
                 });
               }