From 51d08e4b82ccb02425ba4ed85fb81023345039f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E4=B8=87?=
 <52823142+Ten-K@users.noreply.github.com>
Date: Sat, 12 Mar 2022 23:32:32 +0800
Subject: [PATCH] fix: menu search (#214)

* fix: menu search

* fix: i18

* perf: delete route name
---
 mock/asyncRoutes.ts                              | 4 ----
 src/layout/components/search/components/types.ts | 1 -
 src/plugins/i18n.ts                              | 3 +--
 src/router/modules/able.ts                       | 3 +--
 src/router/modules/about.ts                      | 7 +++----
 src/router/modules/components.ts                 | 1 -
 src/router/modules/editor.ts                     | 1 -
 src/router/modules/error.ts                      | 1 -
 src/router/modules/flowchart.ts                  | 1 -
 src/router/modules/guide.ts                      | 1 -
 src/router/modules/nested.ts                     | 3 ---
 src/router/modules/remaining.ts                  | 1 -
 src/router/modules/result.ts                     | 1 -
 src/views/{about.vue => about/index.vue}         | 0
 14 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 src/layout/components/search/components/types.ts
 rename src/views/{about.vue => about/index.vue} (100%)

diff --git a/mock/asyncRoutes.ts b/mock/asyncRoutes.ts
index 4411d9e2d..cd2f85c3b 100644
--- a/mock/asyncRoutes.ts
+++ b/mock/asyncRoutes.ts
@@ -4,7 +4,6 @@ import { MockMethod } from "vite-plugin-mock";
 // http://mockjs.com/examples.html#Object
 const systemRouter = {
   path: "/system",
-  name: "system",
   redirect: "/system/user/index",
   meta: {
     icon: "setting",
@@ -35,7 +34,6 @@ const systemRouter = {
 
 const permissionRouter = {
   path: "/permission",
-  name: "permission",
   redirect: "/permission/page/index",
   meta: {
     title: "menus.permission",
@@ -66,7 +64,6 @@ const permissionRouter = {
 
 const frameRouter = {
   path: "/iframe",
-  name: "reFrame",
   redirect: "/iframe/pure",
   meta: {
     icon: "monitor",
@@ -106,7 +103,6 @@ const frameRouter = {
 
 const tabsRouter = {
   path: "/tabs",
-  name: "reTabs",
   redirect: "/tabs/index",
   meta: {
     icon: "IF-team-icontabs",
diff --git a/src/layout/components/search/components/types.ts b/src/layout/components/search/components/types.ts
deleted file mode 100644
index 9319664aa..000000000
--- a/src/layout/components/search/components/types.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type RouteList = AuthRoute.Route;
diff --git a/src/plugins/i18n.ts b/src/plugins/i18n.ts
index 8027f8708..f494927f7 100644
--- a/src/plugins/i18n.ts
+++ b/src/plugins/i18n.ts
@@ -50,10 +50,9 @@ export function transformI18n(
 
   // 处理存储动态路由的title,格式 {zh:"",en:""}
   if (typeof message === "object") {
-    debugger;
     const locale: string | WritableComputedRef<string> | any =
       i18n.global.locale;
-    return message[locale];
+    return message[locale?.value];
   }
 
   if (isI18n) {
diff --git a/src/router/modules/able.ts b/src/router/modules/able.ts
index 6da89f516..8a9a9e75d 100644
--- a/src/router/modules/able.ts
+++ b/src/router/modules/able.ts
@@ -3,9 +3,8 @@ const Layout = () => import("/@/layout/index.vue");
 
 const ableRouter = {
   path: "/able",
-  name: "components",
   component: Layout,
-  redirect: "/able/menuTree",
+  redirect: "/able/watermark",
   meta: {
     icon: "ubuntu-fill",
     title: $t("menus.hsAble"),
diff --git a/src/router/modules/about.ts b/src/router/modules/about.ts
index ae11b3e78..c93bcfc2f 100644
--- a/src/router/modules/about.ts
+++ b/src/router/modules/about.ts
@@ -3,9 +3,8 @@ const Layout = () => import("/@/layout/index.vue");
 
 const aboutRouter = {
   path: "/about",
-  name: "reAbout",
   component: Layout,
-  redirect: "/about",
+  redirect: "/about/index",
   meta: {
     icon: "question-line",
     title: $t("menus.hsAbout"),
@@ -14,9 +13,9 @@ const aboutRouter = {
   },
   children: [
     {
-      path: "/about",
+      path: "/about/index",
       name: "reAbout",
-      component: () => import("/@/views/about.vue"),
+      component: () => import("/@/views/about/index.vue"),
       meta: {
         title: $t("menus.hsAbout"),
         i18n: true
diff --git a/src/router/modules/components.ts b/src/router/modules/components.ts
index 1cbf99b7a..842a48f8a 100644
--- a/src/router/modules/components.ts
+++ b/src/router/modules/components.ts
@@ -3,7 +3,6 @@ const Layout = () => import("/@/layout/index.vue");
 
 const componentsRouter = {
   path: "/components",
-  name: "components",
   component: Layout,
   redirect: "/components/video",
   meta: {
diff --git a/src/router/modules/editor.ts b/src/router/modules/editor.ts
index c085b5915..be1fff6d9 100644
--- a/src/router/modules/editor.ts
+++ b/src/router/modules/editor.ts
@@ -3,7 +3,6 @@ const Layout = () => import("/@/layout/index.vue");
 
 const editorRouter = {
   path: "/editor",
-  name: "reEditor",
   component: Layout,
   redirect: "/editor/index",
   meta: {
diff --git a/src/router/modules/error.ts b/src/router/modules/error.ts
index 14bbeccd7..a99d84020 100644
--- a/src/router/modules/error.ts
+++ b/src/router/modules/error.ts
@@ -3,7 +3,6 @@ const Layout = () => import("/@/layout/index.vue");
 
 const errorRouter = {
   path: "/error",
-  name: "error",
   component: Layout,
   redirect: "/error/403",
   meta: {
diff --git a/src/router/modules/flowchart.ts b/src/router/modules/flowchart.ts
index cb036f32b..3eeaf3ec7 100644
--- a/src/router/modules/flowchart.ts
+++ b/src/router/modules/flowchart.ts
@@ -3,7 +3,6 @@ const Layout = () => import("/@/layout/index.vue");
 
 const flowChartRouter = {
   path: "/flowChart",
-  name: "flowChart",
   component: Layout,
   redirect: "/flowChart/index",
   meta: {
diff --git a/src/router/modules/guide.ts b/src/router/modules/guide.ts
index cca255eb8..7fb474f43 100644
--- a/src/router/modules/guide.ts
+++ b/src/router/modules/guide.ts
@@ -3,7 +3,6 @@ const Layout = () => import("/@/layout/index.vue");
 
 const guideRouter = {
   path: "/guide",
-  name: "reGuide",
   component: Layout,
   redirect: "/guide/index",
   meta: {
diff --git a/src/router/modules/nested.ts b/src/router/modules/nested.ts
index ff56b6926..7c13e768c 100644
--- a/src/router/modules/nested.ts
+++ b/src/router/modules/nested.ts
@@ -5,7 +5,6 @@ const nestedRouter = {
   path: "/nested",
   component: Layout,
   redirect: "/nested/menu1/menu1-1",
-  name: "Nested",
   meta: {
     title: $t("menus.hsmenus"),
     icon: "histogram",
@@ -15,7 +14,6 @@ const nestedRouter = {
   children: [
     {
       path: "/nested/menu1",
-      name: "Menu1",
       meta: {
         title: $t("menus.hsmenu1"),
         i18n: true,
@@ -35,7 +33,6 @@ const nestedRouter = {
         },
         {
           path: "/nested/menu1/menu1-2",
-          name: "Menu1-2",
           redirect: "/nested/menu1/menu1-2/menu1-2-1",
           meta: {
             title: $t("menus.hsmenu1-2"),
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index 5782df6e3..9483ff8da 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -15,7 +15,6 @@ const remainingRouter = [
   },
   {
     path: "/redirect",
-    name: "redirect",
     component: Layout,
     meta: {
       icon: "home-filled",
diff --git a/src/router/modules/result.ts b/src/router/modules/result.ts
index a802adab3..ecfd3d2a8 100644
--- a/src/router/modules/result.ts
+++ b/src/router/modules/result.ts
@@ -3,7 +3,6 @@ const Layout = () => import("/@/layout/index.vue");
 
 const resultRouter = {
   path: "/result",
-  name: "reResult",
   component: Layout,
   redirect: "/result/success",
   meta: {
diff --git a/src/views/about.vue b/src/views/about/index.vue
similarity index 100%
rename from src/views/about.vue
rename to src/views/about/index.vue