From c359d8d2f2e3282cd7582466b0b65266c4b83ceb Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 9 Apr 2025 14:17:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=80=89=E9=A1=B9=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=AF=B9=E5=AD=90=E8=A1=A8=E4=B8=8D=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=E7=9A=84bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/formControlPropertiNew.vue     | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index b6f505c..f9a7aa1 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -2560,6 +2560,19 @@ function getAssociatedFormsCurrentFieldTree1() {
           disabled: true,
         },
       ];
+      
+      //liwenxuan 关联选项设置对子表不生效的bug修复 start 250409
+      let resDataHasTableButNoTableChild = JSON.parse(JSON.stringify(data.children));
+      resDataHasTableButNoTableChild.splice(0,2);
+      resDataHasTableButNoTableChild.splice(2,4);
+      resDataHasTableButNoTableChild.forEach((element: any) => {
+        if(element.type&&element.type=="table"){
+          element.children = []
+          element.disabled = false
+        }
+      });
+      //liwenxuan 关联选项设置对子表不生效的bug修复 end 250409
+
 
       resDataNoTable = resDataNoTable.filter(
         (item: { type: string | null }) => item.type != "table"
@@ -2579,14 +2592,15 @@ function getAssociatedFormsCurrentFieldTree1() {
           treeAttrs: data.treeAttrs,
         },
       ];
-
+      //console.log(resDataNoTable)
       associatedFormsCurrentFormFieldTreeNoTable1.value = [...resDataNoTable];
       //liwenxuan 关联选项设置无法识别创建人,创建时间控件bug修复 start 250409
-      let r1 = JSON.parse(JSON.stringify(data.children));
+      /* let r1 = JSON.parse(JSON.stringify(data.children));
+      
       r1.splice(0,2);
-      r1.splice(2,4);
+      r1.splice(2,4); */
       //let resDataForGlxxsz = ref(data.children.slice(8));
-      let resDataForGlxxsz = ref(r1);
+      let resDataForGlxxsz = ref(resDataHasTableButNoTableChild);
       //liwenxuan 关联选项设置无法识别创建人,创建时间控件bug修复 end 250409
       resDataForGlxxszExceptself = JSON.parse(JSON.stringify(resDataForGlxxsz.value));
 
@@ -2760,6 +2774,7 @@ function handleRoleTreeContextmenuRange(
 }
 
 import { ElTree } from "element-plus";
+import { forEach } from "jszip";
 
 const fieldTreeFilterText = ref("");
 const orgTreeFilterText = ref("");