From c01a890bdadc6bce7903ab79a7aecce4b64f3be9 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Sat, 13 Jan 2024 09:57:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/public/form/form.vue           | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index e450e07fc..1908029bc 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -164,20 +164,32 @@ const forEachGetFormModel = (list: FormList[], obj: any) => {
 
 // 表单组件值改变事件 tProp为子表格相关
 provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any) => {
-	console.log("表单组件值改变事件----------1--------->",key)
-	console.log("表单组件值改变事件----------2--------->",value)
-	console.log("表单组件值改变事件----------3--------->",data)
-	console.log("表单组件值改变事件----------4--------->",tProp)
-	console.log("表单组件值改变事件----------5--------->",type)
-	console.log("表单组件值改变事件----------6--------->",attribute)
-	// console.log("表单组件值改变事件----------1--------->",key, value, data, tProp, type, attribute)
+	// console.log("表单组件值改变事件----------1--------->",key)
+	// console.log("表单组件值改变事件----------2--------->",value)
+	// console.log("表单组件值改变事件----------3--------->",data)
+	// console.log("表单组件值改变事件----------4--------->",tProp)
+	// console.log("表单组件值改变事件----------5--------->",type)
+	// console.log("表单组件值改变事件----------6--------->",attribute)
+	// console.log("表单组件值改变事件----------11--------->",model.value)
 	let fieldVal =  {}
-	validate((valid: boolean, fields: any) => {
-		// console.log("监听表单--constControlChange----------1--------->",valid,fields,type)
-		for(let i in fields){
-			fieldVal[i]=fields[i].toString()
+	for(let i in model.value){
+		if(i == key){
+			fieldVal[i] = typeof value=="number"?value.toString():value;
+		}else{
+			fieldVal[i] = typeof model.value[i]=="number"?model.value[i].toString():model.value[i];
 		}
-		//判断是否进行计算
+		// console.log("监听表单--constControlChange----------1--------->",i,model.value[i])
+	}
+	// console.log("监听表单--fieldVal----------2--------->",fieldVal)
+	// let fieldVal =  {}
+	// validate((valid: boolean, fields: any) => {
+	// 	console.log("监听表单--constControlChange----------1--------->",fields)
+	// 	for(let i in fields){
+	// 		fieldVal[i]=fields[i].toString()
+
+	// 		console.log("监听表单--constControlChange----------2--------->",fields)
+	// 	}
+	// 	//判断是否进行计算
 		if(type == "digitpage"){
 			let sendInfo = {
 				"fieldKey":key,
@@ -216,7 +228,7 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 					})
 				})
 		}
-	})
+	// })
 	
 	
 	// console.log("监听表单-1-constControlChange-->",props.formData)
@@ -301,7 +313,7 @@ const ruleForm = ref()
 const validate = (callback: any) => {
     ruleForm.value.validate((valid: boolean, fields: any) => {
 
-		// console.log("ruleForm.value--->filter-->",ruleForm.value)
+		console.log("ruleForm.value--->filter-->",ruleForm.value)
 		// console.log("getValue--->fields-->",fields)
 		// console.log("getValue--->valid-->",valid)