fix: 测试清单遗留bug批量修复(15条:商品库/消费/团队/设置/消息中心/平台套图/资产库)

- R6 商品图删除不生效: 封面asset移交+绕开prefetch缓存, 前端封面缩图补删除入口
- R48 消息中心长文本与UI框错位: 胶囊单行省略+优先级标签禁压缩
- R70 账单流水筛选: 后端加ledger_type过滤, count随筛选变化, 切筛选重置页码
- R72 月限额改后不刷新: 团队页/消费页自取最新teamSettings, 两页同源
- R83/R86 平台套图提示词框加大+模型胶囊嵌入输入框(复用Pill组件)
- R96 未读角标: 修KeyTextTransform注解过滤触发MySQL 3141致接口500
- R100 工作台记录丢失: 新增GET /api/ai/tasks/workbench/ 同源恢复, 废除localStorage方案
- R104 卖点添加按钮移出输入框, 新建抽屉+编辑态统一
- R106 商品库宽屏锁5列, 10个/页铺满两行
- R108 资产删除改软删+单张删除+回收站二次确认; trash页商品/资产双分区+restore/purge端点
- R109 生成图自动入资产库(person演员立绘除外), 迁移0008存量回填, 移除全部加入资产库入口
- R65 无需改动(22268d6已修, 测旧部署所致)

