feat(编辑器): 优化表格选区交互与工具栏层级管理

- 重构表格单元格选区机制，支持拖拽多选和shift点击扩展选择
- 实现视觉单元格位置追踪，正确处理跨行跨列合并单元格的选择
- 优化工具栏z-index层级（1000→1002）和位置定位，防止被表格遮挡
- 移除表格块的hover工具栏显示，统一采用左侧浮动工具按钮交互
- 调整编辑器wrapper的隔离上下文和连接间隙宽度（42px→12px），改进鼠标交互区域
- 增强拖拽选择时的user-select禁用，提升选区拖拽的稳定性
- 优化表格调整大小hook与工具栏逻辑，支持多选状态下的批量操作

src/components/Editor/RichTextEditor/RichTextEditor.css

@@ -5,6 +5,7 @@
 .rich-text-editor-wrapper {
   position: relative;
   width: 100%;
+  isolation: isolate;
 }
 
 /* 连接正文与左侧工具按钮，避免鼠标经过间隙时触发 hover 离开 */
@@ -12,8 +13,8 @@
   content: '';
   position: absolute;
   top: 0;
-  left: -42px;
-  width: 42px;
+  left: -12px;
+  width: 12px;
   height: 100%;
   pointer-events: auto;
 }

src/components/Editor/RichTextEditor/RichTextEditor.tsx

