From 3c0cc49f0cc75e601b17bc1b17c9b32d92764663 Mon Sep 17 00:00:00 2001 From: JEECG <445654970@qq.com> Date: Sat, 19 Jul 2025 09:34:17 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90issues/8317=E3=80=91=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=A6=96=E9=A1=B5=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E6=8A=A5=E9=94=99=20---?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/locales/lang/en/routes/basic.ts | 1 + .../src/locales/lang/zh-CN/routes/basic.ts | 1 + .../src/views/system/menu/index.vue | 29 +++++++++++++------ 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/jeecgboot-vue3/src/locales/lang/en/routes/basic.ts b/jeecgboot-vue3/src/locales/lang/en/routes/basic.ts index b6faa00ef..15d91416d 100644 --- a/jeecgboot-vue3/src/locales/lang/en/routes/basic.ts +++ b/jeecgboot-vue3/src/locales/lang/en/routes/basic.ts @@ -1,4 +1,5 @@ export default { login: 'Login', errorLogList: 'Error Log', + defaultHomePage: 'Default Home Page', }; diff --git a/jeecgboot-vue3/src/locales/lang/zh-CN/routes/basic.ts b/jeecgboot-vue3/src/locales/lang/zh-CN/routes/basic.ts index 3d03e8ef1..d154a4ed4 100644 --- a/jeecgboot-vue3/src/locales/lang/zh-CN/routes/basic.ts +++ b/jeecgboot-vue3/src/locales/lang/zh-CN/routes/basic.ts @@ -1,4 +1,5 @@ export default { login: '登录', errorLogList: '错误日志列表', + defaultHomePage: '默认首页', }; diff --git a/jeecgboot-vue3/src/views/system/menu/index.vue b/jeecgboot-vue3/src/views/system/menu/index.vue index b3e4e06d7..ac3e90844 100644 --- a/jeecgboot-vue3/src/views/system/menu/index.vue +++ b/jeecgboot-vue3/src/views/system/menu/index.vue @@ -48,18 +48,29 @@ const { t } = useI18n(); // 自定义菜单名称列渲染 - columns[0].customRender = function ({text, record}) { - const isDefIndex = checkDefIndex(record) - if (isDefIndex) { - text += '(默认首页)' - } + columns[0].customRender = function ({ text, record }) { + // date-begin--author:liaozhiyang---date:20250716---for:【issues/8317】默认首页菜单名称适配国际化报错 + let displayText = text; // update-begin--author:liaozhiyang---date:20240306---for:【QQYUN-8379】菜单管理页菜单国际化 - if (text.includes("t('") && t) { - return new Function('t', `return ${text}`)(t); + // 先处理国际化,避免在添加默认首页标记后影响国际化检查 + if (displayText && displayText.includes("t('") && t) { + try { + displayText = new Function('t', `return ${displayText}`)(t); + } catch (error) { + console.warn('国际化处理失败:', error); + // 如果国际化处理失败,使用原始文本 + displayText = text; + } } // update-end--author:liaozhiyang---date:20240306---for:【QQYUN-8379】菜单管理页菜单国际化 - return text - } + // 在国际化处理完成后,再添加默认首页标记 + const isDefIndex = checkDefIndex(record); + if (isDefIndex) { + displayText += `(${t('routes.basic.defaultHomePage')})`; + } + return displayText; + // date-end--author:liaozhiyang---date:20250716---for:【issues/8317】默认首页菜单名称适配国际化报错 + }; // 列表页面公共参数、方法 const { prefixCls, tableContext } = useListPage({