0.3.2.1 UI修复3

wolai-frontend/src/hooks/use-convex-sidebar-data.ts

@@ -21,6 +21,13 @@ export function useConvexSidebarData(workspaceId: string): {
 
   // 显式转为 boolean，确保类型正确
   const shouldFetch = Boolean(isAuthenticated && workspaceId);
+  const currentUser = useQuery(api.users.currentUser, shouldFetch ? {} : "skip");
+  const userId =
+    currentUser && typeof currentUser === "object" && typeof (currentUser as any)._id === "string"
+      ? String((currentUser as any)._id)
+      : "";
+
+  const shouldFetchAuthed = Boolean(shouldFetch && userId);
 
   // 使用 Convex 的 useQuery，自动订阅实时更新
   // 后端从 ctx.auth.getUserIdentity() 获取用户身份，无需前端传入 userId
@@ -39,6 +46,16 @@ export function useConvexSidebarData(workspaceId: string): {
     shouldFetch ? { workspaceId, includeDeleted: true } : "skip"
   );
 
+  const mediaAssets = useQuery(
+    api.mediaAssets.listByWorkspace,
+    shouldFetchAuthed ? { userId, workspaceId, limit: 200 } : "skip",
+  );
+
+  const trashedMediaAssets = useQuery(
+    api.mediaAssets.listDeletedByWorkspace,
+    shouldFetchAuthed ? { userId, workspaceId, limit: 2000 } : "skip",
+  );
+
   const workspacesResult = useQuery(
     api.workspaces.fetchWorkspaceSummaries,
     shouldFetch ? undefined : "skip"
@@ -47,9 +64,12 @@ export function useConvexSidebarData(workspaceId: string): {
   // 组合数据，格式与 SidebarInitialData 一致
   const data: SidebarInitialData | null = useMemo(() => {
     // 当 skip 时，返回值是 undefined
-    if (documents === undefined ||
+    if (currentUser === undefined ||
+        documents === undefined ||
         trashedDocuments === undefined ||
         mindmaps === undefined ||
+        mediaAssets === undefined ||
+        trashedMediaAssets === undefined ||
         workspacesResult === undefined) {
       return null;
     }
@@ -115,22 +135,34 @@ export function useConvexSidebarData(workspaceId: string): {
       workspaces: workspacesResult.workspaces,
       documents,
       trashedDocuments,
-      trashedMediaAssets: [],
+      trashedMediaAssets: (trashedMediaAssets ?? []) as MediaAsset[],
       trashedMindmapAssets,
       mindmapDocs,
       mindmapAssets,
       mindmapAssetChildren: {},
       tableAssets: [],
-      mediaAssets: [],
+      mediaAssets: (mediaAssets ?? []) as MediaAsset[],
     };
-  }, [documents, trashedDocuments, mindmaps, workspacesResult, workspaceId]);
+  }, [
+    currentUser,
+    documents,
+    trashedDocuments,
+    mindmaps,
+    mediaAssets,
+    trashedMediaAssets,
+    workspacesResult,
+    workspaceId,
+  ]);
 
   // loading 状态：只有当 shouldFetch 为 true 且数据未加载时才算 loading
   // 使用 === undefined 判断，因为 skip 时返回 undefined
   const isLoading = shouldFetch && (
+    currentUser === undefined ||
     documents === undefined ||
     trashedDocuments === undefined ||
     mindmaps === undefined ||
+    mediaAssets === undefined ||
+    trashedMediaAssets === undefined ||
     workspacesResult === undefined
   );
   const error = null;