关联表单-数据填充规则-v0.42 完成页面配置

src/components/DesignForm/formControlPropertiNew.vue

@@ -956,7 +956,7 @@ const attrList = computed(() => {
                     isNum: true
                 },
                 {
-                    label: '显示类型',
+                    label: 'type',
                     value: control.type,
                     path: 'control.type',
                     vShow: ['datePicker'],
@@ -974,7 +974,7 @@ const attrList = computed(() => {
                     }
                 },
                 {
-                    label: '时间格式',
+                    label: 'format',
                     value: control.format,
                     path: 'control.format',
                     vShow: ['datePicker', 'timePicker'],
@@ -2672,6 +2672,9 @@ function childRoleRightChanged(){
             }
         });
     });
+    let selectedArr: any[] = []
+    selectedArr.push(...masterSelectedArr)
+    selectedArr.push(...childSelectedArr)
     //主表控制 start
     if(associatedFormsCurrentFormFieldTree1.value){
         associatedFormsCurrentFormFieldTree1.value[0].children?.forEach(function(item: any){   
@@ -2689,14 +2692,14 @@ function childRoleRightChanged(){
         associatedFormsCurrentFormFieldTree1.value[0].children?.forEach(function(item: any){   
             if(item.type=="table"){
                 item.children.forEach((element: any) => {
-                    masterSelectedArr.forEach((j:any) => {
+                    selectedArr.forEach((j:any) => {
                         if(j.rightValue==element.id){
                             element.disabled = true
                         }
                     })
                 });
             }else{
-                masterSelectedArr.forEach((element:any) => {
+                selectedArr.forEach((element:any) => {
                     if(element.rightValue==item.id){
                         item.disabled = true
                     }
@@ -2710,7 +2713,7 @@ function childRoleRightChanged(){
     if(currentFormChildTableFieldsForFillRole.value){
         currentFormChildTableFieldsForFillRole.value[0]?.children?.forEach((element: any) => {
             element.children.forEach((item: any) => {
-                childSelectedArr.forEach((j:any) => {
+                selectedArr.forEach((j:any) => {
                     item.disabled = false
                 })
             });
@@ -2719,7 +2722,7 @@ function childRoleRightChanged(){
     if(currentFormChildTableFieldsForFillRole.value){
         currentFormChildTableFieldsForFillRole.value[0]?.children?.forEach((element: any) => {
             element.children.forEach((item: any) => {
-                childSelectedArr.forEach((j:any) => {
+                selectedArr.forEach((j:any) => {
                     if(j.rightValue==item.id){
                         item.disabled = true
                     }