From b6fedd9f636d7f0a3f08198575b1395f3ae9871b Mon Sep 17 00:00:00 2001 From: que01 Date: Thu, 29 Oct 2026 13:47:30 +0800 Subject: [PATCH] =?UTF-8?q?test:=20=E6=8F=90=E5=8F=96=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E7=9B=AE=E6=A0=87=E7=BA=AF=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E5=B9=B6=E8=A1=A5=E5=85=85=E5=8D=95=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../raw/completion-evidence.json | 4 +- .../src/features/services/ServicesPage.tsx | 22 +-- .../services/offering-preview-targets.ts | 47 ++++++ .../src/features/services/offering-preview.ts | 32 +--- apps/admin/test/offering-preview.test.mjs | 141 ++++++++++++++++++ 5 files changed, 203 insertions(+), 43 deletions(-) create mode 100644 apps/admin/src/features/services/offering-preview-targets.ts create mode 100644 apps/admin/test/offering-preview.test.mjs diff --git a/.codex-tasks/template-audit-execution/raw/completion-evidence.json b/.codex-tasks/template-audit-execution/raw/completion-evidence.json index 4a2a02c..aa7c1e5 100644 --- a/.codex-tasks/template-audit-execution/raw/completion-evidence.json +++ b/.codex-tasks/template-audit-execution/raw/completion-evidence.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "scope": "模板完成证据登记,保留命令、日志与产物哈希", - "generatedAt": "2026-10-29T04:18:53.512Z", + "generatedAt": "2026-10-29T05:47:32.979Z", "templates": { "acheng-campus-food": { "real-manifest-interaction": { @@ -256,5 +256,5 @@ } } }, - "sourceTreeHash": "c360b68fa3e19dc9aab34eef007e6a6fa8cd502809a494324b537198c4c1a0eb" + "sourceTreeHash": "3f8f7d8b0063a1d21d4cf757d7c1b5ea83c3b3a162fd390183b1cb8e76879907" } diff --git a/apps/admin/src/features/services/ServicesPage.tsx b/apps/admin/src/features/services/ServicesPage.tsx index 0254c02..1a828c6 100644 --- a/apps/admin/src/features/services/ServicesPage.tsx +++ b/apps/admin/src/features/services/ServicesPage.tsx @@ -9,6 +9,7 @@ import { OfferingsTable } from "./OfferingsTable.js"; import { detailPageLabel, hasTemplateDetailCopy, offeringPageLabel } from "./offering-model.js"; import { buildOfferingPreviewWorkspace, + pageTemplateFields as collectPageTemplateFields, previewFieldsByTarget, previewTargetsByPage, } from "./offering-preview.js"; @@ -45,17 +46,16 @@ export function ServicesPage() { ); // 页面级字段必须按该页所有真实预览区域收集,不能只取列表/详情首个区域, // 否则模板把详情拆成多个区域后,未点选的“全部字段”会漏掉后续区域。 - const pageTemplateFields = useMemo(() => { - const targets = - editor.previewPage === "offerings" ? previewTargets.offerings : previewTargets.detail; - const targetKeys = new Set(targets.map((target) => target.key)); - return templateFields.filter( - (field) => - (field.previewTarget && targetKeys.has(field.previewTarget)) || - (!field.previewTarget && - field.page === (editor.previewPage === "offerings" ? listTarget?.page : "detail")), - ); - }, [editor.previewPage, listTarget?.page, previewTargets, templateFields]); + const pageTemplateFields = useMemo( + () => + collectPageTemplateFields({ + previewPage: editor.previewPage, + previewTargets, + templateFields, + listPage: listTarget?.page, + }), + [editor.previewPage, listTarget?.page, previewTargets, templateFields], + ); // 点选预览区块后,右侧只保留该区块对应的字段,与小程序页面点选编辑保持一致。 const selectedTarget = useMemo(() => { if (!editor.previewTargetKey) return undefined; diff --git a/apps/admin/src/features/services/offering-preview-targets.ts b/apps/admin/src/features/services/offering-preview-targets.ts new file mode 100644 index 0000000..6729122 --- /dev/null +++ b/apps/admin/src/features/services/offering-preview-targets.ts @@ -0,0 +1,47 @@ +import type { AdminTemplateContent, TemplateAdminField } from "@personal-brand/api-client"; +import type { PreviewTarget } from "../brand/preview-selection.js"; + +export function previewTargetsByPage( + sections: AdminTemplateContent["admin"]["sections"], +): Record<"offerings" | "detail", PreviewTarget[]> { + const targets = sections.flatMap((section) => + (section.previewTargets ?? []).map((target) => ({ + ...target, + page: section.page, + source: section.fields.some( + (field) => field.binding.startsWith("offering.") && field.previewTarget === target.key, + ) + ? ("offering" as const) + : section.target, + })), + ); + const pages = [...new Set(sections.map((section) => section.page))]; + const offeringPages = pages.filter( + (page) => + page !== "detail" && + targets.some((target) => target.page === page && target.source === "offering"), + ); + // 业务卡片不一定在“服务页”:独立工坊把案例卡片放在首页。优先使用专门的 + // offerings 页,没有时退回第一个包含业务记录的页面。 + const listPage = offeringPages.find((page) => page === "offerings") ?? offeringPages[0]; + return { + offerings: listPage ? targets.filter((target) => target.page === listPage) : [], + detail: targets.filter((target) => target.page === "detail"), + }; +} + +export function pageTemplateFields(options: { + previewPage: "offerings" | "detail"; + previewTargets: Record<"offerings" | "detail", PreviewTarget[]>; + templateFields: TemplateAdminField[]; + listPage?: string | undefined; +}): TemplateAdminField[] { + const { previewPage, previewTargets, templateFields, listPage } = options; + const targets = previewPage === "offerings" ? previewTargets.offerings : previewTargets.detail; + const targetKeys = new Set(targets.map((target) => target.key)); + return templateFields.filter( + (field) => + (field.previewTarget && targetKeys.has(field.previewTarget)) || + (!field.previewTarget && field.page === (previewPage === "offerings" ? listPage : "detail")), + ); +} diff --git a/apps/admin/src/features/services/offering-preview.ts b/apps/admin/src/features/services/offering-preview.ts index ca997d3..af9fb9b 100644 --- a/apps/admin/src/features/services/offering-preview.ts +++ b/apps/admin/src/features/services/offering-preview.ts @@ -1,41 +1,13 @@ +export { pageTemplateFields, previewTargetsByPage } from "./offering-preview-targets.js"; + import type { AdminTemplateContent, Offering, RuntimeWorkspace, TemplateAdminField, } from "@personal-brand/api-client"; -import type { PreviewTarget } from "../brand/preview-selection.js"; import { applyPresentationValues } from "../../lib/presentation/presentation-bindings.js"; -export function previewTargetsByPage( - sections: AdminTemplateContent["admin"]["sections"], -): Record<"offerings" | "detail", PreviewTarget[]> { - const targets = sections.flatMap((section) => - (section.previewTargets ?? []).map((target) => ({ - ...target, - page: section.page, - source: section.fields.some( - (field) => field.binding.startsWith("offering.") && field.previewTarget === target.key, - ) - ? ("offering" as const) - : section.target, - })), - ); - const pages = [...new Set(sections.map((section) => section.page))]; - const offeringPages = pages.filter( - (page) => - page !== "detail" && - targets.some((target) => target.page === page && target.source === "offering"), - ); - // 业务卡片不一定在“服务页”:独立工坊把案例卡片放在首页。优先使用专门的 - // offerings 页,没有时退回第一个包含业务记录的页面。 - const listPage = offeringPages.find((page) => page === "offerings") ?? offeringPages[0]; - return { - offerings: listPage ? targets.filter((target) => target.page === listPage) : [], - detail: targets.filter((target) => target.page === "detail"), - }; -} - export function previewFieldsByTarget( sections: AdminTemplateContent["admin"]["sections"], ): Record { diff --git a/apps/admin/test/offering-preview.test.mjs b/apps/admin/test/offering-preview.test.mjs new file mode 100644 index 0000000..7100cd7 --- /dev/null +++ b/apps/admin/test/offering-preview.test.mjs @@ -0,0 +1,141 @@ +import assert from "node:assert/strict"; +import test from "node:test"; +import { + pageTemplateFields, + previewTargetsByPage, +} from "../src/features/services/offering-preview-targets.ts"; + +function section(page, target, fields) { + return { + key: `${page}-${target}`, + title: target, + description: "", + page, + target, + fields, + previewTargets: [{ key: `${page}.${target}`, label: target }], + }; +} + +test("previewTargetsByPage prefers the offerings page for list targets", () => { + const sections = [ + section("home", "homeCard", [{ binding: "offering.name", previewTarget: "home.homeCard" }]), + section("offerings", "offeringCard", [ + { binding: "offering.name", previewTarget: "offerings.offeringCard" }, + ]), + section("detail", "projectHero", [ + { binding: "offering.name", previewTarget: "detail.projectHero" }, + ]), + ]; + + const result = previewTargetsByPage(sections); + assert.deepEqual( + result.offerings.map((target) => target.key), + ["offerings.offeringCard"], + ); + assert.deepEqual( + result.detail.map((target) => target.key), + ["detail.projectHero"], + ); +}); + +test("previewTargetsByPage falls back to the first non-detail page with offering records", () => { + const sections = [ + section("home", "homeCard", [{ binding: "offering.name", previewTarget: "home.homeCard" }]), + section("detail", "projectHero", []), + ]; + + const result = previewTargetsByPage(sections); + assert.equal(result.offerings.length, 1); + assert.equal(result.offerings[0].key, "home.homeCard"); + assert.equal(result.offerings[0].source, "offering"); +}); + +test("previewTargetsByPage returns no list targets without offering-backed pages", () => { + const sections = [ + section("detail", "projectHero", [ + { binding: "brand.name", previewTarget: "detail.projectHero" }, + ]), + ]; + + const result = previewTargetsByPage(sections); + assert.deepEqual(result.offerings, []); + assert.deepEqual( + result.detail.map((target) => target.key), + ["detail.projectHero"], + ); + assert.notEqual(result.detail[0].source, "offering"); +}); + +test("pageTemplateFields collects every detail target field", () => { + const previewTargets = previewTargetsByPage([ + section("detail", "projectHero", [ + { binding: "offering.name", previewTarget: "detail.projectHero" }, + ]), + section("detail", "projectFacts", [ + { binding: "offering.priceText", previewTarget: "detail.projectFacts" }, + ]), + section("home", "homeCard", [{ binding: "offering.summary", previewTarget: "home.homeCard" }]), + ]); + const templateFields = [ + { key: "name", binding: "offering.name", previewTarget: "detail.projectHero" }, + { key: "priceText", binding: "offering.priceText", previewTarget: "detail.projectFacts" }, + { key: "summary", binding: "offering.summary", previewTarget: "home.homeCard" }, + ]; + + const result = pageTemplateFields({ + previewPage: "detail", + previewTargets, + templateFields, + }); + assert.deepEqual( + result.map((field) => field.key), + ["name", "priceText"], + ); +}); + +test("pageTemplateFields falls back to page fields without previewTarget", () => { + const previewTargets = previewTargetsByPage([ + section("detail", "projectHero", [ + { binding: "offering.name", previewTarget: "detail.projectHero" }, + ]), + ]); + const templateFields = [ + { key: "name", binding: "offering.name", previewTarget: "detail.projectHero" }, + { key: "legacy", binding: "offering.config.legacy", page: "detail" }, + { key: "other", binding: "offering.config.other", previewTarget: "unknown.target" }, + ]; + + const result = pageTemplateFields({ + previewPage: "detail", + previewTargets, + templateFields, + }); + assert.deepEqual( + result.map((field) => field.key), + ["name", "legacy"], + ); +}); + +test("pageTemplateFields uses the inferred list page for offerings", () => { + const previewTargets = previewTargetsByPage([ + section("home", "homeCard", [{ binding: "offering.name", previewTarget: "home.homeCard" }]), + section("detail", "projectHero", []), + ]); + const templateFields = [ + { key: "name", binding: "offering.name", previewTarget: "home.homeCard" }, + { key: "legacy", binding: "offering.config.legacy", page: "home" }, + { key: "detail", binding: "offering.config.detail", previewTarget: "detail.projectHero" }, + ]; + + const result = pageTemplateFields({ + previewPage: "offerings", + previewTargets, + templateFields, + listPage: previewTargets.offerings[0]?.page, + }); + assert.deepEqual( + result.map((field) => field.key), + ["name", "legacy"], + ); +});