From 3eac14752a8c6c88fd9432ee8a119a2a258e2333 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Mon, 29 Jul 2024 15:21:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue            | 2 +-
 src/components/DesignForm/formControlPropertiNew.vue     | 2 +-
 src/components/DesignForm/public/form/form.vue           | 3 ++-
 src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 9f463a9..1e629eb 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -2044,7 +2044,7 @@ getAssociatedFormsCurrentFieldTree().then(({ data }) => {
     //console.log(data)
     getAssociatedFormsCurrentFieldTreeData = JSON.parse(JSON.stringify(data))
     //console.log(getAssociatedFormsCurrentFieldTreeData)
-    if(data.id==="cfid为空"){
+    if(data.id==="cfid为空"||data.id==="masterTable为null"){
         //alert("cfid为空")
     }else{
         let resData = ref(data.children)
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index de7f9c7..e6c2155 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -2087,7 +2087,7 @@ getAssociatedFormsCurrentFieldTree().then(({ data }) => {
     // console.log(data)
     getAssociatedFormsCurrentFieldTreeData = JSON.parse(JSON.stringify(data))
     // console.log(getAssociatedFormsCurrentFieldTreeData)
-    if(data.id==="cfid为空"){
+    if(data.id==="cfid为空"||data.id==="masterTable为null"){
         //alert("cfid为空")
     }else{
         let resData = ref(data.children)
diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index dad0502..197d0aa 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -452,12 +452,13 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 			let oldFormConfig = props.formData.config
 			let newFormConfig = props.formData.config.groupKey
 			delete  props.formData.config.groupKey
+			delete  props.formData.config.hideField
 			let sendInfo = {
 				"fieldKey":key,
 				"mathsFornula":props.formData.config,
 				"keyVal":fieldVal
 			}
-			console.log("sendInfoe-2->",newFormConfig,props.formData)
+			console.log("sendInfoe-2->",props.formData,props.formData)
 			currencyFormApiSubmit("/systemapi/maths/mathematicalCalculations",sendInfo)
 				.then((data:any)=>{
 					// console.log("结果-->",data)
diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
index 89ac216..e31e02e 100644
--- a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
@@ -454,6 +454,7 @@ function optionsValue3Get3(data: any,fieldName: string){
 		</div>
 		<!--无流程表单-->
 		<div v-else class="common-layout">
+
 			<ak-form
 				ref="formEl"
 				v-loading="formLoading" element-loading-text="Loading..."