cloud-web-corejs 1.0.54-dev.286 → 1.0.54-dev.288

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,7 +3,7 @@
3
3
  <template v-if="layoutType=='PC'">
4
4
  <x-tabs ref="xTabs" v-model="activeName" class="tab-box">
5
5
  <el-tab-pane :label="$t2('常规')" name="first">
6
- <vFormRender :formCode="formCode2" :dataId.sync="dataId" :param="param" :formData="formData"
6
+ <vFormRender :formCode.sync="formCode1" :dataId.sync="dataId" :param="param" :formData="formData"
7
7
  v-if="showEdit" visible-key="showEdit" :parent-target="_self"
8
8
  @reload="reload" @openCopyEditTab="openCopyEditTab"></vFormRender>
9
9
  </el-tab-pane>
@@ -74,7 +74,9 @@ export default {
74
74
  /* formCode: null,*/
75
75
  layoutType: null,
76
76
  formCode: null,
77
+ formCode1: null,
77
78
  formCode2: null,
79
+ addFormCode:null,
78
80
  dataId: null,
79
81
  showEditDialog: false,
80
82
  param: {},
@@ -109,7 +111,13 @@ export default {
109
111
  let formJson = formTemplate.formViewContent ? JSON.parse(formTemplate.formViewContent) : {};
110
112
  this.formJson = formJson;
111
113
  this.layoutType = formJson.formConfig?.layoutType
112
- this.formCode2 = formJson.formConfig?.editFormCode ?? null;
114
+ let addFormCode = formJson.formConfig?.addFormCode ?? null;
115
+ let formCode2 = formJson.formConfig?.editFormCode ?? null;
116
+ this.formCode2 = formCode2
117
+ if(!addFormCode) {
118
+ addFormCode = formCode2
119
+ }
120
+ this.addFormCode = addFormCode;
113
121
  this.multiTabLabelField = formJson.formConfig?.multiTabLabelField
114
122
  }
115
123
  });
@@ -126,6 +134,7 @@ export default {
126
134
  this.$refs.xTabs.openEditTab(row,param);
127
135
  }else{
128
136
  this.dataId = dataId
137
+ this.formCode1 = this.addFormCode;
129
138
  this.activeName = 'first';
130
139
  this.showEdit = false;
131
140
  this.showEditDialog = true;
@@ -136,6 +145,7 @@ export default {
136
145
 
137
146
  },
138
147
  openEditH5Dialog(row) {
148
+ this.formCode1 = this.addFormCode;
139
149
  this.dataId = row && row.id ? row.id : null;
140
150
  this.activeName = 'first';
141
151
  this.showEdit = false;
@@ -147,6 +157,7 @@ export default {
147
157
 
148
158
  openCopyEditTab(formData) {
149
159
  this.dataId = null
160
+ this.formCode1 = this.addFormCode;
150
161
  this.activeName = 'first';
151
162
  this.showEdit = false;
152
163
  this.showEditDialog = true;