Merge branch 'qin_v1'

src/components/DesignForm/app/formPage.vue

@@ -596,7 +596,7 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 				"mathsFornula":props.formData.config,
 				"keyVal":fieldVal
 			}
-			console.log("sendInfoe-->",sendInfo)
+			console.log("sendInfoe-1->",sendInfo)
 			currencyFormApiSubmit("/systemapi/maths/mathematicalCalculations",sendInfo)
 				.then((data:any)=>{
 					// console.log("结果-->",data)

src/components/DesignForm/public/form/form.vue

@@ -443,12 +443,16 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 	// 	}
 	// 	//判断是否进行计算
 		if(type == "digitpage"){
+
+			let oldFormConfig = props.formData.config
+			let newFormConfig = props.formData.config.groupKey
+			delete  props.formData.config.groupKey
 			let sendInfo = {
 				"fieldKey":key,
 				"mathsFornula":props.formData.config,
 				"keyVal":fieldVal
 			}
-			console.log("sendInfoe-->",sendInfo)
+			console.log("sendInfoe-2->",newFormConfig,props.formData)
 			currencyFormApiSubmit("/systemapi/maths/mathematicalCalculations",sendInfo)
 				.then((data:any)=>{
 					// console.log("结果-->",data)
@@ -477,6 +481,7 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 						if (formatRes.dict && Object.keys(formatRes.dict).length) {
 							resultDict.value = formatRes.dict
 						}
+						props.formData.config.groupKey = newFormConfig
 					})
 				})
 		}