diff --git a/apps/admin/src/features/brand/ComponentTemplatePreview.css b/apps/admin/src/features/brand/ComponentTemplatePreview.css index d1b28ec..a2ddfb4 100644 --- a/apps/admin/src/features/brand/ComponentTemplatePreview.css +++ b/apps/admin/src/features/brand/ComponentTemplatePreview.css @@ -104,6 +104,20 @@ box-shadow: 0 0 0 3px rgba(22, 119, 255, 0.16); } +.component-template-preview__composite-select { + position: absolute; + z-index: 7; + width: auto !important; + padding: 2px 8px !important; + border: 1px solid #1677ff !important; + border-radius: 4px !important; + background: #fff !important; + color: #0958d9 !important; + font-size: 12px !important; + line-height: 20px !important; + cursor: pointer; +} + .component-template-preview__outline span { position: absolute; bottom: 100%; diff --git a/apps/admin/src/features/brand/ComponentTemplatePreview.tsx b/apps/admin/src/features/brand/ComponentTemplatePreview.tsx index 745108a..eaa18dd 100644 --- a/apps/admin/src/features/brand/ComponentTemplatePreview.tsx +++ b/apps/admin/src/features/brand/ComponentTemplatePreview.tsx @@ -32,15 +32,19 @@ export function ComponentTemplatePreview({ const [hovered, setHovered] = useState(null); const [hoverOutline, setHoverOutline] = useState(null); const [selectedOutline, setSelectedOutline] = useState(null); + const [compositeOutlines, setCompositeOutlines] = useState>([]); const targetFor = useCallback( (element: Element | null): HTMLElement | null => { let candidate = element?.closest("[data-editor-target]"); + let deepest: HTMLElement | null = null; + let composite: HTMLElement | null = null; while (candidate && root.current?.contains(candidate)) { - if (targets.some((target) => target.key === candidate?.dataset.editorTarget)) - return candidate; + const target = targets.find((item) => item.key === candidate?.dataset.editorTarget); + if (target && !deepest) deepest = candidate; + if (target?.composite) composite = candidate; candidate = candidate.parentElement?.closest("[data-editor-target]") ?? null; } - return null; + return composite ?? deepest; }, [targets], ); @@ -81,6 +85,17 @@ export function ComponentTemplatePreview({ frame = requestAnimationFrame(() => { setSelectedOutline(measure(selectedElement())); setHoverOutline(measure(hovered)); + setCompositeOutlines( + targets + .filter((target) => target.composite) + .flatMap((target) => { + const element = viewport.querySelector( + `[data-editor-target="${CSS.escape(target.key)}"]`, + ); + const outline = measure(element); + return outline ? [{ ...outline, key: target.key }] : []; + }), + ); }); }; update(); @@ -136,7 +151,13 @@ export function ComponentTemplatePreview({ onPointerLeave={() => setHovered(null)} onClickCapture={(event) => { if (mode !== "edit") return; - const element = targetFor(event.target instanceof Element ? event.target : null); + const canvas = root.current?.querySelector(".component-template-preview__canvas"); + if (!event.target || !(event.target instanceof Node) || !canvas?.contains(event.target)) + return; + const pointTarget = document.elementFromPoint(event.clientX, event.clientY); + const element = targetFor( + pointTarget && canvas.contains(pointTarget) ? pointTarget : null, + ); event.preventDefault(); event.stopPropagation(); onTargetSelected( @@ -154,6 +175,20 @@ export function ComponentTemplatePreview({
+ {mode === "edit" + ? compositeOutlines.map((outline) => ( + + )) + : null} {mode === "edit" && hoverOutline ? (
item.value === activePage) ? activePage : pageOptions[0]?.value; - const visibleSections = sections.filter((section) => section.page === selectedPage); + const visibleSections = sections.filter( + (section) => + section.page === selectedPage && + // 详情页内容来自所选业务记录;不再展示一套额外的品牌级详情编辑器。 + !(selectedPage === "detail" && section.target === "brand"), + ); const recordSections = useMemo( () => (templateContent?.trustContentTypes ?? []) @@ -227,10 +236,14 @@ export function PresentationEditor({ .map((item) => trustSection(item, selectedPage ?? "home")), [templateContent, selectedPage], ); - const visibleTargets = useMemo( + const visibleTargets = useMemo( () => [...(templateContent?.admin.sections ?? []), ...recordSections] - .filter((section) => section.page === selectedPage) + .filter( + (section) => + section.page === selectedPage && + !(selectedPage === "detail" && section.target === "brand"), + ) .flatMap((section) => (section.previewTargets ?? []).map((target) => ({ ...target, @@ -621,7 +634,14 @@ export function PresentationEditor({ {selectedTarget?.label ?? pageTitle(selectedPage ?? "home")} - {activeTarget?.startsWith("inquiry-field:") && inquiryRuntime ? ( + {selectedPage === "detail" ? ( + + ) : activeTarget?.startsWith("inquiry-field:") && inquiryRuntime ? ( item.key === inquiryRuntime.key) ?? @@ -630,6 +650,43 @@ export function PresentationEditor({ fieldKey={activeTarget.slice("inquiry-field:".length)} onDraft={setInquiryDraft} /> + ) : selectedTarget?.composite ? ( + + {(selectedTarget.children ?? []).map((childKey) => { + const child = visibleTargets.find((item) => item.key === childKey); + if (!child) return null; + return ( + + ); + })} + + } + /> ) : selectedRecordSource && selection?.recordId && selectedSection ? ( selectedRecord ? ( { @@ -361,10 +376,12 @@ test("Admin 按通用预览目标筛选字段并同步品牌草稿", async ({ pa ); await expect(actionButtons.nth(0)).toContainText("咨询 / 预订"); await expect(actionButtons.nth(1)).toContainText("查看餐品"); - await preview.locator('[data-editor-target="food.home.actions"]').click(); + await page.getByRole("button", { name: "选择品牌信息区" }).click(); + await page.getByRole("button", { name: "编辑首页操作按钮" }).click(); await expect(page.getByLabel("咨询按钮")).toBeVisible(); await page.keyboard.press("Escape"); - await preview.locator('[data-editor-target="food.home.location"]').click(); + await page.getByRole("button", { name: "选择品牌信息区" }).click(); + await page.getByRole("button", { name: "编辑服务地点" }).click(); await expect(page.getByText("出摊信息标题")).toBeVisible(); await expect(page.getByText("招牌餐品标题")).toHaveCount(0); await page.getByLabel("出摊信息标题").fill("后台草稿地点"); @@ -379,7 +396,8 @@ test("Admin 按通用预览目标筛选字段并同步品牌草稿", async ({ pa await preview.locator(".food-home .actions button").nth(1).click(); await expect(page.getByText("招牌餐品标题")).toHaveCount(0); await page.getByRole("button", { name: "点选编辑" }).click(); - await preview.locator('[data-editor-target="food.home.location"]').click(); + await page.getByRole("button", { name: "选择品牌信息区" }).click(); + await page.getByRole("button", { name: "编辑服务地点" }).click(); await expect(preview.locator(".component-template-preview__outline.is-selected")).toHaveAttribute( "data-selected-target", "food.home.location", @@ -414,6 +432,9 @@ test("Admin 按通用预览目标筛选字段并同步品牌草稿", async ({ pa await page.getByText("出摊服务", { exact: true }).click(); await expect(preview.locator(".schedule-card")).toContainText("周一到周五营业"); await page.getByText("详情页", { exact: true }).click(); + await expect(page.locator(".component-template-preview")).toHaveCount(1); + await expect(preview.locator(".component-template-preview__canvas")).toHaveCount(1); + await expect(preview.locator(".food-detail")).toHaveCount(1); const detailBounds = await preview.evaluate((element) => { const canvas = element.querySelector(".component-template-preview__canvas")!; const bar = element.querySelector(".food-detail .bar")!; @@ -433,12 +454,9 @@ test("Admin 按通用预览目标筛选字段并同步品牌草稿", async ({ pa await preview.locator(".food-detail .bar").scrollIntoViewIfNeeded(); await expect(preview.locator(".food-detail .bar button")).toBeVisible(); await preview.screenshot({ path: "../../.codex-tasks/preview-proportion/detail.png" }); - await preview.locator('[data-editor-target="acheng-campus-food.detail.detailCopy"]').click(); - await expect(preview.locator(".component-template-preview__outline.is-selected")).toHaveAttribute( - "data-selected-target", - "acheng-campus-food.detail.detailCopy", - ); - await expect(page.getByLabel("价格标题")).toBeVisible(); + await expect(page.getByText("详情页由所选业务内容动态生成")).toBeVisible(); + await expect(page.getByLabel("价格标题")).toHaveCount(0); + await expect(page.getByLabel("餐品介绍")).toHaveCount(0); await page.getByText("定制/咨询", { exact: true }).click(); await expect(preview.locator(".inquiry-form .form-field")).toHaveCount(2); await expect(preview.locator(".inquiry-form")).toContainText("称呼"); diff --git a/packages/api-client/src/index.ts b/packages/api-client/src/index.ts index a2db8a9..51004a7 100644 --- a/packages/api-client/src/index.ts +++ b/packages/api-client/src/index.ts @@ -107,7 +107,12 @@ export interface TemplateAdminSection { description: string; page: string; target: "brand" | "offering" | "trust" | "inquiry"; - previewTargets?: Array<{ key: string; label: string }>; + previewTargets?: Array<{ + key: string; + label: string; + composite?: boolean; + children?: string[]; + }>; fields: TemplateAdminField[]; } diff --git a/packages/config/src/generated-template-packages.js b/packages/config/src/generated-template-packages.js index 9e190e3..816f5da 100644 --- a/packages/config/src/generated-template-packages.js +++ b/packages/config/src/generated-template-packages.js @@ -251,6 +251,16 @@ export const generatedTemplatePackageRegistry = [ "page": "home", "target": "brand", "previewTargets": [ + { + "key": "food.home.brand-card", + "label": "品牌信息区", + "composite": true, + "children": [ + "food.home.identity", + "food.home.location", + "food.home.actions" + ] + }, { "key": "food.home.identity", "label": "主理人身份" @@ -2666,4 +2676,4 @@ export const generatedTemplatePackageRegistry = [ } ]; export const generatedTemplatePackageRegistryHash = - "a0e75797819fae48ed9592704c7ab271725298617aca56fa9e674c132684dde2"; + "d2dc4f44e161e567f9e726a777689e09b5e31cbc41aefe569a9531ccf6a604dd"; diff --git a/packages/template-acheng-campus-food/taro/index.tsx b/packages/template-acheng-campus-food/taro/index.tsx index 3f185ab..9c23bfb 100644 --- a/packages/template-acheng-campus-food/taro/index.tsx +++ b/packages/template-acheng-campus-food/taro/index.tsx @@ -15,7 +15,7 @@ function Home({ workspace }: { workspace: RuntimeWorkspace }) { return ( - + {text(brand.avatarUrl) && } diff --git a/packages/template-acheng-campus-food/template.json b/packages/template-acheng-campus-food/template.json index 8f644b1..deb34cc 100644 --- a/packages/template-acheng-campus-food/template.json +++ b/packages/template-acheng-campus-food/template.json @@ -244,6 +244,12 @@ "page": "home", "target": "brand", "previewTargets": [ + { + "key": "food.home.brand-card", + "label": "品牌信息区", + "composite": true, + "children": ["food.home.identity", "food.home.location", "food.home.actions"] + }, { "key": "food.home.identity", "label": "主理人身份" diff --git a/packages/template-contract/src/index.ts b/packages/template-contract/src/index.ts index baa8c5b..a1be046 100644 --- a/packages/template-contract/src/index.ts +++ b/packages/template-contract/src/index.ts @@ -86,7 +86,13 @@ export type TemplateAdminSection = { page: TemplatePageKey; target: "brand" | "offering" | "trust" | "inquiry"; /** Visual regions rendered by this section's page. */ - previewTargets?: Array<{ key: string; label: string }>; + previewTargets?: Array<{ + key: string; + label: string; + /** 组合区域只负责承载和导航,不重复声明可编辑字段。 */ + composite?: boolean; + children?: string[]; + }>; fields: TemplateAdminField[]; }; diff --git a/packages/template-contract/test/preview-target.test.mjs b/packages/template-contract/test/preview-target.test.mjs index d21c578..9c7420b 100644 --- a/packages/template-contract/test/preview-target.test.mjs +++ b/packages/template-contract/test/preview-target.test.mjs @@ -36,6 +36,25 @@ for (const directory of templateDirectories) { `${section.key}.${field.key} references an undeclared previewTarget`, ); } + for (const target of section.previewTargets ?? []) { + if (target.composite) { + assert.ok( + Array.isArray(target.children) && target.children.length > 0, + `${target.key} composite target must declare child targets`, + ); + for (const child of target.children) + assert.ok( + section.previewTargets?.some( + (candidate) => candidate.key === child && !candidate.composite, + ), + `${target.key} references missing or composite child ${child}`, + ); + assert.ok( + !section.fields.some((field) => field.previewTarget === target.key), + `${target.key} composite target must not duplicate editable fields`, + ); + } + } } for (const field of manifest.templateFields ?? []) { assert.ok(field.binding, `templateFields.${field.key} must have an editable binding`); @@ -48,19 +67,55 @@ for (const directory of templateDirectories) { } for (const target of targets) - assert.ok( - target.section.fields.some((field) => field.previewTarget === target.key), - `${target.key} must map to at least one editable field`, - ); + if (!target.composite) + assert.ok( + target.section.fields.some((field) => field.previewTarget === target.key), + `${target.key} must map to at least one editable field`, + ); if (!targets.length) return; assert.ok(fs.existsSync(rendererPath), "templates with preview targets need a Taro renderer"); const renderer = fs.readFileSync(rendererPath, "utf8"); for (const target of targets) assert.ok( - renderer.includes(target.key), + renderer.includes(`data-editor-target="${target.key}"`) || + renderer.includes(`data-editor-target={\`${target.key}`) || + renderer.includes(`data-editor-target={formTargets[`), `renderer is missing data-editor-target ${target.key}`, ); assert.ok(renderer.includes("data-editor-target"), "renderer must expose editor targets"); + + const hasDynamicTrustTarget = /data-editor-target=\{`trust:\$\{item\.type\}`\}/.test(renderer); + const literalRendererTargets = new Set( + [...renderer.matchAll(/data-editor-target="([^"]+)"/g)] + .map((match) => match[1]) + .filter((key) => !key.startsWith("trust:")), + ); + for (const renderedKey of literalRendererTargets) + assert.ok( + keys.includes(renderedKey), + `renderer target ${renderedKey} is missing from manifest`, + ); + const concreteTrustTypes = new Set( + [...literalRendererTargets] + .filter((key) => key.startsWith("trust:")) + .map((key) => key.slice("trust:".length)), + ); + for (const type of concreteTrustTypes) { + const key = `trust:${type}`; + assert.ok( + (manifest.trustContentTypes ?? []).some((item) => item.type === type), + `renderer trust target ${key} has no trust type declaration`, + ); + assert.ok( + targets.some((target) => target.key === key), + `renderer trust target ${key} is missing from Admin declarations`, + ); + } + if (hasDynamicTrustTarget) + assert.ok( + manifest.trustContentTypes?.length, + "dynamic trust targets need trust type declarations", + ); }); }