feat(编辑器): 添加撤销/重做功能，优化编辑器状态管理

src/components/Editor/BlockEditor.tsx

@@ -91,6 +91,30 @@ export const BlockEditor: React.FC<BlockEditorProps> = ({
     };
   }, [documentId, loadDocument]);
 
+  // 在编辑器范围内接管撤销/重做快捷键，避免影响聊天输入框。
+  useEffect(() => {
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (readOnly || !event.target || !(event.target as HTMLElement).closest('.block-editor')) {
+        return;
+      }
+
+      const modifierPressed = event.ctrlKey || event.metaKey;
+      if (!modifierPressed || event.key.toLowerCase() !== 'z') {
+        return;
+      }
+
+      event.preventDefault();
+      if (event.shiftKey) {
+        useEditorStore.getState().redo();
+      } else {
+        useEditorStore.getState().undo();
+      }
+    };
+
+    window.addEventListener('keydown', handleKeyDown);
+    return () => window.removeEventListener('keydown', handleKeyDown);
+  }, [readOnly]);
+
   // ── Save handler ───────────────────────────────────────────────────────────
   const handleSave = useCallback(async () => {
     if (readOnly) return;

src/components/Editor/toolbar/MainToolbar.tsx

@@ -20,6 +20,8 @@ import {
   DownOutlined,
   LoadingOutlined,
   ExclamationCircleOutlined,
+  UndoOutlined,
+  RedoOutlined,
 } from '@ant-design/icons';
 import { useEditorStore } from '../../../stores/editorStore';
 import { exportToWord } from '../../../services/exportService';
@@ -73,6 +75,12 @@ export const MainToolbar: React.FC<MainToolbarProps> = ({
     setAutoSaveEnabled,
     lastSaveTime,
     savingProgress,
+    pastLength,
+    futureLength,
+    isHistoryApplying,
+    pendingStructuralOperations,
+    undo,
+    redo,
   } = useEditorStore(useShallow((state) => ({
     hasModified: state.hasModified,
     isSaving: state.isSaving,
@@ -80,6 +88,12 @@ export const MainToolbar: React.FC<MainToolbarProps> = ({
     setAutoSaveEnabled: state.setAutoSaveEnabled,
     lastSaveTime: state.lastSaveTime,
     savingProgress: state.savingProgress,
+    pastLength: state.past.length,
+    futureLength: state.future.length,
+    isHistoryApplying: state.isHistoryApplying,
+    pendingStructuralOperations: state.pendingStructuralOperations,
+    undo: state.undo,
+    redo: state.redo,
   })));
   
   // ── 格式化上次保存时间 ────────────────────────────────────────────────────
@@ -232,6 +246,25 @@ export const MainToolbar: React.FC<MainToolbarProps> = ({
       <div className="toolbar-right">
         {!readOnly && (
           <>
+            <Button
+              type="text"
+              size="small"
+              icon={<UndoOutlined />}
+              onClick={undo}
+              disabled={pastLength === 0 || isSaving || isHistoryApplying || pendingStructuralOperations > 0}
+              title="撤销 (Ctrl/Cmd+Z)"
+              aria-label="撤销"
+            />
+            <Button
+              type="text"
+              size="small"
+              icon={<RedoOutlined />}
+              onClick={redo}
+              disabled={futureLength === 0 || isSaving || isHistoryApplying || pendingStructuralOperations > 0}
+              title="重做 (Ctrl/Cmd+Shift+Z)"
+              aria-label="重做"
+            />
+
             {/* 自动保存切换 */}
             <Button
               type={autoSaveEnabled ? 'default' : 'text'}

src/stores/editorStore.ts

@@ -33,6 +33,17 @@ const AUTO_SAVE_DELAY = 3000; // 3秒无操作后自动保存
 
 // 最大重试次数
 const MAX_RETRY_ATTEMPTS = 3;
+const MAX_HISTORY_ENTRIES = 100;
+
+interface EditorHistoryEntry {
+  blocks: DocumentBlock[];
+  selectedBlockId: string | null;
+}
+
+function snapshotBlocks(blocks: DocumentBlock[]): DocumentBlock[] {
+  // 块更新采用不可变替换，历史快照只需复制数组即可复用块对象。
+  return blocks.slice();
+}
 
 /**
  * 计算块内容的哈希值
@@ -77,6 +88,10 @@ interface EditorStore {
   documentTitle: string;
   blocks: DocumentBlock[];
   selectedBlockId: string | null;
+  past: EditorHistoryEntry[];
+  future: EditorHistoryEntry[];
+  isHistoryApplying: boolean;
+  pendingStructuralOperations: number;
   
   // ── 加载/保存状态 ──────────────────────────────────────────────────────
   isLoading: boolean;
@@ -232,6 +247,10 @@ interface EditorStore {
    * 重置状态
    */
   reset: () => void;
+  /** 撤销最近一次编辑 */
+  undo: () => Promise<void>;
+  /** 重做最近一次撤销 */
+  redo: () => Promise<void>;
 }
 
 // ══════════════════════════════════════════════════════════════════════════════
@@ -288,6 +307,10 @@ const initialState = {
   documentTitle: '',
   blocks: [],
   selectedBlockId: null,
+  past: [],
+  future: [],
+  isHistoryApplying: false,
+  pendingStructuralOperations: 0,
   isLoading: false,
   isSaving: false,
   error: null,
@@ -308,8 +331,100 @@ const initialState = {
   retryTimer: null,
 };
 
-export const useEditorStore = create<EditorStore>((set, get) => ({
-  ...initialState,
+export const useEditorStore = create<EditorStore>((set, get) => {
+  const pushHistory = (blocks: DocumentBlock[], selectedBlockId: string | null) => {
+    set((state) => ({
+      past: [
+        ...state.past,
+        { blocks: snapshotBlocks(blocks), selectedBlockId },
+      ].slice(-MAX_HISTORY_ENTRIES),
+      future: [],
+    }));
+  };
+
+  const restoreHistoryEntry = async (entry: EditorHistoryEntry) => {
+    const { blockHashes, autoSaveEnabled, blocks: currentBlocks, documentId } = get();
+    let restoredBlocks = entry.blocks;
+    let restoredSelectedBlockId = entry.selectedBlockId;
+    const currentIds = new Set(currentBlocks.map((block) => block.id));
+    const targetIds = new Set(entry.blocks.map((block) => block.id));
+    const hasStructuralChange = currentBlocks.some((block) => !targetIds.has(block.id)) ||
+      entry.blocks.some((block) => !currentIds.has(block.id));
+
+    if (hasStructuralChange && documentId) {
+      await Promise.all(
+        currentBlocks
+          .filter((block) => !targetIds.has(block.id))
+          .map((block) => blockService.deleteBlock(documentId, block.id)),
+      );
+
+      const resolvedIds = new Map<string, string>();
+      let previousBlockId: string | null = null;
+      for (const block of [...entry.blocks].sort((a, b) => a.block_order - b.block_order)) {
+        if (currentIds.has(block.id)) {
+          resolvedIds.set(block.id, block.id);
+        } else {
+          const response = await blockService.createBlock(documentId, {
+            type: block.type,
+            level: block.level,
+            index: block.index,
+            content: block.content,
+            word_style: block.word_style,
+            style: block.style,
+            metadata: block.metadata,
+            after_block_id: previousBlockId,
+          });
+          if (!response.blockId) {
+            throw new Error('撤销操作创建块失败');
+          }
+          resolvedIds.set(block.id, response.blockId);
+        }
+        previousBlockId = resolvedIds.get(block.id) || null;
+      }
+
+      restoredBlocks = entry.blocks.map((block) => ({
+        ...block,
+        id: resolvedIds.get(block.id) || block.id,
+      }));
+      restoredSelectedBlockId = entry.selectedBlockId
+        ? resolvedIds.get(entry.selectedBlockId) || entry.selectedBlockId
+        : null;
+    }
+
+    const restoredHashes = new Map(blockHashes);
+    currentBlocks.forEach((block) => {
+      if (!restoredBlocks.some((restoredBlock) => restoredBlock.id === block.id)) {
+        restoredHashes.delete(block.id);
+      }
+    });
+    restoredBlocks.forEach((block) => {
+      if (!restoredHashes.has(block.id)) {
+        restoredHashes.set(block.id, computeBlockHash(block));
+      }
+    });
+    const dirtyBlocks = new Set(
+      restoredBlocks
+        .filter((block) => restoredHashes.get(block.id) !== computeBlockHash(block))
+        .map((block) => block.id),
+    );
+
+    set({
+      blocks: restoredBlocks,
+      selectedBlockId: restoredSelectedBlockId,
+      dirtyBlocks,
+      hasModified: dirtyBlocks.size > 0,
+      failedBlocks: [],
+      error: null,
+      blockHashes: restoredHashes,
+    });
+
+    if (autoSaveEnabled && dirtyBlocks.size > 0) {
+      get().triggerAutoSave();
+    }
+  };
+
+  return ({
+    ...initialState,
 
   // ── loadDocument ────────────────────────────────────────────────────────
   loadDocument: async (documentId: string) => {
@@ -366,6 +481,8 @@ export const useEditorStore = create<EditorStore>((set, get) => ({
         failedBlocks: [], // 清空失败块列表
         blockHashes: initialHashes, // 初始化哈希表
         loadAbortController: null,
+        past: [],
+        future: [],
       });
     } catch (error: unknown) {
       if (controller.signal.aborted || isCanceledRequest(error)) return;
@@ -859,12 +976,16 @@ export const useEditorStore = create<EditorStore>((set, get) => ({
 
   // ── addBlock ────────────────────────────────────────────────────────────
   addBlock: async (partialBlock: PartialBlock, afterBlockId?: string) => {
-    const { blocks, blockHashes, documentId } = get();
+    const { blocks, blockHashes, documentId, isHistoryApplying, pendingStructuralOperations } = get();
     
-    if (!documentId) {
+    if (!documentId || isHistoryApplying || pendingStructuralOperations > 0) {
+      if (!documentId) {
       message.error('没有打开的文档');
+      }
       return;
     }
+
+    set({ pendingStructuralOperations: pendingStructuralOperations + 1 });
     
     let orderedBlocks = blocks;
 
@@ -939,6 +1060,11 @@ export const useEditorStore = create<EditorStore>((set, get) => ({
       if (!realBlockId) {
         throw new Error('后端未返回blockId');
       }
+
+      if (get().documentId !== documentId) {
+        await blockService.deleteBlock(documentId, realBlockId).catch(() => undefined);
+        return;
+      }
       
       // 用后端返回的真实ID替换临时ID
       const { blocks: currentBlocks } = get();
@@ -962,6 +1088,7 @@ export const useEditorStore = create<EditorStore>((set, get) => ({
           blocks: updatedBlocks,
           blockHashes: newBlockHashes,
         });
+        pushHistory(blocks, get().selectedBlockId);
       } else {
         throw new Error('无法找到创建的块');
       }
@@ -976,18 +1103,28 @@ export const useEditorStore = create<EditorStore>((set, get) => ({
       
       message.error(getErrorMessage(error) || '创建块失败');
       throw error;
+    } finally {
+      set((state) => ({
+        pendingStructuralOperations: Math.max(0, state.pendingStructuralOperations - 1),
+      }));
     }
   },
 
   // ── updateBlock ─────────────────────────────────────────────────────────
   updateBlock: (id: string, updates: BlockUpdate) => {
-    const { blocks, dirtyBlocks, blockHashes, autoSaveEnabled } = get();
+    const { blocks, dirtyBlocks, blockHashes, autoSaveEnabled, isHistoryApplying, pendingStructuralOperations } = get();
+
+    if (isHistoryApplying || pendingStructuralOperations > 0) {
+      return;
+    }
 
     const blockIndex = blocks.findIndex((block) => block.id === id);
     if (blockIndex < 0) {
       return;
     }
 
+    const previousBlocks = blocks;
+
     const newBlocks = blocks.slice();
     newBlocks[blockIndex] = { ...blocks[blockIndex], ...updates } as DocumentBlock;
 
@@ -1014,6 +1151,9 @@ export const useEditorStore = create<EditorStore>((set, get) => ({
       dirtyBlocks: newDirtyBlocks,
       hasModified: newDirtyBlocks.size > 0,
     });
+    if (newHash !== computeBlockHash(blocks[blockIndex])) {
+      pushHistory(previousBlocks, get().selectedBlockId);
+    }
     
     // 触发自动保存
     if (autoSaveEnabled && newDirtyBlocks.size > 0) {
@@ -1023,12 +1163,16 @@ export const useEditorStore = create<EditorStore>((set, get) => ({
 
   // ── deleteBlock ─────────────────────────────────────────────────────────
   deleteBlock: async (id: string) => {
-    const { blocks, dirtyBlocks, blockHashes, documentId } = get();
+    const { blocks, dirtyBlocks, blockHashes, documentId, isHistoryApplying, pendingStructuralOperations } = get();
     
-    if (!documentId) {
+    if (!documentId || isHistoryApplying || pendingStructuralOperations > 0) {
+      if (!documentId) {
       message.error('没有打开的文档');
+      }
       return;
     }
+
+    set({ pendingStructuralOperations: pendingStructuralOperations + 1 });
     
     // 找到要删除的块
     const blockToDelete = blocks.find(b => b.id === id);
@@ -1121,7 +1265,12 @@ export const useEditorStore = create<EditorStore>((set, get) => ({
           hasModified: latestState.dirtyBlocks.size > 0,
         });
       }
+      pushHistory(blocks, get().selectedBlockId);
     } catch (error: unknown) {
+      if (get().documentId !== documentId) {
+        return;
+      }
+
       // 删除或更新失败，回滚本地状态
       
       // 恢复被删除的块
@@ -1152,18 +1301,96 @@ export const useEditorStore = create<EditorStore>((set, get) => ({
       
       message.error(getErrorMessage(error) || '删除块失败');
       throw error;
+    } finally {
+      set((state) => ({
+        pendingStructuralOperations: Math.max(0, state.pendingStructuralOperations - 1),
+      }));
     }
   },
 
   // ── moveBlock ───────────────────────────────────────────────────────────
   moveBlock: (id: string, targetOrder: number) => {
-    const { blocks } = get();
+    const { blocks, isHistoryApplying, pendingStructuralOperations } = get();
+    if (isHistoryApplying || pendingStructuralOperations > 0) {
+      return;
+    }
+    const block = blocks.find((item) => item.id === id);
+    if (!block || block.block_order === targetOrder) {
+      return;
+    }
+    pushHistory(blocks, get().selectedBlockId);
     
     const newBlocks = blocks.map((block) =>
       block.id === id ? { ...block, block_order: targetOrder } : block
     );
     
-    set({ blocks: newBlocks });
+    const { dirtyBlocks, blockHashes } = get();
+    const newDirtyBlocks = new Set(dirtyBlocks);
+    const movedBlock = newBlocks.find((item) => item.id === id);
+    if (movedBlock && blockHashes.get(id) !== computeBlockHash(movedBlock)) {
+      newDirtyBlocks.add(id);
+    }
+    set({
+      blocks: newBlocks,
+      dirtyBlocks: newDirtyBlocks,
+      hasModified: newDirtyBlocks.size > 0,
+    });
+    if (get().autoSaveEnabled) {
+      get().triggerAutoSave();
+    }
+  },
+
+  // ── undo / redo ────────────────────────────────────────────────────────
+  undo: async () => {
+    const { past, blocks, selectedBlockId, isHistoryApplying, pendingStructuralOperations } = get();
+    const previous = past[past.length - 1];
+    if (!previous || isHistoryApplying || pendingStructuralOperations > 0) return;
+
+    set({ isHistoryApplying: true });
+    try {
+      await restoreHistoryEntry(previous);
+      set((state) => ({
+        past: state.past.slice(0, -1),
+        future: [
+          ...state.future,
+          { blocks: snapshotBlocks(blocks), selectedBlockId },
+        ].slice(-MAX_HISTORY_ENTRIES),
+        isHistoryApplying: false,
+      }));
+    } catch (error: unknown) {
+      const documentId = get().documentId;
+      if (documentId) {
+        await get().loadDocument(documentId).catch(() => undefined);
+      }
+      set({ isHistoryApplying: false });
+      message.error(getErrorMessage(error) || '撤销失败');
+    }
+  },
+
+  redo: async () => {
+    const { future, blocks, selectedBlockId, isHistoryApplying, pendingStructuralOperations } = get();
+    const next = future[future.length - 1];
+    if (!next || isHistoryApplying || pendingStructuralOperations > 0) return;
+
+    set({ isHistoryApplying: true });
+    try {
+      await restoreHistoryEntry(next);
+      set((state) => ({
+        future: state.future.slice(0, -1),
+        past: [
+          ...state.past,
+          { blocks: snapshotBlocks(blocks), selectedBlockId },
+        ].slice(-MAX_HISTORY_ENTRIES),
+        isHistoryApplying: false,
+      }));
+    } catch (error: unknown) {
+      const documentId = get().documentId;
+      if (documentId) {
+        await get().loadDocument(documentId).catch(() => undefined);
+      }
+      set({ isHistoryApplying: false });
+      message.error(getErrorMessage(error) || '重做失败');
+    }
   },
 
   // ── selectBlock ─────────────────────────────────────────────────────────
@@ -1311,6 +1538,10 @@ export const useEditorStore = create<EditorStore>((set, get) => ({
   recomputeBlockOrders: () => {
     const { blocks } = get();
     const newBlocks = rebalanceOrders(blocks);
+    if (JSON.stringify(newBlocks) === JSON.stringify(blocks)) {
+      return;
+    }
+    pushHistory(blocks, get().selectedBlockId);
     set({ blocks: newBlocks });
   },
   
@@ -1376,6 +1607,7 @@ export const useEditorStore = create<EditorStore>((set, get) => ({
     
     set(initialState);
   },
-}));
+  });
+});
 
 export default useEditorStore;