fix: 修复独立工坊业务详情区块字段过滤
This commit is contained in:
1 parent
61f216ae0e
commit
8f252d088a
15 files changed
+553
-145
No files matched your search
@@ -13,14 +13,6 @@ import type { PreviewSelection, PreviewTarget } from "../brand/preview-selection
|
||||
import type { FormInstance } from "antd";
|
||||
import "./ServicesPage.css";
|
||||
|
||||
const OFFERING_BASE_FIELD_BINDINGS: Record<string, string> = {
|
||||
name: "offering.name",
|
||||
summary: "offering.summary",
|
||||
description: "offering.description",
|
||||
priceText: "offering.priceText",
|
||||
coverUrl: "offering.coverUrl",
|
||||
};
|
||||
|
||||
type OfferingEditorModalProps = {
|
||||
open: boolean;
|
||||
editingOffering: Offering | null;
|
||||
@@ -33,7 +25,7 @@ type OfferingEditorModalProps = {
|
||||
selectedTarget: PreviewTarget | undefined;
|
||||
templateFieldSection: TemplateAdminSection;
|
||||
hasTemplateDetailCopy: boolean;
|
||||
listTarget: PreviewTarget;
|
||||
listTarget: PreviewTarget | undefined;
|
||||
detailTarget: PreviewTarget | undefined;
|
||||
saving: boolean;
|
||||
onClose: () => void;
|
||||
@@ -67,25 +59,21 @@ export function OfferingEditorModal({
|
||||
onEditInBrand,
|
||||
}: OfferingEditorModalProps) {
|
||||
const formScroll = useRef<HTMLDivElement>(null);
|
||||
const defaultPreviewTarget = previewPage === "offerings" ? listTarget : detailTarget;
|
||||
const previewSelectionTarget = selectedTarget ?? defaultPreviewTarget;
|
||||
const previewPageTarget = previewPage === "offerings" ? listTarget : detailTarget;
|
||||
const previewSelectionTarget = selectedTarget ?? previewPageTarget;
|
||||
const viewOptions = [
|
||||
...(listTarget ? [{ value: "offerings" as const, label: "列表卡片" }] : []),
|
||||
...(detailTarget ? [{ value: "detail" as const, label: "详情内容" }] : []),
|
||||
];
|
||||
const previewSelection: PreviewSelection | undefined = previewSelectionTarget
|
||||
? previewSelectionTarget.source === "offering" && editingOffering
|
||||
? { targetKey: previewSelectionTarget.key, recordId: editingOffering.id }
|
||||
: { targetKey: previewSelectionTarget.key }
|
||||
: undefined;
|
||||
// 点选某个区块后,右侧只保留该区块真正会展示的字段;未点选时仍展示完整表单。
|
||||
const visibleBaseFields = (() => {
|
||||
if (!selectedTarget) return undefined;
|
||||
if (selectedTarget.source !== "offering") return new Set<string>();
|
||||
const bindings = new Set(activePreviewBindings);
|
||||
return new Set(
|
||||
Object.entries(OFFERING_BASE_FIELD_BINDINGS)
|
||||
.filter(([, binding]) => bindings.has(binding))
|
||||
.map(([name]) => name),
|
||||
);
|
||||
})();
|
||||
const isBaseFieldVisible = (name: string) => !visibleBaseFields || visibleBaseFields.has(name);
|
||||
// 标准字段与模板字段使用同一份 manifest binding;点选后只显示当前区域真正声明的字段。
|
||||
const activeBindingSet = new Set(activePreviewBindings);
|
||||
const isBaseFieldVisible = (name: string) =>
|
||||
!selectedTarget || activeBindingSet.has(`offering.${name}`);
|
||||
const showDescriptionField = !hasTemplateDetailCopy && isBaseFieldVisible("description");
|
||||
const hasVisibleBaseFields =
|
||||
["kind", "name", "summary", "priceText", "coverUrl", "sortOrder", "isEnabled"].some((name) =>
|
||||
@@ -120,10 +108,7 @@ export function OfferingEditorModal({
|
||||
<Segmented
|
||||
className="service-offering-editor__view"
|
||||
value={previewPage}
|
||||
options={[
|
||||
{ value: "offerings", label: "列表卡片" },
|
||||
{ value: "detail", label: "详情内容" },
|
||||
]}
|
||||
options={viewOptions}
|
||||
onChange={onPreviewPageChange}
|
||||
/>
|
||||
<Alert
|
||||
@@ -140,7 +125,7 @@ export function OfferingEditorModal({
|
||||
/>
|
||||
<ComponentTemplatePreview
|
||||
workspace={previewWorkspace}
|
||||
page={previewPage}
|
||||
page={previewPageTarget?.page ?? previewPage}
|
||||
offeringId={editingOffering.id}
|
||||
targets={previewTargets[previewPage]}
|
||||
{...(previewSelection ? { selection: previewSelection } : {})}
|
||||
@@ -153,7 +138,9 @@ export function OfferingEditorModal({
|
||||
form={form}
|
||||
layout="vertical"
|
||||
onValuesChange={(_, allValues) => onValuesChange(allValues)}
|
||||
onFinish={onFinish}
|
||||
// 动态隐藏的字段会被卸载,onFinish 默认只返回仍挂载的字段。
|
||||
// 提交时读取完整表单存储,避免切换区块后隐藏字段的修改丢失。
|
||||
onFinish={() => onFinish(form.getFieldsValue(true) as Record<string, unknown>)}
|
||||
>
|
||||
<div ref={formScroll} className="service-offering-editor__form-scroll">
|
||||
{selectedTarget ? (
|
||||
|
||||
@@ -34,53 +34,35 @@ export function ServicesPage() {
|
||||
const sections = workspace.data?.templateContent?.admin.sections ?? [];
|
||||
const previewTargets = useMemo(() => previewTargetsByPage(sections), [sections]);
|
||||
const fieldsByTarget = useMemo(() => previewFieldsByTarget(sections), [sections]);
|
||||
// 只使用 manifest 中真实存在的业务卡片区域;模板没有对应区域时不显示列表预览。
|
||||
const listTarget = useMemo(
|
||||
() =>
|
||||
previewTargets.offerings.find((target) =>
|
||||
templateFields.some((field) => field.previewTarget === target.key),
|
||||
) ?? {
|
||||
key: "offering.list.item",
|
||||
label: "业务卡片",
|
||||
page: "offerings",
|
||||
source: "offering" as const,
|
||||
},
|
||||
[previewTargets, templateFields],
|
||||
() => previewTargets.offerings.find((target) => target.source === "offering"),
|
||||
[previewTargets],
|
||||
);
|
||||
const detailTarget = useMemo(
|
||||
() => previewTargets.detail.find((target) => target.source === "offering"),
|
||||
[previewTargets],
|
||||
);
|
||||
const listFields = useMemo(
|
||||
() => templateFields.filter((field) => field.previewTarget === listTarget.key),
|
||||
[templateFields, listTarget.key],
|
||||
);
|
||||
const detailFields = useMemo(
|
||||
() => templateFields.filter((field) => field.previewTarget === detailTarget?.key),
|
||||
[templateFields, detailTarget?.key],
|
||||
);
|
||||
const otherFields = useMemo(
|
||||
() =>
|
||||
templateFields.filter(
|
||||
(field) => !listFields.includes(field) && !detailFields.includes(field),
|
||||
),
|
||||
[templateFields, listFields, detailFields],
|
||||
);
|
||||
const pageTemplateFields = useMemo<TemplateAdminField[]>(
|
||||
() =>
|
||||
editor.previewPage === "offerings"
|
||||
? [...listFields, ...otherFields.filter((field) => field.page === "offerings")]
|
||||
: [...detailFields, ...otherFields.filter((field) => field.page === "detail")],
|
||||
[editor.previewPage, listFields, detailFields, otherFields],
|
||||
);
|
||||
// 页面级字段必须按该页所有真实预览区域收集,不能只取列表/详情首个区域,
|
||||
// 否则模板把详情拆成多个区域后,未点选的“全部字段”会漏掉后续区域。
|
||||
const pageTemplateFields = useMemo<TemplateAdminField[]>(() => {
|
||||
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 selectedTarget = useMemo(() => {
|
||||
if (!editor.previewTargetKey) return undefined;
|
||||
return (
|
||||
previewTargets[editor.previewPage].find((target) => target.key === editor.previewTargetKey) ??
|
||||
(editor.previewTargetKey === listTarget.key ? listTarget : undefined) ??
|
||||
(editor.previewTargetKey === detailTarget?.key ? detailTarget : undefined)
|
||||
return previewTargets[editor.previewPage].find(
|
||||
(target) => target.key === editor.previewTargetKey,
|
||||
);
|
||||
}, [editor.previewPage, editor.previewTargetKey, previewTargets, listTarget, detailTarget]);
|
||||
}, [editor.previewPage, editor.previewTargetKey, previewTargets]);
|
||||
const activeTemplateFields = useMemo<TemplateAdminField[]>(
|
||||
() =>
|
||||
selectedTarget
|
||||
@@ -114,13 +96,13 @@ export function ServicesPage() {
|
||||
|
||||
const navigateToBrand = () => {
|
||||
if (!editor.editingOffering) return;
|
||||
const target =
|
||||
selectedTarget ?? (editor.previewPage === "offerings" ? listTarget : detailTarget);
|
||||
if (!target) return;
|
||||
void navigate("/admin/brand", {
|
||||
state: {
|
||||
targetKey:
|
||||
editor.previewTargetKey ??
|
||||
(editor.previewPage === "offerings"
|
||||
? listTarget.key
|
||||
: (detailTarget?.key ?? listTarget.key)),
|
||||
page: target.page,
|
||||
targetKey: target.key,
|
||||
recordId: editor.editingOffering.id,
|
||||
},
|
||||
});
|
||||
|
||||
@@ -10,26 +10,30 @@ import { applyPresentationValues } from "../../lib/presentation/presentation-bin
|
||||
export function previewTargetsByPage(
|
||||
sections: AdminTemplateContent["admin"]["sections"],
|
||||
): Record<"offerings" | "detail", PreviewTarget[]> {
|
||||
const result: Record<"offerings" | "detail", PreviewTarget[]> = {
|
||||
offerings: [],
|
||||
detail: [],
|
||||
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"),
|
||||
};
|
||||
for (const page of ["offerings", "detail"] as const) {
|
||||
result[page] = sections
|
||||
.filter((section) => section.page === page)
|
||||
.flatMap((section) =>
|
||||
(section.previewTargets ?? []).map((target) => ({
|
||||
...target,
|
||||
page: section.page,
|
||||
source: section.fields.some(
|
||||
(field) => field.binding.startsWith("offering.") && field.previewTarget === target.key,
|
||||
)
|
||||
? "offering"
|
||||
: section.target,
|
||||
})),
|
||||
);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
export function previewFieldsByTarget(
|
||||
|
||||
Reference in new issue
Block a user