diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index 930bb6d..ab8cdad 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/src/components/DesignForm/formControlPropertiNew.vue @@ -2425,7 +2425,7 @@ function getAssociatedFormsCurrentFieldTree1() { let resDataExceptSystemFields = JSON.parse(JSON.stringify(data.children)); let currentFormChildTableFields = JSON.parse(JSON.stringify(data.children)); let resDataNoTable = JSON.parse(JSON.stringify(data.children)); - + let resDataNoTableNoAsf = JSON.parse(JSON.stringify(data.children)); resDataExceptSystemFields = removeFirstNumElements(resDataExceptSystemFields, 8); resDataExceptSystemFields.forEach((element: any) => { if (element.type == "table") { @@ -2472,15 +2472,19 @@ function getAssociatedFormsCurrentFieldTree1() { resDataNoTable = resDataNoTable.filter( (item: { type: string | null }) => item.type != "table" ); + resDataNoTableNoAsf = resDataNoTable.filter( + (item: { type: string | null }) => item.type != "associatedForms"&&item.type != "table" + ); associatedFormsCurrentFormFieldTreeNoTable.value = [ { id: "rootid_" + data.label, label: "当前表单-" + data.treeAttrs.show, - children: [...resDataNoTable], + children: [...resDataNoTableNoAsf], treeAttrs: data.treeAttrs, }, ]; + associatedFormsCurrentFormFieldTreeNoTable1.value = [...resDataNoTable] let resDataForGlxxsz = ref(data.children.slice(8));