Merge branch 'qin_v2'

src/components/DesignForm/formControlAttr.vue

@@ -2044,7 +2044,7 @@ getAssociatedFormsCurrentFieldTree().then(({ data }) => {
     //console.log(data)
     getAssociatedFormsCurrentFieldTreeData = JSON.parse(JSON.stringify(data))
     //console.log(getAssociatedFormsCurrentFieldTreeData)
-    if(data.id==="cfid为空"){
+    if(data.id==="cfid为空"||data.id==="masterTable为null"){
         //alert("cfid为空")
     }else{
         let resData = ref(data.children)

src/components/DesignForm/formControlPropertiNew.vue

@@ -2087,7 +2087,7 @@ getAssociatedFormsCurrentFieldTree().then(({ data }) => {
     // console.log(data)
     getAssociatedFormsCurrentFieldTreeData = JSON.parse(JSON.stringify(data))
     // console.log(getAssociatedFormsCurrentFieldTreeData)
-    if(data.id==="cfid为空"){
+    if(data.id==="cfid为空"||data.id==="masterTable为null"){
         //alert("cfid为空")
     }else{
         let resData = ref(data.children)

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

@@ -452,12 +452,13 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 			let oldFormConfig = props.formData.config
 			let newFormConfig = props.formData.config.groupKey
 			delete  props.formData.config.groupKey
+			delete  props.formData.config.hideField
 			let sendInfo = {
 				"fieldKey":key,
 				"mathsFornula":props.formData.config,
 				"keyVal":fieldVal
 			}
-			console.log("sendInfoe-2->",newFormConfig,props.formData)
+			console.log("sendInfoe-2->",props.formData,props.formData)
 			currencyFormApiSubmit("/systemapi/maths/mathematicalCalculations",sendInfo)
 				.then((data:any)=>{
 					// console.log("结果-->",data)

src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue

@@ -454,6 +454,7 @@ function optionsValue3Get3(data: any,fieldName: string){
 		</div>
 		<!--无流程表单-->
 		<div v-else class="common-layout">
+
 			<ak-form
 				ref="formEl"
 				v-loading="formLoading" element-loading-text="Loading..."