From 665a88eb300fdad6b4a2f102254bda710ac24f8e Mon Sep 17 00:00:00 2001 From: que01 Date: Mon, 21 Sep 2026 12:28:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E6=88=90=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF=E7=B1=BB=E5=9E=8B=E5=AE=89=E5=85=A8=E6=94=B6=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/features/overview/OverviewPage.tsx | 8 +++--- .../src/features/services/ServicesPage.tsx | 12 ++++++--- .../trust-content/TrustContentPage.tsx | 10 +++++--- .../src/features/workspace/WorkspacePage.tsx | 25 +++++++++++++------ packages/types/src/index.ts | 1 + 5 files changed, 38 insertions(+), 18 deletions(-) diff --git a/apps/admin/src/features/overview/OverviewPage.tsx b/apps/admin/src/features/overview/OverviewPage.tsx index da7c5d9..84ba847 100644 --- a/apps/admin/src/features/overview/OverviewPage.tsx +++ b/apps/admin/src/features/overview/OverviewPage.tsx @@ -22,9 +22,11 @@ export function OverviewPage() { const error = results.find((result) => result.isError)?.error; const retry = () => results.forEach((result) => void result.refetch()); const brand = results[0].data; - const workspace = results[1].data; + const workspace = results[1].data as + | { inquiryForm?: { isEnabled?: boolean }; modules?: Array<{ isEnabled?: boolean }> } + | undefined; const trust = results[2].data; - const offerings = results[3].data; + const offerings = results[3].data as Array<{ isEnabled?: boolean }> | undefined; const submissions = results[4].data; const checklist = [ { label: "品牌定位已填写", done: Boolean(brand?.name && brand.tagline) }, @@ -78,7 +80,7 @@ export function OverviewPage() { item.isEnabled).length ?? 0} + value={workspace?.modules?.filter((item) => item.isEnabled).length ?? 0} suffix="个启用" /> diff --git a/apps/admin/src/features/services/ServicesPage.tsx b/apps/admin/src/features/services/ServicesPage.tsx index 38ebc1d..1e0f79e 100644 --- a/apps/admin/src/features/services/ServicesPage.tsx +++ b/apps/admin/src/features/services/ServicesPage.tsx @@ -129,7 +129,7 @@ export function ServicesPage() { package: "套餐", subscription: "订阅", } as Record - )[value] ?? value} + )[String(value)] ?? String(value)} ), }, @@ -154,7 +154,7 @@ export function ServicesPage() { 还没有公开业务提供项。创建后,小程序服务页会优先读取这些内容。 )} - 兼容旧版服务 + 兼容旧版服务 saveOffering.mutate(values)} + onFinish={(values) => saveOffering.mutate(values as Record)} > diff --git a/apps/admin/src/features/trust-content/TrustContentPage.tsx b/apps/admin/src/features/trust-content/TrustContentPage.tsx index 1073c1d..90c17d9 100644 --- a/apps/admin/src/features/trust-content/TrustContentPage.tsx +++ b/apps/admin/src/features/trust-content/TrustContentPage.tsx @@ -65,9 +65,9 @@ export function TrustContentPage() { ? { type: item.type, title: item.title, - summary: item.summary ?? undefined, + ...(item.summary ? { summary: item.summary } : {}), content: item.content, - coverUrl: item.coverUrl ?? undefined, + ...(item.coverUrl ? { coverUrl: item.coverUrl } : {}), isPublished: item.isPublished, } : { type: "profile", isPublished: false }, @@ -97,7 +97,11 @@ export function TrustContentPage() { ), }, { title: "标题", dataIndex: "title" }, - { title: "摘要", dataIndex: "summary", render: (value) => value || "未填写" }, + { + title: "摘要", + dataIndex: "summary", + render: (value) => (typeof value === "string" && value ? value : "未填写"), + }, { title: "状态", dataIndex: "isPublished", diff --git a/apps/admin/src/features/workspace/WorkspacePage.tsx b/apps/admin/src/features/workspace/WorkspacePage.tsx index 779627a..887870d 100644 --- a/apps/admin/src/features/workspace/WorkspacePage.tsx +++ b/apps/admin/src/features/workspace/WorkspacePage.tsx @@ -24,8 +24,8 @@ export function WorkspacePage() { const queryClient = useQueryClient(); const [fieldOpen, setFieldOpen] = useState(false); const [formOpen, setFormOpen] = useState(false); - const [form] = Form.useForm(); - const [inquiryForm] = Form.useForm(); + const [form] = Form.useForm>(); + const [inquiryForm] = Form.useForm>(); const query = useQuery({ queryKey: ["admin-workspace"], queryFn: () => client.getAdminWorkspace(), @@ -222,9 +222,9 @@ export function WorkspacePage() { render: (value, item: BrandModule) => ( updateModule.mutate({ id: item.id, @@ -299,10 +299,10 @@ export function WorkspacePage() { onFinish={(values) => createField.mutate({ ...values, - required: values.required ?? false, + required: Boolean(values.required), isVisible: true, sortOrder: 99, - }) + } as Omit) } > @@ -355,7 +355,16 @@ export function WorkspacePage() { onOk={() => inquiryForm.submit()} confirmLoading={createForm.isPending} > -
createForm.mutate(values)}> + + createForm.mutate({ + name: typeof values.name === "string" ? values.name : "", + fieldsSnapshot: Array.isArray(values.fieldsSnapshot) ? values.fieldsSnapshot : [], + }) + } + > diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index c2143cb..1b24b0a 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -34,6 +34,7 @@ export interface PublicService { priceText: string | null; priceAmount: number | null; bookingEnabled: boolean; + isEnabled?: boolean; categoryKey?: string; config?: Record | null; }