diff --git a/apps/web-antd/src/views/system/role/role-drawer.vue b/apps/web-antd/src/views/system/role/role-drawer.vue index 0944c4b4..92568f56 100644 --- a/apps/web-antd/src/views/system/role/role-drawer.vue +++ b/apps/web-antd/src/views/system/role/role-drawer.vue @@ -3,7 +3,7 @@ import { computed, ref } from 'vue'; import { useVbenDrawer } from '@vben/common-ui'; import { $t } from '@vben/locales'; -import { cloneDeep } from '@vben/utils'; +import { cloneDeep, eachTree } from '@vben/utils'; import { useVbenForm } from '#/adapter'; import { menuTreeSelect, roleMenuTreeSelect } from '#/api/system/menu'; @@ -37,11 +37,20 @@ async function setupMenuTree(id?: number | string) { if (id) { const resp = await roleMenuTreeSelect(id); formApi.setFieldValue('menuIds', resp.checkedKeys); + const menus = resp.menus; + // i18n处理 + eachTree(menus, (node) => { + node.label = $t(node.label); + }); // 设置菜单信息 menuTree.value = resp.menus; } else { const resp = await menuTreeSelect(); formApi.setFieldValue('menuIds', []); + // i18n处理 + eachTree(resp, (node) => { + node.label = $t(node.label); + }); // 设置菜单信息 menuTree.value = resp; } 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 8f8d4b11..cbfffaec 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 @@ -3,7 +3,7 @@ import { computed, ref } from 'vue'; import { useVbenDrawer } from '@vben/common-ui'; import { $t } from '@vben/locales'; -import { cloneDeep, listToTree } from '@vben/utils'; +import { cloneDeep, eachTree, listToTree } from '@vben/utils'; import { useVbenForm } from '#/adapter'; import { menuList, tenantPackageMenuTreeSelect } from '#/api/system/menu'; @@ -45,6 +45,10 @@ const menuTree = ref([]); async function setupMenuTree() { const resp = await menuList(); const treeData = listToTree(resp, { id: 'menuId' }); + // i18n处理 + eachTree(treeData, (node) => { + node.menuName = $t(node.menuName); + }); // 设置菜单信息 menuTree.value = treeData; } @@ -122,7 +126,7 @@ function handleMenuCheckStrictlyChange(value: boolean) { ref="menuSelectRef" v-bind="slotProps" :check-strictly="formApi.form.values.menuCheckStrictly" - :expand-all-on-init="true" + :expand-all-on-init="false" :field-names="{ title: 'menuName', key: 'menuId' }" :tree-data="menuTree" @check-strictly-change="handleMenuCheckStrictlyChange"