背景: - 落实 11-前端路由与目录规范:URL、导航、面包屑、页面目录一一对应; - 「平台」更名「管理中心」,模块 key 由 platform 改为 system; - 原导航模块 key 与 URL 首段不一致(script vs /scripts、asset vs /assets), 占位页按 URL 解析不到模块,出现「页面不存在」。 改动: - nav-config:模块 key 改为 URL 首段(scripts / assets / system),平台更名 管理中心,管理中心全部路径收敛到 /system/*;用户页为 /system/users; - routes / router:ROUTES 按模块分组;新增 /system/users、/system/users/new、 /system/users/:id;旧 /users* 与 /platform* 加前端重定向;/system 落到用户列表; - 页面目录迁移:pages/users → pages/system/users,pages/home → pages/dashboard, 懒加载与所有引用同步; - 面包屑、AppLayout、登录回跳、通用占位页(按路径 + 权限解析,无权限进 403) 与单测 / e2e 路径同步; - 顺带修复 /scripts/library、/assets/library 等占位页因模块 key 不一致导致的 404。 影响面: - 仅前端路由与目录;后端 /api/v1/users 等接口与权限点不变; - 旧书签 /users*、/platform* 由前端重定向兼容一个版本。 回滚方式: - 回滚本提交即恢复 /users 与 /platform/* 路由、原页面目录与导航命名。 验证证据: - pnpm --filter @lingxi/web lint / typecheck / test 通过(15 files / 55 tests); - pnpm build 通过; - 浏览器:登录后落在 /system/users,导航显示「管理中心」;/users → /system/users, /platform/roles → /system/roles;有权限的 /scripts/library、/assets/library 显示占位页,无权限显示 403; - A1 e2e 6/6 通过(真实 API + 浏览器)。
This commit is contained in:
1 parent
a1e28daec5
commit
f97f97b0cd
40 files changed
+159
-106
No files matched your search
+17
-7
@@ -2,11 +2,12 @@
|
||||
import { Permission } from '@lingxi/shared';
|
||||
import { PageSkeleton } from '@lingxi/ui';
|
||||
import { lazy, type ReactNode, Suspense } from 'react';
|
||||
import { createBrowserRouter } from 'react-router';
|
||||
import { createBrowserRouter, Navigate } from 'react-router';
|
||||
|
||||
import { RequireAuth } from '@/components/auth/RequireAuth';
|
||||
import { RequirePermission } from '@/components/auth/RequirePermission';
|
||||
import { AppLayout } from '@/layout/AppLayout';
|
||||
import { LegacySystemRedirect, LegacyUsersRedirect } from '@/navigation/legacy-redirect';
|
||||
import { ForbiddenPage } from '@/pages/errors/ForbiddenPage';
|
||||
import { NotFoundPage } from '@/pages/errors/NotFoundPage';
|
||||
import { ServerErrorPage } from '@/pages/errors/ServerErrorPage';
|
||||
@@ -14,12 +15,12 @@ import { UnauthorizedPage } from '@/pages/errors/UnauthorizedPage';
|
||||
import { ROUTES } from '@/routes';
|
||||
|
||||
const UsersPage = lazy(async () => {
|
||||
const module = await import('@/pages/users/UsersPage');
|
||||
const module = await import('@/pages/system/users/UsersPage');
|
||||
return { default: module.UsersPage };
|
||||
});
|
||||
|
||||
const UserNewPage = lazy(async () => {
|
||||
const module = await import('@/pages/users/UserNewPage');
|
||||
const module = await import('@/pages/system/users/UserNewPage');
|
||||
return { default: module.UserNewPage };
|
||||
});
|
||||
|
||||
@@ -28,6 +29,11 @@ function withSkeleton(node: ReactNode): ReactNode {
|
||||
}
|
||||
|
||||
export const router = createBrowserRouter([
|
||||
// 旧地址兼容:/users* → /system/users*,/platform* → /system*
|
||||
{ path: 'users', element: <LegacyUsersRedirect /> },
|
||||
{ path: 'users/*', element: <LegacyUsersRedirect /> },
|
||||
{ path: 'platform', element: <LegacySystemRedirect /> },
|
||||
{ path: 'platform/*', element: <LegacySystemRedirect /> },
|
||||
{
|
||||
path: ROUTES.login,
|
||||
lazy: async () => ({
|
||||
@@ -45,11 +51,15 @@ export const router = createBrowserRouter([
|
||||
{
|
||||
index: true,
|
||||
lazy: async () => ({
|
||||
Component: (await import('@/pages/home/HomePage')).default,
|
||||
Component: (await import('@/pages/dashboard/HomePage')).default,
|
||||
}),
|
||||
},
|
||||
{
|
||||
path: 'users',
|
||||
path: 'system',
|
||||
element: <Navigate to={ROUTES.system.users} replace />,
|
||||
},
|
||||
{
|
||||
path: 'system/users',
|
||||
element: (
|
||||
<RequirePermission permission={Permission.USER_VIEW}>
|
||||
{withSkeleton(<UsersPage />)}
|
||||
@@ -57,7 +67,7 @@ export const router = createBrowserRouter([
|
||||
),
|
||||
},
|
||||
{
|
||||
path: 'users/new',
|
||||
path: 'system/users/new',
|
||||
element: (
|
||||
<RequirePermission permission={Permission.USER_MANAGE}>
|
||||
{withSkeleton(<UserNewPage />)}
|
||||
@@ -65,7 +75,7 @@ export const router = createBrowserRouter([
|
||||
),
|
||||
},
|
||||
{
|
||||
path: 'users/:id',
|
||||
path: 'system/users/:id',
|
||||
element: (
|
||||
<RequirePermission permission={Permission.USER_VIEW}>
|
||||
{withSkeleton(<UsersPage />)}
|
||||
|
||||
Reference in new issue
Block a user