@gct-paas/word 0.1.38 → 0.1.39

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

@@ -57,6 +57,10 @@ export declare class DataManager {
      * @returns 指定路径的标签值或原值，不存在返回 undefined
      */
     getLabel<T = any>(path: JsonPath): T | undefined;
+    /** 子表数组路径下未软删行数 */
+    countActiveSubtableRows(arrayPath: JsonPath): number;
+    /** 版面可见行下标 → rawData 数组实际下标 */
+    resolveSubtableVisibleIndex(arrayPath: JsonPath, visibleIndex: number): number;
     private assignField;
     /**
      * 根据 jsonpath 设置数据
@@ -170,6 +174,17 @@ export declare class DataManager {
      * 这样可以保证：参数映射（`[n]`）先铺好默认值，自定义数据源（真实下标）再精确覆盖。
      */
     applyInitData(initDataMap: Record<string, any>): void;
+    /**
+     * 仅补齐检验表关联轴子表（如 f_jianyan2）到动态关联铺砖槽位数。
+     * 不处理检验项主体（f_jianyan1）与二维表，避免覆盖接口行或误扩纵向轴。
+     */
+    private syncSubTableRowsToLayout;
+    /** 子表在 rawData 中的行数（支持尚未转成数组的 { data: [] } 接口形态，此时返回 0 且不在此阶段强转） */
+    private countSubTableDataRows;
+    /**
+     * 为检验表关联轴补足铺砖行：占位标记 + __gw_x_uid（与 push/insert 行为一致）。
+     */
+    private ensureCheckTableLinkLayoutRows;
     private applyInitDataCrossWildcard;
     /**
      * 解析子表初始化行数：接口已有行数、版面数据分组槽位。

package/dist/core/data/subtable-row.d.ts

@@ -0,0 +1,17 @@
+/** 子表行软删 / 可见下标与存储下标映射（与后端 deleted_ 约定一致） */
+type AxisType = 'x' | 'y';
+export type PersistedSubtableRowContext = {
+    rawData?: Record<string, any>;
+    /** 子表 key，如 f_ewb、f_ewblink（不含 $.） */
+    tableKey?: string;
+    axis?: AxisType;
+};
+/** 是否应软删（打 deleted_）而非 splice */
+export declare function isPersistedSubtableRow(row: Record<string, any> | undefined | null, ctx?: PersistedSubtableRowContext): boolean;
+/** 未软删的行数；空数组返回 0 */
+export declare function countActiveSubtableRows(rows: unknown): number;
+/** 版面可见行下标 → rawData 数组中的实际下标 */
+export declare function resolveSubtableStorageIndex(rows: any[], visibleIndex: number): number;
+/** 在可见下标处插入时对应的 splice 位置 */
+export declare function resolveSubtableInsertIndex(rows: any[], visibleIndex: number): number;
+export {};

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

@@ -48,6 +48,8 @@ export declare class LayoutContext {
      */
     getParagraphRemainingSize(): number;
     addRun(run: LayoutNode): void;
+    /** 子表可见行下标 → rawData 存储下标（跳过 deleted_ 行） */
+    private mapSubtableVisibleIndex;
     /**
      * 根据 dataIndex 替换 path 中的 [n] 为实际值
      * @param path 包含 [n] 的路径，如 "$.items[n].name"

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

@@ -69,8 +69,8 @@ export declare class DocModel {
      * 根据版面数据分组 / 动态关联铺砖，计算子表字段在 rawData 中应初始化的行数。
      *
      * - 固定表：槽位归 subFieldKey（bounded + itemRegion）
-     * - 二维表 / 检验表：动态分组铺砖在关联轴，槽位归 linkFieldKey（如 f_ewblink）；
-     *   纵向 subFieldKey（如 f_ewb）不由 itemRegion 撑行，返回 0
+     * - 二维表 / 检验表：动态分组铺砖槽位归 linkFieldKey（如 f_jianyan2）；
+     *   纵向 subFieldKey（如 f_jianyan1）由检验项条数撑行，返回 0
      * - 其它子表无分组：返回 1
      */
     getSubTableLayoutSlotCount(subFieldKey: string): number;

package/dist/index.es.js

@@ -40919,6 +40919,22 @@ class LayoutContext {
     this.paragraph?.addChild(run);
     this.layoutRun = run;
   }
+  /** 子表可见行下标 → rawData 存储下标（跳过 deleted_ 行） */
+  mapSubtableVisibleIndex(templatePath, visibleIndex, axis) {
+    if (visibleIndex === void 0) return void 0;
+    const parsed = parseValuePath(templatePath);
+    const dm = this.doc.dataManager;
+    if (axis === "n_y" && parsed.parentFieldPath) {
+      return dm.resolveSubtableVisibleIndex(parsed.parentFieldPath, visibleIndex);
+    }
+    if (axis === "n_x" && parsed.linkFieldPath) {
+      return dm.resolveSubtableVisibleIndex(parsed.linkFieldPath, visibleIndex);
+    }
+    if (parsed.isSubTable && parsed.parentFieldPath) {
+      return dm.resolveSubtableVisibleIndex(parsed.parentFieldPath, visibleIndex);
+    }
+    return visibleIndex;
+  }
   /**
    * 根据 dataIndex 替换 path 中的 [n] 为实际值
    * @param path 包含 [n] 的路径，如 "$.items[n].name"
@@ -40928,7 +40944,11 @@ class LayoutContext {
     if (!path2) return void 0;
     const { type: type4, dataIndex, xDataIndex, yDataIndex, cellZone } = this.cell?.subRenderer || {};
     if (isLinkSubTableType(type4) && cellZone === "cross") {
-      return replacePathIndexPlaceholders({ x: xDataIndex, y: yDataIndex, templatePath: path2 });
+      return replacePathIndexPlaceholders({
+        x: this.mapSubtableVisibleIndex(path2, xDataIndex, "n_x"),
+        y: this.mapSubtableVisibleIndex(path2, yDataIndex, "n_y"),
+        templatePath: path2
+      });
     }
     if (!path2.includes("[n]")) {
       return path2;
@@ -40936,6 +40956,10 @@ class LayoutContext {
     let n = dataIndex;
     if (isLinkSubTableType(type4)) {
       n = cellZone === "horizontal" ? yDataIndex : xDataIndex;
+      const axis = cellZone === "horizontal" ? "n_y" : "n_x";
+      n = this.mapSubtableVisibleIndex(path2, n, axis);
+    } else {
+      n = this.mapSubtableVisibleIndex(path2, n, "n");
     }
     if (n === void 0) return path2;
     return replacePathIndexPlaceholder(n, path2);
@@ -42166,8 +42190,12 @@ function walkOoxmlElementTree(node, visit) {
 function resolveItemCountByRegionId(runtimeJson, infos) {
   const regions = listCheckTableRegionsInRuntimeJson(runtimeJson);
   if (regions.length === 0) return {};
-  const count = infos.data?.length ?? 0;
-  return { [regions[0].regionId]: count };
+  const apiCount = infos.data?.length ?? 0;
+  const itemCountByRegionId = {};
+  for (const region of regions) {
+    itemCountByRegionId[region.regionId] = Math.max(apiCount, 1);
+  }
+  return itemCountByRegionId;
 }
 function mergeCheckTableItemInfosIntoDefaults(defaultsMap, runtimeJson, infos, options) {
   const regions = listCheckTableRegionsInRuntimeJson(runtimeJson);
@@ -42246,14 +42274,14 @@ const basicAttrs = {
   required: [
     {
       from: "required_",
-      to: "newSpecificConfig.newRequired",
+      to: "required",
       transform: (value) => Boolean(value)
-    },
-    {
-      from: "_",
-      to: "newSpecificConfig.newFieldName",
-      transform: () => "值"
     }
+    // {
+    //   from: '_',
+    //   to: 'newSpecificConfig.newFieldName',
+    //   transform: () => '值',
+    // },
   ],
   placeholder: [{ from: "tip_text_", to: "placeholder" }],
   showType: [
@@ -42366,7 +42394,7 @@ const DYN_CONFIG_BY_TYPE = {
       },
       {
         from: "digits_",
-        to: "newSpecificConfig.newPrecision",
+        to: "newSpecificConfig.digits",
         transform: (value) => {
           const n = parseInt(String(value), 10);
           return Number.isNaN(n) ? void 0 : n;
@@ -42384,11 +42412,57 @@ const DYN_CONFIG_BY_TYPE = {
       ...basicAttrs.showType,
       {
         from: "_",
-        to: "newSpecificConfig.newOptions",
-        transform: (_v, _t2, row) => [
-          { label: row.true_text_ || "是", value: true, refFields: [], _item: {} },
-          { label: row.false_text_ || "否", value: false, refFields: [], _item: {} }
-        ]
+        to: "optionsJson",
+        transform: (_v, _t2, row) => {
+          const options = [
+            { label: row.true_text_ || "是", value: true, refFields: [], _item: {} },
+            { label: row.false_text_ || "否", value: false, refFields: [], _item: {} }
+          ];
+          const json = JSON.stringify(options);
+          return json;
+        }
+      },
+      {
+        from: "_",
+        to: "computedOptions",
+        transform: (_v, _t2, row) => {
+          const options = [
+            { label: row.true_text_ || "是", value: true, refFields: [], _item: {} },
+            { label: row.false_text_ || "否", value: false, refFields: [], _item: {} }
+          ];
+          const json = JSON.stringify(options);
+          return json;
+        }
+      },
+      {
+        from: "_",
+        to: "iconLabelSpace",
+        transform: () => 8
+      },
+      {
+        from: "_",
+        to: "labelPosition",
+        transform: () => "after"
+      },
+      {
+        from: "_",
+        to: "direction",
+        transform: () => "landscape"
+      },
+      {
+        from: "_",
+        to: "controlSize",
+        transform: () => 24
+      },
+      {
+        from: "_",
+        to: "controlEnumSpace",
+        transform: () => 16
+      },
+      {
+        from: "_",
+        to: "showMode",
+        transform: () => "both"
       },
       { from: "validate_true_", to: "validateTrue" },
       { from: "validate_false_", to: "validateFalse" }
@@ -42494,12 +42568,6 @@ function buildPropsFromRow(row, config, baseProps = {}) {
     const val = rowDef.transform ? rowDef.transform(raw, config.fieldType, row, baseProps) : raw;
     if (val !== void 0) set(patch, rowDef.to, val);
   }
-  const options = get(patch, "newSpecificConfig.newOptions");
-  if (Array.isArray(options) && options.length > 0) {
-    const json = JSON.stringify(options);
-    patch.computedOptions = json;
-    patch.optionsJson = json;
-  }
   return patch;
 }
 function resolveFwType(fieldType, props) {
@@ -43770,7 +43838,8 @@ class TableExpander {
   /** 编辑模式只展开一份；预览/填报模式按数据路径长度重复 */
   getRepeatCount(region) {
     if (this.doc.mode === DocModeTypeConst.Edit) return 1;
-    return this.data.get(region.subValuePath || region.valuePath)?.length || 1;
+    const path2 = region.subValuePath || region.valuePath;
+    return this.data.countActiveSubtableRows(path2) || 1;
   }
   // ─── 循环子表 / 二维子表（纵向重复）────────────────────────
   initializeRepeatingRowsInRange(region) {
@@ -44020,8 +44089,8 @@ class TableExpander {
     if (this.doc.mode === DocModeTypeConst.Edit) return 1;
     const path2 = region.subValuePath || region.valuePath;
     if (path2) {
-      const data = this.data.get(path2);
-      if (Array.isArray(data) && data.length > 0) return data.length;
+      const activeCount = this.data.countActiveSubtableRows(path2);
+      if (activeCount > 0) return activeCount;
     }
     return Math.max(1, region.end.row - region.start.row + 1);
   }
@@ -46861,6 +46930,61 @@ class PostChangePipeline {
     }
   }
 }
+function hasRowId(row) {
+  const id = row.id_ ?? row.id;
+  return id !== void 0 && id !== null && String(id).trim() !== "";
+}
+function hasPersistedCrossCell(rawData, tableKey, axis, row) {
+  const uid = axis === "y" ? row.__gw_y_uid : row.__gw_x_uid;
+  if (!uid) return false;
+  const uidField = axis === "y" ? "__gw_y_uid" : "__gw_x_uid";
+  for (const crossKey of Object.keys(rawData)) {
+    if (!crossKey.includes(":")) continue;
+    const [yKey, xKey] = crossKey.split(":");
+    const onThisAxis = axis === "y" ? yKey === tableKey : xKey === tableKey;
+    if (!onThisAxis) continue;
+    const crossRows = rawData[crossKey];
+    if (!Array.isArray(crossRows)) continue;
+    if (crossRows.some((cell) => cell?.[uidField] === uid && hasRowId(cell))) {
+      return true;
+    }
+  }
+  return false;
+}
+function isPersistedSubtableRow(row, ctx) {
+  if (!row || typeof row !== "object") return false;
+  if (hasRowId(row)) return true;
+  if (ctx?.rawData && ctx.tableKey && ctx.axis) {
+    return hasPersistedCrossCell(ctx.rawData, ctx.tableKey, ctx.axis, row);
+  }
+  return false;
+}
+function countActiveSubtableRows(rows) {
+  if (!Array.isArray(rows)) return 0;
+  return rows.filter((row) => !row?.deleted_).length;
+}
+function resolveSubtableStorageIndex(rows, visibleIndex) {
+  if (!Array.isArray(rows) || visibleIndex < 0) return visibleIndex;
+  let seen = -1;
+  for (let i = 0; i < rows.length; i++) {
+    if (!rows[i]?.deleted_) {
+      seen++;
+      if (seen === visibleIndex) return i;
+    }
+  }
+  return visibleIndex;
+}
+function resolveSubtableInsertIndex(rows, visibleIndex) {
+  if (!Array.isArray(rows)) return 0;
+  let seen = -1;
+  for (let i = 0; i < rows.length; i++) {
+    if (!rows[i]?.deleted_) {
+      seen++;
+      if (seen === visibleIndex) return i;
+    }
+  }
+  return rows.length;
+}
 const DEFAULT_EMPTY_ITEM = Object.freeze({ __gw_default: true });
 class DataManager {
   doc;
@@ -46947,6 +47071,17 @@ class DataManager {
   getLabel(path2) {
     return this.get(this.getLabelPath(path2)) || this.get(path2);
   }
+  /** 子表数组路径下未软删行数 */
+  countActiveSubtableRows(arrayPath) {
+    const rows = this.getByPath(this.rawData, arrayPath);
+    return countActiveSubtableRows(rows);
+  }
+  /** 版面可见行下标 → rawData 数组实际下标 */
+  resolveSubtableVisibleIndex(arrayPath, visibleIndex) {
+    const rows = this.getByPath(this.rawData, arrayPath);
+    if (!Array.isArray(rows)) return visibleIndex;
+    return resolveSubtableStorageIndex(rows, visibleIndex);
+  }
   assignField(target, fieldPath, value) {
     if (!fieldPath.includes(".") && !fieldPath.includes("[")) {
       target[fieldPath] = value;
@@ -47348,7 +47483,8 @@ class DataManager {
         arr = [{ ...DEFAULT_EMPTY_ITEM }];
         this.set(path2, arr);
       }
-      if (index2 < 0 || index2 > arr.length) {
+      const storageIndex = resolveSubtableInsertIndex(arr, index2);
+      if (storageIndex < 0 || storageIndex > arr.length) {
         throw new Error(`Index ${index2} out of bounds for array of length ${arr.length}`);
       }
       const oldValue = [...arr];
@@ -47357,9 +47493,9 @@ class DataManager {
       const clonedValues = values.map(
         (value) => axisInfo ? this.prepareAxisRowForInsert(arr, axisInfo, value) : this.deepClone(value)
       );
-      arr.splice(index2, 0, ...clonedValues);
+      arr.splice(storageIndex, 0, ...clonedValues);
       if (axisInfo) {
-        for (let i = index2; i < arr.length; i++) {
+        for (let i = storageIndex; i < arr.length; i++) {
           this.ensureAxisRowAndUid(tableKey, i, axisInfo.axis);
         }
       }
@@ -47382,14 +47518,26 @@ class DataManager {
       if (!Array.isArray(arr)) {
         throw new Error(`Path "${path2}" is not an array`);
       }
-      if (index2 < 0 || index2 >= arr.length) {
+      const storageIndex = resolveSubtableStorageIndex(arr, index2);
+      if (storageIndex < 0 || storageIndex >= arr.length) {
         throw new Error(`Index ${index2} out of bounds for array of length ${arr.length}`);
       }
-      const oldValue = [...arr];
-      const removedValue = arr.splice(index2, 1)[0];
-      this.emit(path2, arr, oldValue);
       const tableKey = path2.replace(/^\$\./, "").replace(/\[(n|\d+)\]/g, "");
       const axisInfo = this.resolveAxisByTableKey(tableKey);
+      const row = arr[storageIndex];
+      if (isPersistedSubtableRow(row, {
+        rawData: this.rawData,
+        tableKey,
+        axis: axisInfo?.axis
+      })) {
+        const oldValue2 = this.deepClone(arr);
+        row.deleted_ = true;
+        this.emit(path2, arr, oldValue2);
+        return row;
+      }
+      const oldValue = [...arr];
+      const removedValue = arr.splice(storageIndex, 1)[0];
+      this.emit(path2, arr, oldValue);
       if (axisInfo) {
         const uidField = axisInfo.axis === "y" ? "__gw_y_uid" : "__gw_x_uid";
         this.cleanupCrossByAxisUid(tableKey, axisInfo.axis, removedValue?.[uidField]);
@@ -47470,6 +47618,50 @@ class DataManager {
         }
       }
     }
+    this.syncSubTableRowsToLayout();
+  }
+  /**
+   * 仅补齐检验表关联轴子表（如 f_jianyan2）到动态关联铺砖槽位数。
+   * 不处理检验项主体（f_jianyan1）与二维表，避免覆盖接口行或误扩纵向轴。
+   */
+  syncSubTableRowsToLayout() {
+    const listSubTables = this.doc?.model?.getSubTableInfoList;
+    if (typeof listSubTables !== "function") return;
+    for (const info of listSubTables.call(this.doc.model)) {
+      if (info.subType !== "check-table-2d-link" || !info.field) continue;
+      const linkFieldKey = info.field;
+      const layoutRows = this.doc?.model?.getSubTableLayoutSlotCount(linkFieldKey) ?? 0;
+      if (layoutRows <= 0) continue;
+      const dataRows = this.countSubTableDataRows(linkFieldKey);
+      const targetRows = Math.max(dataRows, layoutRows);
+      if (targetRows <= dataRows) continue;
+      this.ensureCheckTableLinkLayoutRows(linkFieldKey, targetRows);
+    }
+  }
+  /** 子表在 rawData 中的行数（支持尚未转成数组的 { data: [] } 接口形态，此时返回 0 且不在此阶段强转） */
+  countSubTableDataRows(subTableKey) {
+    const existing = this.rawData?.[subTableKey];
+    if (Array.isArray(existing)) return existing.length;
+    if (existing?.data && Array.isArray(existing.data)) return existing.data.length;
+    return 0;
+  }
+  /**
+   * 为检验表关联轴补足铺砖行：占位标记 + __gw_x_uid（与 push/insert 行为一致）。
+   */
+  ensureCheckTableLinkLayoutRows(linkFieldKey, rowCount) {
+    const raw = this.rawData?.[linkFieldKey];
+    if (raw != null && !Array.isArray(raw)) {
+      return;
+    }
+    let arr = raw;
+    if (!Array.isArray(arr)) {
+      arr = [];
+      this.rawData[linkFieldKey] = arr;
+    }
+    for (let i = arr.length; i < rowCount; i++) {
+      arr.push({ ...DEFAULT_EMPTY_ITEM });
+      this.ensureAxisRowAndUid(linkFieldKey, i, "x");
+    }
   }
   applyInitDataCrossWildcard(path2, value) {
     const parse = parseValuePath(path2);
@@ -47512,8 +47704,7 @@ class DataManager {
    * layoutRows 为 0（如二维表纵向 f_ewb）时不按分组扩行，仅保证至少 1 行可绑定。
    */
   resolveInitRowCount(subTableKey) {
-    const existing = this.rawData?.[subTableKey];
-    const dataRows = Array.isArray(existing) ? existing.length : 0;
+    const dataRows = this.countSubTableDataRows(subTableKey);
     const layoutRows = this.doc?.model?.getSubTableLayoutSlotCount(subTableKey) ?? 1;
     if (layoutRows > 0) {
       return Math.max(dataRows, layoutRows);
@@ -47525,7 +47716,11 @@ class DataManager {
    * @param asPlaceholder true：push/insert 用的系统占位行（带 __gw_default）；false：applyInitData 物化行（空对象）
    */
   ensureSubTableRowCount(subTableKey, rowCount, asPlaceholder = true) {
-    let arr = this.rawData?.[subTableKey];
+    const raw = this.rawData?.[subTableKey];
+    if (raw != null && !Array.isArray(raw)) {
+      return [];
+    }
+    let arr = raw;
     if (!Array.isArray(arr)) {
       arr = [];
       this.rawData[subTableKey] = arr;
@@ -50153,8 +50348,8 @@ class DocModel {
    * 根据版面数据分组 / 动态关联铺砖，计算子表字段在 rawData 中应初始化的行数。
    *
    * - 固定表：槽位归 subFieldKey（bounded + itemRegion）
-   * - 二维表 / 检验表：动态分组铺砖在关联轴，槽位归 linkFieldKey（如 f_ewblink）；
-   *   纵向 subFieldKey（如 f_ewb）不由 itemRegion 撑行，返回 0
+   * - 二维表 / 检验表：动态分组铺砖槽位归 linkFieldKey（如 f_jianyan2）；
+   *   纵向 subFieldKey（如 f_jianyan1）由检验项条数撑行，返回 0
    * - 其它子表无分组：返回 1
    */
   getSubTableLayoutSlotCount(subFieldKey) {
@@ -50166,15 +50361,25 @@ class DocModel {
         if (region.subFieldKey !== subFieldKey || !region.itemRegion) continue;
         const fillDirection = region.widgetMeta?.props?.fillDirection ?? "x";
         max = Math.max(max, countDataGroupSlots(region, region.itemRegion, fillDirection));
-        region.type;
       }
-      for (const region of [...table.checkTable, ...table._2DTable]) {
+      for (const region of table.checkTable) {
+        if (!region.itemRegion) continue;
+        const range3 = expandDataGroupRowRange(region, region.itemRegion);
+        const fillDirection = region.widgetMeta?.props?.fillDirection ?? "x";
+        const slots = countDataGroupSlots(range3, region.itemRegion, fillDirection);
+        if (region.linkFieldKey === subFieldKey) {
+          max = Math.max(max, slots);
+        }
+        if (region.subFieldKey === subFieldKey) {
+          isLinkSubTableSubAxisOnly = true;
+        }
+      }
+      for (const region of table._2DTable) {
         if (!region.itemRegion) continue;
         const range3 = expandDataGroupRowRange(region, region.itemRegion);
         const slots = countDataGroupSlots(range3, region.itemRegion);
         if (region.linkFieldKey === subFieldKey) {
           max = Math.max(max, slots);
-          region.type;
         }
         if (region.subFieldKey === subFieldKey) {
           isLinkSubTableSubAxisOnly = true;
@@ -51581,34 +51786,34 @@ function transformSourceDataList(data, dict = {}) {
   return list || [];
 }
 function conversionFormState(payload) {
-  const { interfaceData, masterSlaveList, instances } = payload || {};
+  const { interfaceData, masterSlaveList, widgetInstances } = payload || {};
   const formState = {};
   if (interfaceData && interfaceData.data) {
     merge(formState, transformSourceData(interfaceData.data, interfaceData.dict));
   }
-  let _2dKeys = [];
-  if (instances) {
-    const _2DFieldList = instances.map(({ valuePath }) => {
+  let linkedKeyList = [];
+  if (widgetInstances) {
+    const linkedFieldList = widgetInstances.map(({ valuePath }) => {
       if (valuePath.includes(":")) {
         const { fieldKey, parentFieldKey, linkFieldKey } = parseValuePath(valuePath);
-        const group2DKey = `${parentFieldKey}:${linkFieldKey}`;
+        const linkedKey = `${parentFieldKey}:${linkFieldKey}`;
         return {
           fieldKey,
-          group2DKey
+          linkedKey
         };
       } else {
         return null;
       }
     }).filter(Boolean);
-    Object.entries(groupBy$1(_2DFieldList, "group2DKey")).forEach(([group2DKey, fields]) => {
-      _2dKeys.push(group2DKey);
-      const [parentFieldKey, linkFieldKey] = group2DKey.split(":");
+    Object.entries(groupBy$1(linkedFieldList, "linkedKey")).forEach(([linkedKey, fields]) => {
+      linkedKeyList.push(linkedKey);
+      const [parentFieldKey, linkFieldKey] = linkedKey.split(":");
       const parentState = formState[parentFieldKey];
       const keys2 = ["id_", "group_", ...fields.map((f) => f.fieldKey)];
       formState[linkFieldKey]?.data.forEach((row) => {
         row.__gw_x_uid = row.group_;
       });
-      formState[group2DKey] = {
+      formState[linkedKey] = {
         data: parentState?.data.map((row) => {
           const { group_: g_ } = row;
           const _row = pick(row, keys2);
@@ -51621,15 +51826,15 @@ function conversionFormState(payload) {
         }) || [],
         dict: parentState?.dict || []
       };
-      const addedYUids = [];
+      const addedYUidList = [];
       formState[parentFieldKey] = {
         data: [],
         dict: formState[parentFieldKey]?.dict || []
       };
       parentState?.data.forEach((row) => {
         const yUid = row.group_.split(":")[0];
-        if (addedYUids.includes(yUid)) return;
-        addedYUids.push(yUid);
+        if (addedYUidList.includes(yUid)) return;
+        addedYUidList.push(yUid);
         formState[parentFieldKey].data.push({
           ...row,
           __gw_y_uid: yUid
@@ -51637,7 +51842,7 @@ function conversionFormState(payload) {
       });
     });
   }
-  masterSlaveList.map((item) => item.key).concat(_2dKeys).forEach((k) => {
+  masterSlaveList.map((item) => item.key).concat(linkedKeyList).forEach((k) => {
     const subFormData = formState[k];
     if (subFormData) {
       formState[k] = transformSourceDataList([...subFormData.data], subFormData.dict);
@@ -51647,25 +51852,36 @@ function conversionFormState(payload) {
 }
 function getSubmitFormData(formData) {
   const _formData = { ...formData };
-  Object.keys(_formData).filter((k) => k.includes(":")).forEach((_2DKey) => {
-    const [subKey] = _2DKey.split(":");
-    const _2DData = _formData[_2DKey];
-    const subData = [..._formData[subKey] || []];
-    if ([_2DData, subData].every(Array.isArray)) {
-      _formData[subKey] = [];
-      _2DData.forEach((obj) => {
-        const { __gw_y_uid, __gw_x_uid } = obj;
-        const row = subData.find((row2) => row2.__gw_y_uid === __gw_y_uid);
-        if (!row) return;
-        _formData[subKey].push({
-          // 保留动态关联前端键值到 group_
-          group_: `${__gw_y_uid}:${__gw_x_uid}`,
-          ...row,
-          ...omit(obj, FILTER_KEYS)
-        });
+  Object.keys(_formData).filter((k) => k.includes(":")).forEach((linkedKey) => {
+    const [subKey] = linkedKey.split(":");
+    const subData = _formData[subKey] || [];
+    const crossData = _formData[linkedKey] || [];
+    if ([crossData, subData].every(Array.isArray)) {
+      const isCheckTable = subData[0] && Object.keys(subData[0]).includes("value_");
+      if (!isCheckTable) {
+        _formData[subKey] = [];
+      }
+      crossData.forEach((crossItem) => {
+        const { __gw_y_uid, __gw_x_uid } = crossItem;
+        const existedRow = subData.find((row) => row.__gw_y_uid === __gw_y_uid);
+        const newRowInfo = omit(crossItem, FILTER_KEYS);
+        const group_ = `${__gw_y_uid}:${__gw_x_uid}`;
+        if (!existedRow) return;
+        if (isCheckTable) {
+          Object.assign(existedRow, {
+            ...newRowInfo,
+            group_
+          });
+        } else {
+          _formData[subKey].push({
+            ...existedRow,
+            ...newRowInfo,
+            group_
+          });
+        }
       });
     }
-    delete _formData[_2DKey];
+    delete _formData[linkedKey];
   });
   const realFormData = Object.keys(_formData).reduce((reducedData, fieldKey) => {
     const fieldValue = _formData[fieldKey];
@@ -98183,8 +98399,18 @@ async function resolveCheckTableItemInfos(ctx) {
     protocolKey: checkTableDs.joinModelKey,
     instId: ctx.instanceId
   });
+  res.data?.forEach((item) => {
+    delete item.id_;
+  });
   return res;
 }
+async function waitForDataManagerSettle() {
+  await nextTick();
+  await new Promise((resolve) => setTimeout(resolve, 0));
+}
+function syncInitRawDataSnapshot(doc) {
+  doc.docRuntimeMeta.handleInfo.initRawDataSnapshot = cloneDeep(doc.dataManager.getRawData());
+}
 function snapshotDocInfo(docInst) {
   return {
     pages: docInst?.pages ?? [],
@@ -98251,8 +98477,7 @@ async function initializeDocumentEngine(props, payload, result) {
   });
   const rawData = conversionFormState({
     masterSlaveList,
-    interfaceData,
-    instances
+    interfaceData
   });
   const docRuntimeMeta = {
     ...requestInfo,
@@ -98279,7 +98504,8 @@ async function initializeDocumentEngine(props, payload, result) {
   });
   doc.dataManager.setRawData(rawData, defaultDataMap);
   doc.dataManager.applyInitData({ ...paramMap, ...dsMap });
-  doc.docRuntimeMeta.handleInfo.initRawDataSnapshot = cloneDeep(doc.dataManager.getRawData());
+  await waitForDataManagerSettle();
+  syncInitRawDataSnapshot(doc);
   const docInfo = snapshotDocInfo(doc);
   return {
     doc,
@@ -98290,7 +98516,8 @@ async function finalizeDesignModelImport(doc, docModel) {
   doc.setModel(docModel);
   const mainModelKey = doc.mainModelKey;
   doc.dataManager.setRawData({}, {});
-  doc.docRuntimeMeta.handleInfo.initRawDataSnapshot = cloneDeep(doc.dataManager.getRawData());
+  await waitForDataManagerSettle();
+  syncInitRawDataSnapshot(doc);
   doc.commandManager.undoStack.length = 0;
   doc.commandManager.redoStack.length = 0;
   doc.eventManager.cursorController.clearCursor();
@@ -98353,6 +98580,7 @@ function useDocumentFactory(props, payload) {
   watch(
     () => finisher.value,
     () => {
+      if (!docIns.value) return;
       console.log("Document request success");
       payload.onDocumentLoadSuccess?.();
     }
@@ -98419,10 +98647,10 @@ function useDocumentFactory(props, payload) {
         instances
       });
       doc.dataManager.setRawData(rawData);
-      await nextTick();
-      doc.docRuntimeMeta.handleInfo.initRawDataSnapshot = cloneDeep(doc.dataManager.getRawData());
+      await waitForDataManagerSettle();
+      syncInitRawDataSnapshot(doc);
     } finally {
-      await new Promise((resolve) => setTimeout(resolve, 0));
+      await waitForDataManagerSettle();
       isRefreshingData.value = false;
       doc.eventManager.cursorController.clearCursor();
     }
@@ -103364,7 +103592,8 @@ const _sfc_main$2y = /* @__PURE__ */ defineComponent({
     };
     const copyRow = () => {
       const { path: path2, index: index2 } = getCtx();
-      const data = props.doc.dataManager.get(`${path2}[${index2}]`) || {};
+      const storageIndex = props.doc.dataManager.resolveSubtableVisibleIndex(path2, index2);
+      const data = props.doc.dataManager.get(`${path2}[${storageIndex}]`) || {};
       props.doc.dataManager.insertAt(path2, index2 + 1, data);
     };
     const actionHandlers = {
@@ -103506,7 +103735,7 @@ const _sfc_main$2y = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$2y, [["__scopeId", "data-v-a58c6b2e"]]);
+const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$2y, [["__scopeId", "data-v-da25771b"]]);
 const _sfc_main$2x = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
@@ -104308,9 +104537,14 @@ function useDocLooperAutoSaveNotify(factory2, ops, options) {
   }
   function releaseSuppressOnLoad() {
     cancelFlushNotify();
-    Promise.resolve().then(() => {
+    void (async () => {
+      await waitForDataManagerSettle();
+      const doc = factory2.docIns.value;
+      if (doc) {
+        syncInitRawDataSnapshot(doc);
+      }
       suppress = false;
-    });
+    })();
   }
   if (options.suppressSignal) {
     watch(

package/dist/sdk/doc-runtime/check-table/map-check-table-item-infos.d.ts

@@ -1,5 +1,5 @@
 import { CheckTableItemInfosPayload } from './types';
-/** 从检验项详情推导每张检验表需要扩的主体行数 */
+/** 从检验项详情推导每张检验表需要扩的主体行数（仅检验项条数，不含关联轴铺砖槽位） */
 export declare function resolveItemCountByRegionId(runtimeJson: unknown, infos: CheckTableItemInfosPayload): Record<string, number>;
 /**
  * 将接口返回的检验项配置写入 defaults（展开为 $.f_jianyan1[0].type_ 等字段路径）。

package/dist/sdk/doc-runtime/utils/wait-for-data-settle.d.ts

@@ -0,0 +1,8 @@
+import { Doc } from '../../../core';
+/**
+ * 等待 Vue 响应式与 DataManager 后置流水线（依赖 / enrich / emit 队列）完成一轮 settle。
+ * 与 refreshData 收尾一致，避免过早读取 rawData 或误判 dirty。
+ */
+export declare function waitForDataManagerSettle(): Promise<void>;
+/** 将当前 rawData 写入 initRawDataSnapshot，供 getUnsavedChanges({ includeRawData: true }) 比对 */
+export declare function syncInitRawDataSnapshot(doc: Doc): void;

package/dist/sdk/types/index.d.ts

@@ -198,12 +198,14 @@ export interface UseWordOptions {
     /** 指定渲染模式 */
     renderModeType?: DocModeType;
     /**
-     * 文档接口请求成功且引擎挂载完成后的回调（每轮成功加载触发一次）。
+     * 文档接口请求成功且引擎挂载完成、dataManager 首轮 settle 后的回调（每轮成功加载触发一次）。
+     * 此时 controller.rawData() 已与内部 initRawDataSnapshot 对齐，适合做外部自动保存基线。
      * 不会在 requestId 为空、请求被丢弃、或初始化抛错时调用。
      */
     onDocumentLoadSuccess?: () => void;
     /**
-     * 文档数据发生变化（防抖 300ms 后）的回调，可在此处触发外部自动保存通知。
+     * 文档数据发生变化（防抖 300ms 后）且存在未保存改动时的回调，可触发外部自动保存轮询。
+     * 保存成功后请调用 controller.markAsSaved()，避免重复通知。
      * 例：() => emitter.emit(EmitterEnum.__on_looper_auto_save)
      */
     onLooperAutoSave?: (payload?: {

package/dist/utils/func/render.d.ts

@@ -13,7 +13,7 @@ export declare function conversionFormState(payload: {
     /** 渲染数据列表 */
     interfaceData: any;
     /** 主要是 WrField */
-    instances: Wr[];
+    widgetInstances: Wr[];
 }): Record<string, any>;
 /** 数据转成真实提交数据 */
 export declare function getSubmitFormData(formData: any): any;

package/dist/word.css

@@ -8170,17 +8170,17 @@ textarea[data-v-57fe54a3]::placeholder {
 .table-action .row-headers .row-header:last-child .row-add-btn[data-v-c40eef9f] .gct-icon.bottom {
   transform: translateY(-100%);
 }
-.sub-table-action[data-v-a58c6b2e] {
+.sub-table-action[data-v-da25771b] {
   position: absolute;
   z-index: 999;
 }
-.sub-table-action-content[data-v-a58c6b2e] {
+.sub-table-action-content[data-v-da25771b] {
   display: flex;
   align-items: center;
   gap: 4px;
   padding: 4px;
 }
-.action-group[data-v-a58c6b2e] {
+.action-group[data-v-da25771b] {
   display: flex;
   align-items: center;
   gap: 4px;
@@ -8188,15 +8188,15 @@ textarea[data-v-57fe54a3]::placeholder {
   border-radius: 4px;
   overflow: hidden;
 }
-.action-group .sub-table-btn[data-v-a58c6b2e] {
+.action-group .sub-table-btn[data-v-da25771b] {
   border-radius: 0;
 }
-.sub-table-action-bar[data-v-a58c6b2e],
-.sub-table-action-content[data-v-a58c6b2e] {
+.sub-table-action-bar[data-v-da25771b],
+.sub-table-action-content[data-v-da25771b] {
   pointer-events: auto;
   user-select: none;
 }
-.sub-table-btn[data-v-a58c6b2e] {
+.sub-table-btn[data-v-da25771b] {
   display: flex;
   align-items: center;
   justify-content: center;
@@ -8206,25 +8206,25 @@ textarea[data-v-57fe54a3]::placeholder {
   border-radius: 4px;
   cursor: pointer;
 }
-.sub-table-btn.delete-icon[data-v-a58c6b2e] {
+.sub-table-btn.delete-icon[data-v-da25771b] {
   border: none;
   background-color: #ff7875;
 }
-.insert-row-container[data-v-a58c6b2e] {
+.insert-row-container[data-v-da25771b] {
   padding: 6px;
 }
-.insert-row-container .insert-row-item[data-v-a58c6b2e] {
+.insert-row-container .insert-row-item[data-v-da25771b] {
   display: flex;
   align-items: center;
   gap: 8px;
   padding: 5px 8px;
   cursor: pointer;
 }
-.insert-row-container .insert-row-item[data-v-a58c6b2e]:hover {
+.insert-row-container .insert-row-item[data-v-da25771b]:hover {
   background: rgba(13, 13, 13, 0.06);
   border-radius: 4px;
 }
-.insert-row-container .insert-row-item .title[data-v-a58c6b2e] {
+.insert-row-container .insert-row-item .title[data-v-da25771b] {
   font-size: 14px;
   line-height: 28px;
   color: #0d0d0d;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/word",
-  "version": "0.1.38",
+  "version": "0.1.39",
   "description": "GCT 在线 word",
   "keywords": [
     "vue",