From bb4b2d747a6e09cb253ff1acc3af403f06974c6a Mon Sep 17 00:00:00 2001
From: zouzhibing <zouzhibing@anthead.cn>
Date: Thu, 2 Mar 2023 10:30:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=80=A7:=20=E4=B8=AD=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=E8=8F=9C=E5=8D=95=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/language/modules/en.ts                 | 10 +++++++---
 src/language/modules/zh.ts                 | 10 +++++++---
 src/layout/components/SubMenu/MenuItem.vue |  3 ++-
 src/layout/components/SubMenu/SubMenu.vue  |  3 ++-
 src/routers/modules/externalLink.ts        |  2 +-
 src/routers/modules/functionPage.ts        |  2 +-
 src/routers/modules/other.ts               |  2 +-
 src/routers/modules/system.ts              |  2 +-
 src/routers/modules/table.ts               |  2 +-
 src/utils/i18n.ts                          |  2 +-
 10 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/language/modules/en.ts b/src/language/modules/en.ts
index 19398cf..c6eb938 100644
--- a/src/language/modules/en.ts
+++ b/src/language/modules/en.ts
@@ -25,15 +25,19 @@ export default {
 	route:{
 		home:'Home',
 		visualizationChart:'Visualization Chart',
-		Table:'Super Table',
+		superTable:'Super Table',
+		form:'Super Form',
+		dataScreen:'Data Screen',
 		chatBox:'Chat Box',
-		expansionComponents:'Components',
+		commonComponents:'Components',
+		functionPage:'Function Page',
 		nested: 'Nested Routes',
 		excel: 'Excel',
 		zip: 'Zip',
 		errorPages: 'Error Pages',
 		clipboardIndex: 'Clipboard',
-		SystemManagement: 'System Management',
+		systemManagement: 'System Management',
+		externalLink: 'External Link',
 	},
 	tagsView: {
 		refresh:'Refresh Current',
diff --git a/src/language/modules/zh.ts b/src/language/modules/zh.ts
index 693a224..d321440 100644
--- a/src/language/modules/zh.ts
+++ b/src/language/modules/zh.ts
@@ -25,15 +25,19 @@ export default {
 	route:{
 		home:'首页',
 		visualizationChart:'可视化图表',
-		Table:'超级表格',
+		superTable:'超级表格',
+		form:'超级表单',
+		dataScreen:'可视化大屏',
 		chatBox:'聊天框',
-		expansionComponents:'扩展组件',
+		commonComponents:'常用组件',
+		functionPage:'功能页面',
 		nested: '路由嵌套',
 		excel: 'Excel&Zip',
 		zip: 'Zip',
 		errorPages: '错误页面',
 		clipboardIndex: '剪贴板',
-		SystemManagement: '剪贴板',
+		systemManagement: '系统管理',
+		externalLink: '外部链接',
 	},
 	tagsView: {
 		refresh:'刷新当页',
diff --git a/src/layout/components/SubMenu/MenuItem.vue b/src/layout/components/SubMenu/MenuItem.vue
index 80dfb1d..2aa824a 100644
--- a/src/layout/components/SubMenu/MenuItem.vue
+++ b/src/layout/components/SubMenu/MenuItem.vue
@@ -6,13 +6,14 @@
       <component :is="subItem?.meta?.icon"></component>
     </el-icon>
     <template #title>
-      <span>{{ subItem?.meta?.title }}</span>
+      <span>{{ generateTitle(subItem) }}</span>
     </template>
   </el-menu-item>
 </template>
 
 <script setup lang="ts">
 import { ref } from "vue";
+import { generateTitle } from '@/utils/i18n'
 import { useRouter } from "vue-router";
 import { isExternal } from "@/utils/validate";
 
diff --git a/src/layout/components/SubMenu/SubMenu.vue b/src/layout/components/SubMenu/SubMenu.vue
index 5e09c4a..43e774a 100644
--- a/src/layout/components/SubMenu/SubMenu.vue
+++ b/src/layout/components/SubMenu/SubMenu.vue
@@ -11,7 +11,7 @@
           <el-icon>
             <component :is="subItem?.meta?.icon"></component>
           </el-icon>
-          <span>{{ subItem?.meta?.title }}</span>
+          <span>{{ generateTitle(subItem) }}</span>
         </template>
         <SubMenu :menuList="subItem.children" />
       </el-sub-menu>
@@ -22,6 +22,7 @@
 <script setup lang="ts">
 import { ref } from "vue";
 import MenuItem from './MenuItem.vue'
+import { generateTitle } from '@/utils/i18n'
 
 let props = defineProps({
   menuList:{
diff --git a/src/routers/modules/externalLink.ts b/src/routers/modules/externalLink.ts
index 2f06c5b..c27a03b 100644
--- a/src/routers/modules/externalLink.ts
+++ b/src/routers/modules/externalLink.ts
@@ -6,7 +6,7 @@ const externalLink = [{
     path: '/external-link',
     component: Layout,
     redirect: '/external-link/wechat',
-    name: 'external-link',
+    name: 'externalLink',
     meta: {
         title: '外部链接',
         icon: 'link'
diff --git a/src/routers/modules/functionPage.ts b/src/routers/modules/functionPage.ts
index a907017..ad45417 100644
--- a/src/routers/modules/functionPage.ts
+++ b/src/routers/modules/functionPage.ts
@@ -7,7 +7,7 @@ const functionPageRouter = [{
     path: '/function-page',
     component: Layout,
     redirect: '/function-page/404',
-    name: 'function-page',
+    name: 'functionPage',
     meta: {
         title: '功能页面',
         icon: 'ElementPlus'
diff --git a/src/routers/modules/other.ts b/src/routers/modules/other.ts
index 2b082e0..507451f 100644
--- a/src/routers/modules/other.ts
+++ b/src/routers/modules/other.ts
@@ -6,7 +6,7 @@ const othersRouter = [{
   path: '/other',
   component: Layout,
   redirect: '/other/clipboard',
-  name: 'other',
+  name: 'commonComponents',
   meta: {
     title: '常用组件',
     icon: 'management'
diff --git a/src/routers/modules/system.ts b/src/routers/modules/system.ts
index 448bdc5..73d4510 100644
--- a/src/routers/modules/system.ts
+++ b/src/routers/modules/system.ts
@@ -6,7 +6,7 @@ const systemRouter = [{
     path: '/system',
     component: Layout,
     redirect: '/system/user',
-    name: 'system',
+    name: 'systemManagement',
     meta: {
         title: '系统管理',
         icon: 'Setting',
diff --git a/src/routers/modules/table.ts b/src/routers/modules/table.ts
index cfec74f..2ac35ff 100644
--- a/src/routers/modules/table.ts
+++ b/src/routers/modules/table.ts
@@ -7,7 +7,7 @@ const tableRouter = [{
     path: '/table',
     component: Layout,
     redirect: '/table/comprehensive',
-    name: 'table',
+    name: 'superTable',
     meta: {
         title: '超级表格',
         icon: 'School'
diff --git a/src/utils/i18n.ts b/src/utils/i18n.ts
index 88a1b1f..b671dab 100644
--- a/src/utils/i18n.ts
+++ b/src/utils/i18n.ts
@@ -7,5 +7,5 @@ export function generateTitle(route) {
     const translatedTitle = I18n.global.t('route.' + route.name)
     return translatedTitle
   }
-  return route.meta.title
+  return route?.meta?.title
 }