@gct-paas/word 0.1.74-beta.11 → 0.1.74-beta.12

package/dist/core/command/commands/InsertTable.d.ts

@@ -5,5 +5,9 @@ import { Wtbl } from '../../model/document';
 export declare class InsertTable extends CommandBase<'insertTable'> {
     constructor(doc: Doc, payload?: CommandPayloadMap['insertTable']);
     protected createTable(width: number, rowCount?: number, colCount?: number): Wtbl;
+    private resolveBlockedTableLabel;
     protected execute(): Promise<PostCommandContext>;
+    private insertAtCursor;
+    private insertIntoBody;
+    private insertIntoCell;
 }

package/dist/core/constants/index.d.ts

@@ -2,3 +2,4 @@ export * from './common';
 export * from './component';
 export * from './doc-mode';
 export * from './paper';
+export * from './table';

package/dist/core/constants/table.d.ts

@@ -0,0 +1,11 @@
+/** 外表列/单元格最小宽度（像素），与手动拖列宽下限一致 */
+export declare const MIN_TABLE_COL_WIDTH_PX = 30;
+/** 外表列/单元格最小宽度（DXA） */
+export declare const MIN_TABLE_COL_WIDTH_DXA: number;
+/** 嵌套表内单列最小宽度（DXA，约 0.5"） */
+export declare const MIN_NESTED_TABLE_COL_WIDTH_DXA = 720;
+/**
+ * 业务表 / 数据表 region 类型集合。
+ * 用于：嵌套表插入拦截、内外表业务数据标记互斥。
+ */
+export declare const BUSINESS_DATA_REGION_TYPES: ReadonlySet<string>;

package/dist/core/cursor/logic/getSelectionRects.d.ts

@@ -1,6 +1,19 @@
 import { Doc } from '../../view/Doc';
 import { ISelectionRange, Rect } from '../types/cursor';
 /**
- * 将 selection（逻辑选区）转换成一组视觉矩形（canvas 绝对坐标）
+ * 将 selection（逻辑选区）转换成一组视觉矩形（canvas 绝对坐标）和单元格 ID 集合。
+ *
+ * 高亮策略（按模式）：
+ *  - cell-range / cell-full / mixed(表格行部分)
+ *      → cellRangeIds：由 table-cell.vue 在内容层渲染选中背景，
+ *        内表格单元格的白色背景会自然覆盖外格蓝色，无需额外处理。
+ *  - cell-inner
+ *      → rects：cursor 覆盖层渲染文字级别高亮；
+ *        只保留属于 selectionTableId 的原子节点（过滤掉内表格 atoms，解决 Q6 场景）。
+ *  - mixed(段落部分) / 纯段落
+ *      → rects：cursor 覆盖层渲染。
  */
-export declare function getSelectionRects(doc: Doc, selection: ISelectionRange, upgrade: boolean): Rect[];
+export declare function getSelectionRects(doc: Doc, selection: ISelectionRange, upgrade: boolean): {
+    rects: Rect[];
+    cellRangeIds: string[];
+};

package/dist/core/cursor/logic/index.d.ts

