From 45a5e4d66652194e0fe5543bfae7c8267badb39a Mon Sep 17 00:00:00 2001 From: que01 Date: Thu, 29 Oct 2026 15:09:53 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=8A=BD=E5=8F=96=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E9=A2=84=E8=A7=88=E6=8A=95=E5=BD=B1=E8=A7=84=E5=88=99?= =?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 +- .../services/offering-preview-projection.ts | 63 ++++++++ .../src/features/services/offering-preview.ts | 52 +------ .../test/offering-preview-projection.test.mjs | 138 ++++++++++++++++++ packages/api-client/src/index.ts | 1 + 5 files changed, 206 insertions(+), 52 deletions(-) create mode 100644 apps/admin/src/features/services/offering-preview-projection.ts create mode 100644 apps/admin/test/offering-preview-projection.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 aa9b6a3..5a7e89d 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-29T06:24:26.667Z", + "generatedAt": "2026-10-29T07:09:56.748Z", "templates": { "acheng-campus-food": { "real-manifest-interaction": { @@ -256,5 +256,5 @@ } } }, - "sourceTreeHash": "5d81aec11fe39aa90095a7855b1cef41d7d48efc92aa19f7c9fd9a2c0b872b11" + "sourceTreeHash": "6c984c7a56aeef55ed6af2b9f95ec5a8fb2073405b14846fdc79e056c8fe2a65" } diff --git a/apps/admin/src/features/services/offering-preview-projection.ts b/apps/admin/src/features/services/offering-preview-projection.ts new file mode 100644 index 0000000..f19ed4b --- /dev/null +++ b/apps/admin/src/features/services/offering-preview-projection.ts @@ -0,0 +1,63 @@ +import type { RuntimeOffering } from "@personal-brand/api-client"; + +type RuntimePresentation = RuntimeOffering["presentation"]; + +function isFilledString(value: unknown): value is string { + return typeof value === "string" && value.trim() !== ""; +} + +/** + * 把表单草稿投影到单条 Runtime Offering 上。 + * 该函数是 buildOfferingPreviewWorkspace 的核心合并规则: + * - name/coverUrl 等展示字段为空时保留原值,避免输入中间态清空预览; + * - summary/priceText 允许清空为空字符串; + * - presentation 由原值、模板 config、config.presentation 与事实字段逐层合并; + * - detailHero 优先于 coverUrl,两者都为空时保留原 heroImage。 + */ +export function projectOfferingPreviewFields(options: { + item: Pick; + config: Record; + formValues: Record; +}): { + name: string; + summary: string; + priceText: string | null; + coverUrl: string | null; + presentation: RuntimePresentation; +} { + const { item, config, formValues } = options; + const nestedPresentation = + config.presentation && typeof config.presentation === "object" + ? (config.presentation as Record) + : {}; + const configDetails = + config.details && typeof config.details === "object" + ? (config.details as Record) + : {}; + + const presentation: RuntimePresentation = { + ...item.presentation, + ...config, + ...nestedPresentation, + ...(typeof config.area === "string" ? { area: config.area } : {}), + ...(typeof config.series === "string" ? { series: config.series } : {}), + ...(typeof config.spaceType === "string" ? { spaceType: config.spaceType } : {}), + heroImage: isFilledString(config.detailHero) + ? config.detailHero + : isFilledString(formValues.coverUrl) + ? formValues.coverUrl + : (item.coverUrl ?? null), + details: { + ...item.presentation.details, + ...configDetails, + }, + }; + + return { + name: isFilledString(formValues.name) ? formValues.name : item.name, + summary: typeof formValues.summary === "string" ? formValues.summary : item.summary, + priceText: typeof formValues.priceText === "string" ? formValues.priceText : item.priceText, + coverUrl: isFilledString(formValues.coverUrl) ? formValues.coverUrl : item.coverUrl, + presentation, + }; +} diff --git a/apps/admin/src/features/services/offering-preview.ts b/apps/admin/src/features/services/offering-preview.ts index af9fb9b..64298e8 100644 --- a/apps/admin/src/features/services/offering-preview.ts +++ b/apps/admin/src/features/services/offering-preview.ts @@ -7,6 +7,7 @@ import type { TemplateAdminField, } from "@personal-brand/api-client"; import { applyPresentationValues } from "../../lib/presentation/presentation-bindings.js"; +import { projectOfferingPreviewFields } from "./offering-preview-projection.js"; export function previewFieldsByTarget( sections: AdminTemplateContent["admin"]["sections"], @@ -33,60 +34,11 @@ export function buildOfferingPreviewWorkspace(options: { [{ key: "offering", fields: templateFields }], formValues, ); - const offeringValues = { - name: formValues.name, - summary: formValues.summary, - description: formValues.description, - priceText: formValues.priceText, - coverUrl: formValues.coverUrl, - }; return { ...previewWorkspace, offerings: previewWorkspace.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, - ...config, - ...(config.presentation && typeof config.presentation === "object" - ? (config.presentation as Record) - : {}), - ...(typeof config.area === "string" ? { area: config.area } : {}), - ...(typeof config.series === "string" ? { series: config.series } : {}), - ...(typeof config.spaceType === "string" ? { spaceType: config.spaceType } : {}), - heroImage: - typeof config.detailHero === "string" - ? config.detailHero - : typeof offeringValues.coverUrl === "string" && offeringValues.coverUrl.trim() - ? offeringValues.coverUrl - : (item.coverUrl ?? null), - details: { - ...item.presentation.details, - ...(config.details && typeof config.details === "object" - ? { - ...item.presentation.details, - ...(config.details as Record), - } - : {}), - }, - }, - } + ? { ...item, ...projectOfferingPreviewFields({ item, config, formValues }) } : item, ), }; diff --git a/apps/admin/test/offering-preview-projection.test.mjs b/apps/admin/test/offering-preview-projection.test.mjs new file mode 100644 index 0000000..daed1a8 --- /dev/null +++ b/apps/admin/test/offering-preview-projection.test.mjs @@ -0,0 +1,138 @@ +import assert from "node:assert/strict"; +import test from "node:test"; +import { projectOfferingPreviewFields } from "../src/features/services/offering-preview-projection.ts"; + +const baseItem = { + name: "原名称", + summary: "原简介", + priceText: "原价格", + coverUrl: "/media/original-cover.jpg", + presentation: { + categoryKey: "portfolio", + categoryLabel: "品牌视觉", + heroImage: "/media/original-hero.jpg", + keywords: ["原始"], + media: [], + details: { + background: "原始背景", + designConcept: "", + crafts: [], + materialsList: [], + }, + }, +}; + +test("filled name and coverUrl override originals", () => { + const result = projectOfferingPreviewFields({ + item: baseItem, + config: {}, + formValues: { + name: "新名称", + coverUrl: "/media/new-cover.jpg", + summary: "", + priceText: "", + }, + }); + + assert.equal(result.name, "新名称"); + assert.equal(result.coverUrl, "/media/new-cover.jpg"); + // summary/priceText 空字符串应覆盖原值(允许清空)。 + assert.equal(result.summary, ""); + assert.equal(result.priceText, ""); +}); + +test("empty name and coverUrl preserve originals", () => { + const result = projectOfferingPreviewFields({ + item: baseItem, + config: {}, + formValues: { + name: " ", + coverUrl: "", + summary: "新简介", + }, + }); + + assert.equal(result.name, "原名称"); + assert.equal(result.coverUrl, "/media/original-cover.jpg"); + assert.equal(result.summary, "新简介"); +}); + +test("presentation merges base config and nested presentation", () => { + const result = projectOfferingPreviewFields({ + item: baseItem, + config: { + area: "杭州", + series: "品牌焕新", + spaceType: "线上与线下", + presentation: { categoryLabel: "新分类" }, + keywords: ["新关键词"], + }, + formValues: {}, + }); + + assert.equal(result.presentation.area, "杭州"); + assert.equal(result.presentation.series, "品牌焕新"); + assert.equal(result.presentation.spaceType, "线上与线下"); + assert.equal(result.presentation.categoryLabel, "新分类"); + assert.deepEqual(result.presentation.keywords, ["新关键词"]); + // categoryKey 不被覆盖时保留原值。 + assert.equal(result.presentation.categoryKey, "portfolio"); +}); + +test("heroImage follows detailHero, then coverUrl, then original", () => { + const hero = projectOfferingPreviewFields({ + item: baseItem, + config: { detailHero: "/media/detail-hero.jpg" }, + formValues: { coverUrl: "/media/new-cover.jpg" }, + }); + assert.equal(hero.presentation.heroImage, "/media/detail-hero.jpg"); + + const fallbackCover = projectOfferingPreviewFields({ + item: baseItem, + config: { detailHero: "" }, + formValues: { coverUrl: "/media/new-cover.jpg" }, + }); + assert.equal(fallbackCover.presentation.heroImage, "/media/new-cover.jpg"); + + const fallbackOriginal = projectOfferingPreviewFields({ + item: baseItem, + config: { detailHero: "" }, + formValues: { coverUrl: "" }, + }); + assert.equal(fallbackOriginal.presentation.heroImage, "/media/original-cover.jpg"); +}); + +test("details merge preserves originals and applies updates", () => { + const result = projectOfferingPreviewFields({ + item: baseItem, + config: { + details: { + background: "更新后的背景", + designConcept: "新的设计理念", + crafts: ["新交付"], + materialsList: [{ name: "策略", spec: "定位" }], + }, + }, + formValues: {}, + }); + + assert.equal(result.presentation.details.background, "更新后的背景"); + assert.equal(result.presentation.details.designConcept, "新的设计理念"); + assert.deepEqual(result.presentation.details.crafts, ["新交付"]); + assert.deepEqual(result.presentation.details.materialsList, [{ name: "策略", spec: "定位" }]); +}); + +test("non-object config.presentation and details are ignored safely", () => { + const result = projectOfferingPreviewFields({ + item: baseItem, + config: { + presentation: "invalid", + details: 42, + }, + formValues: {}, + }); + + assert.deepEqual(result.presentation.keywords, ["原始"]); + assert.equal(result.presentation.details.background, "原始背景"); + assert.deepEqual(result.presentation.details.crafts, []); +}); diff --git a/packages/api-client/src/index.ts b/packages/api-client/src/index.ts index 533a98e..180e030 100644 --- a/packages/api-client/src/index.ts +++ b/packages/api-client/src/index.ts @@ -68,6 +68,7 @@ export type { PublicOffering, BookingStatus, BrandTemplateKey } from "@personal- export type { EditorPreviewFrameMessage, EditorPreviewHostMessage, + RuntimeOffering, RuntimeWorkspace, } from "@personal-brand/types"; export { isTrustContentComplete } from "@personal-brand/types"; -- 2.54.0