feat(编辑器状态管理): 增强脏块管理逻辑，优化保存条件与状态更新

src/components/Editor/toolbar/MainToolbar.tsx

@@ -67,6 +67,7 @@ export const MainToolbar: React.FC<MainToolbarProps> = ({
   // 获取文档修改状态和保存状态
   const {
     hasModified,
+    failedBlocks,
     isSaving,
     autoSaveEnabled,
     setAutoSaveEnabled,
@@ -81,6 +82,7 @@ export const MainToolbar: React.FC<MainToolbarProps> = ({
   } = useEditorStore(
     useShallow((state) => ({
       hasModified: state.hasModified,
+      failedBlocks: state.failedBlocks,
       isSaving: state.isSaving,
       autoSaveEnabled: state.autoSaveEnabled,
       setAutoSaveEnabled: state.setAutoSaveEnabled,
@@ -110,11 +112,13 @@ export const MainToolbar: React.FC<MainToolbarProps> = ({
    * 如果有未保存的修改，弹出确认对话框
    */
   const handleClose = () => {
-    if (hasModified) {
+    if (hasModified || isSaving || failedBlocks.length > 0) {
       Modal.confirm({
-        title: '未保存的修改',
+        title: isSaving ? '文档正在保存' : '未保存的修改',
         icon: <ExclamationCircleOutlined />,
-        content: '您有未保存的修改，确定要关闭吗？',
+        content: isSaving
+          ? '保存请求尚未完成，关闭可能导致最新修改未写入服务器。确定要关闭吗？'
+          : '您有未保存或保存失败的修改，确定要关闭吗？',
         okText: '关闭',
         okType: 'danger',
         cancelText: '取消',

src/services/blockService.ts

@@ -29,6 +29,23 @@ import type {
 
 const BLOCKS_BASE_URL = '/api/v1/documents';
 
+function encodeResourceId(value: string, name: string): string {
+  const hasUnsafeCharacter = Array.from(value).some((character) => {
+    const codePoint = character.codePointAt(0) ?? 0;
+    return codePoint < 32 || codePoint === 127 || character === '/' || character === '\\';
+  });
+
+  if (!value || value.length > 128 || hasUnsafeCharacter) {
+    throw new Error(`无效的${name}`);
+  }
+
+  return encodeURIComponent(value);
+}
+
+function documentBlocksPath(documentId: string): string {
+  return `${BLOCKS_BASE_URL}/${encodeResourceId(documentId, '文档 ID')}/blocks`;
+}
+
 function createServiceError(message: string, error: unknown): Error {
   const detail = getErrorMessage(error);
   return new Error(detail === '发生未知错误' ? message : `${message}: ${detail}`, {
@@ -61,7 +78,7 @@ export const blockService = {
     options?: { signal?: AbortSignal }
   ): Promise<GetBlocksResponse> {
     try {
-      const response = await apiClient.get(`${BLOCKS_BASE_URL}/${documentId}/blocks`, {
+      const response = await apiClient.get(documentBlocksPath(documentId), {
         signal: options?.signal,
       });
 
@@ -94,7 +111,9 @@ export const blockService = {
    */
   async getBlock(documentId: string, blockId: string): Promise<GetBlockResponse> {
     try {
-      const response = await apiClient.get(`${BLOCKS_BASE_URL}/${documentId}/blocks/${blockId}`);
+      const response = await apiClient.get(
+        `${documentBlocksPath(documentId)}/${encodeResourceId(blockId, '块 ID')}`
+      );
 
       const data = response.data?.data || response.data;
       return {
@@ -135,7 +154,7 @@ export const blockService = {
   ): Promise<UpdateBlockResponse> {
     try {
       const response = await apiClient.put(
-        `${BLOCKS_BASE_URL}/${documentId}/blocks/${blockId}`,
+        `${documentBlocksPath(documentId)}/${encodeResourceId(blockId, '块 ID')}`,
         updates,
         { signal: options?.signal }
       );
@@ -170,7 +189,7 @@ export const blockService = {
    */
   async createBlock(documentId: string, block: CreateBlockRequest): Promise<CreateBlockResponse> {
     try {
-      const response = await apiClient.post(`${BLOCKS_BASE_URL}/${documentId}/blocks`, block);
+      const response = await apiClient.post(documentBlocksPath(documentId), block);
 
       return response.data?.data || response.data;
     } catch (error: unknown) {
@@ -191,7 +210,9 @@ export const blockService = {
    */
   async deleteBlock(documentId: string, blockId: string): Promise<void> {
     try {
-      await apiClient.delete(`${BLOCKS_BASE_URL}/${documentId}/blocks/${blockId}`);
+      await apiClient.delete(
+        `${documentBlocksPath(documentId)}/${encodeResourceId(blockId, '块 ID')}`
+      );
     } catch (error: unknown) {
       throw createServiceError('删除块失败', error);
     }
@@ -222,7 +243,7 @@ export const blockService = {
         params.type = type;
       }
 
-      const response = await apiClient.get(`${BLOCKS_BASE_URL}/${documentId}/blocks/search`, {
+      const response = await apiClient.get(`${documentBlocksPath(documentId)}/search`, {
         params,
       });
 
@@ -251,7 +272,7 @@ export const blockService = {
    */
   async getTOC(documentId: string): Promise<GetTOCResponse> {
     try {
-      const response = await apiClient.get(`${BLOCKS_BASE_URL}/${documentId}/blocks/toc`);
+      const response = await apiClient.get(`${documentBlocksPath(documentId)}/toc`);
 
       const data = response.data?.data || response.data;
       return {
@@ -276,7 +297,7 @@ export const blockService = {
    */
   async getStats(documentId: string): Promise<BlockStatsResponse> {
     try {
-      const response = await apiClient.get(`${BLOCKS_BASE_URL}/${documentId}/blocks/stats`);
+      const response = await apiClient.get(`${documentBlocksPath(documentId)}/stats`);
 
       const data = response.data?.data || response.data;
       return {

src/stores/editorStore.ts

@@ -557,7 +557,7 @@ export const useEditorStore = create<EditorStore>((set, get) => {
       const {
         documentId,
         blocks,
-        dirtyBlocks,
+        dirtyBlocks: currentDirtyBlocks,
         currentSavePromise,
         saveAbortController,
         retryAttempts,
@@ -568,7 +568,26 @@ export const useEditorStore = create<EditorStore>((set, get) => {
       }
 
       // 如果没有脏块，无需保存
+      if (currentDirtyBlocks.size === 0) {
+        return;
+      }
+
+      const dirtyBlocks = new Set(
+        blocks
+          .filter(
+            (block) =>
+              currentDirtyBlocks.has(block.id) && block.type !== 'toc' && !isReadonlyBlock(block)
+          )
+          .map((block) => block.id)
+      );
+
       if (dirtyBlocks.size === 0) {
+        set({
+          dirtyBlocks: new Set(),
+          failedBlocks: [],
+          hasModified: false,
+          error: null,
+        });
         return;
       }
 
@@ -608,16 +627,6 @@ export const useEditorStore = create<EditorStore>((set, get) => {
               return false;
             }
 
-            // 跳过TOC块
-            if (block.type === 'toc') {
-              return false;
-            }
-
-            // 跳过metadata中标记为readonly的块
-            if (isReadonlyBlock(block)) {
-              return false;
-            }
-
             return true;
           });
 
@@ -1136,6 +1145,10 @@ export const useEditorStore = create<EditorStore>((set, get) => {
         return;
       }
 
+      if (isReadonlyBlock(blocks[blockIndex])) {
+        return;
+      }
+
       const previousBlocks = blocks;
 
       const newBlocks = blocks.slice();