From f23f8f53e605140d27c45fb2ad7da71f06b834cb Mon Sep 17 00:00:00 2001 From: juetan Date: Tue, 7 Nov 2023 21:12:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 10 ++-- src/pages/_layout/components/menu.vue | 6 ++- src/pages/system/menu/index.vue | 6 +-- src/router/guards/auth.ts | 68 +++++++++++++++++++++++++ src/router/guards/guard-auth.ts | 31 ----------- src/router/guards/guard-progress.ts | 31 ----------- src/router/guards/guard-title.ts | 9 ---- src/router/guards/progress.ts | 30 +++++++++++ src/router/guards/title.ts | 12 +++++ src/router/index.ts | 3 +- src/router/menus/index.ts | 2 +- src/router/router/index.ts | 33 ++++-------- src/router/router/util.ts | 17 +++++++ src/router/routes/base.ts | 14 ++--- src/router/routes/{index.ts => page.ts} | 4 +- src/store/menu/index.ts | 12 ++++- src/types/env.d.ts | 9 +++- src/utils/listToTree.ts | 26 ++++++++++ 18 files changed, 205 insertions(+), 118 deletions(-) create mode 100644 src/router/guards/auth.ts delete mode 100644 src/router/guards/guard-auth.ts delete mode 100644 src/router/guards/guard-progress.ts delete mode 100644 src/router/guards/guard-title.ts create mode 100644 src/router/guards/progress.ts create mode 100644 src/router/guards/title.ts create mode 100644 src/router/router/util.ts rename src/router/routes/{index.ts => page.ts} (91%) diff --git a/.env b/.env index 25e9cd6..5c319d4 100644 --- a/.env +++ b/.env @@ -5,8 +5,12 @@ VITE_TITLE = 绝弹项目管理 # 网站副标题 VITE_SUBTITLE = 快速开发web应用的模板工具 -# 接口前缀 说明:参见 axios 的 baseURL +# 接口前缀:参见 axios 的 baseURL VITE_API = / +# 首页路径 +VITE_HOME_PATH = /home/home +# 路由模式:web(路径) hash(锚点) +VITE_HISTORY = web # ===================================================================================== # 开发设置 @@ -19,9 +23,5 @@ VITE_PORT = 3020 VITE_PROXY = http://127.0.0.1:3030/ # API文档 说明:需返回符合 OPENAPI 规范的json内容 VITE_OPENAPI = http://127.0.0.1:3030/openapi.json - -# ===================================================================================== -# 构建设置 -# ===================================================================================== # 文件后缀 说明:设为dev时会优先加载index.dev.vue文件,否则回退至index.vue文件 VITE_EXTENSION = dev \ No newline at end of file diff --git a/src/pages/_layout/components/menu.vue b/src/pages/_layout/components/menu.vue index 98b5226..9f83356 100644 --- a/src/pages/_layout/components/menu.vue +++ b/src/pages/_layout/components/menu.vue @@ -10,7 +10,7 @@ export default defineComponent({ watch( () => route.path, () => { - selectedKeys.value = route.matched.map((i) => i.path); + selectedKeys.value = route.matched.map((i) => i.aliasOf?.path ?? i.path); }, { immediate: true } ); @@ -31,7 +31,9 @@ export default defineComponent({ const icon = route.icon ? () => : null; const node: any = route.children?.length ? ( <> -
+
+ +
{this.renderItem(route?.children)} ) : ( diff --git a/src/pages/system/menu/index.vue b/src/pages/system/menu/index.vue index 33a402a..2864e57 100644 --- a/src/pages/system/menu/index.vue +++ b/src/pages/system/menu/index.vue @@ -7,11 +7,11 @@