分支合并

src/store/useAppStore.ts

@@ -261,6 +261,17 @@ export const useAppStore = create<AppState>()(
                 };
               } else if (asset.url.startsWith('blob:')) {
                 // 如果已经是Blob URL，直接使用
+                // 同时确保存储在blobStore中
+                set((innerState) => {
+                  const blob = innerState.blobStore.get(asset.url);
+                  if (blob) {
+                    const newBlobStore = new Map(innerState.blobStore);
+                    newBlobStore.set(asset.url, blob);
+                    return { blobStore: newBlobStore };
+                  }
+                  return innerState;
+                });
+                
                 return {
                   id: asset.id,
                   type: asset.type,
@@ -271,7 +282,7 @@ export const useAppStore = create<AppState>()(
                   blobUrl: asset.url
                 };
               }
-              // 对于其他URL类型，创建一个新的Blob URL
+              // 对于其他URL类型，直接使用URL
               return {
                 id: asset.id,
                 type: asset.type,
@@ -521,6 +532,98 @@ export const useAppStore = create<AppState>()(
         
         setSelectedTool: (tool) => set({ selectedTool: tool }),
         
+        // 删除生成记录
+        removeGeneration: (id) => set((state) => {
+          if (!state.currentProject) return {};
+          
+          // 收集需要释放的Blob URLs
+          const urlsToRevoke: string[] = [];
+          const generationToRemove = state.currentProject.generations.find(gen => gen.id === id);
+          
+          if (generationToRemove) {
+            // 收集要删除的生成记录中的Blob URLs
+            generationToRemove.sourceAssets.forEach(asset => {
+              if (asset.blobUrl.startsWith('blob:')) {
+                urlsToRevoke.push(asset.blobUrl);
+              }
+            });
+            generationToRemove.outputAssetsBlobUrls.forEach(url => {
+              if (url.startsWith('blob:')) {
+                urlsToRevoke.push(url);
+              }
+            });
+            
+            // 释放Blob URLs
+            if (urlsToRevoke.length > 0) {
+              set((innerState) => {
+                urlsToRevoke.forEach(url => {
+                  URL.revokeObjectURL(url);
+                  const newBlobStore = new Map(innerState.blobStore);
+                  newBlobStore.delete(url);
+                  innerState = { ...innerState, blobStore: newBlobStore };
+                });
+                return innerState;
+              });
+            }
+          }
+          
+          // 从项目中移除生成记录
+          const updatedProject = {
+            ...state.currentProject,
+            generations: state.currentProject.generations.filter(gen => gen.id !== id),
+            updatedAt: Date.now()
+          };
+          
+          return {
+            currentProject: updatedProject
+          };
+        }),
+        
+        // 删除编辑记录
+        removeEdit: (id) => set((state) => {
+          if (!state.currentProject) return {};
+          
+          // 收集需要释放的Blob URLs
+          const urlsToRevoke: string[] = [];
+          const editToRemove = state.currentProject.edits.find(edit => edit.id === id);
+          
+          if (editToRemove) {
+            // 收集要删除的编辑记录中的Blob URLs
+            if (editToRemove.maskReferenceAssetBlobUrl && editToRemove.maskReferenceAssetBlobUrl.startsWith('blob:')) {
+              urlsToRevoke.push(editToRemove.maskReferenceAssetBlobUrl);
+            }
+            editToRemove.outputAssetsBlobUrls.forEach(url => {
+              if (url.startsWith('blob:')) {
+                urlsToRevoke.push(url);
+              }
+            });
+            
+            // 释放Blob URLs
+            if (urlsToRevoke.length > 0) {
+              set((innerState) => {
+                urlsToRevoke.forEach(url => {
+                  URL.revokeObjectURL(url);
+                  const newBlobStore = new Map(innerState.blobStore);
+                  newBlobStore.delete(url);
+                  innerState = { ...innerState, blobStore: newBlobStore };
+                });
+                return innerState;
+              });
+            }
+          }
+          
+          // 从项目中移除编辑记录
+          const updatedProject = {
+            ...state.currentProject,
+            edits: state.currentProject.edits.filter(edit => edit.id !== id),
+            updatedAt: Date.now()
+          };
+          
+          return {
+            currentProject: updatedProject
+          };
+        }),
+        
         // 清理旧的历史记录
         cleanupOldHistory: () => set((state) => {
           if (!state.currentProject) return {};