From cbb13d2f17f76b0e63434795f6c991c1b6377684 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Thu, 22 Aug 2024 16:36:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95-=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=A1=AB=E5=85=85=E8=A7=84=E5=88=99-v0.41=20=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E9=A1=B5=E9=9D=A2=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlPropertiNew.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 048fcd1..bebf5e7 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -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
                     }