验证: tsc/build/check/makemigrations --check 通过, 后端测试210/210, perf-probe PASS

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
zyc
2026-07-02 11:30:06 +08:00
co-authored by Claude Fable 5
parent 22268d608b
commit aab4d7ea4c
28 changed files with 924 additions and 476 deletions
+114 -35
View File
@@ -2,26 +2,45 @@ import { useEffect, useState } from "react";
import type { CSSProperties } from "react";
import { api } from "../api";
import type { NavigateFn } from "./route-config";
import type { Product } from "../types";
import type { Asset, Product } from "../types";
import "../trash-page.css";
const coverOf = (p: Product): string => p.cover_preview_url || p.images?.find((i) => i.preview_url)?.preview_url || "";
// 资产缩略图:主文件直链优先,任一带 preview_url 的文件兜底
const assetCoverOf = (a: Asset): string =>
a.files?.find((f) => f.is_primary && f.preview_url)?.preview_url || a.files?.find((f) => f.preview_url)?.preview_url || "";
const mediaStyle = (url: string): CSSProperties => ({ ["--mock-media-url"]: `url(${url})` } as CSSProperties);
// mono 时间戳(设计规范 // 05.22 式):软删走 update updated_at → updated_at ≈ 删除时间
const dateOf = (iso?: string): string => {
if (!iso) return "";
const d = new Date(iso);
if (Number.isNaN(d.getTime())) return "";
return `${String(d.getMonth() + 1).padStart(2, "0")}.${String(d.getDate()).padStart(2, "0")}`;
};
// 垃圾桶:已软删(status=archived)的商品 · 可恢复 / 可彻底删除(不可恢复)
const ASSET_TYPE_LABEL: Record<string, string> = { image: "图片", video: "视频", audio: "音频" };
// 垃圾桶:已软删商品(status=archived)+ 已软删资产(is_deleted,R108)· 均可恢复 / 可彻底删除(不可恢复)
export function TrashPage({ onRestore, onPurge }: {
navigate: NavigateFn;
onRestore: (id: string) => Promise<unknown> | void;
onPurge: (id: string) => Promise<unknown> | void;
}) {
const [items, setItems] = useState<Product[]>([]);
const [assets, setAssets] = useState<Asset[]>([]);
const [loading, setLoading] = useState(true);
const [confirmId, setConfirmId] = useState<string | null>(null);
const [busyId, setBusyId] = useState<string | null>(null);
const [errText, setErrText] = useState("");
useEffect(() => {
let alive = true;
api.productsTrash().then((r) => { if (alive) setItems(r.results); }).catch(() => { if (alive) setItems([]); }).finally(() => { if (alive) setLoading(false); });
void Promise.allSettled([api.productsTrash(), api.assetsTrash()]).then(([p, a]) => {
if (!alive) return;
setItems(p.status === "fulfilled" ? p.value.results : []);
setAssets(a.status === "fulfilled" ? a.value.results : []);
setLoading(false);
});
return () => { alive = false; };
}, []);
@@ -35,6 +54,21 @@ export function TrashPage({ onRestore, onPurge }: {
try { await onPurge(id); setItems((list) => list.filter((p) => p.id !== id)); setConfirmId(null); }
finally { setBusyId(null); }
}
// 资产的恢复/彻底删除直接走 api(商品那对经 App 的 action 包装,只发商品口)。失败不移行、如实亮错误。
async function restoreAsset(id: string) {
setBusyId(id);
setErrText("");
try { await api.restoreAsset(id); setAssets((list) => list.filter((a) => a.id !== id)); }
catch (error) { setErrText(error instanceof Error ? error.message : "恢复失败"); }
finally { setBusyId(null); }
}
async function purgeAsset(id: string) {
setBusyId(id);
setErrText("");
try { await api.purgeAsset(id); setAssets((list) => list.filter((a) => a.id !== id)); setConfirmId(null); }
catch (error) { setErrText(error instanceof Error ? error.message : "彻底删除失败"); }
finally { setBusyId(null); }
}
return (
<div className="trash-page">
@@ -42,7 +76,7 @@ export function TrashPage({ onRestore, onPurge }: {
<div>
<h1></h1>
<div className="sub">
<span className="mono">// 已删除商品</span>
<span className="mono">// 已删除商品与资产</span>
<span>·</span>
<span>,()</span>
</div>
@@ -51,40 +85,85 @@ export function TrashPage({ onRestore, onPurge }: {
{loading ? (
<div className="placeholder" style={{ minHeight: 160 }}><span className="ph-frame">// 加载中…</span></div>
) : items.length === 0 ? (
) : items.length === 0 && assets.length === 0 ? (
<div className="placeholder trash-empty"><span className="ph-frame">// 垃圾桶是空的</span></div>
) : (
<div className="trash-list">
{items.map((p) => {
const cover = coverOf(p);
const busy = busyId === p.id;
return (
<div className="trash-row" key={p.id}>
<div className={`placeholder trash-thumb${cover ? " has-mock-media" : ""}`} style={cover ? mediaStyle(cover) : undefined}>
{!cover && <span className="ph-frame"></span>}
</div>
<div className="trash-meta">
<div className="trash-name" title={p.title}>{p.title}</div>
<div className="trash-sub mono">// {p.category || "未分类"}</div>
</div>
<div className="trash-actions">
{confirmId === p.id ? (
<>
<span className="trash-confirm-txt mono">?</span>
<button className="btn btn-sm trash-del" type="button" disabled={busy} onClick={() => void purge(p.id)}></button>
<button className="btn btn-sm" type="button" disabled={busy} onClick={() => setConfirmId(null)}></button>
</>
) : (
<>
<button className="btn btn-sm btn-primary" type="button" disabled={busy} onClick={() => void restore(p.id)}></button>
<button className="btn btn-sm" type="button" disabled={busy} onClick={() => setConfirmId(p.id)}></button>
</>
)}
</div>
<>
{errText && <div className="trash-err mono">// {errText}</div>}
{items.length > 0 && (
<div className="trash-section">
<div className="trash-section-title mono">// 商品 · {items.length}</div>
<div className="trash-list">
{items.map((p) => {
const cover = coverOf(p);
const busy = busyId === p.id;
return (
<div className="trash-row" key={p.id}>
<div className={`placeholder trash-thumb${cover ? " has-mock-media" : ""}`} style={cover ? mediaStyle(cover) : undefined}>
{!cover && <span className="ph-frame"></span>}
</div>
<div className="trash-meta">
<div className="trash-name" title={p.title}>{p.title}</div>
<div className="trash-sub mono">// {p.category || "未分类"}</div>
</div>
<div className="trash-actions">
{confirmId === p.id ? (
<>
<span className="trash-confirm-txt mono">?</span>
<button className="btn btn-sm trash-del" type="button" disabled={busy} onClick={() => void purge(p.id)}></button>
<button className="btn btn-sm" type="button" disabled={busy} onClick={() => setConfirmId(null)}></button>
</>
) : (
<>
<button className="btn btn-sm btn-primary" type="button" disabled={busy} onClick={() => void restore(p.id)}></button>
<button className="btn btn-sm" type="button" disabled={busy} onClick={() => setConfirmId(p.id)}></button>
</>
)}
</div>
</div>
);
})}
</div>
);
})}
</div>
</div>
)}
{assets.length > 0 && (
<div className="trash-section">
<div className="trash-section-title mono">// 资产 · {assets.length}</div>
<div className="trash-list">
{assets.map((a) => {
const cover = assetCoverOf(a);
const busy = busyId === a.id;
const deletedAt = dateOf(a.updated_at);
return (
<div className="trash-row" key={a.id}>
<div className={`placeholder trash-thumb${cover ? " has-mock-media" : ""}`} style={cover ? mediaStyle(cover) : undefined}>
{!cover && <span className="ph-frame"></span>}
</div>
<div className="trash-meta">
<div className="trash-name" title={a.name}>{a.name}</div>
<div className="trash-sub mono">// {ASSET_TYPE_LABEL[a.asset_type] || a.asset_type}{deletedAt ? ` · 删除于 ${deletedAt}` : ""}</div>
</div>
<div className="trash-actions">
{confirmId === a.id ? (
<>
<span className="trash-confirm-txt mono">?</span>
<button className="btn btn-sm trash-del" type="button" disabled={busy} onClick={() => void purgeAsset(a.id)}></button>
<button className="btn btn-sm" type="button" disabled={busy} onClick={() => setConfirmId(null)}></button>
</>
) : (
<>
<button className="btn btn-sm btn-primary" type="button" disabled={busy} onClick={() => void restoreAsset(a.id)}></button>
<button className="btn btn-sm" type="button" disabled={busy} onClick={() => setConfirmId(a.id)}></button>
</>
)}
</div>
</div>
);
})}
</div>
</div>
)}
</>
)}
</div>
);