From 113c2d60b59f333417e0479f9856592feb23e93f Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Fri, 11 Oct 2024 21:20:23 +0800 Subject: [PATCH] fix: menu support i18n --- apps/web-antd/src/locales/langs/en-US.json | 1 + apps/web-antd/src/locales/langs/zh-CN.json | 1 + apps/web-antd/src/views/system/menu/menu-drawer.vue | 6 +++++- .../src/views/tool/gen/edit-steps/basic-setting.vue | 9 +++++++-- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/apps/web-antd/src/locales/langs/en-US.json b/apps/web-antd/src/locales/langs/en-US.json index 2fac357b..ece9278c 100644 --- a/apps/web-antd/src/locales/langs/en-US.json +++ b/apps/web-antd/src/locales/langs/en-US.json @@ -84,6 +84,7 @@ } }, "menu": { + "root": "Root", "system": { "root": "System", "user": "User", diff --git a/apps/web-antd/src/locales/langs/zh-CN.json b/apps/web-antd/src/locales/langs/zh-CN.json index b6036dea..9ad8e04e 100644 --- a/apps/web-antd/src/locales/langs/zh-CN.json +++ b/apps/web-antd/src/locales/langs/zh-CN.json @@ -84,6 +84,7 @@ } }, "menu": { + "root": "根目录", "system": { "root": "系统管理", "user": "用户管理", diff --git a/apps/web-antd/src/views/system/menu/menu-drawer.vue b/apps/web-antd/src/views/system/menu/menu-drawer.vue index 0298f946..e07224e9 100644 --- a/apps/web-antd/src/views/system/menu/menu-drawer.vue +++ b/apps/web-antd/src/views/system/menu/menu-drawer.vue @@ -43,12 +43,16 @@ const [BasicForm, formApi] = useVbenForm({ async function setupMenuSelect() { // menu const menuArray = await menuList(); + // support i18n + menuArray.forEach((item) => { + item.menuName = $t(item.menuName); + }); // const folderArray = menuArray.filter((item) => item.menuType === 'M'); const menuTree = listToTree(menuArray, { id: 'menuId', pid: 'parentId' }); const fullMenuTree = [ { menuId: 0, - menuName: '根目录', + menuName: $t('menu.root'), children: menuTree, }, ]; diff --git a/apps/web-antd/src/views/tool/gen/edit-steps/basic-setting.vue b/apps/web-antd/src/views/tool/gen/edit-steps/basic-setting.vue index 9edaf73a..76bef792 100644 --- a/apps/web-antd/src/views/tool/gen/edit-steps/basic-setting.vue +++ b/apps/web-antd/src/views/tool/gen/edit-steps/basic-setting.vue @@ -4,6 +4,7 @@ import type { Column, GenInfo } from '#/api/tool/gen/model'; import { inject, onMounted, type Ref } from 'vue'; import { useVbenForm } from '@vben/common-ui'; +import { $t } from '@vben/locales'; import { addFullName, listToTree } from '@vben/utils'; import { Col, Row } from 'ant-design-vue'; @@ -66,12 +67,16 @@ async function initTreeSelect(columns: Column[]) { */ async function initMenuSelect() { const list = await menuList(); + // support i18n + list.forEach((item) => { + item.menuName = $t(item.menuName); + }); const tree = listToTree(list, { id: 'menuId', pid: 'parentId' }); const treeData = [ { - fullName: '根目录', + fullName: $t('menu.root'), menuId: 0, - menuName: '根目录', + menuName: $t('menu.root'), children: tree, }, ];