From 4e5b52c82590fe60014e92d8735ba13ea5ab1ecd Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Wed, 19 Jun 2024 14:56:32 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/FormRender.vue      | 15 +++++++++++----
 components/form/SelectPlus.vue |  7 ++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/components/FormRender.vue b/components/FormRender.vue
index 2bc36e4..b3b51bb 100644
--- a/components/FormRender.vue
+++ b/components/FormRender.vue
@@ -122,12 +122,14 @@
 			},
 			validate(call) {
 				this.$refs['wflowForm'].validate().then(res => {
-					const dataList = Object.values(this.modelValue);
-					const result = dataList[0][dataList[0].length - 1];
 					// console.log(4444444, JSON.stringify(this.modelValue))
+					const dataList = Object.values(this.modelValue);
+					const result = dataList[0] instanceof Array ? dataList[0][dataList[0].length - 1] : dataList;
+					// console.log(JSON.stringify(dataList[0]))
+					// console.log(4444444, JSON.stringify(this.formFields[this.formFields.length - 1].props.columns))
 					const flag = this.formFields[this.formFields.length - 1].props.columns ? this.formFields[this.formFields.length - 1].props.columns.every((v, i)=> {
 						if((i == this.formFields[this.formFields.length - 1].props.columns.length - 1) && result[v.id]){
-							// console.log(result[v.id])
+							// console.log(5555555, JSON.stringify(result[v.id]))
 							if(result[v.id][0].id){
 								return true
 							} else {
@@ -139,9 +141,14 @@
 							}
 							return
 						}
+						if(result instanceof Array){
+							// console.log(22222, v.props.required, JSON.stringify(result[result.length - 1]), v.id)
+							return v.props.required == false || (v.props.required == true && result[result.length - 1][0][v.id] != null && result[result.length - 1][0][v.id] != "")
+						}
+						// console.log(22222, v.props.required, JSON.stringify(result), v.id)
 						return v.props.required == false || (v.props.required == true && result[v.id] != null);
 					}) : true;
-					console.log(3333333, flag)
+					// console.log(3333333, flag)
 					call(flag)
 					console.log('表单数据信息：', JSON.stringify(res));
 				}).catch(err => {
diff --git a/components/form/SelectPlus.vue b/components/form/SelectPlus.vue
index 8d051fb..6d900b8 100644
--- a/components/form/SelectPlus.vue
+++ b/components/form/SelectPlus.vue
@@ -328,15 +328,16 @@
 	}
 </script>
 <style>
-	/deep/ .uni-picker-custom {
+	/* :deep(.uni-picker-custom), .uni-picker-custom  {
 		height: 480rpx;
-	}
+	} */
 </style>
 <style scoped>
 	.search {
 		position: fixed;
 		/* bottom: 465rpx; */
-		bottom: 400rpx;
+		bottom: 242px;
+		 /* bottom: 400rpx; */
 		left: 50%;
 		transform: translateX(-50%);
 		z-index: 9999;