From 0e0ca201a7053fc5dcebda084ad8921664c6d290 Mon Sep 17 00:00:00 2001 From: que01 Date: Sat, 10 Oct 2026 17:31:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=9A=E5=8A=A1=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=88=97=E8=A1=A8=E4=B8=8E=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/features/services/ServicesPage.css | 12 ++++ .../src/features/services/ServicesPage.tsx | 58 +++++++++++++++---- 2 files changed, 60 insertions(+), 10 deletions(-) diff --git a/apps/admin/src/features/services/ServicesPage.css b/apps/admin/src/features/services/ServicesPage.css index 4707a50..078ffb8 100644 --- a/apps/admin/src/features/services/ServicesPage.css +++ b/apps/admin/src/features/services/ServicesPage.css @@ -8,12 +8,24 @@ .service-offering-editor__preview { min-width: 0; + display: flex; + flex-direction: column; height: 72vh; border: 1px solid #e5e7eb; border-radius: 12px; overflow: hidden; } +.service-offering-editor__view { + align-self: flex-start; + margin-bottom: 10px; +} + +.service-offering-editor__preview > .component-template-preview-shell { + flex: 1; + min-height: 0; +} + .service-offering-editor__form { min-width: 0; max-height: 72vh; diff --git a/apps/admin/src/features/services/ServicesPage.tsx b/apps/admin/src/features/services/ServicesPage.tsx index 19b08a7..06d4a98 100644 --- a/apps/admin/src/features/services/ServicesPage.tsx +++ b/apps/admin/src/features/services/ServicesPage.tsx @@ -4,6 +4,7 @@ import { Input, Modal, Popconfirm, + Segmented, Select, Space, Table, @@ -19,7 +20,6 @@ import type { TemplateAdminSection, } from "@personal-brand/api-client"; import { useMemo, useState } from "react"; -import { projectBrandAliases } from "@personal-brand/api-client"; import { createApiClient } from "../../lib/api.js"; import { AdminPageHeader } from "../../components/AdminPageHeader.js"; import { ImageUrlField } from "../../components/ImageUrlField.js"; @@ -42,6 +42,7 @@ export function ServicesPage() { const [offeringForm] = Form.useForm(); const [offeringOpen, setOfferingOpen] = useState(false); const [editingOffering, setEditingOffering] = useState(null); + const [previewPage, setPreviewPage] = useState<"offerings" | "detail">("detail"); const offerings = useQuery({ queryKey: ["admin-offerings"], queryFn: () => client.listAdminOfferings(), @@ -94,7 +95,7 @@ export function ServicesPage() { const previewTargets = useMemo( () => (workspace.data?.templateContent?.admin.sections ?? []) - .filter((section) => section.page === "offerings") + .filter((section) => section.page === previewPage) .flatMap((section) => (section.previewTargets ?? []).map((target) => ({ ...target, @@ -109,15 +110,41 @@ export function ServicesPage() { ), [workspace.data?.templateContent], ); - const previewPageWorkspace = useMemo(() => { + const previewWorkspaceDraft = useMemo(() => { if (!previewWorkspace.data || !editingOffering) return undefined; - const config = editingOffering.config ?? {}; + const values = offeringForm.getFieldsValue(true) as Record; + const config = applyPresentationValues( + editingOffering.config, + [{ key: "offering", fields: templateFields }], + values, + ); + const offeringValues = { + name: values.name, + summary: values.summary, + description: values.description, + priceText: values.priceText, + coverUrl: values.coverUrl, + }; return { ...previewWorkspace.data, offerings: previewWorkspace.data.offerings.map((item) => item.id === editingOffering.id ? { ...item, + name: + typeof offeringValues.name === "string" && offeringValues.name.trim() + ? offeringValues.name + : item.name, + summary: + typeof offeringValues.summary === "string" ? offeringValues.summary : item.summary, + priceText: + typeof offeringValues.priceText === "string" + ? offeringValues.priceText + : item.priceText, + coverUrl: + typeof offeringValues.coverUrl === "string" && offeringValues.coverUrl.trim() + ? offeringValues.coverUrl + : item.coverUrl, config, presentation: { ...item.presentation, @@ -128,14 +155,16 @@ export function ServicesPage() { heroImage: typeof config.detailHero === "string" ? config.detailHero - : (editingOffering.coverUrl ?? null), + : typeof offeringValues.coverUrl === "string" && offeringValues.coverUrl.trim() + ? offeringValues.coverUrl + : (item.coverUrl ?? null), }, } : item, ), - brand: projectBrandAliases(previewWorkspace.data.brand, config), + brand: previewWorkspace.data.brand, }; - }, [previewWorkspace.data, editingOffering]); + }, [previewWorkspace.data, editingOffering, templateFields]); const saveOffering = useMutation({ mutationFn: (values: Record) => { const fields = Object.fromEntries( @@ -327,11 +356,20 @@ export function ServicesPage() { confirmLoading={saveOffering.isPending} >
- {editingOffering && previewPageWorkspace ? ( + {editingOffering && previewWorkspaceDraft ? (
+ setPreviewPage(value as "offerings" | "detail")} + /> {}}