0.3.3 外网下载修复
This commit is contained in:
@@ -3,6 +3,7 @@ import { useQuery, useConvexAuth } from "convex/react";
|
||||
import type { SidebarInitialData } from "@/components/sidebar/types";
|
||||
import type { MediaAsset } from "@/types/media";
|
||||
import { api } from "@/lib/convex/api";
|
||||
import { toBrowserAccessibleUrl } from "@/lib/url/browser-file-url";
|
||||
|
||||
/**
|
||||
* Convex 模式下的侧边栏数据 hook
|
||||
@@ -61,6 +62,12 @@ export function useConvexSidebarData(workspaceId: string): {
|
||||
shouldFetch ? undefined : "skip"
|
||||
);
|
||||
|
||||
const normalizeAssetUrls = (asset: MediaAsset): MediaAsset => {
|
||||
const fileUrl = toBrowserAccessibleUrl(asset.file_url) ?? asset.file_url;
|
||||
const thumbUrl = toBrowserAccessibleUrl(asset.thumbnail_url) ?? asset.thumbnail_url;
|
||||
return { ...asset, file_url: fileUrl, thumbnail_url: thumbUrl };
|
||||
};
|
||||
|
||||
// 组合数据,格式与 SidebarInitialData 一致
|
||||
const data: SidebarInitialData | null = useMemo(() => {
|
||||
// 当 skip 时,返回值是 undefined
|
||||
@@ -135,13 +142,13 @@ export function useConvexSidebarData(workspaceId: string): {
|
||||
workspaces: workspacesResult.workspaces,
|
||||
documents,
|
||||
trashedDocuments,
|
||||
trashedMediaAssets: (trashedMediaAssets ?? []) as MediaAsset[],
|
||||
trashedMediaAssets: ((trashedMediaAssets ?? []) as MediaAsset[]).map(normalizeAssetUrls),
|
||||
trashedMindmapAssets,
|
||||
mindmapDocs,
|
||||
mindmapAssets,
|
||||
mindmapAssetChildren: {},
|
||||
tableAssets: [],
|
||||
mediaAssets: (mediaAssets ?? []) as MediaAsset[],
|
||||
mediaAssets: ((mediaAssets ?? []) as MediaAsset[]).map(normalizeAssetUrls),
|
||||
};
|
||||
}, [
|
||||
currentUser,
|
||||
|
||||
Reference in New Issue
Block a user