From 0b030883971223ab387a2bac391a92ba37c8be62 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Thu, 10 Oct 2024 14:31:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BE=AE=E8=B0=83=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B0=81=E8=A3=85=E7=9A=84=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/routers/index.ts | 2 + frontend/src/routers/modules/staticRouter.ts | 67 +++++++++++--------- frontend/src/stores/interface/index.ts | 7 +- 3 files changed, 42 insertions(+), 34 deletions(-) diff --git a/frontend/src/routers/index.ts b/frontend/src/routers/index.ts index 99195e0..0daccb6 100644 --- a/frontend/src/routers/index.ts +++ b/frontend/src/routers/index.ts @@ -32,7 +32,9 @@ const routerMode = { const router = createRouter({ history: routerMode[mode](), routes: [...staticRouter, ...errorRouter], + // 不区分路由大小写,非严格模式下提供了更宽松的路径匹配 strict: false, + // 页面刷新时,滚动条位置还原 scrollBehavior: () => ({ left: 0, top: 0 }) }); diff --git a/frontend/src/routers/modules/staticRouter.ts b/frontend/src/routers/modules/staticRouter.ts index 8cde7b3..64366b7 100644 --- a/frontend/src/routers/modules/staticRouter.ts +++ b/frontend/src/routers/modules/staticRouter.ts @@ -1,6 +1,6 @@ import { RouteRecordRaw } from "vue-router"; import { HOME_URL, LOGIN_URL } from "@/config"; - +export const Layout = () => import('@/layouts/index.vue'); /** * staticRouter (静态路由) */ @@ -20,9 +20,7 @@ export const staticRouter: RouteRecordRaw[] = [ { path: "/layout", name: "layout", - component: () => import("@/layouts/index.vue"), - // component: () => import("@/layouts/indexAsync.vue"), - // redirect: HOME_URL, + component: Layout, children: [ { path: "/plan", @@ -54,32 +52,39 @@ export const staticRouter: RouteRecordRaw[] = [ */ export const errorRouter = [ { - path: "/403", - name: "403", - component: () => import("@/components/ErrorMessage/403.vue"), - meta: { - title: "403页面", - }, - }, - { - path: "/404", - name: "404", - component: () => import("@/components/ErrorMessage/404.vue"), - meta: { - title: "404页面", - }, - }, - { - path: "/500", - name: "500", - component: () => import("@/components/ErrorMessage/500.vue"), - meta: { - title: "500页面", - }, - }, - // Resolve refresh page, route warnings - { - path: "/:pathMatch(.*)*", - component: () => import("@/components/ErrorMessage/404.vue"), + path: "/layout", + name: "layout", + component: Layout, + children: [ + { + path: "/403", + name: "403", + component: () => import("@/components/ErrorMessage/403.vue"), + meta: { + title: "403页面", + }, + }, + { + path: "/404", + name: "404", + component: () => import("@/components/ErrorMessage/404.vue"), + meta: { + title: "404页面", + }, + }, + { + path: "/500", + name: "500", + component: () => import("@/components/ErrorMessage/500.vue"), + meta: { + title: "500页面", + }, + }, + // Resolve refresh page, route warnings + { + path: "/:pathMatch(.*)*", + component: () => import("@/components/ErrorMessage/404.vue"), + }, + ], }, ]; diff --git a/frontend/src/stores/interface/index.ts b/frontend/src/stores/interface/index.ts index 4b57088..1fa337a 100644 --- a/frontend/src/stores/interface/index.ts +++ b/frontend/src/stores/interface/index.ts @@ -1,8 +1,8 @@ -export type LayoutType = "vertical" | "classic" | "transverse" | "columns"; +export type LayoutType = 'vertical' | 'classic' | 'transverse' | 'columns'; -export type AssemblySizeType = "large" | "default" | "small"; +export type AssemblySizeType = 'large' | 'default' | 'small'; -export type LanguageType = "zh" | "en" | null; +export type LanguageType = 'zh' | 'en' | null; /* GlobalState */ export interface GlobalState { @@ -53,6 +53,7 @@ export interface AuthState { [key: string]: string[]; }; authMenuList: Menu.MenuOptions[]; + showMenuFlag: boolean; } /* KeepAliveState */