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("");