feat: 生图模型可选(火山/gpt-image) + 工作台图「加入资产库」收纳 + 任务中心排序修复

- AI 工作室生图支持显式选模型:resolve_image_model 解析 volcano(Seedream 图生图,
  无 image_edit 时走 image_generation 带参考图)/ gpt-image(image_edit 多图编辑),
  未选回落系统默认;enqueue_standalone_images 透传 image_model
- 资产库收纳:Asset 加 in_library 字段(迁移 0007,既有资产 db_default=True 不动);
  工作台生成图默认 in_library=False,只在工作台展示,用户「加入资产库」后才进库列表;
  assets 视图/序列化器/library 页/types 配套
- 任务中心修复:AITaskViewSet 默认 order_by(-created_at),前端 aiTasks 取 page_size=200。
  原因:列表无排序时 MySQL 按 UUID 主键乱序返回,把一批旧失败记录顶到首页,
  前端又只取首页 20 条算 全部/已完成/失败 → 误显示「全部失败」(实为 421 成功/少量失败)

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
zyc
2026-06-27 10:34:12 +08:00
co-authored by Claude Opus 4.8
parent de4b20cc7b
commit 26577b99b1
15 changed files with 472 additions and 104 deletions
+85 -13
View File
@@ -5,7 +5,7 @@ import { Download, Image as ImageIcon, Images, Info, LayoutGrid, Music, Trash2,
import { api } from "../api";
import { SkeletonGrid } from "../components/loading";
import { ReviewBadge, type ReviewStatus } from "../components/review-badge";
import type { Asset } from "../types";
import type { Asset, AssetBatch } from "../types";
import { ConfirmModal, MediaLightbox, useBodyScrollLock, useOverlayTransition } from "../components/overlays";
import { Pager } from "../components/pager";
@@ -44,6 +44,9 @@ const LIB_TABS: Array<{ key: LibTab; label: string }> = [
{ key: "videopacks", label: "视频成品" }, { key: "others", label: "其他" }
];
// 图片成品三类按「生成批次」成组展示(一次提交的多张图 = 一张批次卡,点开看整批);其余 tab 仍平铺
const BATCH_TABS: LibTab[] = ["tryon", "kits", "creations"];
// 对齐 api-bridge:工具栏 chip 按 tab 显隐(视频成品走素材包,不用这些扁平筛选)
const LIB_CHIPS: Array<{ key: string; label: string; tabs: LibTab[] }> = [
{ key: "product", label: "关联商品", tabs: ["tryon", "kits"] },
@@ -92,6 +95,10 @@ function AssetDetailModal({ asset, close, onZoom }: {
// 多图资产:当前选中的主图索引(缩略图切换)
const [activeIdx, setActiveIdx] = useState(0);
useEffect(() => { setActiveIdx(0); }, [asset?.id]);
// 审核盾本地覆盖态:必须在提前 return 之前声明,否则 hook 数量随 asset 有无变化 → React 崩溃白屏
const [reviewOverride, setReviewOverride] = useState<string | null>(null);
const [submittingReview, setSubmittingReview] = useState(false);
useEffect(() => { setReviewOverride(null); }, [asset?.id]);
if (!mounted || !asset) return null;
const files = asset.files || [];
@@ -132,10 +139,8 @@ function AssetDetailModal({ asset, close, onZoom }: {
];
// 审核盾:仅送审类(角色/三视图/分镜)显示;灰盾可点提交。本地覆盖提交后即时反映,切资产清空
// (状态 hook 已上移到提前 return 之前)
const REVIEW_CATS = ["person", "tri_view", "storyboard"];
const [reviewOverride, setReviewOverride] = useState<string | null>(null);
const [submittingReview, setSubmittingReview] = useState(false);
useEffect(() => { setReviewOverride(null); }, [asset?.id]);
const review = (reviewOverride ?? asset.review_status ?? "") as ReviewStatus;
async function submitReview() {
if (!asset) return;
@@ -437,6 +442,9 @@ export function LibraryPage({ onUpload, onDelete }: { onUpload: (formData: FormD
const [items, setItems] = useState<Asset[]>([]);
const [total, setTotal] = useState(0);
const [counts, setCounts] = useState<Record<LibTab, number>>({ tryon: 0, kits: 0, creations: 0, videopacks: 0, others: 0 });
// 图片成品:按生成批次成组(点批次卡 → 弹窗看整批图片)
const [batches, setBatches] = useState<AssetBatch[]>([]);
const [openBatch, setOpenBatch] = useState<AssetBatch | null>(null);
// 视频成品:按项目素材包(点包卡 → 弹窗看该项目所有片段)
const [packs, setPacks] = useState<import("../types").VideoPack[]>([]);
const [openPack, setOpenPack] = useState<import("../types").VideoPack | null>(null);
@@ -456,26 +464,38 @@ export function LibraryPage({ onUpload, onDelete }: { onUpload: (formData: FormD
// 当前 tab 的 metadata 筛选键(来源/类型走独立字段,不算 metadata)
const metaKeys = LIB_CHIPS.filter((c) => c.tabs.includes(tab) && c.key !== "source" && c.key !== "kind").map((c) => c.key);
// 图片成品三类按批次成组展示;其余 tab 平铺
const isBatchTab = BATCH_TABS.includes(tab);
// 列表数据(分页 + 过滤)
const [reloadFlag, setReloadFlag] = useState(0);
useEffect(() => {
if (tab === "videopacks") { setLoading(false); return; } // 视频成品走素材包,不拉扁平资产
let alive = true;
setLoading(true);
api.assetsPage({
const common = {
tab,
q: debouncedQuery || undefined,
source: srcFilter || undefined,
asset_type: kindFilter || undefined,
meta: metaFilter,
ordering: sortDesc ? "-created_at" : "created_at",
page,
pageSize: LIB_PAGE_SIZE
}).then((res) => { if (alive) { setItems(res.results); setTotal(res.count); } })
.catch(() => { if (alive) { setItems([]); setTotal(0); } })
.finally(() => { if (alive) setLoading(false); });
};
if (isBatchTab) {
// 图片成品:按生成批次成组(每批一张卡)
api.assetBatches(common)
.then((res) => { if (alive) { setBatches(res.results); setTotal(res.count); } })
.catch(() => { if (alive) { setBatches([]); setTotal(0); } })
.finally(() => { if (alive) setLoading(false); });
} else {
api.assetsPage({ ...common, asset_type: kindFilter || undefined })
.then((res) => { if (alive) { setItems(res.results); setTotal(res.count); } })
.catch(() => { if (alive) { setItems([]); setTotal(0); } })
.finally(() => { if (alive) setLoading(false); });
}
return () => { alive = false; };
}, [tab, debouncedQuery, srcFilter, kindFilter, metaFilter, sortDesc, page, reloadFlag]);
}, [tab, isBatchTab, debouncedQuery, srcFilter, kindFilter, metaFilter, sortDesc, page, reloadFlag]);
// tab 计数(徽标)+ 当前 tab 的筛选项(下拉「只列真有的」):切 tab / 上传 / 删除后刷新
useEffect(() => { api.assetSummary().then((c) => setCounts((prev) => ({ ...prev, ...c }))).catch(() => {}); }, [reloadFlag]);
@@ -541,7 +561,7 @@ export function LibraryPage({ onUpload, onDelete }: { onUpload: (formData: FormD
<div className="page-head">
<div>
<h1>资产库</h1>
<div className="sub"><span className="mono">// 你的成品 · 图片 {counts.tryon + counts.kits + counts.creations} · 视频 {counts.videopacks} 包</span></div>
<div className="sub"><span className="mono">// 你的成品 · 图片 {counts.tryon + counts.kits + counts.creations} 批 · 视频 {counts.videopacks} 包</span></div>
</div>
<div className="actions">
<button className={`btn btn-edit-toggle${editMode ? " active" : ""}`} type="button" id="lib-manage-btn" onClick={() => (editMode ? exitEdit() : setEditMode(true))}>
@@ -674,9 +694,32 @@ export function LibraryPage({ onUpload, onDelete }: { onUpload: (formData: FormD
</div>
</div>
<div className="result-meta" id="result-meta">// 显示 <span className="count">{shown.length}</span> / {total} 个资产{hasFilter ? "(已筛选)" : ""}{loading ? " · 加载中…" : ""}</div>
<div className="result-meta" id="result-meta">// 显示 <span className="count">{isBatchTab ? batches.length : shown.length}</span> / {total} {isBatchTab ? "个批次" : "个资产"}{hasFilter ? "(已筛选)" : ""}{loading ? " · 加载中…" : ""}</div>
{shown.length ? (
{isBatchTab ? (
batches.length ? (
<div className="packs-grid" id="batch-grid">
{batches.map((batch) => (
<article className="pack-card" key={batch.batch_id} onClick={() => setOpenBatch(batch)} role="button" tabIndex={0} onKeyDown={(e) => { if (e.key === "Enter" || e.key === " ") { e.preventDefault(); setOpenBatch(batch); } }}>
{editMode && onDelete && (
<button className="card-del-btn" type="button" title="删除整批" onClick={(event) => { event.stopPropagation(); setConfirmIds(batch.items.map((a) => a.id)); }}>
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round"><path d="M3 6h18" /><path d="M8 6V4a2 2 0 012-2h4a2 2 0 012 2v2" /><path d="M19 6l-1.5 14a2 2 0 01-2 1.8H8.5a2 2 0 01-2-1.8L5 6" /></svg>
</button>
)}
<div className="placeholder asset-thumb pack-thumb">
{batch.cover ? <img src={batch.cover} alt={batch.name} loading="lazy" /> : <span className="ph-frame">无图</span>}
<span className="pack-count mono">{batch.count} 张</span>
</div>
<div className="asset-body"><div className="asset-name">{batch.name}</div><div className="asset-meta mono">生成批次</div></div>
</article>
))}
</div>
) : loading ? (
<SkeletonGrid count={8} />
) : (
<div className="empty-filter">// 当前分类暂无真实资产</div>
)
) : shown.length ? (
<div className="asset-grid" id="asset-grid">
{shown.map((asset) => {
const cover = asset.files?.find((f) => f.is_primary)?.preview_url || asset.files?.[0]?.preview_url || "";
@@ -771,6 +814,35 @@ export function LibraryPage({ onUpload, onDelete }: { onUpload: (formData: FormD
document.body
)}
{/* 生成批次弹窗:看该批次所有图片(点单图开详情/大图) */}
{openBatch && createPortal(
<div className="pack-modal-bg" role="dialog" aria-modal="true" aria-label="生成批次" onClick={(e) => { if (e.target === e.currentTarget) setOpenBatch(null); }}>
<div className="pack-modal">
<div className="pack-modal-h">
<div>
<h2>{openBatch.name}</h2>
<span className="mono" style={{ fontSize: 12, color: "var(--black-alpha-48)" }}>// 生成批次 · {openBatch.count} 张</span>
</div>
<button className="x" type="button" aria-label="关闭" onClick={() => setOpenBatch(null)}>
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.8" strokeLinecap="round" strokeLinejoin="round"><path d="M6 6l12 12M6 18L18 6" /></svg>
</button>
</div>
<div className="pack-clip-grid">
{openBatch.items.map((a, i) => {
const cover = a.files?.find((f) => f.is_primary)?.preview_url || a.files?.[0]?.preview_url || "";
return (
<button className="pack-clip as-btn" type="button" key={a.id} onClick={() => { setOpenBatch(null); setDetail(a); }} title="查看详情">
{cover ? <img src={cover} alt={a.name} loading="lazy" /> : <span className="pack-clip-ph ph-frame">无图</span>}
<div className="pack-clip-name mono">第 {i + 1} 张</div>
</button>
);
})}
</div>
</div>
</div>,
document.body
)}
{/* 编辑模式浮动批量操作栏(scope 到资产库;删除/清空/完成) */}
<div className={`lib-bulk-bar${selected.size > 0 ? " show" : ""}`} role="toolbar" aria-label="批量操作">
<span className="ct">已选 <b>{selected.size}</b> 项</span>