centaline-data-driven 1.3.28 → 1.3.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.3.28",
+  "version": "1.3.31",
   "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/finance/account-flow/task'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :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: 1,
-businessId: "1547837545432465409",
+actionType: 3,
+originalTraId: "1547488795469586434",
 pageOnly: true,
 pageStyle: 2,
-stepId: "1547838255872065538"
+pageTitle: "成交报告"
           }
       }
     },

package/src/SearchList.vue

@@ -8,16 +8,15 @@
     :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
     :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" :apiParam="para"></ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'" 
-      :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
-      :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'">
-    </ct-searchlist>
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyContactImportList/getLayoutOfSearch'" 
+      :searchDataApi="'/PropertyContactImportList/getListOfSearchModel'">
+    </ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
-                   :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
-                   :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
-                    :searchStatsApi="'/exampleList/getListStats'"
-                   ></ct-searchlist> -->
+    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+      :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
+      :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
+      :searchStatsApi="'/exampleList/getListStats'">
+    </ct-searchlist>
 
     <ct-dialog-list></ct-dialog-list>
   </div>

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">
@@ -107,6 +107,7 @@
         isScroll: false,
         loading: true,
         activeName: '-1',
+        formKey:0,
         collapse: [],//分组数组
         collapseActiveNames: [],//默认展开的分组name
         collapseFieldsRow: [],//分组数组对应的行列布局
@@ -414,7 +415,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 +432,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);
                   }
@@ -594,7 +612,7 @@
         var rtnBool = true;
         var jump = false;
         var i=0;
-        debugger
+        
         self.$refs.Fields.forEach((f) => {
           if (f.model && typeof f.validExcute !== 'undefined') {
             if (!f.validExcute()) {
@@ -620,7 +638,7 @@
 
               if (!jump) {
                 if (this.model.isHorizontalLayout) {//水平布局
-                  this.activeName = f.model.collapseName.toString();
+                  this.activeName = f.model.collapseName.toString()==='-1'?self.activeName:f.model.collapseName.toString();
                   jump = true;
                 }
                 else {//垂直布局