diff --git a/apps/admin/src/features/publication/PublicationPage.tsx b/apps/admin/src/features/publication/PublicationPage.tsx index 71945dd..a565f6d 100644 --- a/apps/admin/src/features/publication/PublicationPage.tsx +++ b/apps/admin/src/features/publication/PublicationPage.tsx @@ -13,6 +13,7 @@ import { Space, Spin, Tag, + Tabs, Typography, message, } from "antd"; @@ -44,6 +45,7 @@ export function PublicationPage({ canManageTemplate }: { canManageTemplate: bool const [settingsAppId, setSettingsAppId] = useState(""); const [settingsArtifactPath, setSettingsArtifactPath] = useState(""); const [settingsPrivateKey, setSettingsPrivateKey] = useState(""); + const [activeTab, setActiveTab] = useState("content"); const brand = useQuery({ queryKey: ["publication-brand"], queryFn: () => client.getAdminBrand(), @@ -157,7 +159,6 @@ export function PublicationPage({ canManageTemplate }: { canManageTemplate: bool mutationFn: (values: { appId?: string; artifactPath?: string; privateKey?: string }) => client.updateAdminMiniAppSettings(values), onSuccess: () => { - setSettingsOpen(false); message.success("小程序上传配置已保存"); void miniAppSettings.refetch(); }, @@ -185,9 +186,15 @@ export function PublicationPage({ canManageTemplate }: { canManageTemplate: bool const loading = [brand, workspace, catalog, readiness, releases, miniAppReleases].some( (query) => query.isLoading, ); - const error = [brand, workspace, catalog, readiness, releases, miniAppReleases].find( - (query) => query.isError, - )?.error; + const error = [ + brand, + workspace, + catalog, + readiness, + releases, + miniAppReleases, + miniAppSettings, + ].find((query) => query.isError)?.error; const retry = () => { void brand.refetch(); void workspace.refetch(); @@ -212,12 +219,13 @@ export function PublicationPage({ canManageTemplate }: { canManageTemplate: bool ? brand.data.config.visualTemplateKey : (visuals[0]?.key ?? null); const currentRelease = releases.data?.find((item) => item.status === "published"); + const settings = miniAppSettings.data; useEffect(() => { if (!miniAppSettings.data) return; setSettingsAppId(miniAppSettings.data.appId); setSettingsArtifactPath(miniAppSettings.data.artifactPath); setSettingsPrivateKey(""); - }, [miniAppSettings.data]); + }, [settings]); const publishedHistory = (releases.data ?? []).filter( (item) => item.status === "published" || item.status === "superseded", ); @@ -228,293 +236,317 @@ export function PublicationPage({ canManageTemplate }: { canManageTemplate: bool isEnabled: boolean; }>; + const contentTab = ; + const miniAppTab = ; + return ( - -
- 1. 选择表达方式 - - ({ value: item.key, label: item.name }))} - onChange={(key) => selectVisual.mutate(key)} - /> - {canManageTemplate && ( - - )} - - {workspace.data?.installations.length ? ( - - 当前品牌已安装主模板。模板版本与升级在高级设置中管理。 - - ) : null} - - - - 示例内容 - {sample.isLoading && } - {sample.data && ( - - {sample.data.alreadyImported ? "已导入" : "可导入"} - - )} - - {sample.isError && } - - {sample.isError && ( - - )} - {sample.data && !sample.data.alreadyImported && ( - - 将向草稿添加{" "} - {Object.entries(sample.data.counts) - .map(([key, count]) => `${key} ${count} 项`) - .join("、")} - ;发布前请替换示例文案和图片。 - - )} - -
- -
- 2. 核对草稿内容 - - 此处核对的是待发布内容,不是小程序视觉预览。 - - - {brand.data?.name || "未命名品牌"} - {brand.data?.tagline || "尚未填写品牌定位"} - - 已启用业务项:{draftOfferings.map((item) => item.name).join("、") || "无"} - - - 已启用咨询表单: - {draftForms - .filter((item) => item.isEnabled) - .map((item) => item.name) - .join("、") || "无"} - + + {activeTab === "content" && ( + +
+ 1. 选择表达方式 - - - + ({ value: item.key, label: item.name }))} + onChange={(key) => selectVisual.mutate(key)} + /> + {canManageTemplate && ( + + )} - -
- -
- 3. 检查并发布 - - - {currentRelease ? `已发布 v${currentRelease.version}` : "尚未发布"} - - - - - {(readiness.data?.checks ?? []).map((check) => ( - - - {check.passed ? "已完成" : "待完善"} + {workspace.data?.installations.length ? ( + + 当前品牌已安装主模板。模板版本与升级在高级设置中管理。 + + ) : null} + + + + 示例内容 + {sample.isLoading && } + {sample.data && ( + + {sample.data.alreadyImported ? "已导入" : "可导入"} - {check.label} - {check.help ? ( - {check.help} - ) : null} - {!check.passed && ( - - )} - - ))} - - - - {currentRelease && ( - + {sample.isError && } + + {sample.isError && ( + )} - - - - 发布记录 - {releases.data?.length ? ( + {sample.data && !sample.data.alreadyImported && ( + + 将向草稿添加{" "} + {Object.entries(sample.data.counts) + .map(([key, count]) => `${key} ${count} 项`) + .join("、")} + ;发布前请替换示例文案和图片。 + + )} + +
+
+ )} + {activeTab === "miniapp" && ( + +
+ 1. 核对草稿内容 + + 此处核对的是待发布内容,不是小程序视觉预览。 + - {releases.data.map((item) => ( - - v{item.version} - {item.status} - - {new Date(item.createdAt).toLocaleString("zh-CN")} - - {item.note && {item.note}} - {item.status === "superseded" && publishedHistory.length > 1 && ( - + + + + +
+
+ )} + + {activeTab === "content" && ( + +
+ 3. 检查并发布 + + + {currentRelease ? `已发布 v${currentRelease.version}` : "尚未发布"} + + + + + {(readiness.data?.checks ?? []).map((check) => ( + + + {check.passed ? "已完成" : "待完善"} + + {check.label} + {check.help ? ( + {check.help} + ) : null} + {!check.passed && ( + )} ))} - ) : ( - - )} - -
-
- 小程序代码发布 - - 使用微信官方 miniprogram-ci 上传代码;审核与发布状态需按微信平台结果人工确认。 - - - - - {miniAppSettings.data?.hasStoredCredentials ? ( - 已配置上传凭据 - ) : ( - 未配置上传凭据 - )} - - - {miniAppReleases.data?.length ? ( - - {miniAppReleases.data.map((task) => ( - - - 品牌 v{task.version} - - {task.status} + + + {currentRelease && ( + + )} + + + + 发布记录 + {releases.data?.length ? ( + + {releases.data.map((item) => ( + + v{item.version} + + {item.status} - {task.weappUploadId && ( - - 微信版本 {task.weappUploadId} - - )} - {task.error && {task.error}} - {task.status === "built" && ( - - )} - {task.status === "uploaded" && ( - - )} - {task.status === "under_review" && ( - <> - - - - )} - {task.status === "approved" && ( - - )} - {task.status === "failed" && ( - )} - - ))} + ))} + + ) : ( + + )} + +
+
+ 小程序代码发布 + + 使用微信官方 miniprogram-ci 上传代码;审核与发布状态需按微信平台结果人工确认。 + + + + + {miniAppSettings.data?.hasStoredCredentials ? ( + 已配置上传凭据 + ) : ( + 未配置上传凭据 + )} - ) : ( - - )} -
-
+ + {miniAppReleases.data?.length ? ( + + {miniAppReleases.data.map((task) => ( + + + 品牌 v{task.version} + + {task.status} + + {task.weappUploadId && ( + + 微信版本 {task.weappUploadId} + + )} + {task.error && {task.error}} + {task.status === "built" && ( + + )} + {task.status === "uploaded" && ( + + )} + {task.status === "under_review" && ( + <> + + + + )} + {task.status === "approved" && ( + + )} + {task.status === "failed" && ( + + )} + + + ))} + + ) : ( + + )} +
+
+ )}