tt/ttstd-infinite-canvas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(*): 稳定期治理 - 收敛核心架构、错误语义并修复跨项目数据竞态

Browse Source
This commit is contained in:
ddCat
2026-09-09 22:02:10 +08:00
parent bacd502f5c
commit b5f3413ded
298 changed files with 12681 additions and 26428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/src/pages/assets/asset-batch-upload-modal.tsx
View File

@@ -6,7 +6,7 @@ import { FileImage, UploadCloud, X } from "lucide-react";
import { ASSET_CATEGORY_OPTIONS, type AssetCategory } from "@/lib/asset-category";
import { readImageMeta } from "@/lib/image-utils";
import { uploadImage } from "@/services/image-storage";
import { saveRemoteUserDataNow } from "@/services/user-data-sync";
import { localSavedRemotePendingMessage, saveRemoteUserDataNow } from "@/services/user-data-sync";
import { flushAssetStorePersistence, useAssetStore } from "@/stores/use-asset-store";
import type { AssetFolder } from "@/services/api/user-data";
@@ -58,8 +58,8 @@ export function AssetBatchUploadModal({ open, defaultFolderId, folders, onClose,
await flushAssetStorePersistence();
try {
await saveRemoteUserDataNow();
} catch {
message.warning("部分素材已保存在本地，稍后自动同步至云端");
} catch (error) {
message.warning(localSavedRemotePendingMessage("部分素材已保存在本地", error));
}
setUploading(false);
await onComplete();

31
web/src/pages/assets/index.tsx
View File

@@ -11,7 +11,6 @@ import { AssetMediaPreview } from "@/components/asset-media-preview";
import { AssetLibraryCard, AssetLibraryCardMedia } from "@/components/assets/asset-library-card";
import { saveAs } from "file-saver";
import { cn } from "@/lib/utils";
import { normalizeAssetRecord } from "@/lib/asset-storage-revision";
import { useCopyText } from "@/hooks/use-copy-text";
import { useDebouncedValue } from "@/hooks/use-debounced-value";
@@ -23,7 +22,7 @@ import { uploadMediaFile } from "@/services/file-storage";
import { flushAssetStorePersistence, useAssetStore, type Asset, type AssetCategory, type AssetKind, type ImageAsset } from "@/stores/use-asset-store";
import { exportAssets, readAssetPackage } from "./asset-transfer";
import { AssetStorageUsage, assetStorageUsageQueryKey } from "./asset-storage-usage";
import { deleteAssetWithRemoteSync, loadAssetLibraryPage, saveRemoteUserDataNow } from "@/services/user-data-sync";
import { deleteAssetWithRemoteSync, loadAssetLibraryPage, localSavedRemotePendingMessage, saveRemoteUserDataNow } from "@/services/user-data-sync";
import { useUserStore } from "@/stores/use-user-store";
import { createAssetFolder, deleteAssetFolder, listAssetFolders, listRemoteAssetsPage, moveRemoteAssetsToFolder, updateAssetFolder, type AssetFolder } from "@/services/api/user-data";
import { AssetBatchUploadModal } from "./asset-batch-upload-modal";
@@ -124,7 +123,7 @@ export default function AssetsPage() {
});
const folders = foldersQuery.data?.folders || [];
const allLibraryAssets = useMemo(() => assets.map(normalizeAssetRecord).filter((asset): asset is LibraryAsset => asset.kind !== "entity"), [assets]);
const allLibraryAssets = useMemo(() => assets.filter((asset): asset is LibraryAsset => asset.kind !== "entity"), [assets]);
const activeAssets = useMemo(() => allLibraryAssets.filter((asset) => asset.status !== "archived"), [allLibraryAssets]);
const trashAssets = useMemo(() => allLibraryAssets.filter((asset) => asset.status === "archived"), [allLibraryAssets]);
const validAssets = viewMode === "trash" ? trashAssets : activeAssets;
@@ -163,7 +162,7 @@ export default function AssetsPage() {
return filteredAssets.slice(start, start + pageSize);
}, [filteredAssets, page, pageSize]);
const visibleAssets = useMemo(
() => (assetPageQuery.data?.assets || localVisibleAssets).map(normalizeAssetRecord).filter((asset): asset is LibraryAsset => asset.kind !== "entity"),
() => (assetPageQuery.data?.assets || localVisibleAssets).filter((asset): asset is LibraryAsset => asset.kind !== "entity"),
[assetPageQuery.data?.assets, localVisibleAssets],
);
const visibleAssetIds = useMemo(() => visibleAssets.map((asset) => asset.id), [visibleAssets]);
@@ -332,8 +331,8 @@ export default function AssetsPage() {
await saveRemoteUserDataNow();
await invalidateAssetLibrary();
message.success(editingAsset ? "素材已更新" : "素材已保存");
} catch {
message.warning(editingAsset ? "素材已在本地更新，稍后自动同步至云端" : "素材已在本地保存，稍后自动同步至云端");
} catch (error) {
message.warning(localSavedRemotePendingMessage(editingAsset ? "素材已在本地更新" : "素材已在本地保存", error));
}
setIsAssetOpen(false);
};
@@ -372,7 +371,9 @@ export default function AssetsPage() {
data: { url: uploaded.url, storageKey: uploaded.storageKey, bytes: uploaded.bytes, mimeType: uploaded.mimeType, fileName: file.name },
metadata: { source: "manual" },
});
message.success("3D 模型已保存");
// 直传失败时文件只落在本机，云端同步会重传；此时不能说成"已保存"。
if (uploaded.pendingRemoteUpload) message.warning(`3D 模型已保存在本机，尚未上传到服务器${uploaded.remoteUploadError ? `：${uploaded.remoteUploadError}` : ""}`);
else message.success("3D 模型已保存");
};
const copyAssetText = async (asset: LibraryAsset) => {
@@ -420,8 +421,8 @@ export default function AssetsPage() {
try {
await saveRemoteUserDataNow();
message.success(`已还原素材「${asset.title}」`);
} catch {
message.warning("已在本地还原，稍后自动同步至云端");
} catch (error) {
message.warning(localSavedRemotePendingMessage("已在本地还原", error));
}
};
@@ -436,8 +437,8 @@ export default function AssetsPage() {
try {
await saveRemoteUserDataNow();
message.success(`已还原 ${count} 个素材`);
} catch {
message.warning("已在本地还原，稍后自动同步至云端");
} catch (error) {
message.warning(localSavedRemotePendingMessage("已在本地还原", error));
}
};
@@ -447,8 +448,8 @@ export default function AssetsPage() {
try {
await saveRemoteUserDataNow();
message.success(`已将「${asset.title}」移入回收站`);
} catch {
message.warning("已移入回收站，稍后自动同步至云端");
} catch (error) {
message.warning(localSavedRemotePendingMessage("已移入回收站", error));
}
};
@@ -463,8 +464,8 @@ export default function AssetsPage() {
try {
await saveRemoteUserDataNow();
message.success(`已将 ${count} 个素材移入回收站`);
} catch {
message.warning("已移入回收站，稍后自动同步至云端");
} catch (error) {
message.warning(localSavedRemotePendingMessage("已移入回收站", error));
}
};