From ca2aadaf4af9137c507de1a58945cd0e615be43d Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Fri, 6 Jun 2025 12:02:56 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=9F=E6=88=B7=E5=A5=97?= =?UTF-8?q?=E9=A4=90=20=E6=96=B0=E5=A2=9E=20=E8=BF=87=E6=BB=A4`=E7=A7=9F?= =?UTF-8?q?=E6=88=B7`=E7=9B=B8=E5=85=B3=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenantPackage/tenant-package-drawer.vue | 38 +++++++------------ 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/apps/web-antd/src/views/system/tenantPackage/tenant-package-drawer.vue b/apps/web-antd/src/views/system/tenantPackage/tenant-package-drawer.vue index b0bd28f4..548511ee 100644 --- a/apps/web-antd/src/views/system/tenantPackage/tenant-package-drawer.vue +++ b/apps/web-antd/src/views/system/tenantPackage/tenant-package-drawer.vue @@ -10,7 +10,7 @@ import { cloneDeep, eachTree } from '@vben/utils'; import { omit } from 'lodash-es'; import { useVbenForm } from '#/adapter/form'; -import { menuTreeSelect, tenantPackageMenuTreeSelect } from '#/api/system/menu'; +import { tenantPackageMenuTreeSelect } from '#/api/system/menu'; import { packageAdd, packageInfo, @@ -40,30 +40,18 @@ const [BasicForm, formApi] = useVbenForm({ const menuTree = ref([]); async function setupMenuTree(id?: number | string) { - if (id) { - const resp = await tenantPackageMenuTreeSelect(id); - const menus = resp.menus; - // i18n处理 - eachTree(menus, (node) => { - node.label = $t(node.label); - }); - // 设置菜单信息 - menuTree.value = resp.menus; - // keys依赖于menu 需要先加载menu - await nextTick(); - await formApi.setFieldValue('menuIds', resp.checkedKeys); - } else { - const resp = await menuTreeSelect(); - // i18n处理 - eachTree(resp, (node) => { - node.label = $t(node.label); - }); - // 设置菜单信息 - menuTree.value = resp; - // keys依赖于menu 需要先加载menu - await nextTick(); - await formApi.setFieldValue('menuIds', []); - } + // 0为新增使用 获取除了`租户管理`的所有菜单 + const resp = await tenantPackageMenuTreeSelect(id ?? 0); + const menus = resp.menus; + // i18n处理 + eachTree(menus, (node) => { + node.label = $t(node.label); + }); + // 设置菜单信息 + menuTree.value = menus; + // keys依赖于menu 需要先加载menu + await nextTick(); + await formApi.setFieldValue('menuIds', resp.checkedKeys); } async function customFormValueGetter() {