@gct-paas/word 0.1.74 → 0.2.1

package/dist/core/data/enrichers/build-field-enrichers.d.ts

@@ -1,5 +1,5 @@
 import { Doc } from '../../view/Doc';
-import { PostChangePipelineContext, DataEnricherRegistration } from '../types';
+import { DataEnricherRegistration, PostChangePipelineContext } from '../types';
 import { FieldComputedConfig } from '../../../domain/field/field-props-schema-type';
 /**
  * 解析 enricher 用的 widget props

package/dist/core/data/enrichers/lot-parent-label-enricher.d.ts

@@ -0,0 +1,12 @@
+import { Doc } from '../../view/Doc';
+import { DataEnricherRegistration } from '../types';
+export type LotParentLookupBy = 'name' | 'id';
+/** 生产 LOT/SN 字段保存子批次 ID 时，解析其子批次名称。 */
+export declare function resolveProductionContainerChildName(childId: unknown): Promise<string | undefined>;
+type LotParentLabelEnricherOptions = {
+    doc: Doc;
+    valuePath: string;
+    lookupBy?: LotParentLookupBy;
+};
+export declare function createLotParentLabelEnricher(options: LotParentLabelEnricherOptions): DataEnricherRegistration;
+export {};

package/dist/core/data/enrichers/operation-receive-qty-enricher.d.ts

@@ -0,0 +1,19 @@
+import { Doc } from '../..';
+import { DataEnricherRegistration } from '..';
+import { FIELD_TYPE } from '../../../domain/field/field-type';
+export interface OperationReceiveQtyWidgetTarget {
+    valuePath: string;
+}
+type OperationReceiveQtyWidgetInstance = {
+    widgetMeta?: {
+        field?: {
+            fieldType?: FIELD_TYPE;
+        };
+    };
+    valuePath?: string;
+};
+/** 从单个 widget 实例解析工序接收数量 enrich 目标 */
+export declare function tryCollectOperationReceiveQtyTarget(instance: OperationReceiveQtyWidgetInstance): OperationReceiveQtyWidgetTarget | null;
+/** 工序接收数量：getOne query 取 container_id_ / routing_operation_id_，空值时拉取 qty_current_ */
+export declare function createOperationReceiveQtyEnricher(doc: Doc, targets: OperationReceiveQtyWidgetTarget[]): DataEnricherRegistration;
+export {};

package/dist/core/data/paths/field-paths.d.ts

@@ -9,6 +9,8 @@ export declare const HYPERLINK_TEXT_COLOR = "#0563c1";
 export declare function getLabelPath(path: string): string;
 export declare function getHrefPath(path: string): string;
 export declare function getIdPath(path: string): string;
+/** 将路径末段替换为同行另一字段 key（如 `$.t[0].product_id_` + `inventory_id_` → `$.t[0].inventory_id_`） */
+export declare function getSiblingFieldPath(path: string, fieldKey: string): string;
 /**
  * 是否为批次 companion id 路径（以 `__id_` 结尾）。
  * 在于判断用了 endsWith('_id_')：product_id_、warehouse_id_ 也会命中。改成只认以 __id_ 结尾

package/dist/core/data/submit/form-state.d.ts

@@ -26,4 +26,4 @@ export declare function conversionFormState(payload: {
 /** 从模型子表元信息解析二维/检验表交叉区 key；无元信息时回退为 formData 中含 `:` 的 key */
 export declare function resolveSubmitCrossKeys(formData: Record<string, any>, subTableInfoList?: SubTableInfo[]): string[];
 /** 数据转成真实提交数据 */
-export declare function getSubmitFormData(formData: any, subTableInfoList?: SubTableInfo[]): any;
+export declare function getSubmitFormData(formData: any, subTableInfoList?: SubTableInfo[], fieldList?: FieldMeta[]): any;

package/dist/core/data/updates/field-updates.d.ts

