refactor: 统一模板契约并修复预览版本

This commit is contained in:
que01 committed 2026-10-18 17:09:09 +08:00
1 parent cd2992c00a
commit 50b87e48de
56 files changed
+7849 -5756

No files matched your search

@@ -17,11 +17,7 @@ function pageContent({ workspace, page }) {
}
export function resolveTemplateRenderer(workspace) {
const config = workspace?.brand?.config;
const key =
config && typeof config === "object" && !Array.isArray(config)
? config.visualTemplateKey
: undefined;
const key = workspace?.visualTemplate?.key;
if (typeof key !== "string") return null;
if (resolvedRenderers.has(key)) return resolvedRenderers.get(key);
const suffix = `/template-${key}/taro/index.tsx`;
@@ -111,8 +111,6 @@ export function useBrandSaveMutation({
return useMutation({
mutationFn: (values: PresentationValues) => {
const nextConfig = applyPresentationValues(config, sections, values);
const contentConfig = { ...nextConfig };
delete contentConfig.visualTemplateKey;
const standard = applyStandardBrandValues(
brand as unknown as Record<string, unknown>,
sections,
@@ -124,7 +122,7 @@ export function useBrandSaveMutation({
key !== "config" && value !== (brand as unknown as Record<string, unknown>)[key],
),
);
return createApiClient().updateAdminBrand({ ...changed, config: contentConfig });
return createApiClient().updateAdminBrand({ ...changed, config: nextConfig });
},
onSuccess: () => {
onSaved();
@@ -80,7 +80,7 @@ export function PublicationPage({ canManageTemplate }: { canManageTemplate: bool
};
const mutations = usePublicationMutations({
refresh,
brandConfig: brand.data?.config,
currentTemplatePackageVersionId: workspace.data?.installations[0]?.templatePackageVersionId,
onInstallClose: () => setIndustryTarget(null),
onPublishClose: () => setConfirmAction(null),
onNoteClear: () => setNote(""),
@@ -104,16 +104,14 @@ export function PublicationPage({ canManageTemplate }: { canManageTemplate: bool
workspace.data?.installations[0]?.templateKey ??
workspace.data?.brand?.templateKey ??
brand.data?.templateKey ??
catalog.data?.industries[0]?.key ??
null;
const visuals = (catalog.data?.visuals ?? []).filter(
const selectablePackageVersions = (queries.packages.data?.items ?? []).filter(
(item) =>
typeof industryKey === "string" && item.supportedIndustryTemplates.includes(industryKey),
item.status === "published" &&
typeof industryKey === "string" &&
item.manifestSummary?.supportedIndustryTemplates.includes(industryKey),
);
const visualKey =
typeof brand.data?.config?.visualTemplateKey === "string"
? brand.data.config.visualTemplateKey
: (visuals[0]?.key ?? null);
const visualKey = workspace.data?.installations[0]?.visualTemplateKey ?? null;
const currentRelease = releases.data?.find((item) => item.status === "published");
const publishedHistory = (releases.data ?? []).filter(
(item) => item.status === "published" || item.status === "superseded",
@@ -182,8 +180,11 @@ export function PublicationPage({ canManageTemplate }: { canManageTemplate: bool
value={visualKey}
disabled={!canManageTemplate}
loading={selectVisual.isPending}
options={visuals.map((item) => ({ value: item.key, label: item.name }))}
onChange={(key) => selectVisual.mutate(key)}
options={selectablePackageVersions.map((item) => ({
value: item.id,
label: `${item.displayName} · ${item.version}`,
}))}
onChange={(versionId) => selectVisual.mutate(versionId)}
/>
</Space>
{industryKey ? (
@@ -350,9 +351,7 @@ export function PublicationPage({ canManageTemplate }: { canManageTemplate: bool
{sample.data && !sample.data.alreadyImported && (
<p className="admin-section-description admin-offset-top-sm">
来源:{sample.data.source.packageKey}@{sample.data.source.version}
{sample.data.source.contentChecksum
? `(checksum ${sample.data.source.contentChecksum.slice(0, 12)})`
: "(兼容 registry 来源)"}
(checksum {(sample.data.source.contentChecksum ?? "").slice(0, 12)})
。将向草稿添加{" "}
{Object.entries(sample.data.counts)
.map(([key, count]) => `${key} ${count} 项`)
@@ -589,7 +588,15 @@ export function PublicationPage({ canManageTemplate }: { canManageTemplate: bool
title="确认安装行业模板"
open={industryTarget !== null}
onCancel={() => setIndustryTarget(null)}
onOk={() => industryTarget && install.mutate({ key: industryTarget })}
okButtonProps={{ disabled: !templatePreview.data?.targetPackageVersionId }}
onOk={() =>
industryTarget &&
templatePreview.data?.targetPackageVersionId &&
install.mutate({
key: industryTarget,
versionId: templatePreview.data.targetPackageVersionId,
})
}
confirmLoading={install.isPending}
>
模板会更新当前品牌的草稿结构,不会立即改变已发布的小程序。请安装后核对业务内容与视觉模板。
@@ -7,7 +7,7 @@ const client = createApiClient();
interface MutationOptions {
refresh: () => void;
brandConfig: Record<string, unknown> | null | undefined;
currentTemplatePackageVersionId: string | null | undefined;
onInstallClose: () => void;
onPublishClose: () => void;
onNoteClear: () => void;
@@ -20,11 +20,11 @@ export function usePublicationMutations({
onPublishClose,
onNoteClear,
onRollbackClose,
brandConfig,
currentTemplatePackageVersionId,
}: MutationOptions) {
const queryClient = useQueryClient();
const install = useMutation({
mutationFn: ({ key, versionId }: { key: BrandTemplateKey; versionId?: string }) =>
mutationFn: ({ key, versionId }: { key: BrandTemplateKey; versionId: string }) =>
client.installAdminTemplate(key, versionId),
onSuccess: () => {
onInstallClose();
@@ -55,12 +55,16 @@ export function usePublicationMutations({
},
});
const selectVisual = useMutation({
mutationFn: (key: string) =>
client.updateAdminBrand({
config: { ...(brandConfig ?? {}), visualTemplateKey: key },
mutationFn: (templatePackageVersionId: string) =>
client.selectAdminTemplateVersion({
templatePackageVersionId,
...(currentTemplatePackageVersionId !== undefined
? { expectedCurrentPackageVersionId: currentTemplatePackageVersionId }
: {}),
confirm: true,
}),
onSuccess: () => {
message.success("视觉模板已保存到草稿");
message.success("模板版本已切换");
refresh();
},
});
@@ -24,6 +24,10 @@ export function usePublicationQueries(
queryKey: ["publication-catalog"],
queryFn: () => client.listPublicTemplates(),
});
const packages = useQuery<Awaited<ReturnType<typeof client.listAdminTemplatePackages>>>({
queryKey: ["publication-template-packages"],
queryFn: () => client.listAdminTemplatePackages({ page: 1, pageSize: 100 }),
});
const sample = useQuery<Awaited<ReturnType<typeof client.previewAdminSampleContent>>>({
queryKey: ["publication-sample", workspace.data?.installations[0]?.templatePackageVersionId],
queryFn: () =>
@@ -82,6 +86,7 @@ export function usePublicationQueries(
brand,
workspace,
catalog,
packages,
readiness,
releases,
miniAppReleases,
@@ -91,6 +96,7 @@ export function usePublicationQueries(
brand,
workspace,
catalog,
packages,
readiness,
releases,
miniAppReleases,
@@ -100,6 +106,7 @@ export function usePublicationQueries(
void brand.refetch();
void workspace.refetch();
void catalog.refetch();
void packages.refetch();
void readiness.refetch();
void releases.refetch();
void miniAppReleases.refetch();
@@ -110,6 +117,7 @@ export function usePublicationQueries(
brand,
workspace,
catalog,
packages,
sample,
readiness,
releases,