xto-fronted 0.4.42 → 0.4.43

package/src/router/dynamicRoutes.ts

@@ -4,7 +4,7 @@
 
 import type { RouteRecordRaw } from 'vue-router'
 
-// 布局路由（包含默认子路由）
+// 布局路由（包含默认子路由和 catch-all 404）
 export const layoutRoute: RouteRecordRaw = {
   path: '/',
   name: 'Layout',
@@ -51,6 +51,16 @@ export const layoutRoute: RouteRecordRaw = {
         icon: 'menu',
         keepAlive: true
       }
+    },
+    // catch-all 路由：让 404 在 Layout 内部渲染，保持左侧菜单显示
+    {
+      path: '/:pathMatch(.*)*',
+      name: 'CatchAll',
+      component: () => import('@/views/error/404.vue'),
+      meta: {
+        title: '404',
+        hidden: true
+      }
     }
   ]
 }

package/src/router/index.ts

@@ -3,7 +3,7 @@
  */
 
 import { createRouter, createWebHistory } from 'vue-router'
-import { staticRoutes, errorRoute } from './staticRoutes'
+import { staticRoutes } from './staticRoutes'
 import { layoutRoute } from './dynamicRoutes'
 import { hasToken } from '@/utils/auth'
 import { getAppId } from '@/utils/config'
@@ -14,12 +14,12 @@ import { mockMenuData } from './dynamicRoutes'
 
 const router = createRouter({
   history: createWebHistory(),
-  routes: [...staticRoutes, layoutRoute, errorRoute],
+  routes: [...staticRoutes, layoutRoute],
   scrollBehavior: () => ({ left: 0, top: 0 })
 })
 
 // 白名单路由
-const whiteList = ['/login', '/404', '/403']
+const whiteList = ['/login']
 
 // 路由守卫
 router.beforeEach(async (to, _from, next) => {
@@ -72,7 +72,7 @@ router.beforeEach(async (to, _from, next) => {
 export function resetRouter() {
   const newRouter = createRouter({
     history: createWebHistory(),
-    routes: [...staticRoutes, layoutRoute, errorRoute]
+    routes: [...staticRoutes, layoutRoute]
   })
   ;(router as any).matcher = (newRouter as any).matcher
 }

package/src/router/layoutRoute.ts

@@ -22,12 +22,22 @@ export function createLayoutRoute(
 ): RouteRecordRaw {
   const indexPath = options.indexPath || '/dashboard'
 
+  // 添加 catch-all 路由，让404在Layout内部渲染，保持左侧菜单显示
+  const catchAllRoute: RouteRecordRaw = {
+    path: '/:pathMatch(.*)*',
+    name: 'CatchAll',
+    component: () => import('@/views/error/404.vue'),
+    meta: {
+      title: '404'
+    }
+  }
+
   return {
     path: '/',
     name: 'Layout',
     component: Layout,
     redirect: indexPath,
-    children
+    children: [...children, catchAllRoute]
   }
 }
 

package/src/router/staticRoutes.ts

@@ -13,31 +13,7 @@ export const staticRoutes: RouteRecordRaw[] = [
       title: '登录',
       hidden: true
     }
-  },
-  {
-    path: '/404',
-    name: 'NotFound',
-    component: () => import('@/views/error/404.vue'),
-    meta: {
-      title: '404',
-      hidden: true
-    }
-  },
-  {
-    path: '/403',
-    name: 'Forbidden',
-    component: () => import('@/views/error/403.vue'),
-    meta: {
-      title: '403',
-      hidden: true
-    }
   }
 ]
 
-export const errorRoute: RouteRecordRaw = {
-  path: '/:pathMatch(.*)*',
-  redirect: '/404',
-  meta: {
-    hidden: true
-  }
-}
+// 注意：404 和 403 路由已在 layoutRoute.ts 的 catch-all 中处理，确保在 Layout 内部渲染