diff --git a/apps/admin/src/app/Dashboard.tsx b/apps/admin/src/app/Dashboard.tsx index 27dc545..514ecc1 100644 --- a/apps/admin/src/app/Dashboard.tsx +++ b/apps/admin/src/app/Dashboard.tsx @@ -41,6 +41,7 @@ import { Route, Routes } from "react-router-dom"; import { AdminOverviewRedirect } from "./AdminRouter.js"; import { createBrandRouteElement } from "./route-access.js"; import { Suspense } from "react"; +import { AdminErrorBoundary } from "../components/AdminErrorBoundary.js"; export function Dashboard({ onLogout, @@ -146,37 +147,39 @@ export function Dashboard({
- }> - - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - {role === "editor" ? null : ( - <> - } - /> - )} - /> - } /> - } /> - } /> - {platformTemplateRole === "template_admin" ? ( - } /> - ) : null} - - )} - } /> - - + + }> + + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + {role === "editor" ? null : ( + <> + } + /> + )} + /> + } /> + } /> + } /> + {platformTemplateRole === "template_admin" ? ( + } /> + ) : null} + + )} + } /> + + +
diff --git a/apps/admin/src/app/Root.tsx b/apps/admin/src/app/Root.tsx index 19bdfcb..c1ec054 100644 --- a/apps/admin/src/app/Root.tsx +++ b/apps/admin/src/app/Root.tsx @@ -6,6 +6,7 @@ import { AdminRouter } from "./AdminRouter.js"; import { App } from "antd"; import { createApiClient } from "../lib/api.js"; import { LoadingStack } from "../components/LoadingStack.js"; +import { AdminErrorBoundary } from "../components/AdminErrorBoundary.js"; type SessionState = Omit; @@ -73,12 +74,14 @@ export function Root() { /> ); return ( - - - + + + + + ); } diff --git a/apps/admin/src/components/AdminErrorBoundary.tsx b/apps/admin/src/components/AdminErrorBoundary.tsx new file mode 100644 index 0000000..1398229 --- /dev/null +++ b/apps/admin/src/components/AdminErrorBoundary.tsx @@ -0,0 +1,82 @@ +import { Component, type ErrorInfo, type ReactNode } from "react"; +import { Button, Result, Space, Typography } from "antd"; + +interface AdminErrorBoundaryProps { + children: ReactNode; + variant?: "page" | "content"; +} + +interface AdminErrorBoundaryState { + error: Error | null; + errorId: string | null; +} + +function createErrorId(): string { + return `admin-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`; +} + +/** + * 后台渲染错误边界:页面级兜底整页,内容级兜底单个业务页面且保留导航。 + * React 只支持 class 组件捕获渲染异常,因此这里保留 class 实现。 + */ +export class AdminErrorBoundary extends Component< + AdminErrorBoundaryProps, + AdminErrorBoundaryState +> { + override state: AdminErrorBoundaryState = { error: null, errorId: null }; + + static getDerivedStateFromError(error: Error): AdminErrorBoundaryState { + return { error, errorId: createErrorId() }; + } + + override componentDidCatch(error: Error, info: ErrorInfo) { + console.error("[admin] 页面渲染异常", this.state.errorId, error, info.componentStack); + } + + private reset = () => { + this.setState({ error: null, errorId: null }); + }; + + private reload = () => { + window.location.reload(); + }; + + override render() { + const { error, errorId } = this.state; + if (!error) return this.props.children; + const isPage = this.props.variant === "page"; + return ( + + {isPage ? null : ( + + )} + + {isPage ? : null} + + } + > + + 错误编号:{errorId} + + {import.meta.env.DEV ? ( + + 开发环境错误信息:{error.message} + + ) : null} + + ); + } +}