@gct-paas/word 0.1.31 → 0.1.33

package/dist/core/model/logic/{RepeatingRegion.d.ts → subtable/repeating/RepeatingRegion.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 RepeatingWidgetPropsMeta = {
     /** 快速填报 */
     quickFill: boolean;
@@ -25,12 +25,6 @@ export declare class RepeatingRegion extends Region {
     valuePath: string;
     widgetMeta: RepeatingWidgetMeta;
     constructor(options: RepeatingRegionOptions);
-    /**
-     * 序列化为 JSON 对象
-     */
     toJSON(): RepeatingRegionJson;
-    /**
-     * 从 JSON 对象还原
-     */
     static fromJSON(json: RepeatingRegionJson, table: Wtbl): RepeatingRegion;
 }

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

@@ -0,0 +1,11 @@
+import { Wtbl } from '../../../document';
+import { CellPos, Region } from '../../base/Region';
+type RegionBounds = {
+    start: CellPos;
+    end: CellPos;
+};
+/** 在矩形范围内为单元格打上子表项标记 */
+export declare function markSubTableItemCells(table: Wtbl, bounds: RegionBounds, itemType: string, regionId: string): void;
+/** 清除子表项区域覆盖单元格上的字段与子表项标记 */
+export declare function clearSubTableItemCells(table: Wtbl, itemRegion: Region): void;
+export {};

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

@@ -0,0 +1,10 @@
+import { RepeatingRegion } from './subtable/repeating/RepeatingRegion';
+import { BoundedRegion } from './subtable/bounded/BoundedRegion';
+import { CheckTableRegion } from './subtable/link/CheckTableRegion';
+import { TableHeaderRegion } from './header/TableHeaderRegion';
+import { SubTableHeaderRegion } from './header/SubTableHeaderRegion';
+import { _2DTableRegion } from './subtable/link/_2DTableRegion';
+/** 表格上可注册的全部逻辑区域 */
+export type TableRegion = RepeatingRegion | _2DTableRegion | BoundedRegion | CheckTableRegion | TableHeaderRegion | SubTableHeaderRegion;
+/** 可作为子表体的区域类型 */
+export type SubTableRegion = RepeatingRegion | BoundedRegion;

package/dist/core/utils/expand.d.ts

@@ -1,7 +1,9 @@
 import { DataManager } from '../data/DataManager';
 import { Wtr, Wtbl, Wtc } from '../model/document';
 import { RepeatingRegion, BoundedRegion, TableHeaderRegion, SubTableHeaderRegion, CheckTableRegion, _2DTableRegion } from '../model/logic';
+import { LinkSubTableCellZone } from '../layout/linkSubTableLayout';
 import { Doc } from '../view/Doc';
+/** 表格矩形范围（含起止行列，均为闭区间） */
 export type TableRange = {
     start: {
         row: number;
@@ -12,13 +14,16 @@ export type TableRange = {
         col: number;
     };
 };
+/** 展开后的单元格片段，供布局与数据绑定使用 */
 export type CellFragment = {
     id: string;
     expandFromId: string;
     rowspan: number;
     colspan: number;
     dataIndex?: number;
+    /** 二维表横向数据索引（数据关联区） */
     xDataIndex?: number;
+    /** 二维表纵向数据索引 */
     yDataIndex?: number;
     repeatingId?: string;
     _2DTableId?: string;
@@ -26,6 +31,8 @@ export type CellFragment = {
     checkTableId?: string;
     mergeFromId?: string;
     headerId?: string;
+    /** 数据关联子表单元格分区：交叉 / 横向 / 纵向 */
+    cellZone?: LinkSubTableCellZone;
 };
 type RowFragment = {
     id: string;
@@ -33,28 +40,36 @@ type RowFragment = {
     cells: CellFragment[];
 };
 type ModelNode = Wtr | Wtc;
+/** 模板坐标 "row,col" → 数据项索引及引用单元格 */
 type IndexMap = Map<string, {
     dataIndex: number;
     refPos?: string;
     refCellId?: string;
 }>;
+type SubTableRegion = RepeatingRegion | BoundedRegion | CheckTableRegion | _2DTableRegion;
 export declare class TableExpander {
     table: Wtbl;
     doc: Doc;
     data: DataManager;
+    /** 模板节点 id → Wtr / Wtc */
     modelMapper: Map<string, ModelNode>;
+    /** 展开实例 id → RowFragment / CellFragment */
     instanceMapper: Map<string, RowFragment | CellFragment>;
+    /** 模板行索引 → 各类逻辑区域（用于按行分发展开策略） */
     rowIndexRepeatingMapper: Map<number, RepeatingRegion>;
     rowIndex2DTableMapper: Map<number, _2DTableRegion>;
     rowIndexBoundedMapper: Map<number, BoundedRegion>;
     rowIndexCheckTableMapper: Map<number, CheckTableRegion>;
     rowIndexTableHeaderMapper: Map<number, TableHeaderRegion | SubTableHeaderRegion>;
     rowIdTableHeaderMapper: Map<string, TableHeaderRegion | SubTableHeaderRegion>;
-    rowIdSubTableMapper: Map<string, RepeatingRegion | BoundedRegion | CheckTableRegion | _2DTableRegion>;
+    rowIdSubTableMapper: Map<string, SubTableRegion>;
+    /** 固定表 / 检验表 / 二维表：数据关联铺砖后的单元格数据索引 */
     boundedCellDataIndexMap: IndexMap;
     checkTableCellDataIndexMap: IndexMap;
     _2DTableCellDataIndexMap: IndexMap;
+    /** 展开后的行列表（按文档顺序） */
     rows: RowFragment[];
+    /** 表头区域 id → 该区域包含的模板行 id 列表 */
     regionIdTableHeaderMetaMap: Map<string, {
         rowIds: string[];
     }>;
@@ -62,38 +77,54 @@ export declare class TableExpander {
     getModelById<T extends ModelNode = Wtc>(id: string): T | undefined;
     initialize(): void;
     private initializeModelMapper;
-    private initializeRepeatingMapper;
-    private initialize2DTableMapper;
-    private initializeBoundedMapper;
-    private initializeCheckTableMapper;
+    /** 建立模板行索引 / 行 id 与各类子表、表头区域的映射 */
+    private initializeRegionMappers;
+    private registerRowsForRegions;
     private initializeTableHeaderMapper;
     private initializeBoundedItemDataIndex;
+    /**
+     * 检验表 / 二维表的数据关联区：itemRegion 可能超出子表行范围（向上/下扩充），
+     * 展开铺砖时需用扩充后的行范围。
+     */
     private getDataGroup2DItemRange;
     private initializeDataGroup2DDataIndex;
+    private initLinkSubTableCellIndexMaps;
+    private mergeIndexMap;
     private initializeRows;
+    /** 编辑模式只展开一份；预览/填报模式按数据路径长度重复 */
     getRepeatCount(region: RepeatingRegion | _2DTableRegion): number;
     private initializeRepeatingRowsInRange;
     private initialize2DTableRowsInRange;
+    /**
+     * 循环子表与二维子表共用的纵向展开逻辑：
+     * 按数据条数复制行块，区域外最后一行单元格需合并 rowspan 以覆盖重复产生的额外行。
+     */
+    private initializeRepeatableSubTableRows;
+    /**
+     * 循环区域外、首条数据最后一行：将 rowspan 拉长以吞并后续重复行，
+     * 避免区域外单元格被拆成多行。
+     */
+    private tryCreateExtendedRowspanCell;
     private initializeBoundedRowInRange;
     private initializeCheckTableRowInRange;
     private initializeTableHeaderRowInRange;
     private initializeNormalRowInRange;
+    private buildSingleTemplateRow;
+    private createTemplateCell;
+    private pushRow;
+    private getLinkSubTableCellIndexMap;
+    private getFillEndColForRegion;
+    private findLinkSubTableRegionForCell;
+    private resolveLinkSubTableCellMeta;
+    /** 根据主单元格的 rowspan/colspan，为被覆盖的从属单元格设置 mergeFromId */
     private transformMergeRelations;
     /**
-     * 计算单元格对应的数据索引（用于范围扩展）
-     *
-     * @param range - 整体范围 {start:{row,col} end:{row,col}}，表示需要分配数据项的总区域
-     * @param itemRange - 局部范围 {start:{row,col} end:{row,col}}，表示一个数据项的模板大小
-     * @param fillDirection - `x`：先横向扩展再换行；`y`：先纵向扩展再换列（与 `x` 的行列外层循环互为镜像）
-     * @returns Map，key 为字符串 "row,col"，值为对应的数据索引
-     *
-     * 横向（x）算法：
-     * 1. 局部范围内的单元格数据索引为 0
-     * 2. 从局部范围右侧开始，按 itemWidth 宽度逐个扩展数据项
-     * 3. 当同一行带内无法再放置更多数据项时，换到下一个 itemHeight 行带
-     * 4. 换行后从整体范围的最左侧列开始继续扩展
+     * 计算单元格对应的数据索引（用于范围扩展 / 数据关联铺砖）。
      *
-     * 纵向（y）算法：与 x 对称——先在模板列宽内从模板下方按 itemHeight 向下铺，再换到下一组列（列宽对齐 itemWidth），新一组列从整体范围最顶行重新起铺。
+     * @param range - 需要分配数据项的总区域
+     * @param itemRange - 单个数据项的模板大小（局部范围索引均为 0）
+     * @param fillDirection - `x`：先横向铺砖再换行；`y`：先纵向铺砖再换列
+     * @returns key 为 "row,col"，含 dataIndex 及引用模板单元格 id
      */
     computeDataIndexMap(range: TableRange, itemRange: TableRange, fillDirection?: 'x' | 'y'): IndexMap;
 }

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

@@ -24,7 +24,3 @@ export declare function repeat(count: number, callback: (index: number) => void)
  * distributeInteger(10, 3)   // [3, 3, 4]
  */
 export declare function distributeInteger(total: number, count: number): number[];
-/**
- * 将主工程的数据转换为 Word 的 JSONPath 格式数据
- */
-export declare const mainData2WordData: (data: Record<string, any>) => Record<string, any>;

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

@@ -3,11 +3,8 @@ import { LayoutGroup, LayoutGroupOptions } from './base';
 import { IContainerMetrics, Border } from './types';
 import { Table } from './Table';
 import { TableRow } from './TableRow';
-import { RepeatingWidgetMeta } from '../model/logic/RepeatingRegion';
-import { BoundedWidgetMeta } from '../model/logic/BoundedRegion';
-import { CheckTableWidgetMeta } from '../model/logic/CheckTableRegion';
-import { TableRange } from '../utils/expand';
-import { _2DTableWidgetMeta } from '../model/logic/_2DTableRegion';
+import { RepeatingWidgetMeta, BoundedWidgetMeta, CheckTableWidgetMeta, _2DTableWidgetMeta } from '../model/logic';
+import { LinkSubTableCellZone } from '../layout/linkSubTableLayout';
 export interface TableCellOptions extends LayoutGroupOptions {
     colspan?: number;
     rowspan?: number;
@@ -21,11 +18,12 @@ export type SubRenderer = {
     id: string;
     type: 'dynamic-table' | '2d-table' | 'fixed-table' | 'check-table' | 'table-header';
     dataIndex?: number;
-    xDataIndex?: number;
-    yDataIndex?: number;
     valuePath: string;
     widgetMeta?: RepeatingWidgetMeta | BoundedWidgetMeta | CheckTableWidgetMeta | _2DTableWidgetMeta;
-    dataGroup2DAreaRange?: TableRange;
+    xDataIndex?: number;
+    yDataIndex?: number;
+    /** 用来标记二维表的子类型 交叉 / 横向 / 纵向 */
+    cellZone?: LinkSubTableCellZone;
 };
 export declare class TableCell extends LayoutGroup<Paragraph> implements IContainerMetrics {
     component: "tableCell";

package/dist/core/view/base/LayoutNode.d.ts

@@ -7,7 +7,6 @@ type ModelRef = {
     id: string;
     start?: number;
     end?: number;
-    valuePath2D?: string;
     xDataIndex?: number;
     yDataIndex?: number;
 };

package/dist/domain/active/active-types.d.ts

@@ -27,6 +27,7 @@ export type PanelType =
 type ActiveContext = {
     mainModelKey: string;
     subFieldKey: string | undefined;
+    isDataGroup2DClicked?: boolean;
     regionId: string;
     /** 章节引用 id */
     secRefId: string;