From ac3f433ee6e5dbc9426793d8901d0e9074069126 Mon Sep 17 00:00:00 2001 From: que01 Date: Tue, 13 Oct 2026 21:59:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=8D=E5=81=9A=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E5=8F=91=E5=B8=83=E4=BB=BB=E5=8A=A1=E5=8D=A1=E7=89=87?= =?UTF-8?q?=E5=B9=B6=E6=94=AF=E6=8C=81=E9=85=8D=E7=BD=AE=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 发布任务卡片拆为 MiniAppReleaseCard,状态用中文映射并附下一步说明,构建日志收进折叠面板,构建中自动滚动到底部 - 小程序配置增加“小程序请求地址”字段,展示当前生效域名,未配置时直接提示原因与修复位置 - 顶部上传按钮在无任务时自动创建发布任务,不再报“还没有可发布的内容版本” - 构建轮询在任务被判定为中断后停止,避免页面空转请求 --- .../publication/MiniAppReleaseCard.tsx | 185 ++++++++++++++++++ .../features/publication/PublicationPage.tsx | 174 ++++++---------- 2 files changed, 248 insertions(+), 111 deletions(-) create mode 100644 apps/admin/src/features/publication/MiniAppReleaseCard.tsx diff --git a/apps/admin/src/features/publication/MiniAppReleaseCard.tsx b/apps/admin/src/features/publication/MiniAppReleaseCard.tsx new file mode 100644 index 0000000..4ba26b9 --- /dev/null +++ b/apps/admin/src/features/publication/MiniAppReleaseCard.tsx @@ -0,0 +1,185 @@ +import { useEffect, useRef } from "react"; +import { Alert, Button, Card, Collapse, Flex, Space, Tag, Tooltip, Typography, theme } from "antd"; +import { LoadingOutlined } from "@ant-design/icons"; +import type { MiniAppReleaseTask } from "@personal-brand/api-client"; + +type ReleaseStatus = MiniAppReleaseTask["status"]; + +const STALE_BUILDING_MS = 15 * 60 * 1000; + +function isStaleBuilding(task: MiniAppReleaseTask): boolean { + if (task.buildStatus !== "building") return false; + const updatedAt = new Date(task.updatedAt).getTime(); + return !Number.isNaN(updatedAt) && Date.now() - updatedAt >= STALE_BUILDING_MS; +} + +const statusView: Record = { + built: { label: "待上传", color: "default", hint: "代码已构建,可上传到微信。" }, + uploaded: { label: "已上传微信", color: "blue", hint: "请在微信后台上传体验版并提交审核。" }, + under_review: { + label: "审核中", + color: "processing", + hint: "等待微信审核结果,通过后回到本页标记。", + }, + approved: { label: "审核通过", color: "cyan", hint: "审核已通过,确认无误后标记为已发布。" }, + published: { label: "已发布", color: "green", hint: "该版本已发布,可继续编辑内容后再次上传。" }, + rejected: { label: "已驳回", color: "volcano", hint: "微信驳回后需修改内容并重新构建上传。" }, + failed: { label: "失败", color: "red", hint: "上次构建或上传失败,可直接重试。" }, +}; + +function formatTime(value: string): string { + const date = new Date(value); + if (Number.isNaN(date.getTime())) return value; + return date.toLocaleString("zh-CN", { hour12: false }); +} + +function formatLogTime(value: string): string { + const date = new Date(value); + if (Number.isNaN(date.getTime())) return ""; + return date.toLocaleTimeString("zh-CN", { hour12: false }); +} + +export function MiniAppReleaseCard({ + task, + uploading, + onUpload, + onStatusChange, +}: { + task: MiniAppReleaseTask; + uploading: boolean; + onUpload: () => void; + onStatusChange: (status: ReleaseStatus) => void; +}) { + const { token } = theme.useToken(); + const logRef = useRef(null); + const logs = task.buildLogs ?? []; + const status = statusView[task.status]; + const building = task.buildStatus === "building"; + const staleBuilding = isStaleBuilding(task); + + useEffect(() => { + if (!building) return; + const node = logRef.current; + if (node) node.scrollTop = node.scrollHeight; + }, [building, logs.length]); + + const actions = ( + + {(task.status === "built" || task.status === "failed" || staleBuilding) && ( + + )} + {task.status === "uploaded" && ( + + )} + {task.status === "under_review" && ( + <> + + + + )} + {task.status === "approved" && ( + + )} + + ); + + return ( + + + + + 品牌内容 v{task.version} + {status.label} + {building && ( + } color="orange"> + {staleBuilding ? "构建已中断" : "构建中"} + + )} + {task.weappUploadId && ( + 微信版本 {task.weappUploadId} + )} + + + {staleBuilding ? "超过 15 分钟没有新的构建输出,可能已中断;可直接重试。" : status.hint} + + + + 更新于 {formatTime(task.updatedAt)} + + + + {actions} + + + {task.error && } + + {logs.length > 0 && ( + + 构建日志({logs.length} 行) + + ), + children: ( +
+                  {logs.map((log, index) => (
+                    
+ + {formatLogTime(log.at)} + + {" "} + {log.message} +
+ ))} +
+ ), + }, + ]} + /> + )} +
+ ); +} diff --git a/apps/admin/src/features/publication/PublicationPage.tsx b/apps/admin/src/features/publication/PublicationPage.tsx index 273c156..2da4e36 100644 --- a/apps/admin/src/features/publication/PublicationPage.tsx +++ b/apps/admin/src/features/publication/PublicationPage.tsx @@ -22,6 +22,7 @@ import type { BrandTemplateKey } from "@personal-brand/api-client"; import { createApiClient } from "../../lib/api.js"; import { AdminPageHeader } from "../../components/AdminPageHeader.js"; import { MutationError, QueryState } from "../../components/QueryState.js"; +import { MiniAppReleaseCard } from "./MiniAppReleaseCard.js"; const client = createApiClient(); @@ -45,6 +46,7 @@ export function PublicationPage({ canManageTemplate }: { canManageTemplate: bool const [activeTab, setActiveTab] = useState("content"); const [miniAppSettingsForm] = Form.useForm<{ appId: string; + apiBaseUrl: string; artifactPath: string; privateKey?: string; }>(); @@ -85,12 +87,17 @@ export function PublicationPage({ canManageTemplate }: { canManageTemplate: bool if (!miniAppSettings.data) return; miniAppSettingsForm.setFieldsValue({ appId: miniAppSettings.data.appId, + apiBaseUrl: miniAppSettings.data.apiBaseUrl, artifactPath: miniAppSettings.data.artifactPath, privateKey: "", }); }, [miniAppSettings.data, miniAppSettingsForm]); useEffect(() => { - const building = miniAppReleases.data?.find((task) => task.buildStatus === "building"); + const building = miniAppReleases.data?.find( + (task) => + task.buildStatus === "building" && + Date.now() - new Date(task.updatedAt).getTime() < 15 * 60 * 1000, + ); if (!building) return; const timer = setInterval(() => void miniAppReleases.refetch(), 1500); return () => clearInterval(timer); @@ -167,8 +174,8 @@ export function PublicationPage({ canManageTemplate }: { canManageTemplate: bool const uploadLatestMiniAppRelease = useMutation({ mutationFn: async () => { const latest = await client.getLatestAdminMiniAppRelease(); - if (!latest) throw new Error("还没有可发布的内容版本"); - return client.uploadAdminMiniAppRelease(latest.id); + const task = latest ?? (await client.createAdminMiniAppRelease()); + return client.uploadAdminMiniAppRelease(task.id); }, onSuccess: () => { message.success("小程序代码已上传"); @@ -267,6 +274,23 @@ export function PublicationPage({ canManageTemplate }: { canManageTemplate: bool AppID 用于服务端调用微信官方上传工具;上传私钥保存前会使用 AES-256-GCM 加密。小程序产物目录由系统构建流程决定,不需要手动修改。 + {miniAppSettings.data?.buildError ? ( + + ) : ( + + )}
+ + !value || /^https:\/\/[^/]+/.test(value) + ? Promise.resolve() + : Promise.reject( + new Error( + "公网地址必须以 https:// 开头,例如 https://wechat.app.que01.top/api", + ), + ), + }, + ]} + extra="构建时写入小程序包,必须与微信后台“开发设置 → 服务器域名 → request 合法域名”一致。修改后需重新构建并上传代码才生效。" + > + + .key 全文,必须保留换行。" } > - + - )} - {task.status === "uploaded" && ( - - )} - {task.status === "under_review" && ( - <> - - - - )} - {task.status === "approved" && ( - - )} - {task.status === "failed" && ( - - )} - - + uploadMiniAppRelease.mutate(task.id)} + onStatusChange={(status) => updateMiniAppStatus.mutate({ id: task.id, status })} + /> ))} ) : (