centaline-data-driven 1.3.30 → 1.3.33

package/package.json

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

package/src/Form.vue

@@ -2,7 +2,7 @@
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/task'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -14,11 +14,11 @@
     data() {
       return {
         apiParam:{
-actionType: 3,
-originalTraId: "1547488795469586434",
-pageOnly: true,
-pageStyle: 2,
-pageTitle: "成交报告"
+actionType: "1",
+businessId: "1550013042447081473",
+pageOnly: "true",
+pageStyle: "2",
+stepId: "1550014106894327810"
           }
       }
     },

package/src/SearchList.vue

@@ -13,10 +13,10 @@
     </ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
-                   :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
-                   :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
-                    :searchStatsApi="'/exampleList/getListStats'"
-                   ></ct-searchlist> -->
+      :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
+      :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
+      :searchStatsApi="'/exampleList/getListStats'">
+    </ct-searchlist> -->
 
     <ct-dialog-list></ct-dialog-list>
   </div>

package/src/centaline/api/index.js

@@ -200,6 +200,7 @@ const api = {
             attrs: {
               progressAction: data.content.action,
               progressKey: data.content.key,
+              progressType:'export',
               width: '300px',
               height: '60px'
             },

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

@@ -1,6 +1,6 @@
 <template>
   <div v-loading="loading" :style="{width:pageWidth?pageWidth+'px':'100%',margin:'auto'}">
-    <div v-if="model !== null && !loading" class="ct-form"  :class="{'domDisabled':model.pageDisabled}">
+    <div v-if="model !== null && !loading" class="ct-form"  :class="{'domDisabled':model.pageDisabled}" :key="formKey">
       <!--可根据场景判断显示el-card还是el-main-->
       <component :is="model.showTitle?'el-main':'el-card'">
         <div slot="header" class="clearfix" v-if="typeof model.title !== 'undefined' && model.flagShowTitle">
@@ -74,6 +74,7 @@
             <component v-for="(btn, index) in model.buttons" :key="index" :is="btn.is" :vmodel="btn" @click="clickHandler" v-if="btn.show"></component>
           </el-col>
         </el-row>
+        <div v-if="isScroll" style="height: 34px;"></div>
       </component>
     </div>
     <div style="min-height:200px" v-if="loading"></div>
@@ -107,6 +108,7 @@
         isScroll: false,
         loading: true,
         activeName: '-1',
+        formKey:0,
         collapse: [],//分组数组
         collapseActiveNames: [],//默认展开的分组name
         collapseFieldsRow: [],//分组数组对应的行列布局
@@ -414,7 +416,16 @@
               }
               else if (field.isExport) {
                 submitData = field.getActionPara(submitData).para;
-                self.model.export(field, submitData);
+                if(field.flagAsync){
+                  self.model.export(field, submitData);
+                }
+                else{
+                  field.doAction(submitData, (data) => {
+                    if(data.content){
+                      window.open(data.content, "_blank");
+                    }
+                  });
+                }
               }
               else {
                 submitData = field.getActionPara(submitData).para;
@@ -422,6 +433,14 @@
                   if(field && field.changeCallBackFunName){
                     self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
                   }
+                  else if(field.isRefersh){
+                    self.collapse.splice(0, self.collapse.length);
+                    self.collapseActiveNames.splice(0, self.collapseActiveNames.length);
+                    self.collapseFieldsRow.splice(0, self.collapseFieldsRow.length);
+                    self.independentItem.splice(0, self.independentItem.length);
+                    self.load(self.loaderObj.Form(data.content));
+                    self.formKey=self.formKey+1;
+                  }
                   else{
                     self.model.doAction(data);
                   }
@@ -466,11 +485,43 @@
         }
       },
       importComplete(res,field) {
-        if(field && field.changeCallBackFunName){
-          this.changeCallBackHandler(field, field.changeCallBackFunName, res.content);
+        var self=this;
+        if(field.flagAsync){
+          if(res.content && res.content.action){
+            var dialogOption = {
+              title: "导入",
+              content: [{
+                component: 'ct-progress',
+                attrs: {
+                  progressAction: res.content.action,
+                  progressKey: res.content.key,
+                  progressType:'import',
+                  width: '300px',
+                  height: '60px'
+                },
+                on: {
+                  finished(data) {
+                    self.$common.closeDialog(dialogOption.dialog);
+                    if(field && field.changeCallBackFunName){
+                      self.changeCallBackHandler(field, field.changeCallBackFunName, data.content.content);
+                    }
+                    else{
+                      self.model.doAction(data);
+                    }
+                  }
+                }
+              }]
+            };
+            self.$common.openDialog(dialogOption);
+            }
         }
         else{
-          this.model.doAction(res);
+          if(field && field.changeCallBackFunName){
+            this.changeCallBackHandler(field, field.changeCallBackFunName, res.content);
+          }
+          else{
+            this.model.doAction(res);
+          }
         }
       },
       changeHandler(field) {

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

@@ -71,7 +71,7 @@
   var ctSpan = {//临时的span组件对象，用于vue双向绑定，强制更新
     props: {
       vmodel: Object,
-      rowNum: Number,
+      rowNum: String,
     },
     data: function () {
       return {
@@ -105,6 +105,7 @@
       }
     },
     created() {
+      
       let self = this;
       this.model = this.vmodel;
       this.model.OptApi = this.api;