Merge branch 'lwx_v5'

src/components/DesignForm/formControlAttr.vue

@@ -4015,7 +4015,7 @@ const disabledIstrue = (val:string) => {
 
 
 
-    <el-dialog v-model="associatedFormsFillRolesDialogFlag" title="数据填充规则" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 500px" width="40%"  >
+    <el-dialog v-model="associatedFormsFillRolesDialogFlag" title="数据填充规则" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 500px" width="50%"  >
 		
 		<template v-if="controlData.type=='associatedForms'">
             <el-divider style="margin-top: 0px;" />

src/components/DesignForm/formControlPropertiNew.vue

@@ -4321,7 +4321,7 @@ const radioChangeSet = (val:any) => {
 
 
 
-    <el-dialog v-model="associatedFormsFillRolesDialogFlag" title="数据填充规则" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 500px" width="40%"  >
+    <el-dialog v-model="associatedFormsFillRolesDialogFlag" title="数据填充规则" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 500px" width="50%"  >
 		
 		<template v-if="controlData.type=='associatedForms'">
             <el-divider style="margin-top: 0px;" />

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

@@ -461,6 +461,7 @@ const initLoadData = () => {
 				stateForm.formId =data.data.appForm.cfid.toString()
 				stateForm.versionId =data.data.appForm.id.toString()
 				stateForm.formData = stringToObj(data.data.appForm.mastesform)
+				stateForm.formData.config.hideField = []//暂时的修复方法:接口返回的config中没有hideField属性,手动添加
 				stateForm.dict = string2json(data.data.appForm.dict)
 				stateForm.formData.powerstr = string2json(data.data.appForm.powerstr)
 				// console.log("data.data.mastesform", stateForm.formData)