From f345c851e8abb91d6415b4aba4f944c37feb4cc6 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Fri, 16 Aug 2024 14:22:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=80=89=E9=A1=B9=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=B5=8C=E5=A5=97=E5=9C=A8=E5=B8=83=E5=B1=80=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=86=85=E6=97=B6=E4=B8=8D=E7=94=9F=E6=95=88bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/DesignForm/types.ts                   |   1 +
 .../DesignForm/public/form/form.vue           | 113 ++++++++++++++++--
 2 files changed, 101 insertions(+), 13 deletions(-)

diff --git a/src/api/DesignForm/types.ts b/src/api/DesignForm/types.ts
index 32d431d..f1f890c 100644
--- a/src/api/DesignForm/types.ts
+++ b/src/api/DesignForm/types.ts
@@ -1,4 +1,5 @@
 export interface FormList {
+	list?: any
 	name: string
 	type: string
 	control: any // 当前type表单控件所有props
diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index 769caed..d6ad84d 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -215,6 +215,7 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 	
 
 	nextTick(() => {
+		//console.log(model.value)
 		/* console.log("以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建的数组radioselectArr3  --- 内容为完整显示隐藏条件")
 		console.log(radioSelectArr3)
 		console.log("当前表单的值-------------------")
@@ -225,6 +226,9 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 		for(let i= 0;i<props.formData.list.length;i++){
 			modelKeyArr.push(props.formData.list[i].name+"")
 		}
+		modelKeyArr = newModelKeyArr
+
+		//console.log(modelKeyArr)
 		/* console.log("所有字段modelKeyArr^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^")
 		console.log(modelKeyArr) */
 
@@ -341,13 +345,16 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 						}
 					}
 				}else{//来自单选下拉
-					//console.log(conditionFieldValue)
+					//console.log(modelKeyArr)
 					for(let n = 0; n< modelKeyArr.length;n++){
 						if(modelKeyArr[n]==conditionField){
 							//let count_1 = 0;
 							let trueValue = model.value[modelKeyArr[n]]
 							//console.log(modelKeyArr[n])
-							//console.log(trueValue)
+							/* console.log("conditionField====="+conditionField)
+							console.log("trueValue====="+trueValue)
+							console.log("conditionFieldValue-----"+conditionFieldValue) */
+							
 							if(trueValue==conditionFieldValue){
 								//此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
 								let flag = false//其依赖的选项的父字段是否被隐藏.默认没被隐藏,
@@ -372,9 +379,11 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 					}
 				}
 		}
+		//console.log(x,hideFieldArr,toshow)
 		if(x>0){
 			hideFieldArr = hideFieldArr.filter((item: string) => item!=toshow)
 		}
+		//console.log(x,hideFieldArr)
 	}
 	//将隐藏的字段值重置
 	for(let i = 0; i< hideFieldArr.length;i++){
@@ -541,6 +550,8 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 	*/
 })
 let mustBeHidden: any = []
