cloud-web-corejs 1.0.115 → 1.0.117

package/src/views/user/form/view/list.vue

@@ -3,7 +3,7 @@
     <template v-if="layoutType=='PC'">
       <x-tabs ref="xTabs" v-model="activeName" class="tab-box">
         <el-tab-pane :label="$t2('常规')" name="first">
-          <vFormRender :formCode="formCode2" :dataId.sync="dataId" :param="param" :formData="formData"
+          <vFormRender :formCode.sync="formCode1" :dataId.sync="dataId" :param="param" :formData="formData"
                        v-if="showEdit" visible-key="showEdit" :parent-target="_self"
                        @reload="reload" @openCopyEditTab="openCopyEditTab"></vFormRender>
         </el-tab-pane>
@@ -74,7 +74,9 @@ export default {
       /*      formCode: null,*/
       layoutType: null,
       formCode: null,
+      formCode1: null,
       formCode2: null,
+      addFormCode:null,
       dataId: null,
       showEditDialog: false,
       param: {},
@@ -109,7 +111,13 @@ export default {
           let formJson = formTemplate.formViewContent ? JSON.parse(formTemplate.formViewContent) : {};
           this.formJson = formJson;
           this.layoutType = formJson.formConfig?.layoutType
-          this.formCode2 = formJson.formConfig?.editFormCode ?? null;
+          let addFormCode = formJson.formConfig?.addFormCode ?? null;
+          let formCode2 = formJson.formConfig?.editFormCode ?? null;
+          this.formCode2 = formCode2
+          if(!addFormCode) {
+            addFormCode = formCode2
+          }
+          this.addFormCode = addFormCode;
           this.multiTabLabelField = formJson.formConfig?.multiTabLabelField
         }
       });
@@ -122,10 +130,15 @@ export default {
       let formConfig = this.formJson.formConfig
       let multiTabEnabled = formConfig.multiTabEnabled && formConfig.multiTabLabelField
       let dataId = row && row.id ? row.id : null;
+      this.dataId = dataId
+      if(!dataId){
+          this.formCode1 = this.addFormCode;
+      }else{
+        this.formCode1 = this.formCode2;
+      }
       if(multiTabEnabled && dataId){
         this.$refs.xTabs.openEditTab(row,param);
       }else{
-        this.dataId = dataId
         this.activeName = 'first';
         this.showEdit = false;
         this.showEditDialog = true;
@@ -136,6 +149,7 @@ export default {
 
     },
     openEditH5Dialog(row) {
+      this.formCode1 = this.addFormCode;
       this.dataId = row && row.id ? row.id : null;
       this.activeName = 'first';
       this.showEdit = false;
@@ -147,6 +161,7 @@ export default {
 
     openCopyEditTab(formData) {
       this.dataId = null
+      this.formCode1 = this.addFormCode;
       this.activeName = 'first';
       this.showEdit = false;
       this.showEditDialog = true;