From 6d98fc1197282641a655cf01b15a3b4e319d5f25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 20 Oct 2023 22:09:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=99=BA=E8=83=BD=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/mdp-ui-ext/mdp-expand/FormDataItem.vue | 2 +-
 src/views/mdp/lcode/formDef/Form.vue                  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/mdp-ui-ext/mdp-expand/FormDataItem.vue b/src/components/mdp-ui-ext/mdp-expand/FormDataItem.vue
index db07a55..e137bbb 100644
--- a/src/components/mdp-ui-ext/mdp-expand/FormDataItem.vue
+++ b/src/components/mdp-ui-ext/mdp-expand/FormDataItem.vue
@@ -1,5 +1,5 @@
 <template>
-	<section>
+	<section v-if="field.hidden!='1'">
 		<el-row>  
 			<el-row v-if="field.extType=='row'" :gutter="gutter">     
 				<el-col  v-for="child,idx in field.children" :key="idx" :span="calcSpan(child,field)">
diff --git a/src/views/mdp/lcode/formDef/Form.vue b/src/views/mdp/lcode/formDef/Form.vue
index a618958..de9e73f 100644
--- a/src/views/mdp/lcode/formDef/Form.vue
+++ b/src/views/mdp/lcode/formDef/Form.vue
@@ -262,11 +262,11 @@ export default {
                     this.load.edit=false
                     var tips=res.data.tips;
                     if(tips.isOk){  
-                        this.$mdp.removeFormFieldsCache(formDef.id)
-                        this.currOpType='edit'
                         var data=res.data.data
                         Object.assign(this.editForm,data.formDef)
                         this.formFields=data.formFields
+                        this.$mdp.removeFormFieldsCache(this.editForm.id)
+                        this.currOpType='edit'  
                         this.afterSubmit(res,tips.isOk,this.currOpType);
                     }
                     this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
@@ -315,11 +315,12 @@ export default {
                         this.load.edit=false
                         var tips=res.data.tips;
                         if(tips.isOk){  
-                            this.$mdp.removeFormFieldsCache(formDef.id)
-                            this.currOpType='edit'
+                            
                             var data=res.data.data
                             Object.assign(this.editForm,data.formDef)
                             this.formFields=data.formFields
+                            this.$mdp.removeFormFieldsCache(this.editForm.id)
+                            this.currOpType='edit'   
                             this.afterSubmit(res,tips.isOk,this.currOpType);
                         }
                         this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });