From b852651f0d8b489947affcd9317bc37a064ed9fb Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Wed, 21 Aug 2024 15:48:33 +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.33?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DesignForm/formControlPropertiNew.vue | 33 ++- .../asfTmFillRoleFilterCondi.vue | 258 ++++++++++++++++++ .../associatedFormsChildFillRole.vue | 47 +++- 3 files changed, 325 insertions(+), 13 deletions(-) create mode 100644 src/widget/associatedforms/asfTmFillRoleFilterCondi.vue diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index ada2ae2..cbd5995 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/src/components/DesignForm/formControlPropertiNew.vue @@ -2101,6 +2101,8 @@ const asfasfMasterFieldTree = ref() const asfasfChildTableList = ref() +const asfasfChildTableFields = ref() + const asfasfFieldTreeOptionsValue3 = ref() let currentChildTableCount = 0 @@ -2118,13 +2120,19 @@ function formidChanged(){ let resData = ref(data.children) let dataExceptChild = JSON.parse(JSON.stringify(data.children)) let dataOnlyChild = JSON.parse(JSON.stringify(data.children)) + let dataOnlyChild1 = JSON.parse(JSON.stringify(data.children)) dataExceptChild = dataExceptChild.filter((obj: { type: string }) => obj.type!== 'table'); dataOnlyChild = dataOnlyChild.filter((obj: { type: string }) => obj.type== 'table'); + dataOnlyChild1 = dataOnlyChild1.filter((obj: { type: string }) => obj.type== 'table'); + /* console.log(dataOnlyChild1) + console.log(dataOnlyChild) */ for(let m = 0;m obj.type!== 'table'); dataOnlyChild = dataOnlyChild.filter((obj: { type: string }) => obj.type== 'table'); + dataOnlyChild1 = dataOnlyChild1.filter((obj: { type: string }) => obj.type== 'table'); + /* console.log(dataOnlyChild1) + console.log(dataOnlyChild) */ for(let m = 0;m { v-model:selected-child-table="controlData.control.fillRoles.child[index].tableKey" v-model:filter-condition="controlData.control.fillRoles.child[index].filterCondition" v-model:child-roles = "controlData.control.fillRoles.child[index].childRoles" + v-model:child-table-list="asfasfChildTableList" :asfasf-field-tree="asfasfFieldTree" :tree-default-props="treeDefaultProps" :filter-node="filterNode" @@ -4562,8 +4590,9 @@ const radioChangeSet = (val:any) => { :role-tree="roleTree" :handle-role-tree-contextmenu-range="handleRoleTreeContextmenuRange" :associated-forms-current-form-field-tree= "associatedFormsCurrentFormFieldTree" + :asfasf-child-table-fields = "asfasfChildTableFields" :current-key="controlData.control.fillRoles.child[index].id" - :child-table-list="asfasfChildTableList" + @del-role = "delChildRole" > diff --git a/src/widget/associatedforms/asfTmFillRoleFilterCondi.vue b/src/widget/associatedforms/asfTmFillRoleFilterCondi.vue new file mode 100644 index 0000000..205ece4 --- /dev/null +++ b/src/widget/associatedforms/asfTmFillRoleFilterCondi.vue @@ -0,0 +1,258 @@ + + + + + diff --git a/src/widget/associatedforms/associatedFormsChildFillRole.vue b/src/widget/associatedforms/associatedFormsChildFillRole.vue index f1293a3..6c2eca8 100644 --- a/src/widget/associatedforms/associatedFormsChildFillRole.vue +++ b/src/widget/associatedforms/associatedFormsChildFillRole.vue @@ -1,12 +1,12 @@