From f8467ceb173abb1b82550640fc7d5bc070171454 Mon Sep 17 00:00:00 2001 From: Soybean Date: Sun, 28 Jan 2024 17:14:46 +0800 Subject: [PATCH] refactor(projects): manage_route => manage_menu --- src/locales/langs/en-us.ts | 2 +- src/locales/langs/zh-cn.ts | 2 +- src/router/elegant/imports.ts | 2 +- src/router/elegant/routes.ts | 26 +++++++++++++------------- src/router/elegant/transform.ts | 2 +- src/typings/elegant-router.d.ts | 4 ++-- src/views/manage/menu/index.vue | 7 +++++++ src/views/manage/route/index.vue | 13 ------------- 8 files changed, 26 insertions(+), 32 deletions(-) create mode 100644 src/views/manage/menu/index.vue delete mode 100644 src/views/manage/route/index.vue diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index fa06df8e..306a9ee6 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -129,7 +129,7 @@ const local: App.I18n.Schema = { manage_user: 'User Manage', 'manage_user-detail': 'User Detail', manage_role: 'Role Manage', - manage_route: 'Route Manage', + manage_menu: 'Menu Manage', 'multi-menu': 'Multi Menu', 'multi-menu_first': 'Menu One', 'multi-menu_first_child': 'Menu One Child', diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index 611f229d..64cb1314 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -129,7 +129,7 @@ const local: App.I18n.Schema = { manage_user: '用户管理', 'manage_user-detail': '用户详情', manage_role: '角色管理', - manage_route: '路由管理', + manage_menu: '菜单管理', 'multi-menu': '多级菜单', 'multi-menu_first': '菜单一', 'multi-menu_first_child': '菜单一子菜单', diff --git a/src/router/elegant/imports.ts b/src/router/elegant/imports.ts index e4d3fd40..eee3a7ab 100644 --- a/src/router/elegant/imports.ts +++ b/src/router/elegant/imports.ts @@ -23,8 +23,8 @@ export const views: Record Promise import("@/views/function/multi-tab/index.vue"), function_tab: () => import("@/views/function/tab/index.vue"), home: () => import("@/views/home/index.vue"), + manage_menu: () => import("@/views/manage/menu/index.vue"), manage_role: () => import("@/views/manage/role/index.vue"), - manage_route: () => import("@/views/manage/route/index.vue"), "manage_user-detail": () => import("@/views/manage/user-detail/[id].vue"), manage_user: () => import("@/views/manage/user/index.vue"), "multi-menu_first_child": () => import("@/views/multi-menu/first_child/index.vue"), diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts index f8ce9800..8c6e5067 100644 --- a/src/router/elegant/routes.ts +++ b/src/router/elegant/routes.ts @@ -117,6 +117,19 @@ export const generatedRoutes: GeneratedRoute[] = [ roles: ['R_ADMIN'] }, children: [ + { + name: 'manage_menu', + path: '/manage/menu', + component: 'view.manage_menu', + meta: { + title: 'manage_menu', + i18nKey: 'route.manage_menu', + icon: 'material-symbols:route', + order: 3, + roles: ['R_ADMIN'], + keepAlive: true + } + }, { name: 'manage_role', path: '/manage/role', @@ -129,19 +142,6 @@ export const generatedRoutes: GeneratedRoute[] = [ roles: ['R_ADMIN'] } }, - { - name: 'manage_route', - path: '/manage/route', - component: 'view.manage_route', - meta: { - title: 'manage_route', - i18nKey: 'route.manage_route', - icon: 'material-symbols:route', - order: 3, - roles: ['R_ADMIN'], - keepAlive: true - } - }, { name: 'manage_user', path: '/manage/user', diff --git a/src/router/elegant/transform.ts b/src/router/elegant/transform.ts index 63eb0d3f..56189ef8 100644 --- a/src/router/elegant/transform.ts +++ b/src/router/elegant/transform.ts @@ -157,8 +157,8 @@ const routeMap: RouteMap = { "home": "/home", "login": "/login/:module(pwd-login|code-login|register|reset-pwd|bind-wechat)?", "manage": "/manage", + "manage_menu": "/manage/menu", "manage_role": "/manage/role", - "manage_route": "/manage/route", "manage_user": "/manage/user", "manage_user-detail": "/manage/user-detail/:id", "multi-menu": "/multi-menu", diff --git a/src/typings/elegant-router.d.ts b/src/typings/elegant-router.d.ts index 85158df8..7e4a1598 100644 --- a/src/typings/elegant-router.d.ts +++ b/src/typings/elegant-router.d.ts @@ -31,8 +31,8 @@ declare module "@elegant-router/types" { "home": "/home"; "login": "/login/:module(pwd-login|code-login|register|reset-pwd|bind-wechat)?"; "manage": "/manage"; + "manage_menu": "/manage/menu"; "manage_role": "/manage/role"; - "manage_route": "/manage/route"; "manage_user": "/manage/user"; "manage_user-detail": "/manage/user-detail/:id"; "multi-menu": "/multi-menu"; @@ -112,8 +112,8 @@ declare module "@elegant-router/types" { | "function_multi-tab" | "function_tab" | "home" + | "manage_menu" | "manage_role" - | "manage_route" | "manage_user-detail" | "manage_user" | "multi-menu_first_child" diff --git a/src/views/manage/menu/index.vue b/src/views/manage/menu/index.vue new file mode 100644 index 00000000..5db0cc3e --- /dev/null +++ b/src/views/manage/menu/index.vue @@ -0,0 +1,7 @@ + + + + + diff --git a/src/views/manage/route/index.vue b/src/views/manage/route/index.vue deleted file mode 100644 index b91e74eb..00000000 --- a/src/views/manage/route/index.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - -