@gct-paas/word 0.1.32 → 0.1.34

package/dist/base/input/src/input.vue.d.ts

@@ -44,7 +44,6 @@ declare const __VLS_component: import('vue').DefineComponent<GctInputProps, {
     name: string;
     type: import('./types').InputType;
     id: string;
-    rows: number;
     readonly: boolean;
     disabled: boolean;
     size: import('./types').InputSize;
@@ -60,6 +59,7 @@ declare const __VLS_component: import('vue').DefineComponent<GctInputProps, {
     maxLength: number;
     autofocus: boolean;
     autocomplete: string;
+    rows: number;
     bordered: boolean;
     showSearchButton: boolean;
     spellcheck: boolean;

package/dist/base/input/src/text-area.vue.d.ts

@@ -40,7 +40,6 @@ declare const __VLS_component: import('vue').DefineComponent<GctInputProps, {
     onPressEnter?: ((event: KeyboardEvent) => any) | undefined;
 }>, {
     name: string;
-    rows: number;
     readonly: boolean;
     disabled: boolean;
     placeholder: string;
@@ -50,6 +49,7 @@ declare const __VLS_component: import('vue').DefineComponent<GctInputProps, {
     maxLength: number;
     autofocus: boolean;
     autocomplete: string;
+    rows: number;
     bordered: boolean;
     spellcheck: boolean;
     customStyle: Record<string, string | number>;

package/dist/base/table/src/table.vue.d.ts

@@ -31,10 +31,10 @@ declare const __VLS_component: import('vue').DefineComponent<TableProps, {}, {},
     onSelect?: ((keys: string[]) => any) | undefined;
     "onRow-click"?: ((row: TableRow) => any) | undefined;
 }>, {
-    columns: TableColumn[];
     size: "small" | "middle" | "large";
     multiple: boolean;
     loading: boolean;
+    columns: TableColumn[];
     stripe: boolean;
     selectable: boolean;
     selectedKeys: string[];

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

@@ -2,6 +2,7 @@ import { CommandBase, PostCommandContext } from '../base/CommandBase';
 import { Doc } from '../../view/Doc';
 import { CommandPayloadMap } from '../types';
 import { Wp } from '../../model/document';
+import { WidgetMeta } from '../../widget/widget-meta';
 type InsertFieldCommandOptions = CommandPayloadMap['insertField'];
 export declare class InsertField extends CommandBase<'insertField'> {
     constructor(doc: Doc, payload: InsertFieldCommandOptions);
@@ -15,7 +16,6 @@ export declare class InsertField extends CommandBase<'insertField'> {
      */
     private handleSelectionText;
     protected isRootField(valuePath?: string): boolean;
-    protected isNestedTableField(valuePath?: string): boolean;
     /**
      * 判断两个 valuePath 是否连续（父子关系）
      * @param parentPath 父路径，如 "$.a[n]"
@@ -44,6 +44,26 @@ export declare class InsertField extends CommandBase<'insertField'> {
      * isFieldPathCompatible("$.a[n].b", "$.a[n].b[n].c") // false - 去掉开头 [n] 后 .c 实际上应该检查原逻辑
      */
     protected isFieldPathCompatible(parentPath: string, childPath: string): boolean;
-    protected validateFieldPath(valuePath: string | undefined, node: Wp): boolean;
+    private getLayoutTableCellFromCursor;
+    private getModelCellFromCursor;
+    /** 二维表/检验表：用当前单元格 subRenderer 分区 valuePath 作为父路径 */
+    private getSubTableZoneParentPath;
+    private resolveInsertFieldPayload;
+    /**
+     * 根据拖拽时 palette 传入的 subFieldKey 判断字段属于关联侧还是二维表/检验表主体侧。
+     * - 仅 linkFieldKey：动态关联 palette（f_ewblink）
+     * - 仅 subFieldKey：横向区 palette（f_ewb）
+     * - sub:link：交叉区 palette 拖入的主体字段（f_ewb:f_ewblink）
+     */
+    private getDraggedFieldSide;
+    private validateLinkSubTableFieldPath;
+    /** 数据关联区向上/下扩充、超出子表主体行范围的模板行 */
+    private isDataGroup2DExpansionCell;
+    private getLinkSubTableRegionFromLayout;
+    /**
+     * 校验字段是否可插入当前位置
+     * @returns 校验通过返回 null，失败返回提示文案
+     */
+    protected validateFieldPath(valuePath: string | undefined, node: Wp, widgetMeta?: WidgetMeta): string | null;
 }
 export {};

package/dist/core/data/DataManager.d.ts

@@ -47,22 +47,38 @@ export declare class DataManager {
      * @returns 指定路径的标签值或原值，不存在返回 undefined
      */
     getLabel<T = any>(path: JsonPath): T | undefined;
+    private assignField;
     /**
      * 根据 jsonpath 设置数据
      * @param path jsonpath 路径
      * @param value 要设置的值
-     * @param x
-     * @param y
      * @returns 是否设置成功
      */
-    set2D(path: JsonPath, value: any, x: number, y: number, source?: 'user' | 'dependency'): boolean;
+    set(path: JsonPath, value: any, source?: 'user' | 'dependency'): boolean;
     /**
-     * 根据 jsonpath 设置数据
-     * @param path jsonpath 路径
-     * @param value 要设置的值
-     * @returns 是否设置成功
+     * 从带数字下标的 path 推断二维坐标（供 setMultiple / patch / 业务回填等无 modelRef 的场景）
+     * - 单轴：$.f_ewb[0].f_name → y=0；$.f_ewblink[1].x → x=1（需能从 rawData 的交叉 key 识别轴，或命中 link 命名启发）
+     * - 交叉：$.f_ewb:f_ewblink[0][1].f_value → y=0,x=1
+     * 不会处理 [n] 通配符；普通子表（如 $.b[0].c）不推断，避免破坏原有语义。
      */
-    set(path: JsonPath, value: any, source?: 'user' | 'dependency'): boolean;
+    private infer2DPathAndCoords;
+    /**
+     * rawData 尚无交叉 key 时，用命名约定推测轴（避免误判普通子表 $.b[0]）
+     * 须先于「f_ewb 主体」判断：f_ewblink 也以 f_ewb 开头。
+     */
+    private guessLinkSubTableAxis;
+    private parse2DPath;
+    private getCrossKeys;
+    private resolveAxisByTableKey;
+    private ensureAxisRowAndUid;
+    private getFieldFromRow;
+    /**
+     * 按 y/x 坐标读取二维表数据（与 set2DByCoords 对称）
+     * 交叉区在 rawData 中按 __gw_y_uid / __gw_x_uid 稀疏存储，不能直接用 [y][x] 下标 getByPath。
+     */
+    private get2DByCoords;
+    private set2DByCoords;
+    private cleanupCrossByAxisUid;
     /**
      * 将一个部分值对象合进整体
      */
@@ -137,6 +153,19 @@ export declare class DataManager {
      * 这样可以保证：参数映射（`[n]`）先铺好默认值，自定义数据源（真实下标）再精确覆盖。
      */
     applyInitData(initDataMap: Record<string, any>): void;
+    private applyInitDataCrossWildcard;
+    /**
+     * 解析子表初始化行数：接口已有行数、版面数据分组槽位。
+     * layoutRows 为 0（如二维表纵向 f_ewb）时不按分组扩行，仅保证至少 1 行可绑定。
+     */
+    private resolveInitRowCount;
+    /**
+     * 将子表数组补齐到指定行数。
+     * @param asPlaceholder true：push/insert 用的系统占位行（带 __gw_default）；false：applyInitData 物化行（空对象）
+     */
+    private ensureSubTableRowCount;
+    /** 行已写入业务数据后去掉占位标记，避免提交/对比时被当成空行 */
+    private clearPlaceholderFlag;
     private applyInitDataWildcard;
     /**
      * 内部方法：根据路径获取值
@@ -203,10 +232,9 @@ export declare class DataManager {
      */
     getDefault<T = any>(path: JsonPath): T | undefined;
     /**
-     * 将路径中的具体数组索引转换为通配符
-     * 例如: "items[0].name" -> "items[n].name"
-     * @param path 原始路径
-     * @returns 转换后的路径
+     * 将路径中的具体数组索引转换为默认值通配符
+     * - 普通子表: items[0].name -> items[n].name
+     * - 二维交叉区: $.f_ewb:f_ewblink[0][1].f_value -> $.f_ewb:f_ewblink[n_y][n_x].f_value
      */
     private convertPathToWildcard;
     private formatRuntimeValue;

package/dist/core/layout/handlers/fields/FieldBaseHandler.d.ts

@@ -6,6 +6,7 @@ import { HandlerContext } from '../../types';
 type ValueType = string | number | undefined | null;
 export declare class FieldBaseHandler {
     static hasValue(value: ValueType): boolean;
+    static getSubTableRunIndex(context: LayoutContext): number | undefined;
     static getId(context: LayoutContext, wr: WrText): string;
     static get2DInfo(context: LayoutContext): {
         xDataIndex: number | undefined;

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

@@ -0,0 +1,27 @@
+import { LinkSubTableRegion } from '../model/logic';
+export type LinkSubTableCellZone = 'cross' | 'horizontal' | 'vertical';
+export type LinkSubTableLayoutType = '2d-table' | 'check-table';
+/** 二维表 / 检验表（LinkSubTable 布局体系） */
+export declare function isLinkSubTableType(type?: string): type is LinkSubTableLayoutType;
+/** 渲染端子表主体范围（交叉区 + 横向区，不含纵向铺砖带） */
+export declare function isLinkSubTableSubScopeZone(cellZone?: string): cellZone is Exclude<LinkSubTableCellZone, 'vertical'>;
+export type LinkSubTableCellIndexMap = Map<string, {
+    dataIndex?: number;
+}>;
+export type ResolveLinkSubTableCellZoneOptions = {
+    /** 数据关联向右铺砖的最右列（由 computeDataIndexMap 结果推算，交叉/纵向共用） */
+    fillEndCol?: number;
+};
+/**
+ * 数据关联区（含向上/下扩充行）向右铺砖的最右列，与固定表 computeDataIndexMap 一致
+ */
+export declare function getDataGroup2DFillEndCol(region: LinkSubTableRegion, cellDataIndexMap: LinkSubTableCellIndexMap): number;
+/**
+ * 按模板坐标判定二维表/检验表单元格分区。
+ * - cross：交叉行 ∩ [关联列, 铺砖最右列]（与固定表相同向右铺砖，非无限延伸）
+ * - vertical：关联行带内、不在交叉行，关联列起向右铺砖至 fillEndCol（与固定表一致）
+ * - horizontal：子表主体内、关联列左侧，或交叉行上铺砖范围之外的列
+ */
+export declare function resolveLinkSubTableCellZone(row: number, col: number, region: LinkSubTableRegion, options?: ResolveLinkSubTableCellZoneOptions): LinkSubTableCellZone | undefined;
+export declare function resolveLinkSubTableValuePath(region: LinkSubTableRegion, cellZone: LinkSubTableCellZone): string;
+export declare function isInLinkSubTableLayoutScope(row: number, col: number, region: LinkSubTableRegion, options?: ResolveLinkSubTableCellZoneOptions): boolean;

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

@@ -1,7 +1,6 @@
 import { Wtbl, Wtc, Wtr } from '../../model/document';
-import { TableExpander, CellFragment, TableRange } from '../../utils/expand';
+import { TableExpander, CellFragment } from '../../utils/expand';
 import { SubRenderer } from '../../view/TableCell';
-import { _2DTableRegion, CheckTableRegion } from '../../model/logic';
 export declare class TableInfoProvider {
     wtbl: Wtbl;
     tableExpander: TableExpander;
@@ -20,7 +19,7 @@ export declare class TableInfoProvider {
     getCellModelRef(cell: any): {
         id: string;
     };
-    getDataGroup2DAreaRange(region: CheckTableRegion | _2DTableRegion): TableRange | undefined;
+    private buildLinkSubTableSubRenderer;
     getCellSubRenderer(cell: CellFragment): SubRenderer | undefined;
     /**
      * 获取当前行是都能分割

package/dist/core/model/DocModel.d.ts

@@ -65,6 +65,15 @@ export declare class DocModel {
         name: string;
         subType: string;
     }[];
+    /**
+     * 根据版面数据分组 / 动态关联铺砖，计算子表字段在 rawData 中应初始化的行数。
+     *
+     * - 固定表：槽位归 subFieldKey（bounded + itemRegion）
+     * - 二维表 / 检验表：动态分组铺砖在关联轴，槽位归 linkFieldKey（如 f_ewblink）；
+     *   纵向 subFieldKey（如 f_ewb）不由 itemRegion 撑行，返回 0
+     * - 其它子表无分组：返回 1
+     */
+    getSubTableLayoutSlotCount(subFieldKey: string): number;
     /** 根据 pageIndex 获取页眉实例 */
     getHeader(pageIndex: number, section: Section): import('./headers/Wheader').Wheader | null;
     /** 根据 pageIndex 获取页脚实例 */

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

@@ -1,36 +1,73 @@
 import { BoundedRegionOptions, CheckTableRegionOptions, RepeatingRegionOptions, TableRegion, TableHeaderRegionOptions, SubTableHeaderRegionOptions, _2DTableRegionOptions, BoundedRegion, CheckTableRegion, RepeatingRegion, TableHeaderRegion, SubTableHeaderRegion, _2DTableRegion } from '../../logic';
 import { Wtbl } from '../Wtbl';
+/** 矩形区域边界（行/列起止索引） */
+type RegionBounds = Pick<TableRegion, 'start' | 'end'>;
 /**
- * 表格区域管理功能类
- * 提供设置重复区域和有界区域的功能
+ * 表格区域管理器
+ *
+ * 负责在 {@link Wtbl} 上注册、查询、删除各类 {@link TableRegion}，
+ * 并同步维护 region 覆盖范围内单元格上的子表 / 表头 / 区域引用标记。
  */
 export declare class WtblRegionManager {
     /**
-     * 根据 region id 查找对应的 region
+     * 按 id 查找 region
      */
     static findRegionById(table: Wtbl, regionId: string): TableRegion | undefined;
-    static findCrossRegion(table: Wtbl, options: Pick<TableRegion, 'start' | 'end'>): TableRegion | undefined;
-    static findCrossRegions(table: Wtbl, options: Pick<TableRegion, 'start' | 'end'>): TableRegion[];
     /**
-     * 根据 region id 删除对应的 region
+     * 查找与给定矩形范围相交的第一个 region（含边界接触）
+     */
+    static findCrossRegion(table: Wtbl, bounds: RegionBounds): TableRegion | undefined;
+    /**
+     * 查找与给定矩形范围相交的全部 region
+     */
+    static findCrossRegions(table: Wtbl, bounds: RegionBounds): TableRegion[];
+    /**
+     * 按 id 删除 region，并清除其覆盖范围内单元格上的关联标记
      */
     static deleteRegionById(table: Wtbl, regionId: string): void;
     /**
-     * 设置重复区域
+     * 设置重复区域（子表体）
      */
     static setRepeating(table: Wtbl, options: Omit<RepeatingRegionOptions, 'table'>): RepeatingRegion;
     /**
-     * 设置二维表
+     * 设置二维表区域
      */
     static set2DTable(table: Wtbl, options: Omit<_2DTableRegionOptions, 'table'>): _2DTableRegion;
     /**
-     * 设置有界区域
+     * 设置有界区域（子表体）
      */
     static setBounded(table: Wtbl, options: Omit<BoundedRegionOptions, 'table'>): BoundedRegion;
     /**
-     * 设置检验表
+     * 设置检验表区域
      */
     static setCheckTable(table: Wtbl, options: Omit<CheckTableRegionOptions, 'table'>): CheckTableRegion;
+    /**
+     * 设置表头区域（主表表头）
+     */
     static setTableHeader(table: Wtbl, options: Omit<TableHeaderRegionOptions, 'table'>): TableHeaderRegion;
+    /**
+     * 设置子表表头区域
+     */
     static setSubTableHeader(table: Wtbl, options: Omit<SubTableHeaderRegionOptions, 'table'>): SubTableHeaderRegion;
+    /**
+     * 判断两个矩形区域是否相交（含边界恰好相贴的情况）
+     */
+    private static regionsIntersect;
+    /**
+     * 遍历 region 覆盖范围内的所有单元格
+     */
+    private static forEachCellInRegion;
+    /**
+     * 将 region 加入 table.regions，并同步标记覆盖范围内的单元格
+     */
+    private static registerRegion;
+    /**
+     * 删除 region 时，按类型清除单元格上的关联数据
+     *
+     * - 子表类：清除字段 runs + 子表 / 子表项引用
+     * - 表头类：清除字段 runs + 表头引用
+     * - 其他：仅清除对应 region 的引用
+     */
+    private static clearCellRegionMarks;
 }
+export {};

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

@@ -3,7 +3,9 @@ import { Wtr } from './Wtr';
 import { Wp } from './Wp';
 import { ModelGroup, ModelGroupOptions } from '../base';
 import { Wtbl } from './Wtbl';
-export declare const WTC_REF_KEYS: string[];
+import { SubTableBodyType, SubTableItemType, TableHeaderRefType, WtcHeaderRef, WtcSubTableItemRef, WtcSubTableRef } from './wtcRegionRef';
+/** 单元格上需随行列复制同步的引用字段 */
+export declare const WTC_REF_KEYS: readonly ["mergeId", "subTable", "subTableItem", "header"];
 /**
  * w:tc 表格单元格
  */
@@ -17,13 +19,12 @@ export declare class Wtc extends ModelGroup {
     backgroundColor?: string;
     mergeFromId?: string;
     mergeId?: string;
-    repeatingId?: string;
-    _2DTableId?: string;
-    boundedId?: string;
-    boundedItemId?: string;
-    checkTableId?: string;
-    dataGroup2DId?: string;
-    headerId?: string;
+    /** 子表主体（动态表 / 固定表 / 二维表 / 检验表） */
+    subTable?: WtcSubTableRef;
+    /** 子表内数据分组或数据关联 */
+    subTableItem?: WtcSubTableItemRef;
+    /** 表头 / 子表表头 */
+    header?: WtcHeaderRef;
     vMergeType?: 'restart' | 'continue';
     tempMergeId?: string;
     constructor(options: ModelGroupOptions & {
@@ -32,13 +33,9 @@ export declare class Wtc extends ModelGroup {
         rowspan?: number;
         mergeFromId?: string;
         mergeId?: string;
-        repeatingId?: string;
-        _2DTableId?: string;
-        boundedId?: string;
-        boundedItemId?: string;
-        checkTableId?: string;
-        dataGroup2DId?: string;
-        headerId?: string;
+        subTable?: WtcSubTableRef;
+        subTableItem?: WtcSubTableItemRef;
+        header?: WtcHeaderRef;
         backgroundColor?: string;
         vMergeType?: 'restart' | 'continue';
         tempMergeId?: string;
@@ -79,6 +76,14 @@ export declare class Wtc extends ModelGroup {
          */
         isRoot: boolean;
     };
+    setSubTable(type: SubTableBodyType, regionId: string): void;
+    clearSubTable(): void;
+    setSubTableItem(type: SubTableItemType, regionId: string): void;
+    clearSubTableItem(): void;
+    setHeaderRef(type: TableHeaderRefType, regionId: string): void;
+    clearHeaderRef(): void;
+    /** 按 regionId 清除单元格上的子表 / 表头引用 */
+    clearRegionRef(regionId: string): void;
     /**
      * 查找当前单元格对应的区域
      * @returns

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

@@ -0,0 +1,20 @@
+/** 子表主体类型（repeating 在 layout 层映射为 dynamic-table） */
+export type SubTableBodyType = 'repeating' | 'bounded' | '2d-table' | 'check-table';
+/** 子表内数据分组 / 数据关联 */
+export type SubTableItemType = 'bounded-item' | 'data-group-2d';
+export type TableHeaderRefType = 'table-header' | 'sub-table-header';
+export type WtcSubTableRef = {
+    type: SubTableBodyType;
+    regionId: string;
+};
+export type WtcSubTableItemRef = {
+    type: SubTableItemType;
+    regionId: string;
+};
+export type WtcHeaderRef = {
+    type: TableHeaderRefType;
+    regionId: string;
+};
+export type LayoutSubTableType = 'dynamic-table' | 'fixed-table' | '2d-table' | 'check-table' | 'table-header';
+export declare function bodyTypeToLayoutType(type: SubTableBodyType): LayoutSubTableType;
+export declare function headerTypeToLayoutType(type: TableHeaderRefType): 'table-header';

package/dist/core/model/logic/{Region.d.ts → base/Region.d.ts}

@@ -1,5 +1,5 @@
-import { Wtbl } from '../document';
-import { RegionJson } from '../types';
+import { Wtbl } from '../../document';
+import { RegionJson } from '../../types';
 export type CellPos = {
     row: number;
     col: number;
@@ -25,9 +25,6 @@ export declare abstract class Region {
     constructor(options: RegionOptions);
     /**
      * 检查指定的行列位置是否在当前区域内
-     * @param row 行号
-     * @param col 列号
-     * @returns 是否在区域内
      */
     contains(row: number, col: number): boolean;
     toJSON(): RegionJson;

package/dist/core/model/logic/{SubTableHeaderRegion.d.ts → header/SubTableHeaderRegion.d.ts}

@@ -1,6 +1,6 @@
-import { Wtbl } from '../document';
-import { Region, RegionOptions } from './Region';
-import { RegionJson } from '../types';
+import { Wtbl } from '../../document';
+import { Region, RegionOptions } from '../base/Region';
+import { RegionJson } from '../../types';
 export type SubTableHeaderRegionOptions = RegionOptions & {
     name: string;
     subTableId: string;
@@ -14,9 +14,6 @@ export declare class SubTableHeaderRegion extends Region {
     name: string;
     subTableId: SubTableHeaderRegionOptions['subTableId'];
     constructor(options: SubTableHeaderRegionOptions);
-    /**
-     * 序列化为 JSON 对象
-     */
     toJSON(): SubTableRegionJson;
     static fromJSON(json: SubTableRegionJson, table: Wtbl): SubTableHeaderRegion;
 }

package/dist/core/model/logic/{TableHeaderRegion.d.ts → header/TableHeaderRegion.d.ts}

@@ -1,6 +1,6 @@
-import { Wtbl } from '../document';
-import { Region, RegionOptions } from './Region';
-import { RegionJson } from '../types';
+import { Wtbl } from '../../document';
+import { Region, RegionOptions } from '../base/Region';
+import { RegionJson } from '../../types';
 export type TableHeaderRegionOptions = RegionOptions & {
     name: string;
 };

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

@@ -1,22 +1,18 @@
-import { RepeatingRegion } from './RepeatingRegion';
-import { BoundedRegion } from './BoundedRegion';
-import { CheckTableRegion } from './CheckTableRegion';
-import { TableHeaderRegion } from './TableHeaderRegion';
-import { SubTableHeaderRegion } from './SubTableHeaderRegion';
-import { _2DTableRegion } from './_2DTableRegion';
-export { Region } from './Region';
-export { RepeatingRegion } from './RepeatingRegion';
-export { _2DTableRegion } from './_2DTableRegion';
-export { BoundedRegion } from './BoundedRegion';
-export { CheckTableRegion } from './CheckTableRegion';
-export { TableHeaderRegion } from './TableHeaderRegion';
-export { SubTableHeaderRegion } from './SubTableHeaderRegion';
-export type { RegionOptions, CellPos } from './Region';
-export type { RepeatingRegionOptions } from './RepeatingRegion';
-export type { _2DTableRegionOptions } from './_2DTableRegion';
-export type { BoundedRegionOptions } from './BoundedRegion';
-export type { CheckTableRegionOptions } from './CheckTableRegion';
-export type { TableHeaderRegionOptions } from './TableHeaderRegion';
-export type { SubTableHeaderRegionOptions } from './SubTableHeaderRegion';
-export type TableRegion = RepeatingRegion | _2DTableRegion | BoundedRegion | CheckTableRegion | TableHeaderRegion | SubTableHeaderRegion;
-export type SubTableRegion = RepeatingRegion | BoundedRegion;
+export { Region } from './base/Region';
+export type { RegionOptions, CellPos } from './base/Region';
+export { TableHeaderRegion } from './header/TableHeaderRegion';
+export { SubTableHeaderRegion } from './header/SubTableHeaderRegion';
+export type { TableHeaderRegionOptions } from './header/TableHeaderRegion';
+export type { SubTableHeaderRegionOptions } from './header/SubTableHeaderRegion';
+export { RepeatingRegion } from './subtable/repeating/RepeatingRegion';
+export type { RepeatingRegionOptions, RepeatingWidgetMeta } from './subtable/repeating/RepeatingRegion';
+export { BoundedRegion } from './subtable/bounded/BoundedRegion';
+export { BoundedItemRegion } from './subtable/bounded/BoundedItemRegion';
+export type { BoundedRegionOptions, BoundedWidgetMeta } from './subtable/bounded/BoundedRegion';
+export { LinkSubTableRegion } from './subtable/link/LinkSubTableRegion';
+export { DataGroup2DRegion } from './subtable/link/DataGroup2DRegion';
+export { _2DTableRegion } from './subtable/link/_2DTableRegion';
+export { CheckTableRegion } from './subtable/link/CheckTableRegion';
+export type { _2DTableRegionOptions, _2DTableWidgetMeta } from './subtable/link/_2DTableRegion';
+export type { CheckTableRegionOptions, CheckTableWidgetMeta } from './subtable/link/CheckTableRegion';
+export type { TableRegion, SubTableRegion } from './types';

package/dist/core/model/logic/{BoundedItemRegion.d.ts → subtable/bounded/BoundedItemRegion.d.ts}

@@ -1,4 +1,4 @@
-import { Region, RegionOptions } from './Region';
+import { Region, RegionOptions } from '../../base/Region';
 import { BoundedRegion } from './BoundedRegion';
 export type BoundedItemRegionOptions = RegionOptions & {
     parent?: BoundedRegion;
@@ -7,5 +7,9 @@ export declare class BoundedItemRegion extends Region {
     type: "boundedItem";
     parent?: BoundedRegion;
     constructor(options: BoundedItemRegionOptions);
+    get subFieldKey(): string;
+    get linkFieldKey(): string;
+    get subValuePath(): string;
+    get linkValuePath(): string;
     remove(): void;
 }

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

@@ -1,6 +1,6 @@
-import { Wtbl } from '../document';
-import { Region, RegionOptions } from './Region';
-import { RegionJson } from '../types';
+import { Wtbl } from '../../../document';
+import { Region, RegionOptions } from '../../base/Region';
+import { RegionJson } from '../../../types';
 import { BoundedItemRegion, BoundedItemRegionOptions } from './BoundedItemRegion';
 export type BoundedWidgetPropsMeta = {
     /** 引用填充（撑满固定表）*/
@@ -35,13 +35,11 @@ export declare class BoundedRegion extends Region {
     widgetMeta: BoundedWidgetMeta;
     itemRegion?: BoundedItemRegion;
     constructor(options: BoundedRegionOptions);
-    /**
-     * 序列化为 JSON 对象
-     */
+    get subFieldKey(): string;
+    get linkFieldKey(): string;
+    get subValuePath(): string;
+    get linkValuePath(): string;
     toJSON(): BoundedRegionJson;
-    /**
-     * 从 JSON 对象还原
-     */
     static fromJSON(json: BoundedRegionJson, table: Wtbl): BoundedRegion;
     setItemRegion(options: Omit<BoundedItemRegionOptions, 'table'>): BoundedItemRegion;
     removeItemRegion(): void;

package/dist/core/model/logic/subtable/link/CheckTableRegion.d.ts

@@ -0,0 +1,11 @@
+import { Wtbl } from '../../../document';
+import { LinkSubTableRegion, LinkSubTableRegionJson, LinkSubTableRegionOptions, LinkSubTableWidgetMeta } from './LinkSubTableRegion';
+export type CheckTableWidgetPropsMeta = LinkSubTableWidgetMeta['props'];
+export type CheckTableWidgetMeta = LinkSubTableWidgetMeta;
+export type CheckTableRegionOptions = LinkSubTableRegionOptions;
+export type CheckTableRegionJson = LinkSubTableRegionJson;
+export declare class CheckTableRegion extends LinkSubTableRegion {
+    type: "check-table";
+    toJSON(): CheckTableRegionJson;
+    static fromJSON(json: CheckTableRegionJson, table: Wtbl): CheckTableRegion;
+}

package/dist/core/model/logic/subtable/link/DataGroup2DRegion.d.ts

@@ -0,0 +1,15 @@
+import { Region, RegionOptions } from '../../base/Region';
+import { LinkSubTableRegion } from './LinkSubTableRegion';
+export type DataGroup2DRegionOptions = RegionOptions & {
+    parent?: LinkSubTableRegion;
+};
+export declare class DataGroup2DRegion extends Region {
+    type: "dataGroup2D";
+    parent?: LinkSubTableRegion;
+    constructor(options: DataGroup2DRegionOptions);
+    get subFieldKey(): string;
+    get linkFieldKey(): string;
+    get subValuePath(): string;
+    get linkValuePath(): string;
+    remove(): void;
+}

package/dist/core/model/logic/subtable/link/LinkSubTableRegion.d.ts

@@ -0,0 +1,48 @@
+import { Wtbl } from '../../../document';
+import { Region, RegionOptions } from '../../base/Region';
+import { RegionJson } from '../../../types';
+import { DataGroup2DRegion, DataGroup2DRegionOptions } from './DataGroup2DRegion';
+export type LinkSubTableWidgetPropsMeta = {
+    /** 引用填充（撑满固定表）*/
+    autoFill: boolean;
+    /** 关联主键 */
+    refColField: string | undefined;
+    /** 动态表关联关系建立 */
+    refRowField: string | undefined;
+    [key: string]: any;
+};
+export type LinkSubTableWidgetMeta = {
+    props: LinkSubTableWidgetPropsMeta;
+};
+export type LinkSubTableRegionOptions = RegionOptions & {
+    name: string;
+    valuePath: string;
+    widgetMeta: LinkSubTableWidgetMeta;
+    itemRegion?: DataGroup2DRegion;
+};
+export type LinkSubTableRegionJson = RegionJson & {
+    name: string;
+    valuePath: string;
+    widgetMeta: LinkSubTableWidgetMeta;
+    itemRegion?: any;
+};
+/**
+ * 带「主字段:关联字段」valuePath 的子表基类（二维表、检验表共用）
+ */
+export declare abstract class LinkSubTableRegion extends Region {
+    name: string;
+    valuePath: string;
+    widgetMeta: LinkSubTableWidgetMeta;
+    itemRegion?: DataGroup2DRegion;
+    constructor(options: LinkSubTableRegionOptions);
+    get subFieldKey(): string;
+    get linkFieldKey(): string;
+    get subValuePath(): string;
+    get linkValuePath(): string;
+    protected toLinkSubTableJSON(): LinkSubTableRegionJson;
+    protected static restoreItemRegion(region: LinkSubTableRegion, json: LinkSubTableRegionJson, table: Wtbl): void;
+    /** 从 JSON 还原关联子表（二维表 / 检验表子类共用） */
+    protected static fromLinkSubTableJSON<T extends LinkSubTableRegion>(Ctor: new (options: LinkSubTableRegionOptions) => T, json: LinkSubTableRegionJson, table: Wtbl): T;
+    setItemRegion(options: Omit<DataGroup2DRegionOptions, 'table'>): DataGroup2DRegion;
+    removeItemRegion(): void;
+}

package/dist/core/model/logic/subtable/link/_2DTableRegion.d.ts

@@ -0,0 +1,11 @@
+import { Wtbl } from '../../../document';
+import { LinkSubTableRegion, LinkSubTableRegionJson, LinkSubTableRegionOptions, LinkSubTableWidgetMeta } from './LinkSubTableRegion';
+export type _2DTableWidgetPropsMeta = LinkSubTableWidgetMeta['props'];
+export type _2DTableWidgetMeta = LinkSubTableWidgetMeta;
+export type _2DTableRegionOptions = LinkSubTableRegionOptions;
+export type _2DTableRegionJson = LinkSubTableRegionJson;
+export declare class _2DTableRegion extends LinkSubTableRegion {
+    type: "2d-table";
+    toJSON(): _2DTableRegionJson;
+    static fromJSON(json: _2DTableRegionJson, table: Wtbl): _2DTableRegion;
+}