From ca0c3e230056ab1b8fb61c1eec820e1cc739dd10 Mon Sep 17 00:00:00 2001
From: zyc <1439655764@qq.com>
Date: Mon, 29 Jun 2026 17:23:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=95=86=E5=93=81=E5=BA=93=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E6=8C=81=E4=B9=85=E5=8C=96=E6=BC=8F=E4=BF=AE=20+=20?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=B8=89=E8=A7=86=E5=9B=BE=E8=B7=A8=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=9B=9E=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ZWQ#row22(补): 商品库网格/列表用 useViewMode 持久化(上轮只接了视频项目、
  误判商品库无切换跳过,实际 products.tsx 有切换但用裸 useState 不持久化)
- 商品三视图不同步(测试新增): 商品详情三视图面板 triVersions 从不回填已有资产,
  只在本次会话点生成才有数据 → 视频项目基础资产阶段生成/采用的商品三视图(落库 tri_view),
  回商品库打开面板显示「尚未生成」。新增 useEffect 从 productAssets 回填已有 tri_view
  (判定对齐后端 is_triview),并把采用为封面的那版标记已采用

构建: tsc --noEmit=0, npm run build=0

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 core/frontend/src/routes/products.tsx | 30 ++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/core/frontend/src/routes/products.tsx b/core/frontend/src/routes/products.tsx
index 78ff5a7..a820d74 100644
--- a/core/frontend/src/routes/products.tsx
+++ b/core/frontend/src/routes/products.tsx
@@ -7,6 +7,7 @@ import { ReviewBadge, type ReviewStatus } from "../components/review-badge";
 import { ProductCreateDrawer, PC_CAT_OPTIONS } from "../components/product-create-drawer";
 import { Pager } from "../components/pager";
 import { SkeletonGrid } from "../components/loading";
+import { useViewMode } from "../components/use-view-mode";
 import { api } from "../api";
 
 const PROD_PAGE_SIZE = 10;
@@ -107,7 +108,8 @@ export function ProductsPage({ products, projects = [], loading = false, navigat
   const [catFilter, setCatFilter] = useState<Set<string>>(new Set());
   const [dateFilter, setDateFilter] = useState<"all" | "7" | "30" | "90">("all");
   // 视图切换:网格 / 列表(.view-tog 黑激活;列表态卡片横排)
-  const [view, setView] = useState<"grid" | "list">("grid");
+  // ZWQ#row22:持久化 → 切走再切回商品库仍保持用户上次选的网格/列表
+  const [view, setView] = useViewMode<"grid" | "list">("view:products", "grid");
   const toggleCat = (cat: string) => setCatFilter((prev) => {
     const next = new Set(prev);
     next.has(cat) ? next.delete(cat) : next.add(cat);
@@ -673,6 +675,32 @@ export function ProductDetailPage({ product, projects, initialTab = "assets", na
     return () => { alive = false; };
   }, [product?.id, assetReload]);
 
+  // ZWQ#row24/三视图同步:该商品已存在的三视图资产(在【视频项目】基础资产阶段生成、
+  // 或此前在商品库生成并落库的 tri_view)回填到三视图面板,避免「明明已生成却显示尚未生成」。
+  // 判定与后端 is_triview 对齐:category=tri_view / metadata.view=three_view / 名字含三视图。
+  useEffect(() => {
+    const triAssets = productAssets.filter(
+      (a) => a.category === "tri_view" || a.asset_type === "tri_view"
+        || (a.metadata as { view?: string } | undefined)?.view === "three_view"
+        || (a.name || "").includes("三视图")
+    );
+    if (!triAssets.length) return;
+    const serverVersions: TriVersion[] = triAssets
+      .map((a) => ({ id: a.id, url: a.files?.[0]?.preview_url || "", asset: a, createdAt: a.created_at || "" }))
+      .filter((v) => v.url);
+    if (!serverVersions.length) return;
+    setTriVersions((prev) => {
+      const seen = new Set(prev.map((v) => v.id));
+      const merged = [...prev, ...serverVersions.filter((v) => !seen.has(v.id))];
+      // 最新版本在前(与生成态 prepend 一致)
+      merged.sort((x, y) => (y.createdAt || "").localeCompare(x.createdAt || ""));
+      return merged.length === prev.length ? prev : merged;
+    });
+    // 已被采用为商品封面的那版三视图 → 标记「已采用」
+    const adopted = triAssets.find((a) => a.id === product.cover_asset);
+    if (adopted) setTriAdoptedId((cur) => cur || adopted.id);
+  }, [productAssets, product.cover_asset]);
+
   async function onPickProductImage(event: ChangeEvent<HTMLInputElement>) {
     const file = event.target.files?.[0];
     event.target.value = "";