cloud-web-corejs 1.0.54-dev.787 → 1.0.54-dev.789

package/src/views/bd/setting/form_template/mixins/list2.js

@@ -153,13 +153,13 @@ modules = {
       this.$refs['table-m1'].commitProxy('reload');
     },
     openEditDialog(row) {
-      let formCode = row?.formCode || null;
+      let dataId = row?.id || 0;
       /*this.dataId = !id || typeof id === 'object' ? 0 : id;
       this.activeName = 'first';
       this.showItemEdit = false;
       this.$openEditView('showEdit');*/
-      if (!formCode) {
-        this.dataId = formCode;
+      if (!dataId) {
+        this.dataId = dataId;
         this.activeName = 'first';
         this.$openEditView('showEdit');
       } else {

package/src/views/bd/setting/form_template/mixins/wf_list.js

@@ -156,13 +156,13 @@ modules = {
       this.$refs['table-m1'].commitProxy('reload');
     },
     openEditDialog(row) {
-      let formCode = row?.formCode || null;
+      let dataId = row?.id || 0;
       /*this.dataId = !id || typeof id === 'object' ? 0 : id;
       this.activeName = 'first';
       this.showItemEdit = false;
       this.$openEditView('showEdit');*/
-      if (!formCode) {
-        this.dataId = formCode;
+      if (!dataId) {
+        this.dataId = dataId;
         this.activeName = 'first';
         this.$openEditView('showEdit');
       } else {

package/src/views/bd/setting/form_template/wf_list.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="containt">
-    <x-tabs ref="xTabs" v-model="activeName" class="tab-box" paneKeyName="formCode">
+    <x-tabs ref="xTabs" v-model="activeName" class="tab-box" paneKeyName="id">
       <el-tab-pane :label="$t1('常规')" name="first">
         <editView
           v-if="showEdit"
@@ -109,7 +109,7 @@
         <el-tab-pane
           :key="tab.data.id"
           :label.sync="tab.data.formName"
-          :name="tab.data.formCode"
+          :name="tab.data.id + ''"
           :closable="true"
         >
           <editView

package/src/views/user/form/vform/designer.vue

@@ -30,6 +30,7 @@ export default {
   name: "vform-designer:edit",
   props: {
     formCode: String,
+    id: [String, Number],
     readonly: Boolean,
     formTemplate: Object,
     widgetList: Array,
@@ -106,28 +107,56 @@ export default {
           this.$refs.designer.setFormJson(this.reportTemplate.formViewContent);
         });
       } else {
-        this.$http({
-          aes: true,
-          url: USER_PREFIX + `/formTemplate/getByFormCode`,
-          method: `post`,
-          data: {
-            stringOne: this.formCode,
-          },
-          isLoading: true,
-          modalStrictly: true,
-          success: (res) => {
-            if (!res.objx) {
-              this.$baseAlert(this.$t1("获取报表模板失败"));
-              return;
-            }
-            let reportTemplate = res.objx || {};
-            this.reportTemplate = reportTemplate;
-            this.showDesinger = true;
-            this.$nextTick(() => {
-              this.$refs.designer.setFormJson(reportTemplate.formViewContent);
-            });
-          },
-        });
+        let id = this.id || this.formTemplate?.id;
+        if (id) {
+          this.$http({
+            aes: true,
+            url: USER_PREFIX + `/formTemplate/get`,
+            method: `post`,
+            data: {
+              id,
+            },
+            isLoading: true,
+            modalStrictly: true,
+            success: (res) => {
+              if (!res.objx) {
+                this.$baseAlert(this.$t1("获取报表模板失败"));
+                return;
+              }
+              let reportTemplate = res.objx || {};
+              this.reportTemplate = reportTemplate;
+              this.showDesinger = true;
+              this.$nextTick(() => {
+                this.$refs.designer.setFormJson(reportTemplate.formViewContent);
+              });
+            },
+          });
+        } else if (this.formCode) {
+          this.$http({
+            aes: true,
+            url: USER_PREFIX + `/formTemplate/getByFormCode`,
+            method: `post`,
+            data: {
+              stringOne: this.formCode,
+            },
+            isLoading: true,
+            modalStrictly: true,
+            success: (res) => {
+              if (!res.objx) {
+                this.$baseAlert(this.$t1("获取报表模板失败"));
+                return;
+              }
+              let reportTemplate = res.objx || {};
+              this.reportTemplate = reportTemplate;
+              this.showDesinger = true;
+              this.$nextTick(() => {
+                this.$refs.designer.setFormJson(reportTemplate.formViewContent);
+              });
+            },
+          });
+        } else {
+          this.$baseAlert(this.$t1("获取报表模板失败"));
+        }
       }
     },
     loadFieldListData(res) {