@@ -5,7 +5,8 @@ export { computeRealignedCursorState, cursorMetaToInput, cursorPositionToInput,
 export { getCursorCoords } from './getCursorCoords';
 export { getCursorTextRawList } from './getCursorTextRawList';
 export { getSelectionRects } from './getSelectionRects';
-export { getSelectLinesInfo } from './selectionAnalyzer';
+export { getSelectLinesInfo, resolveSelectionTableScope, resolveTableScopeFromCursor, resolveTableScopeFromModelNode, resolveWpFromCursor, } from './selectionAnalyzer';
+export type { TableScope } from '../../model/document/Wtbl';
 export { getImmediateNeighborNode, findFirstAtomBeyond, isAtBoundaryOfNode, findTargetLineId, locateByX, } from './layoutNavigation';
 /**
  * 将命中结果转换为光标位置

package/dist/core/cursor/logic/selectionAnalyzer.d.ts

@@ -1,12 +1,32 @@
-import { BaseMetaNode, LineInfo, TableSelectionMode } from '../../layout/types';
+import { BaseMetaNode, LineInfo } from '../../layout/types';
 import { Doc } from '../../view/Doc';
 import { ISelectionRange } from '../types/cursor';
+import { ModelNode } from '../../model/base';
+import { TableScope } from '../../model/document/Wtbl';
+import { Wp } from '../../model/document';
+/** 从 model 节点向上解析当前表格作用域 */
+export declare function resolveTableScopeFromModelNode(node: ModelNode): TableScope | undefined;
+/** 从光标定位当前 Wtbl 作用域（含嵌套表内光标） */
+export declare function resolveTableScopeFromCursor(doc: Doc): TableScope | undefined;
+/** 从当前选区解析表格作用域（仅单表，跨内外表时返回 undefined） */
+export declare function resolveSelectionTableScope(doc: Doc): TableScope | undefined;
+/** 从光标向上解析所在段落的 Wp（兼容 placeholder 空行） */
+export declare function resolveWpFromCursor(doc: Doc): Wp | undefined;
 /**
+ * 计算选区的行级信息（scopedSelectedLines、tableMode、rangeWidgetIds 等）。
  *
- * @param doc
- * @param selection
- * @param upgrade 单元格是否升级成单个单元格选中
- * @returns
+ * 过滤规则：
+ *  - anchor 在嵌套表格内 → 严格夹紧在该嵌套表，不纳入外部行/段落
+ *  - 其他情况         → 纳入所有顶层表格行 + 所有段落
+ *
+ * tableMode 决定策略：
+ *  - mixed      → 多张顶层表 OR (表格行 + 段落) → 选整行；段落单独生成 rect
+ *  - cell-range → 单张表、多行或跨列
+ *  - cell-inner → 单张表、单行、同一列（单格内文字选区）
+ *  - cell-full  → cell-inner 升级：选中整格（isCellUpgrade）
+ *  - none       → 纯段落 / 空
+ *
+ * @param upgrade 鼠标在 cellHitPoint 角上，允许 cell-inner → cell-full 升级
  */
 export declare function getSelectLinesInfo(doc: Doc, selection: ISelectionRange, upgrade: boolean): {
     normalized: import('../types/cursor').INormalizedRange;
@@ -16,8 +36,13 @@ export declare function getSelectLinesInfo(doc: Doc, selection: ISelectionRange,
     startPageIdx: number;
     endPageIdx: number;
     selectedLines: LineInfo[];
-    tableMode: TableSelectionMode;
+    tableMode: "none" | "mixed" | "cell-range" | "cell-full" | "cell-inner";
     overlapIds: string[];
     widgetRunMap: Map<string, BaseMetaNode[]>;
     rangeWidgetIds: string[];
+    selectionTableId: string | undefined;
+    anchorCellIndex: number | undefined;
+    focusCellIndex: number | undefined;
+    /** focus 越界夹紧方向：true=夹末列，false=夹首列，undefined=已有精确值 */
+    focusClampToLast: boolean | undefined;
 } | undefined;

package/dist/core/event/types.d.ts

@@ -65,4 +65,4 @@ export type MoveOpts = Pick<KeydownOpts, 'dir' | 'shift' | 'ctrl'>;
  * 定义了系统中所有需要进行分发/调度的事件类型标识
  */
 export type DispatchEventType = 'ime:compositionstart' | 'ime:compositionupdate' | 'ime:compositionend' | 'ime:input' | 'ime:paste' | 'ime:focus' | 'ime:blur' | 'ime:keydown' | 'caret:locate' | 'konva:click' | 'konva:dragstart' | 'konva:dragmove' | 'konva:dragend' | 'konva:contextmenu' | 'inter:str' | 'inter:stc' | 'inter:stall' | 'inter:active' | 'inter:chg-hmid';
-export type EventBusType = 'autoScroll:start' | 'autoScroll:move' | 'autoScroll:stop' | 'caret:changed' | 'caret:requestScroll' | 'cursor:change' | 'cursor:changed' | 'tableSelection:change' | 'activeTableId:change' | 'dragHoverId:change' | 'hoverModelId:change' | 'focusModelId:change' | 'panelData:change';
+export type EventBusType = 'autoScroll:start' | 'autoScroll:move' | 'autoScroll:stop' | 'caret:changed' | 'caret:requestScroll' | 'cursor:change' | 'cursor:changed' | 'tableSelection:change' | 'activeTableId:change' | 'activeTableScope:change' | 'dragHoverId:change' | 'hoverModelId:change' | 'focusModelId:change' | 'panelData:change';

package/dist/core/index.d.ts

@@ -29,7 +29,7 @@ export type { WrPageWidget } from './model/document';
 export type { Border, Paragraph } from './view/Paragraph';
 export type { OverlayLayout } from './view/base/OverlayLayout';
 export type { Table } from './view/Table';
-export type { SubRenderer } from './view/TableCell';
+export type { SubRenderer, TableCellContent } from './view/TableCell';
 export type { Wtbl } from './model/document';
 export type { BoundedRegion, CheckTableRegion, _2DTableRegion } from './model/logic';
 export type { WidgetStateContext } from './widget/state';

package/dist/core/interaction/InteractionController.d.ts

@@ -1,6 +1,7 @@
 import { ActivePanelData, PanelType } from '../../domain/active/active-types';
 import { Doc } from '../view/Doc';
 import { ContextMenuParams } from '../../runtime/canvas/__common__/context-menu/index.type';
+import { ActiveTableScopeState } from './types';
 export declare class InteractionController {
     doc: Doc;
     constructor(doc: Doc);
@@ -16,10 +17,20 @@ export declare class InteractionController {
     onSelectTableAll(payload: {
         id: string;
     }): void;
+    /**
+     * 根据行/列范围设置 cursor selection，驱动 cellRangeIds 内容层高亮。
+     *
+     * @param tableId  目标表格 layout ID
+     * @param options.rowRange  [startRowIdx, endRowIdx]（默认全表）
+     * @param options.colRange  [startColIdx, endColIdx]（默认全列）
+     */
+    private _setTableCursorSelection;
     clearTableSelection(): void;
     onChangeDragHoverId(hitId: string): void;
     onSetActiveTableId(tableId: string): void;
+    onSetActiveTableScope(scope: ActiveTableScopeState): void;
     clearActiveTableId(): void;
+    clearActiveTableScope(): void;
     /** 解析字段批注 key */
     private resolveFieldCommentKey;
     /**

package/dist/core/interaction/types.d.ts

@@ -1,16 +1,24 @@
 import { ActivePanelData } from '../../domain/active/active-types';
 import { AttachFieldTarget } from '../../domain/field/attach-field';
+import { TableScope } from '../model/document/Wtbl';
 export type ITableSelection = {
     tableId: string;
     axis: 'row' | 'col' | 'all';
     index: number;
     realRowIndex?: number;
 } | null;
+export type ActiveTableScopeState = Pick<TableScope, 'depth'> & {
+    wtblId: string;
+    rootWtblId: string;
+    hostCellId?: string;
+};
 export type InteractionState = {
     /** 表格选择（行 / 列 / 全选） */
     tableSelection: ITableSelection | null;
     /** 当前激活表格 id（仅用于 table overlay 显示） */
     activeTableId: string;
+    /** 当前激活表格作用域（内外表隔离） */
+    activeTableScope: ActiveTableScopeState | null;
     /** 拖拽的id 用来进行处理单个单元格选中 */
     dragHoverId: string;
     /** hover 模型的模型 id */

package/dist/core/interaction/useInteraction.d.ts

@@ -8,6 +8,12 @@ export declare function useInteraction(docRef: Ref<Doc | null>): {
         readonly realRowIndex?: number | undefined;
     } | null | undefined;
     readonly activeTableId?: string | undefined;
+    readonly activeTableScope?: {
+        readonly depth: number;
+        readonly wtblId: string;
+        readonly rootWtblId: string;
+        readonly hostCellId?: string | undefined;
+    } | null | undefined;
     readonly dragHoverId?: string | undefined;
     readonly hoverModelId?: string | undefined;
     readonly focusModelId?: string | undefined;

package/dist/core/layout/LayoutManager.d.ts

@@ -25,7 +25,11 @@ export declare class LayoutManager {
      */
     private layoutTable;
     /**
-     * 布局单元格内容
+     * 构建表格 layout 节点（不含分页）
+     */
+    private buildTableLayout;
+    /**
+     * 布局单元格内容（段落 + 嵌套表 block 混排）
      */
     private layoutCellContent;
     /**

package/dist/core/layout/providers/TableInfoProvider.d.ts

@@ -1,4 +1,4 @@
-import { Wtbl, Wtc, Wtr } from '../../model/document';
+import { Wtbl, Wtc, Wtr, Wp } from '../../model/document';
 import { TableExpander, CellFragment } from '../table/table-expand';
 import { SubRenderer } from '../../view/TableCell';
 export declare class TableInfoProvider {
@@ -10,7 +10,7 @@ export declare class TableInfoProvider {
         expandFromId: string;
         cells: CellFragment[];
     }[];
-    getCellContent(cell: any): any[];
+    getCellContent(cell: CellFragment): Array<Wp | Wtbl>;
     getRowModelRef(row: any): {
         id: string;
     };

package/dist/core/layout/table/split-table.d.ts

@@ -21,6 +21,16 @@ import { Table } from '../../view/Table';
  * 当前页: Row 0 原样 + Row 1 上半部分
  * 下一页: 新建 Cell A_next + Row 1 下半部分引用新源单元格
  */
+/**
+ * 行内切分最小顶部剩余高度（像素）
+ *
+ * 仅约束「留在当前页的上半截」不能过薄：remainHeight < 此值时整行下移。
+ * 不再用几何 bottomHeight（rowH - remain）否决切分——那只是切分前的余量，
+ * 真正高度由 fillCells + redistribute 按内容重算；用它拦切分会导致
+ * 「差几像素超页却整行跳页」的悬崖效应。
+ */
+declare const MIN_SPLIT_REMAINING_HEIGHT = 20;
+export { MIN_SPLIT_REMAINING_HEIGHT };
 export declare class TableSplitter {
     private readonly table;
     private readonly maxHeight;

package/dist/core/layout/types/index.d.ts

@@ -50,6 +50,8 @@ export interface LineInfo {
         /** 当前行的绝对位置 - 下边 */
         lineBottom: number;
     }>;
+    /** 所属表格的 layout id（仅 tablerow 类型有值） */
+    tableId?: string;
 }
 export interface Bounds {
     left: number;

package/dist/core/model/document/Wbody.d.ts

@@ -26,6 +26,10 @@ export declare class Wbody extends ModelGroup<Child> {
      * @returns Wbody 实例
      */
     static fromXmlJson(json: RawElement): Wbody;
+    /**
+     * 规范化：确保 body 中每个 Wtbl 前后都紧跟一个 Wp。
+     */
+    ensureParagraphsAroundTables(): void;
     /**
      * 实例转换为原始 XML JSON
      *

package/dist/core/model/document/Wtbl/RowColumnOps.d.ts

@@ -4,6 +4,10 @@ import { Wtbl } from '../Wtbl';
  * 提供插入和删除行列的功能
  */
 export declare class WtblRowColumnOps {
+    /** 外表删除前，显式移除受影响单元格中的嵌套表，避免孤儿节点残留 */
+    private static detachNestedTablesFromCells;
+    /** 仅外表需要做「删除行/列/表时联动删除嵌套表」 */
+    private static detachNestedTablesFromOuterTable;
     /**
      * 新单元格同步引用信息
      * refCell: 参考单元格 (above | left)
@@ -55,6 +59,11 @@ export declare class WtblRowColumnOps {
      * 如果有右侧列，右侧列会相应调整以保持表格总宽度不变
      */
     static resizeCol(table: Wtbl, colIndex: number, width: number): void;
+    /**
+     * 从其他列借宽度给指定列跨度，保持表格总宽不变。
+     * 优先借右侧列，再借左侧；被借列不低于 minWidth。
+     */
+    static stealWidthToColumn(table: Wtbl, startCol: number, colSpan: number, extra: number, minWidth?: number): number;
     /**
      * 调整行高
      */

package/dist/core/model/document/Wtbl/Serialization.d.ts

@@ -1,16 +1,41 @@
 import { RawElement } from '../../types/raw';
+import { ModelNode } from '../../base';
 import { Wtr } from '../Wtr';
 import { Wtbl } from '../Wtbl';
 import { Wtc } from '../Wtc';
+/** Wtc.fromXmlJson / Wtr.fromXmlJson 解析单元格内容时的上下文 */
+export type WtcParseOptions = {
+    hostTableDepth: 0 | 1;
+    rootTableId: string;
+    grandchildWarned: {
+        value: number;
+    };
+    parseNestedTable: (json: RawElement) => ModelNode;
+    onGrandchildIgnored?: () => void;
+};
+/** WtblSerialization.fromXmlJson 解析上下文 */
+export type WtblParseContext = {
+    depth: 0 | 1;
+    rootTableId?: string;
+    hostCellId?: string;
+    grandchildWarned?: {
+        value: number;
+    };
+};
 /**
  * 表格序列化功能类
  * 提供 XML 转换、快照序列化等功能
  */
 export declare class WtblSerialization {
+    static resetImportGrandchildWarning(): void;
+    static consumeImportGrandchildWarning(): number;
+    static markGrandchildTableIgnored(warnedRef?: {
+        value: number;
+    }): void;
     /**
      * 从 XML JSON 创建表格实例
      */
-    static fromXmlJson(json: RawElement): Wtbl;
+    static fromXmlJson(json: RawElement, context?: WtblParseContext): Wtbl;
     /**
      * 将表格实例转换为 XML JSON
      */

package/dist/core/model/document/Wtbl.d.ts

@@ -1,18 +1,32 @@
 import { RawElement } from '../types/raw';
 import { Wbody } from './Wbody';
-import { Wtr } from './Wtr';
 import { Wtc } from './Wtc';
+import { Wtr } from './Wtr';
 import { ModelGroup, ModelGroupOptions } from '../base';
 import { TableRegion, BoundedRegionOptions, CheckTableRegionOptions, RepeatingRegionOptions, _2DTableRegionOptions, TableHeaderRegion, SubTableHeaderRegion, TableHeaderRegionOptions, SubTableHeaderRegionOptions, CheckTableRegion, MaterialConsumeTableRegion, MaterialConsumeTableRegionOptions, BoundedRegion, RepeatingRegion, _2DTableRegion } from '../logic';
+import { WtblParseContext } from './Wtbl/Serialization';
 import { WtblPr } from './WtblPr';
+/** 当前操作归属的表格作用域 */
+export type TableScope = {
+    wtbl: Wtbl;
+    depth: number;
+    hostCell?: Wtc;
+    rootWtbl: Wtbl;
+};
 export declare class Wtbl extends ModelGroup {
     name: 'w:tbl';
     type: "element";
     tblPr?: WtblPr;
     colWidths?: number[];
     regions: TableRegion[];
-    parent?: Wbody;
+    parent?: Wbody | Wtc;
     children: Wtr[];
+    /** 嵌套表宿主单元格 id */
+    nestedInCellId?: string;
+    /** 最外层 Wtbl.id */
+    rootTableId?: string;
+    /** 嵌套深度：0（外表）或 1（嵌套表） */
+    depth: 0 | 1;
     private pendingRecalculate;
     private mutationDepth;
     private mutationNeedsRecalculate;
@@ -36,6 +50,17 @@ export declare class Wtbl extends ModelGroup {
     get checkTable(): CheckTableRegion[];
     getCheckTableById(id: string): CheckTableRegion | undefined;
     get hasCheckTable(): boolean;
+    /** 是否已标为业务表 / 数据表 */
+    get isBusinessOrDataTable(): boolean;
+    /** 沿 parent 链找到最外层 Wtbl */
+    getRootTable(): Wtbl;
+    getTableScope(): TableScope;
+    /** 收集本表单元格内的物理嵌套表 */
+    collectNestedTables(): Wtbl[];
+    /** 本表内是否存在已标业务/数据区的嵌套表 */
+    hasNestedBusinessOrDataTable(): boolean;
+    /** 作为物理嵌套表挂到宿主单元格 */
+    attachAsNested(hostCell: Wtc): void;
     get tableHeader(): Array<TableHeaderRegion | SubTableHeaderRegion>;
     getTableHeaderById(id: string): TableHeaderRegion | SubTableHeaderRegion | undefined;
     /**
@@ -49,7 +74,9 @@ export declare class Wtbl extends ModelGroup {
         syncRefs?: () => void;
         finalize?: () => void;
     }): void;
-    static fromXmlJson(json: RawElement): Wtbl;
+    static fromXmlJson(json: RawElement, context?: WtblParseContext): Wtbl;
+    /** 是否为嵌套在单元格内的物理子表 */
+    get isNestedTable(): boolean;
     toXmlJson(): RawElement;
     /**
      * 在指定行索引处拆分表格
@@ -102,5 +129,6 @@ export declare class Wtbl extends ModelGroup {
     deleteColAt(index: number): void;
     deleteColRange(startIndex: number, endIndex: number): void;
     resizeCol(colIndex: number, width: number): void;
+    stealWidthToColumn(startCol: number, colSpan: number, extra: number, minWidth?: number): number;
     resizeRow(rowIndex: number, height: number): void;
 }

package/dist/core/model/document/Wtc.d.ts

@@ -1,8 +1,9 @@
 import { RawElement } from '../types/raw';
 import { Wtr } from './Wtr';
 import { Wp } from './Wp';
+import { Wtbl, TableScope } from './Wtbl';
 import { ModelGroup, ModelGroupOptions } from '../base';
-import { Wtbl } from './Wtbl';
+import { WtcParseOptions } from './Wtbl/Serialization';
 import { SubTableRegionType, SubTableItemType, TableHeaderRegionType, WtcHeaderRef, WtcSubTableItemRef, WtcSubTableRef } from './wtcRegionRef';
 /** 单元格上需随行列复制同步的引用字段 */
 export declare const WTC_REF_KEYS: readonly ["mergeId", "subTable", "subTableItem", "header"];
@@ -46,6 +47,15 @@ export declare class Wtc extends ModelGroup {
     /** 是否是合并起始单元格 */
     get isMergeStart(): boolean;
     get contents(): Wp[];
+    getParagraphs(): Wp[];
+    getNestedTables(): Wtbl[];
+    getTableScope(): TableScope;
+    /** 单元格内容区宽度（DXA），用于嵌套表初始列宽（已扣除左右 padding） */
+    getContentWidthDxa(): number;
+    /** 是否允许在本单元格插入物理嵌套表 */
+    canInsertNestedTable(): boolean;
+    /** 在 block 子节点序列中插入嵌套表（纵向堆叠） */
+    insertNestedTableAt(index: number, wtbl: Wtbl): void;
     /** 单元格垂直对齐（w:tcPr/w:vAlign） */
     get vAlign(): 'top' | 'center' | 'bottom' | undefined;
     get firstContent(): Wp | undefined;
@@ -100,7 +110,7 @@ export declare class Wtc extends ModelGroup {
     /**
      * 从 XML JSON 创建单元格（返回数组，因为 colspan 会产生多个单元格）
      */
-    static fromXmlJson(tcRaw: RawElement): Wtc[];
+    static fromXmlJson(tcRaw: RawElement, cellParseOptions?: WtcParseOptions): Wtc[];
     /**
      * 转换为 XML JSON
      * 结构：w:tc
@@ -109,6 +119,7 @@ export declare class Wtc extends ModelGroup {
      */
     toXmlJson(): RawElement | null;
     private buildTcPr;
+    private static parseNestedTableFromXml;
     private static normalizeWordColor;
     /**
      * 从模板创建单元格

package/dist/core/model/document/Wtr.d.ts

@@ -1,6 +1,7 @@
 import { RawElement } from '../types/raw';
 import { Wtbl } from './Wtbl';
 import { Wtc } from './Wtc';
+import { WtcParseOptions } from './Wtbl/Serialization';
 import { ModelGroup, ModelGroupOptions } from '../base';
 import { WtrPr, WtrHeightRule } from './WtrPr';
 type RowHeightRule = WtrHeightRule;
@@ -28,7 +29,7 @@ export declare class Wtr extends ModelGroup {
     /**
      * 从 XML JSON 创建表格行
      */
-    static fromXmlJson(trRaw: RawElement): Wtr;
+    static fromXmlJson(trRaw: RawElement, cellParseOptions?: WtcParseOptions): Wtr;
     /**
      * 转换为 XML JSON
      * 结构：w:tr

package/dist/core/model/document/index.d.ts

@@ -8,6 +8,7 @@ export { WrImage } from './WrImage';
 export { WrField } from './WrField';
 export { WrPageWidget } from './WrPageWidget';
 export { Wtbl } from './Wtbl';
+export type { TableScope } from './Wtbl';
 export { Wtr } from './Wtr';
 export { Wtc } from './Wtc';
 export { WsecPr } from './WsecPr';

package/dist/core/model/document/utils/ensure-paragraphs-around-tables.d.ts

@@ -0,0 +1,18 @@
+import { Wtbl } from '../Wtbl';
+import { ModelGroup } from '../../base';
+type EnsureGroup = Pick<ModelGroup<any>, 'children' | 'insertBefore' | 'insertAfter'>;
+/**
+ * 在数组中为每个表格补齐前后段落（就地修改，倒序遍历）。
+ * 适用于 fromXmlJson 等尚未挂到 ModelGroup 的构建阶段。
+ */
+export declare function ensureParagraphsAroundTablesInList<T>(children: T[], isTable: (item: T | undefined) => boolean, isParagraph: (item: T | undefined) => boolean, createParagraph: () => T): void;
+/** Wp / Wtbl 列表的便捷封装 */
+export declare function ensureWpAroundWtblInList(children: unknown[]): void;
+/**
+ * 确保单个表格在 ModelGroup 中前后都紧跟段落。
+ * 插入表格后调用即可（body / 单元格共用）。
+ */
+export declare function ensureParagraphsAroundTable(group: EnsureGroup, table: Wtbl): void;
+/** 确保 group 内每个表格前后都有段落 */
+export declare function ensureParagraphsAroundAllTables(group: EnsureGroup): void;
+export {};

package/dist/core/model/templates/tableCell.template.d.ts

@@ -1,6 +1,8 @@
 /**
  * 表格单元格模板 - TypeScript 版本
  * 保留变量占位符位置：{{width}}, {{paraId}}
+ *
+ * 单元格 block 子节点可为 w:p（段落）与 w:tbl（物理嵌套表）混合排列，仅纵向堆叠。
  */
 export declare const TABLE_CELL_TEMPLATE: {
     name: string;

package/dist/core/view/Table.d.ts

@@ -3,14 +3,18 @@ import { TableRow } from './TableRow';
 import { Border } from './types';
 import { EventUtil } from './utils/EventUtil';
 import { TableCell } from './TableCell';
+import { WtblPr } from '../model/document/WtblPr';
 export interface TableOptions extends LayoutGroupOptions {
     colWidths?: number[];
+    tblPr?: WtblPr;
 }
 export declare class Table extends LayoutGroup<TableRow> {
     type: 'table';
     component: "table";
     cellPadding: [number, number, number, number];
     colWidths?: number[];
+    /** 表格属性 */
+    tblPr?: WtblPr;
     /** redistribute 完成事件 */
     redistributeEvent: EventUtil;
     /** 表格边框 */
@@ -21,6 +25,15 @@ export declare class Table extends LayoutGroup<TableRow> {
     get width(): number;
     redistribute(): void;
     layout(x: number, y: number): void;
+    /**
+     * 相对正文区左边缘的水平偏移
+     * 对应 w:jc / w:tblInd；居中或右对齐且表格宽于正文区时可为负值
+     */
+    private resolveOffsetX;
+    /** 嵌套在单元格内的表格不使用页面级对齐 */
+    private isNestedInCell;
+    private getTableJc;
+    private getTblIndPx;
     updateCellOffsetInfo(): void;
     forEachCell(options: {
         startRowIdx: number;

package/dist/core/view/TableCell.d.ts

@@ -27,7 +27,8 @@ export type SubRenderer = {
     /** 用来标记二维表的子类型 交叉 / 横向 / 纵向 */
     cellZone?: LinkSubTableCellZone;
 };
-export declare class TableCell extends LayoutGroup<Paragraph> implements IContainerMetrics {
+export type TableCellContent = Paragraph | Table;
+export declare class TableCell extends LayoutGroup<TableCellContent> implements IContainerMetrics {
     component: "tableCell";
     colspan: number;
     rowspan: number;

package/dist/domain/table/design/validate-nested-table-region.d.ts

@@ -0,0 +1,31 @@
+import { Wtbl, Wtc } from '../../../core/model/document';
+import { TableCellSelectionBounds } from './validate-table-selection';
+export type NestedTableMutexReason = 'cell-has-nested' | 'outer-has-region';
+/**
+ * 业务表/数据表互斥校验（内外表）
+ *
+ * 规则 3：内表已标业务/数据区 → 外表该单元格不支持再标（被规则 4 涵盖）
+ * 规则 4：外表选中单元格含有内表 → 不支持标为业务/数据表
+ * 内表视角：外层宿主单元格已被外表标为业务/数据区 → 内表不支持再标
+ *
+ * @param table  当前操作的表格（外表或内表）
+ * @param bounds 当前光标选区对应的单元格范围（来自 resolveTableCellSelectionBounds）
+ */
+export declare function validateNestedTableRegionMutex(table: Wtbl, bounds?: TableCellSelectionBounds | null): {
+    ok: boolean;
+    existingLabel?: string;
+    reason?: NestedTableMutexReason;
+};
+export declare function getNestedTableRegionMutexMessage(reason?: NestedTableMutexReason, existingLabel?: string): string;
+/**
+ * 校验互斥并弹出警告。返回 true 表示可以继续标记。
+ */
+export declare function assertNestedTableRegionMutex(table: Wtbl, bounds?: TableCellSelectionBounds | null): boolean;
+/**
+ * 设置子表前的综合校验（嵌套互斥 + 同一行唯一子表）
+ */
+export declare function assertSubTableRegionPlacement(table: Wtbl, bounds?: TableCellSelectionBounds | null): boolean;
+/**
+ * 从起止单元格构造互斥校验所需的 bounds。
+ */
+export declare function buildBoundsFromCellRange(startCell: Wtc, endCell: Wtc): TableCellSelectionBounds | null;

package/dist/domain/table/design/validate-table-selection.d.ts

@@ -18,6 +18,14 @@ export type ValidateTableSelectionOptions = {
     /** 与这些类型区域重叠时不视为非法 */
     ignoreOverlapTypes?: string[];
 };
+/**
+ * 同一行并排多个子表（列不重叠）时，布局展开只保留后设 region，需提前拦截。
+ * 若选区与已有 region 重叠，交由 findCrossRegion 处理，此处返回 undefined。
+ */
+export declare function findSameRowSubTableConflict(table: Wtbl, bounds: TableCellSelectionBounds): TableRegion | undefined;
+export declare function getSameRowSubTableConflictMessage(existing?: TableRegion): string;
+/** 校验通过返回 true；冲突时弹出提示并返回 false */
+export declare function assertSameRowSubTableAllowed(table: Wtbl, bounds: TableCellSelectionBounds): boolean;
 /** 解析已有逻辑区域的展示名称 */
 export declare function resolveTableRegionLabel(region: TableRegion): string;
 /** 从当前光标选区解析表格单元格范围 */

package/dist/domain/table/index.d.ts

@@ -14,3 +14,4 @@ export * from './design/hooks/on-subtable-create';
 export * from './design/hooks/on-field-attach';
 export * from './design/hooks/on-repeating-default-props';
 export * from './design/validate-table-selection';
+export * from './design/validate-nested-table-region';