feat: 完善模板区域预览与详情页编辑边界
This commit is contained in:
1 parent
df2b1f6031
commit
849ae5df05
11 files changed
+236
-28
No files matched your search
@@ -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%;
|
||||
|
||||
@@ -32,15 +32,19 @@ export function ComponentTemplatePreview({
|
||||
const [hovered, setHovered] = useState<HTMLElement | null>(null);
|
||||
const [hoverOutline, setHoverOutline] = useState<Outline | null>(null);
|
||||
const [selectedOutline, setSelectedOutline] = useState<Outline | null>(null);
|
||||
const [compositeOutlines, setCompositeOutlines] = useState<Array<Outline & { key: string }>>([]);
|
||||
const targetFor = useCallback(
|
||||
(element: Element | null): HTMLElement | null => {
|
||||
let candidate = element?.closest<HTMLElement>("[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<HTMLElement>("[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<HTMLElement>(
|
||||
`[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({
|
||||
<div className="component-template-preview__canvas">
|
||||
<Renderer workspace={workspace} page={page} {...(offeringId ? { offeringId } : {})} />
|
||||
</div>
|
||||
{mode === "edit"
|
||||
? compositeOutlines.map((outline) => (
|
||||
<button
|
||||
key={outline.key}
|
||||
type="button"
|
||||
className="component-template-preview__composite-select"
|
||||
style={{ top: outline.top + 4, left: outline.left + 4 }}
|
||||
aria-label={`选择${targets.find((target) => target.key === outline.key)?.label ?? outline.label}`}
|
||||
onClick={() => onTargetSelected({ targetKey: outline.key })}
|
||||
>
|
||||
选择{targets.find((target) => target.key === outline.key)?.label ?? outline.label}
|
||||
</button>
|
||||
))
|
||||
: null}
|
||||
{mode === "edit" && hoverOutline ? (
|
||||
<div
|
||||
className="component-template-preview__outline is-hovered"
|
||||
|
||||
@@ -35,7 +35,11 @@ import { TemplateListField } from "../../components/TemplateListField.js";
|
||||
import { MutationError } from "../../components/QueryState.js";
|
||||
import { TemplatePreview } from "./TemplatePreview.js";
|
||||
import { InquiryPreviewEditor } from "./InquiryPreviewEditor.js";
|
||||
import { resolvePreviewSelection, type PreviewSelection } from "./preview-selection.js";
|
||||
import {
|
||||
resolvePreviewSelection,
|
||||
type PreviewSelection,
|
||||
type PreviewTarget,
|
||||
} from "./preview-selection.js";
|
||||
import {
|
||||
applyBrandPreviewValues,
|
||||
applyStandardBrandValues,
|
||||
@@ -219,7 +223,12 @@ export function PresentationEditor({
|
||||
const selectedPage = pageOptions.some((item) => 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<PreviewTarget[]>(
|
||||
() =>
|
||||
[...(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({
|
||||
<Typography.Title level={5}>
|
||||
{selectedTarget?.label ?? pageTitle(selectedPage ?? "home")}
|
||||
</Typography.Title>
|
||||
{activeTarget?.startsWith("inquiry-field:") && inquiryRuntime ? (
|
||||
{selectedPage === "detail" ? (
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
message="详情页由所选业务内容动态生成"
|
||||
description="选择不同的业务内容即可预览对应详情;内容请在业务提供项中维护。"
|
||||
/>
|
||||
) : activeTarget?.startsWith("inquiry-field:") && inquiryRuntime ? (
|
||||
<InquiryPreviewEditor
|
||||
runtime={
|
||||
draftWorkspace?.inquiryForms.find((item) => item.key === inquiryRuntime.key) ??
|
||||
@@ -630,6 +650,43 @@ export function PresentationEditor({
|
||||
fieldKey={activeTarget.slice("inquiry-field:".length)}
|
||||
onDraft={setInquiryDraft}
|
||||
/>
|
||||
) : selectedTarget?.composite ? (
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
message="这是一个组合区域"
|
||||
description={
|
||||
<Space wrap>
|
||||
{(selectedTarget.children ?? []).map((childKey) => {
|
||||
const child = visibleTargets.find((item) => item.key === childKey);
|
||||
if (!child) return null;
|
||||
return (
|
||||
<Button
|
||||
key={child.key}
|
||||
onClick={() => {
|
||||
const recordId =
|
||||
child.source === "offering"
|
||||
? selectedPage === "detail"
|
||||
? selectedDetailOfferingId
|
||||
: draftWorkspace?.offerings[0]?.id
|
||||
: child.source === "trust"
|
||||
? draftWorkspace?.trustItems.find(
|
||||
(item) => child.key === `trust:${item.type}`,
|
||||
)?.id
|
||||
: undefined;
|
||||
handleTargetSelected({
|
||||
targetKey: child.key,
|
||||
...(recordId ? { recordId } : {}),
|
||||
});
|
||||
}}
|
||||
>
|
||||
编辑{child.label}
|
||||
</Button>
|
||||
);
|
||||
})}
|
||||
</Space>
|
||||
}
|
||||
/>
|
||||
) : selectedRecordSource && selection?.recordId && selectedSection ? (
|
||||
selectedRecord ? (
|
||||
<RecordEditor
|
||||
|
||||
@@ -5,6 +5,8 @@ export type PreviewTarget = {
|
||||
label: string;
|
||||
source: "brand" | "offering" | "trust" | "inquiry";
|
||||
page: string;
|
||||
composite?: boolean;
|
||||
children?: string[];
|
||||
};
|
||||
|
||||
export function resolvePreviewSelection(
|
||||
|
||||
@@ -191,6 +191,12 @@ const templateContent = {
|
||||
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: "主理人身份" },
|
||||
{ key: "food.home.location", label: "服务地点" },
|
||||
{ key: "food.home.offerings-heading", label: "餐品区域标题" },
|
||||
@@ -326,7 +332,16 @@ test("Admin 按通用预览目标筛选字段并同步品牌草稿", async ({ pa
|
||||
await expect(page.getByText("小程序页面配置")).toBeVisible();
|
||||
const preview = page.locator(".component-template-preview");
|
||||
await expect(preview.locator(".food-home .name")).toContainText("测试主理人");
|
||||
await preview.locator('[data-editor-target="food.home.identity"]').click();
|
||||
await page.getByRole("button", { name: "选择品牌信息区" }).click();
|
||||
await expect(preview.locator(".component-template-preview__outline.is-selected")).toHaveAttribute(
|
||||
"data-selected-target",
|
||||
"food.home.brand-card",
|
||||
);
|
||||
await expect(page.getByRole("button", { name: "编辑主理人身份" })).toBeVisible();
|
||||
await page.getByRole("button", { name: "编辑服务地点" }).click();
|
||||
await expect(page.getByLabel("出摊信息标题")).toBeVisible();
|
||||
await page.getByRole("button", { name: "选择品牌信息区" }).click();
|
||||
await page.getByRole("button", { name: "编辑主理人身份" }).click();
|
||||
await expect(page.getByLabel("主理人姓名")).toBeVisible();
|
||||
await page.keyboard.press("Escape");
|
||||
const dimensions = await preview.evaluate((element) => {
|
||||
@@ -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("称呼");
|
||||
|
||||
@@ -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[];
|
||||
}
|
||||
|
||||
|
||||
@@ -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";
|
||||
@@ -15,7 +15,7 @@ function Home({ workspace }: { workspace: RuntimeWorkspace }) {
|
||||
return (
|
||||
<View className="food-home">
|
||||
<View className="page">
|
||||
<View className="brand-card">
|
||||
<View className="brand-card" data-editor-target="food.home.brand-card">
|
||||
<View className="identity" data-editor-target="food.home.identity">
|
||||
{text(brand.avatarUrl) && <Image src={text(brand.avatarUrl)} mode="aspectFill" />}
|
||||
<View>
|
||||
|
||||
@@ -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": "主理人身份"
|
||||
|
||||
@@ -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[];
|
||||
};
|
||||
|
||||
|
||||
@@ -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",
|
||||
);
|
||||
});
|
||||
}
|
||||
Reference in new issue
Block a user