From 7f2d6942dc1e0975853a58be55df20fc3b1507d9 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 9 Mar 2022 17:01:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/2.0.5/AppForm/components/Add.vue        |  6 ++++--
 packages/2.0.5/AppForm/components/FormLayout.vue | 14 +++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/2.0.5/AppForm/components/Add.vue b/packages/2.0.5/AppForm/components/Add.vue
index 2386d43b..466e4248 100644
--- a/packages/2.0.5/AppForm/components/Add.vue
+++ b/packages/2.0.5/AppForm/components/Add.vue
@@ -16,7 +16,7 @@
         </div>
       </div>
       <basic-info ref="basicInfo" v-model="basicInfo" v-show="currIndex === 0" :dict="dict" :instance="instance"></basic-info>
-      <form-layout :appType="basicInfo.appType" class="form-config__wrapper" v-model="tableInfos" ref="form" v-if="currIndex === 1" :dict="dict" :instance="instance"></form-layout>
+      <form-layout :appType="basicInfo.appType" :currIndex="currIndex" class="form-config__wrapper" v-model="tableInfos" ref="form" v-show="currIndex === 1" :dict="dict" :instance="instance"></form-layout>
       <form-config
         ref="config"
         :showListFields="showListFields"
@@ -121,7 +121,9 @@
               menuLevel1Name: res.data.menuLevel1Name,
               menuLevel3Name: res.data.menuLevel3Name,
               menuLevel2Name: res.data.menuLevel2Name,
-              appType: res.data.appType
+              appType: res.data.appType,
+              corpId: res.data.corpId,
+              corpName: res.data.corpName
             }
             this.fuzzyQueryFields = res.data.fuzzyQueryFields
             this.tableInfos = res.data.tableInfos
diff --git a/packages/2.0.5/AppForm/components/FormLayout.vue b/packages/2.0.5/AppForm/components/FormLayout.vue
index d40ec6d2..39075cf5 100644
--- a/packages/2.0.5/AppForm/components/FormLayout.vue
+++ b/packages/2.0.5/AppForm/components/FormLayout.vue
@@ -374,7 +374,8 @@
       type: String,
       areaId: String,
       value: Array,
-      appType: String
+      appType: String,
+      currIndex: Number
     },
 
     components: {
@@ -438,6 +439,12 @@
         }
       },
 
+      currIndex (v, oldV) {
+        if (this.appType && !this.value.length && oldV === 0) {
+          this.getInitFileds()
+        }
+      },
+
       activeIndex () {
         if (this.activeIndex > -1 && this.groupIndex > -1 && !this.isGroup) {
           const filed = this.targetList[this.groupIndex].column[this.activeIndex]
@@ -497,9 +504,6 @@
     },
 
     mounted () {
-      if (this.appType && !this.value.length) {
-        this.getInitFileds()
-      }
     },
 
     methods: {
@@ -584,7 +588,7 @@
               ...item,
               groupIndex: i,
               groupName: group.groupName,
-              fieldDbName: this.isUnique(item.type) ? item.type : `${item.type}${i}${index}`,
+              fieldDbName: item.isInit === '1' ? item.fieldDbName : (this.isUnique(item.type) ? item.type : `${item.type}${i}${index}`),
               defaultValue: item.type === 'checkbox' && item.defaultValue ? item.defaultValue.join('`') : item.defaultValue,
               selectValues: item.options ? item.options.map(v => v.label).join('`') : ''
             })