+
+let newModelKeyArr: string[] = []
 function showOrHide (data:any){
 	//console.log(data)
 	
@@ -734,21 +745,97 @@ function showOrHide (data:any){
 	const switchShowConfigArr = []
 	//以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建一个数组radioselectArr2。----用于获取所有出现在配置中的字段。
 	const radioSelectArr2:any[] = []
+
+	//20240815 关联选项设置的隐藏效果嵌套在内时不生效的问题修复 liwenxuan start 
+	//console.log(props.formData.list)			newModelKeyArr
 	for(let i = 0;i<props.formData.list.length;i++){
 		if(props.formData.list[i].type=="radio"||props.formData.list[i].type=="select"||props.formData.list[i].type=="checkbox"||props.formData.list[i].type=="switch"){
 			props.formData.config.hideField = [];
+			if(props.formData.list[i].type=="radio"||props.formData.list[i].type=="select"){
+				radioSelectShowConfigArr.push(props.formData.list[i].control.glxxsz)
+			}else if(props.formData.list[i].type=="checkbox"){
+				checkboxShowConfigArr.push(props.formData.list[i].control.glxxszForCheckBox)
+			}else if(props.formData.list[i].type=="switch"){
+				switchShowConfigArr.push(props.formData.list[i].control.glxxszSwitch)
+			}
+		}else if(props.formData.list[i].type=="card"||props.formData.list[i].type=="flex"||props.formData.list[i].type=="div"||props.formData.list[i].type=="table"){
+			props.formData.config.hideField = [];
+			let a = JSON.parse(JSON.stringify(props.formData.list[i].list));
+			for(let w = 0;w<a.length;w++){
+				if(a[w].type=="radio"||a[w].type=="select"){
+					//console.log(a[w])
+					radioSelectShowConfigArr.push(a[w].control.glxxsz)
+				}else if(a[w].type=="checkbox"){
+					checkboxShowConfigArr.push(a[w].control.glxxszForCheckBox)
+				}else if(a[w].type=="switch"){
+					switchShowConfigArr.push(a[w].control.glxxszSwitch)
+				}
+				newModelKeyArr.push(a[w].name)
+				
+			}
+		}else if(props.formData.list[i].type=="grid"){
+			props.formData.config.hideField = [];
+			let columns = JSON.parse(JSON.stringify(props.formData.list[i].columns));
+			if(columns.length>0){
+				for(let z = 0;z<columns.length;z++){
+					for(let x = 0; x<columns[z].list.length;x++){
+						let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+						if(a.type=="radio"||a.type=="select"){
+							radioSelectShowConfigArr.push(a.control.glxxsz)
+						}else if(a.type=="checkbox"){
+							checkboxShowConfigArr.push(a.control.glxxszForCheckBox)
+						}else if(a.type=="switch"){
+							switchShowConfigArr.push(a.control.glxxszSwitch)
+						}
+						newModelKeyArr.push(a.name)
+						
+					}
+				}
+			}
+		}else if(props.formData.list[i].type=="tabs"){//tabs标签页有可能再嵌套一层flex或者table
+			props.formData.config.hideField = [];
+			let columns = JSON.parse(JSON.stringify(props.formData.list[i].columns));
+			if(columns.length>0){
+				for(let z = 0;z<columns.length;z++){
+					for(let x = 0; x<columns[z].list.length;x++){
+						let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+						if(a.type=="radio"||a.type=="select"){
+							radioSelectShowConfigArr.push(a.control.glxxsz)
+						}else if(a.type=="checkbox"){
+							checkboxShowConfigArr.push(a.control.glxxszForCheckBox)
+						}else if(a.type=="switch"){
+							switchShowConfigArr.push(a.control.glxxszSwitch)
+						}else if(a.type=="flex"||a.type=="table"){
+							if(a.list.length>0){
+								for(let m = 0;m<a.list.length;m++){
+									let q = JSON.parse(JSON.stringify(a.list[m]))
+									//console.log(q)
+									if(q.type=="radio"||q.type=="select"){
+										radioSelectShowConfigArr.push(q.control.glxxsz)
+									}else if(q.type=="checkbox"){
+										checkboxShowConfigArr.push(q.control.glxxszForCheckBox)
+									}else if(q.type=="switch"){
+										switchShowConfigArr.push(q.control.glxxszSwitch)
+									}
+									newModelKeyArr.push(q.name)
+									
+								}
+							}
+						}
+						newModelKeyArr.push(a.name)
+						
+					}
+				}
+			}
 		}
-		//console.log(props.formData.list[i].type)
-		if(props.formData.list[i].type=="radio"||props.formData.list[i].type=="select"){
-			radioSelectShowConfigArr.push(props.formData.list[i].control.glxxsz)
-			
-		}else if(props.formData.list[i].type=="checkbox"){
-			
-			checkboxShowConfigArr.push(props.formData.list[i].control.glxxszForCheckBox)
-		}else if(props.formData.list[i].type=="switch"){
-			switchShowConfigArr.push(props.formData.list[i].control.glxxszSwitch)
-		}
+		newModelKeyArr.push(props.formData.list[i].name)
+		
+		
+		
 	}
+	newModelKeyArr = Array.from(new Set(newModelKeyArr));
+	//20240815 关联选项设置的隐藏效果嵌套在内时不生效的问题修复 liwenxuan end
+	//console.log(radioSelectShowConfigArr)
 	//数组深拷贝
 	const radioSelectShowConfigArr2 = JSON.parse(JSON.stringify(radioSelectShowConfigArr));
 	const checkboxShowConfigArr2 = JSON.parse(JSON.stringify(checkboxShowConfigArr));
@@ -957,7 +1044,7 @@ function showOrHide (data:any){
 		
 		
 	
-
+	//console.log(props.formData.config.hideField)