@gct-paas/word 0.1.32 → 0.1.33

package/dist/index.es.js

@@ -15580,7 +15580,7 @@ function isArrayBufferView(val) {
 }
 const isString = typeOfTest("string");
 const isFunction$2 = typeOfTest("function");
-const isNumber = typeOfTest("number");
+const isNumber$1 = typeOfTest("number");
 const isObject$1 = (thing) => thing !== null && typeof thing === "object";
 const isBoolean = (thing) => thing === true || thing === false;
 const isPlainObject$1 = (val) => {
@@ -15738,7 +15738,7 @@ const toArray = (thing) => {
   if (!thing) return null;
   if (isArray$1(thing)) return thing;
   let i = thing.length;
-  if (!isNumber(i)) return null;
+  if (!isNumber$1(i)) return null;
   const arr = new Array(i);
   while (i-- > 0) {
     arr[i] = thing[i];
@@ -15881,7 +15881,7 @@ const utils$1 = {
   isFormData,
   isArrayBufferView,
   isString,
-  isNumber,
+  isNumber: isNumber$1,
   isBoolean,
   isObject: isObject$1,
   isPlainObject: isPlainObject$1,
@@ -19121,11 +19121,11 @@ var moduleExports$2 = freeModule$2 && freeModule$2.exports === freeExports$2;
 var Buffer$2 = moduleExports$2 ? root.Buffer : void 0;
 var nativeIsBuffer = Buffer$2 ? Buffer$2.isBuffer : void 0;
 var isBuffer = nativeIsBuffer || stubFalse;
-var argsTag$2 = "[object Arguments]", arrayTag$2 = "[object Array]", boolTag$3 = "[object Boolean]", dateTag$3 = "[object Date]", errorTag$2 = "[object Error]", funcTag$1 = "[object Function]", mapTag$6 = "[object Map]", numberTag$3 = "[object Number]", objectTag$4 = "[object Object]", regexpTag$3 = "[object RegExp]", setTag$6 = "[object Set]", stringTag$3 = "[object String]", weakMapTag$2 = "[object WeakMap]";
+var argsTag$2 = "[object Arguments]", arrayTag$2 = "[object Array]", boolTag$3 = "[object Boolean]", dateTag$3 = "[object Date]", errorTag$2 = "[object Error]", funcTag$1 = "[object Function]", mapTag$6 = "[object Map]", numberTag$4 = "[object Number]", objectTag$4 = "[object Object]", regexpTag$3 = "[object RegExp]", setTag$6 = "[object Set]", stringTag$3 = "[object String]", weakMapTag$2 = "[object WeakMap]";
 var arrayBufferTag$3 = "[object ArrayBuffer]", dataViewTag$4 = "[object DataView]", float32Tag$2 = "[object Float32Array]", float64Tag$2 = "[object Float64Array]", int8Tag$2 = "[object Int8Array]", int16Tag$2 = "[object Int16Array]", int32Tag$2 = "[object Int32Array]", uint8Tag$2 = "[object Uint8Array]", uint8ClampedTag$2 = "[object Uint8ClampedArray]", uint16Tag$2 = "[object Uint16Array]", uint32Tag$2 = "[object Uint32Array]";
 var typedArrayTags = {};
 typedArrayTags[float32Tag$2] = typedArrayTags[float64Tag$2] = typedArrayTags[int8Tag$2] = typedArrayTags[int16Tag$2] = typedArrayTags[int32Tag$2] = typedArrayTags[uint8Tag$2] = typedArrayTags[uint8ClampedTag$2] = typedArrayTags[uint16Tag$2] = typedArrayTags[uint32Tag$2] = true;
-typedArrayTags[argsTag$2] = typedArrayTags[arrayTag$2] = typedArrayTags[arrayBufferTag$3] = typedArrayTags[boolTag$3] = typedArrayTags[dataViewTag$4] = typedArrayTags[dateTag$3] = typedArrayTags[errorTag$2] = typedArrayTags[funcTag$1] = typedArrayTags[mapTag$6] = typedArrayTags[numberTag$3] = typedArrayTags[objectTag$4] = typedArrayTags[regexpTag$3] = typedArrayTags[setTag$6] = typedArrayTags[stringTag$3] = typedArrayTags[weakMapTag$2] = false;
+typedArrayTags[argsTag$2] = typedArrayTags[arrayTag$2] = typedArrayTags[arrayBufferTag$3] = typedArrayTags[boolTag$3] = typedArrayTags[dataViewTag$4] = typedArrayTags[dateTag$3] = typedArrayTags[errorTag$2] = typedArrayTags[funcTag$1] = typedArrayTags[mapTag$6] = typedArrayTags[numberTag$4] = typedArrayTags[objectTag$4] = typedArrayTags[regexpTag$3] = typedArrayTags[setTag$6] = typedArrayTags[stringTag$3] = typedArrayTags[weakMapTag$2] = false;
 function baseIsTypedArray(value) {
   return isObjectLike(value) && isLength(value.length) && !!typedArrayTags[baseGetTag(value)];
 }
@@ -19684,7 +19684,7 @@ function cloneTypedArray(typedArray, isDeep) {
   var buffer = isDeep ? cloneArrayBuffer(typedArray.buffer) : typedArray.buffer;
   return new typedArray.constructor(buffer, typedArray.byteOffset, typedArray.length);
 }
-var boolTag$2 = "[object Boolean]", dateTag$2 = "[object Date]", mapTag$4 = "[object Map]", numberTag$2 = "[object Number]", regexpTag$2 = "[object RegExp]", setTag$4 = "[object Set]", stringTag$2 = "[object String]", symbolTag$2 = "[object Symbol]";
+var boolTag$2 = "[object Boolean]", dateTag$2 = "[object Date]", mapTag$4 = "[object Map]", numberTag$3 = "[object Number]", regexpTag$2 = "[object RegExp]", setTag$4 = "[object Set]", stringTag$2 = "[object String]", symbolTag$2 = "[object Symbol]";
 var arrayBufferTag$2 = "[object ArrayBuffer]", dataViewTag$2 = "[object DataView]", float32Tag$1 = "[object Float32Array]", float64Tag$1 = "[object Float64Array]", int8Tag$1 = "[object Int8Array]", int16Tag$1 = "[object Int16Array]", int32Tag$1 = "[object Int32Array]", uint8Tag$1 = "[object Uint8Array]", uint8ClampedTag$1 = "[object Uint8ClampedArray]", uint16Tag$1 = "[object Uint16Array]", uint32Tag$1 = "[object Uint32Array]";
 function initCloneByTag(object4, tag, isDeep) {
   var Ctor = object4.constructor;
@@ -19708,7 +19708,7 @@ function initCloneByTag(object4, tag, isDeep) {
       return cloneTypedArray(object4, isDeep);
     case mapTag$4:
       return new Ctor();
-    case numberTag$2:
+    case numberTag$3:
     case stringTag$2:
       return new Ctor(object4);
     case regexpTag$2:
@@ -19735,10 +19735,10 @@ function baseIsSet(value) {
 var nodeIsSet = nodeUtil && nodeUtil.isSet;
 var isSet = nodeIsSet ? baseUnary(nodeIsSet) : baseIsSet;
 var CLONE_DEEP_FLAG$2 = 1, CLONE_FLAT_FLAG$1 = 2, CLONE_SYMBOLS_FLAG$2 = 4;
-var argsTag$1 = "[object Arguments]", arrayTag$1 = "[object Array]", boolTag$1 = "[object Boolean]", dateTag$1 = "[object Date]", errorTag$1 = "[object Error]", funcTag = "[object Function]", genTag = "[object GeneratorFunction]", mapTag$2 = "[object Map]", numberTag$1 = "[object Number]", objectTag$1 = "[object Object]", regexpTag$1 = "[object RegExp]", setTag$2 = "[object Set]", stringTag$1 = "[object String]", symbolTag$1 = "[object Symbol]", weakMapTag = "[object WeakMap]";
+var argsTag$1 = "[object Arguments]", arrayTag$1 = "[object Array]", boolTag$1 = "[object Boolean]", dateTag$1 = "[object Date]", errorTag$1 = "[object Error]", funcTag = "[object Function]", genTag = "[object GeneratorFunction]", mapTag$2 = "[object Map]", numberTag$2 = "[object Number]", objectTag$1 = "[object Object]", regexpTag$1 = "[object RegExp]", setTag$2 = "[object Set]", stringTag$1 = "[object String]", symbolTag$1 = "[object Symbol]", weakMapTag = "[object WeakMap]";
 var arrayBufferTag$1 = "[object ArrayBuffer]", dataViewTag$1 = "[object DataView]", float32Tag = "[object Float32Array]", float64Tag = "[object Float64Array]", int8Tag = "[object Int8Array]", int16Tag = "[object Int16Array]", int32Tag = "[object Int32Array]", uint8Tag = "[object Uint8Array]", uint8ClampedTag = "[object Uint8ClampedArray]", uint16Tag = "[object Uint16Array]", uint32Tag = "[object Uint32Array]";
 var cloneableTags = {};
-cloneableTags[argsTag$1] = cloneableTags[arrayTag$1] = cloneableTags[arrayBufferTag$1] = cloneableTags[dataViewTag$1] = cloneableTags[boolTag$1] = cloneableTags[dateTag$1] = cloneableTags[float32Tag] = cloneableTags[float64Tag] = cloneableTags[int8Tag] = cloneableTags[int16Tag] = cloneableTags[int32Tag] = cloneableTags[mapTag$2] = cloneableTags[numberTag$1] = cloneableTags[objectTag$1] = cloneableTags[regexpTag$1] = cloneableTags[setTag$2] = cloneableTags[stringTag$1] = cloneableTags[symbolTag$1] = cloneableTags[uint8Tag] = cloneableTags[uint8ClampedTag] = cloneableTags[uint16Tag] = cloneableTags[uint32Tag] = true;
+cloneableTags[argsTag$1] = cloneableTags[arrayTag$1] = cloneableTags[arrayBufferTag$1] = cloneableTags[dataViewTag$1] = cloneableTags[boolTag$1] = cloneableTags[dateTag$1] = cloneableTags[float32Tag] = cloneableTags[float64Tag] = cloneableTags[int8Tag] = cloneableTags[int16Tag] = cloneableTags[int32Tag] = cloneableTags[mapTag$2] = cloneableTags[numberTag$2] = cloneableTags[objectTag$1] = cloneableTags[regexpTag$1] = cloneableTags[setTag$2] = cloneableTags[stringTag$1] = cloneableTags[symbolTag$1] = cloneableTags[uint8Tag] = cloneableTags[uint8ClampedTag] = cloneableTags[uint16Tag] = cloneableTags[uint32Tag] = true;
 cloneableTags[errorTag$1] = cloneableTags[funcTag] = cloneableTags[weakMapTag] = false;
 function baseClone(value, bitmask, customizer, key, object4, stack) {
   var result, isDeep = bitmask & CLONE_DEEP_FLAG$2, isFlat = bitmask & CLONE_FLAT_FLAG$1, isFull = bitmask & CLONE_SYMBOLS_FLAG$2;
@@ -19892,7 +19892,7 @@ function setToArray(set2) {
   return result;
 }
 var COMPARE_PARTIAL_FLAG$4 = 1, COMPARE_UNORDERED_FLAG$2 = 2;
-var boolTag = "[object Boolean]", dateTag = "[object Date]", errorTag = "[object Error]", mapTag$1 = "[object Map]", numberTag = "[object Number]", regexpTag = "[object RegExp]", setTag$1 = "[object Set]", stringTag = "[object String]", symbolTag = "[object Symbol]";
+var boolTag = "[object Boolean]", dateTag = "[object Date]", errorTag = "[object Error]", mapTag$1 = "[object Map]", numberTag$1 = "[object Number]", regexpTag = "[object RegExp]", setTag$1 = "[object Set]", stringTag = "[object String]", symbolTag = "[object Symbol]";
 var arrayBufferTag = "[object ArrayBuffer]", dataViewTag = "[object DataView]";
 var symbolProto = Symbol$1 ? Symbol$1.prototype : void 0, symbolValueOf = symbolProto ? symbolProto.valueOf : void 0;
 function equalByTag(object4, other, tag, bitmask, customizer, equalFunc, stack) {
@@ -19910,7 +19910,7 @@ function equalByTag(object4, other, tag, bitmask, customizer, equalFunc, stack)
       return true;
     case boolTag:
     case dateTag:
-    case numberTag:
+    case numberTag$1:
       return eq(+object4, +other);
     case errorTag:
       return object4.name == other.name && object4.message == other.message;
@@ -20430,6 +20430,10 @@ function isEmpty(value) {
 function isEqual(value, other) {
   return baseIsEqual(value, other);
 }
+var numberTag = "[object Number]";
+function isNumber(value) {
+  return typeof value == "number" || isObjectLike(value) && baseGetTag(value) == numberTag;
+}
 function isNil(value) {
   return value == null;
 }
@@ -20594,13 +20598,21 @@ function safeParseJson(data, fallback = null, validator2) {
 }
 function generateValuePath(fieldLink, subFieldKey) {
   if (subFieldKey) {
-    const connector = subFieldKey.includes(":") ? "" : "[n]";
+    const connector = subFieldKey.includes(":") ? "[n_y][n_x]" : "[n]";
     return `$.${subFieldKey}${connector}.${fieldLink}`;
   } else {
     return `$.${fieldLink}`;
   }
 }
-function replacePathIndexPlaceholder(refPath, templatePath) {
+function replacePathIndexPlaceholders(params) {
+  const { x: x2, y: y2, templatePath } = params;
+  let path2 = templatePath;
+  path2 = replacePathIndexPlaceholder(y2, path2, "n_y");
+  path2 = replacePathIndexPlaceholder(x2, path2, "n_x");
+  path2 = replacePathIndexPlaceholder(x2, path2);
+  return path2;
+}
+function replacePathIndexPlaceholder(refPath, templatePath, placeholder = "n") {
   let index2;
   if (refPath === void 0) {
     return templatePath;
@@ -20609,32 +20621,64 @@ function replacePathIndexPlaceholder(refPath, templatePath) {
     index2 = refPath.toString();
   } else {
     const indexMatch = refPath.match(/\[(\d+)\]/);
-    index2 = indexMatch ? indexMatch[1] : "n";
+    index2 = indexMatch ? indexMatch[1] : placeholder;
   }
-  return templatePath.replace(/\[n\]/g, `[${index2}]`);
+  return templatePath.replaceAll(`[${placeholder}]`, `[${index2}]`);
 }
 function getLastSegment(str, separator = ".") {
   if (!str) return "";
   const index2 = str.lastIndexOf(separator);
   return index2 === -1 ? str : str.slice(index2 + 1);
 }
-function parseLinkFieldExpression(str) {
-  if (!str) {
+function parseValuePath(valuePath) {
+  if (!valuePath) {
     return {
-      subFieldKey: "",
-      linkFieldKey: ""
-    };
+      raw: "",
+      normalized: "",
+      fieldKey: "",
+      isRoot: false,
+      isSubTable: false,
+      isLink: false,
+      hasIndex: false,
+      segments: []
+    };
+  }
+  const normalized = valuePath.replace(/^\$\./, "");
+  const segments = normalized.split(".").filter(Boolean);
+  const only = segments[0] || "";
+  const parentRaw = segments.length > 1 ? only : only.includes(":") ? only : "";
+  const fieldKey = segments.length > 1 ? segments.at(-1) || "" : only.includes(":") ? "" : only;
+  const hasIndex = /\[[^\]]+\]/.test(valuePath);
+  const isLink = parentRaw.includes(":");
+  let parentFieldKey = "";
+  let linkFieldKey = "";
+  if (isLink) {
+    const colonIdx = parentRaw.indexOf(":");
+    const subFieldKey = colonIdx >= 0 ? parentRaw.slice(0, colonIdx) : parentRaw;
+    const linkKey = colonIdx >= 0 ? parentRaw.slice(colonIdx + 1) : "";
+    parentFieldKey = (subFieldKey || "").replace(/\[[^\]]*\]/g, "");
+    linkFieldKey = (linkKey || "").replace(/\[[^\]]*\]/g, "");
+  } else {
+    parentFieldKey = parentRaw.replace(/\[.*?\]/g, "");
   }
-  const normalized = str.replace(/^\$\./, "");
-  const [subFieldKey = "", linkFieldKey = ""] = normalized.split(":");
   return {
-    subFieldKey,
-    linkFieldKey
+    raw: valuePath,
+    normalized,
+    fieldKey,
+    parentFieldKey,
+    isRoot: segments.length === 1,
+    isSubTable: segments.length > 1,
+    isLink,
+    linkFieldKey,
+    hasIndex,
+    segments
   };
 }
 function getBeforeBracket(str) {
-  const reg = /\$\.[a-z_]+\[[^\]]+\]/i;
-  return str.match(reg)?.[0] || "";
+  const reg = /\$\.[a-z0-9_$:]+(?:\[[^\]]+\])+/i;
+  const m = str.match(reg)?.[0];
+  if (m) return m;
+  return str.match(/\$\.[a-z_]+\[[^\]]+\]/i)?.[0] || "";
 }
 function createRafOnce() {
   let rafId = null;
@@ -22626,16 +22670,7 @@ const TABLE_CELL_TEMPLATE = {
     }
   ]
 };
-const WTC_REF_KEYS = [
-  "mergeId",
-  "repeatingId",
-  "_2DTableId",
-  "boundedId",
-  "boundedItemId",
-  "checkTableId",
-  "dataGroup2DId",
-  "headerId"
-];
+const WTC_REF_KEYS = ["mergeId", "subTable", "subTableItem", "header"];
 class Wtc extends ModelGroup {
   name = "w:tc";
   type = "element";
@@ -22652,19 +22687,12 @@ class Wtc extends ModelGroup {
   // 被合并单元格指向源头单元格的 ID
   mergeId;
   // 属于哪个合并区域的 ID（所有属于同一合并区域的单元格都有相同值）
-  repeatingId;
-  // 属于哪个重复区域的 ID
-  _2DTableId;
-  // 二维表
-  boundedId;
-  // 属于哪个有界区域的 ID
-  boundedItemId;
-  // 有界区域内的项目 ID
-  checkTableId;
-  // 属于哪个检验表的 ID
-  dataGroup2DId;
-  // 属于哪个数据关联项目 ID
-  headerId;
+  /** 子表主体（动态表 / 固定表 / 二维表 / 检验表） */
+  subTable;
+  /** 子表内数据分组或数据关联 */
+  subTableItem;
+  /** 表头 / 子表表头 */
+  header;
   vMergeType;
   // 临时字段，用于 fromXmlJson 时追踪垂直合并
   tempMergeId;
@@ -22677,13 +22705,9 @@ class Wtc extends ModelGroup {
     this.mergeId = options.mergeId;
     this.mergeFromId = options.mergeFromId;
     this.vMergeType = options.vMergeType;
-    this.repeatingId = options.repeatingId;
-    this._2DTableId = options._2DTableId;
-    this.boundedId = options.boundedId;
-    this.boundedItemId = options.boundedItemId;
-    this.checkTableId = options.checkTableId;
-    this.dataGroup2DId = options.dataGroup2DId;
-    this.headerId = options.headerId;
+    this.subTable = options.subTable;
+    this.subTableItem = options.subTableItem;
+    this.header = options.header;
     this.backgroundColor = options.backgroundColor;
     this.tempMergeId = options.tempMergeId;
   }
@@ -22760,6 +22784,36 @@ class Wtc extends ModelGroup {
     });
     return result;
   }
+  setSubTable(type4, regionId) {
+    this.subTable = { type: type4, regionId };
+  }
+  clearSubTable() {
+    this.subTable = void 0;
+  }
+  setSubTableItem(type4, regionId) {
+    this.subTableItem = { type: type4, regionId };
+  }
+  clearSubTableItem() {
+    this.subTableItem = void 0;
+  }
+  setHeaderRef(type4, regionId) {
+    this.header = { type: type4, regionId };
+  }
+  clearHeaderRef() {
+    this.header = void 0;
+  }
+  /** 按 regionId 清除单元格上的子表 / 表头引用 */
+  clearRegionRef(regionId) {
+    if (this.subTable?.regionId === regionId) {
+      this.subTable = void 0;
+    }
+    if (this.subTableItem?.regionId === regionId) {
+      this.subTableItem = void 0;
+    }
+    if (this.header?.regionId === regionId) {
+      this.header = void 0;
+    }
+  }
   /**
    * 查找当前单元格对应的区域
    * @returns
@@ -23457,9 +23511,6 @@ class Region {
   }
   /**
    * 检查指定的行列位置是否在当前区域内
-   * @param row 行号
-   * @param col 列号
-   * @returns 是否在区域内
    */
   contains(row, col) {
     return row >= this.start.row && row <= this.end.row && col >= this.start.col && col <= this.end.col;
@@ -23479,84 +23530,81 @@ class Region {
     };
   }
 }
-class RepeatingRegion extends Region {
-  type = "repeating";
-  name;
-  valuePath;
-  widgetMeta;
+class TableHeaderRegion extends Region {
+  type = "table-header";
+  name = "";
   constructor(options) {
     super(options);
-    this.valuePath = options.valuePath;
     this.name = options.name;
-    this.widgetMeta = options.widgetMeta || {
-      props: {
-        quickFill: false
-      }
+  }
+  toJSON() {
+    return {
+      ...super.toJSON(),
+      name: this.name
     };
   }
-  /**
-   * 序列化为 JSON 对象
-   */
+  static fromJSON(json, table) {
+    return new TableHeaderRegion({
+      table,
+      id: json.id,
+      start: json.start,
+      end: json.end,
+      name: json.name
+    });
+  }
+}
+class SubTableHeaderRegion extends Region {
+  type = "sub-table-header";
+  name = "";
+  subTableId;
+  constructor(options) {
+    super(options);
+    this.name = options.name;
+    this.subTableId = options.subTableId;
+  }
   toJSON() {
     return {
       ...super.toJSON(),
       name: this.name,
-      valuePath: this.valuePath,
-      widgetMeta: this.widgetMeta
+      subTableId: this.subTableId
     };
   }
-  /**
-   * 从 JSON 对象还原
-   */
   static fromJSON(json, table) {
-    const region = new RepeatingRegion({
+    return new SubTableHeaderRegion({
       table,
       id: json.id,
       start: json.start,
       end: json.end,
       name: json.name,
-      valuePath: json.valuePath,
-      widgetMeta: json.widgetMeta
+      subTableId: json.subTableId
     });
-    return region;
   }
 }
-class CheckTableRegion extends Region {
-  type = "check-table";
+class RepeatingRegion extends Region {
+  type = "repeating";
   name;
   valuePath;
   widgetMeta;
-  itemRegion;
   constructor(options) {
     super(options);
-    this.name = options.name;
     this.valuePath = options.valuePath;
+    this.name = options.name;
     this.widgetMeta = options.widgetMeta || {
       props: {
-        autoFill: true,
-        refColField: void 0,
-        refRowField: void 0
+        quickFill: false
       }
     };
-    this.itemRegion = options.itemRegion;
   }
-  /**
-   * 序列化为 JSON 对象
-   */
   toJSON() {
     return {
       ...super.toJSON(),
       name: this.name,
       valuePath: this.valuePath,
-      widgetMeta: this.widgetMeta,
-      itemRegion: this.itemRegion ? this.itemRegion.toJSON() : void 0
+      widgetMeta: this.widgetMeta
     };
   }
-  /**
-   * 从 JSON 对象还原
-   */
   static fromJSON(json, table) {
-    const region = new CheckTableRegion({
+    return new RepeatingRegion({
       table,
       id: json.id,
       start: json.start,
@@ -23565,52 +23613,10 @@ class CheckTableRegion extends Region {
       valuePath: json.valuePath,
       widgetMeta: json.widgetMeta
     });
-    if (json.itemRegion) {
-      region.itemRegion = new DataGroup2DRegion({
-        table,
-        start: json.itemRegion?.start,
-        end: json.itemRegion?.end,
-        parent: region
-      });
-    }
-    return region;
-  }
-  setItemRegion(options) {
-    const region = new DataGroup2DRegion({
-      table: this.table,
-      parent: this,
-      ...options
-    });
-    this.itemRegion = region;
-    this.table.forEachCell({
-      startRowIdx: options.start.row,
-      startColIdx: options.start.col,
-      endRowIdx: options.end.row,
-      endColIdx: options.end.col,
-      callback: (cell) => {
-        cell.dataGroup2DId = region.id;
-      }
-    });
-    return region;
-  }
-  removeItemRegion() {
-    if (this.itemRegion) {
-      this.table.forEachCell({
-        startRowIdx: this.itemRegion.start.row,
-        startColIdx: this.itemRegion.start.col,
-        endRowIdx: this.itemRegion.end.row,
-        endColIdx: this.itemRegion.end.col,
-        callback: (cell) => {
-          cell.clearFieldRuns();
-          cell.dataGroup2DId = void 0;
-        }
-      });
-    }
-    this.itemRegion = void 0;
   }
 }
-class DataGroup2DRegion extends Region {
-  type = "dataGroup2D";
+class BoundedItemRegion extends Region {
+  type = "boundedItem";
   parent;
   constructor(options) {
     super(options);
@@ -23622,8 +23628,31 @@ class DataGroup2DRegion extends Region {
     this.parent.removeItemRegion();
   }
 }
-class _2DTableRegion extends Region {
-  type = "2d-table";
+function markSubTableItemCells(table, bounds, itemType, regionId) {
+  table.forEachCell({
+    startRowIdx: bounds.start.row,
+    startColIdx: bounds.start.col,
+    endRowIdx: bounds.end.row,
+    endColIdx: bounds.end.col,
+    callback: (cell) => {
+      cell.setSubTableItem(itemType, regionId);
+    }
+  });
+}
+function clearSubTableItemCells(table, itemRegion) {
+  table.forEachCell({
+    startRowIdx: itemRegion.start.row,
+    startColIdx: itemRegion.start.col,
+    endRowIdx: itemRegion.end.row,
+    endColIdx: itemRegion.end.col,
+    callback: (cell) => {
+      cell.clearFieldRuns();
+      cell.clearSubTableItem();
+    }
+  });
+}
+class BoundedRegion extends Region {
+  type = "bounded";
   name;
   valuePath;
   widgetMeta;
@@ -23635,15 +23664,11 @@ class _2DTableRegion extends Region {
     this.widgetMeta = options.widgetMeta || {
       props: {
         autoFill: true,
-        refColField: void 0,
-        refRowField: void 0
+        fillDirection: "x"
       }
     };
     this.itemRegion = options.itemRegion;
   }
-  /**
-   * 序列化为 JSON 对象
-   */
   toJSON() {
     return {
       ...super.toJSON(),
@@ -23653,11 +23678,8 @@ class _2DTableRegion extends Region {
       itemRegion: this.itemRegion ? this.itemRegion.toJSON() : void 0
     };
   }
-  /**
-   * 从 JSON 对象还原
-   */
   static fromJSON(json, table) {
-    const region = new _2DTableRegion({
+    const region = new BoundedRegion({
       table,
       id: json.id,
       start: json.start,
@@ -23667,7 +23689,7 @@ class _2DTableRegion extends Region {
       widgetMeta: json.widgetMeta
     });
     if (json.itemRegion) {
-      region.itemRegion = new DataGroup2DRegion({
+      region.itemRegion = new BoundedItemRegion({
         table,
         start: json.itemRegion?.start,
         end: json.itemRegion?.end,
@@ -23677,41 +23699,24 @@ class _2DTableRegion extends Region {
     return region;
   }
   setItemRegion(options) {
-    const region = new DataGroup2DRegion({
+    const region = new BoundedItemRegion({
       table: this.table,
       parent: this,
       ...options
     });
     this.itemRegion = region;
-    this.table.forEachCell({
-      startRowIdx: options.start.row,
-      startColIdx: options.start.col,
-      endRowIdx: options.end.row,
-      endColIdx: options.end.col,
-      callback: (cell) => {
-        cell.dataGroup2DId = region.id;
-      }
-    });
+    markSubTableItemCells(this.table, options, "bounded-item", region.id);
     return region;
   }
   removeItemRegion() {
     if (this.itemRegion) {
-      this.table.forEachCell({
-        startRowIdx: this.itemRegion.start.row,
-        startColIdx: this.itemRegion.start.col,
-        endRowIdx: this.itemRegion.end.row,
-        endColIdx: this.itemRegion.end.col,
-        callback: (cell) => {
-          cell.clearFieldRuns();
-          cell.dataGroup2DId = void 0;
-        }
-      });
+      clearSubTableItemCells(this.table, this.itemRegion);
     }
     this.itemRegion = void 0;
   }
 }
-class BoundedItemRegion extends Region {
-  type = "boundedItem";
+class DataGroup2DRegion extends Region {
+  type = "dataGroup2D";
   parent;
   constructor(options) {
     super(options);
@@ -23723,8 +23728,7 @@ class BoundedItemRegion extends Region {
     this.parent.removeItemRegion();
   }
 }
-class BoundedRegion extends Region {
-  type = "bounded";
+class LinkSubTableRegion extends Region {
   name;
   valuePath;
   widgetMeta;
@@ -23736,15 +23740,26 @@ class BoundedRegion extends Region {
     this.widgetMeta = options.widgetMeta || {
       props: {
         autoFill: true,
-        fillDirection: "x"
+        refColField: void 0,
+        refRowField: void 0
       }
     };
     this.itemRegion = options.itemRegion;
   }
-  /**
-   * 序列化为 JSON 对象
-   */
-  toJSON() {
+  get subFieldKey() {
+    const parsed = parseValuePath(this.valuePath);
+    return parsed.isLink ? parsed.parentFieldKey ?? "" : parsed.fieldKey;
+  }
+  get linkFieldKey() {
+    return parseValuePath(this.valuePath).linkFieldKey ?? "";
+  }
+  get subValuePath() {
+    return this.subFieldKey ? `$.${this.subFieldKey}` : "";
+  }
+  get linkValuePath() {
+    return this.linkFieldKey ? `$.${this.linkFieldKey}` : "";
+  }
+  toLinkSubTableJSON() {
     return {
       ...super.toJSON(),
       name: this.name,
@@ -23753,11 +23768,19 @@ class BoundedRegion extends Region {
       itemRegion: this.itemRegion ? this.itemRegion.toJSON() : void 0
     };
   }
-  /**
-   * 从 JSON 对象还原
-   */
-  static fromJSON(json, table) {
-    const region = new BoundedRegion({
+  static restoreItemRegion(region, json, table) {
+    if (json.itemRegion) {
+      region.itemRegion = new DataGroup2DRegion({
+        table,
+        start: json.itemRegion?.start,
+        end: json.itemRegion?.end,
+        parent: region
+      });
+    }
+  }
+  /** 从 JSON 还原关联子表（二维表 / 检验表子类共用） */
+  static fromLinkSubTableJSON(Ctor, json, table) {
+    const region = new Ctor({
       table,
       id: json.id,
       start: json.start,
@@ -23766,103 +23789,42 @@ class BoundedRegion extends Region {
       valuePath: json.valuePath,
       widgetMeta: json.widgetMeta
     });
-    if (json.itemRegion) {
-      region.itemRegion = new BoundedItemRegion({
-        table,
-        start: json.itemRegion?.start,
-        end: json.itemRegion?.end,
-        parent: region
-      });
-    }
+    LinkSubTableRegion.restoreItemRegion(region, json, table);
     return region;
   }
   setItemRegion(options) {
-    const region = new BoundedItemRegion({
+    const region = new DataGroup2DRegion({
       table: this.table,
       parent: this,
       ...options
     });
     this.itemRegion = region;
-    this.table.forEachCell({
-      startRowIdx: options.start.row,
-      startColIdx: options.start.col,
-      endRowIdx: options.end.row,
-      endColIdx: options.end.col,
-      callback: (cell) => {
-        cell.boundedItemId = region.id;
-      }
-    });
+    markSubTableItemCells(this.table, options, "data-group-2d", region.id);
     return region;
   }
   removeItemRegion() {
     if (this.itemRegion) {
-      this.table.forEachCell({
-        startRowIdx: this.itemRegion.start.row,
-        startColIdx: this.itemRegion.start.col,
-        endRowIdx: this.itemRegion.end.row,
-        endColIdx: this.itemRegion.end.col,
-        callback: (cell) => {
-          cell.clearFieldRuns();
-          cell.boundedItemId = void 0;
-        }
-      });
+      clearSubTableItemCells(this.table, this.itemRegion);
     }
     this.itemRegion = void 0;
   }
 }
-class TableHeaderRegion extends Region {
-  type = "table-header";
-  name = "";
-  constructor(options) {
-    super(options);
-    this.name = options.name;
-  }
+class _2DTableRegion extends LinkSubTableRegion {
+  type = "2d-table";
   toJSON() {
-    return {
-      ...super.toJSON(),
-      name: this.name
-    };
+    return this.toLinkSubTableJSON();
   }
   static fromJSON(json, table) {
-    const region = new TableHeaderRegion({
-      table,
-      id: json.id,
-      start: json.start,
-      end: json.end,
-      name: json.name
-    });
-    return region;
+    return LinkSubTableRegion.fromLinkSubTableJSON(_2DTableRegion, json, table);
   }
 }
-class SubTableHeaderRegion extends Region {
-  type = "sub-table-header";
-  name = "";
-  subTableId;
-  constructor(options) {
-    super(options);
-    this.name = options.name;
-    this.subTableId = options.subTableId;
-  }
-  /**
-   * 序列化为 JSON 对象
-   */
+class CheckTableRegion extends LinkSubTableRegion {
+  type = "check-table";
   toJSON() {
-    return {
-      ...super.toJSON(),
-      name: this.name,
-      subTableId: this.subTableId
-    };
+    return this.toLinkSubTableJSON();
   }
   static fromJSON(json, table) {
-    const region = new SubTableHeaderRegion({
-      table,
-      id: json.id,
-      start: json.start,
-      end: json.end,
-      name: json.name,
-      subTableId: json.subTableId
-    });
-    return region;
+    return LinkSubTableRegion.fromLinkSubTableJSON(CheckTableRegion, json, table);
   }
 }
 const TABLE_TEMPLATE = {
@@ -24269,7 +24231,7 @@ class WtblRowColumnOps {
     WTC_REF_KEYS.forEach((key) => {
       const refValue = refCell[key];
       if (!refValue) return;
-      if (nextRefCell && nextRefCell[key] !== refValue) return;
+      if (nextRefCell && JSON.stringify(nextRefCell[key]) !== JSON.stringify(refValue)) return;
       newCell[key] = refValue;
     });
   }
@@ -24531,27 +24493,25 @@ class WtblCellIterator {
 }
 class WtblRegionManager {
   /**
-   * 根据 region id 查找对应的 region
+   * 按 id 查找 region
    */
   static findRegionById(table, regionId) {
     return table.regions.find((r) => r.id === regionId);
   }
-  static findCrossRegion(table, options) {
-    const { start, end } = options;
-    const crossRegion = table.regions.find((r) => {
-      return !(r.end.row < start.row || r.start.row > end.row || r.end.col < start.col || r.start.col > end.col);
-    });
-    return crossRegion;
+  /**
+   * 查找与给定矩形范围相交的第一个 region（含边界接触）
+   */
+  static findCrossRegion(table, bounds) {
+    return table.regions.find((r) => this.regionsIntersect(r, bounds));
   }
-  static findCrossRegions(table, options) {
-    const { start, end } = options;
-    const crossRegions = table.regions.filter((r) => {
-      return !(r.end.row < start.row || r.start.row > end.row || r.end.col < start.col || r.start.col > end.col);
-    });
-    return crossRegions;
+  /**
+   * 查找与给定矩形范围相交的全部 region
+   */
+  static findCrossRegions(table, bounds) {
+    return table.regions.filter((r) => this.regionsIntersect(r, bounds));
   }
   /**
-   * 根据 region id 删除对应的 region
+   * 按 id 删除 region，并清除其覆盖范围内单元格上的关联标记
    */
   static deleteRegionById(table, regionId) {
     const regionIndex = table.regions.findIndex((r) => r.id === regionId);
@@ -24559,154 +24519,348 @@ class WtblRegionManager {
     const region = table.regions[regionIndex];
     if (!region) return;
     table.regions.splice(regionIndex, 1);
-    const { type: regionType, start, end } = region;
-    const isRepeating = regionType === "repeating";
-    const is2DTable = regionType === "2d-table";
-    const isBounded = regionType === "bounded";
-    const isCheckTable = regionType === "check-table";
-    const isThead = ["table-header", "sub-table-header"].includes(regionType);
-    WtblCellIterator.forEachCell(table, {
-      startRowIdx: start.row,
-      startColIdx: start.col,
-      endRowIdx: end.row,
-      endColIdx: end.col,
-      callback: (cell) => {
-        if (isRepeating) {
-          cell.clearFieldRuns();
-          cell.repeatingId = void 0;
-          cell.dataGroup2DId = void 0;
-        } else if (is2DTable) {
-          cell.clearFieldRuns();
-          cell._2DTableId = void 0;
-          cell.dataGroup2DId = void 0;
-        } else if (isBounded) {
-          cell.clearFieldRuns();
-          cell.boundedId = void 0;
-          cell.boundedItemId = void 0;
-        } else if (isCheckTable) {
-          cell.clearFieldRuns();
-          cell.checkTableId = void 0;
-          cell.dataGroup2DId = void 0;
-        } else if (isThead) {
-          cell.headerId = void 0;
-        }
-      }
+    this.forEachCellInRegion(table, region, (cell) => {
+      this.clearCellRegionMarks(cell, region);
     });
   }
   /**
-   * 设置重复区域
+   * 设置重复区域（子表体）
    */
   static setRepeating(table, options) {
-    const region = new RepeatingRegion({
-      ...options,
-      table
-    });
-    table.regions.push(region);
-    WtblCellIterator.forEachCell(table, {
-      startRowIdx: options.start.row,
-      startColIdx: options.start.col,
-      endRowIdx: options.end.row,
-      endColIdx: options.end.col,
-      callback: (cell) => {
-        cell.repeatingId = region.id;
-      }
+    const region = new RepeatingRegion({ ...options, table });
+    return this.registerRegion(table, region, options, (cell) => {
+      cell.setSubTable("repeating", region.id);
     });
-    return region;
   }
   /**
-   * 设置二维表
+   * 设置二维表区域
    */
   static set2DTable(table, options) {
-    const region = new _2DTableRegion({
-      ...options,
-      table
-    });
-    table.regions.push(region);
-    WtblCellIterator.forEachCell(table, {
-      startRowIdx: options.start.row,
-      startColIdx: options.start.col,
-      endRowIdx: options.end.row,
-      endColIdx: options.end.col,
-      callback: (cell) => {
-        cell._2DTableId = region.id;
-      }
+    const region = new _2DTableRegion({ ...options, table });
+    return this.registerRegion(table, region, options, (cell) => {
+      cell.setSubTable("2d-table", region.id);
     });
-    return region;
   }
   /**
-   * 设置有界区域
+   * 设置有界区域（子表体）
    */
   static setBounded(table, options) {
-    const region = new BoundedRegion({
-      ...options,
-      table
+    const region = new BoundedRegion({ ...options, table });
+    return this.registerRegion(table, region, options, (cell) => {
+      cell.setSubTable("bounded", region.id);
     });
-    table.regions.push(region);
-    WtblCellIterator.forEachCell(table, {
-      startRowIdx: options.start.row,
-      startColIdx: options.start.col,
-      endRowIdx: options.end.row,
-      endColIdx: options.end.col,
-      callback: (cell) => {
-        cell.boundedId = region.id;
-      }
-    });
-    return region;
   }
   /**
-   * 设置检验表
+   * 设置检验表区域
    */
   static setCheckTable(table, options) {
-    const region = new CheckTableRegion({
-      ...options,
-      table
-    });
-    table.regions.push(region);
-    WtblCellIterator.forEachCell(table, {
-      startRowIdx: options.start.row,
-      startColIdx: options.start.col,
-      endRowIdx: options.end.row,
-      endColIdx: options.end.col,
-      callback: (cell) => {
-        cell.checkTableId = region.id;
-      }
+    const region = new CheckTableRegion({ ...options, table });
+    return this.registerRegion(table, region, options, (cell) => {
+      cell.setSubTable("check-table", region.id);
     });
-    return region;
   }
+  /**
+   * 设置表头区域（主表表头）
+   */
   static setTableHeader(table, options) {
-    const region = new TableHeaderRegion({
-      ...options,
-      table
+    const region = new TableHeaderRegion({ ...options, table });
+    return this.registerRegion(table, region, options, (cell) => {
+      cell.setHeaderRef("table-header", region.id);
     });
-    table.regions.push(region);
-    WtblCellIterator.forEachCell(table, {
-      startRowIdx: options.start.row,
-      startColIdx: options.start.col,
-      endRowIdx: options.end.row,
-      endColIdx: options.end.col,
-      callback: (cell) => {
-        cell.headerId = region.id;
-      }
-    });
-    return region;
   }
+  /**
+   * 设置子表表头区域
+   */
   static setSubTableHeader(table, options) {
-    const region = new SubTableHeaderRegion({
-      ...options,
-      table
+    const region = new SubTableHeaderRegion({ ...options, table });
+    return this.registerRegion(table, region, options, (cell) => {
+      cell.setHeaderRef("sub-table-header", region.id);
     });
-    table.regions.push(region);
+  }
+  /**
+   * 判断两个矩形区域是否相交（含边界恰好相贴的情况）
+   */
+  static regionsIntersect(a, b2) {
+    return !(a.end.row < b2.start.row || a.start.row > b2.end.row || a.end.col < b2.start.col || a.start.col > b2.end.col);
+  }
+  /**
+   * 遍历 region 覆盖范围内的所有单元格
+   */
+  static forEachCellInRegion(table, bounds, callback) {
+    const { start, end } = bounds;
     WtblCellIterator.forEachCell(table, {
-      startRowIdx: options.start.row,
-      startColIdx: options.start.col,
-      endRowIdx: options.end.row,
-      endColIdx: options.end.col,
-      callback: (cell) => {
-        cell.headerId = region.id;
-      }
+      startRowIdx: start.row,
+      startColIdx: start.col,
+      endRowIdx: end.row,
+      endColIdx: end.col,
+      callback: (cell) => callback(cell)
     });
+  }
+  /**
+   * 将 region 加入 table.regions，并同步标记覆盖范围内的单元格
+   */
+  static registerRegion(table, region, bounds, markCell) {
+    table.regions.push(region);
+    this.forEachCellInRegion(table, bounds, markCell);
     return region;
   }
+  /**
+   * 删除 region 时，按类型清除单元格上的关联数据
+   *
+   * - 子表类：清除字段 runs + 子表 / 子表项引用
+   * - 表头类：清除字段 runs + 表头引用
+   * - 其他：仅清除对应 region 的引用
+   */
+  static clearCellRegionMarks(cell, region) {
+    const regionId = region.id;
+    switch (region.type) {
+      case "repeating":
+      case "2d-table":
+      case "bounded":
+      case "check-table":
+        cell.clearFieldRuns();
+        cell.clearSubTable();
+        cell.clearSubTableItem();
+        break;
+      case "table-header":
+      case "sub-table-header":
+        cell.clearFieldRuns();
+        cell.clearHeaderRef();
+        break;
+      default:
+        cell.clearRegionRef(regionId);
+    }
+  }
+}
+const OUTLINE_BORDER_INSET = 1;
+const borderConfig = {
+  outer: {
+    color: "rgb(128, 128, 128)",
+    width: 1
+  },
+  inner: {
+    color: "rgb(128, 128, 128)",
+    width: 1
+  },
+  guide: {
+    color: "#026AC8",
+    width: 2
+  }
+};
+const subThemeConfig = {
+  "fixed-table": {
+    label: "固定表",
+    color: "#309C41",
+    background: "rgba(48,156,65,0.1)",
+    labelBjColor: "rgba(48,156,65,0.8)"
+  },
+  "check-table": {
+    label: "检验表",
+    color: "#309C41",
+    background: "rgba(48,156,65,0.1)",
+    labelBjColor: "rgba(48,156,65,0.8)"
+  },
+  "dynamic-table": {
+    label: "动态表",
+    color: "#026AC8",
+    background: "rgba(2,106,200,0.1)",
+    labelBjColor: "rgba(2,106,200,0.8)"
+  },
+  "2d-table": {
+    label: "二维表",
+    color: "#026AC8",
+    background: "rgba(2,106,200,0.1)",
+    labelBjColor: "rgba(2,106,200,0.8)"
+  },
+  "table-header": {
+    label: "表头",
+    color: "rgba(245, 69, 71, 1)",
+    background: "rgba(245, 69, 71, 0.1)",
+    labelBjColor: "rgba(245, 69, 71, 0.8)"
+  },
+  "data-group": {
+    label: "数据分组",
+    color: "#F77E4A",
+    background: "rgba(247,126,74,0.1)",
+    labelBjColor: "rgba(247,126,74,0.8)"
+  },
+  "data-group-2d": {
+    label: "动态关联",
+    color: "#F77E4A",
+    background: "rgba(247,126,74,0.1)",
+    labelBjColor: "rgba(247,126,74,0.8)"
+  }
+};
+const getStyleByType = (type4) => {
+  const config = subThemeConfig[type4];
+  return {
+    strokeColor: config?.color || "#000",
+    backgroundColor: config?.background || "transparent",
+    label: config?.label || "",
+    labelBjColor: config?.labelBjColor || "#666"
+  };
+};
+const EPS = 1e-3;
+function clipHLineByMerges(line, merges) {
+  let segments = [line];
+  merges.forEach((rect) => {
+    segments = segments.flatMap((seg) => {
+      const insideY = seg.y > rect.y + EPS && seg.y < rect.y + rect.height - EPS;
+      if (!insideY) return [seg];
+      if (seg.x2 <= rect.x + EPS || seg.x1 >= rect.x + rect.width - EPS) return [seg];
+      if (rect.x <= seg.x1 + EPS && rect.x + rect.width >= seg.x2 - EPS) return [];
+      const res = [];
+      if (seg.x1 < rect.x - EPS) res.push({ ...seg, x2: rect.x });
+      if (seg.x2 > rect.x + rect.width + EPS) res.push({ ...seg, x1: rect.x + rect.width });
+      return res;
+    });
+  });
+  return segments;
+}
+function clipVLineByMerges(line, merges) {
+  let segments = [line];
+  merges.forEach((rect) => {
+    segments = segments.flatMap((seg) => {
+      const insideX = seg.x > rect.x + EPS && seg.x < rect.x + rect.width - EPS;
+      if (!insideX) return [seg];
+      if (seg.y2 <= rect.y + EPS || seg.y1 >= rect.y + rect.height - EPS) return [seg];
+      if (rect.y <= seg.y1 + EPS && rect.y + rect.height >= seg.y2 - EPS) return [];
+      const res = [];
+      if (seg.y1 < rect.y - EPS) res.push({ ...seg, y2: rect.y });
+      if (seg.y2 > rect.y + rect.height + EPS) res.push({ ...seg, y1: rect.y + rect.height });
+      return res;
+    });
+  });
+  return segments;
+}
+function createTableOutlineLayer(options) {
+  const { cells, inset = 1 } = options;
+  if (!cells.length) return { backgroundRect: null, hLines: [], vLines: [], labelPos: void 0 };
+  const minX = Math.min(...cells.map((c2) => c2.x));
+  const minY = Math.min(...cells.map((c2) => c2.y));
+  const maxX = Math.max(...cells.map((c2) => c2.x + c2.width));
+  const maxY = Math.max(...cells.map((c2) => c2.y + c2.height));
+  const minLY = Math.min(...cells.map((c2) => c2.layoutY));
+  const maxLX = Math.max(...cells.map((c2) => c2.layoutX + c2.width));
+  const maxLY = Math.max(...cells.map((c2) => c2.layoutY + c2.height));
+  const backgroundRect = {
+    x: minX + inset,
+    y: minY + inset,
+    width: maxX - minX - inset * 2,
+    height: maxY - minY - inset * 2
+  };
+  const hLines = [
+    { x1: minX + inset, x2: maxX - inset, y: minY + inset },
+    // top
+    { x1: minX + inset, x2: maxX - inset, y: maxY - inset }
+    // bottom
+  ];
+  const vLines = [
+    { x: minX + inset, y1: minY + inset, y2: maxY - inset },
+    // left
+    { x: maxX - inset, y1: minY + inset, y2: maxY - inset }
+    // right
+  ];
+  const labelPos = { x: maxLX - inset, y1: minLY + inset, y2: maxLY - inset };
+  return { backgroundRect, hLines, vLines, labelPos };
+}
+const accumulate = (list) => {
+  const result = [0];
+  let acc = 0;
+  for (const n of list) {
+    acc += n;
+    result.push(acc);
+  }
+  return result;
+};
+const inRange = (n, min, max) => n > min && n < max;
+function mapCellsToOutlineCells(cells) {
+  return cells.map((c2) => ({
+    x: c2.x,
+    y: c2.rowY,
+    layoutX: c2.layoutX,
+    layoutY: c2.layoutY,
+    width: c2.width,
+    height: c2.height
+  }));
+}
+function groupBy(list, getKey) {
+  return list.reduce((acc, item) => {
+    const key = getKey(item);
+    (acc[key] ||= []).push(item);
+    return acc;
+  }, {});
+}
+function buildPosMap(layers, getRect, toDom) {
+  const res = {};
+  for (const [id, layer] of Object.entries(layers)) {
+    const rect = getRect(layer);
+    if (!rect) continue;
+    const pos = toDom(rect);
+    if (pos) res[id] = pos;
+  }
+  return res;
+}
+const getIsDataGroup2DTable = (type4) => {
+  if (!type4) return false;
+  return ["2d-table", "check-table"].includes(type4);
+};
+const getIs2DCellInSubTable = (cellZone) => {
+  if (!cellZone) return false;
+  return ["cross", "horizontal"].includes(cellZone);
+};
+function getDataIndexLayersMap({
+  type: type4,
+  cells,
+  isDesign,
+  convertExtraProps
+}) {
+  const getDataIndex = (cell) => {
+    return getIsDataGroup2DTable(type4) && isDesign ? cell.subRenderer?.xDataIndex : cell.subRenderer?.dataIndex;
+  };
+  const getAllDataIndex = (cell) => {
+    const { dataIndex, xDataIndex, yDataIndex } = cell?.subRenderer || {};
+    return dataIndex ?? xDataIndex ?? yDataIndex;
+  };
+  const _cells = cells.filter(
+    (cell) => isNumber(getAllDataIndex(cell)) && cell?.subRenderer?.type === type4
+  );
+  if (!_cells.length) return {};
+  const grouped = groupBy(
+    _cells,
+    (cell) => `${cell.subRenderer.id}_dataIndex${getDataIndex(cell)}`
+  );
+  const layersMapEntries = Object.entries(grouped).map(([id, __cells]) => {
+    const firstCell = __cells[0];
+    const isFirstGroup = getDataIndex(firstCell) === 0;
+    const lastCell = __cells.filter((c2) => {
+      if (isDesign) {
+        return true;
+      } else {
+        const { type: type22, cellZone } = c2.subRenderer || {};
+        return getIsDataGroup2DTable(type22) ? getIs2DCellInSubTable(cellZone) : true;
+      }
+    }).at(-1);
+    const bgLayer = createTableOutlineLayer({
+      cells: mapCellsToOutlineCells(__cells),
+      inset: 4
+    });
+    const borderLayer = isFirstGroup ? createTableOutlineLayer({
+      cells: mapCellsToOutlineCells(__cells),
+      inset: OUTLINE_BORDER_INSET
+    }) : { hLines: [], vLines: [], backgroundRect: null, labelPos: void 0 };
+    return [
+      id,
+      {
+        ...borderLayer,
+        ...convertExtraProps(firstCell),
+        showBorder: isFirstGroup,
+        placeholderBjRect: bgLayer.backgroundRect,
+        lastCell
+      }
+    ];
+  });
+  return Object.fromEntries(layersMapEntries);
 }
 class CellCollector {
   constructor(table) {
@@ -24744,41 +24898,21 @@ class CellCollector {
           }
           this.mergeGroups.get(cell.mergeId).push(position);
         }
-        if (cell.repeatingId) {
-          if (!this.repeatingGroups.has(cell.repeatingId)) {
-            this.repeatingGroups.set(cell.repeatingId, []);
-          }
-          this.repeatingGroups.get(cell.repeatingId).push(position);
-        }
-        if (cell._2DTableId) {
-          if (!this._2DTableGroups.has(cell._2DTableId)) {
-            this._2DTableGroups.set(cell._2DTableId, []);
-          }
-          this._2DTableGroups.get(cell._2DTableId).push(position);
-        }
-        if (cell.boundedId) {
-          if (!this.boundedGroups.has(cell.boundedId)) {
-            this.boundedGroups.set(cell.boundedId, []);
-          }
-          this.boundedGroups.get(cell.boundedId).push(position);
-        }
-        if (cell.boundedItemId) {
-          if (!this.boundedItemGroups.has(cell.boundedItemId)) {
-            this.boundedItemGroups.set(cell.boundedItemId, []);
+        const body = cell.subTable;
+        if (body) {
+          const map2 = body.type === "repeating" ? this.repeatingGroups : body.type === "2d-table" ? this._2DTableGroups : body.type === "bounded" ? this.boundedGroups : this.checkTableGroups;
+          if (!map2.has(body.regionId)) {
+            map2.set(body.regionId, []);
           }
-          this.boundedItemGroups.get(cell.boundedItemId).push(position);
+          map2.get(body.regionId).push(position);
         }
-        if (cell.checkTableId) {
-          if (!this.checkTableGroups.has(cell.checkTableId)) {
-            this.checkTableGroups.set(cell.checkTableId, []);
+        const item = cell.subTableItem;
+        if (item) {
+          const map2 = item.type === "bounded-item" ? this.boundedItemGroups : this.dataGroup2DGroups;
+          if (!map2.has(item.regionId)) {
+            map2.set(item.regionId, []);
           }
-          this.checkTableGroups.get(cell.checkTableId).push(position);
-        }
-        if (cell.dataGroup2DId) {
-          if (!this.dataGroup2DGroups.has(cell.dataGroup2DId)) {
-            this.dataGroup2DGroups.set(cell.dataGroup2DId, []);
-          }
-          this.dataGroup2DGroups.get(cell.dataGroup2DId).push(position);
+          map2.get(item.regionId).push(position);
         }
       }
     }
@@ -24956,7 +25090,7 @@ class WtblCalculation {
       if (positions.length === 0) continue;
       const { minRow, maxRow, minCol, maxCol } = calculateGroupBounds(positions);
       const region = table.findRegionById(groupId);
-      if (region && ["check-table", "2d-table"].includes(region.type)) {
+      if (region && getIsDataGroup2DTable(region.type)) {
         region.start.row = minRow;
         region.end.row = maxRow;
         region.start.col = minCol;
@@ -31782,7 +31916,7 @@ class DeleteDataGroup2D extends CommandBase {
       return null;
     }
     const subTable = table.findRegionById(regionId);
-    if (!subTable || subTable?.type && !["check-table", "2d-table"].includes(subTable.type)) {
+    if (!subTable || !getIsDataGroup2DTable(subTable.type)) {
       console.error(
         `deleteDataGroup2D: region not found with id ${regionId} or region type is not support`
       );
@@ -38092,6 +38226,82 @@ function canSwitchImageFieldToAdaptive(cell, fieldRunId) {
   }
   return !fieldRunId || run.id === fieldRunId;
 }
+function getLinkSubTableCrossRange(region) {
+  const { itemRegion } = region;
+  if (!itemRegion) return void 0;
+  return {
+    start: {
+      row: Math.max(region.start.row, itemRegion.start.row),
+      col: Math.max(region.start.col, itemRegion.start.col)
+    },
+    end: {
+      row: Math.min(region.end.row, itemRegion.end.row),
+      col: Math.min(region.end.col, itemRegion.end.col)
+    }
+  };
+}
+function getDataGroup2DFillEndCol(region, cellDataIndexMap) {
+  const { itemRegion } = region;
+  if (!itemRegion) return region.end.col;
+  let maxCol = itemRegion.end.col;
+  cellDataIndexMap.forEach((meta, key) => {
+    const [rowStr, colStr] = key.split(",");
+    const row = Number(rowStr);
+    const col = Number(colStr);
+    if (row >= itemRegion.start.row && row <= itemRegion.end.row && meta.dataIndex !== void 0) {
+      maxCol = Math.max(maxCol, col);
+    }
+  });
+  return maxCol;
+}
+function resolveLinkSubTableCellZone(row, col, region, options = {}) {
+  const { itemRegion } = region;
+  if (!itemRegion) {
+    return region.contains(row, col) ? "horizontal" : void 0;
+  }
+  const cross = getLinkSubTableCrossRange(region);
+  const fillEndCol = options.fillEndCol ?? itemRegion.end.col;
+  const inCrossRows = row >= cross.start.row && row <= cross.end.row;
+  const inItemRows = row >= itemRegion.start.row && row <= itemRegion.end.row;
+  if (inCrossRows && col >= itemRegion.start.col && col <= fillEndCol) {
+    return "cross";
+  }
+  if (!inCrossRows && inItemRows && col >= itemRegion.start.col && col <= fillEndCol) {
+    return "vertical";
+  }
+  if (region.contains(row, col)) {
+    if (col < itemRegion.start.col) {
+      return "horizontal";
+    }
+    if (inCrossRows && col > fillEndCol) {
+      return "horizontal";
+    }
+  }
+  return void 0;
+}
+function resolveLinkSubTableValuePath(region, cellZone) {
+  switch (cellZone) {
+    case "cross":
+      return region.valuePath;
+    case "vertical":
+      return region.linkValuePath;
+    case "horizontal":
+      return region.subValuePath;
+  }
+}
+function isInLinkSubTableLayoutScope(row, col, region, options = {}) {
+  return resolveLinkSubTableCellZone(row, col, region, options) !== void 0;
+}
+const INSERT_FIELD_MSG = {
+  NOT_IN_CELL: "子表字段只能插入表格单元格中",
+  PATH_INCOMPATIBLE: "字段路径与当前区域不兼容，无法插入",
+  NOT_IN_SUBTABLE_REGION: "当前位置不在子表区域内，无法插入该字段",
+  LINK_IN_CROSS: "二维表/检验表关联字段不能拖入交叉区域",
+  SUB_IN_CROSS_PATH: "该字段不能拖入交叉区域",
+  LINK_ONLY_VERTICAL: "请使用动态关联字段拖入纵向关联区域",
+  SUB_ONLY_HORIZONTAL: "请使用子表主体字段拖入横向区域",
+  SUB_IN_2D_EXPANSION: "二维表字段不能拖入交叉区域上方或下方的扩展区域"
+};
 class InsertField extends CommandBase {
   constructor(doc, payload) {
     super(doc, payload);
@@ -38110,17 +38320,20 @@ class InsertField extends CommandBase {
   handleCollapseText() {
     const cursor = this.doc.cursorManager;
     const { nodeId, offset: offset2, side } = cursor.getCursor();
-    const {
-      valuePath,
-      widgetMeta
-    } = this.payload;
+    const { valuePath: draggedValuePath, widgetMeta } = this.payload;
     const mapper = this.doc.layoutMapper;
     const node = mapper.getBaseMetaNodeById(nodeId);
     const run = node.raw;
     const wp = mapper.getModelNodeById(run.parent.modelRef.id);
-    const wr = new WrField({ text: valuePath, valuePath, widgetMeta });
-    if (!this.validateFieldPath(valuePath, wp)) {
-      console.warn("字段路径不合法，无法插入字段", valuePath);
+    const { valuePath, widgetMeta: resolvedMeta } = this.resolveInsertFieldPayload(
+      draggedValuePath,
+      widgetMeta
+    );
+    const wr = new WrField({ text: valuePath, valuePath, widgetMeta: resolvedMeta });
+    const validateError = this.validateFieldPath(valuePath, wp, widgetMeta);
+    if (validateError) {
+      GctMessage.warning(validateError);
+      this.isTerminated = true;
       return null;
     }
     const cell = getAncestorCell(wp);
@@ -38171,8 +38384,17 @@ class InsertField extends CommandBase {
     if (models.length === 0) return null;
     if (mode !== SelectionMode.PP) return null;
     this.clearSelectionContent(models);
-    const { valuePath, widgetMeta } = this.payload;
-    const wr = new WrField({ text: "*", valuePath, widgetMeta });
+    const { valuePath: draggedValuePath, widgetMeta } = this.payload;
+    const { valuePath, widgetMeta: resolvedMeta } = this.resolveInsertFieldPayload(
+      draggedValuePath,
+      widgetMeta
+    );
+    const validateError = this.validateFieldPath(valuePath, blockFirst, widgetMeta);
+    if (validateError) {
+      GctMessage.warning(validateError);
+      return null;
+    }
+    const wr = new WrField({ text: "*", valuePath, widgetMeta: resolvedMeta });
     const cell = getAncestorCell(blockFirst);
     if (isCellLockedByAdaptiveImage(cell)) {
       GctMessage.warning(ADAPTIVE_IMAGE_CELL_MSG);
@@ -38194,16 +38416,7 @@ class InsertField extends CommandBase {
     };
   }
   isRootField(valuePath) {
-    if (valuePath && valuePath.indexOf("[n]") === -1) {
-      return true;
-    }
-    return false;
-  }
-  isNestedTableField(valuePath) {
-    if (valuePath && valuePath.indexOf("[n]") !== -1) {
-      return true;
-    }
-    return false;
+    return parseValuePath(valuePath).isRoot;
   }
   /**
    * 判断两个 valuePath 是否连续（父子关系）
@@ -38220,15 +38433,17 @@ class InsertField extends CommandBase {
    */
   isConsecutivePath(parentPath, childPath) {
     if (!parentPath || !childPath) return false;
-    const _parentPath = parentPath.includes(":") ? parentPath.split(":")[0] : parentPath;
-    if (!childPath.startsWith(_parentPath)) {
+    if (!childPath.startsWith(parentPath)) {
       return false;
     }
-    const remainder = childPath.slice(_parentPath.length);
+    const remainder = childPath.slice(parentPath.length);
     if (remainder === "") {
       return false;
     }
-    return remainder.startsWith(".") || remainder.startsWith("[n].");
+    if (remainder.startsWith(":")) {
+      return false;
+    }
+    return remainder.startsWith(".") || remainder.startsWith("[n].") || remainder.startsWith("[");
   }
   /**
    * 判断 childPath 是否可以在 parentPath 的循环区域中使用
@@ -38254,22 +38469,168 @@ class InsertField extends CommandBase {
     const hasLoops = (relativePath.match(/\[n\]/g) || []).length > 0;
     return !!(relativePath && relativePath !== "." && !hasLoops);
   }
-  // 获取所在单元格 的 row col
-  // 获取所在表格的 子表
-  validateFieldPath(valuePath = "", node) {
-    if (this.isRootField(valuePath)) return true;
+  getLayoutTableCellFromCursor() {
+    const cursor = this.doc.cursorManager.getCursor();
+    if (!cursor?.nodeId) return void 0;
+    const meta = this.doc.layoutMapper.getBaseMetaNodeById(cursor.nodeId);
+    const tableCellId = meta?.line?.tableCellId;
+    if (!tableCellId) return void 0;
+    return this.doc.layoutMapper.getLayoutNodeById(tableCellId);
+  }
+  getModelCellFromCursor() {
+    const cursor = this.doc.cursorManager.getCursor();
+    if (!cursor?.nodeId) return null;
+    const meta = this.doc.layoutMapper.getBaseMetaNodeById(cursor.nodeId);
+    const run = meta?.raw;
+    const wpId = run?.parent?.modelRef?.id;
+    if (!wpId) return null;
+    const wp = this.doc.layoutMapper.getModelNodeById(wpId);
+    return wp ? getAncestorCell(wp) : null;
+  }
+  /** 二维表/检验表：用当前单元格 subRenderer 分区 valuePath 作为父路径 */
+  getSubTableZoneParentPath() {
+    const sub = this.getLayoutTableCellFromCursor()?.subRenderer;
+    if (sub && getIsDataGroup2DTable(sub.type)) {
+      return sub.valuePath;
+    }
+    return void 0;
+  }
+  resolveInsertFieldPayload(draggedValuePath, widgetMeta) {
+    const layoutSub = this.getLayoutTableCellFromCursor()?.subRenderer;
+    const zoneParentPath = this.getSubTableZoneParentPath();
+    if (!zoneParentPath || !widgetMeta.field) {
+      return { valuePath: draggedValuePath, widgetMeta };
+    }
+    if (layoutSub?.type === "2d-table" || layoutSub?.type === "check-table") {
+      const cell = this.getModelCellFromCursor();
+      const region = cell ? this.getLinkSubTableRegionFromLayout(cell, layoutSub) : void 0;
+      if (region && !this.getDraggedFieldSide(widgetMeta.field, region)) {
+        return { valuePath: draggedValuePath, widgetMeta };
+      }
+    }
+    const fieldLink = widgetMeta.field.fieldLink || getLastSegment(draggedValuePath);
+    const parentKey = getLastSegment(zoneParentPath);
+    const valuePath = generateValuePath(fieldLink, parentKey);
+    return {
+      valuePath,
+      widgetMeta: {
+        ...widgetMeta,
+        field: {
+          ...widgetMeta.field,
+          valuePath,
+          subFieldKey: parentKey
+        }
+      }
+    };
+  }
+  /**
+   * 根据拖拽时 palette 传入的 subFieldKey 判断字段属于关联侧还是二维表/检验表主体侧。
+   * - 仅 linkFieldKey：动态关联 palette（f_ewblink）
+   * - 仅 subFieldKey：横向区 palette（f_ewb）
+   * - sub:link：交叉区 palette 拖入的主体字段（f_ewb:f_ewblink）
+   */
+  getDraggedFieldSide(field, region) {
+    const raw = field?.subFieldKey;
+    if (!raw) return void 0;
+    const parsed = parseValuePath(raw);
+    const subFieldKey = parsed.isLink ? parsed.parentFieldKey ?? "" : parsed.fieldKey;
+    const linkFieldKey = parsed.linkFieldKey ?? "";
+    if (subFieldKey === region.subFieldKey && linkFieldKey === region.linkFieldKey) {
+      return "sub";
+    }
+    if (!linkFieldKey && subFieldKey === region.linkFieldKey) {
+      return "link";
+    }
+    if (!linkFieldKey && subFieldKey === region.subFieldKey) {
+      return "sub";
+    }
+    return void 0;
+  }
+  validateLinkSubTableFieldPath(valuePath, region, field, cell, cellZone) {
+    const fieldSide = this.getDraggedFieldSide(field, region);
+    if (!fieldSide) {
+      return INSERT_FIELD_MSG.PATH_INCOMPATIBLE;
+    }
+    const zoneParentPath = cellZone ? resolveLinkSubTableValuePath(region, cellZone) : fieldSide === "link" ? region.linkValuePath : region.subValuePath;
+    if (!this.isFieldPathCompatible(zoneParentPath, valuePath)) {
+      return INSERT_FIELD_MSG.PATH_INCOMPATIBLE;
+    }
+    const parsed = parseValuePath(valuePath);
+    if (cellZone === "cross") {
+      if (fieldSide === "link") return INSERT_FIELD_MSG.LINK_IN_CROSS;
+      if (!parsed.isLink) return INSERT_FIELD_MSG.SUB_IN_CROSS_PATH;
+      return null;
+    }
+    if (cellZone === "vertical" && fieldSide !== "link") {
+      return INSERT_FIELD_MSG.LINK_ONLY_VERTICAL;
+    }
+    if (cellZone === "horizontal" && fieldSide !== "sub") {
+      return INSERT_FIELD_MSG.SUB_ONLY_HORIZONTAL;
+    }
+    if (region.type === "2d-table" && fieldSide === "sub" && this.isDataGroup2DExpansionCell(cell, region)) {
+      return INSERT_FIELD_MSG.SUB_IN_2D_EXPANSION;
+    }
+    return null;
+  }
+  /** 数据关联区向上/下扩充、超出子表主体行范围的模板行 */
+  isDataGroup2DExpansionCell(cell, region) {
+    const item = region.itemRegion;
+    if (!item) return false;
+    const rowIndex = cell.parent.getCurrentIndex();
+    const inItemRows = rowIndex >= item.start.row && rowIndex <= item.end.row;
+    const inBodyRows = rowIndex >= region.start.row && rowIndex <= region.end.row;
+    return inItemRows && !inBodyRows;
+  }
+  getLinkSubTableRegionFromLayout(cell, sub) {
+    const table = cell.table;
+    if (sub.type === "2d-table") {
+      return table.get2DTableById(sub.id);
+    }
+    if (sub.type === "check-table") {
+      return table.getCheckTableById(sub.id);
+    }
+    return void 0;
+  }
+  /**
+   * 校验字段是否可插入当前位置
+   * @returns 校验通过返回 null，失败返回提示文案
+   */
+  validateFieldPath(valuePath = "", node, widgetMeta) {
+    if (this.isRootField(valuePath)) return null;
     const cell = getAncestorCell(node);
-    if (!cell) return false;
+    if (!cell) return INSERT_FIELD_MSG.NOT_IN_CELL;
+    const layoutSub = this.getLayoutTableCellFromCursor()?.subRenderer;
+    if (layoutSub?.type === "2d-table" || layoutSub?.type === "check-table") {
+      const region = this.getLinkSubTableRegionFromLayout(cell, layoutSub);
+      if (!region) return INSERT_FIELD_MSG.NOT_IN_SUBTABLE_REGION;
+      return this.validateLinkSubTableFieldPath(
+        valuePath,
+        region,
+        widgetMeta?.field,
+        cell,
+        layoutSub.cellZone
+      );
+    }
     const table = cell.table;
     const row = cell.parent;
     const regions = table.regions;
     const colIndex = cell.getCurrentIndex();
     const rowIndex = row.getCurrentIndex();
-    const targetRegion = regions.find((r) => {
-      return r.contains(rowIndex, colIndex);
-    });
-    if (!targetRegion) return false;
-    return this.isFieldPathCompatible(targetRegion.valuePath, valuePath);
+    const targetRegion = regions.find((r) => r.contains(rowIndex, colIndex));
+    if (targetRegion?.type === "2d-table" || targetRegion?.type === "check-table") {
+      return this.validateLinkSubTableFieldPath(
+        valuePath,
+        targetRegion,
+        widgetMeta?.field,
+        cell
+      );
+    }
+    const zoneParentPath = this.getSubTableZoneParentPath();
+    if (zoneParentPath) {
+      return this.isFieldPathCompatible(zoneParentPath, valuePath) ? null : INSERT_FIELD_MSG.PATH_INCOMPATIBLE;
+    }
+    if (!targetRegion) return INSERT_FIELD_MSG.NOT_IN_SUBTABLE_REGION;
+    return this.isFieldPathCompatible(targetRegion.valuePath, valuePath) ? null : INSERT_FIELD_MSG.PATH_INCOMPATIBLE;
   }
 }
 const __vite_glob_0_15$2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -39567,7 +39928,7 @@ class SetDataGroup2D extends CommandBase {
     let region;
     cellList.some((cell) => {
       const r = cell.getRegion();
-      if (r && ["check-table", "2d-table"].includes(r.type)) {
+      if (r && getIsDataGroup2DTable(r.type)) {
         region = r;
         return true;
       }
@@ -40600,35 +40961,50 @@ class LayoutContext {
    */
   getValuePath(path2) {
     if (!path2) return void 0;
+    const { type: type4, dataIndex, xDataIndex, yDataIndex, cellZone } = this.cell?.subRenderer || {};
+    if (getIsDataGroup2DTable(type4) && cellZone === "cross") {
+      return replacePathIndexPlaceholders({ x: xDataIndex, y: yDataIndex, templatePath: path2 });
+    }
     if (!path2.includes("[n]")) {
       return path2;
     }
-    const {
-      type: type4,
-      dataIndex,
-      xDataIndex
-    } = this.cell?.subRenderer || {};
     let n = dataIndex;
-    if (type4 === "2d-table") {
-      n = xDataIndex;
+    if (getIsDataGroup2DTable(type4)) {
+      n = cellZone === "horizontal" ? yDataIndex : xDataIndex;
     }
     if (n === void 0) return path2;
-    return path2.replace(/\[n\]/g, `[${n}]`);
+    return replacePathIndexPlaceholder(n, path2);
   }
 }
 class TextHandler {
   static getId(context, wr) {
-    let id = wr.id;
-    if (typeof context.cell?.subRenderer?.dataIndex === "number") {
-      id = `${wr.id}@${context.cell.subRenderer.dataIndex}`;
-    } else if (context.type === "header" || context.type === "footer") {
-      id = `${wr.id}$p${Math.max(0, context.page?.pageIndex)}`;
+    const baseId = wr.id;
+    const sub = context.cell?.subRenderer;
+    if (sub && getIsDataGroup2DTable(sub.type) && sub.cellZone === "cross" && typeof sub.yDataIndex === "number" && typeof sub.xDataIndex === "number") {
+      return `${baseId}@${sub.yDataIndex}_${sub.xDataIndex}`;
+    }
+    let runIndex;
+    if (sub) {
+      if (getIsDataGroup2DTable(sub.type)) {
+        runIndex = sub.cellZone === "horizontal" ? sub.yDataIndex : sub.xDataIndex;
+      } else {
+        runIndex = sub.dataIndex;
+      }
     }
-    return id;
+    if (typeof runIndex === "number") {
+      return `${baseId}@${runIndex}`;
+    }
+    if (context.type === "header" || context.type === "footer") {
+      return `${baseId}$p${Math.max(0, context.page?.pageIndex ?? 0)}`;
+    }
+    return baseId;
   }
   static get2DInfo(context) {
-    const { xDataIndex, yDataIndex } = context.cell?.subRenderer || {};
-    return { xDataIndex, yDataIndex };
+    const { xDataIndex, yDataIndex, cellZone } = context.cell?.subRenderer || {};
+    return {
+      xDataIndex: cellZone === "horizontal" ? void 0 : xDataIndex,
+      yDataIndex
+    };
   }
   /**
    * 合并部分run
@@ -40707,7 +41083,9 @@ class TextHandler {
     const chars = text.split("");
     let doc = context.doc;
     chars.forEach((char, charIndex) => {
-      const { width, height, ascent, descent } = TextRun.measureText(TextRun.measurePayload(char, layoutStyle));
+      const { width, height, ascent, descent } = TextRun.measureText(
+        TextRun.measurePayload(char, layoutStyle)
+      );
       const run = new TextRun({
         doc,
         width,
@@ -40823,18 +41201,41 @@ class FieldBaseHandler {
   static hasValue(value) {
     return value !== void 0 && value !== null;
   }
+  static getSubTableRunIndex(context) {
+    const sub = context.cell?.subRenderer;
+    if (!sub) return void 0;
+    if (getIsDataGroup2DTable(sub.type)) {
+      if (sub.cellZone === "horizontal") {
+        return sub.yDataIndex;
+      }
+      return sub.xDataIndex;
+    }
+    if (typeof sub.dataIndex === "number") {
+      return sub.dataIndex;
+    }
+    return void 0;
+  }
   static getId(context, wr) {
-    let id = wr.id;
-    if (typeof context.cell?.subRenderer?.dataIndex === "number") {
-      id = `${wr.id}@${context.cell.subRenderer.dataIndex}`;
-    } else if (context.type === "header" || context.type === "footer") {
-      id = `${wr.id}$p${Math.max(0, context.page?.pageIndex)}`;
+    const baseId = wr.id;
+    const sub = context.cell?.subRenderer;
+    if (sub && getIsDataGroup2DTable(sub.type) && sub.cellZone === "cross" && typeof sub.yDataIndex === "number" && typeof sub.xDataIndex === "number") {
+      return `${baseId}@${sub.yDataIndex}_${sub.xDataIndex}`;
     }
-    return id;
+    const runIndex = this.getSubTableRunIndex(context);
+    if (typeof runIndex === "number") {
+      return `${baseId}@${runIndex}`;
+    }
+    if (context.type === "header" || context.type === "footer") {
+      return `${baseId}$p${Math.max(0, context.page?.pageIndex ?? 0)}`;
+    }
+    return baseId;
   }
   static get2DInfo(context) {
-    const { xDataIndex, yDataIndex } = context.cell?.subRenderer || {};
-    return { xDataIndex, yDataIndex };
+    const { xDataIndex, yDataIndex, cellZone } = context.cell?.subRenderer || {};
+    return {
+      xDataIndex: cellZone === "horizontal" ? void 0 : xDataIndex,
+      yDataIndex
+    };
   }
   static getValue(ctx, valuePath) {
     const { context } = ctx;
@@ -40917,7 +41318,9 @@ class FieldBaseHandler {
       position: "left"
     });
     chars.forEach((char, charIndex) => {
-      const { width, height, ascent, descent } = TextRun.measureText(TextRun.measurePayload(char, layoutStyle));
+      const { width, height, ascent, descent } = TextRun.measureText(
+        TextRun.measurePayload(char, layoutStyle)
+      );
       const run = new TextWidget({
         doc,
         width,
@@ -40962,7 +41365,9 @@ class FieldBaseHandler {
       position: "left"
     });
     chars.forEach((char, charIndex) => {
-      const { width, height, ascent, descent } = TextRun.measureText(TextRun.measurePayload(char, measureStyle));
+      const { width, height, ascent, descent } = TextRun.measureText(
+        TextRun.measurePayload(char, measureStyle)
+      );
       const run = new TextWidget({
         doc,
         width,
@@ -41036,7 +41441,9 @@ class FieldBaseHandler {
     } = payload;
     const style = { ...layoutStyle, fontSize };
     label.split("").forEach((char, charIndex) => {
-      const { width, height, ascent, descent } = TextRun.measureText(TextRun.measurePayload(char, style));
+      const { width, height, ascent, descent } = TextRun.measureText(
+        TextRun.measurePayload(char, style)
+      );
       const run = new TextWidget({
         doc: context.doc,
         width,
@@ -41114,7 +41521,9 @@ class FieldBaseHandler {
     } : {
       widgetFieldRightMarker: true
     };
-    const { width, height, ascent, descent } = TextRun.measureText(TextRun.measurePayload(label, measureStyle));
+    const { width, height, ascent, descent } = TextRun.measureText(
+      TextRun.measurePayload(label, measureStyle)
+    );
     const _width = position === "left" ? width + 2 : width + 3;
     const run = new TextWidget({
       doc: context.doc,
@@ -41568,8 +41977,14 @@ class WidgetBaseHandler {
    */
   getDataIndex(init2 = null) {
     const { context } = this;
-    const { type: type4, dataIndex, xDataIndex } = context.cell?.subRenderer || {};
-    return (type4 === "2d-table" ? xDataIndex : dataIndex) ?? init2;
+    const { type: type4, dataIndex, xDataIndex, yDataIndex, cellZone } = context.cell?.subRenderer || {};
+    if (getIsDataGroup2DTable(type4)) {
+      if (cellZone === "horizontal") {
+        return yDataIndex ?? init2;
+      }
+      return xDataIndex ?? init2;
+    }
+    return dataIndex ?? init2;
   }
   getPaperIndex() {
     const { context } = this;
@@ -41579,21 +41994,28 @@ class WidgetBaseHandler {
     return null;
   }
   getId() {
-    const { wr } = this;
-    let id = wr.id;
+    const baseId = this.wr.id;
+    const sub = this.context.cell?.subRenderer;
+    if (sub && getIsDataGroup2DTable(sub.type) && sub.cellZone === "cross" && typeof sub.yDataIndex === "number" && typeof sub.xDataIndex === "number") {
+      return `${baseId}@${sub.yDataIndex}_${sub.xDataIndex}`;
+    }
     const dataIndex = this.getDataIndex();
-    const pageIndex = this.getPaperIndex();
     if (typeof dataIndex === "number") {
-      id = `${wr.id}@${dataIndex}`;
-    } else if (typeof pageIndex === "number") {
-      id = `${wr.id}$p${pageIndex}`;
+      return `${baseId}@${dataIndex}`;
     }
-    return id;
+    const pageIndex = this.getPaperIndex();
+    if (typeof pageIndex === "number") {
+      return `${baseId}$p${pageIndex}`;
+    }
+    return baseId;
   }
   get2DInfo() {
     const { context } = this;
-    const { xDataIndex, yDataIndex } = context.cell?.subRenderer || {};
-    return { xDataIndex, yDataIndex };
+    const { xDataIndex, yDataIndex, cellZone } = context.cell?.subRenderer || {};
+    return {
+      xDataIndex: cellZone === "horizontal" ? void 0 : xDataIndex,
+      yDataIndex
+    };
   }
   getLayoutStyle() {
     const { wr, context } = this;
@@ -41738,7 +42160,7 @@ class BarcodeHandler extends WidgetBaseHandler {
   layout() {
     const { wr, context } = this;
     const computedMap = wr.pageWidgetMeta?.props?.newSpecificConfig;
-    const id = wr.id + "@" + this.getDataIndex(0);
+    const id = this.getId();
     const config = computedMap?.[id];
     const width = config?.relWidth ?? wr.pageWidgetMeta?.layout?.width ?? 120;
     const height = wr.pageWidgetMeta?.layout?.height ?? 40;
@@ -42518,12 +42940,16 @@ function splitTableByHeight(table, maxHeight) {
   console.timeEnd(key);
   return result;
 }
+const cellKey = (row, col) => `${row},${col}`;
 class TableExpander {
   table;
   doc;
   data;
+  /** 模板节点 id → Wtr / Wtc */
   modelMapper = /* @__PURE__ */ new Map();
+  /** 展开实例 id → RowFragment / CellFragment */
   instanceMapper = /* @__PURE__ */ new Map();
+  /** 模板行索引 → 各类逻辑区域（用于按行分发展开策略） */
   rowIndexRepeatingMapper = /* @__PURE__ */ new Map();
   rowIndex2DTableMapper = /* @__PURE__ */ new Map();
   rowIndexBoundedMapper = /* @__PURE__ */ new Map();
@@ -42531,11 +42957,13 @@ class TableExpander {
   rowIndexTableHeaderMapper = /* @__PURE__ */ new Map();
   rowIdTableHeaderMapper = /* @__PURE__ */ new Map();
   rowIdSubTableMapper = /* @__PURE__ */ new Map();
+  /** 固定表 / 检验表 / 二维表：数据关联铺砖后的单元格数据索引 */
   boundedCellDataIndexMap = /* @__PURE__ */ new Map();
   checkTableCellDataIndexMap = /* @__PURE__ */ new Map();
   _2DTableCellDataIndexMap = /* @__PURE__ */ new Map();
+  /** 展开后的行列表（按文档顺序） */
   rows = [];
-  // tableHeaders: string[][] = [];
+  /** 表头区域 id → 该区域包含的模板行 id 列表 */
   regionIdTableHeaderMetaMap = /* @__PURE__ */ new Map();
   constructor(table, doc) {
     this.table = table;
@@ -42546,373 +42974,371 @@ class TableExpander {
   getModelById(id) {
     return this.modelMapper.get(id);
   }
+  // ─── 初始化入口 ─────────────────────────────────────────────
   initialize() {
     this.initializeModelMapper();
-    this.initializeRepeatingMapper();
-    this.initialize2DTableMapper();
-    this.initializeBoundedMapper();
-    this.initializeCheckTableMapper();
-    this.initializeTableHeaderMapper();
+    this.initializeRegionMappers();
     this.initializeBoundedItemDataIndex();
     this.initializeDataGroup2DDataIndex();
     this.initializeRows();
     this.transformMergeRelations();
   }
   initializeModelMapper() {
-    this.table.rows.forEach((wtr) => {
+    for (const wtr of this.table.rows) {
       this.modelMapper.set(wtr.id, wtr);
-      wtr.cells.forEach((wtc) => {
+      for (const wtc of wtr.cells) {
         this.modelMapper.set(wtc.id, wtc);
-      });
-    });
-  }
-  initializeRepeatingMapper() {
-    this.table.repeating.forEach((region) => {
-      for (let r = region.start.row; r <= region.end.row; r++) {
-        this.rowIndexRepeatingMapper.set(r, region);
-        this.rowIdSubTableMapper.set(this.table.rows[r]?.id, region);
-      }
-    });
-  }
-  initialize2DTableMapper() {
-    this.table._2DTable.forEach((region) => {
-      for (let r = region.start.row; r <= region.end.row; r++) {
-        this.rowIndex2DTableMapper.set(r, region);
-        this.rowIdSubTableMapper.set(this.table.rows[r]?.id, region);
       }
-    });
+    }
   }
-  initializeBoundedMapper() {
-    this.table.bounded.forEach((region) => {
-      for (let r = region.start.row; r <= region.end.row; r++) {
-        this.rowIndexBoundedMapper.set(r, region);
-        this.rowIdSubTableMapper.set(this.table.rows[r]?.id, region);
-      }
-    });
+  /** 建立模板行索引 / 行 id 与各类子表、表头区域的映射 */
+  initializeRegionMappers() {
+    this.registerRowsForRegions(this.table.repeating, this.rowIndexRepeatingMapper);
+    this.registerRowsForRegions(this.table._2DTable, this.rowIndex2DTableMapper);
+    this.registerRowsForRegions(this.table.bounded, this.rowIndexBoundedMapper);
+    this.registerRowsForRegions(this.table.checkTable, this.rowIndexCheckTableMapper);
+    this.initializeTableHeaderMapper();
   }
-  initializeCheckTableMapper() {
-    this.table.checkTable.forEach((region) => {
+  registerRowsForRegions(regions, rowIndexMapper) {
+    for (const region of regions) {
       for (let r = region.start.row; r <= region.end.row; r++) {
-        this.rowIndexCheckTableMapper.set(r, region);
-        this.rowIdSubTableMapper.set(this.table.rows[r]?.id, region);
+        rowIndexMapper.set(r, region);
+        const rowId = this.table.rows[r]?.id;
+        if (rowId) this.rowIdSubTableMapper.set(rowId, region);
       }
-    });
+    }
   }
   initializeTableHeaderMapper() {
-    this.table.tableHeader.forEach((region) => {
+    for (const region of this.table.tableHeader) {
       const tableHeaderRowIds = [];
       for (let r = region.start.row; r <= region.end.row; r++) {
         this.rowIndexTableHeaderMapper.set(r, region);
-        this.rowIdTableHeaderMapper.set(this.table.getChildAt(r).id, region);
         const wtr = this.table.rows[r];
+        this.rowIdTableHeaderMapper.set(wtr.id, region);
         tableHeaderRowIds.push(wtr.id);
       }
-      this.regionIdTableHeaderMetaMap.set(region.id, {
-        rowIds: tableHeaderRowIds
-      });
-    });
+      this.regionIdTableHeaderMetaMap.set(region.id, { rowIds: tableHeaderRowIds });
+    }
   }
   initializeBoundedItemDataIndex() {
-    this.table.bounded.forEach((region) => {
-      if (region.itemRegion) {
-        const fillDirection = region.widgetMeta?.props?.fillDirection ?? "x";
-        const map2 = this.computeDataIndexMap(region, region.itemRegion, fillDirection);
-        map2.forEach((obj, key) => {
-          this.boundedCellDataIndexMap.set(key, {
-            dataIndex: obj.dataIndex,
-            refCellId: obj.refCellId
-          });
-        });
-      }
-    });
+    for (const region of this.table.bounded) {
+      if (!region.itemRegion) continue;
+      const fillDirection = region.widgetMeta?.props?.fillDirection ?? "x";
+      this.mergeIndexMap(
+        this.boundedCellDataIndexMap,
+        this.computeDataIndexMap(region, region.itemRegion, fillDirection)
+      );
+    }
   }
-  // [数据关联]上、下超出子表范围的部分需要撑开
+  /**
+   * 检验表 / 二维表的数据关联区：itemRegion 可能超出子表行范围（向上/下扩充），
+   * 展开铺砖时需用扩充后的行范围。
+   */
   getDataGroup2DItemRange(range3, itemRange) {
-    const {
-      start: { row: startRow },
-      end: { row: endRow }
-    } = itemRange;
     const expandedRange = cloneDeep(pick(range3, "start", "end"));
-    expandedRange.start.row = startRow;
-    expandedRange.end.row = endRow;
+    expandedRange.start.row = itemRange.start.row;
+    expandedRange.end.row = itemRange.end.row;
     return expandedRange;
   }
   initializeDataGroup2DDataIndex() {
-    this.table.checkTable.forEach((region) => {
-      if (region.itemRegion) {
-        const expandedRange = this.getDataGroup2DItemRange(region, region.itemRegion);
-        const map2 = this.computeDataIndexMap(expandedRange, region.itemRegion);
-        map2.forEach((obj, key) => {
-          this.checkTableCellDataIndexMap.set(key, {
-            dataIndex: obj.dataIndex,
-            refCellId: obj.refCellId
-          });
-        });
-      }
-    });
-    this.table._2DTable.forEach((region) => {
-      if (region.itemRegion) {
-        const expandedRange = this.getDataGroup2DItemRange(region, region.itemRegion);
-        const map2 = this.computeDataIndexMap(expandedRange, region.itemRegion);
-        map2.forEach((obj, key) => {
-          this._2DTableCellDataIndexMap.set(key, {
-            dataIndex: obj.dataIndex,
-            refCellId: obj.refCellId
-          });
-        });
-      }
+    this.initLinkSubTableCellIndexMaps(this.table.checkTable, this.checkTableCellDataIndexMap);
+    this.initLinkSubTableCellIndexMaps(this.table._2DTable, this._2DTableCellDataIndexMap);
+  }
+  initLinkSubTableCellIndexMaps(regions, target) {
+    for (const region of regions) {
+      if (!region.itemRegion) continue;
+      const expandedRange = this.getDataGroup2DItemRange(region, region.itemRegion);
+      this.mergeIndexMap(target, this.computeDataIndexMap(expandedRange, region.itemRegion));
+    }
+  }
+  mergeIndexMap(target, source) {
+    source.forEach((meta, key) => {
+      target.set(key, {
+        dataIndex: meta.dataIndex,
+        refCellId: meta.refCellId
+      });
     });
   }
+  // ─── 按行展开 ───────────────────────────────────────────────
   initializeRows() {
-    for (let wtrIndex = 0; wtrIndex < this.table.rows.length; wtrIndex++) {
-      const wtr = this.table.rows[wtrIndex];
-      if (this.rowIndexRepeatingMapper.has(wtrIndex)) {
-        const region = this.rowIndexRepeatingMapper.get(wtrIndex);
-        if (wtrIndex === region.start.row) {
+    for (let rowIndex = 0; rowIndex < this.table.rows.length; rowIndex++) {
+      const wtr = this.table.rows[rowIndex];
+      if (this.rowIndexRepeatingMapper.has(rowIndex)) {
+        const region = this.rowIndexRepeatingMapper.get(rowIndex);
+        if (rowIndex === region.start.row) {
           this.initializeRepeatingRowsInRange(region);
         }
-      } else if (this.rowIndex2DTableMapper.has(wtrIndex)) {
-        const region = this.rowIndex2DTableMapper.get(wtrIndex);
-        if (wtrIndex === region.start.row) {
-          this.initialize2DTableRowsInRange(wtrIndex, region);
+      } else if (this.rowIndex2DTableMapper.has(rowIndex)) {
+        const region = this.rowIndex2DTableMapper.get(rowIndex);
+        if (rowIndex === region.start.row) {
+          this.initialize2DTableRowsInRange(rowIndex, region);
         }
-      } else if (this.rowIndexBoundedMapper.has(wtrIndex)) {
-        const region = this.rowIndexBoundedMapper.get(wtrIndex);
-        this.initializeBoundedRowInRange(wtr, wtrIndex, region);
-      } else if (this.rowIndexCheckTableMapper.has(wtrIndex)) {
-        const region = this.rowIndexCheckTableMapper.get(wtrIndex);
-        this.initializeCheckTableRowInRange(wtr, wtrIndex, region);
-      } else if (this.rowIndexTableHeaderMapper.has(wtrIndex)) {
-        const region = this.rowIndexTableHeaderMapper.get(wtrIndex);
-        this.initializeTableHeaderRowInRange(wtr, region);
+      } else if (this.rowIndexBoundedMapper.has(rowIndex)) {
+        this.initializeBoundedRowInRange(wtr, rowIndex, this.rowIndexBoundedMapper.get(rowIndex));
+      } else if (this.rowIndexCheckTableMapper.has(rowIndex)) {
+        this.initializeCheckTableRowInRange(
+          wtr,
+          rowIndex,
+          this.rowIndexCheckTableMapper.get(rowIndex)
+        );
+      } else if (this.rowIndexTableHeaderMapper.has(rowIndex)) {
+        this.initializeTableHeaderRowInRange(wtr, this.rowIndexTableHeaderMapper.get(rowIndex));
       } else {
-        this.initializeNormalRowInRange(wtr, wtrIndex);
+        this.initializeNormalRowInRange(wtr, rowIndex);
       }
     }
   }
+  /** 编辑模式只展开一份；预览/填报模式按数据路径长度重复 */
   getRepeatCount(region) {
-    if (this.doc.mode === DocModeTypeConst.Edit) {
-      return 1;
-    }
-    return this.data.get(region.valuePath)?.length || 1;
+    if (this.doc.mode === DocModeTypeConst.Edit) return 1;
+    return this.data.get(region.subValuePath || region.valuePath)?.length || 1;
   }
+  // ─── 循环子表 / 二维子表（纵向重复）────────────────────────
   initializeRepeatingRowsInRange(region) {
-    const repeatCount = this.getRepeatCount(region);
-    const repeatRows = this.table.children.slice(region.start.row, region.end.row + 1);
-    const repeatRowsCount = repeatRows.length;
-    repeat(repeatCount, (dataIndex) => {
-      repeatRows.forEach((_wtr, _wtrIndex) => {
-        const row = {
-          id: `${_wtr.id}@${dataIndex}`,
-          expandFromId: _wtr.id,
-          cells: _wtr.children.map((wtc, wtcIndex) => {
-            if (dataIndex === 0 && _wtrIndex === repeatRowsCount - 1 && (wtcIndex < region.start.col || wtcIndex > region.end.col)) {
-              if (!wtc.mergeFromId) {
-                const cell2 = {
-                  id: `${wtc.id}@${dataIndex}`,
-                  expandFromId: wtc.id,
-                  rowspan: (wtc.rowspan ?? 1) + repeatRowsCount * (repeatCount - 1),
-                  colspan: wtc.colspan ?? 1
-                };
-                this.instanceMapper.set(cell2.id, cell2);
-                return cell2;
-              } else {
-                const instanceCell = this.instanceMapper.get(`${wtc.mergeFromId}@0`) ?? this.instanceMapper.get(wtc.mergeFromId);
-                instanceCell.rowspan = (instanceCell.rowspan ?? 1) + repeatRowsCount * (repeatCount - 1);
-              }
-            }
-            const cell = {
-              id: `${wtc.id}@${dataIndex}`,
-              expandFromId: wtc.id,
-              rowspan: wtc.rowspan ?? 1,
-              colspan: wtc.colspan ?? 1
-            };
-            if (region.contains(region.start.row + _wtrIndex, wtcIndex)) {
-              cell.dataIndex = this.doc.mode === DocModeTypeConst.Edit ? void 0 : dataIndex;
-              cell.repeatingId = region.id;
-            }
-            this.instanceMapper.set(cell.id, cell);
-            return cell;
-          })
-        };
-        this.instanceMapper.set(row.id, row);
-        this.rows.push(row);
-      });
+    this.initializeRepeatableSubTableRows(region, (templateRow, col, dataIndex) => {
+      const cell = {
+        id: "",
+        expandFromId: "",
+        rowspan: 1,
+        colspan: 1
+      };
+      if (region.contains(templateRow, col)) {
+        cell.dataIndex = this.doc.mode === DocModeTypeConst.Edit ? void 0 : dataIndex;
+        cell.repeatingId = region.id;
+      }
+      return cell;
     });
   }
-  initialize2DTableRowsInRange(r, region) {
+  initialize2DTableRowsInRange(regionStartRow, region) {
+    this.initializeRepeatableSubTableRows(
+      region,
+      (templateRow, col, yDataIndex, wtc) => {
+        const dataIndexMeta = this._2DTableCellDataIndexMap.get(cellKey(templateRow, col));
+        const linkMeta = this.resolveLinkSubTableCellMeta(templateRow, col, region, dataIndexMeta);
+        const cell = {
+          id: "",
+          expandFromId: linkMeta.expandFromId || wtc.id,
+          rowspan: wtc.rowspan ?? 1,
+          colspan: wtc.colspan ?? 1,
+          xDataIndex: linkMeta.xDataIndex,
+          cellZone: linkMeta.cellZone
+        };
+        if (region.contains(templateRow, col)) {
+          cell.yDataIndex = this.doc.mode === DocModeTypeConst.Edit ? void 0 : yDataIndex;
+        }
+        if (linkMeta.cellZone) {
+          cell._2DTableId = region.id;
+        }
+        return cell;
+      },
+      regionStartRow
+    );
+  }
+  /**
+   * 循环子表与二维子表共用的纵向展开逻辑：
+   * 按数据条数复制行块，区域外最后一行单元格需合并 rowspan 以覆盖重复产生的额外行。
+   */
+  initializeRepeatableSubTableRows(region, enrichCell, regionStartRow = region.start.row) {
     const repeatCount = this.getRepeatCount(region);
-    const repeatRows = this.table.children.slice(region.start.row, region.end.row + 1);
-    const repeatRowsCount = repeatRows.length;
-    repeat(repeatCount, (yDataIndex) => {
-      repeatRows.forEach((_wtr, _wtrIndex) => {
+    const templateRows = this.table.children.slice(region.start.row, region.end.row + 1);
+    const templateRowCount = templateRows.length;
+    const extraRowspan = templateRowCount * (repeatCount - 1);
+    repeat(repeatCount, (dataIndex) => {
+      templateRows.forEach((wtr, rowOffset) => {
+        const templateRow = regionStartRow + rowOffset;
+        const isLastTemplateRow = rowOffset === templateRowCount - 1;
         const row = {
-          id: `${_wtr.id}@${yDataIndex}`,
-          expandFromId: _wtr.id,
-          cells: _wtr.children.map((wtc, wtcIndex) => {
-            const dataIndexMeta = this._2DTableCellDataIndexMap.get(`${r + _wtrIndex},${wtcIndex}`);
-            const xDataIndex = dataIndexMeta?.dataIndex;
-            if (yDataIndex === 0 && _wtrIndex === repeatRowsCount - 1 && (wtcIndex < region.start.col || wtcIndex > region.end.col)) {
-              if (!wtc.mergeFromId) {
-                const cell2 = {
-                  id: `${wtc.id}@${yDataIndex}`,
-                  expandFromId: wtc.id,
-                  rowspan: (wtc.rowspan ?? 1) + repeatRowsCount * (repeatCount - 1),
-                  colspan: wtc.colspan ?? 1
-                };
-                this.instanceMapper.set(cell2.id, cell2);
-                return cell2;
-              } else {
-                const instanceCell = this.instanceMapper.get(`${wtc.mergeFromId}@0`) ?? this.instanceMapper.get(wtc.mergeFromId);
-                instanceCell.rowspan = (instanceCell.rowspan ?? 1) + repeatRowsCount * (repeatCount - 1);
-              }
-            }
-            const cell = {
-              id: `${wtc.id}@${yDataIndex}`,
-              expandFromId: dataIndexMeta?.refCellId || wtc.id,
-              rowspan: wtc.rowspan ?? 1,
-              colspan: wtc.colspan ?? 1,
-              xDataIndex
-            };
-            if (region.contains(region.start.row + _wtrIndex, wtcIndex)) {
-              cell.dataIndex = yDataIndex;
-              cell.yDataIndex = yDataIndex;
-              cell._2DTableId = region.id;
-            }
+          id: `${wtr.id}@${dataIndex}`,
+          expandFromId: wtr.id,
+          cells: wtr.children.map((wtc, col) => {
+            const outsideRegion = dataIndex === 0 && isLastTemplateRow && (col < region.start.col || col > region.end.col);
+            const extended = this.tryCreateExtendedRowspanCell(
+              wtc,
+              dataIndex,
+              outsideRegion,
+              extraRowspan
+            );
+            if (extended) return extended;
+            const cell = enrichCell(templateRow, col, dataIndex, wtc);
+            cell.id = `${wtc.id}@${dataIndex}`;
+            if (!cell.expandFromId) cell.expandFromId = wtc.id;
+            cell.rowspan = wtc.rowspan ?? 1;
+            cell.colspan = wtc.colspan ?? 1;
             this.instanceMapper.set(cell.id, cell);
             return cell;
           })
         };
-        this.instanceMapper.set(row.id, row);
-        this.rows.push(row);
+        this.pushRow(row);
       });
     });
   }
-  initializeBoundedRowInRange(wtr, wtrIndex, region) {
-    const row = {
-      id: wtr.id,
-      expandFromId: wtr.id,
-      cells: wtr.children.map((wtc, wtcIndex) => {
-        const dataIndexMeta = this.boundedCellDataIndexMap.get(`${wtrIndex},${wtcIndex}`);
-        const cell = {
-          id: wtc.id,
-          expandFromId: dataIndexMeta?.refCellId ?? wtc.id,
-          // 这里的id需要复用
-          rowspan: wtc.rowspan ?? 1,
-          colspan: wtc.colspan ?? 1
-        };
-        if (region.start.col <= wtcIndex && wtcIndex <= region.end.col) {
+  /**
+   * 循环区域外、首条数据最后一行：将 rowspan 拉长以吞并后续重复行，
+   * 避免区域外单元格被拆成多行。
+   */
+  tryCreateExtendedRowspanCell(wtc, dataIndex, shouldExtend, extraRowspan) {
+    if (!shouldExtend) return void 0;
+    if (!wtc.mergeFromId) {
+      const cell = {
+        id: `${wtc.id}@${dataIndex}`,
+        expandFromId: wtc.id,
+        rowspan: (wtc.rowspan ?? 1) + extraRowspan,
+        colspan: wtc.colspan ?? 1
+      };
+      this.instanceMapper.set(cell.id, cell);
+      return cell;
+    }
+    const anchor = this.instanceMapper.get(`${wtc.mergeFromId}@0`) ?? this.instanceMapper.get(wtc.mergeFromId);
+    if (anchor) {
+      anchor.rowspan = (anchor.rowspan ?? 1) + extraRowspan;
+    }
+    return void 0;
+  }
+  // ─── 单行区域（固定表 / 检验表 / 表头 / 普通行）────────────
+  initializeBoundedRowInRange(wtr, rowIndex, region) {
+    this.pushRow(
+      this.buildSingleTemplateRow(wtr, (wtc, col) => {
+        const dataIndexMeta = this.boundedCellDataIndexMap.get(cellKey(rowIndex, col));
+        const cell = this.createTemplateCell(wtc, dataIndexMeta?.refCellId);
+        if (region.start.col <= col && col <= region.end.col) {
           cell.boundedId = region.id;
         }
         if (dataIndexMeta?.dataIndex !== void 0) {
           cell.dataIndex = dataIndexMeta.dataIndex;
         }
-        this.instanceMapper.set(cell.id, cell);
         return cell;
       })
-    };
-    this.instanceMapper.set(row.id, row);
-    this.rows.push(row);
+    );
   }
-  initializeCheckTableRowInRange(wtr, wtrIndex, region) {
-    const row = {
-      id: wtr.id,
-      expandFromId: wtr.id,
-      cells: wtr.children.map((wtc, wtcIndex) => {
-        const dataIndexMeta = this.checkTableCellDataIndexMap.get(`${wtrIndex},${wtcIndex}`);
-        const cell = {
-          id: wtc.id,
-          expandFromId: dataIndexMeta?.refCellId ?? wtc.id,
-          // 这里的id需要复用
-          rowspan: wtc.rowspan ?? 1,
-          colspan: wtc.colspan ?? 1
-        };
-        if (region.start.col <= wtcIndex && wtcIndex <= region.end.col) {
-          cell.checkTableId = region.id;
-        }
-        if (dataIndexMeta?.dataIndex !== void 0) {
-          cell.dataIndex = dataIndexMeta.dataIndex;
-        }
-        this.instanceMapper.set(cell.id, cell);
+  initializeCheckTableRowInRange(wtr, rowIndex, region) {
+    this.pushRow(
+      this.buildSingleTemplateRow(wtr, (wtc, col) => {
+        const dataIndexMeta = this.checkTableCellDataIndexMap.get(cellKey(rowIndex, col));
+        const linkMeta = this.resolveLinkSubTableCellMeta(rowIndex, col, region, dataIndexMeta);
+        const cell = this.createTemplateCell(
+          wtc,
+          linkMeta.expandFromId,
+          linkMeta.xDataIndex,
+          linkMeta.cellZone
+        );
+        if (linkMeta.cellZone) cell.checkTableId = region.id;
         return cell;
       })
-    };
-    this.instanceMapper.set(row.id, row);
-    this.rows.push(row);
+    );
   }
   initializeTableHeaderRowInRange(wtr, region) {
-    const row = {
-      id: wtr.id,
-      expandFromId: wtr.id,
-      cells: wtr.children.map((wtc, wtcIndex) => {
-        const cell = {
-          id: wtc.id,
-          expandFromId: wtc.id,
-          rowspan: wtc.rowspan ?? 1,
-          colspan: wtc.colspan ?? 1
-        };
-        if (region.start.col <= wtcIndex && wtcIndex <= region.end.col) {
+    this.pushRow(
+      this.buildSingleTemplateRow(wtr, (wtc, col) => {
+        const cell = this.createTemplateCell(wtc);
+        if (region.start.col <= col && col <= region.end.col) {
           cell.headerId = region.id;
         }
-        this.instanceMapper.set(cell.id, cell);
         return cell;
       })
-    };
-    this.instanceMapper.set(row.id, row);
-    this.rows.push(row);
+    );
   }
-  initializeNormalRowInRange(wtr, wtrIndex) {
-    const row = {
+  initializeNormalRowInRange(wtr, rowIndex) {
+    this.pushRow(
+      this.buildSingleTemplateRow(wtr, (wtc, col) => {
+        const dataIndexMeta = this.checkTableCellDataIndexMap.get(cellKey(rowIndex, col)) ?? this._2DTableCellDataIndexMap.get(cellKey(rowIndex, col));
+        const linkRegion = this.findLinkSubTableRegionForCell(rowIndex, col);
+        const cell = this.createTemplateCell(wtc, dataIndexMeta?.refCellId);
+        if (linkRegion) {
+          const linkMeta = this.resolveLinkSubTableCellMeta(
+            rowIndex,
+            col,
+            linkRegion,
+            dataIndexMeta
+          );
+          cell.expandFromId = linkMeta.expandFromId || wtc.id;
+          cell.xDataIndex = linkMeta.xDataIndex;
+          cell.cellZone = linkMeta.cellZone;
+          if (linkRegion.type === "check-table") {
+            cell.checkTableId = linkRegion.id;
+          } else {
+            cell._2DTableId = linkRegion.id;
+          }
+        }
+        return cell;
+      })
+    );
+  }
+  buildSingleTemplateRow(wtr, buildCell) {
+    return {
       id: wtr.id,
       expandFromId: wtr.id,
-      cells: wtr.children.map((wtc, wtcIndex) => {
-        const checkMeta = this.checkTableCellDataIndexMap.get(`${wtrIndex},${wtcIndex}`);
-        const _2DMeta = this._2DTableCellDataIndexMap.get(`${wtrIndex},${wtcIndex}`);
-        const dataGroup2DRefCellId = checkMeta?.refCellId || _2DMeta?.refCellId;
-        const cell = {
-          id: wtc.id,
-          expandFromId: dataGroup2DRefCellId || wtc.id,
-          rowspan: wtc.rowspan ?? 1,
-          colspan: wtc.colspan ?? 1
-        };
+      cells: wtr.children.map((wtc, col) => {
+        const cell = buildCell(wtc, col);
         this.instanceMapper.set(cell.id, cell);
         return cell;
       })
     };
+  }
+  createTemplateCell(wtc, expandFromId, xDataIndex, cellZone) {
+    return {
+      id: wtc.id,
+      expandFromId: expandFromId ?? wtc.id,
+      rowspan: wtc.rowspan ?? 1,
+      colspan: wtc.colspan ?? 1,
+      ...xDataIndex !== void 0 && { xDataIndex },
+      ...cellZone !== void 0 && { cellZone }
+    };
+  }
+  pushRow(row) {
     this.instanceMapper.set(row.id, row);
     this.rows.push(row);
   }
+  // ─── 数据关联子表（检验表 / 二维表）元信息 ─────────────────
+  getLinkSubTableCellIndexMap(region) {
+    return region.type === "2d-table" ? this._2DTableCellDataIndexMap : this.checkTableCellDataIndexMap;
+  }
+  getFillEndColForRegion(region) {
+    return getDataGroup2DFillEndCol(region, this.getLinkSubTableCellIndexMap(region));
+  }
+  findLinkSubTableRegionForCell(row, col) {
+    const candidates = [...this.table.checkTable, ...this.table._2DTable];
+    for (const region of candidates) {
+      const fillEndCol = this.getFillEndColForRegion(region);
+      if (isInLinkSubTableLayoutScope(row, col, region, { fillEndCol })) {
+        return region;
+      }
+    }
+    return void 0;
+  }
+  resolveLinkSubTableCellMeta(row, col, region, dataIndexMeta) {
+    const fillEndCol = this.getFillEndColForRegion(region);
+    return {
+      cellZone: resolveLinkSubTableCellZone(row, col, region, { fillEndCol }),
+      xDataIndex: dataIndexMeta?.dataIndex,
+      expandFromId: dataIndexMeta?.refCellId
+    };
+  }
+  // ─── 合并单元格关系 ─────────────────────────────────────────
+  /** 根据主单元格的 rowspan/colspan，为被覆盖的从属单元格设置 mergeFromId */
   transformMergeRelations() {
-    this.rows.forEach((row, rowIndex) => {
-      row.cells.forEach((cell, colIndex) => {
-        if (cell.colspan > 1 || cell.rowspan > 1) {
-          this.rows.slice(rowIndex, rowIndex + cell.rowspan).forEach((r, ri) => {
-            r.cells.slice(colIndex, colIndex + cell.colspan).forEach((c2, ci) => {
-              if (ri === 0 && ci === 0) {
-                return;
-              }
-              c2.mergeFromId = cell.id;
-            });
-          });
+    for (let rowIndex = 0; rowIndex < this.rows.length; rowIndex++) {
+      const row = this.rows[rowIndex];
+      for (let colIndex = 0; colIndex < row.cells.length; colIndex++) {
+        const cell = row.cells[colIndex];
+        if (cell.colspan <= 1 && cell.rowspan <= 1) continue;
+        for (let dr = 0; dr < cell.rowspan; dr++) {
+          for (let dc = 0; dc < cell.colspan; dc++) {
+            if (dr === 0 && dc === 0) continue;
+            const covered = this.rows[rowIndex + dr]?.cells[colIndex + dc];
+            if (covered) covered.mergeFromId = cell.id;
+          }
         }
-      });
-    });
+      }
+    }
   }
+  // ─── 数据铺砖索引计算 ─────────────────────────────────────
   /**
-   * 计算单元格对应的数据索引（用于范围扩展）
+   * 计算单元格对应的数据索引（用于范围扩展 / 数据关联铺砖）。
    *
-   * @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(range3, itemRange, fillDirection = "x") {
     const indexMap = /* @__PURE__ */ new Map();
@@ -42920,34 +43346,32 @@ class TableExpander {
     const itemHeight = itemRange.end.row - itemRange.start.row + 1;
     for (let r = itemRange.start.row; r <= itemRange.end.row; r++) {
       for (let c2 = itemRange.start.col; c2 <= itemRange.end.col; c2++) {
-        indexMap.set(`${r},${c2}`, {
-          dataIndex: 0
-        });
+        indexMap.set(cellKey(r, c2), { dataIndex: 0 });
       }
     }
-    const tlr = itemRange.start.row;
-    const tlc = itemRange.start.col;
-    const stampBlock = (blockTopRow, blockLeftCol, di) => {
+    const templateTopRow = itemRange.start.row;
+    const templateLeftCol = itemRange.start.col;
+    const stampBlock = (blockTopRow, blockLeftCol, dataIndex) => {
       for (let r = blockTopRow; r < blockTopRow + itemHeight; r++) {
         for (let c2 = blockLeftCol; c2 < blockLeftCol + itemWidth; c2++) {
-          const refR = tlr + r - blockTopRow;
-          const refC = tlc + c2 - blockLeftCol;
-          const refCell = this.table.getChildAt(refR).getChildAt(refC);
-          indexMap.set(`${r},${c2}`, {
-            dataIndex: di,
-            refPos: `${refR},${refC}`,
+          const refRow = templateTopRow + r - blockTopRow;
+          const refCol = templateLeftCol + c2 - blockLeftCol;
+          const refCell = this.table.getChildAt(refRow).getChildAt(refCol);
+          indexMap.set(cellKey(r, c2), {
+            dataIndex,
+            refPos: cellKey(refRow, refCol),
             refCellId: refCell.id
           });
         }
       }
     };
-    let dataIndex = 1;
+    let nextDataIndex = 1;
     if (fillDirection === "x") {
       let currentRow = itemRange.start.row;
       let currentCol = itemRange.end.col + 1;
       while (currentRow + itemHeight - 1 <= range3.end.row) {
         while (currentCol + itemWidth - 1 <= range3.end.col) {
-          stampBlock(currentRow, currentCol, dataIndex++);
+          stampBlock(currentRow, currentCol, nextDataIndex++);
           currentCol += itemWidth;
         }
         currentRow += itemHeight;
@@ -42958,7 +43382,7 @@ class TableExpander {
       let currentRow = itemRange.end.row + 1;
       while (currentCol + itemWidth - 1 <= range3.end.col) {
         while (currentRow + itemHeight - 1 <= range3.end.row) {
-          stampBlock(currentRow, currentCol, dataIndex++);
+          stampBlock(currentRow, currentCol, nextDataIndex++);
           currentRow += itemHeight;
         }
         currentCol += itemWidth;
@@ -42993,32 +43417,18 @@ class TableInfoProvider {
   getCellModelRef(cell) {
     return { id: cell.expandFromId };
   }
-  // 获取检验表、二维表超出子表范围的数据关联的单元格范围
-  getDataGroup2DAreaRange(region) {
-    const { itemRegion, end: { col: endCol } } = region;
-    if (!itemRegion) {
-      return void 0;
-    }
-    const {
-      start: {
-        row: startRow,
-        col: startCol
-      },
-      end: {
-        row: endRow
-      }
-    } = itemRegion;
-    const range3 = {
-      start: {
-        row: startRow,
-        col: startCol
-      },
-      end: {
-        row: endRow,
-        col: endCol
-      }
+  buildLinkSubTableSubRenderer(regionId, type4, region, cell) {
+    const cellZone = cell.cellZone;
+    const valuePath = cellZone ? resolveLinkSubTableValuePath(region, cellZone) : region.valuePath;
+    return {
+      id: regionId,
+      type: type4,
+      valuePath,
+      widgetMeta: region.widgetMeta,
+      cellZone,
+      xDataIndex: cellZone === "horizontal" ? void 0 : cell.xDataIndex,
+      yDataIndex: cellZone === "horizontal" || cellZone === "cross" ? cell.yDataIndex : void 0
     };
-    return range3;
   }
   getCellSubRenderer(cell) {
     if (cell.repeatingId) {
@@ -43032,17 +43442,8 @@ class TableInfoProvider {
       };
     } else if (cell._2DTableId) {
       const region = this.wtbl.get2DTableById(cell._2DTableId);
-      return {
-        id: cell._2DTableId,
-        type: "2d-table",
-        // 二维表使用 cell 的扩展字段
-        dataIndex: cell.dataIndex,
-        xDataIndex: cell.xDataIndex,
-        yDataIndex: cell.yDataIndex,
-        valuePath: region?.valuePath,
-        widgetMeta: region?.widgetMeta,
-        dataGroup2DAreaRange: this.getDataGroup2DAreaRange(region)
-      };
+      if (!region || !cell.cellZone) return void 0;
+      return this.buildLinkSubTableSubRenderer(cell._2DTableId, "2d-table", region, cell);
     } else if (cell.boundedId) {
       const region = this.wtbl.getBoundedById(cell.boundedId);
       return {
@@ -43054,21 +43455,13 @@ class TableInfoProvider {
       };
     } else if (cell.checkTableId) {
       const region = this.wtbl.getCheckTableById(cell.checkTableId);
-      return {
-        id: cell.checkTableId,
-        type: "check-table",
-        dataIndex: cell.dataIndex,
-        valuePath: region?.valuePath,
-        widgetMeta: region?.widgetMeta,
-        dataGroup2DAreaRange: this.getDataGroup2DAreaRange(region)
-      };
+      if (!region || !cell.cellZone) return void 0;
+      return this.buildLinkSubTableSubRenderer(cell.checkTableId, "check-table", region, cell);
     } else if (cell.headerId) {
       return {
         id: cell.headerId,
         type: "table-header",
         dataIndex: cell.dataIndex,
-        // valuePath: region?.valuePath!,
-        // widgetMeta: region?.widgetMeta,
         valuePath: "",
         widgetMeta: void 0
       };
@@ -45694,6 +46087,13 @@ class DataManager {
    * @returns 指定路径的值，不存在返回 undefined
    */
   get(path2) {
+    const inferred = this.infer2DPathAndCoords(path2);
+    if (inferred) {
+      const value2D = this.get2DByCoords(inferred.logicalPath, inferred.coords);
+      if (value2D !== void 0) {
+        return value2D;
+      }
+    }
     let value = this.getByPath(this.rawData, path2);
     if (value === void 0) {
       value = this.getDefault(path2);
@@ -45710,16 +46110,26 @@ class DataManager {
   getLabel(path2) {
     return this.get(this.getLabelPath(path2)) || this.get(path2);
   }
+  assignField(target, fieldPath, value) {
+    if (!fieldPath.includes(".") && !fieldPath.includes("[")) {
+      target[fieldPath] = value;
+      return;
+    }
+    this.setByPath(target, `$.${fieldPath}`, value);
+  }
   /**
    * 根据 jsonpath 设置数据
    * @param path jsonpath 路径
    * @param value 要设置的值
-   * @param x
-   * @param y
    * @returns 是否设置成功
    */
-  set2D(path2, value, x2, y2, source = "user") {
+  set(path2, value, source = "user") {
     try {
+      const inferred = this.infer2DPathAndCoords(path2);
+      if (inferred) {
+        const updated = this.set2DByCoords(inferred.logicalPath, value, inferred.coords, source);
+        if (updated) return true;
+      }
       const oldValue = this.getByPath(this.rawData, path2);
       this.setByPath(this.rawData, path2, value);
       this.emit(path2, value, oldValue, source);
@@ -45730,21 +46140,202 @@ class DataManager {
     }
   }
   /**
-   * 根据 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(path2, value, source = "user") {
-    try {
-      const oldValue = this.getByPath(this.rawData, path2);
-      this.setByPath(this.rawData, path2, value);
-      this.emit(path2, value, oldValue, source);
+  infer2DPathAndCoords(path2) {
+    if (!path2 || path2.includes("[n]")) return null;
+    const segments = this.parsePath(path2);
+    if (segments.length < 3) return null;
+    const head = segments[0];
+    if (head?.type !== "property") return null;
+    const tableKey = head.value;
+    const restToFieldPath = (startIdx) => {
+      let s = "";
+      for (let i = startIdx; i < segments.length; i++) {
+        const seg = segments[i];
+        if (!seg) continue;
+        if (seg.type === "property") {
+          s += (s ? "." : "") + seg.value;
+        } else {
+          s += `[${seg.value}]`;
+        }
+      }
+      return s;
+    };
+    if (tableKey.includes(":")) {
+      let i = 1;
+      if (segments[i]?.type !== "index") return null;
+      const y2 = parseInt(segments[i].value, 10);
+      i++;
+      if (segments[i]?.type !== "index") return null;
+      const x2 = parseInt(segments[i].value, 10);
+      i++;
+      const fieldPath2 = restToFieldPath(i);
+      if (!fieldPath2) return null;
+      return { logicalPath: `$.${tableKey}.${fieldPath2}`, coords: { x: x2, y: y2 } };
+    }
+    if (segments[1]?.type !== "index") return null;
+    const idx = parseInt(segments[1].value, 10);
+    if (!Number.isFinite(idx)) return null;
+    const axisResolved = this.resolveAxisByTableKey(tableKey);
+    const axisGuess = this.guessLinkSubTableAxis(tableKey);
+    const axis = axisResolved?.axis ?? axisGuess;
+    if (!axis) return null;
+    const fieldPath = restToFieldPath(2);
+    if (!fieldPath) return null;
+    const coords = axis === "y" ? { y: idx } : { x: idx };
+    return { logicalPath: `$.${tableKey}.${fieldPath}`, coords };
+  }
+  /**
+   * rawData 尚无交叉 key 时，用命名约定推测轴（避免误判普通子表 $.b[0]）
+   * 须先于「f_ewb 主体」判断：f_ewblink 也以 f_ewb 开头。
+   */
+  guessLinkSubTableAxis(tableKey) {
+    const lower = tableKey.toLowerCase();
+    if (lower.includes("ewblink") || /link$/i.test(lower)) return "x";
+    if (lower.startsWith("f_ewb")) return "y";
+    return null;
+  }
+  parse2DPath(path2) {
+    const normalized = path2.replace(/^\$\./, "");
+    const firstDot = normalized.indexOf(".");
+    if (firstDot === -1) return null;
+    const tableKey = normalized.slice(0, firstDot).replace(/\[[^\]]+\]/g, "");
+    const fieldPath = normalized.slice(firstDot + 1);
+    if (!tableKey || !fieldPath) return null;
+    return { tableKey, fieldPath };
+  }
+  getCrossKeys() {
+    return Object.keys(this.rawData).filter((key) => key.includes(":"));
+  }
+  resolveAxisByTableKey(tableKey) {
+    const crossKeys = this.getCrossKeys();
+    const matched = crossKeys.filter((key) => {
+      const [yKey2, xKey] = key.split(":");
+      return yKey2 === tableKey || xKey === tableKey;
+    });
+    if (matched.length === 0) return null;
+    const first = matched[0];
+    const [yKey] = first.split(":");
+    return { axis: yKey === tableKey ? "y" : "x", crossKeys: matched };
+  }
+  ensureAxisRowAndUid(tableKey, index2, axis) {
+    const path2 = `$.${tableKey}`;
+    let rows = this.getByPath(this.rawData, path2);
+    if (!Array.isArray(rows)) {
+      rows = [];
+      this.setByPath(this.rawData, path2, rows);
+    }
+    while (rows.length <= index2) {
+      rows.push({});
+    }
+    const row = rows[index2] ?? {};
+    rows[index2] = row;
+    const uidField = axis === "y" ? "__gw_y_uid" : "__gw_x_uid";
+    if (!row[uidField]) {
+      row[uidField] = row.id || `${axis}_${uuid()}`;
+    }
+    return row;
+  }
+  getFieldFromRow(row, fieldPath) {
+    if (!fieldPath.includes(".") && !fieldPath.includes("[")) {
+      return row[fieldPath];
+    }
+    return this.getByPath(row, `$.${fieldPath}`);
+  }
+  /**
+   * 按 y/x 坐标读取二维表数据（与 set2DByCoords 对称）
+   * 交叉区在 rawData 中按 __gw_y_uid / __gw_x_uid 稀疏存储，不能直接用 [y][x] 下标 getByPath。
+   */
+  get2DByCoords(path2, coords) {
+    const parsed = this.parse2DPath(path2);
+    if (!parsed) return void 0;
+    const { tableKey, fieldPath } = parsed;
+    if (tableKey.includes(":")) {
+      const [yTableKey = "", xTableKey = ""] = tableKey.split(":");
+      if (!yTableKey || !xTableKey) return void 0;
+      if (typeof coords.y !== "number" || typeof coords.x !== "number") return void 0;
+      const yRows = this.getByPath(this.rawData, `$.${yTableKey}`);
+      const xRows = this.getByPath(this.rawData, `$.${xTableKey}`);
+      const yUid = yRows?.[coords.y]?.__gw_y_uid;
+      const xUid = xRows?.[coords.x]?.__gw_x_uid;
+      if (!yUid || !xUid) return void 0;
+      const crossRows = this.getByPath(this.rawData, `$.${tableKey}`);
+      if (!Array.isArray(crossRows)) return void 0;
+      const row = crossRows.find(
+        (item) => item?.__gw_y_uid === yUid && item?.__gw_x_uid === xUid
+      );
+      if (!row) return void 0;
+      return this.getFieldFromRow(row, fieldPath);
+    }
+    const axisInfo = this.resolveAxisByTableKey(tableKey);
+    const axis = axisInfo?.axis ?? (typeof coords.y === "number" ? "y" : typeof coords.x === "number" ? "x" : null);
+    if (!axis) return void 0;
+    const index2 = axis === "y" ? coords.y : coords.x;
+    if (typeof index2 !== "number") return void 0;
+    const rows = this.getByPath(this.rawData, `$.${tableKey}`);
+    if (!Array.isArray(rows) || !rows[index2]) return void 0;
+    return this.getFieldFromRow(rows[index2], fieldPath);
+  }
+  set2DByCoords(path2, value, coords, source) {
+    const parsed = this.parse2DPath(path2);
+    if (!parsed) return false;
+    const { tableKey, fieldPath } = parsed;
+    if (tableKey.includes(":")) {
+      const [yTableKey = "", xTableKey = ""] = tableKey.split(":");
+      if (!yTableKey || !xTableKey) return false;
+      if (typeof coords.y !== "number" || typeof coords.x !== "number") return false;
+      const yRow = this.ensureAxisRowAndUid(yTableKey, coords.y, "y");
+      const xRow = this.ensureAxisRowAndUid(xTableKey, coords.x, "x");
+      const yUid = yRow.__gw_y_uid;
+      const xUid = xRow.__gw_x_uid;
+      if (!yUid || !xUid) return false;
+      const crossPath = `$.${tableKey}`;
+      const oldValue2 = this.deepClone(this.getByPath(this.rawData, crossPath));
+      let rows = this.getByPath(this.rawData, crossPath);
+      if (!Array.isArray(rows)) {
+        rows = [];
+        this.setByPath(this.rawData, crossPath, rows);
+      }
+      let row2 = rows.find((item) => item?.__gw_y_uid === yUid && item?.__gw_x_uid === xUid);
+      if (!row2) {
+        row2 = { __gw_y_uid: yUid, __gw_x_uid: xUid };
+        rows.push(row2);
+      }
+      this.assignField(row2, fieldPath, value);
+      this.emit(crossPath, this.getByPath(this.rawData, crossPath), oldValue2, source);
       return true;
-    } catch (error) {
-      console.error(`Failed to set value at path "${path2}":`, error);
-      return false;
     }
+    const axisInfo = this.resolveAxisByTableKey(tableKey);
+    const axis = axisInfo?.axis ?? (typeof coords.y === "number" ? "y" : typeof coords.x === "number" ? "x" : null);
+    if (!axis) return false;
+    const index2 = axis === "y" ? coords.y : coords.x;
+    if (typeof index2 !== "number") return false;
+    const tablePath = `$.${tableKey}`;
+    const oldValue = this.deepClone(this.getByPath(this.rawData, tablePath));
+    const row = this.ensureAxisRowAndUid(tableKey, index2, axis);
+    this.assignField(row, fieldPath, value);
+    this.emit(tablePath, this.getByPath(this.rawData, tablePath), oldValue, source);
+    return true;
+  }
+  cleanupCrossByAxisUid(tableKey, axis, uid) {
+    if (!uid) return;
+    const uidField = axis === "y" ? "__gw_y_uid" : "__gw_x_uid";
+    this.getCrossKeys().forEach((crossKey) => {
+      const [yKey, xKey] = crossKey.split(":");
+      const matched = (axis === "y" ? yKey : xKey) === tableKey;
+      if (!matched) return;
+      const path2 = `$.${crossKey}`;
+      const rows = this.getByPath(this.rawData, path2);
+      if (!Array.isArray(rows)) return;
+      const oldValue = this.deepClone(rows);
+      const next = rows.filter((item) => item?.[uidField] !== uid);
+      this.setByPath(this.rawData, path2, next);
+      this.emit(path2, next, oldValue);
+    });
   }
   /**
    * 将一个部分值对象合进整体
@@ -45812,8 +46403,15 @@ class DataManager {
         this.set(path2, arr);
       }
       const oldValue = [...arr];
+      const tableKey = path2.replace(/^\$\./, "").replace(/\[(n|\d+)\]/g, "");
+      const axisInfo = this.resolveAxisByTableKey(tableKey);
       values.forEach((value) => {
-        arr.push(this.deepClone(value));
+        const cloned = this.deepClone(value);
+        arr.push(cloned);
+        if (axisInfo) {
+          const index2 = arr.length - 1;
+          this.ensureAxisRowAndUid(tableKey, index2, axisInfo.axis);
+        }
       });
       this.emit(path2, arr, oldValue);
       return true;
@@ -45836,6 +46434,12 @@ class DataManager {
       const oldValue = [...arr];
       const poppedValue = arr.pop();
       this.emit(path2, arr, oldValue);
+      const tableKey = path2.replace(/^\$\./, "").replace(/\[(n|\d+)\]/g, "");
+      const axisInfo = this.resolveAxisByTableKey(tableKey);
+      if (axisInfo) {
+        const uidField = axisInfo.axis === "y" ? "__gw_y_uid" : "__gw_x_uid";
+        this.cleanupCrossByAxisUid(tableKey, axisInfo.axis, poppedValue?.[uidField]);
+      }
       return poppedValue;
     } catch (error) {
       console.error(`Failed to pop value at path "${path2}":`, error);
@@ -45865,6 +46469,13 @@ class DataManager {
       const oldValue = [...arr];
       const clonedValues = values.map((value) => this.deepClone(value));
       arr.splice(index2, 0, ...clonedValues);
+      const tableKey = path2.replace(/^\$\./, "").replace(/\[(n|\d+)\]/g, "");
+      const axisInfo = this.resolveAxisByTableKey(tableKey);
+      if (axisInfo) {
+        for (let i = index2; i < arr.length; i++) {
+          this.ensureAxisRowAndUid(tableKey, i, axisInfo.axis);
+        }
+      }
       this.emit(path2, arr, oldValue);
       return true;
     } catch (error) {
@@ -45890,6 +46501,12 @@ class DataManager {
       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);
+      if (axisInfo) {
+        const uidField = axisInfo.axis === "y" ? "__gw_y_uid" : "__gw_x_uid";
+        this.cleanupCrossByAxisUid(tableKey, axisInfo.axis, removedValue?.[uidField]);
+      }
       return removedValue;
     } catch (error) {
       console.error(`Failed to remove value at path "${path2}":`, error);
@@ -45947,7 +46564,9 @@ class DataManager {
         const existing = this.getByPath(this.rawData, path2);
         if (existing === void 0 || existing === null) {
           try {
-            this.setByPath(this.rawData, path2, value);
+            if (!this.set(path2, value, "user")) {
+              console.warn(`applyInitData: set returned false for path "${path2}"`);
+            }
           } catch (e) {
             console.warn(`applyInitData: failed to set path "${path2}"`, e);
           }
@@ -45968,7 +46587,9 @@ class DataManager {
       const existing = this.getByPath(this.rawData, realPath);
       if (existing === void 0 || existing === null) {
         try {
-          this.setByPath(this.rawData, realPath, value);
+          if (!this.set(realPath, value, "user")) {
+            console.warn(`applyInitData: set returned false for path "${realPath}"`);
+          }
         } catch (e) {
           console.warn(`applyInitData: failed to set path "${realPath}"`, e);
         }
@@ -46095,7 +46716,7 @@ class DataManager {
     if (current.startsWith(".")) {
       current = current.substring(1);
     }
-    const regex = /([a-zA-Z_$][a-zA-Z0-9_$]*)|\.([a-zA-Z_$][a-zA-Z0-9_$]*)|\.?(\[(\d+)\])/g;
+    const regex = /([a-zA-Z_$][a-zA-Z0-9_$:]*)|\.([a-zA-Z_$][a-zA-Z0-9_$:]*)|\.?(\[(\d+)\])/g;
     let match;
     while ((match = regex.exec(current)) !== null) {
       if (match[1]) {
@@ -48441,19 +49062,21 @@ class DocModel {
       };
     });
     const table2DRegions = tables.filter((w2) => w2.has2DTable).flatMap((w2) => w2._2DTable).map((item) => {
-      const region = parseLinkFieldExpression(item.valuePath);
+      const parsed = parseValuePath(item.valuePath);
+      const subFieldKey = parsed.isLink ? parsed.parentFieldKey ?? "" : parsed.fieldKey;
+      const linkFieldKey = parsed.linkFieldKey ?? "";
       const result = [];
-      if (region.subFieldKey) {
+      if (subFieldKey) {
         result.push({
-          field: region.subFieldKey,
+          field: subFieldKey,
           key: "dyn",
           name: "二维表",
           subType: "sub-table-2d"
         });
       }
-      if (region.linkFieldKey) {
+      if (linkFieldKey) {
         result.push({
-          field: region.linkFieldKey,
+          field: linkFieldKey,
           key: "newfixed",
           name: "二维表-关联",
           subType: "sub-table-2d-link"
@@ -48462,19 +49085,21 @@ class DocModel {
       return result;
     }).flat();
     const checkTableRegions = tables.filter((w2) => w2.hasCheckTable).flatMap((w2) => w2.checkTable).map((item) => {
-      const region = parseLinkFieldExpression(item.valuePath);
+      const parsed = parseValuePath(item.valuePath);
+      const subFieldKey = parsed.isLink ? parsed.parentFieldKey ?? "" : parsed.fieldKey;
+      const linkFieldKey = parsed.linkFieldKey ?? "";
       const result = [];
-      if (region.subFieldKey) {
+      if (subFieldKey) {
         result.push({
-          field: region.subFieldKey,
+          field: subFieldKey,
           key: "newfixed",
           name: "检验表-动态",
           subType: "check-table-2d"
         });
       }
-      if (region.linkFieldKey) {
+      if (linkFieldKey) {
         result.push({
-          field: region.linkFieldKey,
+          field: linkFieldKey,
           key: "newfixed",
           name: "检验表-关联",
           subType: "check-table-2d-link"
@@ -52496,12 +53121,20 @@ const DROPDOWN_TYPES = /* @__PURE__ */ new Set([
   "fw:rdo-table-select"
 ]);
 const DIALOG_TYPES = /* @__PURE__ */ new Set(["fw:signature", "fw:image", "fw:file"]);
+function useMetaFromWidget(widget, metaKey) {
+  const meta = computed(() => widget?.[metaKey] ?? {});
+  const props = computed(() => meta.value.props ?? {});
+  const widgetType = computed(() => meta.value.type);
+  return { meta, props, widgetType };
+}
 function useWidgetMeta(widget) {
-  const widgetMeta = computed(() => widget?.widgetMeta ?? {});
+  const {
+    meta: widgetMeta,
+    props: widgetProps,
+    widgetType
+  } = useMetaFromWidget(widget, "widgetMeta");
   const fieldMeta = computed(() => widgetMeta.value.field);
-  const widgetProps = computed(() => widgetMeta.value.props ?? {});
   const runtimeValuePath = computed(() => widget.valuePath || fieldMeta.value?.valuePath || "");
-  const widgetType = computed(() => widgetMeta.value.type);
   const isMultiple = computed(() => MULTIPLE_TYPES.has(widgetType.value));
   const isAsync = computed(() => ASYNC_TYPES.has(widgetType.value));
   const isDropdown = computed(() => {
@@ -52523,6 +53156,14 @@ function useWidgetMeta(widget) {
     isDialog
   };
 }
+function usePaperWidgetMeta(widget) {
+  const {
+    meta: pageWidgetMeta,
+    props: pageWidgetProps,
+    widgetType
+  } = useMetaFromWidget(widget, "pageWidgetMeta");
+  return { pageWidgetMeta, pageWidgetProps, widgetType };
+}
 function useFieldInfo(fieldMeta) {
   const designCtx = useDesignSuiteContext();
   const field = computed(() => fieldMeta());
@@ -52611,6 +53252,17 @@ function useWidgetStaticAttrs(widget) {
     showDisplayStatus: newDisplayStatus
   };
 }
+function usePaperWidgetStaticAttrs(widget) {
+  const { docInst, isDesignMode } = useDocPubApiContext();
+  const { pageWidgetMeta, pageWidgetProps, widgetType } = usePaperWidgetMeta(widget);
+  return {
+    docInst,
+    isDesignMode,
+    pageWidgetMeta,
+    pageWidgetProps,
+    widgetType
+  };
+}
 const _hoisted_1$1U = { class: "dropdown-container" };
 const _sfc_main$2S = /* @__PURE__ */ defineComponent({
   __name: "dropdown-container",
@@ -52666,7 +53318,7 @@ const _sfc_main$2S = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DropdownContainer = /* @__PURE__ */ _export_sfc(_sfc_main$2S, [["__scopeId", "data-v-730f825e"]]);
+const DropdownContainer = /* @__PURE__ */ _export_sfc(_sfc_main$2S, [["__scopeId", "data-v-c9c3a05b"]]);
 const _hoisted_1$1T = { class: "dialog-container" };
 const _sfc_main$2R = /* @__PURE__ */ defineComponent({
   __name: "dialog-container",
@@ -54351,7 +55003,7 @@ const _sfc_main$2Q = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const OverlayRender = /* @__PURE__ */ _export_sfc(_sfc_main$2Q, [["__scopeId", "data-v-7e8fe8f4"]]);
+const OverlayRender = /* @__PURE__ */ _export_sfc(_sfc_main$2Q, [["__scopeId", "data-v-1d10a573"]]);
 let activeHoverId = 0;
 function useHoverDelay(callback, delay = 120) {
   let timer = null;
@@ -55178,217 +55830,6 @@ const builtinComponents = {
   [BuiltinComponentTypeConst.InlineImage]: _sfc_main$2L,
   [BuiltinComponentTypeConst.Text]: _sfc_main$2K
 };
-const OUTLINE_BORDER_INSET = 1;
-const borderConfig = {
-  outer: {
-    color: "rgb(128, 128, 128)",
-    width: 1
-  },
-  inner: {
-    color: "rgb(128, 128, 128)",
-    width: 1
-  },
-  guide: {
-    color: "#026AC8",
-    width: 2
-  }
-};
-const subThemeConfig = {
-  "fixed-table": {
-    label: "固定表",
-    color: "#309C41",
-    background: "rgba(48,156,65,0.1)",
-    labelBjColor: "rgba(48,156,65,0.8)"
-  },
-  "check-table": {
-    label: "检验表",
-    color: "#309C41",
-    background: "rgba(48,156,65,0.1)",
-    labelBjColor: "rgba(48,156,65,0.8)"
-  },
-  "dynamic-table": {
-    label: "动态表",
-    color: "#026AC8",
-    background: "rgba(2,106,200,0.1)",
-    labelBjColor: "rgba(2,106,200,0.8)"
-  },
-  "2d-table": {
-    label: "二维表",
-    color: "#026AC8",
-    background: "rgba(2,106,200,0.1)",
-    labelBjColor: "rgba(2,106,200,0.8)"
-  },
-  "table-header": {
-    label: "表头",
-    color: "rgba(245, 69, 71, 1)",
-    background: "rgba(245, 69, 71, 0.1)",
-    labelBjColor: "rgba(245, 69, 71, 0.8)"
-  },
-  "data-group": {
-    label: "数据分组",
-    color: "#F77E4A",
-    background: "rgba(247,126,74,0.1)",
-    labelBjColor: "rgba(247,126,74,0.8)"
-  },
-  "data-group-2d": {
-    label: "动态关联",
-    color: "#F77E4A",
-    background: "rgba(247,126,74,0.1)",
-    labelBjColor: "rgba(247,126,74,0.8)"
-  }
-};
-const getStyleByType = (type4) => {
-  const config = subThemeConfig[type4];
-  return {
-    strokeColor: config?.color || "#000",
-    backgroundColor: config?.background || "transparent",
-    label: config?.label || "",
-    labelBjColor: config?.labelBjColor || "#666"
-  };
-};
-const EPS = 1e-3;
-function clipHLineByMerges(line, merges) {
-  let segments = [line];
-  merges.forEach((rect) => {
-    segments = segments.flatMap((seg) => {
-      const insideY = seg.y > rect.y + EPS && seg.y < rect.y + rect.height - EPS;
-      if (!insideY) return [seg];
-      if (seg.x2 <= rect.x + EPS || seg.x1 >= rect.x + rect.width - EPS) return [seg];
-      if (rect.x <= seg.x1 + EPS && rect.x + rect.width >= seg.x2 - EPS) return [];
-      const res = [];
-      if (seg.x1 < rect.x - EPS) res.push({ ...seg, x2: rect.x });
-      if (seg.x2 > rect.x + rect.width + EPS) res.push({ ...seg, x1: rect.x + rect.width });
-      return res;
-    });
-  });
-  return segments;
-}
-function clipVLineByMerges(line, merges) {
-  let segments = [line];
-  merges.forEach((rect) => {
-    segments = segments.flatMap((seg) => {
-      const insideX = seg.x > rect.x + EPS && seg.x < rect.x + rect.width - EPS;
-      if (!insideX) return [seg];
-      if (seg.y2 <= rect.y + EPS || seg.y1 >= rect.y + rect.height - EPS) return [seg];
-      if (rect.y <= seg.y1 + EPS && rect.y + rect.height >= seg.y2 - EPS) return [];
-      const res = [];
-      if (seg.y1 < rect.y - EPS) res.push({ ...seg, y2: rect.y });
-      if (seg.y2 > rect.y + rect.height + EPS) res.push({ ...seg, y1: rect.y + rect.height });
-      return res;
-    });
-  });
-  return segments;
-}
-function createTableOutlineLayer(options) {
-  const { cells, inset = 1 } = options;
-  if (!cells.length) return { backgroundRect: null, hLines: [], vLines: [], labelPos: void 0 };
-  const minX = Math.min(...cells.map((c2) => c2.x));
-  const minY = Math.min(...cells.map((c2) => c2.y));
-  const maxX = Math.max(...cells.map((c2) => c2.x + c2.width));
-  const maxY = Math.max(...cells.map((c2) => c2.y + c2.height));
-  const minLY = Math.min(...cells.map((c2) => c2.layoutY));
-  const maxLX = Math.max(...cells.map((c2) => c2.layoutX + c2.width));
-  const maxLY = Math.max(...cells.map((c2) => c2.layoutY + c2.height));
-  const backgroundRect = {
-    x: minX + inset,
-    y: minY + inset,
-    width: maxX - minX - inset * 2,
-    height: maxY - minY - inset * 2
-  };
-  const hLines = [
-    { x1: minX + inset, x2: maxX - inset, y: minY + inset },
-    // top
-    { x1: minX + inset, x2: maxX - inset, y: maxY - inset }
-    // bottom
-  ];
-  const vLines = [
-    { x: minX + inset, y1: minY + inset, y2: maxY - inset },
-    // left
-    { x: maxX - inset, y1: minY + inset, y2: maxY - inset }
-    // right
-  ];
-  const labelPos = { x: maxLX - inset, y1: minLY + inset, y2: maxLY - inset };
-  return { backgroundRect, hLines, vLines, labelPos };
-}
-const accumulate = (list) => {
-  const result = [0];
-  let acc = 0;
-  for (const n of list) {
-    acc += n;
-    result.push(acc);
-  }
-  return result;
-};
-const inRange = (n, min, max) => n > min && n < max;
-function mapCellsToOutlineCells(cells) {
-  return cells.map((c2) => ({
-    x: c2.x,
-    y: c2.rowY,
-    layoutX: c2.layoutX,
-    layoutY: c2.layoutY,
-    width: c2.width,
-    height: c2.height
-  }));
-}
-function groupBy(list, getKey) {
-  return list.reduce((acc, item) => {
-    const key = getKey(item);
-    (acc[key] ||= []).push(item);
-    return acc;
-  }, {});
-}
-function buildPosMap(layers, getRect, toDom) {
-  const res = {};
-  for (const [id, layer] of Object.entries(layers)) {
-    const rect = getRect(layer);
-    if (!rect) continue;
-    const pos = toDom(rect);
-    if (pos) res[id] = pos;
-  }
-  return res;
-}
-function getDataIndexLayersMap({
-  type: type4,
-  cells,
-  isEdit,
-  convertExtraProps
-}) {
-  const getDataIndex = (cell) => {
-    return type4 === "2d-table" && isEdit ? cell.subRenderer?.xDataIndex : cell.subRenderer?.dataIndex;
-  };
-  const _cells = cells.filter(
-    (cell) => getDataIndex(cell) != null && cell?.subRenderer?.type === type4
-  );
-  if (!_cells.length) return {};
-  const grouped = groupBy(
-    _cells,
-    (cell) => `${cell.subRenderer.id}_dataIndex${getDataIndex(cell)}`
-  );
-  const layersMapEntries = Object.entries(grouped).map(([id, __cells]) => {
-    const firstCell = __cells[0];
-    const lastCell = __cells[__cells.length - 1];
-    const isFirstDataGroup = getDataIndex(firstCell) === 0;
-    const bgLayer = createTableOutlineLayer({
-      cells: mapCellsToOutlineCells(__cells),
-      inset: 4
-    });
-    const borderLayer = isFirstDataGroup ? createTableOutlineLayer({
-      cells: mapCellsToOutlineCells(__cells),
-      inset: OUTLINE_BORDER_INSET
-    }) : { hLines: [], vLines: [], backgroundRect: null, labelPos: void 0 };
-    return [
-      id,
-      {
-        ...borderLayer,
-        ...convertExtraProps(firstCell),
-        showBorder: isFirstDataGroup,
-        placeholderBjRect: bgLayer.backgroundRect,
-        lastCell
-      }
-    ];
-  });
-  return Object.fromEntries(layersMapEntries);
-}
 const baseCanvasAttrs = {
   /** 不参与事件命中检测 */
   listening: false,
@@ -55699,49 +56140,6 @@ const _sfc_main$2D = /* @__PURE__ */ defineComponent({
         }))
       )
     );
-    const dataGroup2DCells = computed(() => {
-      const dataGroup2DList = [];
-      const cells = [];
-      props.rows.flatMap((row) => row.cells).filter((cell) => cell?.subRenderer?.id && ["check-table", "2d-table"].includes(cell.subRenderer.type)).forEach((cell) => {
-        if (dataGroup2DList.find((o) => o.subTableId === cell.subRenderer.id)) return;
-        dataGroup2DList.push({
-          subTableId: cell.subRenderer.id,
-          subTableType: cell.subRenderer.type,
-          subTableValuePath: cell.subRenderer.valuePath,
-          dataGroup2DAreaRange: cell.subRenderer?.dataGroup2DAreaRange
-        });
-      });
-      dataGroup2DList.forEach(({ subTableId, subTableType, subTableValuePath, dataGroup2DAreaRange }) => {
-        if (!dataGroup2DAreaRange?.start) return;
-        const {
-          start: { row: startRow, col: startCol },
-          end: { row: endRow, col: endCol }
-        } = dataGroup2DAreaRange;
-        props.rows.forEach((row, rowIndex) => {
-          row.cells.forEach((cell, colIndex) => {
-            const isInRange = rowIndex >= startRow && rowIndex <= endRow && colIndex >= startCol && colIndex <= endCol;
-            if (isInRange) {
-              const fakeDataIndex = colIndex - dataGroup2DAreaRange.start.col;
-              cells.push({
-                ...cell,
-                rowY: row.y,
-                layoutY: row.layoutY,
-                // 伪造动态关联的 subRenderer
-                subRenderer: {
-                  id: subTableId,
-                  type: subTableType,
-                  valuePath: subTableValuePath,
-                  dataIndex: fakeDataIndex,
-                  xDataIndex: fakeDataIndex
-                }
-              });
-            }
-          });
-        });
-      });
-      const uniqueCells = Object.values(groupBy(cells, (c2) => c2.id)).map((cells2) => cells2[0]).filter(Boolean);
-      return uniqueCells;
-    });
     const pageBaseOffset = computed(() => {
       const node = props.doc.layoutMapper.getBaseMetaNodeById(tableId.value);
       if (!node) return null;
@@ -55753,7 +56151,15 @@ const _sfc_main$2D = /* @__PURE__ */ defineComponent({
       };
     });
     const outlineLayers = computed(() => {
-      const grouped = groupBy(subTableCells.value, (cell) => cell.subRenderer.id);
+      const filteredCells = subTableCells.value.filter(({ subRenderer }) => {
+        if (subRenderer) {
+          const { type: type4, cellZone } = subRenderer;
+          return getIsDataGroup2DTable(type4) ? getIs2DCellInSubTable(cellZone) : true;
+        } else {
+          return true;
+        }
+      });
+      const grouped = groupBy(filteredCells, (cell) => cell.subRenderer.id);
       return Object.fromEntries(
         Object.entries(grouped).map(([id, cells]) => {
           const outline = createTableOutlineLayer({
@@ -55775,7 +56181,7 @@ const _sfc_main$2D = /* @__PURE__ */ defineComponent({
       () => getDataIndexLayersMap({
         type: "fixed-table",
         cells: subTableCells.value,
-        isEdit: props.doc.mode === DocModeTypeConst.Edit,
+        isDesign: true,
         convertExtraProps: (cell) => ({
           type: "data-group",
           valuePath: cell.subRenderer.valuePath,
@@ -55786,8 +56192,8 @@ const _sfc_main$2D = /* @__PURE__ */ defineComponent({
     const checkTableDataGroup2DLayersMap = computed(
       () => getDataIndexLayersMap({
         type: "check-table",
-        cells: dataGroup2DCells.value,
-        isEdit: props.doc.mode === DocModeTypeConst.Edit,
+        cells: subTableCells.value,
+        isDesign: true,
         convertExtraProps: (cell) => ({
           type: "data-group-2d",
           valuePath: cell.subRenderer.valuePath,
@@ -55798,8 +56204,8 @@ const _sfc_main$2D = /* @__PURE__ */ defineComponent({
     const _2DTableDataGroup2DLayersMap = computed(
       () => getDataIndexLayersMap({
         type: "2d-table",
-        cells: dataGroup2DCells.value,
-        isEdit: props.doc.mode === DocModeTypeConst.Edit,
+        cells: subTableCells.value,
+        isDesign: true,
         convertExtraProps: (cell) => ({
           type: "data-group-2d",
           valuePath: cell.subRenderer.valuePath,
@@ -56633,10 +57039,10 @@ const _sfc_main$2y = /* @__PURE__ */ defineComponent({
       downRowNum: 1
     });
     const getCtx = () => {
-      const { subRenderer } = props.cell;
+      const { valuePath, dataIndex, yDataIndex } = props.cell.subRenderer;
       return {
-        path: subRenderer.valuePath,
-        index: subRenderer.dataIndex
+        path: valuePath,
+        index: dataIndex ?? yDataIndex ?? 0
       };
     };
     const readonly2 = computed(() => {
@@ -56800,7 +57206,7 @@ const _sfc_main$2y = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$2y, [["__scopeId", "data-v-adc8fb9a"]]);
+const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$2y, [["__scopeId", "data-v-e2cc91ff"]]);
 const _sfc_main$2x = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
@@ -56844,7 +57250,7 @@ const _sfc_main$2x = /* @__PURE__ */ defineComponent({
       return getDataIndexLayersMap({
         type: type4,
         cells: subTableCells.value,
-        isEdit: props.doc.mode === DocModeTypeConst.Edit,
+        isDesign: false,
         convertExtraProps: () => ({
           type: type4,
           placeholder: "",
@@ -59215,8 +59621,10 @@ const _sfc_main$2l = /* @__PURE__ */ defineComponent({
       }[type4];
       const usedSubModelKeys = (docInst.value.model?.document.body.children || []).map((w2) => {
         if (w2.name === "w:tbl" && (w2.hasBounded || w2.hasCheckTable || w2.hasRepeating || w2.has2DTable)) {
-          const subInfoList = [...w2.bounded, ...w2.checkTable, ...w2.repeating, ...w2._2DTable];
-          return subInfoList.map((info) => info.valuePath.replace("$.", ""));
+          const subTableRegions = [...w2.bounded, ...w2.checkTable, ...w2.repeating, ...w2._2DTable];
+          return subTableRegions.flatMap((region) => {
+            return region.valuePath.replace("$.", "").split(":");
+          });
         } else {
           return [];
         }
@@ -59545,7 +59953,7 @@ const _sfc_main$2l = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const WordTable = /* @__PURE__ */ _export_sfc(_sfc_main$2l, [["__scopeId", "data-v-880a7ed3"]]);
+const WordTable = /* @__PURE__ */ _export_sfc(_sfc_main$2l, [["__scopeId", "data-v-77cd5ff0"]]);
 const _hoisted_1$1F = { class: "ribbon" };
 const _hoisted_2$14 = { class: "ribbon-content-wrapper" };
 const _sfc_main$2k = /* @__PURE__ */ defineComponent({
@@ -59735,17 +60143,24 @@ function useHighlightSearch() {
     highlightName
   };
 }
-function createDesignFieldToWidgetFactory(getFieldManifest) {
+function buildPaletteExtra(manifest2, label, opts) {
+  return {
+    extensions: manifest2.extensions,
+    biz: {
+      fromField: true,
+      source: opts.source ?? "palette",
+      fieldIdentity: { label }
+    }
+  };
+}
+function createDesignFieldToWidgetFactory(getManifest) {
   return function createWidgetFromField(field, opts = {}) {
-    const manifest2 = getFieldManifest(field.type);
+    const manifest2 = getManifest(field.type);
     const valuePath = generateValuePath(field.key, opts.parentFieldKey || "");
     return {
       id: uuid(),
       type: manifest2.component,
-      layout: {
-        width: 70,
-        height: 18
-      },
+      layout: { width: 70, height: 18 },
       props: {
         ...manifest2.defaultProps ?? {},
         ...opts.overrideProps ?? {}
@@ -59766,16 +60181,31 @@ function createDesignFieldToWidgetFactory(getFieldManifest) {
         valuePath,
         ...opts.parentFieldKey ? { subFieldKey: opts.parentFieldKey } : void 0
       },
-      extra: {
-        extensions: manifest2.extensions,
-        biz: {
-          fromField: true,
-          source: opts.source ?? "palette",
-          fieldIdentity: {
-            label: field.name
-          }
-        }
-      }
+      extra: buildPaletteExtra(manifest2, field.name, opts)
+    };
+  };
+}
+function createDesignPaperWidgetToWidgetFactory(getManifest) {
+  return function createWidgetFromPaperWidget(widget, opts = {}) {
+    const manifest2 = getManifest(widget.type);
+    return {
+      id: uuid(),
+      type: manifest2.component,
+      layout: manifest2.defaultLayout || {},
+      props: {
+        ...manifest2.defaultProps ?? {},
+        ...opts.overrideProps ?? {}
+      },
+      behavior: {
+        draggable: manifest2.allowDrag,
+        resizable: false,
+        copyable: false,
+        removable: false,
+        droppable: false,
+        outOfFlow: !!manifest2.outOfFlow
+      },
+      widget: { widgetType: widget.type },
+      extra: buildPaletteExtra(manifest2, widget.name, opts)
     };
   };
 }
@@ -59802,19 +60232,18 @@ const _sfc_main$2i = /* @__PURE__ */ defineComponent({
     const { keyword, highlightName } = useHighlightSearch();
     const createFieldToWidget = createDesignFieldToWidgetFactory(designCtx.getFieldManifest);
     const subFieldKey = computed(() => {
-      if (!interCtx.panelData) return "";
+      if (!interCtx.panelData?.context?.subFieldKey) return "";
       return getLastSegment(interCtx.panelData.context.subFieldKey);
     });
     const modelKey = computed(() => {
       if (!interCtx.panelData) return "";
-      const mainModelKey = interCtx.panelData.context.mainModelKey;
+      const { mainModelKey, isDataGroup2DClicked } = interCtx.panelData.context;
       if (!mainModelKey) return "";
       const fullSubKey = subFieldKey.value;
       if (fullSubKey) {
         let singleSubKey = fullSubKey;
         if (fullSubKey.includes(":")) {
-          const keyIndex = interCtx.panelData.context.isDataGroup2DClicked ? 1 : 0;
-          singleSubKey = fullSubKey.split(":")[keyIndex];
+          singleSubKey = fullSubKey.split(":")[isDataGroup2DClicked ? 1 : 0];
         }
         const field = designCtx.runtime.getFieldList(mainModelKey)?.find((f) => f.key === singleSubKey);
         return field?.bindInfo ?? "";
@@ -59929,42 +60358,7 @@ const _sfc_main$2i = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ToolkitContentFields = /* @__PURE__ */ _export_sfc(_sfc_main$2i, [["__scopeId", "data-v-3fbe453b"]]);
-function createDesignPaperWidgetToWidgetFactory(getPaperWidgetManifest) {
-  return function(widget, opts = {}) {
-    const manifest2 = getPaperWidgetManifest(widget.type);
-    return {
-      id: uuid(),
-      type: manifest2.component,
-      layout: manifest2.defaultLayout || {},
-      props: {
-        ...manifest2.defaultProps ?? {},
-        ...opts.overrideProps ?? {}
-      },
-      behavior: {
-        draggable: manifest2.allowDrag,
-        resizable: false,
-        copyable: false,
-        removable: false,
-        droppable: false,
-        outOfFlow: !!manifest2.outOfFlow
-      },
-      widget: {
-        widgetType: widget.type
-      },
-      extra: {
-        extensions: manifest2.extensions,
-        biz: {
-          fromField: true,
-          source: opts.source ?? "palette",
-          fieldIdentity: {
-            label: widget.name
-          }
-        }
-      }
-    };
-  };
-}
+const ToolkitContentFields = /* @__PURE__ */ _export_sfc(_sfc_main$2i, [["__scopeId", "data-v-2e5d2168"]]);
 const _hoisted_1$1C = { class: "toolkit-content-widgets" };
 const _hoisted_2$11 = { key: 0 };
 const _hoisted_3$M = ["data-type", "draggable", "onDragstart"];
@@ -60014,7 +60408,7 @@ const _sfc_main$2h = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ToolkitContentWidgets = /* @__PURE__ */ _export_sfc(_sfc_main$2h, [["__scopeId", "data-v-1e28101c"]]);
+const ToolkitContentWidgets = /* @__PURE__ */ _export_sfc(_sfc_main$2h, [["__scopeId", "data-v-393cb2aa"]]);
 const _hoisted_1$1B = { class: "designer_toolkit-wrapper" };
 const _sfc_main$2g = /* @__PURE__ */ defineComponent({
   __name: "toolkit",
@@ -61121,7 +61515,7 @@ const _sfc_main$27 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ValidationCommentItem = /* @__PURE__ */ _export_sfc(_sfc_main$27, [["__scopeId", "data-v-a4657686"]]);
+const ValidationCommentItem = /* @__PURE__ */ _export_sfc(_sfc_main$27, [["__scopeId", "data-v-553b2a25"]]);
 const _hoisted_1$1x = {
   key: 0,
   class: "validation-comment-layer"
@@ -65081,27 +65475,6 @@ const __vite_glob_0_7$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.d
   __proto__: null,
   default: _sfc_main$1Q
 }, Symbol.toStringTag, { value: "Module" }));
-function usePaperWidgetMeta(widget) {
-  const pageWidgetMeta = computed(() => widget?.pageWidgetMeta ?? {});
-  const pageWidgetProps = computed(() => pageWidgetMeta.value.props ?? {});
-  const widgetType = computed(() => pageWidgetMeta.value.type);
-  return {
-    pageWidgetMeta,
-    pageWidgetProps,
-    widgetType
-  };
-}
-function usePaperWidgetStaticAttrs(widget) {
-  const { docInst, isDesignMode } = useDocPubApiContext();
-  const { pageWidgetMeta, pageWidgetProps, widgetType } = usePaperWidgetMeta(widget);
-  return {
-    docInst,
-    isDesignMode,
-    pageWidgetMeta,
-    pageWidgetProps,
-    widgetType
-  };
-}
 const UNIT_WIDTH = 1;
 const _sfc_main$1P = /* @__PURE__ */ defineComponent({
   __name: "pw-barcode-render",
@@ -66723,7 +67096,7 @@ const _sfc_main$1E = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const PaperPanel = /* @__PURE__ */ _export_sfc(_sfc_main$1E, [["__scopeId", "data-v-22c28a0f"]]);
+const PaperPanel = /* @__PURE__ */ _export_sfc(_sfc_main$1E, [["__scopeId", "data-v-3cf8e3a5"]]);
 const schema$c = {
   key: "paper.basic",
   title: "表单属性",
@@ -66974,7 +67347,7 @@ const _sfc_main$1C = /* @__PURE__ */ defineComponent({
     });
     const isBindDataGroup = withLayoutComputed(() => !!regionRef.value?.itemRegion);
     const modelKey = computed(() => getLastSegment(props.active.context.mainModelKey));
-    const fieldKey = computed(() => getLastSegment(regionRef.value?.valuePath));
+    const fieldKey = computed(() => getLastSegment(regionRef.value?.subFieldKey));
     const fieldInfo = computed(() => {
       if (!modelKey.value || !fieldKey.value) return null;
       const list = designCtx.runtime.getFieldList(modelKey.value);
@@ -67080,7 +67453,7 @@ const _sfc_main$1C = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _2DTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1C, [["__scopeId", "data-v-654c8531"]]);
+const _2DTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1C, [["__scopeId", "data-v-7d2be0ce"]]);
 const schema$a = {
   key: "2d-table.basic",
   title: [
@@ -67246,7 +67619,7 @@ const _sfc_main$1A = /* @__PURE__ */ defineComponent({
     });
     const isBindDataGroup = withLayoutComputed(() => !!regionRef.value?.itemRegion);
     const modelKey = computed(() => getLastSegment(props.active.context.mainModelKey));
-    const fieldKey = computed(() => getLastSegment(regionRef.value?.valuePath));
+    const fieldKey = computed(() => getLastSegment(regionRef.value?.subFieldKey));
     const fieldInfo = computed(() => {
       if (!modelKey.value || !fieldKey.value) return null;
       const list = designCtx.runtime.getFieldList(modelKey.value);
@@ -67352,7 +67725,7 @@ const _sfc_main$1A = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const CheckTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1A, [["__scopeId", "data-v-acfe3e02"]]);
+const CheckTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1A, [["__scopeId", "data-v-5792e4ce"]]);
 const schema$8 = {
   key: "check-table.basic",
   title: [
@@ -75904,7 +76277,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const optionDropdown = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["__scopeId", "data-v-acc41a8a"]]);
+const optionDropdown = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["__scopeId", "data-v-d81082a4"]]);
 const optionDropdown$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: optionDropdown
@@ -76125,7 +76498,7 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const treeDropdown = /* @__PURE__ */ _export_sfc(_sfc_main$c, [["__scopeId", "data-v-2eb67208"]]);
+const treeDropdown = /* @__PURE__ */ _export_sfc(_sfc_main$c, [["__scopeId", "data-v-4a40a7ac"]]);
 const treeDropdown$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: treeDropdown
@@ -76161,7 +76534,7 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const datetimeDropdown = /* @__PURE__ */ _export_sfc(_sfc_main$b, [["__scopeId", "data-v-aab79189"]]);
+const datetimeDropdown = /* @__PURE__ */ _export_sfc(_sfc_main$b, [["__scopeId", "data-v-a395aede"]]);
 const datetimeDropdown$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: datetimeDropdown
@@ -76193,7 +76566,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const timeDropdown = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__scopeId", "data-v-0875dd7d"]]);
+const timeDropdown = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__scopeId", "data-v-b2862e2a"]]);
 const timeDropdown$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: timeDropdown
@@ -77718,7 +78091,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const uploadFileDialog = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-e1c998a1"]]);
+const uploadFileDialog = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-8f81c7bf"]]);
 const uploadFileDialog$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: uploadFileDialog
@@ -78017,7 +78390,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const uploadImageDialog = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-65b78b04"]]);
+const uploadImageDialog = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-a4f2d7a5"]]);
 const uploadImageDialog$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: uploadImageDialog
@@ -78204,7 +78577,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const signatureDialog = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-f0714089"]]);
+const signatureDialog = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-41124487"]]);
 const signatureDialog$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: signatureDialog