fix: 修复独立工坊业务详情区块字段过滤
This commit is contained in:
1 parent
61f216ae0e
commit
8f252d088a
15 files changed
+553
-145
No files matched your search
@@ -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,
|
||||
},
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user