@@ -132,7 +132,7 @@ export const RichTextEditor: React.FC<RichTextEditorProps> = ({
   hasContent,
 }) => {
   const editorRef = useRef<HTMLDivElement>(null);
-  const [toolbarPosition, setToolbarPosition] = useState({ top: 0, left: -34 });
+  const [toolbarPosition, setToolbarPosition] = useState({ top: 0, left: -40 });
   const isComposingRef = useRef(false);
   const isFormattingRef = useRef(false); // 标记正在格式化,避免被value更新覆盖
   const formatFrameRef = useRef<number | null>(null);
@@ -290,7 +290,7 @@ export const RichTextEditor: React.FC<RichTextEditorProps> = ({
       
       setToolbarPosition({
         top: 0,
-        left: -34,
+        left: -40,
       });
       
       return;
@@ -308,7 +308,7 @@ export const RichTextEditor: React.FC<RichTextEditorProps> = ({
 
     setToolbarPosition({
       top: 0,
-      left: -34,
+      left: -40,
     });
     
   }, [readOnly, tableContext]);
@@ -323,7 +323,7 @@ export const RichTextEditor: React.FC<RichTextEditorProps> = ({
       
       setToolbarPosition({
         top: 0,
-        left: -34,
+        left: -40,
       });
     }, 50);
   }, [readOnly, tableContext]);

src/components/Editor/RichTextEditor/RichTextToolbar.css

@@ -4,7 +4,7 @@
 
 .rich-text-toolbar {
   position: absolute;
-  z-index: 1000;
+  z-index: 1002;
   width: 208px;
   top: 0;
   padding: 7px 7px 6px;
@@ -46,6 +46,8 @@
 }
 
 .toolbar-launch-button {
+  position: relative;
+  z-index: 1;
   display: inline-flex;
   align-items: center;
   justify-content: center;

src/components/Editor/blocks/TableBlock.css

@@ -8,19 +8,6 @@
   overflow: visible;
 }
 
-.table-block-wrapper .block-toolbar-launcher {
-  position: absolute;
-  top: 8px;
-  left: -38px;
-  z-index: 11;
-  opacity: 0;
-  transition: opacity 0.16s ease;
-}
-
-.table-block-wrapper:hover .block-toolbar-launcher {
-  opacity: 1;
-}
-
 .table-container {
   overflow: visible; /* 改为visible以显示拖拽线 */
   margin: 8px 0;
@@ -40,6 +27,11 @@
   user-select: none;
 }
 
+.table-block.table-selecting,
+.table-block.table-selecting * {
+  user-select: none;
+}
+
 .table-block th,
 .table-block td {
   border: 1px solid #d9d9d9;

src/components/Editor/blocks/TableBlock.tsx

@@ -4,14 +4,13 @@
  * @module components/Editor/blocks
  */
 
-import React, { useState, useCallback, useRef } from 'react';
+import React, { useState, useCallback, useRef, useEffect } from 'react';
 import type { TableBlock as TableBlockType, TableCell as TableCellType } from '../../../types/editor';
 import { useEditorStore } from '../../../stores/editorStore';
 import { TableCell } from './TableCell';
 import { TableToolbar } from './TableToolbar';
 import { TableResizeHandle } from './TableResizeHandle';
 import { useTableResize } from '../../../hooks/useTableResize';
-import { ToolbarLauncher } from '../RichTextEditor/RichTextToolbar';
 import './TableBlock.css';
 
 // ══════════════════════════════════════════════════════════════════════════════
@@ -23,6 +22,53 @@ export interface TableBlockProps {
   readOnly?: boolean;
 }
 
+interface VisualCellPosition {
+  rowStart: number;
+  rowEnd: number;
+  colStart: number;
+  colEnd: number;
+}
+
+type VisualCellPositions = Map<string, VisualCellPosition>;
+
+const getCellKey = (rowIndex: number, colIndex: number) => `${rowIndex}-${colIndex}`;
+
+const buildVisualCellPositions = (rows: TableBlockType['content']['rows']): VisualCellPositions => {
+  const occupied: boolean[][] = [];
+  const positions: VisualCellPositions = new Map();
+
+  rows.forEach((row, rowIndex) => {
+    if (!occupied[rowIndex]) occupied[rowIndex] = [];
+    let visualCol = 0;
+
+    row.cells.forEach((cell, colIndex) => {
+      if (cell.rowspan === 0 || cell.colspan === 0) return;
+
+      while (occupied[rowIndex][visualCol]) visualCol += 1;
+
+      const rowSpan = Math.max(cell.rowspan || 1, 1);
+      const colSpan = Math.max(cell.colspan || 1, 1);
+      const position = {
+        rowStart: rowIndex,
+        rowEnd: rowIndex + rowSpan - 1,
+        colStart: visualCol,
+        colEnd: visualCol + colSpan - 1,
+      };
+      positions.set(getCellKey(rowIndex, colIndex), position);
+
+      for (let occupiedRow = rowIndex; occupiedRow <= position.rowEnd; occupiedRow += 1) {
+        if (!occupied[occupiedRow]) occupied[occupiedRow] = [];
+        for (let occupiedCol = position.colStart; occupiedCol <= position.colEnd; occupiedCol += 1) {
+          occupied[occupiedRow][occupiedCol] = true;
+        }
+      }
+      visualCol = position.colEnd + 1;
+    });
+  });
+
+  return positions;
+};
+
 /**
  * TableBlock - 表格块(完整实现)
  */
@@ -39,9 +85,16 @@ export const TableBlock: React.FC<TableBlockProps> = ({
     endRow: number;
     endCol: number;
   } | null>(null);
+  const [selectedVisualRange, setSelectedVisualRange] = useState<VisualCellPosition | null>(null);
   
   const tableRef = useRef<HTMLTableElement>(null);
   const containerRef = useRef<HTMLDivElement>(null);
+  const selectionAnchorRef = useRef<{ row: number; col: number } | null>(null);
+  const selectionAnchorVisualRef = useRef<VisualCellPosition | null>(null);
+  const isSelectingRef = useRef(false);
+  const didDragSelectRef = useRef(false);
+  const [isSelecting, setIsSelecting] = useState(false);
+  const visualCellPositions = buildVisualCellPositions(block.content.rows);
 
   // ══════════════════════════════════════════════════════════════════════════════
   // 使用表格调整大小Hook
@@ -171,6 +224,11 @@ export const TableBlock: React.FC<TableBlockProps> = ({
 
   // 处理单元格点击(支持Shift多选)
   const handleCellClick = useCallback((rowIndex: number, colIndex: number, shiftKey: boolean) => {
+    if (didDragSelectRef.current) {
+      didDragSelectRef.current = false;
+      return;
+    }
+
     if (shiftKey && selectedCell) {
       // Shift+点击:选择范围
       const startRow = Math.min(selectedCell.row, rowIndex);
@@ -179,12 +237,114 @@ export const TableBlock: React.FC<TableBlockProps> = ({
       const endCol = Math.max(selectedCell.col, colIndex);
       
       setSelectedRange({ startRow, startCol, endRow, endCol });
+      const anchorPosition = visualCellPositions.get(getCellKey(selectedCell.row, selectedCell.col));
+      const targetPosition = visualCellPositions.get(getCellKey(rowIndex, colIndex));
+      if (anchorPosition && targetPosition) {
+        setSelectedVisualRange({
+          rowStart: Math.min(anchorPosition.rowStart, targetPosition.rowStart),
+          rowEnd: Math.max(anchorPosition.rowEnd, targetPosition.rowEnd),
+          colStart: Math.min(anchorPosition.colStart, targetPosition.colStart),
+          colEnd: Math.max(anchorPosition.colEnd, targetPosition.colEnd),
+        });
+      }
     } else {
       // 普通点击:选择单个单元格
       setSelectedCell({ row: rowIndex, col: colIndex });
       setSelectedRange(null);
+      setSelectedVisualRange(null);
+    }
+  }, [selectedCell, visualCellPositions]);
+
+  const updateSelectedRange = useCallback((rowIndex: number, colIndex: number) => {
+    const anchor = selectionAnchorRef.current;
+    if (!anchor) return;
+
+    const startRow = Math.min(anchor.row, rowIndex);
+    const endRow = Math.max(anchor.row, rowIndex);
+    const startCol = Math.min(anchor.col, colIndex);
+    const endCol = Math.max(anchor.col, colIndex);
+    setSelectedCell({ row: rowIndex, col: colIndex });
+    setSelectedRange({ startRow, startCol, endRow, endCol });
+
+    const anchorPosition = selectionAnchorVisualRef.current;
+    const targetPosition = visualCellPositions.get(getCellKey(rowIndex, colIndex));
+    if (anchorPosition && targetPosition) {
+      setSelectedVisualRange({
+        rowStart: Math.min(anchorPosition.rowStart, targetPosition.rowStart),
+        rowEnd: Math.max(anchorPosition.rowEnd, targetPosition.rowEnd),
+        colStart: Math.min(anchorPosition.colStart, targetPosition.colStart),
+        colEnd: Math.max(anchorPosition.colEnd, targetPosition.colEnd),
+      });
+    }
+  }, [visualCellPositions]);
+
+  const handleCellMouseDown = useCallback((
+    rowIndex: number,
+    colIndex: number,
+    event: React.MouseEvent<HTMLTableCellElement>,
+  ) => {
+    if (readOnly || event.button !== 0) return;
+
+    const isEditorTarget = !!(event.target as HTMLElement).closest('.rich-text-editor');
+    if (!isEditorTarget) {
+      event.preventDefault();
+    }
+    selectionAnchorRef.current = { row: rowIndex, col: colIndex };
+    selectionAnchorVisualRef.current = visualCellPositions.get(getCellKey(rowIndex, colIndex)) || null;
+    isSelectingRef.current = true;
+    setIsSelecting(true);
+
+    if (event.shiftKey && selectedCell) {
+      selectionAnchorRef.current = selectedCell;
+      updateSelectedRange(rowIndex, colIndex);
+    } else {
+      setSelectedCell({ row: rowIndex, col: colIndex });
+      setSelectedRange(null);
+      setSelectedVisualRange(null);
+    }
+  }, [readOnly, selectedCell, updateSelectedRange, visualCellPositions]);
+
+  const handleCellMouseEnter = useCallback((rowIndex: number, colIndex: number) => {
+    if (isSelectingRef.current) {
+      const anchor = selectionAnchorRef.current;
+      if (anchor && (anchor.row !== rowIndex || anchor.col !== colIndex)) {
+        didDragSelectRef.current = true;
+      }
+      updateSelectedRange(rowIndex, colIndex);
+    }
+  }, [updateSelectedRange]);
+
+  const handleTableMouseMove = useCallback((event: React.MouseEvent<HTMLTableElement>) => {
+    if (!isSelectingRef.current) return;
+
+    const target = event.target as HTMLElement;
+    const cellElement = target.closest<HTMLTableCellElement>('td[data-row][data-col]');
+    if (!cellElement || !tableRef.current?.contains(cellElement)) return;
+
+    const rowIndex = Number(cellElement.dataset.row);
+    const colIndex = Number(cellElement.dataset.col);
+    if (!Number.isInteger(rowIndex) || !Number.isInteger(colIndex)) return;
+
+    const anchor = selectionAnchorRef.current;
+    if (anchor && (anchor.row !== rowIndex || anchor.col !== colIndex)) {
+      didDragSelectRef.current = true;
+      event.preventDefault();
+      window.getSelection()?.removeAllRanges();
     }
-  }, [selectedCell]);
+    updateSelectedRange(rowIndex, colIndex);
+  }, [updateSelectedRange]);
+
+  useEffect(() => {
+    const handleMouseUp = () => {
+      isSelectingRef.current = false;
+      setIsSelecting(false);
+      selectionAnchorRef.current = null;
+      selectionAnchorVisualRef.current = null;
+    };
+
+    document.addEventListener('mouseup', handleMouseUp);
+    return () => document.removeEventListener('mouseup', handleMouseUp);
+  }, []);
 
   // ══════════════════════════════════════════════════════════════════════════════
   // 渲染
@@ -209,17 +369,14 @@ export const TableBlock: React.FC<TableBlockProps> = ({
     : block.content.col_widths 
       ? (() => {
           const totalPt = block.content.col_widths.reduce((sum: number, w: number) => sum + w, 0);
-          return block.content.col_widths.map((w: number) => (w / totalPt) * 100);
+          return totalPt > 0
+            ? block.content.col_widths.map((w: number) => (w / totalPt) * 100)
+            : block.content.col_widths.map(() => 100 / block.content.col_widths!.length);
         })()
-      : [];
+      : Array(Math.max(block.metadata.cols, 1)).fill(100 / Math.max(block.metadata.cols, 1));
 
   return (
     <div className="table-block-wrapper" data-block-id={block.id}>
-      {!readOnly && block.content.rows.length > 0 && (
-        <div className="block-toolbar-launcher">
-          <ToolbarLauncher onClick={() => setSelectedCell({ row: 0, col: 0 })} />
-        </div>
-      )}
       {/* 表格工具栏 */}
       {!readOnly && selectedCell && (
         <TableToolbar
@@ -229,6 +386,7 @@ export const TableBlock: React.FC<TableBlockProps> = ({
           onClose={() => {
             setSelectedCell(null);
             setSelectedRange(null);
+            setSelectedVisualRange(null);
           }}
         />
       )}
@@ -275,7 +433,8 @@ export const TableBlock: React.FC<TableBlockProps> = ({
 
         <table
           ref={tableRef}
-          className={`table-block ${resizeState?.isResizing ? 'table-resizing' : ''}`}
+          onMouseMove={handleTableMouseMove}
+          className={`table-block${resizeState?.isResizing ? ' table-resizing' : ''}${isSelecting ? ' table-selecting' : ''}`}
           style={{
             width: tableWidthStyle,
             tableLayout: 'fixed',
@@ -296,11 +455,12 @@ export const TableBlock: React.FC<TableBlockProps> = ({
               >
                 {row.cells.map((cell, colIndex) => {
                   // 检查单元格是否在选择范围内
-                  const isInRange = selectedRange
-                    ? rowIndex >= selectedRange.startRow &&
-                      rowIndex <= selectedRange.endRow &&
-                      colIndex >= selectedRange.startCol &&
-                      colIndex <= selectedRange.endCol
+                  const cellPosition = visualCellPositions.get(getCellKey(rowIndex, colIndex));
+                  const isInRange = selectedVisualRange && cellPosition
+                    ? cellPosition.rowStart <= selectedVisualRange.rowEnd &&
+                      cellPosition.rowEnd >= selectedVisualRange.rowStart &&
+                      cellPosition.colStart <= selectedVisualRange.colEnd &&
+                      cellPosition.colEnd >= selectedVisualRange.colStart
                     : false;
 
                   return (
@@ -316,6 +476,8 @@ export const TableBlock: React.FC<TableBlockProps> = ({
                       }
                       onChange={handleCellChange}
                       onClick={handleCellClick}
+                      onMouseDown={handleCellMouseDown}
+                      onMouseEnter={handleCellMouseEnter}
                       tableBlock={block}
                       selectedRange={selectedRange}
                       onStyleChange={handleCellStyleChange}

src/components/Editor/blocks/TableCell.css

@@ -17,8 +17,7 @@
 
 .table-cell.selected {
   background-color: rgba(24, 144, 255, 0.1);
-  border-color: #1890ff;
-  box-shadow: inset 0 0 0 1px #1890ff;
+  box-shadow: inset 0 0 0 2px #1890ff;
 }
 
 /* 单元格内的富文本编辑器 */

src/components/Editor/blocks/TableCell.tsx

@@ -29,6 +29,10 @@ export interface TableCellProps {
   onChange?: (rowIndex: number, colIndex: number, updates: Partial<TableCellType>) => void;
   /** 单元格点击回调 */
   onClick?: (rowIndex: number, colIndex: number, shiftKey: boolean) => void;
+  /** 鼠标按下回调（用于拖动选择单元格） */
+  onMouseDown?: (rowIndex: number, colIndex: number, event: React.MouseEvent<HTMLTableCellElement>) => void;
+  /** 鼠标进入回调（用于拖动选择单元格） */
+  onMouseEnter?: (rowIndex: number, colIndex: number) => void;
   /** 表格块(用于传递给RichTextEditor) */
   tableBlock?: TableBlock;
   /** 选中的范围(用于传递给RichTextEditor) */
@@ -63,6 +67,8 @@ export const TableCell: React.FC<TableCellProps> = ({
   isSelected = false,
   onChange,
   onClick,
+  onMouseDown,
+  onMouseEnter,
   tableBlock,
   selectedRange,
   onStyleChange,
@@ -110,6 +116,8 @@ export const TableCell: React.FC<TableCellProps> = ({
       colSpan={cell.colspan}
       style={cellStyle}
       onClick={handleClick}
+      onMouseDown={(event) => onMouseDown?.(rowIndex, colIndex, event)}
+      onMouseEnter={() => onMouseEnter?.(rowIndex, colIndex)}
       data-row={rowIndex}
       data-col={colIndex}
     >

src/components/Editor/blocks/TableToolbar.tsx

@@ -71,6 +71,26 @@ export const TableToolbar: React.FC<TableToolbarProps> = ({
   const updateBlock = useEditorStore((state) => state.updateBlock);
   const deleteBlock = useEditorStore((state) => state.deleteBlock);
 
+  const rowCount = block.content.rows.length;
+  const columnCount = block.metadata.cols;
+  const hasValidSelectedCell = Number.isInteger(selectedCell.row)
+    && Number.isInteger(selectedCell.col)
+    && selectedCell.row >= 0
+    && selectedCell.row < rowCount
+    && selectedCell.col >= 0
+    && selectedCell.col < columnCount
+    && !!block.content.rows[selectedCell.row]?.cells[selectedCell.col];
+  const hasValidRange = !!selectedRange
+    && selectedRange.startRow >= 0
+    && selectedRange.startCol >= 0
+    && selectedRange.endRow >= selectedRange.startRow
+    && selectedRange.endCol >= selectedRange.startCol
+    && selectedRange.endRow < rowCount
+    && selectedRange.endCol < columnCount
+    && block.content.rows.every((row) => row.cells.length > selectedRange.endCol);
+  const isMultiCellRange = hasValidRange
+    && (selectedRange.endRow > selectedRange.startRow || selectedRange.endCol > selectedRange.startCol);
+
   // 插入行
   const handleInsertRow = useCallback(() => {
     try {
@@ -181,9 +201,10 @@ export const TableToolbar: React.FC<TableToolbarProps> = ({
 
   // 检查当前单元格是否已合并
   const isMergedCell = useCallback(() => {
+    if (!hasValidSelectedCell) return false;
     const cell = block.content.rows[selectedCell.row]?.cells[selectedCell.col];
     return cell && (cell.rowspan > 1 || cell.colspan > 1);
-  }, [block, selectedCell]);
+  }, [block, hasValidSelectedCell, selectedCell]);
 
   return (
     <div className="table-toolbar">
@@ -223,8 +244,8 @@ export const TableToolbar: React.FC<TableToolbarProps> = ({
           size="small"
           icon={<MergeCellsOutlined />}
           onClick={handleMergeCells}
-          disabled={!selectedRange}
-          title={selectedRange ? '合并选中的单元格' : '请先按住Shift选择范围'}
+          disabled={!isMultiCellRange}
+          title={isMultiCellRange ? '合并选中的单元格' : '请先按住Shift选择多个单元格'}
         >
           合并单元格
         </Button>
@@ -255,6 +276,7 @@ export const TableToolbar: React.FC<TableToolbarProps> = ({
             size="small"
             icon={<MinusOutlined />}
             danger
+            disabled={!hasValidSelectedCell || rowCount <= 1}
             title="删除当前行"
           >
             删除行
@@ -273,6 +295,7 @@ export const TableToolbar: React.FC<TableToolbarProps> = ({
             size="small"
             icon={<MinusOutlined />}
             danger
+            disabled={!hasValidSelectedCell || columnCount <= 1}
             title="删除当前列"
           >
             删除列

src/components/Editor/blocks/TableWidthControl.tsx

@@ -43,11 +43,24 @@ export const TableWidthControl: React.FC<TableWidthControlProps> = ({ block }) =
 
   // 应用宽度变更
   const applyWidthChange = useCallback(() => {
+    const safeWidth = Number.isFinite(width) && width > 0 ? width : 100;
+    const sourceColWidths = block.metadata.col_widths.length > 0
+      ? block.metadata.col_widths
+      : Array(Math.max(block.metadata.cols, 1)).fill(100 / Math.max(block.metadata.cols, 1));
+    const totalPercent = sourceColWidths.reduce(
+      (sum, value) => sum + (Number.isFinite(value) && value > 0 ? value : 0),
+      0,
+    );
+    const normalizedColWidths = totalPercent > 0
+      ? sourceColWidths.map((value) => (Number.isFinite(value) && value > 0 ? value : 0) * 100 / totalPercent)
+      : Array(sourceColWidths.length).fill(100 / sourceColWidths.length);
+
     // 更新metadata
     const newMetadata = {
       ...block.metadata,
-      table_width: width,
+      table_width: safeWidth,
       table_width_unit: unit,
+      col_widths: normalizedColWidths,
     };
     
     // 重新计算content.col_widths（pt单位）
@@ -56,19 +69,18 @@ export const TableWidthControl: React.FC<TableWidthControlProps> = ({ block }) =
     
     let tableActualWidthPt: number;
     if (unit === 'percent') {
-      tableActualWidthPt = pageWidthPt * (width / 100);
+      tableActualWidthPt = pageWidthPt * (safeWidth / 100);
     } else if (unit === 'cm') {
-      tableActualWidthPt = width * 28.35; // 1cm = 28.35pt
+      tableActualWidthPt = safeWidth * 28.35; // 1cm = 28.35pt
     } else if (unit === 'inch') {
-      tableActualWidthPt = width * 72; // 1inch = 72pt
+      tableActualWidthPt = safeWidth * 72; // 1inch = 72pt
     } else {
       tableActualWidthPt = pageWidthPt * (width / 100);
     }
     
     // 根据metadata.col_widths（百分比）重新计算content.col_widths（pt）
-    const totalPercent = block.metadata.col_widths.reduce((sum, value) => sum + value, 0);
-    const newColWidthsPt = block.metadata.col_widths.map(
-      (percent) => tableActualWidthPt * percent / totalPercent
+    const newColWidthsPt = normalizedColWidths.map(
+      (percent) => tableActualWidthPt * percent / 100
     );
     
     updateBlock(block.id, {

src/hooks/useTableResize.ts

@@ -258,6 +258,13 @@ export function useTableResize(options: UseTableResizeOptions): UseTableResizeRe
         // 列宽调整
         // ──────────────────────────────────────────────────────────────────────
         const tableWidthPx = table.offsetWidth;
+        if (tableWidthPx <= 0) {
+          setResizeState(null);
+          setResizeLinePosition(null);
+          document.body.style.cursor = '';
+          document.body.style.userSelect = '';
+          return;
+        }
         const deltaPercent = (finalOffset / tableWidthPx) * 100;
 
         const newColWidths = [...colWidths];
@@ -352,8 +359,12 @@ export function useTableResize(options: UseTableResizeOptions): UseTableResizeRe
         }
         window.removeEventListener('mousemove', handleResizeMove);
         window.removeEventListener('mouseup', handleResizeEnd);
+        document.body.style.cursor = '';
+        document.body.style.userSelect = '';
       };
     }
+
+    return undefined;
   }, [resizeState, tableRef, hoverState, handleResizeStart, handleResizeMove, handleResizeEnd]);
 
   /**

src/utils/blockOperations.ts

@@ -98,6 +98,30 @@ export function rebalanceBlockOrders(blocks: DocumentBlock[]): DocumentBlock[] {
 // Table Operations
 // ══════════════════════════════════════════════════════════════════════════════
 
+function assertTableIndex(index: number, length: number, label: string): void {
+  if (!Number.isInteger(index) || index < 0 || index >= length) {
+    throw new Error(`${label}索引无效`);
+  }
+}
+
+function assertTableRange(
+  table: TableBlock,
+  startRow: number,
+  startCol: number,
+  endRow: number,
+  endCol: number,
+): void {
+  assertTableIndex(startRow, table.content.rows.length, '起始行');
+  assertTableIndex(endRow, table.content.rows.length, '结束行');
+  if (startRow > endRow) throw new Error('行范围无效');
+  assertTableIndex(startCol, table.metadata.cols, '起始列');
+  assertTableIndex(endCol, table.metadata.cols, '结束列');
+  if (startCol > endCol) throw new Error('列范围无效');
+  if (table.content.rows.some((row) => row.cells.length <= endCol)) {
+    throw new Error('表格单元格结构无效');
+  }
+}
+
 /**
  * 将 text 字段从富文本数组转换为纯字符串
  * 
@@ -379,6 +403,7 @@ export function createEmptyRow(cols: number, colWidths?: number[], height?: numb
  * ```
  */
 export function insertTableRow(table: TableBlock, afterRow: number): TableBlock {
+  assertTableIndex(afterRow, table.content.rows.length, '行');
   // 使用合理的默认行高
   const defaultHeight = 58; // 默认行高58磅
   
@@ -431,6 +456,7 @@ export function insertTableRow(table: TableBlock, afterRow: number): TableBlock
  * ```
  */
 export function insertTableColumn(table: TableBlock, afterCol: number): TableBlock {
+  assertTableIndex(afterCol, table.metadata.cols, '列');
   // 计算新列的宽度
   // 如果有content.col_widths，使用相邻列的宽度；否则使用默认值
   let newColWidth = 100; // 默认列宽100磅
@@ -502,6 +528,7 @@ export function insertTableColumn(table: TableBlock, afterCol: number): TableBlo
  * @returns 新的表格块
  */
 export function deleteTableRow(table: TableBlock, rowIndex: number): TableBlock {
+  assertTableIndex(rowIndex, table.content.rows.length, '行');
   if (table.content.rows.length <= 1) {
     throw new Error('表格至少需要一行');
   }
@@ -530,6 +557,7 @@ export function deleteTableRow(table: TableBlock, rowIndex: number): TableBlock
  * @returns 新的表格块
  */
 export function deleteTableColumn(table: TableBlock, colIndex: number): TableBlock {
+  assertTableIndex(colIndex, table.metadata.cols, '列');
   if (table.metadata.cols <= 1) {
     throw new Error('表格至少需要一列');
   }
@@ -607,6 +635,8 @@ export function mergeCells(
   endRow: number,
   endCol: number
 ): TableBlock {
+  assertTableRange(table, startRow, startCol, endRow, endCol);
+
   // 计算合并范围
   const rowSpan = endRow - startRow + 1;
   const colSpan = endCol - startCol + 1;
@@ -732,6 +762,8 @@ export function splitCell(
   rowIndex: number,
   colIndex: number
 ): TableBlock {
+  assertTableIndex(rowIndex, table.content.rows.length, '行');
+  assertTableIndex(colIndex, table.metadata.cols, '列');
   const targetCell = table.content.rows[rowIndex]?.cells[colIndex];
   
   if (!targetCell) {

src/utils/tableUtils.ts

@@ -19,9 +19,16 @@ export function percentToPtWidths(
   tableWidthPercent: number = 100,
   pageWidthPt: number = 478 // A4纸宽度595pt - 左右边距各71pt ≈ 453pt
 ): number[] {
-  const tableActualWidthPt = pageWidthPt * (tableWidthPercent / 100);
-  return percentWidths.map(percent => 
-    Math.round((tableActualWidthPt * percent / 100) * 10) / 10
+  const safePageWidthPt = Number.isFinite(pageWidthPt) && pageWidthPt > 0 ? pageWidthPt : 478;
+  const safeTableWidthPercent = Number.isFinite(tableWidthPercent) && tableWidthPercent > 0
+    ? tableWidthPercent
+    : 100;
+  const tableActualWidthPt = safePageWidthPt * (safeTableWidthPercent / 100);
+  const validWidths = percentWidths.map((percent) => Number.isFinite(percent) && percent > 0 ? percent : 0);
+  const totalPercent = validWidths.reduce((sum, percent) => sum + percent, 0);
+  const fallbackPercent = validWidths.length > 0 ? 100 / validWidths.length : 0;
+  return validWidths.map((percent) =>
+    Math.round((tableActualWidthPt * (totalPercent > 0 ? percent / totalPercent : fallbackPercent / 100)) * 10) / 10
   );
 }
 
@@ -32,10 +39,13 @@ export function percentToPtWidths(
  * @returns 百分比宽度数组
  */
 export function ptToPercentWidths(ptWidths: number[]): number[] {
-  const totalPt = ptWidths.reduce((sum, w) => sum + w, 0);
-  if (totalPt === 0) return ptWidths.map(() => 0);
+  const validWidths = ptWidths.map((width) => Number.isFinite(width) && width > 0 ? width : 0);
+  const totalPt = validWidths.reduce((sum, width) => sum + width, 0);
+  if (totalPt === 0) {
+    return validWidths.length > 0 ? validWidths.map(() => 100 / validWidths.length) : [];
+  }
   
-  const percentWidths = ptWidths.map(w => (w / totalPt) * 100);
+  const percentWidths = validWidths.map(width => (width / totalPt) * 100);
   
   // 归一化,确保总和为100%
   const totalPercent = percentWidths.reduce((sum, w) => sum + w, 0);
@@ -77,15 +87,18 @@ export function ptToPixel(pt: number): number {
  * @returns 归一化后的百分比数组
  */
 export function normalizePercents(percentWidths: number[]): number[] {
-  const total = percentWidths.reduce((sum, w) => sum + w, 0);
-  if (total === 0) return percentWidths;
+  const validWidths = percentWidths.map((width) => Number.isFinite(width) && width > 0 ? width : 0);
+  const total = validWidths.reduce((sum, width) => sum + width, 0);
+  if (total === 0) {
+    return validWidths.length > 0 ? validWidths.map(() => 100 / validWidths.length) : [];
+  }
   
   if (Math.abs(total - 100) < 0.1) {
-    return percentWidths; // 已经接近100%
+    return validWidths; // 已经接近100%
   }
   
   const factor = 100 / total;
-  return percentWidths.map(w => Math.round(w * factor * 100) / 100);
+  return validWidths.map(w => Math.round(w * factor * 100) / 100);
 }
 
 /**
@@ -102,6 +115,11 @@ export function validateTableData(
   content: TableContent;
   metadata: Pick<TableBlock['metadata'], 'cols' | 'col_widths' | 'table_width'>;
 } {
+  const safeColumnCount = Number.isInteger(metadata.cols) && metadata.cols > 0
+    ? metadata.cols
+    : Math.max(content.rows.reduce((max, row) => Math.max(max, row.cells.length), 0), 1);
+  metadata.cols = safeColumnCount;
+
   // 确保metadata.col_widths存在且长度正确
   if (!metadata.col_widths || metadata.col_widths.length !== metadata.cols) {
     // 平均分配