Merge branch 'qin_v1'

src/components/DesignForm/app/formPage.vue

@@ -591,6 +591,9 @@ 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,
@@ -625,6 +628,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
 					})
 				})
 	}