fix: 增加后台渲染错误边界

This commit is contained in:
que01 committed 2026-10-21 10:56:51 +08:00
1 parent 98c7701ccd
commit 88ab2561bd
3 files changed
+126 -38

No files matched your search

+34 -31
View File
@@ -41,6 +41,7 @@ import { Route, Routes } from "react-router-dom";
import { AdminOverviewRedirect } from "./AdminRouter.js"; import { AdminOverviewRedirect } from "./AdminRouter.js";
import { createBrandRouteElement } from "./route-access.js"; import { createBrandRouteElement } from "./route-access.js";
import { Suspense } from "react"; import { Suspense } from "react";
import { AdminErrorBoundary } from "../components/AdminErrorBoundary.js";
export function Dashboard({ export function Dashboard({
onLogout, onLogout,
@@ -146,37 +147,39 @@ export function Dashboard({
</AdminLayout.Header> </AdminLayout.Header>
<AdminLayout.Content className="admin-content"> <AdminLayout.Content className="admin-content">
<div className="admin-content-inner"> <div className="admin-content-inner">
<Suspense fallback={<LoadingStack />}> <AdminErrorBoundary key={location.pathname}>
<Routes> <Suspense fallback={<LoadingStack />}>
<Route index element={<AdminOverviewRedirect />} /> <Routes>
<Route path="overview" element={<FeatureOverviewPage />} /> <Route index element={<AdminOverviewRedirect />} />
<Route path="publication" element={<FeaturePublicationPage />} /> <Route path="overview" element={<FeatureOverviewPage />} />
<Route path="brand" element={<FeatureBrandPage />} /> <Route path="publication" element={<FeaturePublicationPage />} />
<Route path="trust" element={<FeatureTrustContentPage />} /> <Route path="brand" element={<FeatureBrandPage />} />
<Route path="services" element={<FeatureServicesPage />} /> <Route path="trust" element={<FeatureTrustContentPage />} />
<Route path="inquiries" element={<FeatureInquiriesPage />} /> <Route path="services" element={<FeatureServicesPage />} />
<Route path="workspace" element={<FeatureWorkspacePage />} /> <Route path="inquiries" element={<FeatureInquiriesPage />} />
{role === "editor" ? null : ( <Route path="workspace" element={<FeatureWorkspacePage />} />
<> {role === "editor" ? null : (
<Route <>
path="brands" <Route
element={<FeatureBrandsPage canCreate={role === "owner"} />} path="brands"
/> element={<FeatureBrandsPage canCreate={role === "owner"} />}
<Route />
path="brands/new" <Route
element={createBrandRouteElement(role, <FeatureCreateBrandPage />)} path="brands/new"
/> element={createBrandRouteElement(role, <FeatureCreateBrandPage />)}
<Route path="page-scheme" element={<FeaturePageSchemePage />} /> />
<Route path="capabilities" element={<FeatureCapabilitiesPage />} /> <Route path="page-scheme" element={<FeaturePageSchemePage />} />
<Route path="members" element={<FeatureMembersPage />} /> <Route path="capabilities" element={<FeatureCapabilitiesPage />} />
{platformTemplateRole === "template_admin" ? ( <Route path="members" element={<FeatureMembersPage />} />
<Route path="templates" element={<FeatureTemplateManagementPage />} /> {platformTemplateRole === "template_admin" ? (
) : null} <Route path="templates" element={<FeatureTemplateManagementPage />} />
</> ) : null}
)} </>
<Route path="*" element={<AdminOverviewRedirect />} /> )}
</Routes> <Route path="*" element={<AdminOverviewRedirect />} />
</Suspense> </Routes>
</Suspense>
</AdminErrorBoundary>
</div> </div>
</AdminLayout.Content> </AdminLayout.Content>
</AdminLayout> </AdminLayout>
+10 -7
View File
@@ -6,6 +6,7 @@ import { AdminRouter } from "./AdminRouter.js";
import { App } from "antd"; import { App } from "antd";
import { createApiClient } from "../lib/api.js"; import { createApiClient } from "../lib/api.js";
import { LoadingStack } from "../components/LoadingStack.js"; import { LoadingStack } from "../components/LoadingStack.js";
import { AdminErrorBoundary } from "../components/AdminErrorBoundary.js";
type SessionState = Omit<AdminSession, "authenticated">; type SessionState = Omit<AdminSession, "authenticated">;
@@ -73,12 +74,14 @@ export function Root() {
/> />
); );
return ( return (
<AdminRouter> <AdminErrorBoundary variant="page">
<Dashboard <AdminRouter>
onLogout={logout} <Dashboard
role={session.role} onLogout={logout}
platformTemplateRole={session.platformTemplateRole} role={session.role}
/> platformTemplateRole={session.platformTemplateRole}
</AdminRouter> />
</AdminRouter>
</AdminErrorBoundary>
); );
} }
@@ -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 (
<Result
status="error"
title="页面渲染出错"
subTitle={
isPage
? "后台页面无法显示。可以重新加载;如果问题持续,请把错误编号提供给管理员。"
: "这个页面无法显示,其他页面仍可正常使用。可以重试或重新加载页面。"
}
extra={
<Space wrap>
{isPage ? null : (
<Button type="primary" onClick={this.reset}>
重试
</Button>
)}
<Button type={isPage ? "primary" : "default"} onClick={this.reload}>
重新加载页面
</Button>
{isPage ? <Button href="/admin/overview">返回概览</Button> : null}
</Space>
}
>
<Typography.Paragraph type="secondary" copyable={{ text: errorId ?? "" }}>
错误编号:{errorId}
</Typography.Paragraph>
{import.meta.env.DEV ? (
<Typography.Paragraph type="secondary">
开发环境错误信息:{error.message}
</Typography.Paragraph>
) : null}
</Result>
);
}
}