@gct-paas/word 0.1.33 → 0.1.35

package/dist/index.es.js

@@ -17464,12 +17464,12 @@ const getFetch = (config) => {
     Response,
     fetch2
   ];
-  let len = seeds.length, i = len, seed2, target, map2 = seedCache;
+  let len = seeds.length, i = len, seed2, target, map = seedCache;
   while (i--) {
     seed2 = seeds[i];
-    target = map2.get(seed2);
-    target === void 0 && map2.set(seed2, target = i ? /* @__PURE__ */ new Map() : factory(env));
-    map2 = target;
+    target = map.get(seed2);
+    target === void 0 && map.set(seed2, target = i ? /* @__PURE__ */ new Map() : factory(env));
+    map = target;
   }
   return target;
 };
@@ -19033,11 +19033,11 @@ function copyObject(source, props, object4, customizer) {
   }
   return object4;
 }
-var nativeMax$2 = Math.max;
+var nativeMax$1 = Math.max;
 function overRest(func, start, transform) {
-  start = nativeMax$2(start === void 0 ? func.length - 1 : start, 0);
+  start = nativeMax$1(start === void 0 ? func.length - 1 : start, 0);
   return function() {
-    var args = arguments, index2 = -1, length = nativeMax$2(args.length - start, 0), array4 = Array(length);
+    var args = arguments, index2 = -1, length = nativeMax$1(args.length - start, 0), array4 = Array(length);
     while (++index2 < length) {
       array4[index2] = args[start + index2];
     }
@@ -19344,8 +19344,8 @@ function isKeyable(value) {
   var type4 = typeof value;
   return type4 == "string" || type4 == "number" || type4 == "symbol" || type4 == "boolean" ? value !== "__proto__" : value === null;
 }
-function getMapData(map2, key) {
-  var data = map2.__data__;
+function getMapData(map, key) {
+  var data = map.__data__;
   return isKeyable(key) ? data[typeof key == "string" ? "string" : "hash"] : data.map;
 }
 function mapCacheDelete(key) {
@@ -19877,9 +19877,9 @@ function equalArrays(array4, other, bitmask, customizer, equalFunc, stack) {
   stack["delete"](other);
   return result;
 }
-function mapToArray(map2) {
-  var index2 = -1, result = Array(map2.size);
-  map2.forEach(function(value, key) {
+function mapToArray(map) {
+  var index2 = -1, result = Array(map.size);
+  map.forEach(function(value, key) {
     result[++index2] = [key, value];
   });
   return result;
@@ -20203,7 +20203,7 @@ var now = function() {
   return root.Date.now();
 };
 var FUNC_ERROR_TEXT = "Expected a function";
-var nativeMax$1 = Math.max, nativeMin = Math.min;
+var nativeMax = Math.max, nativeMin = Math.min;
 function debounce(func, wait, options) {
   var lastArgs, lastThis, maxWait, result, timerId, lastCallTime, lastInvokeTime = 0, leading = false, maxing = false, trailing = true;
   if (typeof func != "function") {
@@ -20213,7 +20213,7 @@ function debounce(func, wait, options) {
   if (isObject(options)) {
     leading = !!options.leading;
     maxing = "maxWait" in options;
-    maxWait = maxing ? nativeMax$1(toNumber(options.maxWait) || 0, wait) : maxWait;
+    maxWait = maxing ? nativeMax(toNumber(options.maxWait) || 0, wait) : maxWait;
     trailing = "trailing" in options ? !!options.trailing : trailing;
   }
   function invokeFunc(time) {
@@ -20369,20 +20369,6 @@ function last(array4) {
   var length = array4 == null ? 0 : array4.length;
   return length ? array4[length - 1] : void 0;
 }
-function baseMap(collection, iteratee) {
-  var index2 = -1, result = isArrayLike(collection) ? Array(collection.length) : [];
-  baseEach(collection, function(value, key, collection2) {
-    result[++index2] = iteratee(value, key, collection2);
-  });
-  return result;
-}
-function map(collection, iteratee) {
-  var func = isArray(collection) ? arrayMap : baseMap;
-  return func(collection, baseIteratee(iteratee));
-}
-function flatMap(collection, iteratee) {
-  return baseFlatten(map(collection, iteratee));
-}
 var objectProto$2 = Object.prototype;
 var hasOwnProperty$2 = objectProto$2.hasOwnProperty;
 var groupBy$1 = createAggregator(function(result, value, key) {
@@ -20506,18 +20492,6 @@ function basePickBy(object4, paths, predicate) {
   }
   return result;
 }
-function pickBy(object4, predicate) {
-  if (object4 == null) {
-    return {};
-  }
-  var props = arrayMap(getAllKeysIn(object4), function(prop) {
-    return [prop];
-  });
-  predicate = baseIteratee(predicate);
-  return basePickBy(object4, props, function(value, path2) {
-    return predicate(value, path2[0]);
-  });
-}
 function basePick(object4, paths) {
   return basePickBy(object4, paths, function(value, path2) {
     return hasIn(object4, path2);
@@ -20529,23 +20503,6 @@ var pick = flatRest(function(object4, paths) {
 function set(object4, path2, value) {
   return object4 == null ? object4 : baseSet(object4, path2, value);
 }
-var nativeMax = Math.max;
-function unzip(array4) {
-  if (!(array4 && array4.length)) {
-    return [];
-  }
-  var length = 0;
-  array4 = arrayFilter(array4, function(group) {
-    if (isArrayLikeObject(group)) {
-      length = nativeMax(group.length, length);
-      return true;
-    }
-  });
-  return baseTimes(length, function(index2) {
-    return arrayMap(array4, baseProperty(index2));
-  });
-}
-var zip = baseRest(unzip);
 function fallbackUUID() {
   const bytes = new Uint8Array(16);
   crypto?.getRandomValues?.(bytes);
@@ -20604,12 +20561,26 @@ function generateValuePath(fieldLink, subFieldKey) {
     return `$.${fieldLink}`;
   }
 }
+function getLastSegment(str, separator = ".") {
+  if (!str) return "";
+  const index2 = str.lastIndexOf(separator);
+  return index2 === -1 ? str : str.slice(index2 + 1);
+}
 function replacePathIndexPlaceholders(params) {
-  const { x: x2, y: y2, templatePath } = params;
+  const { refPath, templatePath } = params;
+  let n = params.n;
+  let x2 = params.x;
+  let y2 = params.y;
+  if (refPath) {
+    const indices = [...refPath.matchAll(/\[(\d+)\]/g)].map((m) => Number(m[1]));
+    y2 ??= indices[0];
+    x2 ??= indices[1] ?? indices[0];
+    n ??= indices[0];
+  }
   let path2 = templatePath;
   path2 = replacePathIndexPlaceholder(y2, path2, "n_y");
   path2 = replacePathIndexPlaceholder(x2, path2, "n_x");
-  path2 = replacePathIndexPlaceholder(x2, path2);
+  path2 = replacePathIndexPlaceholder(n ?? x2, path2, "n");
   return path2;
 }
 function replacePathIndexPlaceholder(refPath, templatePath, placeholder = "n") {
@@ -20625,17 +20596,13 @@ function replacePathIndexPlaceholder(refPath, templatePath, placeholder = "n") {
   }
   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 parseValuePath(valuePath) {
   if (!valuePath) {
     return {
       raw: "",
       normalized: "",
       fieldKey: "",
+      fieldPath: "",
       isRoot: false,
       isSubTable: false,
       isLink: false,
@@ -20665,11 +20632,14 @@ function parseValuePath(valuePath) {
     raw: valuePath,
     normalized,
     fieldKey,
+    fieldPath: fieldKey ? `$.${fieldKey}` : "",
     parentFieldKey,
+    parentFieldPath: parentFieldKey ? `$.${parentFieldKey}` : "",
     isRoot: segments.length === 1,
     isSubTable: segments.length > 1,
     isLink,
     linkFieldKey,
+    linkFieldPath: linkFieldKey ? `$.${linkFieldKey}` : "",
     hasIndex,
     segments
   };
@@ -20715,10 +20685,10 @@ function createRafOnce() {
   return { schedule, syncSchedule, cancel };
 }
 function listToTree(list, transform = (n) => n) {
-  const map2 = /* @__PURE__ */ new Map();
+  const map = /* @__PURE__ */ new Map();
   const roots = [];
   list.forEach((item) => {
-    map2.set(item.value, item);
+    map.set(item.value, item);
     item.children = [];
   });
   list.forEach((node) => {
@@ -20726,7 +20696,7 @@ function listToTree(list, transform = (n) => n) {
     if (!parentId || parentId === "ROOT") {
       roots.push(transform(node));
     } else {
-      const parent2 = map2.get(parentId);
+      const parent2 = map.get(parentId);
       parent2?.children?.push(transform(node));
     }
   });
@@ -22234,7 +22204,7 @@ class WpPr extends ModelNode {
     while (node.parent) {
       node = node.parent;
     }
-    this._cachedWStyles = node.styles;
+    this._cachedWStyles = node.styles ?? node.root?.styles;
     return this._cachedWStyles;
   }
   /**
@@ -22463,6 +22433,13 @@ class Wp extends ModelGroup {
   constructor(options) {
     super(options);
     this.pPr = options.pPr;
+    this.bindPPrParent();
+  }
+  /** 将 pPr 挂到段落节点，供样式解析沿 parent 链查找 styles */
+  bindPPrParent() {
+    if (this.pPr) {
+      this.pPr.parent = this;
+    }
   }
   get styleId() {
     return this.pPr?.styleId;
@@ -22522,6 +22499,7 @@ class Wp extends ModelGroup {
     wp.runs.forEach((run) => {
       run.parent = wp;
     });
+    wp.bindPPrParent();
     return wp;
   }
   toXmlJson() {
@@ -22590,6 +22568,7 @@ class Wp extends ModelGroup {
   ensurePPr() {
     if (!this.pPr) {
       this.pPr = new WpPr({ elements: [] });
+      this.bindPPrParent();
     }
     return this.pPr;
   }
@@ -22725,6 +22704,15 @@ class Wtc extends ModelGroup {
   get contents() {
     return this.children.filter((child) => child instanceof Wp);
   }
+  /** 单元格垂直对齐（w:tcPr/w:vAlign） */
+  get vAlign() {
+    const elem = this.tcPrRaw ? pickElement(this.tcPrRaw, "w:vAlign") : void 0;
+    const val = elem?.["@attrs"]?.["w:val"];
+    if (val === "center" || val === "bottom" || val === "top") {
+      return val;
+    }
+    return void 0;
+  }
   get firstContent() {
     return this.contents[0];
   }
@@ -23580,6 +23568,17 @@ class SubTableHeaderRegion extends Region {
     });
   }
 }
+function resolveRegionValuePathKeys(valuePath) {
+  const parsed = parseValuePath(valuePath);
+  const subFieldKey = parsed.isLink ? parsed.parentFieldKey ?? "" : parsed.fieldKey;
+  const linkFieldKey = parsed.linkFieldKey ?? "";
+  return {
+    subFieldKey,
+    linkFieldKey,
+    subValuePath: subFieldKey ? `$.${subFieldKey}` : "",
+    linkValuePath: linkFieldKey ? `$.${linkFieldKey}` : ""
+  };
+}
 class RepeatingRegion extends Region {
   type = "repeating";
   name;
@@ -23595,6 +23594,18 @@ class RepeatingRegion extends Region {
       }
     };
   }
+  get subFieldKey() {
+    return resolveRegionValuePathKeys(this.valuePath).subFieldKey;
+  }
+  get linkFieldKey() {
+    return resolveRegionValuePathKeys(this.valuePath).linkFieldKey;
+  }
+  get subValuePath() {
+    return resolveRegionValuePathKeys(this.valuePath).subValuePath;
+  }
+  get linkValuePath() {
+    return resolveRegionValuePathKeys(this.valuePath).linkValuePath;
+  }
   toJSON() {
     return {
       ...super.toJSON(),
@@ -23624,6 +23635,18 @@ class BoundedItemRegion extends Region {
       this.parent = options.parent;
     }
   }
+  get subFieldKey() {
+    return this.parent?.subFieldKey ?? "";
+  }
+  get linkFieldKey() {
+    return this.parent?.linkFieldKey ?? "";
+  }
+  get subValuePath() {
+    return this.parent?.subValuePath ?? "";
+  }
+  get linkValuePath() {
+    return this.parent?.linkValuePath ?? "";
+  }
   remove() {
     this.parent.removeItemRegion();
   }
@@ -23669,6 +23692,18 @@ class BoundedRegion extends Region {
     };
     this.itemRegion = options.itemRegion;
   }
+  get subFieldKey() {
+    return resolveRegionValuePathKeys(this.valuePath).subFieldKey;
+  }
+  get linkFieldKey() {
+    return resolveRegionValuePathKeys(this.valuePath).linkFieldKey;
+  }
+  get subValuePath() {
+    return resolveRegionValuePathKeys(this.valuePath).subValuePath;
+  }
+  get linkValuePath() {
+    return resolveRegionValuePathKeys(this.valuePath).linkValuePath;
+  }
   toJSON() {
     return {
       ...super.toJSON(),
@@ -23724,6 +23759,18 @@ class DataGroup2DRegion extends Region {
       this.parent = options.parent;
     }
   }
+  get subFieldKey() {
+    return this.parent?.subFieldKey ?? "";
+  }
+  get linkFieldKey() {
+    return this.parent?.linkFieldKey ?? "";
+  }
+  get subValuePath() {
+    return this.parent?.subValuePath ?? "";
+  }
+  get linkValuePath() {
+    return this.parent?.linkValuePath ?? "";
+  }
   remove() {
     this.parent.removeItemRegion();
   }
@@ -23747,17 +23794,16 @@ class LinkSubTableRegion extends Region {
     this.itemRegion = options.itemRegion;
   }
   get subFieldKey() {
-    const parsed = parseValuePath(this.valuePath);
-    return parsed.isLink ? parsed.parentFieldKey ?? "" : parsed.fieldKey;
+    return resolveRegionValuePathKeys(this.valuePath).subFieldKey;
   }
   get linkFieldKey() {
-    return parseValuePath(this.valuePath).linkFieldKey ?? "";
+    return resolveRegionValuePathKeys(this.valuePath).linkFieldKey;
   }
   get subValuePath() {
-    return this.subFieldKey ? `$.${this.subFieldKey}` : "";
+    return resolveRegionValuePathKeys(this.valuePath).subValuePath;
   }
   get linkValuePath() {
-    return this.linkFieldKey ? `$.${this.linkFieldKey}` : "";
+    return resolveRegionValuePathKeys(this.valuePath).linkValuePath;
   }
   toLinkSubTableJSON() {
     return {
@@ -24632,235 +24678,79 @@ class WtblRegionManager {
     }
   }
 }
-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];
+function isLinkSubTableType(type4) {
+  if (!type4) return false;
+  return type4 === "2d-table" || type4 === "check-table";
+}
+function isLinkSubTableSubScopeZone(cellZone) {
+  if (!cellZone) return false;
+  return cellZone === "cross" || cellZone === "horizontal";
+}
+function getLinkSubTableCrossRange(region) {
+  const { itemRegion } = region;
+  if (!itemRegion) return void 0;
   return {
-    strokeColor: config?.color || "#000",
-    backgroundColor: config?.background || "transparent",
-    label: config?.label || "",
-    labelBjColor: config?.labelBjColor || "#666"
+    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)
+    }
   };
-};
-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;
-    });
+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 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 };
+  return maxCol;
 }
-const accumulate = (list) => {
-  const result = [0];
-  let acc = 0;
-  for (const n of list) {
-    acc += n;
-    result.push(acc);
+function resolveLinkSubTableCellZone(row, col, region, options = {}) {
+  const { itemRegion } = region;
+  if (!itemRegion) {
+    return region.contains(row, col) ? "horizontal" : void 0;
   }
-  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;
-  }, {});
+  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 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;
+function resolveLinkSubTableValuePath(region, cellZone) {
+  switch (cellZone) {
+    case "cross":
+      return region.valuePath;
+    case "vertical":
+      return region.linkValuePath;
+    case "horizontal":
+      return region.subValuePath;
   }
-  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);
+function isInLinkSubTableLayoutScope(row, col, region, options = {}) {
+  return resolveLinkSubTableCellZone(row, col, region, options) !== void 0;
 }
 class CellCollector {
   constructor(table) {
@@ -24900,19 +24790,19 @@ class CellCollector {
         }
         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, []);
+          const map = body.type === "repeating" ? this.repeatingGroups : body.type === "2d-table" ? this._2DTableGroups : body.type === "bounded" ? this.boundedGroups : this.checkTableGroups;
+          if (!map.has(body.regionId)) {
+            map.set(body.regionId, []);
           }
-          map2.get(body.regionId).push(position);
+          map.get(body.regionId).push(position);
         }
         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, []);
+          const map = item.type === "bounded-item" ? this.boundedItemGroups : this.dataGroup2DGroups;
+          if (!map.has(item.regionId)) {
+            map.set(item.regionId, []);
           }
-          map2.get(item.regionId).push(position);
+          map.get(item.regionId).push(position);
         }
       }
     }
@@ -25090,7 +24980,7 @@ class WtblCalculation {
       if (positions.length === 0) continue;
       const { minRow, maxRow, minCol, maxCol } = calculateGroupBounds(positions);
       const region = table.findRegionById(groupId);
-      if (region && getIsDataGroup2DTable(region.type)) {
+      if (region && isLinkSubTableType(region.type)) {
         region.start.row = minRow;
         region.end.row = maxRow;
         region.start.col = minCol;
@@ -26164,6 +26054,101 @@ class Wdocument extends ModelGroup {
     return result;
   }
 }
+class ParagraphStyleResolver {
+  /**
+   * 计算段落的有效样式
+   * 优先级：直接属性 > 样式定义 > 文档默认
+   *
+   * @param wpPr - 段落属性节点
+   * @returns 计算后的有效样式
+   *
+   * @example
+   * const style = ParagraphStyleResolver.resolve(wpPr);
+   * console.log(style.alignment); // 可能来自直接属性或样式定义
+   */
+  static resolve(wpPr) {
+    const directStyle = wpPr.directStyle;
+    if (!wpPr.styleId || !wpPr.wStyles) {
+      return directStyle;
+    }
+    const styleDefinition = wpPr.wStyles.resolveStyleDef(wpPr.styleId);
+    if (!styleDefinition) {
+      return directStyle;
+    }
+    const inheritedStyle = this.convertPPrToStyle(styleDefinition.pPr);
+    return this.mergeStyles(inheritedStyle, directStyle);
+  }
+  /**
+   * 从 WparagraphProperties 转换为 ParagraphStyle
+   *
+   * WparagraphProperties 是样式体系内部使用的数值化表示
+   * ParagraphStyle 是对外的字符串化 API 表示
+   *
+   * @param pPr - 段落属性对象（可能为 undefined）
+   * @returns 转换后的段落样式
+   */
+  static convertPPrToStyle(pPr) {
+    if (!pPr) {
+      return {};
+    }
+    const style = {};
+    if (pPr.alignment) {
+      style.alignment = pPr.alignment;
+    }
+    if (pPr.indent && Object.keys(pPr.indent).length > 0) {
+      style.indent = {
+        left: pPr.indent.left?.toString(),
+        right: pPr.indent.right?.toString(),
+        firstLine: pPr.indent.firstLine?.toString()
+      };
+    }
+    if (pPr.spacing && Object.keys(pPr.spacing).length > 0) {
+      style.spacing = {
+        before: pPr.spacing.before?.toString(),
+        after: pPr.spacing.after?.toString(),
+        line: pPr.spacing.line?.toString(),
+        beforeAutospacing: pPr.spacing.beforeAutospacing,
+        afterAutospacing: pPr.spacing.afterAutospacing
+      };
+    }
+    return style;
+  }
+  /**
+   * 深度合并两个样式对象
+   * 后来的值优先覆盖前面的值（override > base）
+   *
+   * @param base - 基础样式（如样式定义）
+   * @param override - 覆盖样式（如直接属性）
+   * @returns 合并后的样式
+   */
+  static mergeStyles(base, override) {
+    const result = {};
+    result.alignment = override.alignment ?? base.alignment;
+    if (base.indent || override.indent) {
+      result.indent = {
+        left: override.indent?.left ?? base.indent?.left,
+        right: override.indent?.right ?? base.indent?.right,
+        firstLine: override.indent?.firstLine ?? base.indent?.firstLine
+      };
+    }
+    if (base.spacing || override.spacing) {
+      result.spacing = {
+        before: override.spacing?.before ?? base.spacing?.before,
+        after: override.spacing?.after ?? base.spacing?.after,
+        line: override.spacing?.line ?? base.spacing?.line,
+        beforeAutospacing: override.spacing?.beforeAutospacing ?? base.spacing?.beforeAutospacing,
+        afterAutospacing: override.spacing?.afterAutospacing ?? base.spacing?.afterAutospacing
+      };
+    }
+    if (base.lang || override.lang) {
+      result.lang = {
+        val: override.lang?.val ?? base.lang?.val,
+        eastAsia: override.lang?.eastAsia ?? base.lang?.eastAsia
+      };
+    }
+    return result;
+  }
+}
 class TextStyleResolver {
   /**
    * 计算字符的有效样式
@@ -27218,6 +27203,8 @@ class TextWidget extends TextRun {
   widgetFileItem;
   pageWidgetMeta;
   dataIndex;
+  xDataIndex;
+  yDataIndex;
   constructor(options) {
     super(options);
     this.widgetMeta = options.widgetMeta;
@@ -31916,7 +31903,7 @@ class DeleteDataGroup2D extends CommandBase {
       return null;
     }
     const subTable = table.findRegionById(regionId);
-    if (!subTable || !getIsDataGroup2DTable(subTable.type)) {
+    if (!subTable || !isLinkSubTableType(subTable.type)) {
       console.error(
         `deleteDataGroup2D: region not found with id ${regionId} or region type is not support`
       );
@@ -38226,72 +38213,6 @@ 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: "字段路径与当前区域不兼容，无法插入",
@@ -38490,7 +38411,7 @@ class InsertField extends CommandBase {
   /** 二维表/检验表：用当前单元格 subRenderer 分区 valuePath 作为父路径 */
   getSubTableZoneParentPath() {
     const sub = this.getLayoutTableCellFromCursor()?.subRenderer;
-    if (sub && getIsDataGroup2DTable(sub.type)) {
+    if (sub && isLinkSubTableType(sub.type)) {
       return sub.valuePath;
     }
     return void 0;
@@ -38501,7 +38422,7 @@ class InsertField extends CommandBase {
     if (!zoneParentPath || !widgetMeta.field) {
       return { valuePath: draggedValuePath, widgetMeta };
     }
-    if (layoutSub?.type === "2d-table" || layoutSub?.type === "check-table") {
+    if (isLinkSubTableType(layoutSub?.type)) {
       const cell = this.getModelCellFromCursor();
       const region = cell ? this.getLinkSubTableRegionFromLayout(cell, layoutSub) : void 0;
       if (region && !this.getDraggedFieldSide(widgetMeta.field, region)) {
@@ -38509,7 +38430,7 @@ class InsertField extends CommandBase {
       }
     }
     const fieldLink = widgetMeta.field.fieldLink || getLastSegment(draggedValuePath);
-    const parentKey = getLastSegment(zoneParentPath);
+    const parentKey = parseValuePath(zoneParentPath).normalized;
     const valuePath = generateValuePath(fieldLink, parentKey);
     return {
       valuePath,
@@ -38583,13 +38504,11 @@ class InsertField extends CommandBase {
   }
   getLinkSubTableRegionFromLayout(cell, sub) {
     const table = cell.table;
+    if (!isLinkSubTableType(sub.type)) return void 0;
     if (sub.type === "2d-table") {
       return table.get2DTableById(sub.id);
     }
-    if (sub.type === "check-table") {
-      return table.getCheckTableById(sub.id);
-    }
-    return void 0;
+    return table.getCheckTableById(sub.id);
   }
   /**
    * 校验字段是否可插入当前位置
@@ -38600,7 +38519,7 @@ class InsertField extends CommandBase {
     const cell = getAncestorCell(node);
     if (!cell) return INSERT_FIELD_MSG.NOT_IN_CELL;
     const layoutSub = this.getLayoutTableCellFromCursor()?.subRenderer;
-    if (layoutSub?.type === "2d-table" || layoutSub?.type === "check-table") {
+    if (layoutSub && isLinkSubTableType(layoutSub.type)) {
       const region = this.getLinkSubTableRegionFromLayout(cell, layoutSub);
       if (!region) return INSERT_FIELD_MSG.NOT_IN_SUBTABLE_REGION;
       return this.validateLinkSubTableFieldPath(
@@ -38617,7 +38536,7 @@ class InsertField extends CommandBase {
     const colIndex = cell.getCurrentIndex();
     const rowIndex = row.getCurrentIndex();
     const targetRegion = regions.find((r) => r.contains(rowIndex, colIndex));
-    if (targetRegion?.type === "2d-table" || targetRegion?.type === "check-table") {
+    if (targetRegion && isLinkSubTableType(targetRegion.type)) {
       return this.validateLinkSubTableFieldPath(
         valuePath,
         targetRegion,
@@ -39928,7 +39847,7 @@ class SetDataGroup2D extends CommandBase {
     let region;
     cellList.some((cell) => {
       const r = cell.getRegion();
-      if (r && getIsDataGroup2DTable(r.type)) {
+      if (r && isLinkSubTableType(r.type)) {
         region = r;
         return true;
       }
@@ -40331,16 +40250,16 @@ function getClassNameFromPath(path2) {
   return path2.split("/").pop()?.replace(".ts", "") ?? "";
 }
 function buildCommandMap() {
-  const map2 = {};
+  const map = {};
   Object.entries(commandModules).forEach(([path2, module2]) => {
     const expectedClassName = getClassNameFromPath(path2);
     const CommandClass = module2[expectedClassName];
     if (CommandClass && typeof CommandClass === "function") {
       const commandName = toCamelCase(expectedClassName);
-      map2[commandName] = CommandClass;
+      map[commandName] = CommandClass;
     }
   });
-  return map2;
+  return map;
 }
 class CommandManager {
   registry = /* @__PURE__ */ new Map();
@@ -40445,6 +40364,8 @@ class Paragraph extends LayoutGroup {
   component = BuiltinComponentTypeConst.Paragraph;
   baseline = 0;
   // 基线位置，默认为 0，表示与段落顶部对齐
+  /** 上次 layout 应用的水平对齐偏移，避免重复 layout 时累加 */
+  _alignmentOffset = 0;
   splitFillEvent = new EventUtil();
   // backgroundColor?: string = 'rgba(0,0,0,0.06)';
   // borderTop?: Border = {
@@ -40511,15 +40432,19 @@ class Paragraph extends LayoutGroup {
   }
   applyStyle() {
     const wp = this.doc.layoutMapper.getModelNodeById(this.modelRef.id);
-    const style = wp?.pPr?.directStyle ?? {};
+    const style = wp?.pPr ? ParagraphStyleResolver.resolve(wp.pPr) : {};
     let offset2 = 0;
     if (style.alignment === "center") {
       offset2 = (this.width - this.getContextWidth()) / 2;
     } else if (style.alignment === "right") {
       offset2 = this.width - this.getContextWidth();
     }
+    offset2 = Math.max(offset2, 0);
+    const delta = offset2 - this._alignmentOffset;
+    this._alignmentOffset = offset2;
+    if (delta === 0) return;
     this.forEachChild((child) => {
-      child.x += Math.max(offset2, 0);
+      child.x += delta;
     });
   }
   /**
@@ -40631,19 +40556,19 @@ class Table extends LayoutGroup {
     });
   }
   updateCellOffsetInfo() {
-    const map2 = /* @__PURE__ */ new Map();
+    const map = /* @__PURE__ */ new Map();
     const rows = this.getChildren();
     rows.forEach((row, rowIndex) => {
       row.getChildren().forEach((cell, colIndex) => {
         if (cell.mergeFromId) {
-          cell.mergeRefColOffset = colIndex - map2.get(cell.mergeFromId).colIndex;
-          cell.mergeRefRowOffset = rowIndex - map2.get(cell.mergeFromId).rowIndex;
+          cell.mergeRefColOffset = colIndex - map.get(cell.mergeFromId).colIndex;
+          cell.mergeRefRowOffset = rowIndex - map.get(cell.mergeFromId).rowIndex;
         } else {
-          map2.set(cell.id, { rowIndex, colIndex });
+          map.set(cell.id, { rowIndex, colIndex });
         }
       });
     });
-    map2.clear();
+    map.clear();
   }
   forEachCell(options) {
     const { startRowIdx, startColIdx, endRowIdx, endColIdx, callback, filter: filter2 } = options;
@@ -40962,14 +40887,14 @@ class LayoutContext {
   getValuePath(path2) {
     if (!path2) return void 0;
     const { type: type4, dataIndex, xDataIndex, yDataIndex, cellZone } = this.cell?.subRenderer || {};
-    if (getIsDataGroup2DTable(type4) && cellZone === "cross") {
+    if (isLinkSubTableType(type4) && cellZone === "cross") {
       return replacePathIndexPlaceholders({ x: xDataIndex, y: yDataIndex, templatePath: path2 });
     }
     if (!path2.includes("[n]")) {
       return path2;
     }
     let n = dataIndex;
-    if (getIsDataGroup2DTable(type4)) {
+    if (isLinkSubTableType(type4)) {
       n = cellZone === "horizontal" ? yDataIndex : xDataIndex;
     }
     if (n === void 0) return path2;
@@ -40980,12 +40905,12 @@ class TextHandler {
   static getId(context, wr) {
     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") {
+    if (sub && isLinkSubTableType(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)) {
+      if (isLinkSubTableType(sub.type)) {
         runIndex = sub.cellZone === "horizontal" ? sub.yDataIndex : sub.xDataIndex;
       } else {
         runIndex = sub.dataIndex;
@@ -41204,7 +41129,7 @@ class FieldBaseHandler {
   static getSubTableRunIndex(context) {
     const sub = context.cell?.subRenderer;
     if (!sub) return void 0;
-    if (getIsDataGroup2DTable(sub.type)) {
+    if (isLinkSubTableType(sub.type)) {
       if (sub.cellZone === "horizontal") {
         return sub.yDataIndex;
       }
@@ -41218,7 +41143,7 @@ class FieldBaseHandler {
   static getId(context, wr) {
     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") {
+    if (sub && isLinkSubTableType(sub.type) && sub.cellZone === "cross" && typeof sub.yDataIndex === "number" && typeof sub.xDataIndex === "number") {
       return `${baseId}@${sub.yDataIndex}_${sub.xDataIndex}`;
     }
     const runIndex = this.getSubTableRunIndex(context);
@@ -41650,6 +41575,8 @@ class ImageWidget extends ImageRun {
   signature;
   pageWidgetMeta;
   dataIndex;
+  xDataIndex;
+  yDataIndex;
   constructor(options) {
     super(options);
     this.src = options.src;
@@ -41658,6 +41585,8 @@ class ImageWidget extends ImageRun {
     this.signature = options.signature;
     this.pageWidgetMeta = options.pageWidgetMeta;
     this.dataIndex = options.dataIndex;
+    this.xDataIndex = options.xDataIndex;
+    this.yDataIndex = options.yDataIndex;
   }
 }
 class FieldImageHandler extends FieldBaseHandler {
@@ -41978,7 +41907,7 @@ class WidgetBaseHandler {
   getDataIndex(init2 = null) {
     const { context } = this;
     const { type: type4, dataIndex, xDataIndex, yDataIndex, cellZone } = context.cell?.subRenderer || {};
-    if (getIsDataGroup2DTable(type4)) {
+    if (isLinkSubTableType(type4)) {
       if (cellZone === "horizontal") {
         return yDataIndex ?? init2;
       }
@@ -41996,7 +41925,7 @@ class WidgetBaseHandler {
   getId() {
     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") {
+    if (sub && isLinkSubTableType(sub.type) && sub.cellZone === "cross" && typeof sub.yDataIndex === "number" && typeof sub.xDataIndex === "number") {
       return `${baseId}@${sub.yDataIndex}_${sub.xDataIndex}`;
     }
     const dataIndex = this.getDataIndex();
@@ -42031,7 +41960,7 @@ class SerialNumberHandler extends WidgetBaseHandler {
   layout() {
     const { wr, context } = this;
     const layoutStyle = this.getLayoutStyle();
-    const label = (context.cell?.subRenderer?.dataIndex ?? 0) + 1 + "";
+    const label = (this.getDataIndex() ?? 0) + 1 + "";
     label.split("").forEach((char, charIndex) => {
       const { width, height, ascent, descent } = TextRun.measureText(
         TextRun.measurePayload(char, layoutStyle)
@@ -42120,7 +42049,11 @@ class QrCodeHandler extends WidgetBaseHandler {
         start: 0,
         end: 0
       },
-      pageWidgetMeta: wr.pageWidgetMeta
+      pageWidgetMeta: wr.pageWidgetMeta,
+      // todo
+      dataIndex: this.getDataIndex() ?? void 0,
+      xDataIndex: context.cell?.subRenderer?.xDataIndex,
+      yDataIndex: context.cell?.subRenderer?.yDataIndex
     });
     context.addRun(run);
   }
@@ -42179,7 +42112,10 @@ class BarcodeHandler extends WidgetBaseHandler {
         end: 0
       },
       pageWidgetMeta: wr.pageWidgetMeta,
-      dataIndex: context.cell?.subRenderer?.dataIndex ?? 0
+      // todo
+      dataIndex: this.getDataIndex() ?? void 0,
+      xDataIndex: context.cell?.subRenderer?.xDataIndex,
+      yDataIndex: context.cell?.subRenderer?.yDataIndex
     });
     if (decorationInfo.render) {
       run.decorations = decorationInfo.decorations;
@@ -42227,7 +42163,11 @@ class DiagonalHandler extends WidgetBaseHandler {
         start: 0,
         end: 0
       },
-      pageWidgetMeta: wr.pageWidgetMeta
+      pageWidgetMeta: wr.pageWidgetMeta,
+      // todo
+      dataIndex: this.getDataIndex() ?? void 0,
+      xDataIndex: context.cell?.subRenderer?.xDataIndex,
+      yDataIndex: context.cell?.subRenderer?.yDataIndex
     });
     context.addRun(run);
     cell.skipSplitMeasure = true;
@@ -42489,8 +42429,18 @@ class TableCell extends LayoutGroup {
   layout(x2, y2) {
     this.layoutX = x2;
     this.layoutY = y2;
+    const contentHeight = this.getContentHeight();
+    const innerHeight = this.height - this.pt - this.pb;
+    let contentOffsetY = 0;
+    const wtc = this.modelRef ? this.doc.layoutMapper.getModelNodeById(this.modelRef.id) : void 0;
+    const vAlign = wtc?.vAlign;
+    if (vAlign === "center") {
+      contentOffsetY = Math.max(0, (innerHeight - contentHeight) / 2);
+    } else if (vAlign === "bottom") {
+      contentOffsetY = Math.max(0, innerHeight - contentHeight);
+    }
     this.forEachChild((child) => {
-      child.layout(this.layoutX + this.pl, this.layoutY + this.pt + child.y);
+      child.layout(this.layoutX + this.pl, this.layoutY + this.pt + contentOffsetY + child.y);
     });
   }
 }
@@ -43914,43 +43864,43 @@ class LayoutManager {
     handler.layout(context, run);
   }
 }
-function generateModelMap(node, map2 = /* @__PURE__ */ new Map()) {
+function generateModelMap(node, map = /* @__PURE__ */ new Map()) {
   if (!node) return;
-  map2.set(node.id, node);
+  map.set(node.id, node);
   const children = node.getChildren?.() ?? node.children ?? null;
   if (Array.isArray(children)) {
     for (let ci = 0; ci < children.length; ci++) {
       const child = children[ci];
-      generateModelMap(child, map2);
+      generateModelMap(child, map);
     }
   }
-  return map2;
+  return map;
 }
 function generateDocModelMap(doc) {
-  const map2 = /* @__PURE__ */ new Map();
+  const map = /* @__PURE__ */ new Map();
   const body = doc.model?.document.body;
   if (body) {
-    generateModelMap(body, map2);
+    generateModelMap(body, map);
   }
   const headers2 = doc.model?.headers?.headers;
   if (Array.isArray(headers2)) {
     headers2.forEach((header) => {
-      generateModelMap(header, map2);
+      generateModelMap(header, map);
     });
   }
   const footers2 = doc.model?.footers?.footers;
   if (Array.isArray(footers2)) {
     footers2.forEach((footer) => {
-      generateModelMap(footer, map2);
+      generateModelMap(footer, map);
     });
   }
   const overlays = doc.model?.overlays.overlays;
   if (Array.isArray(overlays)) {
     overlays.forEach((overlay) => {
-      generateModelMap(overlay, map2);
+      generateModelMap(overlay, map);
     });
   }
-  return map2;
+  return map;
 }
 class LayoutMapper {
   doc;
@@ -46233,10 +46183,12 @@ class DataManager {
       rows.push({});
     }
     const row = rows[index2] ?? {};
+    const { group_: g_ } = row;
     rows[index2] = row;
-    const uidField = axis === "y" ? "__gw_y_uid" : "__gw_x_uid";
+    const isY = axis === "y";
+    const uidField = isY ? "__gw_y_uid" : "__gw_x_uid";
     if (!row[uidField]) {
-      row[uidField] = row.id || `${axis}_${uuid()}`;
+      row[uidField] = g_ ? g_.includes(":") ? g_.split(":")[isY ? 0 : 1] : g_ : `${axis}_${uuid()}`;
     }
     return row;
   }
@@ -46337,6 +46289,39 @@ class DataManager {
       this.emit(path2, next, oldValue);
     });
   }
+  /**
+   * 复制轴行插入时：若 uid 与已有行重复，换新 uid 并复制关联交叉区行。
+   */
+  duplicateCrossRowsByAxisUid(crossKeys, axis, oldUid, newUid) {
+    const uidField = axis === "y" ? "__gw_y_uid" : "__gw_x_uid";
+    for (const crossKey of crossKeys) {
+      const path2 = `$.${crossKey}`;
+      const rows = this.getByPath(this.rawData, path2);
+      if (!Array.isArray(rows)) continue;
+      const matched = rows.filter((item) => item?.[uidField] === oldUid);
+      if (matched.length === 0) continue;
+      const oldValue = this.deepClone(rows);
+      const copies = matched.map((item) => {
+        const copy = this.deepClone(item);
+        copy[uidField] = newUid;
+        return copy;
+      });
+      const next = [...rows, ...copies];
+      this.setByPath(this.rawData, path2, next);
+      this.emit(path2, next, oldValue);
+    }
+  }
+  prepareAxisRowForInsert(arr, axisInfo, value) {
+    const cloned = this.deepClone(value);
+    const uidField = axisInfo.axis === "y" ? "__gw_y_uid" : "__gw_x_uid";
+    const oldUid = cloned?.[uidField];
+    if (oldUid && arr.some((row) => row?.[uidField] === oldUid)) {
+      const newUid = `${axisInfo.axis}_${uuid()}`;
+      cloned[uidField] = newUid;
+      this.duplicateCrossRowsByAxisUid(axisInfo.crossKeys, axisInfo.axis, oldUid, newUid);
+    }
+    return cloned;
+  }
   /**
    * 将一个部分值对象合进整体
    */
@@ -46406,7 +46391,7 @@ class DataManager {
       const tableKey = path2.replace(/^\$\./, "").replace(/\[(n|\d+)\]/g, "");
       const axisInfo = this.resolveAxisByTableKey(tableKey);
       values.forEach((value) => {
-        const cloned = this.deepClone(value);
+        const cloned = axisInfo ? this.prepareAxisRowForInsert(arr, axisInfo, value) : this.deepClone(value);
         arr.push(cloned);
         if (axisInfo) {
           const index2 = arr.length - 1;
@@ -46467,10 +46452,12 @@ class DataManager {
         throw new Error(`Index ${index2} out of bounds for array of length ${arr.length}`);
       }
       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);
+      const clonedValues = values.map(
+        (value) => axisInfo ? this.prepareAxisRowForInsert(arr, axisInfo, value) : this.deepClone(value)
+      );
+      arr.splice(index2, 0, ...clonedValues);
       if (axisInfo) {
         for (let i = index2; i < arr.length; i++) {
           this.ensureAxisRowAndUid(tableKey, i, axisInfo.axis);
@@ -46521,6 +46508,7 @@ class DataManager {
     const data = this.deepClone(this.rawData);
     for (let path2 of this.defaults.keys()) {
       if (this.defaults.get(path2) === void 0) continue;
+      if (path2.includes("[n")) continue;
       const value = this.getByPath(data, path2);
       if (value !== void 0) continue;
       this.setByPath(data, path2, this.getDefault(path2));
@@ -46554,13 +46542,22 @@ class DataManager {
   applyInitData(initDataMap) {
     for (const [path2, value] of Object.entries(initDataMap)) {
       if (value === void 0 || value === null) continue;
-      if (path2.includes("[n]")) {
+      const parse = parseValuePath(path2);
+      if (parse.isSubTable && !parse.isLink) {
         this.applyInitDataWildcard(path2, value);
       }
     }
     for (const [path2, value] of Object.entries(initDataMap)) {
       if (value === void 0 || value === null) continue;
-      if (!path2.includes("[n]")) {
+      const parse = parseValuePath(path2);
+      if (parse.isSubTable && parse.isLink) {
+        this.applyInitDataCrossWildcard(path2, value);
+      }
+    }
+    for (const [path2, value] of Object.entries(initDataMap)) {
+      if (value === void 0 || value === null) continue;
+      const parse = parseValuePath(path2);
+      if (!(parse.isSubTable || parse.isLink)) {
         const existing = this.getByPath(this.rawData, path2);
         if (existing === void 0 || existing === null) {
           try {
@@ -46574,25 +46571,99 @@ class DataManager {
       }
     }
   }
-  applyInitDataWildcard(path2, value) {
-    const match = path2.match(/^\$\.([^[.]+)\[n\]/);
-    if (!match) return;
-    const subTableKey = match[1];
-    let subTableArray = this.rawData?.[subTableKey];
-    if (!Array.isArray(subTableArray) || subTableArray.length === 0) {
-      subTableArray = [{ ...DEFAULT_EMPTY_ITEM }];
+  applyInitDataCrossWildcard(path2, value) {
+    const parse = parseValuePath(path2);
+    if (!parse.isLink) return;
+    const yTableKey = parse.parentFieldKey;
+    const xTableKey = parse.linkFieldKey;
+    if (!yTableKey || !xTableKey) return;
+    const yRows = this.ensureSubTableRowCount(
+      yTableKey,
+      this.resolveInitRowCount(yTableKey),
+      false
+    );
+    const xRows = this.ensureSubTableRowCount(
+      xTableKey,
+      this.resolveInitRowCount(xTableKey),
+      false
+    );
+    for (let y2 = 0; y2 < yRows.length; y2++) {
+      for (let x2 = 0; x2 < xRows.length; x2++) {
+        const realPath = replacePathIndexPlaceholders({ y: y2, x: x2, templatePath: path2 });
+        const inferred = this.infer2DPathAndCoords(realPath);
+        const existing = inferred ? this.get2DByCoords(inferred.logicalPath, inferred.coords) : this.getByPath(this.rawData, realPath);
+        if (existing === void 0 || existing === null) {
+          try {
+            if (this.set(realPath, value, "user")) {
+              this.clearPlaceholderFlag(yRows[y2]);
+              this.clearPlaceholderFlag(xRows[x2]);
+            } else {
+              console.warn(`applyInitData: set returned false for path "${realPath}"`);
+            }
+          } catch (e) {
+            console.warn(`applyInitData: failed to set path "${realPath}"`, e);
+          }
+        }
+      }
+    }
+  }
+  /**
+   * 解析子表初始化行数：接口已有行数、版面数据分组槽位。
+   * layoutRows 为 0（如二维表纵向 f_ewb）时不按分组扩行，仅保证至少 1 行可绑定。
+   */
+  resolveInitRowCount(subTableKey) {
+    const existing = this.rawData?.[subTableKey];
+    const dataRows = Array.isArray(existing) ? existing.length : 0;
+    const layoutRows = this.doc?.model?.getSubTableLayoutSlotCount(subTableKey) ?? 1;
+    if (layoutRows > 0) {
+      return Math.max(dataRows, layoutRows);
+    }
+    return Math.max(dataRows, 1);
+  }
+  /**
+   * 将子表数组补齐到指定行数。
+   * @param asPlaceholder true：push/insert 用的系统占位行（带 __gw_default）；false：applyInitData 物化行（空对象）
+   */
+  ensureSubTableRowCount(subTableKey, rowCount, asPlaceholder = true) {
+    let arr = this.rawData?.[subTableKey];
+    if (!Array.isArray(arr)) {
+      arr = [];
+      this.rawData[subTableKey] = arr;
+    }
+    while (arr.length < rowCount) {
+      arr.push(asPlaceholder ? { ...DEFAULT_EMPTY_ITEM } : {});
+    }
+    return arr;
+  }
+  /** 行已写入业务数据后去掉占位标记，避免提交/对比时被当成空行 */
+  clearPlaceholderFlag(row) {
+    if (row && row.__gw_default) {
+      delete row.__gw_default;
     }
+  }
+  applyInitDataWildcard(path2, value) {
+    const subTableKey = parseValuePath(path2).parentFieldKey;
+    if (!subTableKey) return;
+    const subTableArray = this.ensureSubTableRowCount(
+      subTableKey,
+      this.resolveInitRowCount(subTableKey),
+      false
+    );
     for (let i = 0; i < subTableArray.length; i++) {
       const realPath = replacePathIndexPlaceholder(i, path2);
       const existing = this.getByPath(this.rawData, realPath);
       if (existing === void 0 || existing === null) {
         try {
-          if (!this.set(realPath, value, "user")) {
+          if (this.set(realPath, value, "user")) {
+            this.clearPlaceholderFlag(subTableArray[i]);
+          } else {
             console.warn(`applyInitData: set returned false for path "${realPath}"`);
           }
         } catch (e) {
           console.warn(`applyInitData: failed to set path "${realPath}"`, e);
         }
+      } else {
+        this.clearPlaceholderFlag(subTableArray[i]);
       }
     }
   }
@@ -46874,12 +46945,21 @@ class DataManager {
     return void 0;
   }
   /**
-   * 将路径中的具体数组索引转换为通配符
-   * 例如: "items[0].name" -> "items[n].name"
-   * @param path 原始路径
-   * @returns 转换后的路径
+   * 将路径中的具体数组索引转换为默认值通配符
+   * - 普通子表: items[0].name -> items[n].name
+   * - 二维交叉区: $.f_ewb:f_ewblink[0][1].f_value -> $.f_ewb:f_ewblink[n_y][n_x].f_value
    */
   convertPathToWildcard(path2) {
+    const headKey = path2.replace(/^\$\./, "").split(/[\[.]/)[0] ?? "";
+    const isCross = headKey.includes(":");
+    if (isCross) {
+      let index2 = 0;
+      return path2.replace(/\[(\d+)\]/g, () => {
+        const placeholder = index2 === 0 ? "n_y" : index2 === 1 ? "n_x" : "n";
+        index2++;
+        return `[${placeholder}]`;
+      });
+    }
     return path2.replace(/\[(\d+)\]/g, "[n]");
   }
   formatRuntimeValue(value) {
@@ -46931,9 +47011,9 @@ class DataManager {
       if (!this.depGraph.has(realPath)) {
         this.depGraph.set(realPath, /* @__PURE__ */ new Map());
       }
-      const map2 = this.depGraph.get(realPath);
-      if (!map2.has(depKey)) {
-        map2.set(depKey, node);
+      const map = this.depGraph.get(realPath);
+      if (!map.has(depKey)) {
+        map.set(depKey, node);
       }
     });
   }
@@ -46961,9 +47041,9 @@ class DataManager {
   }
   /** 执行依赖 */
   async runDepsByPath(triggerPath, realPath) {
-    const map2 = this.depGraph.get(triggerPath);
-    if (!map2) return;
-    for (const node of map2.values()) {
+    const map = this.depGraph.get(triggerPath);
+    if (!map) return;
+    for (const node of map.values()) {
       await this.runDependency(node, realPath, triggerPath === realPath);
     }
   }
@@ -47280,14 +47360,14 @@ class Doc {
    */
   getWidgetInstances() {
     const instances = [];
-    const map2 = /* @__PURE__ */ new Map();
+    const map = /* @__PURE__ */ new Map();
     const collectWidgets = (node) => {
       if (!node) return;
       if (node.widgetMeta && node.valuePath) {
         const refId = node.modelRef?.id;
-        if (refId && !map2.has(refId)) {
+        if (refId && !map.has(refId)) {
           instances.push(node);
-          map2.set(refId, true);
+          map.set(refId, true);
         }
       }
       if (node.children && Array.isArray(node.children)) {
@@ -48920,6 +49000,41 @@ class Woverlays {
     });
   }
 }
+function countDataGroupSlots(range3, itemRange, fillDirection = "x") {
+  const itemWidth = itemRange.end.col - itemRange.start.col + 1;
+  const itemHeight = itemRange.end.row - itemRange.start.row + 1;
+  let slotCount = 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) {
+        slotCount++;
+        currentCol += itemWidth;
+      }
+      currentRow += itemHeight;
+      currentCol = range3.start.col;
+    }
+  } else {
+    let currentCol = itemRange.start.col;
+    let currentRow = itemRange.end.row + 1;
+    while (currentCol + itemWidth - 1 <= range3.end.col) {
+      while (currentRow + itemHeight - 1 <= range3.end.row) {
+        slotCount++;
+        currentRow += itemHeight;
+      }
+      currentCol += itemWidth;
+      currentRow = range3.start.row;
+    }
+  }
+  return slotCount;
+}
+function expandDataGroupRowRange(parent2, itemRange) {
+  return {
+    start: { row: itemRange.start.row, col: parent2.start.col },
+    end: { row: itemRange.end.row, col: parent2.end.col }
+  };
+}
 class DocModel {
   document;
   headers;
@@ -49047,7 +49162,7 @@ class DocModel {
     const tables = this.getAllTables();
     const dynamicTableRegions = tables.filter((w2) => w2.hasRepeating).flatMap((w2) => w2.repeating).map((item) => {
       return {
-        field: getLastSegment(item.valuePath),
+        field: item.subFieldKey,
         key: "dyn",
         name: "动态表",
         subType: "sub-table"
@@ -49055,28 +49170,25 @@ class DocModel {
     });
     const fixedTableRegions = tables.filter((w2) => w2.hasBounded).flatMap((w2) => w2.bounded).map((item) => {
       return {
-        field: getLastSegment(item.valuePath),
+        field: item.subFieldKey,
         key: "newfixed",
         name: "固定表",
         subType: "fixed-table"
       };
     });
     const table2DRegions = tables.filter((w2) => w2.has2DTable).flatMap((w2) => w2._2DTable).map((item) => {
-      const parsed = parseValuePath(item.valuePath);
-      const subFieldKey = parsed.isLink ? parsed.parentFieldKey ?? "" : parsed.fieldKey;
-      const linkFieldKey = parsed.linkFieldKey ?? "";
       const result = [];
-      if (subFieldKey) {
+      if (item.subFieldKey) {
         result.push({
-          field: subFieldKey,
+          field: item.subFieldKey,
           key: "dyn",
           name: "二维表",
           subType: "sub-table-2d"
         });
       }
-      if (linkFieldKey) {
+      if (item.linkFieldKey) {
         result.push({
-          field: linkFieldKey,
+          field: item.linkFieldKey,
           key: "newfixed",
           name: "二维表-关联",
           subType: "sub-table-2d-link"
@@ -49085,21 +49197,18 @@ class DocModel {
       return result;
     }).flat();
     const checkTableRegions = tables.filter((w2) => w2.hasCheckTable).flatMap((w2) => w2.checkTable).map((item) => {
-      const parsed = parseValuePath(item.valuePath);
-      const subFieldKey = parsed.isLink ? parsed.parentFieldKey ?? "" : parsed.fieldKey;
-      const linkFieldKey = parsed.linkFieldKey ?? "";
       const result = [];
-      if (subFieldKey) {
+      if (item.subFieldKey) {
         result.push({
-          field: subFieldKey,
+          field: item.subFieldKey,
           key: "newfixed",
           name: "检验表-动态",
           subType: "check-table-2d"
         });
       }
-      if (linkFieldKey) {
+      if (item.linkFieldKey) {
         result.push({
-          field: linkFieldKey,
+          field: item.linkFieldKey,
           key: "newfixed",
           name: "检验表-关联",
           subType: "check-table-2d-link"
@@ -49109,6 +49218,42 @@ class DocModel {
     }).flat();
     return [...dynamicTableRegions, ...fixedTableRegions, ...table2DRegions, ...checkTableRegions];
   }
+  /**
+   * 根据版面数据分组 / 动态关联铺砖，计算子表字段在 rawData 中应初始化的行数。
+   *
+   * - 固定表：槽位归 subFieldKey（bounded + itemRegion）
+   * - 二维表 / 检验表：动态分组铺砖在关联轴，槽位归 linkFieldKey（如 f_ewblink）；
+   *   纵向 subFieldKey（如 f_ewb）不由 itemRegion 撑行，返回 0
+   * - 其它子表无分组：返回 1
+   */
+  getSubTableLayoutSlotCount(subFieldKey) {
+    if (!subFieldKey) return 1;
+    let max = 0;
+    let isLinkSubTableSubAxisOnly = false;
+    for (const table of this.getAllTables()) {
+      for (const region of table.bounded) {
+        if (region.subFieldKey !== subFieldKey || !region.itemRegion) continue;
+        const fillDirection = region.widgetMeta?.props?.fillDirection ?? "x";
+        max = Math.max(max, countDataGroupSlots(region, region.itemRegion, fillDirection));
+        region.type;
+      }
+      for (const region of [...table.checkTable, ...table._2DTable]) {
+        if (!region.itemRegion) continue;
+        const range3 = expandDataGroupRowRange(region, region.itemRegion);
+        const slots = countDataGroupSlots(range3, region.itemRegion);
+        if (region.linkFieldKey === subFieldKey) {
+          max = Math.max(max, slots);
+          region.type;
+        }
+        if (region.subFieldKey === subFieldKey) {
+          isLinkSubTableSubAxisOnly = true;
+        }
+      }
+    }
+    if (max > 0) return max;
+    if (isLinkSubTableSubAxisOnly) return 0;
+    return 1;
+  }
   /** 根据 pageIndex 获取页眉实例 */
   getHeader(pageIndex, section) {
     const hasEvenOdd = this.settings?.isEvenAndOddEnabled();
@@ -50111,19 +50256,19 @@ function getBpmnFieldAuthMap(list) {
   );
 }
 function deduplicateFields(data) {
-  const map2 = /* @__PURE__ */ new Map();
+  const map = /* @__PURE__ */ new Map();
   data.forEach((item) => {
     const key = `${item.modelKey}_${item.field}`;
-    if (!map2.has(key)) {
-      map2.set(key, item);
+    if (!map.has(key)) {
+      map.set(key, item);
     } else {
-      const existing = map2.get(key);
+      const existing = map.get(key);
       if (item.edit && !existing.edit) {
-        map2.set(key, item);
+        map.set(key, item);
       }
     }
   });
-  return [...map2.values()];
+  return [...map.values()];
 }
 class DocRequestStrategy {
   props;
@@ -50469,13 +50614,23 @@ const withRequestCache = new RequestCache({
   enableLogging: true
   // 启用日志
 });
+const FILTER_KEYS = [
+  "_DICT",
+  "_OPCT",
+  "__FOREIGN__",
+  "_MCTABLE",
+  "__default_render__",
+  "__gw_default",
+  "__gw_x_uid",
+  "__gw_y_uid"
+];
 function transformSourceData(sourceData, i18nData) {
   const clone2 = cloneDeep(sourceData);
   const _DICT = i18nData ? Object.keys(clone2).reduce((acc, key) => {
-    const map2 = i18nData[key];
+    const map = i18nData[key];
     const value = clone2[key];
-    if (map2 && value) {
-      const labels = String(value).split(",").map((k) => map2[k]);
+    if (map && value) {
+      const labels = String(value).split(",").map((k) => map[k]);
       acc[key] = { [value]: labels };
     }
     return acc;
@@ -50495,12 +50650,63 @@ function transformSourceDataList(data, dict = {}) {
   return list || [];
 }
 function conversionFormState(payload) {
-  const { interfaceData, masterSlaveList } = payload || {};
+  const { interfaceData, masterSlaveList, instances } = payload || {};
   const formState = {};
   if (interfaceData && interfaceData.data) {
     merge(formState, transformSourceData(interfaceData.data, interfaceData.dict));
   }
-  masterSlaveList.map((item) => item.key).forEach((k) => {
+  let _2dKeys = [];
+  if (instances) {
+    const _2DFieldList = instances.map(({ valuePath }) => {
+      if (valuePath.includes(":")) {
+        const { fieldKey, parentFieldKey, linkFieldKey } = parseValuePath(valuePath);
+        const group2DKey = `${parentFieldKey}:${linkFieldKey}`;
+        return {
+          fieldKey,
+          group2DKey
+        };
+      } else {
+        return null;
+      }
+    }).filter(Boolean);
+    Object.entries(groupBy$1(_2DFieldList, "group2DKey")).forEach(([group2DKey, fields]) => {
+      _2dKeys.push(group2DKey);
+      const [parentFieldKey, linkFieldKey] = group2DKey.split(":");
+      const parentState = formState[parentFieldKey];
+      const keys2 = ["group_", ...fields.map((f) => f.fieldKey)];
+      formState[linkFieldKey]?.data.forEach((row) => {
+        row.__gw_x_uid = row.group_;
+      });
+      formState[group2DKey] = {
+        data: parentState?.data.map((row) => {
+          const { group_: g_ } = row;
+          const _row = pick(row, keys2);
+          if (g_) {
+            const [y2, x2] = g_.split(":");
+            _row.__gw_y_uid = y2;
+            _row.__gw_x_uid = x2;
+          }
+          return _row;
+        }) || [],
+        dict: parentState?.dict || []
+      };
+      const addedYUids = [];
+      formState[parentFieldKey] = {
+        data: [],
+        dict: formState[parentFieldKey]?.dict || []
+      };
+      parentState?.data.forEach((row) => {
+        const yUid = row.group_.split(":")[0];
+        if (addedYUids.includes(yUid)) return;
+        addedYUids.push(yUid);
+        formState[parentFieldKey].data.push({
+          ...row,
+          __gw_y_uid: yUid
+        });
+      });
+    });
+  }
+  masterSlaveList.map((item) => item.key).concat(_2dKeys).forEach((k) => {
     const subFormData = formState[k];
     if (subFormData) {
       formState[k] = transformSourceDataList([...subFormData.data], subFormData.dict);
@@ -50509,43 +50715,52 @@ function conversionFormState(payload) {
   return formState;
 }
 function getSubmitFormData(formData) {
-  const list2D = [];
-  const filterKeys = ["_DICT", "_OPCT", "__FOREIGN__", "_MCTABLE", "__default_render__"];
-  const realFormData = Object.keys(formData).reduce((acc, fieldKey) => {
-    const info = list2D.find(
-      (item) => (item.subTable2d || item.checkTable2d) && item.rowSubFieldKey === fieldKey
-    );
-    if (info) {
-      const colSubTable = formData[info.colSubFieldKey]?.map((item) => ({
-        [info.rowRefFieldKey]: item[info.colRefFieldKey]
-      }));
-      const arr = flatMap(
-        formData[fieldKey],
-        (row) => zip(row["_2DTABLE_"], colSubTable).map(([obj1, obj2]) => merge({}, obj1, obj2)).map(
-          (item) => merge(
-            pickBy(omit(row, filterKeys), (v) => !isNil(v)),
-            pickBy(omit(item, filterKeys), (v) => !isNil(v))
-          )
-        )
-      ).map((item) => omit(item, "_2DTABLE_"));
-      acc[fieldKey] = arr.every((item) => Object.keys(item).length === 1 && has(item, "group_")) ? [] : arr;
-    } else if (Array.isArray(formData[fieldKey])) {
-      acc[fieldKey] = formData[fieldKey].map(
-        (item) => Object.fromEntries(
-          Object.entries(item).filter(([key, value]) => {
-            if (filterKeys.includes(key)) return false;
+  const _formData = { ...formData };
+  Object.keys(_formData).filter((k) => k.includes(":")).forEach((_2DKey) => {
+    const [subKey] = _2DKey.split(":");
+    const _2DData = _formData[_2DKey];
+    const subData = [..._formData[subKey]];
+    if ([_2DData, subData].every(Array.isArray)) {
+      _formData[subKey] = [];
+      _2DData.forEach((obj) => {
+        const { __gw_y_uid, __gw_x_uid } = obj;
+        const row = subData.find((row2) => row2.__gw_y_uid === __gw_y_uid);
+        if (!row) return;
+        _formData[subKey].push({
+          // 保留动态关联前端键值到 group_
+          group_: `${__gw_y_uid}:${__gw_x_uid}`,
+          ...row,
+          ...omit(obj, FILTER_KEYS)
+        });
+      });
+    }
+    delete _formData[_2DKey];
+  });
+  const realFormData = Object.keys(_formData).reduce((reducedData, fieldKey) => {
+    const fieldValue = _formData[fieldKey];
+    if (Array.isArray(fieldValue)) {
+      fieldValue.forEach((row) => {
+        const { __gw_x_uid } = row;
+        if (__gw_x_uid) {
+          row.group_ = __gw_x_uid;
+        }
+      });
+      reducedData[fieldKey] = _formData[fieldKey].map(
+        (row) => Object.fromEntries(
+          Object.entries(row).filter(([key, value]) => {
+            if (FILTER_KEYS.includes(key)) return false;
             if (key.endsWith("_lb_") && isEmpty(value)) return false;
             return true;
           })
         )
       );
     } else {
-      acc[fieldKey] = formData[fieldKey];
+      reducedData[fieldKey] = fieldValue;
     }
-    return acc;
+    return reducedData;
   }, {});
-  console.log("0506 数据转成真实提交数据（二维表要平铺）", realFormData);
-  return omit(realFormData, filterKeys);
+  console.log("数据转成真实提交数据", realFormData);
+  return omit(realFormData, FILTER_KEYS);
 }
 const API_CONFIG = {
   ENTITY_CATEGORY: "entity",
@@ -51249,8 +51464,13 @@ async function applyAutofillRules(record, instances, autofillRules, masterSlaveL
     const targetField = widgetMeta.field;
     if (!targetField) continue;
     let runtimeValuePath = targetField.valuePath;
+    if (parseValuePath(runtimeValuePath).isLink) continue;
     if (opts?.needReplacePathIndexPlaceholder) {
-      runtimeValuePath = replacePathIndexPlaceholder(opts.sourceValuePath, runtimeValuePath);
+      if (parseValuePath(opts.sourceValuePath).isLink) continue;
+      runtimeValuePath = replacePathIndexPlaceholders({
+        refPath: opts.sourceValuePath,
+        templatePath: runtimeValuePath
+      });
     }
     const computed2 = await computeFieldDefaultValue({
       fieldType: targetField.fieldType,
@@ -51794,15 +52014,17 @@ const handleParameterMapping = async (parameterMapping, paramsConfig, fieldPermi
   const processParamItem = async (item) => {
     if (!referenceMap.has(item.formKey)) return;
     const value = referenceMap.get(item.formKey);
-    const valuePath = generateValuePath(item.field, item?.subModel ? item.subFieldKey : "");
     const widget = instances.find((instance2) => {
       const fieldMeta = instance2.widgetMeta?.field;
       if (item?.subModel) {
-        return item.field === getLastSegment(fieldMeta?.fieldLink) && item.subFieldKey === fieldMeta?.subFieldKey;
+        const parsed = parseValuePath(fieldMeta?.subFieldKey);
+        const subFieldKey = parsed.isLink ? parsed.parentFieldKey ?? "" : parsed.fieldKey;
+        return item.field === getLastSegment(fieldMeta?.fieldLink) && item.subFieldKey === subFieldKey;
       }
       return item.field === getLastSegment(fieldMeta?.fieldLink) && !fieldMeta?.subFieldKey;
     });
     if (widget) {
+      const valuePath = widget.valuePath;
       const computed2 = await computeFieldDefaultValue({
         fieldType: item.fieldType,
         fieldMeta: widget.widgetMeta.field,
@@ -51814,8 +52036,6 @@ const handleParameterMapping = async (parameterMapping, paramsConfig, fieldPermi
         allowSubModelRequest: true
       });
       merge(paramMap, computed2);
-    } else {
-      merge(paramMap, { [valuePath]: toFormatValue(item.fieldType, value) });
     }
   };
   await Promise.all([...builtinParams, ...compParams].map(processParamItem));
@@ -51833,11 +52053,10 @@ const buildPathMapFromApiResult = (onFieldMap, result, subTableInfo) => {
   onFieldMap.forEach((item) => {
     if (item.subModel === 0) {
       const firstRow = data[0];
-      item.fields.forEach(({ isFieldModel, leftFieldKey, fieldLink, rightFieldKey }) => {
+      item.fields.forEach(({ isFieldModel, fieldLink, rightFieldKey, valuePath }) => {
         const srcKey = rightFieldKey;
         const value = isFieldModel ? firstRow?.__FOREIGN__?.[fieldLink] : firstRow?.[srcKey];
-        if (value != null) {
-          const valuePath = generateValuePath(leftFieldKey, "");
+        if (value != null && valuePath) {
           pathMap[valuePath] = value;
           const label = getLabelFromDict(srcKey, value);
           if (label != null) pathMap[`${valuePath}_lb_`] = label;
@@ -51845,12 +52064,15 @@ const buildPathMapFromApiResult = (onFieldMap, result, subTableInfo) => {
       });
     } else if (item.subModel === 1) {
       data.forEach(
-        (rowData, index2) => item.fields.forEach(({ isFieldModel, leftFieldKey, fieldLink, rightFieldKey }) => {
+        (rowData, index2) => item.fields.forEach(({ isFieldModel, fieldLink, rightFieldKey, valuePath }) => {
           const srcKey = rightFieldKey;
           const value = isFieldModel ? rowData?.__FOREIGN__?.[fieldLink] : rowData?.[srcKey];
-          if (value != null) {
-            const valuePath = generateValuePath(leftFieldKey, item.subFieldKey);
-            const runtimeValuePath = replacePathIndexPlaceholder(index2, valuePath);
+          if (value != null && valuePath) {
+            const runtimeValuePath = replacePathIndexPlaceholders({
+              y: index2,
+              n: index2,
+              templatePath: valuePath
+            });
             pathMap[runtimeValuePath] = value;
             const label = getLabelFromDict(srcKey, value);
             if (label != null) pathMap[`${runtimeValuePath}_lb_`] = label;
@@ -51861,7 +52083,7 @@ const buildPathMapFromApiResult = (onFieldMap, result, subTableInfo) => {
   });
   return pathMap;
 };
-const handleCustomDataSource = async (customDataSource, paramsConfig, subTableInfo, instanceId) => {
+const handleCustomDataSource = async (customDataSource, paramsConfig, subTableInfo, instanceId, instances) => {
   if (!customDataSource.length || !paramsConfig) {
     return {};
   }
@@ -51882,7 +52104,26 @@ const handleCustomDataSource = async (customDataSource, paramsConfig, subTableIn
           formKey: ex.formKey
         };
       }),
-      onFieldMap: item.onFieldMap
+      onFieldMap: item.onFieldMap.map((k) => {
+        return {
+          ...k,
+          fields: k.fields.map((field) => {
+            const widget = instances.find((instance2) => {
+              const fieldMeta = instance2.widgetMeta?.field;
+              if (k?.subModel === 1) {
+                const parsed = parseValuePath(fieldMeta?.subFieldKey);
+                const subFieldKey = parsed.isLink ? parsed.parentFieldKey ?? "" : parsed.fieldKey;
+                return field.leftFieldKey === getLastSegment(fieldMeta?.fieldLink) && k.subFieldKey === subFieldKey;
+              }
+              return field.leftFieldKey === getLastSegment(fieldMeta?.fieldLink) && !fieldMeta?.subFieldKey;
+            });
+            return {
+              ...field,
+              valuePath: widget ? widget.valuePath : ""
+            };
+          })
+        };
+      })
     };
   });
   for (const info of customDsList) {
@@ -51951,7 +52192,11 @@ const handleCustomDataSource = async (customDataSource, paramsConfig, subTableIn
                 Object.entries(rowData).forEach(([key, value]) => {
                   if (value != null) {
                     const valuePath = generateValuePath(key, item.subFieldKey);
-                    const runtimeValuePath = replacePathIndexPlaceholder(index2, valuePath);
+                    const runtimeValuePath = replacePathIndexPlaceholders({
+                      y: index2,
+                      n: index2,
+                      templatePath: valuePath
+                    });
                     ipaasPathMap[runtimeValuePath] = value;
                   }
                 });
@@ -52010,7 +52255,7 @@ const handleCustomDataSource = async (customDataSource, paramsConfig, subTableIn
     }
   }
   const results = await Promise.all(promises);
-  return results.reduce((merged, map2) => merge(merged, map2), {});
+  return results.reduce((merged, map) => merge(merged, map), {});
 };
 const loadDataInitValues = async (dataInitConfig, paramsConfig, subTableInfo, fieldPermission, instanceId, instances, ctx) => {
   if (!dataInitConfig) return { paramMap: {}, dsRawData: {} };
@@ -52026,7 +52271,8 @@ const loadDataInitValues = async (dataInitConfig, paramsConfig, subTableInfo, fi
     customDataSource,
     paramsConfig,
     subTableInfo,
-    instanceId
+    instanceId,
+    instances
   );
   return { paramMap, dsMap };
 };
@@ -52239,7 +52485,8 @@ async function initializeDocumentEngine(props, payload, result) {
   console.log("接口获取接口数据 ===>", interfaceData);
   const rawData = conversionFormState({
     masterSlaveList,
-    interfaceData
+    interfaceData,
+    instances
   });
   const docRuntimeMeta = {
     ...requestInfo,
@@ -52345,7 +52592,11 @@ function useDocumentFactory(props, payload) {
         instances,
         isMockReport: payload.isMockReport || payload.factoryType === "template"
       });
-      const rawData = conversionFormState({ masterSlaveList, interfaceData });
+      const rawData = conversionFormState({
+        masterSlaveList,
+        interfaceData,
+        instances
+      });
       doc.dataManager.setRawData(rawData);
       await nextTick();
       doc.docRuntimeMeta.handleInfo.initRawDataSnapshot = cloneDeep(doc.dataManager.getRawData());
@@ -55830,6 +56081,228 @@ 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,
+  isDesign,
+  convertExtraProps
+}) {
+  const getDataIndex = (cell) => {
+    return isLinkSubTableType(type4) && isDesign ? cell.subRenderer?.xDataIndex : cell.subRenderer?.yDataIndex;
+  };
+  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 isLinkSubTableType(type22) ? isLinkSubTableSubScopeZone(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);
+}
 const baseCanvasAttrs = {
   /** 不参与事件命中检测 */
   listening: false,
@@ -56154,7 +56627,7 @@ const _sfc_main$2D = /* @__PURE__ */ defineComponent({
       const filteredCells = subTableCells.value.filter(({ subRenderer }) => {
         if (subRenderer) {
           const { type: type4, cellZone } = subRenderer;
-          return getIsDataGroup2DTable(type4) ? getIs2DCellInSubTable(cellZone) : true;
+          return isLinkSubTableType(type4) ? isLinkSubTableSubScopeZone(cellZone) : true;
         } else {
           return true;
         }
@@ -56197,7 +56670,7 @@ const _sfc_main$2D = /* @__PURE__ */ defineComponent({
         convertExtraProps: (cell) => ({
           type: "data-group-2d",
           valuePath: cell.subRenderer.valuePath,
-          placeholder: `${cell.subRenderer.dataIndex}`
+          placeholder: `${cell.subRenderer.xDataIndex}`
         })
       })
     );
@@ -57038,18 +57511,24 @@ const _sfc_main$2y = /* @__PURE__ */ defineComponent({
       upRowNum: 1,
       downRowNum: 1
     });
+    const resolveRowDataPath = (valuePath) => {
+      const parsed = parseValuePath(valuePath);
+      return {
+        path: parsed.isLink ? parsed.parentFieldPath ?? "" : parsed.fieldPath,
+        subFieldKey: parsed.isLink ? parsed.parentFieldKey ?? "" : parsed.fieldKey
+      };
+    };
     const getCtx = () => {
       const { valuePath, dataIndex, yDataIndex } = props.cell.subRenderer;
       return {
-        path: valuePath,
-        index: dataIndex ?? yDataIndex ?? 0
+        ...resolveRowDataPath(valuePath),
+        index: yDataIndex ?? dataIndex ?? 0
       };
     };
     const readonly2 = computed(() => {
-      const subFieldKey = getLastSegment(getCtx().path);
       const state = resolveWidgetState({
         doc: props.doc,
-        fieldLink: subFieldKey,
+        fieldLink: getCtx().subFieldKey,
         modelLink: props.doc.mainModelKey
       });
       return state.displayStatus === "readonly-component" || state.displayStatus === "readonly-text";
@@ -57206,7 +57685,7 @@ const _sfc_main$2y = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$2y, [["__scopeId", "data-v-e2cc91ff"]]);
+const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$2y, [["__scopeId", "data-v-a58c6b2e"]]);
 const _sfc_main$2x = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
@@ -57643,7 +58122,10 @@ function diffListField(fieldKey, beforeRows, afterRows, metaMap, output) {
         continue;
       }
       const valuePath = generateValuePath(rowFieldKey, fieldKey);
-      const runtimeValuePath = replacePathIndexPlaceholder(rowIndex, valuePath);
+      const runtimeValuePath = replacePathIndexPlaceholders({
+        n: rowIndex,
+        templatePath: valuePath
+      });
       const meta = getFieldMeta(metaMap, runtimeValuePath);
       pushChange(output, {
         beforeValue,
@@ -57669,7 +58151,7 @@ function diffMainField(fieldKey, beforeValue, afterValue, beforeData, afterData,
   });
 }
 function buildWidgetFieldMetaMap(instances) {
-  const map2 = /* @__PURE__ */ new Map();
+  const map = /* @__PURE__ */ new Map();
   for (const instance2 of instances || []) {
     const widgetMeta = instance2?.widgetMeta;
     const fieldMeta = widgetMeta?.field;
@@ -57682,10 +58164,10 @@ function buildWidgetFieldMetaMap(instances) {
       modelId: instance2.modelRef.id,
       points: instance2?.widgetMeta?.extra?.biz?.[instance2.modelRef.id] || {}
     };
-    map2.set(runtimeValuePath, value);
+    map.set(runtimeValuePath, value);
   }
-  console.log("map", map2);
-  return map2;
+  console.log("map", map);
+  return map;
 }
 function buildFieldChangeList(params) {
   const baseline = normalizeFormData(params.baselineData);
@@ -60233,7 +60715,7 @@ const _sfc_main$2i = /* @__PURE__ */ defineComponent({
     const createFieldToWidget = createDesignFieldToWidgetFactory(designCtx.getFieldManifest);
     const subFieldKey = computed(() => {
       if (!interCtx.panelData?.context?.subFieldKey) return "";
-      return getLastSegment(interCtx.panelData.context.subFieldKey);
+      return parseValuePath(interCtx.panelData.context.subFieldKey).normalized;
     });
     const modelKey = computed(() => {
       if (!interCtx.panelData) return "";
@@ -60358,7 +60840,7 @@ const _sfc_main$2i = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ToolkitContentFields = /* @__PURE__ */ _export_sfc(_sfc_main$2i, [["__scopeId", "data-v-2e5d2168"]]);
+const ToolkitContentFields = /* @__PURE__ */ _export_sfc(_sfc_main$2i, [["__scopeId", "data-v-9c5fa2ca"]]);
 const _hoisted_1$1C = { class: "toolkit-content-widgets" };
 const _hoisted_2$11 = { key: 0 };
 const _hoisted_3$M = ["data-type", "draggable", "onDragstart"];
@@ -60631,14 +61113,14 @@ const _sfc_main$2e = /* @__PURE__ */ defineComponent({
         bl: { x: x2 + padding.left, y: y2 + height - padding.bottom },
         br: { x: x2 + width - padding.right, y: y2 + height - padding.bottom }
       };
-      const map2 = {
+      const map = {
         tl: [-1, -1],
         tr: [1, -1],
         bl: [-1, 1],
         br: [1, 1]
       };
       return Object.keys(corners).map((pos) => {
-        const [dx, dy] = map2[pos];
+        const [dx, dy] = map[pos];
         const cx = halfPixel(corners[pos].x);
         const cy = halfPixel(corners[pos].y);
         return {
@@ -64150,16 +64632,16 @@ const __vite_glob_0_42 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.de
 }, Symbol.toStringTag, { value: "Module" }));
 function loadFieldManifestModules() {
   const manifestModules = /* @__PURE__ */ Object.assign({ "./basic/boolean-manifest.ts": __vite_glob_0_0$3, "./basic/date-manifest.ts": __vite_glob_0_1$3, "./basic/date-time-manifest.ts": __vite_glob_0_2$3, "./basic/decimal-manifest.ts": __vite_glob_0_3$3, "./basic/double-manifest.ts": __vite_glob_0_4$3, "./basic/integer-manifest.ts": __vite_glob_0_5$3, "./basic/long-manifest.ts": __vite_glob_0_6$3, "./basic/long-text-manifest.ts": __vite_glob_0_7$2, "./basic/text-manifest.ts": __vite_glob_0_8$2, "./basic/time-manifest.ts": __vite_glob_0_9$2, "./business/destructive-test-qty-manifest.ts": __vite_glob_0_10$2, "./business/good-qty-manifest.ts": __vite_glob_0_11$2, "./business/material-check-qty-manifest.ts": __vite_glob_0_12$2, "./business/not-good-group-manifest.ts": __vite_glob_0_13$2, "./business/not-good-qty-manifest.ts": __vite_glob_0_14$1, "./business/not-good-reason-manifest.ts": __vite_glob_0_15$1, "./business/product-check-qty-manifest.ts": __vite_glob_0_16, "./business/production-date-manifest.ts": __vite_glob_0_17, "./business/report-end-time-manifest.ts": __vite_glob_0_18, "./business/report-start-time-manifest.ts": __vite_glob_0_19, "./business/reporter-manifest.ts": __vite_glob_0_20, "./business/routing-operation-manifest.ts": __vite_glob_0_21, "./business/scrap-group-manifest.ts": __vite_glob_0_22, "./business/scrap-material-manifest.ts": __vite_glob_0_23, "./business/scrap-material-no-manifest.ts": __vite_glob_0_24, "./business/scrap-qty-manifest.ts": __vite_glob_0_25, "./business/scrap-reason-manifest.ts": __vite_glob_0_26, "./business/work-hours-manifest.ts": __vite_glob_0_27, "./logic/attachment-manifest.ts": __vite_glob_0_28, "./logic/image-manifest.ts": __vite_glob_0_29, "./logic/option-manifest.ts": __vite_glob_0_30, "./logic/option-multi-manifest.ts": __vite_glob_0_31, "./logic/org-manifest.ts": __vite_glob_0_32, "./logic/org-multi-manifest.ts": __vite_glob_0_33, "./logic/signature-manifest.ts": __vite_glob_0_34, "./logic/user-manifest.ts": __vite_glob_0_35, "./logic/user-multi-manifest.ts": __vite_glob_0_36, "./trace/device-manifest.ts": __vite_glob_0_37, "./trace/material-no-manifest.ts": __vite_glob_0_38, "./trace/mfg-order-manifest.ts": __vite_glob_0_39, "./trace/product-manifest.ts": __vite_glob_0_40, "./trace/record-no-manifest.ts": __vite_glob_0_41, "./trace/trace-date-manifest.ts": __vite_glob_0_42 });
-  const map2 = {};
+  const map = {};
   Object.entries(manifestModules).forEach(([path2, exports$1]) => {
     const { manifest: manifest2 } = exports$1;
     if (!manifest2) {
       console.warn(`模块 ${path2} 缺少必要导出项`);
       return;
     }
-    map2[manifest2.type] = manifest2;
+    map[manifest2.type] = manifest2;
   });
-  return map2;
+  return map;
 }
 const fieldManifestMap = loadFieldManifestModules();
 const manifest$6 = {
@@ -64456,16 +64938,16 @@ const __vite_glob_0_6$2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.d
 }, Symbol.toStringTag, { value: "Module" }));
 function loadPaperWidgetManifestModules() {
   const manifestModules = /* @__PURE__ */ Object.assign({ "./basic/barcode-manifest.ts": __vite_glob_0_0$2, "./basic/diagonal-manifest.ts": __vite_glob_0_1$2, "./basic/image-manifest.ts": __vite_glob_0_2$2, "./basic/line-manifest.ts": __vite_glob_0_3$2, "./basic/pagination-manifest.ts": __vite_glob_0_4$2, "./basic/qrcode-manifest.ts": __vite_glob_0_5$2, "./basic/serialnumber-manifest.ts": __vite_glob_0_6$2 });
-  const map2 = {};
+  const map = {};
   Object.entries(manifestModules).forEach(([path2, exports$1]) => {
     const { manifest: manifest2 } = exports$1;
     if (!manifest2) {
       console.warn(`模块 ${path2} 缺少必要导出项`);
       return;
     }
-    map2[manifest2.type] = manifest2;
+    map[manifest2.type] = manifest2;
   });
-  return map2;
+  return map;
 }
 const paperWidgetManifestMap = loadPaperWidgetManifestModules();
 const UploadTypeConst = {
@@ -65491,9 +65973,14 @@ const _sfc_main$1P = /* @__PURE__ */ defineComponent({
     const modelValue = computed(() => {
       let text = pageWidgetProps.value.value;
       if (valueType.value === ValueTypeConst.Field) {
-        const path2 = text?.fieldData?.valuePath;
+        const path2 = text?.exp?.fieldData?.valuePath;
         if (path2) {
-          const runtimePath = replacePathIndexPlaceholder(props.widget.dataIndex, path2);
+          const runtimePath = replacePathIndexPlaceholders({
+            y: props.widget.yDataIndex,
+            x: props.widget.xDataIndex,
+            n: props.widget.dataIndex,
+            templatePath: path2
+          });
           text = docInst.value?.dataManager?.get(runtimePath);
         }
       }
@@ -65784,7 +66271,12 @@ const _sfc_main$1O = /* @__PURE__ */ defineComponent({
           return fieldInfo?.name ? `\${${fieldInfo.name}}` : path2;
         }
         if (path2) {
-          const runtimePath = replacePathIndexPlaceholder(props.widget.dataIndex, path2);
+          const runtimePath = replacePathIndexPlaceholders({
+            y: props.widget.yDataIndex,
+            x: props.widget.xDataIndex,
+            n: props.widget.dataIndex,
+            templatePath: path2
+          });
           return docInst.value?.dataManager?.get(runtimePath);
         }
       }
@@ -66258,9 +66750,14 @@ const _sfc_main$1K = /* @__PURE__ */ defineComponent({
     const modelValue = computed(() => {
       let text = pageWidgetProps.value.value;
       if (valueType.value === ValueTypeConst.Field) {
-        const path2 = text?.fieldData?.valuePath;
+        const path2 = text?.exp?.fieldData?.valuePath;
         if (path2) {
-          const runtimePath = replacePathIndexPlaceholder(props.widget.dataIndex, path2);
+          const runtimePath = replacePathIndexPlaceholders({
+            y: props.widget.yDataIndex,
+            x: props.widget.xDataIndex,
+            n: props.widget.dataIndex,
+            templatePath: path2
+          });
           text = docInst.value?.dataManager?.get(runtimePath);
         }
       }
@@ -67192,13 +67689,15 @@ const _sfc_main$1D = /* @__PURE__ */ defineComponent({
     const designCtx = useDesignSuiteContext();
     const { docInst } = useDocPubApiContext();
     const props = __props;
-    const regionRef = computed(() => props.widget.findRegionById(props.active.context.regionId));
-    const modelKey = computed(() => getLastSegment(props.active.context.mainModelKey));
-    const fieldKey = computed(() => getLastSegment(regionRef.value?.valuePath));
+    const regionRef = computed(
+      () => props.widget.findRegionById(props.active.context.regionId)
+    );
+    const modelKey = computed(() => props.active.context.mainModelKey);
+    const subFieldKey = computed(() => regionRef.value?.subFieldKey);
     const fieldInfo = computed(() => {
-      if (!modelKey.value || !fieldKey.value) return null;
+      if (!modelKey.value || !subFieldKey.value) return null;
       const list = designCtx.runtime.getFieldList(modelKey.value);
-      return list?.find((f) => f.key === fieldKey.value) ?? null;
+      return list?.find((f) => f.key === subFieldKey.value) ?? null;
     });
     const regionProps = usePanelProps(regionRef, "widgetMeta.props");
     function onDeleteDynamicTable() {
@@ -67317,7 +67816,7 @@ const _sfc_main$1D = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DynamicTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1D, [["__scopeId", "data-v-ca7aec6b"]]);
+const DynamicTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1D, [["__scopeId", "data-v-09705f9b"]]);
 const schema$b = {
   key: "dynamic-table.basic",
   title: [
@@ -67346,8 +67845,8 @@ const _sfc_main$1C = /* @__PURE__ */ defineComponent({
       return props.widget.findRegionById(id);
     });
     const isBindDataGroup = withLayoutComputed(() => !!regionRef.value?.itemRegion);
-    const modelKey = computed(() => getLastSegment(props.active.context.mainModelKey));
-    const fieldKey = computed(() => getLastSegment(regionRef.value?.subFieldKey));
+    const modelKey = computed(() => props.active.context.mainModelKey);
+    const fieldKey = computed(() => regionRef.value?.subFieldKey);
     const fieldInfo = computed(() => {
       if (!modelKey.value || !fieldKey.value) return null;
       const list = designCtx.runtime.getFieldList(modelKey.value);
@@ -67453,7 +67952,7 @@ const _sfc_main$1C = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _2DTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1C, [["__scopeId", "data-v-7d2be0ce"]]);
+const _2DTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1C, [["__scopeId", "data-v-8cc7a416"]]);
 const schema$a = {
   key: "2d-table.basic",
   title: [
@@ -67482,8 +67981,8 @@ const _sfc_main$1B = /* @__PURE__ */ defineComponent({
       return props.widget.findRegionById(id);
     });
     const isBindDataGroup = withLayoutComputed(() => !!regionRef.value?.itemRegion);
-    const modelKey = computed(() => getLastSegment(props.active.context.mainModelKey));
-    const fieldKey = computed(() => getLastSegment(regionRef.value?.valuePath));
+    const modelKey = computed(() => props.active.context.mainModelKey);
+    const fieldKey = computed(() => regionRef.value?.subFieldKey);
     const fieldInfo = computed(() => {
       if (!modelKey.value || !fieldKey.value) return null;
       const list = designCtx.runtime.getFieldList(modelKey.value);
@@ -67589,7 +68088,7 @@ const _sfc_main$1B = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const FixedTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1B, [["__scopeId", "data-v-b909e48b"]]);
+const FixedTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1B, [["__scopeId", "data-v-646f62b8"]]);
 const schema$9 = {
   key: "fixed-table.basic",
   title: [
@@ -67618,8 +68117,8 @@ const _sfc_main$1A = /* @__PURE__ */ defineComponent({
       return props.widget.findRegionById(id);
     });
     const isBindDataGroup = withLayoutComputed(() => !!regionRef.value?.itemRegion);
-    const modelKey = computed(() => getLastSegment(props.active.context.mainModelKey));
-    const fieldKey = computed(() => getLastSegment(regionRef.value?.subFieldKey));
+    const modelKey = computed(() => props.active.context.mainModelKey);
+    const fieldKey = computed(() => regionRef.value?.subFieldKey);
     const fieldInfo = computed(() => {
       if (!modelKey.value || !fieldKey.value) return null;
       const list = designCtx.runtime.getFieldList(modelKey.value);
@@ -67725,7 +68224,7 @@ const _sfc_main$1A = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const CheckTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1A, [["__scopeId", "data-v-5792e4ce"]]);
+const CheckTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1A, [["__scopeId", "data-v-e4d1497a"]]);
 const schema$8 = {
   key: "check-table.basic",
   title: [
@@ -67862,13 +68361,18 @@ const _sfc_main$1y = /* @__PURE__ */ defineComponent({
     };
     const props = __props;
     const sheetReadonly = ref(false);
+    const rId = computed(() => props.active.context.regionId?.split("_")[0] ?? "");
+    const regionRef = computed(
+      () => props.widget.findRegionById(rId.value)
+    );
     const optionsMap = computed(() => {
-      const { mainModelKey, subFieldKey } = props.active.context;
-      if (!mainModelKey || !subFieldKey) {
+      const mainModelKey = props.active.context.mainModelKey;
+      const rowFieldKey = regionRef.value?.subFieldKey;
+      const colFieldKey = regionRef.value?.linkFieldKey;
+      if (!mainModelKey || !rowFieldKey || !colFieldKey) {
         return { row: [], col: [] };
       }
       const mainFields = designCtx.runtime.getFieldList(mainModelKey);
-      const [rowFieldKey, colFieldKey] = subFieldKey.replace("$.", "").split(":") ?? [];
       const rowModelKey = mainFields.find((f) => f.key === rowFieldKey)?.bindInfo;
       const colModelKey = mainFields.find((f) => f.key === colFieldKey)?.bindInfo;
       return {
@@ -67876,10 +68380,6 @@ const _sfc_main$1y = /* @__PURE__ */ defineComponent({
         col: getFieldOptions(colModelKey)
       };
     });
-    const rId = computed(() => props.active.context.regionId?.split("_")[0] ?? "");
-    const regionRef = computed(
-      () => props.widget.findRegionById(rId.value)
-    );
     const itemRegion = computed(() => regionRef.value?.itemRegion);
     const regionProps = usePanelProps(regionRef, "widgetMeta.props");
     function onDeleteDataGroup2D() {
@@ -67978,7 +68478,7 @@ const _sfc_main$1y = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DataGroup2DPanel = /* @__PURE__ */ _export_sfc(_sfc_main$1y, [["__scopeId", "data-v-6a36dc19"]]);
+const DataGroup2DPanel = /* @__PURE__ */ _export_sfc(_sfc_main$1y, [["__scopeId", "data-v-9e4ec5d9"]]);
 const schema$6 = {
   key: "data-group-2d.basic",
   title: [
@@ -76017,7 +76517,7 @@ const __vite_glob_1_6 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.def
 const fieldModules = /* @__PURE__ */ Object.assign({ "./field/boolean/field-boolean-config.vue": __vite_glob_0_0, "./field/boolean/field-boolean-style.vue": __vite_glob_0_1, "./field/business/field-business-config.vue": __vite_glob_0_2, "./field/datetime/field-datetime-config.vue": __vite_glob_0_3, "./field/enum/field-enum-config.vue": __vite_glob_0_4, "./field/enum/field-enum-style.vue": __vite_glob_0_5, "./field/file/field-file-config.vue": __vite_glob_0_6, "./field/image/field-image-config.vue": __vite_glob_0_7, "./field/image/field-image-style.vue": __vite_glob_0_8, "./field/number/field-number-config.vue": __vite_glob_0_9, "./field/org/field-org-config.vue": __vite_glob_0_10, "./field/sign/field-sign-config.vue": __vite_glob_0_11, "./field/sign/field-sign-style.vue": __vite_glob_0_12, "./field/text/field-text-config.vue": __vite_glob_0_13, "./field/trace/field-trace-config.vue": __vite_glob_0_14, "./field/user/field-user-config.vue": __vite_glob_0_15 });
 const widgetModules = /* @__PURE__ */ Object.assign({ "./paper-widget/barcode/widget-barcode-config.vue": __vite_glob_1_0, "./paper-widget/diagonal/widget-diagonal-config.vue": __vite_glob_1_1, "./paper-widget/image/widget-image-config.vue": __vite_glob_1_2, "./paper-widget/line/widget-line-config.vue": __vite_glob_1_3, "./paper-widget/pagination/widget-pagination-config.vue": __vite_glob_1_4, "./paper-widget/qrcode/widget-qrcode-config.vue": __vite_glob_1_5, "./paper-widget/serialnumber/widget-serialnumber-config.vue": __vite_glob_1_6 });
 function buildMap(modules, reg) {
-  const map2 = {};
+  const map = {};
   Object.entries(modules).forEach(([filePath, module2]) => {
     try {
       const match = filePath.match(reg);
@@ -76028,20 +76528,20 @@ function buildMap(modules, reg) {
       const [, coreId, typeStr] = match;
       const key = `schema:${coreId}`;
       const type4 = typeStr;
-      if (!map2[key]) {
-        map2[key] = {};
+      if (!map[key]) {
+        map[key] = {};
       }
-      map2[key][type4] = module2.default;
+      map[key][type4] = module2.default;
     } catch (err) {
       console.error(`加载组件 ${filePath} 失败:`, err);
     }
   });
-  return map2;
+  return map;
 }
 function mergeMaps(...maps) {
   const result = {};
-  maps.forEach((map2) => {
-    Object.entries(map2).forEach(([key, value]) => {
+  maps.forEach((map) => {
+    Object.entries(map).forEach(([key, value]) => {
       const _key = key;
       if (!result[_key]) {
         result[_key] = {};
@@ -77396,7 +77896,10 @@ function useTableDropdown(props) {
         strategy.value.linkFieldId,
         fieldMeta.value?.subFieldKey
       );
-      const realLinkValuePath = replacePathIndexPlaceholder(runtimeValuePath.value, linkValuePath);
+      const realLinkValuePath = replacePathIndexPlaceholders({
+        refPath: runtimeValuePath.value,
+        templatePath: linkValuePath
+      });
       return getValue$1(docInst.value.dataManager.get(realLinkValuePath), false);
     }
   });
@@ -77406,7 +77909,10 @@ function useTableDropdown(props) {
         strategy.value.clearFieldId,
         fieldMeta.value?.subFieldKey
       );
-      const realValuePath = replacePathIndexPlaceholder(runtimeValuePath.value, valuePath);
+      const realValuePath = replacePathIndexPlaceholders({
+        refPath: runtimeValuePath.value,
+        templatePath: valuePath
+      });
       return realValuePath;
     }
   });