@gct-paas/word 0.1.33 → 0.1.34

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

@@ -153,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;
     /**
      * 内部方法：根据路径获取值
@@ -219,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/linkSubTableLayout.d.ts

@@ -1,5 +1,10 @@
 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;
 }>;

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/logic/subtable/bounded/BoundedItemRegion.d.ts

@@ -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/subtable/bounded/BoundedRegion.d.ts

@@ -35,6 +35,10 @@ export declare class BoundedRegion extends Region {
     widgetMeta: BoundedWidgetMeta;
     itemRegion?: BoundedItemRegion;
     constructor(options: BoundedRegionOptions);
+    get subFieldKey(): string;
+    get linkFieldKey(): string;
+    get subValuePath(): string;
+    get linkValuePath(): string;
     toJSON(): BoundedRegionJson;
     static fromJSON(json: BoundedRegionJson, table: Wtbl): BoundedRegion;
     setItemRegion(options: Omit<BoundedItemRegionOptions, 'table'>): BoundedItemRegion;

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

@@ -7,5 +7,9 @@ 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/repeating/RepeatingRegion.d.ts

@@ -25,6 +25,10 @@ export declare class RepeatingRegion extends Region {
     valuePath: string;
     widgetMeta: RepeatingWidgetMeta;
     constructor(options: RepeatingRegionOptions);
+    get subFieldKey(): string;
+    get linkFieldKey(): string;
+    get subValuePath(): string;
+    get linkValuePath(): string;
     toJSON(): RepeatingRegionJson;
     static fromJSON(json: RepeatingRegionJson, table: Wtbl): RepeatingRegion;
 }

package/dist/core/model/logic/subtable/shared/dataGroupSlotCount.d.ts

@@ -0,0 +1,18 @@
+/** 表格矩形范围（含起止行列，均为闭区间） */
+export type TableRange = {
+    start: {
+        row: number;
+        col: number;
+    };
+    end: {
+        row: number;
+        col: number;
+    };
+};
+/**
+ * 计算数据分组 / 动态关联在版面中可铺砖的数据槽位数（含模板块 dataIndex 0）。
+ * 逻辑与 TableExpander.computeDataIndexMap 中铺砖循环一致。
+ */
+export declare function countDataGroupSlots(range: TableRange, itemRange: TableRange, fillDirection?: 'x' | 'y'): number;
+/** 检验表 / 二维表动态关联：itemRegion 行范围可能超出子表主体 */
+export declare function expandDataGroupRowRange(parent: TableRange, itemRange: TableRange): TableRange;

package/dist/core/model/logic/subtable/shared/regionValuePath.d.ts

@@ -0,0 +1,8 @@
+export type RegionValuePathKeys = {
+    subFieldKey: string;
+    linkFieldKey: string;
+    subValuePath: string;
+    linkValuePath: string;
+};
+/** 从 region.valuePath 解析子表/关联字段 key（二维表、检验表、固定表、动态表共用） */
+export declare function resolveRegionValuePathKeys(valuePath: string): RegionValuePathKeys;

package/dist/core/view/runs/ImageWidget.d.ts

@@ -11,6 +11,8 @@ export interface IImageWidget extends IImageRun {
     signature?: string;
     pageWidgetMeta?: Record<string, any>;
     dataIndex?: number;
+    xDataIndex?: number;
+    yDataIndex?: number;
 }
 export interface ImageWidgetOptions extends ImageRunOptions {
     /** 值路径 */
@@ -20,6 +22,8 @@ export interface ImageWidgetOptions extends ImageRunOptions {
     signature?: string;
     pageWidgetMeta?: IImageWidget['pageWidgetMeta'];
     dataIndex?: number;
+    xDataIndex?: number;
+    yDataIndex?: number;
 }
 /**
  * 图片运行类
@@ -31,5 +35,7 @@ export declare class ImageWidget extends ImageRun implements IImageWidget {
     signature?: string;
     pageWidgetMeta?: IImageWidget['pageWidgetMeta'];
     dataIndex?: number;
+    xDataIndex?: number;
+    yDataIndex?: number;
     constructor(options: ImageWidgetOptions);
 }

package/dist/core/view/runs/TextWidget.d.ts

@@ -25,6 +25,8 @@ export interface ITextWidget extends ITextRun {
     /** 页面组件元数据 */
     pageWidgetMeta?: WidgetMeta;
     dataIndex?: number;
+    xDataIndex?: number;
+    yDataIndex?: number;
 }
 export interface TextWidgetOptions extends TextRunOptions {
     /** 组件元数据 */
@@ -41,6 +43,8 @@ export interface TextWidgetOptions extends TextRunOptions {
     widgetFieldRightMarker?: boolean;
     pageWidgetMeta: ITextWidget['pageWidgetMeta'];
     dataIndex?: number;
+    xDataIndex?: number;
+    yDataIndex?: number;
 }
 export declare class TextWidget extends TextRun implements ITextWidget {
     widgetMeta?: WidgetMeta;
@@ -54,5 +58,7 @@ export declare class TextWidget extends TextRun implements ITextWidget {
     widgetFileItem?: ITextWidget['widgetFileItem'];
     pageWidgetMeta: ITextWidget['pageWidgetMeta'];
     dataIndex?: number;
+    xDataIndex?: number;
+    yDataIndex?: number;
     constructor(options: TextWidgetOptions);
 }