centaline-data-driven 1.4.4 → 1.4.5

package/package.json

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

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/externalincomemanage/externalincomeimport/readDetail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/PropertyContact/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -11,21 +11,8 @@
     name: 'DataDrivenForm',
     data() {
       return {
-        apiParam:{actionType
-: 
-"3",
-originalTraId
-: 
-"1572420664851103746",
-pageOnly
-: 
-"true",
-pageStyle
-: 
-"2",
-pageTitle
-: 
-"修改成交单",
+        apiParam:{
+          chanceID: "1580430736434008064", actionType: 2
         },
         topHeight:10,
       }

package/src/centaline/api/index.js

@@ -221,6 +221,8 @@ const api = {
         self.$common.openDialog(dialogOption);
       }
     }
+    else if(data.rtnCode === Enum.ReturnCode.ConfirmAlert){
+    }
     else {
       if (response.data.rtnMsg && common.getDataDrivenOpts().showRequestErrorMessage) {
         if (data.MsgAlertStyle && data.MsgAlertStyle == Enum.MessageAlertStyle.Dialog) {

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

@@ -336,6 +336,25 @@
                         if (self.parentModel) {
                           self.parentModel.$vue.closeTabThen(data);
                         }
+                      }                      
+                      else if (data.rtnCode === 202) {
+                        self.$common.confirm(data.rtnMsg, '提示', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            type: 'warning'
+                          }).then(() => {
+                            field.doAction(self.getFormObj({flagHaveAlert:'1'}), (res) => {
+                              if (res.rtnCode === 200) {
+                                if(res.notification===17){
+                                  self.clickHandler(self.model.getRtnRouter(res.content),null)
+                                }
+                                else{
+                                  self.$emit('submit', { formData: self.model, responseData: res });
+                                }
+                              }
+                            });
+                        }).catch(() => {
+                        });
                       }
                     },self.model.scripts);
                   }
@@ -869,11 +888,14 @@
           }
         });
       },
-      getFormObj(){
+      getFormObj(moreFormObj){
         let formData=this.model.getFormObj();
         if(this.$route && this.$route.query && this.$route.query.pageStyle){
            return Object.assign(formData,{'pageStyle':this.$route.query.pageStyle});
         }
+        if(moreFormObj){
+          return Object.assign(formData,moreFormObj);
+        }
         return formData;
       },
       getFileData(field) {

package/src/centaline/loader/src/ctl/lib/Enum.js

@@ -256,6 +256,7 @@ const Enum = {
     Successful: 200, //成功
     Error: 201, //失败
     Unauthorized: 401, //没有登录 或 登录超时
+    ConfirmAlert: 202, //确认提示
   },
 
   InsertPos: {