@@ -8,11 +8,16 @@ export declare function buildClearUpdates(rowPath: string, fields: readonly stri
 interface BuildFieldSelectUpdatesOptions {
     /** 是否写入 companion id（下拉选中时） */
     persistOptionId?: boolean;
+    /**
+     * 自定义 option id 写入路径（如出库物料的 inventory_id_）。
+     * 有值时优先于此路径；否则在 persistOptionId 时写 getIdPath(valuePath)
+     */
+    optionIdPath?: string;
 }
 /**
  * 构建字段选中/清空更新：
- * - 选中：写 value + 可选 companion id
- * - 清空：仅写 value，companion 由 enricher 负责清空
+ * - 选中：写 value + 可选 companion / 自定义 option id
+ * - 清空：写 value，并清空 companion / 自定义 option id（若启用）
  */
 export declare function buildFieldSelectUpdates(valuePath: string, value: unknown, optionId?: unknown, options?: BuildFieldSelectUpdatesOptions): Record<string, unknown>;
 /** 判断两个字段值是否逻辑相等 */

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/handlers/fields/FieldBaseHandler.d.ts

@@ -8,6 +8,8 @@ import { DataSlotIndex } from '../../../view/types';
 type ValueType = string | number | undefined | null;
 export declare class FieldBaseHandler extends RunHandlerBase {
     static hasValue(value: ValueType): boolean;
+    /** 图片/附件 url 列表：兼容逗号串、字符串数组、以及 {url|path|fileUrl} 对象 */
+    static normalizeUrlSources(raw: unknown): string[];
     /** 将展示文案拆成逐字 run；空串 split 会得到 []，需单独处理 */
     static toLayoutChars(label: unknown): string[];
     static isPrint(ctx: HandlerContext): boolean;

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/WrText.d.ts

@@ -94,6 +94,8 @@ export declare class WrText extends ModelNode {
      * @param fontSize 字号大小（半磅单位）
      */
     setFontSize(fontSize: number): void;
+    /** 记录 Ribbon 选中的字号项，用于同磅值下区分「小六」与「6.5」 */
+    setFontSizeOption(fontSizeOption: string): void;
     /**
      * 在指定字符位置拆分文本节点
      * @param index 拆分位置（在此字符之前分割）

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

@@ -25,7 +25,13 @@ export declare class WtblCalculation {
      */
     private static processBounded;
     /**
-     * 处理 boundedItem 数据
+     * 按 itemRegion.id 查找嵌套的数据分组 / 动态关联区域
+     * （itemRegion 不在 table.regions 顶层，不能用 findRegionById）
+     */
+    private static findItemRegionById;
+    private static applyBoundsToItemRegion;
+    /**
+     * 处理 boundedItem 数据（更新父级 bounded 的 itemRegion 边界）
      */
     private static processBoundedItem;
     /**
@@ -33,7 +39,7 @@ export declare class WtblCalculation {
      */
     private static processCheckTable;
     /**
-     * 处理 dataGroup2D 数据
+     * 处理 dataGroup2D 数据（更新检验表 / 二维表上的 itemRegion 边界）
      */
     private static processDataGroup2D;
 }

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

@@ -4,12 +4,28 @@ import { Wtbl } from '../Wtbl';
  * 提供插入和删除行列的功能
  */
 export declare class WtblRowColumnOps {
+    /** 外表删除前，显式移除受影响单元格中的嵌套表，避免孤儿节点残留 */
+    private static detachNestedTablesFromCells;
+    /** 仅外表需要做「删除行/列/表时联动删除嵌套表」 */
+    private static detachNestedTablesFromOuterTable;
     /**
-     * 新单元格同步引用信息
-     * refCell: 参考单元格 (above | left)
-     * nextRefCell: 后参考单元格 (below | right )，如果传入，需要跟 refCell 比对一致后同步
+     * 新单元格同步引用信息（mergeId / subTable / subTableItem / header）
+     *
+     * 必须两侧参考单元格都存在，且对应字段一致，才写入新格。
+     * 单侧缺失（表边界、子表外侧空行）不同步，避免检验表等 region
+     * 在「上一行/下一行插入」时被错误扩大，进而触发重叠校验误报。
      */
     private static syncRefInfo;
+    /**
+     * 在 insertIndex 处插入一行后，将落在该行及以下的 region / itemRegion 行号整体 +1。
+     * 否则仅靠单元格标记回写时，动态关联 itemRegion 若未能匹配 id，边界会留在原行，
+     * 设计端字段与背景框就不会随检验表下移。
+     */
+    private static shiftRegionsForRowInsert;
+    /**
+     * 在 insertIndex 处插入一列后，将落在该列及右侧的 region / itemRegion 列号整体 +1。
+     */
+    private static shiftRegionsForColInsert;
     /**
      * 在指定行位置插入新行
      */
@@ -55,6 +71,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/document/wtcRegionRef.d.ts

@@ -29,7 +29,7 @@ export declare const SUB_TABLE_REGION_TYPES: readonly ["repeating", "bounded", "
  * 子表 layout 类型
  * Ribbon 面板、子表主题色均使用此类型；主题配置见 @/domain/table 各 Profile.theme
  */
-export type SubTableLayoutType = 'dynamic-table' | 'fixed-table' | '2d-table' | 'check-table' | 'material-consume-table' | 'material-balance-table' | 'warehouse-in-out-table' | 'warehouse-inventory-table' | 'warehouse-allocate-table' | 'pretreatment-list-table' | 'entrust-steril-batch-list-table';
+export type SubTableLayoutType = 'dynamic-table' | 'fixed-table' | '2d-table' | 'check-table' | 'material-consume-table' | 'material-balance-table' | 'material-requisition-table' | 'warehouse-in-table' | 'warehouse-inbound-table' | 'warehouse-out-table' | 'warehouse-outbound-table' | 'warehouse-in-out-table' | 'warehouse-inventory-table' | 'part-stocktake-table' | 'device-part-consume-table' | 'warehouse-allocate-table' | 'pretreatment-list-table' | 'entrust-steril-batch-list-table';
 /** 表头 layout 类型 */
 export type TableHeaderLayoutType = 'table-header';
 /** 所有子表表格 layout 类型 */

package/dist/core/model/logic/subtable/bounded/BoundedRegion.d.ts

@@ -5,6 +5,8 @@ import { BoundedItemRegion, BoundedItemRegionOptions } from './BoundedItemRegion
 export type BoundedWidgetPropsMeta = {
     /** 引用填充（撑满固定表）*/
     autoFill: boolean;
+    /** 快速填报 */
+    quickFill: boolean;
     /**
      * 填充方向
      * @alias x 横向填充

package/dist/core/model/logic/subtable/repeating/RepeatingRegion.d.ts

@@ -13,6 +13,22 @@ export type RepeatingWidgetPropsBase = {
 export type DynamicTableProps = RepeatingWidgetPropsBase & {
     layoutType?: 'dynamic-table';
 };
+export type WarehouseInTableProps = RepeatingWidgetPropsBase & {
+    layoutType: 'warehouse-in-table';
+    /** 条码解析规则 */
+    barcode_parsing_rules_id_?: string;
+};
+export type WarehouseInboundTableProps = RepeatingWidgetPropsBase & {
+    layoutType: 'warehouse-inbound-table';
+};
+export type WarehouseOutTableProps = RepeatingWidgetPropsBase & {
+    layoutType: 'warehouse-out-table';
+    /** 条码解析规则 */
+    barcode_parsing_rules_id_?: string;
+};
+export type WarehouseOutboundTableProps = RepeatingWidgetPropsBase & {
+    layoutType: 'warehouse-outbound-table';
+};
 export type WarehouseInOutTableProps = RepeatingWidgetPropsBase & {
     layoutType: 'warehouse-in-out-table';
 };
@@ -30,17 +46,28 @@ export type WarehouseInventoryTableProps = RepeatingWidgetPropsBase & {
     layoutType: 'warehouse-inventory-table';
     /** 库存自动加载 */
     autoLoadInventory?: boolean;
+    /** 盘点维度 */
+    stocktakeDimension?: 'warehouse_summary' | 'location_detail';
     /** 条码解析规则 */
     barcode_parsing_rules_id_?: string;
 };
+export type PartStocktakeTableProps = RepeatingWidgetPropsBase & {
+    layoutType: 'part-stocktake-table';
+};
+export type DevicePartConsumeTableProps = RepeatingWidgetPropsBase & {
+    layoutType: 'device-part-consume-table';
+};
 export type MaterialBalanceTableProps = RepeatingWidgetPropsBase & {
     layoutType: 'material-balance-table';
 };
+export type MaterialRequisitionTableProps = RepeatingWidgetPropsBase & {
+    layoutType: 'material-requisition-table';
+};
 export type WarehouseAllocateTableProps = RepeatingWidgetPropsBase & {
     layoutType: 'warehouse-allocate-table';
     barcode_parsing_rules_id_?: string;
 };
-export type RepeatingWidgetPropsMeta = DynamicTableProps | WarehouseInOutTableProps | WarehouseInventoryTableProps | WarehouseAllocateTableProps | EntrustSterilBatchListTableProps | PretreatmentListTableProps;
+export type RepeatingWidgetPropsMeta = DynamicTableProps | WarehouseInTableProps | WarehouseInboundTableProps | WarehouseOutTableProps | WarehouseOutboundTableProps | WarehouseInOutTableProps | WarehouseInventoryTableProps | PartStocktakeTableProps | DevicePartConsumeTableProps | WarehouseAllocateTableProps | MaterialBalanceTableProps | MaterialRequisitionTableProps | EntrustSterilBatchListTableProps | PretreatmentListTableProps;
 export type RepeatingWidgetMeta = {
     props: RepeatingWidgetPropsMeta;
 };

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/model/types/style.d.ts

@@ -20,6 +20,8 @@ export type TextStyle = {
     };
     sz?: number;
     szCs?: number;
+    /** Ribbon 字号选项 id，区分同磅值的号数/数字项 */
+    fontSizeOption?: string;
     spacing?: number;
     kern?: number;
     rFonts?: {