From b25f2916fb3a23d9f54c9694120107bdfb314917 Mon Sep 17 00:00:00 2001 From: anjon <1274180586@qq.com> Date: Thu, 3 Jul 2025 15:46:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20bmp=20=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=94=A4=E8=B5=B7=E9=80=89=E6=8B=A9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/select-modal/user-select-modal.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/web-antd/src/components/select-modal/user-select-modal.vue b/apps/web-antd/src/components/select-modal/user-select-modal.vue index bd31a0d5c..a2e96ade0 100644 --- a/apps/web-antd/src/components/select-modal/user-select-modal.vue +++ b/apps/web-antd/src/components/select-modal/user-select-modal.vue @@ -124,6 +124,11 @@ const [Modal, modalApi] = useVbenModal({ destroyOnClose: true, }); +defineExpose({ + open: modalApi.open, + close: modalApi.close, +}); + // 左侧列表状态 const leftListState = ref({ searchValue: '', From d26fd8fce12cdc4f6c85ca4e579f1a8e1a0ea0eb Mon Sep 17 00:00:00 2001 From: anjon <1274180586@qq.com> Date: Fri, 4 Jul 2025 15:01:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=80=89=E6=8B=A9=20Modal=20=E6=95=B0=E6=8D=AE=E4=BC=A0?= =?UTF-8?q?=E5=85=A5=E6=97=B6=20getData=20=E4=B8=BA=20{}=20=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../select-modal/user-select-modal.vue | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/apps/web-antd/src/components/select-modal/user-select-modal.vue b/apps/web-antd/src/components/select-modal/user-select-modal.vue index a2e96ade0..60ae64784 100644 --- a/apps/web-antd/src/components/select-modal/user-select-modal.vue +++ b/apps/web-antd/src/components/select-modal/user-select-modal.vue @@ -69,6 +69,7 @@ const deptSearchKeys = ref(''); // 用户数据管理 const userList = ref([]); // 存储所有已知用户 const selectedUserIds = ref([]); +const openModalData = ref<{ userIds?: number[] }>({}); // 弹窗配置 const [Modal, modalApi] = useVbenModal({ @@ -80,7 +81,7 @@ const [Modal, modalApi] = useVbenModal({ return; } // 加载数据 - const data = modalApi.getData(); + const data = openModalData.value || modalApi.getData(); if (!data) { return; } @@ -125,7 +126,12 @@ const [Modal, modalApi] = useVbenModal({ }); defineExpose({ - open: modalApi.open, + open(userIds: number[]) { + openModalData.value = { + userIds, + }; + modalApi.open(); + }, close: modalApi.close, }); @@ -413,9 +419,9 @@ function processDeptNode(node: any): DeptTreeNode {