@agile-team/mach-report 2.16.0 → 2.17.0

package/dist/{json-snapshot-D6ioHth9.js → json-snapshot-DYmEe3sO.js}

@@ -1,36 +1,96 @@
-import { R as X } from "./component-tree-Ca6YYfHq.js";
-import { r as ue, b as xt, i as Tt, f as A, D as Ie, L as Ee } from "./style-67OqfNed.js";
-import { w as Y, h as Ce } from "./textwrap-BEIg2w8y.js";
-import { R as E, g as Oe, b as Pt, i as $t, e as H, l as fe, c as kt, t as Fe, h as Ke, f as Ae, j as Rt, k as It } from "./record-bindings-CZWBJ1fU.js";
-import { e as Ne, b as Et } from "./computed-C-4C2S5h.js";
-import { e as Ct, c as Ot } from "./matrix-CGRGkn5s.js";
-import { f as je, a as Ft, c as Kt } from "./tree-CjVZLRw7.js";
-import { i as At, r as Nt, j as jt, a as Le, v as Lt, R as Ht } from "./template-registry-Cw3vRTX2.js";
-import { g as Dt } from "./report-params-B1RzkhJj.js";
-import { a as xe } from "./param-validation-Do7Eg8Zv.js";
-import { r as me } from "./grid-geometry-BNptEcMm.js";
-import { f as Bt, i as Gt } from "./number-format-BA_KwrZe.js";
-import { d as Wt, v as Vt } from "./dataset-H5pFuQGU.js";
-function Jt(e, t, r) {
+import { R as Q } from "./component-tree-Ca6YYfHq.js";
+import { r as Z, L as ge, b as $t, i as Rt, f as N, D as Ce } from "./style-67OqfNed.js";
+import { w as J, h as Oe } from "./textwrap-BEIg2w8y.js";
+import { c as Fe, R as E, g as Ae, b as It, i as Et, e as H, l as he, t as Ne, h as Ke, f as je, j as Ct, k as Ot } from "./record-bindings-D4TuMzHs.js";
+import { e as Le, b as Ft, k as At, r as Nt } from "./computed-BW5a8QFk.js";
+import { c as Kt, e as jt } from "./matrix-JLAXlux-.js";
+import { r as ee } from "./grid-geometry-BNptEcMm.js";
+import { f as He, a as Lt, c as Ht } from "./tree-DNJorJUf.js";
+import { i as Dt, r as Gt, j as Bt, b as De, v as Wt, R as Vt } from "./template-registry-u11fPd8D.js";
+import { g as Jt } from "./report-params-B1RzkhJj.js";
+import { a as Te } from "./param-validation-Do7Eg8Zv.js";
+import { f as zt, i as _t } from "./number-format-BA_KwrZe.js";
+import { v as Ge, d as qt } from "./dataset-DL83majE.js";
+const Ut = 4096, Pe = 128 * 1024;
+function Xt(e) {
+  const t = /* @__PURE__ */ new Map();
+  let r = 0;
+  return { measureMm(o, n) {
+    const a = JSON.stringify([o, n.fontSizePt, n.fontFamily, n.bold, n.italic, n.letterSpacingPt]), s = t.get(a);
+    if (s !== void 0)
+      return t.delete(a), t.set(a, s), s;
+    const i = e.measureMm(o, n);
+    if (Number.isFinite(i) && a.length <= Pe) {
+      for (; t.size >= Ut || r + a.length > Pe; ) {
+        const c = t.keys().next().value;
+        r -= c.length, t.delete(c);
+      }
+      t.set(a, i), r += a.length;
+    }
+    return i;
+  } };
+}
+function Yt(e, t) {
+  return { member: "body", subtotal: "subtotal", total: "grand-total" }[e?.rows.get(t)?.kind ?? "member"];
+}
+function Qt(e) {
+  const t = e.matrix;
+  if (!t.hierarchy) return t;
+  const r = new Map(e.columns.map((n) => [n.field, n.header])), o = { sum: "求和", count: "计数", avg: "平均", min: "最小", max: "最大", weightedAvg: "加权平均" };
+  return { ...t, hierarchy: {
+    ...t.hierarchy,
+    row: { ...t.hierarchy.row, labels: t.hierarchy.row?.labels ?? t.rowFields.map((n) => r.get(n) ?? n) },
+    column: { ...t.hierarchy.column, labels: t.hierarchy.column?.labels ?? t.columnFields.map((n) => r.get(n) ?? n) }
+  }, measures: t.measures.map((n) => {
+    const a = r.get(n.field) ?? r.get(n.valueField ?? n.field);
+    return n.label === void 0 && a ? { ...n, label: `${a}（${o[n.op]}）` } : n;
+  }) };
+}
+function Zt(e, t) {
+  if (!e.matrix) return { list: e, rows: t };
+  if (e.detail || e.groupBy || e.groups?.length || e.grandTotal) throw new Error("矩阵不能同时配置普通分组、总计或主从明细");
+  const r = Kt(t, Qt(e)), o = r.columns.map((i) => ({ ...i, widthMm: i.semanticRole === "dimension" ? e.matrix.rowWidthMm ?? 40 : e.matrix.columnWidthMm ?? 28, editable: !1, align: i.semanticRole === "dimension" ? "center" : "right" })), n = { ...e, columns: o, headerGrid: r.headerGrid, rowKey: void 0, revisionField: void 0, sourceTokenField: void 0 };
+  e.layout === "wide" && (n.widthMm = o.reduce((i, c) => i + c.widthMm, 0));
+  const a = r.metadata, s = a ? { rows: new WeakMap(r.rows.map((i, c) => [i, a.rows[c]])), header: {
+    columns: a.columns,
+    rowFields: a.rowFields,
+    rowLabels: a.rowLabels,
+    columnFields: a.columnFields,
+    columnLabels: a.columnLabels
+  } } : void 0;
+  return { list: n, rows: r.rows, ...s ? { matrix: s } : {} };
+}
+function er(e, t) {
+  if (!e.matrix?.hierarchy || !e.headerGrid) return e.headerGrid;
+  const r = e.paddingMm ?? 1, o = e.headerGrid.cells.map(() => e.rowHeightMm ?? 0), n = e.columns.map((c) => c.widthMm), a = ee({ ...e.headerGrid, colWidthsMm: n }, n.reduce((c, l) => c + l, 0), o.length), s = /* @__PURE__ */ new WeakMap();
+  for (const { cell: c, ci: l, ri: d, widthMm: f } of a.cells) {
+    const u = { ...Fe(e, e.columns[l]), ...c.style }, m = Z(u).fontSizePt, g = (J(c.text ?? "", Math.max(1, f - r * 2), { fontSizePt: m, fontFamily: u.fontFamily, bold: u.bold, italic: u.italic, letterSpacingPt: u.letterSpacing }, t).length * m * (u.lineHeight ?? ge) * 25.4 / 72 + r * 2) / (c.rowSpan ?? 1);
+    for (let p = d; p < d + (c.rowSpan ?? 1); p++) o[p] = Math.max(o[p] ?? 0, g);
+    s.set(c, u);
+  }
+  const i = e.headerGrid.cells.map((c) => c.map((l) => l ? { ...l, style: s.get(l) } : null));
+  return { ...e.headerGrid, cells: i, rowHeightsMm: o };
+}
+function tr(e, t, r) {
   const o = /* @__PURE__ */ new Set(), n = e.cells.map((a, s) => {
     const i = [];
     let c = 0;
-    for (const d of a) {
+    for (const l of a) {
       for (; o.has(`${s}:${c}`); ) c++;
-      const l = d?.colSpan ?? 1, f = d?.rowSpan ?? 1;
+      const d = l?.colSpan ?? 1, f = l?.rowSpan ?? 1;
       let u = 0;
-      for (let m = c; m < c + l; m++) {
+      for (let m = c; m < c + d; m++) {
         t.has(m) && u++;
         for (let h = s + 1; h < s + f; h++)
           o.add(`${h}:${m}`);
       }
-      u && i.push(d ? { ...d, colSpan: u } : null), c += l;
+      u && i.push(l ? { ...l, colSpan: u } : null), c += d;
     }
     return i;
   });
   return { ...e, cells: n, colWidthsMm: r };
 }
-function zt(e) {
+function rr(e) {
   if (!e.columns.some((o) => o.hidden)) return e;
   const t = /* @__PURE__ */ new Set(), r = e.columns.filter((o, n) => o.hidden ? !1 : (t.add(n), !0));
   if (!r.length) throw new Error("列表至少需要一列可见列");
@@ -38,7 +98,7 @@ function zt(e) {
     ...e,
     columns: r,
     ...e.headerGrid ? {
-      headerGrid: Jt(
+      headerGrid: tr(
         e.headerGrid,
         t,
         r.map((o) => o.widthMm)
@@ -46,34 +106,34 @@ function zt(e) {
     } : {}
   };
 }
-function* _t(e) {
+function* or(e) {
   const { page: t } = e;
-  At(t.components, t.flow);
+  Dt(t.components, t.flow);
   let r = 0, o = 0;
-  for (const n of Nt(t.components, t.flow)) {
+  for (const n of Gt(t.components, t.flow)) {
     e.active();
-    const a = n.band, s = n.components.some((l) => l.kind === "list" && l.cardinality !== "record"), i = s ? 0 : n.components.reduce((l, f) => Math.max(l, f.topMm - a.topMm + (f.kind === "list" ? e.height(f) : f.heightMm)), a.heightMm);
+    const a = n.band, s = n.components.some((d) => d.kind === "list" && d.cardinality !== "record"), i = s ? 0 : n.components.reduce((d, f) => Math.max(d, f.topMm - a.topMm + (f.kind === "list" ? e.height(f) : f.heightMm)), a.heightMm);
     let c = Math.max(e.top(), o + a.topMm - r);
     if (!s && i > e.bottom() - e.top() + 1e-3) throw new Error(`静态区域 ${a.componentIds.join(",")} 高度超出单页可用范围`);
     !s && c + i > e.bottom() + 1e-3 && (e.nextPage(), yield* e.takePages(), e.active(), c = e.top());
-    let d = c + i;
-    for (const l of n.components) {
-      const f = c + l.topMm - a.topMm;
-      l.kind === "list" ? (yield* e.list(l, f, (u) => {
-        d = s ? u : Math.max(d, u);
-      }), e.active()) : e.append({ ...l, topMm: f });
+    let l = c + i;
+    for (const d of n.components) {
+      const f = c + d.topMm - a.topMm;
+      d.kind === "list" ? (yield* e.list(d, f, (u) => {
+        l = s ? u : Math.max(l, u);
+      }), e.active()) : e.append({ ...d, topMm: f });
     }
-    o = d, r = a.topMm + a.heightMm;
+    o = l, r = a.topMm + a.heightMm;
   }
 }
-function qt(e) {
+function nr(e) {
   return !!(e.computed?.length || e.groups?.length || e.groupBy || e.grandTotal || e.rowVisibleWhen || e.matrix || e.tree || e.detail || e.columns.some((t) => t.rules?.length || t.visibleWhen));
 }
-function Q(e) {
-  return e.pages.some((t) => t.components.some((r) => r.kind === "list" && qt(r)));
+function te(e) {
+  return e.pages.some((t) => t.components.some((r) => r.kind === "list" && nr(r)));
 }
-const Ut = 512, Te = 256 * 1024;
-function Xt() {
+const ar = 512, ke = 256 * 1024;
+function sr() {
   const e = /* @__PURE__ */ new Map();
   let t = 0, r;
   return (o, n, a, s) => {
@@ -81,18 +141,18 @@ function Xt() {
     const i = JSON.stringify([o, n, a.fontSizePt, a.fontFamily, a.bold, a.italic, a.letterSpacingPt]), c = e.get(i);
     if (c)
       return e.delete(i), e.set(i, c), c.lines.slice();
-    const d = Y(o, n, a, s), l = i.length + d.reduce((f, u) => f + u.length, 0);
-    if (l <= Te) {
-      for (; e.size >= Ut || t + l > Te; ) {
+    const l = J(o, n, a, s), d = i.length + l.reduce((f, u) => f + u.length, 0);
+    if (d <= ke) {
+      for (; e.size >= ar || t + d > ke; ) {
         const f = e.keys().next().value;
         t -= e.get(f).units, e.delete(f);
       }
-      e.set(i, { lines: d.slice(), units: l }), t += l;
+      e.set(i, { lines: l.slice(), units: d }), t += d;
     }
-    return d;
+    return l;
   };
 }
-class N extends Error {
+class K extends Error {
   constructor(t, r) {
     super(`报表页数超出上限 ${t}（至少 ${r} 页）`), this.limit = t, this.actual = r, this.code = "page-limit", this.name = "PaginatePageLimitError";
   }
@@ -102,98 +162,98 @@ class D extends Error {
     super(`报表单元格数量超出上限 ${t}（至少 ${r} 格）`), this.limit = t, this.actual = r, this.code = "cell-limit", this.name = "PaginateCellLimitError";
   }
 }
-const Yt = 1e4, Pe = 25e4;
-function ge(e) {
+const ir = 1e4, $e = 25e4;
+function pe(e) {
   if (e?.aborted) throw e.reason ?? new DOMException("标签生成已取消", "AbortError");
 }
-function He(e, t, r) {
-  const o = typeof e.copies == "object" ? Oe(t, e.copies.field, r) : e.copies ?? 1;
+function Be(e, t, r) {
+  const o = typeof e.copies == "object" ? Ae(t, e.copies.field, r) : e.copies ?? 1;
   if (typeof o != "number" || !Number.isSafeInteger(o) || o < 1 || o > 1e3) throw new E(`$.datasets.${r.dataset}[${r.rowIndex}]`, "每条记录复制数必须是 1..1000 的数值型整数", r.rowIndex, typeof e.copies == "object" ? e.copies.field : void 0);
   return o;
 }
-function De(e, t, r) {
+function We(e, t, r) {
   if (e.rowKey === void 0) return;
-  const o = Oe(t, e.rowKey, r);
+  const o = Ae(t, e.rowKey, r);
   if (typeof o == "string" && o.trim() || typeof o == "number" && Number.isFinite(o)) return o;
   throw new E(`$.datasets.${r.dataset}[${r.rowIndex}].${e.rowKey}`, "业务主键必须是非空字符串或有限数字", r.rowIndex, e.rowKey);
 }
-function Qt(e) {
+function cr(e) {
   const t = (r) => 1 + (r.grid?.cells.reduce((o, n) => o + 1 + n.length + n.reduce((a, s) => a + (s?.children?.reduce((i, c) => i + t(c), 0) ?? 0), 0), 0) ?? 0);
   return e.pages.reduce((r, o) => r + o.components.reduce((n, a) => n + t(a), 0), 0);
 }
-function Zt(e, t, r) {
+function lr(e, t, r) {
   const o = e.repeat, n = Object.prototype.hasOwnProperty.call(t, o.dataset) ? t[o.dataset] : void 0;
   if (!Array.isArray(n)) throw new E(`$.datasets.${o.dataset}`, "逐记录标签数据集缺失，应提供对象数组（允许空数组）");
-  const a = /* @__PURE__ */ new Set(), s = r.maxPages ?? Yt, i = Qt(e);
-  let c = 0, d = 0;
-  for (const [l, f] of n.entries()) {
-    if (ge(r.signal), !f || typeof f != "object" || Array.isArray(f)) throw new E(`$.datasets.${o.dataset}[${l}]`, "标签记录应为对象", l);
-    const u = { rowIndex: l, dataset: o.dataset }, m = De(o, f, u);
+  const a = /* @__PURE__ */ new Set(), s = r.maxPages ?? ir, i = cr(e);
+  let c = 0, l = 0;
+  for (const [d, f] of n.entries()) {
+    if (pe(r.signal), !f || typeof f != "object" || Array.isArray(f)) throw new E(`$.datasets.${o.dataset}[${d}]`, "标签记录应为对象", d);
+    const u = { rowIndex: d, dataset: o.dataset }, m = We(o, f, u);
     if (m !== void 0) {
       const g = JSON.stringify([typeof m, m]);
-      if (a.has(g)) throw new E(`$.datasets.${o.dataset}[${l}].${o.rowKey}`, "业务主键重复；请先确认记录来源，避免重复打印标签", l, o.rowKey);
+      if (a.has(g)) throw new E(`$.datasets.${o.dataset}[${d}].${o.rowKey}`, "业务主键重复；请先确认记录来源，避免重复打印标签", d, o.rowKey);
       a.add(g);
     }
-    const h = He(o, f, u);
-    if (c += h * e.pages.length, d += h * i, c > s) throw new N(s, c);
-    if (d > Pe) throw new E("$.repeat", `标签组件总量（含网格行、槽位及嵌套组件）超过安全预算 ${Pe}，请分批生成`, l);
+    const h = Be(o, f, u);
+    if (c += h * e.pages.length, l += h * i, c > s) throw new K(s, c);
+    if (l > $e) throw new E("$.repeat", `标签组件总量（含网格行、槽位及嵌套组件）超过安全预算 ${$e}，请分批生成`, d);
   }
   return n;
 }
-function er(e, t, r) {
+function dr(e, t, r) {
   if (!e.binding) return e;
-  const { binding: o, ...n } = e, a = Pt(o, t.row, t);
+  const { binding: o, ...n } = e, a = It(o, t.row, t);
   if (e.kind === "image") {
     if (!a) return;
-    if (!$t(a)) throw new E(`${r}.binding`, "图片字段只接受 PNG/JPEG base64 data URL；业务 URL 应由宿主安全加载后转换", t.rowIndex, o.field);
+    if (!Et(a)) throw new E(`${r}.binding`, "图片字段只接受 PNG/JPEG base64 data URL；业务 URL 应由宿主安全加载后转换", t.rowIndex, o.field);
     return { ...n, imageData: a };
   }
   return e.kind === "barcode" || e.kind === "qrcode" ? (delete n.imageData, { ...n, code: { ...n.code, value: a }, fallbackText: a }) : (delete n.lines, delete n.richParagraphs, { ...n, text: a });
 }
-function tr(e, t, r) {
+function ur(e, t, r) {
   if (e.kind !== "text" || e.grid || e.richParagraphs?.length) return e;
-  const o = e.style ?? {}, n = ue(o).fontSizePt, a = e.text ?? e.lines?.join(`
+  const o = e.style ?? {}, n = Z(o).fontSizePt, a = e.text ?? e.lines?.join(`
 `) ?? "";
   if (a.length > 16384) throw new E(r, "标签文本超过 16384 字符预算，请缩小字段内容", t.rowIndex);
-  const s = t.wrapText(a, e.widthMm, { fontSizePt: n, bold: o.bold, italic: o.italic, fontFamily: o.fontFamily, letterSpacingPt: o.letterSpacing }, t.options.measurer ?? Ce), i = s.length * n * xt(o) * 25.4 / 72;
+  const s = t.wrapText(a, e.widthMm, { fontSizePt: n, bold: o.bold, italic: o.italic, fontFamily: o.fontFamily, letterSpacingPt: o.letterSpacing }, t.options.measurer ?? Oe), i = s.length * n * $t(o) * 25.4 / 72;
   if (i > e.heightMm + 0.05) throw new E(r, `标签文字需要约 ${i.toFixed(2)}mm 高，超出 ${e.heightMm}mm；请增大文本区域、减少内容或调整字号`, t.rowIndex, e.binding?.field);
   return { ...e, lines: s };
 }
-function Be(e, t, r) {
-  ge(t.options.signal);
-  const o = er(e, t, r);
+function Ve(e, t, r) {
+  pe(t.options.signal);
+  const o = dr(e, t, r);
   if (!o) return;
   let n = o.grid;
-  return n && (n = { ...n, cells: n.cells.map((a, s) => a.map((i, c) => i?.children?.length ? { ...i, children: i.children.flatMap((d, l) => {
-    const f = Be(d, t, `${r}.grid.cells.${s}.${c}.children.${l}`);
+  return n && (n = { ...n, cells: n.cells.map((a, s) => a.map((i, c) => i?.children?.length ? { ...i, children: i.children.flatMap((l, d) => {
+    const f = Ve(l, t, `${r}.grid.cells.${s}.${c}.children.${d}`);
     return f ? [f] : [];
-  }) } : i)) }), tr(n === o.grid ? o : { ...o, grid: n }, t, r);
+  }) } : i)) }), ur(n === o.grid ? o : { ...o, grid: n }, t, r);
 }
-function rr(e, t, r, o, n, a) {
+function fr(e, t, r, o, n, a) {
   return {
     ...e,
     components: e.components.flatMap((s, i) => {
-      const c = Be(s, r, `$.pages.${t}.components.${i}`);
+      const c = Ve(s, r, `$.pages.${t}.components.${i}`);
       return c ? [{ ...c, meta: { ...c.meta, labelSource: { pageIndex: t, componentIndex: i } } }] : [];
     }),
     meta: { ...e.meta, record: { dataset: r.dataset, rowIndex: r.rowIndex, ...a === void 0 ? {} : { rowKey: a }, copyIndex: o, copyCount: n, templatePageIndex: t } }
   };
 }
-function* or(e, t, r) {
+function* mr(e, t, r) {
   const o = [];
-  if (jt(e, o), o.length) throw new E(o[0].path, o[0].message);
+  if (Bt(e, o), o.length) throw new E(o[0].path, o[0].message);
   if (!e.repeat) {
     for (const [i, c] of e.pages.entries()) yield { page: c, pageIndex: i };
     return;
   }
-  const n = e.repeat, a = Zt(e, t, r), s = Xt();
+  const n = e.repeat, a = lr(e, t, r), s = sr();
   for (const [i, c] of a.entries()) {
-    const d = { row: c, rowIndex: i, dataset: n.dataset, options: r, wrapText: s }, l = He(n, c, d), f = De(n, c, d);
-    for (let u = 0; u < l; u++) for (const [m, h] of e.pages.entries())
-      ge(r.signal), yield { page: rr(h, m, d, u, l, f), pageIndex: m };
+    const l = { row: c, rowIndex: i, dataset: n.dataset, options: r, wrapText: s }, d = Be(n, c, l), f = We(n, c, l);
+    for (let u = 0; u < d; u++) for (const [m, h] of e.pages.entries())
+      pe(r.signal), yield { page: fr(h, m, l, u, d, f), pageIndex: m };
   }
 }
-function nr(e) {
+function gr(e) {
   return {
     widthMm: e.widthMm,
     heightMm: e.heightMm,
@@ -204,67 +264,67 @@ function nr(e) {
     components: []
   };
 }
-function q(e, t) {
+function U(e, t) {
   const r = t.heightMm - (e.layout === "wide" ? t.marginBottomMm : e.marginBottomMm ?? t.marginBottomMm);
   return e.components.reduce((o, n) => n.kind !== "list" && n.pageAnchor === "footer" ? Math.min(o, n.topMm) : o, r);
 }
-function G(e) {
+function B(e) {
   return e.components.reduce((t, r) => r.kind !== "list" && r.pageAnchor === "header" ? Math.max(t, r.topMm + r.heightMm) : t, 0);
 }
-function Ge(e, t) {
+function Je(e, t) {
   let r = e.textMetrics.get(t);
   if (!r) {
-    const o = ue(t).fontSizePt;
+    const o = Z(t).fontSizePt;
     r = {
       measureOptions: {
         fontSizePt: o,
-        fontFamily: t.fontFamily ?? Ie,
+        fontFamily: t.fontFamily ?? Ce,
         italic: t.italic,
         bold: t.bold,
         letterSpacingPt: t.letterSpacing
       },
-      lineMm: o * (t.lineHeight ?? Ee) * 25.4 / 72
+      lineMm: o * (t.lineHeight ?? ge) * 25.4 / 72
     }, e.textMetrics.set(t, r);
   }
   return r;
 }
-function ar(e) {
+function hr(e) {
   if (e === null || typeof e == "string" || typeof e == "boolean" || typeof e == "number" && Number.isFinite(e)) return e;
 }
-function he(e, t) {
-  const r = e.fontSizePt ?? Tt, o = e.paddingMm ?? 1, n = e.columns.map((g) => g.align ?? g.style?.align ?? e.align ?? "left"), a = e.columns.map((g, w) => ({
-    ...A({
+function we(e, t) {
+  const r = e.fontSizePt ?? Rt, o = e.paddingMm ?? 1, n = e.columns.map((g) => g.align ?? g.style?.align ?? e.align ?? "left"), a = e.columns.map((g, p) => ({
+    ...N({
       fontSize: r,
       verticalAlign: "middle"
     }, g.style),
-    align: n[w] === "auto" ? "left" : n[w]
-  })), s = a.map((g, w) => n[w] === "auto" ? { left: g, center: { ...g, align: "center" }, right: { ...g, align: "right" } } : void 0), i = e.columns.map((g, w) => g.rules?.map((y) => {
-    const v = s[w];
-    if (v) return {
-      left: A(v.left, y.style),
-      center: A(v.center, y.style),
-      right: A(v.right, y.style)
+    align: n[p] === "auto" ? "left" : n[p]
+  })), s = a.map((g, p) => n[p] === "auto" ? { left: g, center: { ...g, align: "center" }, right: { ...g, align: "right" } } : void 0), i = e.columns.map((g, p) => g.rules?.map((b) => {
+    const M = s[p];
+    if (M) return {
+      left: N(M.left, b.style),
+      center: N(M.center, b.style),
+      right: N(M.right, b.style)
     };
-    const T = A(a[w], y.style);
+    const T = N(a[p], b.style);
     return { left: T, center: T, right: T };
-  })), c = e.columns.map((g) => kt(e, g)), d = e.columns.map((g) => g.header);
-  let l = e.rowHeightMm ?? 0;
-  for (let g = 0; g < d.length; g++) {
-    const w = c[g], y = ue(w).fontSizePt, v = Y(
-      d[g],
+  })), c = e.columns.map((g) => Fe(e, g)), l = e.columns.map((g) => g.header);
+  let d = e.rowHeightMm ?? 0;
+  for (let g = 0; g < l.length; g++) {
+    const p = c[g], b = Z(p).fontSizePt, M = J(
+      l[g],
       e.columns[g].widthMm - o * 2,
-      { fontSizePt: y, fontFamily: w.fontFamily ?? Ie, italic: w.italic, bold: w.bold, letterSpacingPt: w.letterSpacing },
+      { fontSizePt: b, fontFamily: p.fontFamily ?? Ce, italic: p.italic, bold: p.bold, letterSpacingPt: p.letterSpacing },
       t
-    ), T = y * (w.lineHeight ?? Ee) * 25.4 / 72;
-    l = Math.max(l, Math.max(v.length, 1) * T + o * 2);
+    ), T = b * (p.lineHeight ?? ge) * 25.4 / 72;
+    d = Math.max(d, Math.max(M.length, 1) * T + o * 2);
   }
-  const f = d.map((g, w) => ({
+  const f = l.map((g, p) => ({
     text: g,
-    style: c[w]
-  })), u = e.border === !1 ? { borderTop: !1, borderRight: !1, borderBottom: !1, borderLeft: !1 } : { borderBottom: !0, borderLeft: !0, borderRight: !0, borderTop: !0 }, m = e.columns.map((g) => g.widthMm), h = sr(e.headerGrid, m, {
+    style: c[p]
+  })), u = e.border === !1 ? { borderTop: !1, borderRight: !1, borderBottom: !1, borderLeft: !1 } : { borderBottom: !0, borderLeft: !0, borderRight: !0, borderTop: !0 }, m = e.columns.map((g) => g.widthMm), h = pr(er(e, t), m, {
     cells: [f],
     colWidthsMm: m,
-    rowHeightsMm: [l],
+    rowHeightsMm: [d],
     paddingMm: o
   });
   return {
@@ -274,23 +334,23 @@ function he(e, t) {
     autoStyles: s,
     ruleStyles: i,
     textMetrics: /* @__PURE__ */ new WeakMap(),
-    numberFormats: e.columns.map((g) => Fe(g.format)),
+    numberFormats: e.columns.map((g) => Ne(g.format)),
     derivedFields: new Set(e.computed?.map((g) => g.field)),
     borderStyle: u,
-    headerHeightMm: h.rowHeightsMm.reduce((g, w) => g + w, 0),
+    headerHeightMm: h.rowHeightsMm.reduce((g, p) => g + p, 0),
     headerGrid: h,
     colWidthsMm: m,
     columns: e.columns
   };
 }
-function sr(e, t, r) {
+function pr(e, t, r) {
   if (!e) return r;
   if (!e.cells.length) throw new Error("自定义列表表头至少需要一行");
   const o = e.rowHeightsMm ?? e.cells.map(() => r.rowHeightsMm[0]);
   if (o.length !== e.cells.length || o.some((n) => !Number.isFinite(n) || n <= 0)) throw new Error("自定义列表表头行高无效");
   return { ...e, colWidthsMm: t, rowHeightsMm: o };
 }
-function ir(e, t, r) {
+function wr(e, t, r) {
   const o = t.format?.kind === "number" || t.format?.kind === "percent";
   t.valueType !== void 0 ? e.valueType = t.valueType : o && (e.valueType = "number"), t.editable !== void 0 && (e.editable = t.editable), (typeof e.value == "number" || e.value == null) && r !== void 0 && (e.numberFormat = r);
 }
@@ -299,42 +359,43 @@ function W(e, t, r) {
   let a = e.rowHeightFloorMm;
   const s = new Array(o.length);
   for (let i = 0; i < o.length; i++) {
-    const c = o[i], d = c.visibleWhen && !H(t, c.visibleWhen) ? null : t[c.field], l = e.autoStyles[i] ? Ke(d, c.format, c.semanticRole) : "left";
-    let f = e.autoStyles[i]?.[l] ?? e.cellStyles[i];
+    const c = o[i], l = c.visibleWhen && !H(t, c.visibleWhen) ? null : t[c.field], d = e.autoStyles[i] ? Ke(l, c.format, c.semanticRole) : "left";
+    let f = e.autoStyles[i]?.[d] ?? e.cellStyles[i];
     if (c.rules)
-      for (let v = 0; v < c.rules.length; v++) {
-        const T = c.rules[v];
+      for (let M = 0; M < c.rules.length; M++) {
+        const T = c.rules[M];
         if (H(t, T.when)) {
-          f = e.ruleStyles[i][v][l];
+          f = e.ruleStyles[i][M][d];
           break;
         }
       }
-    const u = c.format ? Ae(d, c.format) : fe(d), m = cr(e, c, n);
-    f = lr(e, c, f, n);
-    const h = Ge(e, f), g = Y(u, Math.max(1, c.widthMm - e.paddingMm * 2 - m), h.measureOptions, r);
+    const u = c.format ? je(l, c.format) : he(l), m = yr(e, c, n);
+    f = br(e, c, f, n);
+    const h = Je(e, f), g = J(u, Math.max(1, c.widthMm - e.paddingMm * 2 - m), h.measureOptions, r);
     a = Math.max(a, g.length * h.lineMm + e.paddingMm * 2);
-    const w = ar(d), y = { text: u, style: f };
-    w !== void 0 && (y.value = w), ir(y, c, e.numberFormats[i]), dr(y, c, e, n, m), e.derivedFields.has(c.field) && (y.derived = !0, y.editable = !1), c.visibleWhen && d === null && !H(t, c.visibleWhen) && (y.editable = !1), s[i] = y;
+    const p = hr(l), b = { text: u, style: f };
+    p !== void 0 && (b.value = p), wr(b, c, e.numberFormats[i]), Mr(b, c, e, n, m), e.derivedFields.has(c.field) && (b.derived = !0, b.editable = !1), c.visibleWhen && l === null && !H(t, c.visibleWhen) && (b.editable = !1), s[i] = b;
   }
   return {
     grid: { cells: [s], colWidthsMm: e.colWidthsMm, rowHeightsMm: [a], paddingMm: e.paddingMm },
-    heightMm: a
+    heightMm: a,
+    ...e.matrix ? { meta: { matrix: { row: e.matrix.rows.get(t) } } } : {}
   };
 }
-function cr(e, t, r) {
-  return !r || t.field !== e.tree.list.tree.labelField ? 0 : Rt(e.tree.list, t, r, e.paddingMm);
+function yr(e, t, r) {
+  return !r || t.field !== e.tree.list.tree.labelField ? 0 : Ct(e.tree.list, t, r, e.paddingMm);
 }
-function lr(e, t, r, o) {
+function br(e, t, r, o) {
   return !o || t.field !== e.tree.list.tree.labelField || r.align === "left" ? r : { ...r, align: "left" };
 }
-function dr(e, t, r, o, n = 0) {
-  o && (n && (e.indentMm = n), It(e, t, o, r.tree.list));
+function Mr(e, t, r, o, n = 0) {
+  o && (n && (e.indentMm = n), Ot(e, t, o, r.tree.list));
 }
-function We(e) {
+function ze(e) {
   if (e != null && typeof e != "string" && typeof e != "boolean" && !(typeof e == "number" && Number.isFinite(e))) throw new Error("分组字段应为有限 JSON 标量");
   return JSON.stringify([typeof e, e ?? null]);
 }
-function* Ve(e, t, r = 0) {
+function* _e(e, t, r = 0) {
   const o = t[r];
   if (!o) {
     for (const a of e) yield { kind: "row", row: a };
@@ -342,51 +403,51 @@ function* Ve(e, t, r = 0) {
   }
   const n = /* @__PURE__ */ new Map();
   for (const a of e) {
-    const s = We(a[o.field]), i = n.get(s);
+    const s = ze(a[o.field]), i = n.get(s);
     i ? i.push(a) : n.set(s, [a]);
   }
   for (const a of n.values())
-    yield { kind: "groupHeader", label: (o.headerTemplate ?? "{value}").replace(/\{value\}/g, fe(a[0][o.field])), firstRow: a[0], group: o, depth: r, rows: a }, yield* Ve(a, t, r + 1), (o.subtotal?.length || o.aggregates?.length) && (yield { kind: "subtotal", label: o.subtotalLabel ?? "小计", rows: a, group: o, depth: r }), yield { kind: "groupEnd", depth: r };
+    yield { kind: "groupHeader", label: (o.headerTemplate ?? "{value}").replace(/\{value\}/g, he(a[0][o.field])), firstRow: a[0], group: o, depth: r, rows: a }, yield* _e(a, t, r + 1), (o.subtotal?.length || o.aggregates?.length) && (yield { kind: "subtotal", label: o.subtotalLabel ?? "小计", rows: a, group: o, depth: r }), yield { kind: "groupEnd", depth: r };
 }
-function Je(e, t, r, o = []) {
+function qe(e, t, r, o = []) {
   const n = [...r.filter((a) => !o.some((s) => s.field === a)).map((a) => ({ field: a, op: "sum" })), ...o];
   return new Map(n.map((a) => {
-    const s = e.find((c) => c.field === a.field)?.format ?? { kind: "number", thousands: !0 }, i = Et(t, { ...a, field: a.valueField ?? a.field });
-    return [a.field, { text: Ae(i, s), ...i === null ? {} : { value: i }, ...typeof i == "number" ? { numberFormat: Fe(s) } : {} }];
+    const s = e.find((c) => c.field === a.field)?.format ?? { kind: "number", thousands: !0 }, i = Ft(t, { ...a, field: a.valueField ?? a.field });
+    return [a.field, { text: je(i, s), ...i === null ? {} : { value: i }, ...typeof i == "number" ? { numberFormat: Ne(s) } : {} }];
   }));
 }
-function ze(e, t) {
+function Ue(e, t) {
   const r = e.findIndex((o) => t.includes(o.field));
   return r < 0 ? 1 : r;
 }
-function B(e, t, r, o, n, a) {
-  const s = [], i = Math.max(0, Math.min(a, e.columns.length)), c = A({ fontSize: e.fontSizePt }, n);
+function G(e, t, r, o, n, a) {
+  const s = [], i = Math.max(0, Math.min(a, e.columns.length)), c = N({ fontSize: e.fontSizePt }, n);
   i && s.push({ text: r, colSpan: i, style: { bold: !0, ...c } });
   for (let u = i; u < e.columns.length; u++) {
     const m = e.columns[u], h = o.get(m.field), g = e.autoStyles[u]?.[Ke(h?.value, m.format)] ?? e.cellStyles[u];
-    s.push({ ...h, text: h?.text ?? "", style: A(g, n) });
+    s.push({ ...h, text: h?.text ?? "", style: N(g, n) });
   }
-  const d = { text: r, colSpan: e.columns.length, style: { bold: !0, ...c } }, l = i ? [s] : [[d], s], f = l.map((u) => ur(e, u, t));
+  const l = { text: r, colSpan: e.columns.length, style: { bold: !0, ...c } }, d = i ? [s] : [[l], s], f = d.map((u) => vr(e, u, t));
   return {
-    grid: { cells: l, colWidthsMm: e.colWidthsMm, rowHeightsMm: f, paddingMm: e.paddingMm },
+    grid: { cells: d, colWidthsMm: e.colWidthsMm, rowHeightsMm: f, paddingMm: e.paddingMm },
     heightMm: f.reduce((u, m) => u + m, 0)
   };
 }
-function ur(e, t, r) {
+function vr(e, t, r) {
   let o = e.rowHeightFloorMm, n = 0;
   for (const a of t) {
     let s = 0;
     const i = n + (a.colSpan ?? 1);
     for (; n < i; n++) s += e.colWidthsMm[n] ?? 0;
-    const c = Ge(e, a.style), d = Y(a.text ?? "", s - e.paddingMm * 2, c.measureOptions, r);
-    o = Math.max(o, d.length * c.lineMm + e.paddingMm * 2);
+    const c = Je(e, a.style), l = J(a.text ?? "", s - e.paddingMm * 2, c.measureOptions, r);
+    o = Math.max(o, l.length * c.lineMm + e.paddingMm * 2);
   }
   return o;
 }
-function fr(e, t, r) {
-  const { templatePage: o, current: n, warnings: a, nextId: s, pushCurrent: i } = r, c = () => q(o, n), d = Math.max(n.marginTopMm, G(o)), l = o.layout === "wide" ? G(o) : d, f = {
+function Sr(e, t, r) {
+  const { templatePage: o, current: n, warnings: a, nextId: s, pushCurrent: i } = r, c = () => U(o, n), l = Math.max(n.marginTopMm, B(o)), d = o.layout === "wide" ? B(o) : l, f = {
     id: r.tableId,
-    columnKeys: e.columns.map((p) => p.field),
+    columnKeys: e.columns.map((w) => w.field),
     ...e.layout === void 0 ? {} : { layout: e.layout },
     ...e.title === void 0 ? {} : { title: e.title }
   }, u = /* @__PURE__ */ new Map(), m = /* @__PURE__ */ new Map(), h = {
@@ -399,54 +460,54 @@ function fr(e, t, r) {
     nid: s("listh"),
     table: { ...f, role: "header", rowIndex: -1 },
     style: t.borderStyle,
-    ...e.meta ? { meta: e.meta } : {}
-  }, g = (p) => n.components.push({ ...h, topMm: p });
-  if (r.flow && e.header !== !1 && t.headerHeightMm > c() - d + 1e-3) throw new Error(`流式列表 ${e.id ?? e.dataset} 的表头高度超出单页可用范围`);
-  let w = Math.max(r.startTop ?? e.topMm, d);
-  e.header !== !1 && (g(w), w += t.headerHeightMm + r.mmPerRow);
-  function y() {
-    const p = Math.max(r.flow || o.layout === "wide" ? 0 : e.topMm, l);
-    return (e.header !== !1 && e.headerEveryPage !== !1 ? p + t.headerHeightMm : l) + [...m.values()].reduce((x, $) => x + $.heightMm, 0);
+    ...e.meta || t.matrix ? { meta: { ...e.meta, ...t.matrix ? { matrix: t.matrix.header } : {} } } : {}
+  }, g = (w) => n.components.push({ ...h, topMm: w });
+  if (r.flow && e.header !== !1 && t.headerHeightMm > c() - l + 1e-3) throw new Error(`流式列表 ${e.id ?? e.dataset} 的表头高度超出单页可用范围`);
+  let p = Math.max(r.startTop ?? e.topMm, l);
+  e.header !== !1 && (g(p), p += t.headerHeightMm + r.mmPerRow);
+  function b() {
+    const w = Math.max(r.flow || o.layout === "wide" ? 0 : e.topMm, d);
+    return (e.header !== !1 && e.headerEveryPage !== !1 ? w + t.headerHeightMm : d) + [...m.values()].reduce((x, k) => x + k.heightMm, 0);
   }
-  function v() {
-    const p = o.layout === "wide" ? 0 : n.marginBottomMm;
-    return Math.min(o.heightMm - p, q(o, n)) - y();
+  function M() {
+    const w = o.layout === "wide" ? 0 : n.marginBottomMm;
+    return Math.min(o.heightMm - w, U(o, n)) - b();
   }
-  function T(p) {
-    if (w + p <= c()) return;
+  function T(w) {
+    if (p + w <= c()) return;
     i(), n.components = [], n.heightMm = o.heightMm, o.layout === "wide" && (n.marginTopMm = 0, n.marginBottomMm = 0);
-    const M = Math.max(r.flow || o.layout === "wide" ? 0 : e.topMm, l);
-    e.header !== !1 && e.headerEveryPage !== !1 ? (g(M), w = M + t.headerHeightMm) : w = l;
-    for (const x of m.values()) K(x, "listgr", "group-header");
+    const v = Math.max(r.flow || o.layout === "wide" ? 0 : e.topMm, d);
+    e.header !== !1 && e.headerEveryPage !== !1 ? (g(v), p = v + t.headerHeightMm) : p = d;
+    for (const x of m.values()) A(x, "listgr", "group-header");
   }
-  function S(p, M, x, $) {
-    const k = v();
-    if (r.flow && p.heightMm > k + 1e-3) throw new Error(`流式列表 ${e.id ?? e.dataset} 的单行高度超出单页可用范围`);
-    p.heightMm > k && a.push(`列表 ${e.id ?? e.dataset} 行高 ${p.heightMm.toFixed(2)}mm 超出单页可用高度 ${k.toFixed(2)}mm，预览与打印可能截断内容`), T(p.heightMm), K(p, M, x, $);
+  function S(w, v, x, k) {
+    const $ = M();
+    if (r.flow && w.heightMm > $ + 1e-3) throw new Error(`流式列表 ${e.id ?? e.dataset} 的单行高度超出单页可用范围`);
+    w.heightMm > $ && a.push(`列表 ${e.id ?? e.dataset} 行高 ${w.heightMm.toFixed(2)}mm 超出单页可用高度 ${$.toFixed(2)}mm，预览与打印可能截断内容`), T(w.heightMm), A(w, v, x, k);
   }
-  function K(p, M, x, $) {
-    const k = p.table?.id ?? f.id, F = x === "header" ? -1 : u.get(k) ?? 0;
-    x !== "header" && u.set(k, F + p.grid.cells.length), n.components.push({
+  function A(w, v, x, k) {
+    const $ = w.table?.id ?? f.id, F = x === "header" ? -1 : u.get($) ?? 0;
+    x !== "header" && u.set($, F + w.grid.cells.length), n.components.push({
       kind: "rect",
       leftMm: e.leftMm,
-      topMm: w,
+      topMm: p,
       widthMm: e.widthMm,
-      heightMm: p.heightMm,
-      grid: p.grid,
-      nid: s(M),
-      table: { ...f, ...p.table, role: x, rowIndex: F, ...$ ? { source: $ } : {} },
+      heightMm: w.heightMm,
+      grid: w.grid,
+      nid: s(v),
+      table: { ...f, ...w.table, role: x, rowIndex: F, ...k ? { source: k } : {} },
       style: t.borderStyle,
-      ...e.meta ? { meta: e.meta } : {}
-    }), w += p.heightMm;
+      ...e.meta || w.meta ? { meta: { ...e.meta, ...w.meta } } : {}
+    }), p += w.heightMm;
   }
-  function O(p) {
-    p <= v() && T(p);
+  function O(w) {
+    w <= M() && T(w);
   }
-  return { keepTogether: O, placeGridRow: S, setGroupHeader: (p, M) => {
-    M ? m.set(p, M) : m.delete(p);
-  }, bottom: () => w };
+  return { keepTogether: O, placeGridRow: S, setGroupHeader: (w, v) => {
+    v ? m.set(w, v) : m.delete(w);
+  }, bottom: () => p };
 }
-function mr(e, t) {
+function xr(e, t) {
   if (!e.rowKey) return;
   const r = t[e.rowKey];
   if ((typeof r != "string" || !r.trim()) && !(typeof r == "number" && Number.isFinite(r)))
@@ -456,26 +517,26 @@ function mr(e, t) {
   if (n !== void 0 && typeof n != "string") throw new Error("来源令牌应为字符串");
   return { datasetId: e.dataset, rowKey: r, ...o === void 0 ? {} : { revision: o }, ...n === void 0 ? {} : { sourceToken: n } };
 }
-function Z(e, t) {
+function re(e, t) {
   const r = /* @__PURE__ */ new Map();
   if (!e.rowKey) return r;
   const o = /* @__PURE__ */ new Set();
   for (const n of t) {
-    const a = mr(e, n), s = JSON.stringify(a.rowKey);
+    const a = xr(e, n), s = JSON.stringify(a.rowKey);
     if (o.has(s)) throw new Error(`数据集 ${e.dataset} 的业务主键重复：${String(a.rowKey)}`);
     o.add(s), r.set(n, a);
   }
   return r;
 }
-function gr(e, t, r, o, n) {
+function Tr(e, t, r, o, n) {
   if (!e.grandTotal) return;
-  const a = typeof e.grandTotal == "object" ? e.grandTotal : void 0, s = ee(e)[0], i = a?.fields ?? s?.subtotal ?? [], c = a?.aggregates ?? s?.aggregates ?? [];
+  const a = typeof e.grandTotal == "object" ? e.grandTotal : void 0, s = oe(e)[0], i = a?.fields ?? s?.subtotal ?? [], c = a?.aggregates ?? s?.aggregates ?? [];
   if (i.length === 0 && c.length === 0) {
     o.warnings.push(`列表 ${e.id ?? ""} 配置了 grandTotal 但未提供合计字段（groupBy.subtotal 或 grandTotal.fields）`);
     return;
   }
-  const d = B(r, o.measurer, a?.label ?? "合计", Je(e.columns, t, i, c), a?.style ?? {}, ze(e.columns, [...i, ...c.map((l) => l.field)]));
-  n.placeGridRow(d, "listgt", "grand-total");
+  const l = G(r, o.measurer, a?.label ?? "合计", qe(e.columns, t, i, c), a?.style ?? {}, Ue(e.columns, [...i, ...c.map((d) => d.field)]));
+  n.placeGridRow(l, "listgt", "grand-total");
 }
 function V(e) {
   if (e?.aborted) {
@@ -483,147 +544,141 @@ function V(e) {
     throw t.name = "AbortError", t;
   }
 }
-function ee(e) {
+function oe(e) {
   const t = e.groups ?? (e.groupBy ? [e.groupBy] : []);
   if (t.length > 16) throw new Error("列表最多支持 16 级分组");
   return t;
 }
-function pe(e) {
-  const t = zt(e), r = t.columns.reduce((n, a) => n + a.widthMm, 0), o = r > t.widthMm ? t.widthMm / r : 1;
+function ye(e) {
+  const t = rr(e), r = t.columns.reduce((n, a) => n + a.widthMm, 0), o = r > t.widthMm ? t.widthMm / r : 1;
   return o === 1 ? t : { ...t, columns: t.columns.map((n) => ({ ...n, widthMm: n.widthMm * o })) };
 }
-function hr(e, t, r) {
+function Pr(e, t, r) {
   const o = e.detail;
   if (!o) return;
   const n = /* @__PURE__ */ new Set();
-  for (const d of t) {
-    const l = ie(d[o.parentKey]);
-    if (n.has(l)) throw new Error("主从明细的主表关联键重复");
-    n.add(l);
+  for (const l of t) {
+    const d = de(l[o.parentKey]);
+    if (n.has(d)) throw new Error("主从明细的主表关联键重复");
+    n.add(d);
   }
   const a = r.datasets[o.dataset] ?? [], s = /* @__PURE__ */ new Map(), i = [];
-  for (const d of a) {
-    const l = d[o.foreignKey];
-    if (!_e(l) && o.unmatched === "ignore") continue;
-    const f = ie(l);
+  for (const l of a) {
+    const d = l[o.foreignKey];
+    if (!Xe(d) && o.unmatched === "ignore") continue;
+    const f = de(d);
     if (!n.has(f)) {
       if (o.unmatched !== "ignore") throw new Error(`明细数据集 ${o.dataset} 存在未关联的业务键`);
       continue;
     }
     const u = s.get(f);
-    u ? u.push(d) : s.set(f, [d]), i.push(d);
+    u ? u.push(l) : s.set(f, [l]), i.push(l);
   }
-  const c = pe({ ...e, id: `${e.id ?? e.dataset}:detail`, dataset: o.dataset, rowKey: o.rowKey, revisionField: o.revisionField, sourceTokenField: o.sourceTokenField, computed: void 0, columns: o.columns, headerGrid: void 0, rowHeightMm: o.rowHeightMm ?? e.rowHeightMm, detail: void 0 });
-  return { list: c, inter: { ...he(c, r.measurer), rowHeightFloorMm: c.rowHeightMm ?? 0 }, rows: s, sources: Z(c, i) };
+  const c = ye({ ...e, id: `${e.id ?? e.dataset}:detail`, dataset: o.dataset, rowKey: o.rowKey, revisionField: o.revisionField, sourceTokenField: o.sourceTokenField, computed: void 0, columns: o.columns, headerGrid: void 0, rowHeightMm: o.rowHeightMm ?? e.rowHeightMm, detail: void 0 });
+  return { list: c, inter: { ...we(c, r.measurer), rowHeightFloorMm: c.rowHeightMm ?? 0 }, rows: s, sources: re(c, i) };
 }
-function _e(e) {
+function Xe(e) {
   return typeof e == "string" && !!e.trim() || typeof e == "number" && Number.isFinite(e);
 }
-function ie(e) {
-  if (!_e(e)) throw new Error("主从关联键必须是非空字符串或有限数字");
-  return We(e);
+function de(e) {
+  if (!Xe(e)) throw new Error("主从关联键必须是非空字符串或有限数字");
+  return ze(e);
 }
-function* pr(e, t, r, o, n) {
+function* kr(e, t, r, o, n) {
   if (!r) return;
-  const a = r.rows.get(ie(t[e.detail.parentKey])) ?? [];
+  const a = r.rows.get(de(t[e.detail.parentKey])) ?? [];
   if (!a.length) return;
   const s = { id: `${o.tableId}:detail`, columnKeys: r.list.columns.map((i) => i.field), title: e.detail.label };
-  e.detail.label && n.placeGridRow({ ...B(r.inter, o.measurer, e.detail.label, /* @__PURE__ */ new Map(), {}, r.list.columns.length), table: s }, "listdl", "group-header"), e.detail.header !== !1 && n.placeGridRow({ grid: r.inter.headerGrid, heightMm: r.inter.headerHeightMm, table: s }, "listdh", "header"), yield* o.takePages();
+  e.detail.label && n.placeGridRow({ ...G(r.inter, o.measurer, e.detail.label, /* @__PURE__ */ new Map(), {}, r.list.columns.length), table: s }, "listdl", "group-header"), e.detail.header !== !1 && n.placeGridRow({ grid: r.inter.headerGrid, heightMm: r.inter.headerHeightMm, table: s }, "listdh", "header"), yield* o.takePages();
   for (const i of a)
     V(o.signal), n.placeGridRow({ ...W(r.inter, i, o.measurer), table: s }, "listdr", "body", r.sources.get(i)), yield* o.takePages();
 }
-function wr(e, t) {
-  if (!e.matrix) return { list: e, rows: t };
-  if (e.detail || e.groupBy || e.groups?.length || e.grandTotal) throw new Error("矩阵不能同时配置普通分组、总计或主从明细");
-  const r = Ot(t, e.matrix), o = r.columns.map((a, s) => ({ ...a, widthMm: s === 0 ? e.matrix.rowWidthMm ?? 40 : e.matrix.columnWidthMm ?? 28, editable: !1, align: s === 0 ? "center" : "right" })), n = { ...e, columns: o, headerGrid: void 0, rowKey: void 0, revisionField: void 0, sourceTokenField: void 0 };
-  return e.layout === "wide" && (n.widthMm = o.reduce((a, s) => a + s.widthMm, 0)), { list: n, rows: r.rows };
-}
-function qe(e) {
+function Ye(e) {
   if (e.matrix || e.detail || e.groups?.length || e.groupBy || e.rowVisibleWhen) throw new Error("树形布局不能同时配置普通分组、矩阵、主从或行可见条件");
   if (e.rowKey && e.rowKey !== e.tree.idField) throw new Error("树形布局的 rowKey 应与 idField 一致");
   if (!e.columns.some((t) => t.field === e.tree.labelField && !t.hidden)) throw new Error("树形布局需要可见的标签列");
-  Ft(e.tree, e.computed);
+  Lt(e.tree, e.computed);
 }
-function yr(e, t, r) {
-  qe(e);
-  const o = Kt(t, e.tree, { signal: r.signal, computed: e.computed?.length ? { fields: e.computed, formula: r.formula } : void 0 }), n = { ...e, rowKey: e.tree.idField }, a = Z(n, o.entries.map((c) => c.original)), s = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new WeakMap();
+function $r(e, t, r) {
+  Ye(e);
+  const o = Ht(t, e.tree, { signal: r.signal, computed: e.computed?.length ? { fields: e.computed, formula: r.formula } : void 0 }), n = { ...e, rowKey: e.tree.idField }, a = re(n, o.entries.map((c) => c.original)), s = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new WeakMap();
   for (const c of o.entries)
     s.set(c.row, a.get(c.original)), i.set(c.row, c);
   return { list: n, rows: o.rows, sources: s, treeRows: i, totalRows: o.leaves };
 }
-function br(e, t) {
+function Rr(e, t) {
   if (e.cardinality === "record") {
     if (t.length > 1) throw new Error(`单记录区域 ${e.id ?? e.dataset} 仅允许 0 或 1 行数据`);
     if (e.tree || e.matrix || e.detail || e.groups?.length || e.groupBy || e.grandTotal || e.rowVisibleWhen) throw new Error("单记录区域不能配置树、矩阵、主从、分组、总计或行过滤");
     if (!t.length) return { list: { ...e, columns: e.columns.map((r) => ({ ...r, editable: !1 })) }, rows: [{}], sources: /* @__PURE__ */ new Map() };
   }
 }
-function Ue(e, t, r) {
+function Qe(e, t, r) {
   const o = r.prepared.get(e);
   if (o) return o;
-  const n = br(e, t);
+  const n = Rr(e, t);
   if (n)
     return r.prepared.set(e, n), n;
   if (e.tree) {
-    const c = yr(e, t, r);
+    const c = $r(e, t, r);
     return r.prepared.set(e, c), c;
   }
-  let a = e.computed?.length ? Ne(t, { fields: e.computed, signal: r.signal, formula: r.formula }).rows : t;
-  const s = a === t ? void 0 : new Map(a.map((c, d) => [c, t[d]]));
+  let a = e.computed?.length ? Le(t, { fields: e.computed, signal: r.signal, formula: r.formula }).rows : t;
+  const s = a === t ? void 0 : new Map(a.map((c, l) => [c, t[l]]));
   e.rowVisibleWhen && (a = a.filter((c) => H(c, e.rowVisibleWhen)));
-  const i = wr(e, a);
+  const i = Zt(e, a);
   if (!e.matrix) {
-    const c = Z(e, s ? a.map((d) => s.get(d)) : a);
-    i.sources = s ? new Map(a.map((d) => [d, c.get(s.get(d))])) : c;
+    const c = re(e, s ? a.map((l) => s.get(l)) : a);
+    i.sources = s ? new Map(a.map((l) => [l, c.get(s.get(l))])) : c;
   }
   return r.prepared.set(e, i), i;
 }
-function Mr(e, t, r, o) {
+function Ir(e, t, r, o) {
   if (!o.flow) return;
-  const { current: n, templatePage: a } = o, s = Math.max(n.marginTopMm, G(a)), i = Math.max(o.startTop ?? e.topMm, s), c = (e.header === !1 ? 0 : t.headerHeightMm) + (r[0] ? W(t, r[0], o.measurer).heightMm : 0);
-  i + c <= q(a, n) + 1e-3 || i <= s + 1e-3 || (o.pushCurrent(), n.components = [], n.heightMm = a.heightMm, a.layout === "wide" && (n.marginTopMm = 0, n.marginBottomMm = 0), o.startTop = Math.max(n.marginTopMm, G(a)));
+  const { current: n, templatePage: a } = o, s = Math.max(n.marginTopMm, B(a)), i = Math.max(o.startTop ?? e.topMm, s), c = (e.header === !1 ? 0 : t.headerHeightMm) + (r[0] ? W(t, r[0], o.measurer).heightMm : 0);
+  i + c <= U(a, n) + 1e-3 || i <= s + 1e-3 || (o.pushCurrent(), n.components = [], n.heightMm = a.heightMm, a.layout === "wide" && (n.marginTopMm = 0, n.marginBottomMm = 0), o.startTop = Math.max(n.marginTopMm, B(a)));
 }
-function* vr(e, t, r) {
-  const o = Ue(e, t, r), n = o.rows;
+function* Er(e, t, r) {
+  const o = Qe(e, t, r), n = o.rows;
   e = o.list, e.layout === "wide" && (r.current.widthMm = Math.max(r.current.widthMm, e.leftMm + e.widthMm + r.current.marginRightMm));
-  const a = o.sources ?? Z(e, n), s = pe(e), i = ee(s), c = { ...he(s, r.measurer), rowHeightFloorMm: s.rowHeightMm ?? 0, ...o.treeRows ? { tree: { list: s, rows: o.treeRows } } : {} };
-  Mr(s, c, n, r);
-  const d = fr(s, c, r), l = hr(s, n, r);
+  const a = o.sources ?? re(e, n), s = ye(e), i = oe(s), c = { ...we(s, r.measurer), rowHeightFloorMm: s.rowHeightMm ?? 0, matrix: o.matrix, ...o.treeRows ? { tree: { list: s, rows: o.treeRows } } : {} };
+  Ir(s, c, n, r);
+  const l = Sr(s, c, r), d = Pr(s, n, r);
   let f;
-  for (const u of Ve(n, i)) {
+  for (const u of _e(n, i)) {
     if (V(r.signal), u.kind === "row")
-      d.placeGridRow(f ?? W(c, u.row, r.measurer), "listr", "body", a.get(u.row)), f = void 0, yield* r.takePages(), yield* pr(s, u.row, l, r, d);
+      l.placeGridRow(f ?? W(c, u.row, r.measurer), "listr", Yt(o.matrix, u.row), a.get(u.row)), f = void 0, yield* r.takePages(), yield* kr(s, u.row, d, r, l);
     else if (u.kind === "groupHeader") {
-      const m = B(c, r.measurer, u.label, /* @__PURE__ */ new Map(), u.group.headerStyle ?? {}, s.columns.length);
+      const m = G(c, r.measurer, u.label, /* @__PURE__ */ new Map(), u.group.headerStyle ?? {}, s.columns.length);
       f ??= W(c, u.firstRow, r.measurer);
-      const h = i.slice(u.depth + 1).reduce((g, w) => g + B(c, r.measurer, (w.headerTemplate ?? "{value}").replace(/\{value\}/g, fe(u.firstRow[w.field])), /* @__PURE__ */ new Map(), w.headerStyle ?? {}, s.columns.length).heightMm, 0);
-      u.group.keepWithNext !== !1 && d.keepTogether(m.heightMm + h + f.heightMm), d.placeGridRow(m, "listg", "group-header"), u.group.repeatHeader && d.setGroupHeader(u.depth, m);
+      const h = i.slice(u.depth + 1).reduce((g, p) => g + G(c, r.measurer, (p.headerTemplate ?? "{value}").replace(/\{value\}/g, he(u.firstRow[p.field])), /* @__PURE__ */ new Map(), p.headerStyle ?? {}, s.columns.length).heightMm, 0);
+      u.group.keepWithNext !== !1 && l.keepTogether(m.heightMm + h + f.heightMm), l.placeGridRow(m, "listg", "group-header"), u.group.repeatHeader && l.setGroupHeader(u.depth, m);
     } else if (u.kind === "subtotal") {
-      const m = u.group.subtotal ?? [], h = u.group.aggregates ?? [], g = B(c, r.measurer, u.label, Je(s.columns, u.rows, m, h), u.group.subtotalStyle ?? {}, ze(s.columns, [...m, ...h.map((w) => w.field)]));
-      d.placeGridRow(g, "listst", "subtotal");
-    } else d.setGroupHeader(u.depth);
+      const m = u.group.subtotal ?? [], h = u.group.aggregates ?? [], g = G(c, r.measurer, u.label, qe(s.columns, u.rows, m, h), u.group.subtotalStyle ?? {}, Ue(s.columns, [...m, ...h.map((p) => p.field)]));
+      l.placeGridRow(g, "listst", "subtotal");
+    } else l.setGroupHeader(u.depth);
     yield* r.takePages();
   }
-  gr(s, o.totalRows ?? n, c, r, d), r.finished?.(d.bottom()), yield* r.takePages();
+  Tr(s, o.totalRows ?? n, c, r, l), r.finished?.(l.bottom()), yield* r.takePages();
 }
-function te(e) {
+function ne(e) {
   return e.kind !== "list" && (e.pageAnchor !== void 0 || e.kind === "text" && typeof e.text == "string" && (e.text.includes("{page}") || e.text.includes("{totalPages}")));
 }
-function re(e, t) {
+function ae(e, t) {
   return {
     ...e,
     ...e.text === void 0 ? {} : { text: t(e.text) },
     ...e.lines ? { lines: e.lines.map(t) } : {},
     ...e.richParagraphs ? { richParagraphs: e.richParagraphs.map((r) => ({ ...r, segments: r.segments.map((o) => ({ ...o, ...o.text === void 0 ? {} : { text: t(o.text) } })) })) } : {},
-    ...e.grid ? { grid: { ...e.grid, cells: e.grid.cells.map((r) => r.map((o) => o ? { ...o, ...o.text === void 0 ? {} : { text: t(o.text) }, ...o.children ? { children: o.children.map((n) => re(n, t)) } : {} } : null)) } } : {}
+    ...e.grid ? { grid: { ...e.grid, cells: e.grid.cells.map((r) => r.map((o) => o ? { ...o, ...o.text === void 0 ? {} : { text: t(o.text) }, ...o.children ? { children: o.children.map((n) => ae(n, t)) } : {} } : null)) } } : {}
   };
 }
-function Sr(e) {
+function Cr(e) {
   let t = !1;
-  for (const r of e.pages) for (const o of r.components) te(o) && re(o, (n) => (n.includes("{totalPages}") && (t = !0), n));
+  for (const r of e.pages) for (const o of r.components) ne(o) && ae(o, (n) => (n.includes("{totalPages}") && (t = !0), n));
   return t;
 }
-function xr(e, t, r, o, n, a) {
+function Or(e, t, r, o, n, a) {
   const s = {
     pageWidthMm: t.widthMm,
     pageHeightMm: t.heightMm,
@@ -635,40 +690,40 @@ function xr(e, t, r, o, n, a) {
     components: t.components,
     ...e.meta ? { meta: e.meta } : {}
   }, i = (c) => {
-    const d = c.replace(/\{page\}/g, String(o));
-    return a === void 0 ? d : d.replace(/\{totalPages\}/g, String(a));
+    const l = c.replace(/\{page\}/g, String(o));
+    return a === void 0 ? l : l.replace(/\{totalPages\}/g, String(a));
   };
-  for (const c of r) s.components.push(re(c, i));
+  for (const c of r) s.components.push(ae(c, i));
   if (e.layout === "wide") {
-    const c = s.components.reduce((d, l) => Math.max(d, l.topMm + l.heightMm), 0);
+    const c = s.components.reduce((l, d) => Math.max(l, d.topMm + d.heightMm), 0);
     s.marginBottomMm = n ? e.marginBottomMm ?? 0 : 0, s.pageHeightMm = Math.max(1, c + s.marginBottomMm);
   }
   return s;
 }
-function we(e) {
-  return e.cells.reduce((t, r) => t + r.reduce((o, n) => o + (n ? 1 + (n.children?.reduce((a, s) => a + Xe(s), 0) ?? 0) : 0), 0), 0);
+function be(e) {
+  return e.cells.reduce((t, r) => t + r.reduce((o, n) => o + (n ? 1 + (n.children?.reduce((a, s) => a + Ze(s), 0) ?? 0) : 0), 0), 0);
 }
-function Xe(e) {
-  return e.grid ? we(e.grid) : 0;
+function Ze(e) {
+  return e.grid ? be(e.grid) : 0;
 }
-function ye(e) {
+function Me(e) {
   for (const t of ["maxPages", "maxCells", "knownTotalPages"]) if (e[t] !== void 0 && (!Number.isSafeInteger(e[t]) || e[t] < 1)) throw new RangeError(`${t} 应为正安全整数`);
 }
-function Tr(e, t) {
-  const r = Ue(e, t.datasets[e.dataset] ?? [], t), o = pe(r.list), n = { ...he(o, t.measurer), rowHeightFloorMm: o.rowHeightMm ?? 0 };
+function Fr(e, t) {
+  const r = Qe(e, t.datasets[e.dataset] ?? [], t), o = ye(r.list), n = { ...we(o, t.measurer), rowHeightFloorMm: o.rowHeightMm ?? 0 };
   return (o.header === !1 ? 0 : n.headerHeightMm) + r.rows.reduce((a, s) => a + W(n, s, t.measurer).heightMm, 0);
 }
-function* Pr(e) {
+function* Ar(e) {
   const { templatePage: t, current: r } = e, o = new Map(t.components.map((a, s) => [a, s])), n = (a, s, i) => {
     const c = e.datasets[a.dataset];
-    return Array.isArray(c) || e.warnings.push(`数据集 ${a.dataset} 未提供数据，列表 ${a.id ?? ""} 输出为空`), vr(a, Array.isArray(c) ? c : [], { ...e, tableId: `${e.tableId}:${o.get(a)}`, startTop: s, finished: i, flow: !!t.flow });
+    return Array.isArray(c) || e.warnings.push(`数据集 ${a.dataset} 未提供数据，列表 ${a.id ?? ""} 输出为空`), Er(a, Array.isArray(c) ? c : [], { ...e, tableId: `${e.tableId}:${o.get(a)}`, startTop: s, finished: i, flow: !!t.flow });
   };
   if (t.flow) {
-    yield* _t({
+    yield* or({
       page: t,
       active: () => V(e.signal),
-      top: () => Math.max(r.marginTopMm, G(t)),
-      bottom: () => q(t, r),
+      top: () => Math.max(r.marginTopMm, B(t)),
+      bottom: () => U(t, r),
       append: (a) => {
         r.components.push(a);
       },
@@ -676,128 +731,128 @@ function* Pr(e) {
         e.pushCurrent(), r.components = [], r.heightMm = t.heightMm, t.layout === "wide" && (r.marginTopMm = 0, r.marginBottomMm = 0);
       },
       takePages: e.takePages,
-      height: (a) => Tr(a, e),
+      height: (a) => Fr(a, e),
       list: n
     });
     return;
   }
   for (const a of t.components)
-    te(a) || (a.kind === "list" ? yield* n(a) : r.components.push(a));
+    ne(a) || (a.kind === "list" ? yield* n(a) : r.components.push(a));
 }
-function* U(e, t, r, o, n, a = /* @__PURE__ */ new WeakMap()) {
+function* X(e, t, r, o, n, a = /* @__PURE__ */ new WeakMap()) {
   let s = 0, i = 0, c = 0;
-  const d = (l) => `${l}_${(++s).toString(36)}`;
-  for (const { pageIndex: l, page: f } of or(e, t, r)) {
+  const l = Xt(r.measurer ?? Oe), d = (f) => `${f}_${(++s).toString(36)}`;
+  for (const { pageIndex: f, page: u } of mr(e, t, r)) {
     V(r.signal);
-    const u = nr(f), m = f.components.filter(te);
-    let h = [];
-    const g = (y = !1) => {
-      if (V(r.signal), r.maxPages !== void 0 && i >= r.maxPages) throw new N(r.maxPages, i + 1);
-      if (r.maxCells !== void 0 && (c += [...u.components, ...m].reduce((v, T) => v + Xe(T), 0), c > r.maxCells))
+    const m = gr(u), h = u.components.filter(ne);
+    let g = [];
+    const p = (M = !1) => {
+      if (V(r.signal), r.maxPages !== void 0 && i >= r.maxPages) throw new K(r.maxPages, i + 1);
+      if (r.maxCells !== void 0 && (c += [...m.components, ...h].reduce((T, S) => T + Ze(S), 0), c > r.maxCells))
         throw new D(r.maxCells, c);
-      h.push(xr(f, u, m, ++i, y, n));
-    }, w = () => {
-      const y = h;
-      return h = [], y;
+      g.push(Or(u, m, h, ++i, M, n));
+    }, b = () => {
+      const M = g;
+      return g = [], M;
     };
-    yield* Pr({
-      templatePage: f,
-      current: u,
+    yield* Ar({
+      templatePage: u,
+      current: m,
       warnings: o,
       nextId: d,
-      pushCurrent: g,
-      takePages: w,
+      pushCurrent: p,
+      takePages: b,
       datasets: t,
       signal: r.signal,
       formula: r.formula,
       prepared: a,
-      measurer: r.measurer ?? Ce,
+      measurer: l,
       mmPerRow: r.mmPerRow ?? 0,
-      tableId: `table:${l}`
-    }), g(!0), yield* w();
+      tableId: `table:${f}`
+    }), p(!0), yield* b();
   }
 }
-function $o(e, t, r = {}) {
-  ye(r);
+function Ao(e, t, r = {}) {
+  Me(r);
   let o = 0;
-  for (const n of U(e, t, { ...r, onWarning: void 0 }, [])) o++;
+  for (const n of X(e, t, { ...r, onWarning: void 0 }, [])) o++;
   return o;
 }
-function* $r(e, t, r = {}) {
-  ye(r);
-  const o = Sr(e), n = /* @__PURE__ */ new WeakMap();
+function* Nr(e, t, r = {}) {
+  Me(r);
+  const o = Cr(e), n = /* @__PURE__ */ new WeakMap();
   let a = r.knownTotalPages;
   if (o && a === void 0) {
     a = 0;
-    for (const c of U(e, t, r, [], void 0, n)) a++;
+    for (const c of X(e, t, r, [], void 0, n)) a++;
   }
   const s = [];
   let i = 0;
-  for (const c of U(e, t, r, s, a, n)) {
+  for (const c of X(e, t, r, s, a, n)) {
     for (; i < s.length; i++) r.onWarning?.(s[i]);
     yield c;
   }
 }
-function Ye(e, t, r = {}) {
+function et(e, t, r = {}) {
   const o = typeof r == "number" ? { mmPerRow: r } : r;
-  ye(o);
-  const n = [], a = [...U(e, t, o, n, o.knownTotalPages)];
-  for (const s of a) s.components = s.components.map((i) => te(i) ? re(i, (c) => c.replace(/\{totalPages\}/g, String(a.length))) : i);
-  return n.forEach((s) => o.onWarning?.(s)), { plan: { schemaVersion: X, ...Q(e) ? { requiresRecalculation: !0 } : {}, pages: a }, warnings: n };
+  Me(o);
+  const n = [], a = [...X(e, t, o, n, o.knownTotalPages)];
+  for (const s of a) s.components = s.components.map((i) => ne(i) ? ae(i, (c) => c.replace(/\{totalPages\}/g, String(a.length))) : i);
+  return n.forEach((s) => o.onWarning?.(s)), { plan: { schemaVersion: Q, ...te(e) ? { requiresRecalculation: !0 } : {}, pages: a }, warnings: n };
 }
-function kr(e) {
+function Kr(e) {
   const t = e.columns.find((a) => !a.hidden)?.field;
   if (!t) return { groups: 0, total: 0 };
-  const r = ee(e), o = (a = [], s = []) => a.includes(t) || s.some((i) => i.field === t), n = typeof e.grandTotal == "object" ? e.grandTotal : void 0;
+  const r = oe(e), o = (a = [], s = []) => a.includes(t) || s.some((i) => i.field === t), n = typeof e.grandTotal == "object" ? e.grandTotal : void 0;
   return { groups: r.filter((a) => o(a.subtotal, a.aggregates)).length, total: Number(o(n?.fields ?? r[0]?.subtotal, n?.aggregates ?? r[0]?.aggregates)) };
 }
-function Rr(e, t, r) {
-  qe(e);
-  const o = je(t[e.dataset] ?? [], e.tree, r), n = e.columns.filter((s) => !s.hidden).length, a = e.header === !1 ? 0 : e.headerGrid ? we(e.headerGrid) : n;
+function jr(e, t, r) {
+  Ye(e);
+  const o = He(t[e.dataset] ?? [], e.tree, r), n = e.columns.filter((s) => !s.hidden).length, a = e.header === !1 ? 0 : e.headerGrid ? be(e.headerGrid) : n;
   return o.length * n + a + +!!e.grandTotal * 2 * n;
 }
-function ko(e, t, r = {}) {
-  if (e.tree) return Rr(e, t, r.signal);
+function No(e, t, r = {}) {
+  if (e.tree) return jr(e, t, r.signal);
   if (e.matrix) {
     let c = t[e.dataset] ?? [];
-    e.computed?.length && (c = Ne(c, { fields: e.computed, ...r }).rows), e.rowVisibleWhen && (c = c.filter((l) => H(l, e.rowVisibleWhen)));
-    const d = Ct(c, e.matrix);
-    return d.cells + d.columnCount;
+    e.computed?.length && (c = Le(c, { fields: e.computed, ...r }).rows), e.rowVisibleWhen && (c = c.filter((d) => H(d, e.rowVisibleWhen)));
+    const l = jt(c, e.matrix);
+    return l.cells + (e.header === !1 ? 0 : l.columnCount * (e.matrix.hierarchy ? e.matrix.columnFields.length + 1 : 1));
   }
-  const o = t[e.dataset]?.length ?? 0, n = e.columns.filter((c) => !c.hidden).length, a = ee(e).length, s = kr(e);
+  const o = t[e.dataset]?.length ?? 0, n = e.columns.filter((c) => !c.hidden).length, a = oe(e).length, s = Kr(e);
   let i = (o * (1 + 2 * a + s.groups) + +!!e.grandTotal * (1 + s.total)) * n;
-  if (i += e.header === !1 ? 0 : e.headerGrid ? we(e.headerGrid) : n, e.cardinality === "record" && o === 0 && (i += n), e.detail) {
-    const c = t[e.detail.dataset]?.length ?? 0, d = e.detail.columns.filter((l) => !l.hidden).length;
-    i += (c + o * (+(e.detail.header !== !1) + +!!e.detail.label)) * d;
+  if (i += e.header === !1 ? 0 : e.headerGrid ? be(e.headerGrid) : n, e.cardinality === "record" && o === 0 && (i += n), e.detail) {
+    const c = t[e.detail.dataset]?.length ?? 0, l = e.detail.columns.filter((d) => !d.hidden).length;
+    i += (c + o * (+(e.detail.header !== !1) + +!!e.detail.label)) * l;
   }
   if (!Number.isSafeInteger(i)) throw new RangeError("报表单元格估算超出安全整数预算");
   return i;
 }
-function Qe(e) {
+function tt(e) {
   return !e || typeof e != "object" ? !1 : [e.pageIndex, e.componentIndex, e.rowIndex, e.columnIndex].every((t) => Number.isInteger(t) && t >= 0);
 }
-function Ze(e, t, r) {
+function rt(e, t, r) {
   const o = e.grid;
   if (!o) return null;
   const n = o.cells[t];
   if (!n) return null;
-  const s = me(o, e.widthMm, e.heightMm).cells.filter((c) => c.ri === t).findIndex((c) => c.ci === r), i = n[s];
+  const s = ee(o, e.widthMm, e.heightMm).cells.filter((c) => c.ri === t).findIndex((c) => c.ci === r), i = n[s];
   return i ? { cell: i, sourceColumnIndex: s } : null;
 }
-function Ir(e) {
+function Lr(e) {
   return e.value !== void 0 ? e.value : e.rawText ?? e.text ?? null;
 }
-function Er(e, t) {
+function Hr(e, t) {
   return e.valueType ? e.valueType : typeof t == "number" ? "number" : typeof t == "boolean" ? "boolean" : t === null && e.numberFormat && /[0#?]/.test(e.numberFormat) ? "number" : "text";
 }
-function Cr(e, t) {
+function Dr(e, t) {
   if (e.derived) return "derived";
   if (e.editable === !1) return "cell";
   if (e.formula !== void 0) return "formula";
   if (e.children?.length || e.richParagraphs?.length) return "complex";
   if (t.table && t.table.role !== "body" && e.editable !== !0) return "structure";
 }
-function Or(e, t) {
+function Gr(e, t) {
   const r = e.table;
   if (r)
     return {
@@ -807,100 +862,100 @@ function Or(e, t) {
       columnKey: r.columnKeys[t.columnIndex]
     };
 }
-function Fr(e, t, r) {
+function Br(e, t, r) {
   if (e.derived) return;
   if (e.source) return { ...e.source };
   const o = t.table?.source, n = t.table?.columnKeys[r.columnIndex];
   if (!(!o || o.rowKey === void 0 || n === void 0))
     return { ...o, rowKey: o.rowKey, field: n };
 }
-function et(e, t, r) {
-  const o = Ir(r), n = Cr(r, e);
+function ot(e, t, r) {
+  const o = Lr(r), n = Dr(r, e);
   return {
     address: { ...t },
     cell: r,
     component: e,
     value: o,
-    valueType: Er(r, o),
-    table: Or(e, t),
-    source: Fr(r, e, t),
+    valueType: Hr(r, o),
+    table: Gr(e, t),
+    source: Br(r, e, t),
     editable: n === void 0,
     readOnlyReason: n
   };
 }
-function be(e, t) {
-  if (!Qe(t)) return null;
+function ve(e, t) {
+  if (!tt(t)) return null;
   const r = e.pages[t.pageIndex]?.components[t.componentIndex];
   if (!r) return null;
-  const o = Ze(r, t.rowIndex, t.columnIndex);
-  return o ? et(r, t, o.cell) : null;
+  const o = rt(r, t.rowIndex, t.columnIndex);
+  return o ? ot(r, t, o.cell) : null;
 }
 function j(e) {
   const t = /* @__PURE__ */ new Map();
   return (r) => {
-    if (!Qe(r)) return null;
+    if (!tt(r)) return null;
     const o = e.pages[r.pageIndex]?.components[r.componentIndex];
     if (!o?.grid) return null;
     let n = t.get(o);
     if (!n) {
       const s = /* @__PURE__ */ new Map();
       n = /* @__PURE__ */ new Map();
-      for (const i of me(o.grid, o.widthMm, o.heightMm).cells) {
+      for (const i of ee(o.grid, o.widthMm, o.heightMm).cells) {
         const c = s.get(i.ri) ?? 0;
         s.set(i.ri, c + 1);
-        const d = o.grid.cells[i.ri]?.[c];
-        d && n.set(`${i.ri}:${i.ci}`, d);
+        const l = o.grid.cells[i.ri]?.[c];
+        l && n.set(`${i.ri}:${i.ci}`, l);
       }
       t.set(o, n);
     }
     const a = n.get(`${r.rowIndex}:${r.columnIndex}`);
-    return a ? et(o, r, a) : null;
+    return a ? ot(o, r, a) : null;
   };
 }
-class b extends Error {
+class y extends Error {
   constructor(t) {
     super(`Invalid report cell edit: ${t}`), this.code = t, this.name = "ReportCellEditError";
   }
 }
-function Kr(e, t) {
+function Wr(e, t) {
   let r = e.trim();
   const o = t && r.endsWith("%");
-  if (o && (r = r.slice(0, -1).trim()), /^[+-]?\d{1,3}(?:,\d{3})+(?:\.\d*)?(?:[eE][+-]?\d+)?$/.test(r) && (r = r.replace(/,/g, "")), !/^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?$/.test(r)) throw new b("number");
+  if (o && (r = r.slice(0, -1).trim()), /^[+-]?\d{1,3}(?:,\d{3})+(?:\.\d*)?(?:[eE][+-]?\d+)?$/.test(r) && (r = r.replace(/,/g, "")), !/^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?$/.test(r)) throw new y("number");
   return Number(r) / (o ? 100 : 1);
 }
-function Ar(e, t) {
+function Vr(e, t) {
   if (e === null || typeof e == "string" && e.trim() === "") return null;
-  if (typeof e != "string" && typeof e != "number") throw new b("number");
-  const r = typeof e == "number" ? e : Kr(e, Gt(t.cell.numberFormat));
-  if (!Number.isFinite(r) || Number.isInteger(r) && !Number.isSafeInteger(r)) throw new b("number");
+  if (typeof e != "string" && typeof e != "number") throw new y("number");
+  const r = typeof e == "number" ? e : Wr(e, _t(t.cell.numberFormat));
+  if (!Number.isFinite(r) || Number.isInteger(r) && !Number.isSafeInteger(r)) throw new y("number");
   return r;
 }
-function Nr(e) {
+function Jr(e) {
   if (e === null || typeof e == "string" && e.trim() === "") return null;
   if (typeof e == "boolean") return e;
   const t = String(e).trim().toLowerCase();
   if (["true", "yes", "是", "1"].includes(t)) return !0;
   if (["false", "no", "否", "0"].includes(t)) return !1;
-  throw new b("boolean");
+  throw new y("boolean");
 }
-function tt(e, t) {
-  return e.valueType === "number" ? Ar(t, e) : e.valueType === "boolean" ? Nr(t) : t === null ? null : String(t);
+function nt(e, t) {
+  return e.valueType === "number" ? Vr(t, e) : e.valueType === "boolean" ? Jr(t) : t === null ? null : String(t);
 }
-function jr(e, t) {
+function zr(e, t) {
   const r = t.cell.text, n = [["是", "否"], ["TRUE", "FALSE"], ["True", "False"], ["true", "false"], ["1", "0"]].find((a) => a.includes(r ?? ""));
   return n ? n[e ? 0 : 1] : String(e);
 }
-function J(e, t) {
-  return t === null ? "" : typeof t == "boolean" ? jr(t, e) : typeof t == "number" ? Bt(t, e.cell.numberFormat) : String(t);
+function z(e, t) {
+  return t === null ? "" : typeof t == "boolean" ? zr(t, e) : typeof t == "number" ? zt(t, e.cell.numberFormat) : String(t);
 }
-function Ro(e, t, r) {
-  const o = be(e, t);
-  if (!o) throw new b("missing");
-  return z(o, r);
+function Ko(e, t, r) {
+  const o = ve(e, t);
+  if (!o) throw new y("missing");
+  return _(o, r);
 }
-function z(e, t) {
-  if (!e.editable) throw new b("readonly");
-  const r = tt(e, t);
+function _(e, t) {
+  if (!e.editable) throw new y("readonly");
+  const r = nt(e, t);
   return {
     address: { ...e.address },
     table: e.table,
@@ -908,58 +963,58 @@ function z(e, t) {
     previousValue: e.value,
     previousText: e.cell.text ?? "",
     value: r,
-    text: J(e, r)
+    text: z(e, r)
   };
 }
-function Lr(e, t) {
+function _r(e, t) {
   const r = e.table, o = t.table;
   return !r || !o || r.columnKey === void 0 ? !1 : r.id === o.id && r.rowIndex === o.rowIndex && r.role === o.role && r.columnKey === o.columnKey;
 }
-function rt(e, t, r) {
-  const o = e.grid, { rowIndex: n, columnIndex: a } = t.address, s = Ze(e, n, a), i = [...o.cells], c = [...i[n]], d = J(t, r.value), l = { ...s.cell, value: r.value, text: d, rawText: d };
-  return c[s.sourceColumnIndex] = l, i[n] = c, { ...e, grid: { ...o, cells: i } };
+function at(e, t, r) {
+  const o = e.grid, { rowIndex: n, columnIndex: a } = t.address, s = rt(e, n, a), i = [...o.cells], c = [...i[n]], l = z(t, r.value), d = { ...s.cell, value: r.value, text: l, rawText: l };
+  return c[s.sourceColumnIndex] = d, i[n] = c, { ...e, grid: { ...o, cells: i } };
 }
-function Hr(e, t) {
+function qr(e, t) {
   const r = e.table?.columnKeys, o = t.table?.columnKey;
   return r && o !== void 0 ? r.flatMap((n, a) => n === o ? [a] : []) : [];
 }
-function Dr(e, t, r, o, n, a) {
+function Ur(e, t, r, o, n, a) {
   const s = t.table, i = n.table;
   if (!s || !i || s.id !== i.id || s.role !== i.role || !t.grid) return t;
   const c = i.rowIndex - s.rowIndex;
   if (c < 0 || c >= t.grid.cells.length) return t;
-  let d = t;
-  for (const l of Hr(t, n)) {
-    const f = be(e, { pageIndex: r, componentIndex: o, rowIndex: c, columnIndex: l });
-    f?.editable && Lr(n, f) && (d = rt(d, f, a));
+  let l = t;
+  for (const d of qr(t, n)) {
+    const f = ve(e, { pageIndex: r, componentIndex: o, rowIndex: c, columnIndex: d });
+    f?.editable && _r(n, f) && (l = at(l, f, a));
   }
-  return d;
+  return l;
 }
-function Br(e, t, r, o, n, a) {
+function Xr(e, t, r, o, n, a) {
   const s = n.address;
-  return n.table?.columnKey !== void 0 ? Dr(e, t, r, o, n, a) : s.pageIndex === r && s.componentIndex === o ? rt(t, n, a) : t;
+  return n.table?.columnKey !== void 0 ? Ur(e, t, r, o, n, a) : s.pageIndex === r && s.componentIndex === o ? at(t, n, a) : t;
 }
-function Me(e, t) {
+function Se(e, t) {
   const r = t.source;
   if (!r) return !1;
   const o = e.source;
   return !o || ["sourceScope", "datasetId", "rowKey", "field", "revision", "sourceToken"].some((n) => !Object.is(o[n], r[n]));
 }
-function Io(e, t) {
-  const r = be(e, t.address);
-  if (!r) throw new b("missing");
-  if (!r.editable) throw new b("readonly");
-  if (Me(r, t)) throw new b("conflict");
-  if (!Object.is(r.value, t.previousValue) || (r.cell.text ?? "") !== t.previousText) throw new b("conflict");
-  const o = tt(r, t.value), n = { ...t, value: o, text: J(r, o) };
+function jo(e, t) {
+  const r = ve(e, t.address);
+  if (!r) throw new y("missing");
+  if (!r.editable) throw new y("readonly");
+  if (Se(r, t)) throw new y("conflict");
+  if (!Object.is(r.value, t.previousValue) || (r.cell.text ?? "") !== t.previousText) throw new y("conflict");
+  const o = nt(r, t.value), n = { ...t, value: o, text: z(r, o) };
   if (Object.is(o, r.value) && n.text === r.cell.text) return e;
   const a = e.pages.map((s, i) => {
-    const c = s.components.map((d, l) => Br(e, d, i, l, r, n));
-    return c.every((d, l) => d === s.components[l]) ? s : { ...s, components: c };
+    const c = s.components.map((l, d) => Xr(e, l, i, d, r, n));
+    return c.every((l, d) => l === s.components[d]) ? s : { ...s, components: c };
   });
   return { ...e, pages: a };
 }
-function ot(e) {
+function st(e) {
   const t = [];
   for (const r of e.template.pages) for (const o of r.components)
     o.kind === "list" && (t.push(o.tree ? { ...o, rowKey: o.tree.idField } : o), o.detail && t.push({ ...o.detail, relation: { detail: o.detail, parentRows: e.datasets[o.dataset] ?? [] } }));
@@ -968,61 +1023,65 @@ function ot(e) {
 function L(e) {
   return JSON.stringify([e.sourceScope, e.datasetId]);
 }
-function $e(e) {
+function Re(e) {
   return JSON.stringify([e.sourceScope, e.datasetId, e.rowKey]);
 }
-function nt(e) {
+function it(e) {
   const t = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Set();
   return e.forEach((o, n) => {
-    for (const a of ot(o)) {
+    for (const a of st(o)) {
       if (!a.rowKey) continue;
       const s = a.relation, i = s ? new Set(s.parentRows.map((c) => JSON.stringify(c[s.detail.parentKey]))) : void 0;
-      (o.datasets[a.dataset] ?? []).forEach((c, d) => {
+      (o.datasets[a.dataset] ?? []).forEach((c, l) => {
         if (s && !i.has(JSON.stringify(c[s.detail.foreignKey]))) return;
-        const l = c[a.rowKey];
-        if (typeof l != "string" && typeof l != "number") return;
-        const f = `${n}:${a.dataset}:${d}:${a.rowKey}`;
+        const d = c[a.rowKey];
+        if (typeof d != "string" && typeof d != "number") return;
+        const f = `${n}:${a.dataset}:${l}:${a.rowKey}`;
         if (r.has(f)) return;
         r.add(f);
-        const u = $e({ sourceScope: o.sourceScope, datasetId: a.dataset, rowKey: l }), m = t.get(u) ?? [];
-        m.push({ partIndex: n, dataset: a.dataset, rowIndex: d, row: c, binding: a }), t.set(u, m);
+        const u = Re({ sourceScope: o.sourceScope, datasetId: a.dataset, rowKey: d }), m = t.get(u) ?? [];
+        m.push({ partIndex: n, dataset: a.dataset, rowIndex: l, row: c, binding: a }), t.set(u, m);
       });
     }
   }), (o) => {
-    const n = t.get($e(o));
-    if (!n?.length) throw new b("missing");
-    if (new Set(n.map((a) => `${a.partIndex}:${a.dataset}`)).size !== n.length) throw new b("conflict");
+    const n = t.get(Re(o));
+    if (!n?.length) throw new y("missing");
+    if (new Set(n.map((a) => `${a.partIndex}:${a.dataset}`)).size !== n.length) throw new y("conflict");
     return n;
   };
 }
-function at(e, t) {
+function ct(e, t) {
   const r = e.map((n) => ({ ...n, datasets: { ...n.datasets } })), o = /* @__PURE__ */ new Set();
   for (const { row: n, field: a, value: s } of t) {
-    const i = r[n.partIndex], c = `${n.partIndex}:${n.dataset}`;
+    const i = r[n.partIndex], c = JSON.stringify([n.partIndex, n.dataset]);
     o.has(c) || (i.datasets[n.dataset] = [...i.datasets[n.dataset]], o.add(c)), i.datasets[n.dataset][n.rowIndex] = { ...i.datasets[n.dataset][n.rowIndex], [a]: s };
   }
+  for (const n of o) {
+    const [a, s] = JSON.parse(n);
+    At(e[a].datasets[s], r[a].datasets[s]);
+  }
   return r;
 }
-function Gr(e, t, r) {
+function Yr(e, t, r) {
   const o = [], n = /* @__PURE__ */ new Set();
   return e.forEach((a, s) => {
-    for (const i of ot(a))
-      t.has(L({ sourceScope: a.sourceScope, datasetId: i.dataset })) && (a.datasets[i.dataset] ?? []).forEach((c, d) => {
-        const l = { partIndex: s, dataset: i.dataset, rowIndex: d, row: c, binding: i };
+    for (const i of st(a))
+      t.has(L({ sourceScope: a.sourceScope, datasetId: i.dataset })) && (a.datasets[i.dataset] ?? []).forEach((c, l) => {
+        const d = { partIndex: s, dataset: i.dataset, rowIndex: l, row: c, binding: i };
         for (const [f, u] of [[i.revisionField, r.revision], [i.sourceTokenField, r.sourceToken]]) {
           if (!f || u === void 0) continue;
-          const m = `${s}:${i.dataset}:${d}:${f}`;
-          n.has(m) || (n.add(m), o.push({ row: l, field: f, value: u }));
+          const m = `${s}:${i.dataset}:${l}:${f}`;
+          n.has(m) || (n.add(m), o.push({ row: d, field: f, value: u }));
         }
       });
   }), o;
 }
-function Wr(e, t, r) {
+function Qr(e, t, r) {
   if (!r || r.revision === void 0 && r.sourceToken === void 0) return e;
   const o = new Set(t.edits.flatMap((n) => n.source ? [L(n.source)] : []));
-  return st(e, new Map([...o].map((n) => [n, r])));
+  return lt(e, new Map([...o].map((n) => [n, r])));
 }
-function st(e, t) {
+function lt(e, t) {
   if (!t.size) return e;
   function r(a) {
     const s = a.datasetId && t.get(L({ ...a, datasetId: a.datasetId }));
@@ -1030,15 +1089,15 @@ function st(e, t) {
   }
   function o(a) {
     const s = a.map((i) => {
-      const c = i.table?.source ? r(i.table.source) : void 0, d = i.table && c !== i.table.source ? { ...i.table, source: c } : i.table, l = i.grid?.cells.map((u) => {
+      const c = i.table?.source ? r(i.table.source) : void 0, l = i.table && c !== i.table.source ? { ...i.table, source: c } : i.table, d = i.grid?.cells.map((u) => {
         const m = u.map((h) => {
           if (!h) return h;
-          const g = h.source ? r(h.source) : void 0, w = h.children ? o(h.children) : void 0;
-          return g === h.source && w === h.children ? h : { ...h, source: g, children: w };
+          const g = h.source ? r(h.source) : void 0, p = h.children ? o(h.children) : void 0;
+          return g === h.source && p === h.children ? h : { ...h, source: g, children: p };
         });
         return m.some((h, g) => h !== u[g]) ? m : u;
-      }), f = i.grid && l?.some((u, m) => u !== i.grid.cells[m]) ? { ...i.grid, cells: l } : i.grid;
-      return d !== i.table || f !== i.grid ? { ...i, table: d, grid: f } : i;
+      }), f = i.grid && d?.some((u, m) => u !== i.grid.cells[m]) ? { ...i.grid, cells: d } : i.grid;
+      return l !== i.table || f !== i.grid ? { ...i, table: l, grid: f } : i;
     });
     return s.some((i, c) => i !== a[c]) ? s : a;
   }
@@ -1048,35 +1107,35 @@ function st(e, t) {
   });
   return n.some((a, s) => a !== e.pages[s]) ? { ...e, pages: n } : e;
 }
-function Vr(e) {
+function Zr(e) {
   return JSON.stringify([e.pageIndex, e.componentIndex, e.rowIndex, e.columnIndex]);
 }
-function ke(e) {
+function Ie(e) {
   const t = e.table;
-  return t?.columnKey !== void 0 ? JSON.stringify([t.id, t.role, t.rowIndex, t.columnKey]) : Vr(e.address);
+  return t?.columnKey !== void 0 ? JSON.stringify([t.id, t.role, t.rowIndex, t.columnKey]) : Zr(e.address);
 }
-function Jr(e, t) {
+function eo(e, t) {
   if (!t.length) return e;
-  const r = new Map(t.map((c) => [ke(c), c])), o = new Set(t.flatMap((c) => c.table ? [c.table.id] : [])), n = new Set(t.map((c) => `${c.address.pageIndex}:${c.address.componentIndex}`)), a = j(e);
-  function s(c, d, l) {
+  const r = new Map(t.map((c) => [Ie(c), c])), o = new Set(t.flatMap((c) => c.table ? [c.table.id] : [])), n = new Set(t.map((c) => `${c.address.pageIndex}:${c.address.componentIndex}`)), a = j(e);
+  function s(c, l, d) {
     const f = c.grid;
-    if (!f || !n.has(`${d}:${l}`) && !o.has(c.table?.id ?? "")) return c;
+    if (!f || !n.has(`${l}:${d}`) && !o.has(c.table?.id ?? "")) return c;
     const u = /* @__PURE__ */ new Map(), m = /* @__PURE__ */ new Map();
-    for (const h of me(f, c.widthMm, c.heightMm).cells) {
+    for (const h of ee(f, c.widthMm, c.heightMm).cells) {
       const g = m.get(h.ri) ?? 0;
       m.set(h.ri, g + 1);
-      const w = a({ pageIndex: d, componentIndex: l, rowIndex: h.ri, columnIndex: h.ci }), y = w && r.get(ke(w));
-      if (!y || !w.editable) continue;
-      const v = u.get(h.ri) ?? [...f.cells[h.ri]], T = J(w, y.value);
-      Object.is(w.value, y.value) && T === w.cell.text || (v[g] = { ...h.cell, value: y.value, text: T, rawText: T }, u.set(h.ri, v));
+      const p = a({ pageIndex: l, componentIndex: d, rowIndex: h.ri, columnIndex: h.ci }), b = p && r.get(Ie(p));
+      if (!b || !p.editable) continue;
+      const M = u.get(h.ri) ?? [...f.cells[h.ri]], T = z(p, b.value);
+      Object.is(p.value, b.value) && T === p.cell.text || (M[g] = { ...h.cell, value: b.value, text: T, rawText: T }, u.set(h.ri, M));
     }
     return u.size ? { ...c, grid: { ...f, cells: f.cells.map((h, g) => u.get(g) ?? h) } } : c;
   }
-  const i = e.pages.map((c, d) => {
-    const l = c.components.map((f, u) => s(f, d, u));
-    return l.every((f, u) => f === c.components[u]) ? c : { ...c, components: l };
+  const i = e.pages.map((c, l) => {
+    const d = c.components.map((f, u) => s(f, l, u));
+    return d.every((f, u) => f === c.components[u]) ? c : { ...c, components: d };
   });
-  return i.every((c, d) => c === e.pages[d]) ? e : { ...e, pages: i };
+  return i.every((c, l) => c === e.pages[l]) ? e : { ...e, pages: i };
 }
 function C(e) {
   const t = e.source;
@@ -1086,31 +1145,31 @@ function C(e) {
   const o = e.address;
   return JSON.stringify([o.pageIndex, o.componentIndex, o.rowIndex, o.columnIndex]);
 }
-function Eo(e, t, r) {
-  if (typeof r != "string" || !r.trim() || !Array.isArray(t)) throw new b("missing");
-  if (t.length > 1e4) throw new b("limit");
+function Lo(e, t, r) {
+  if (typeof r != "string" || !r.trim() || !Array.isArray(t)) throw new y("missing");
+  if (t.length > 1e4) throw new y("limit");
   const o = /* @__PURE__ */ new Set(), n = j(e), a = t.map(({ address: s, value: i }) => {
     const c = n(s);
-    if (!c) throw new b("missing");
-    const d = z(c, i), l = C(d);
-    if (o.has(l)) throw new b("duplicate");
-    return o.add(l), d;
+    if (!c) throw new y("missing");
+    const l = _(c, i), d = C(l);
+    if (o.has(d)) throw new y("duplicate");
+    return o.add(d), l;
   });
   return { requestId: r, edits: a };
 }
-function Co(e, t) {
-  if (t.edits.length > 1e4) throw new b("limit");
+function Ho(e, t) {
+  if (t.edits.length > 1e4) throw new y("limit");
   const r = j(e), o = /* @__PURE__ */ new Set(), n = t.edits.map((a) => {
     const s = r(a.address);
-    if (!s) throw new b("missing");
+    if (!s) throw new y("missing");
     const i = C(a);
-    if (o.has(i)) throw new b("duplicate");
-    if (o.add(i), Me(s, a) || !Object.is(s.value, a.previousValue) || (s.cell.text ?? "") !== a.previousText) throw new b("conflict");
-    return z(s, a.value);
+    if (o.has(i)) throw new y("duplicate");
+    if (o.add(i), Se(s, a) || !Object.is(s.value, a.previousValue) || (s.cell.text ?? "") !== a.previousText) throw new y("conflict");
+    return _(s, a.value);
   });
-  return Jr(e, n);
+  return eo(e, n);
 }
-function Oo(e) {
+function Do(e) {
   const t = /* @__PURE__ */ new Map();
   for (const r of e) {
     const o = C(r), n = t.get(o), a = n ? { ...r, previousValue: n.previousValue, previousText: n.previousText } : { ...r };
@@ -1118,48 +1177,49 @@ function Oo(e) {
   }
   return [...t.values()];
 }
-function it(e) {
+function dt(e) {
   const t = /* @__PURE__ */ new Map(), r = j(e);
   return e.pages.forEach((o, n) => o.components.forEach((a, s) => {
     if (!(!a.grid || a.table?.role !== "body"))
       for (let i = 0; i < a.grid.cells.length; i++) for (let c = 0; c < a.table.columnKeys.length; c++) {
-        const d = r({ pageIndex: n, componentIndex: s, rowIndex: i, columnIndex: c });
-        d?.source && d.editable && t.set(C(d), d);
+        const l = r({ pageIndex: n, componentIndex: s, rowIndex: i, columnIndex: c });
+        l?.source && l.editable && t.set(C(l), l);
       }
   })), t;
 }
-function Fo(e, t, r) {
-  const o = it(e), n = j(e);
+function Go(e, t, r) {
+  const o = dt(e), n = j(e);
   return t.map((a) => {
     const s = a.source ? o.get(C(a)) : n(a.address);
-    if (!s || C(s) !== C(a)) throw new b("missing");
+    if (!s || C(s) !== C(a)) throw new y("missing");
     return { address: { ...s.address }, value: a[r] };
   });
 }
-function ct(e, t) {
-  if (++e.nodes > 1e6 || t > 128) throw new b("limit");
+function ut(e, t) {
+  if (++e.nodes > 1e6 || t > 128) throw new y("limit");
 }
-function ve(e, t) {
+function Y(e, t) {
   const r = Object.getOwnPropertyDescriptor(e, t);
-  if (!r || r.get || r.set) throw new b("conflict");
+  if (!r || r.get || r.set) throw new y("conflict");
   return r.value;
 }
-function lt(e) {
-  if (Object.getOwnPropertyDescriptor(e, "toJSON")) throw new b("conflict");
+function ft(e) {
+  if (Object.getOwnPropertyDescriptor(e, "toJSON")) throw new y("conflict");
   const t = Object.getPrototypeOf(e);
-  if (!(e instanceof Date) && !Array.isArray(e) && t !== Object.prototype && t !== null) throw new b("conflict");
+  if (Array.isArray(e) && (t !== Array.prototype || Object.keys(e).length !== e.length)) throw new y("conflict");
+  if (!(e instanceof Date) && !Array.isArray(e) && t !== Object.prototype && t !== null) throw new y("conflict");
   for (const r of Reflect.ownKeys(e))
     if (!(Array.isArray(e) && r === "length")) {
-      if (typeof r == "symbol" || !Object.getOwnPropertyDescriptor(e, r)?.enumerable) throw new b("conflict");
-      if (e instanceof Date || Array.isArray(e) && !/^(0|[1-9]\d*)$/.test(r)) throw new b("conflict");
+      if (typeof r == "symbol" || !Object.getOwnPropertyDescriptor(e, r)?.enumerable) throw new y("conflict");
+      if (e instanceof Date || Array.isArray(e) && !/^(0|[1-9]\d*)$/.test(r)) throw new y("conflict");
     }
 }
-function dt(e, t, r, o, n) {
-  if (ct(o, n), typeof e == "function" || typeof e == "symbol") throw new b("conflict");
+function mt(e, t, r, o, n) {
+  if (ut(o, n), typeof e == "function" || typeof e == "symbol") throw new y("conflict");
   if (e === null || typeof e != "object") return;
-  if (lt(e), r.has(e)) throw new b("conflict");
+  if (ft(e), r.has(e)) throw new y("conflict");
   r.add(e);
-  const a = Object.keys(e), s = a.map((i) => ve(e, i));
+  const a = Object.keys(e), s = a.map((i) => Y(e, i));
   t.push({
     object: e,
     prototype: Object.getPrototypeOf(e),
@@ -1168,87 +1228,96 @@ function dt(e, t, r, o, n) {
     ...e instanceof Date ? { date: Date.prototype.getTime.call(e) } : {},
     ...Array.isArray(e) ? { length: e.length } : {}
   });
-  for (const i of s) dt(i, t, r, o, n + 1);
+  for (const i of s) mt(i, t, r, o, n + 1);
   r.delete(e);
 }
-function zr(e) {
+function to(e) {
   const { object: t, keys: r, values: o } = e;
-  if (lt(t), Object.getPrototypeOf(t) !== e.prototype || Object.getOwnPropertyDescriptor(t, "toJSON") || e.date !== void 0 && !Object.is(Date.prototype.getTime.call(t), e.date) || e.length !== void 0 && t.length !== e.length) return !1;
+  if (ft(t), Object.getPrototypeOf(t) !== e.prototype || Object.getOwnPropertyDescriptor(t, "toJSON") || e.date !== void 0 && !Object.is(Date.prototype.getTime.call(t), e.date) || e.length !== void 0 && t.length !== e.length) return !1;
   const n = Object.keys(t);
-  return n.length === r.length && r.every((a, s) => n[s] === a && Object.is(ve(t, a), o[s]));
+  return n.length === r.length && r.every((a, s) => n[s] === a && Object.is(Y(t, a), o[s]));
 }
-function _r(e) {
+function ro(e) {
   const t = [];
-  return dt(e, t, /* @__PURE__ */ new Set(), { nodes: 0 }, 0), () => {
+  return mt(e, t, /* @__PURE__ */ new Set(), { nodes: 0 }, 0), () => {
     try {
-      return t.every(zr);
+      return t.every(to);
     } catch {
       return !1;
     }
   };
 }
-function ce(e, t, r) {
-  return ct(t, r), e === null || typeof e != "object" ? e : e instanceof Date ? new Date(Date.prototype.getTime.call(e)) : Array.isArray(e) ? e.map((o) => ce(o, t, r + 1)) : Object.fromEntries(Object.keys(e).map((o) => [o, ce(ve(e, o), t, r + 1)]));
+function ue(e, t, r) {
+  if (ut(t, r), e === null || typeof e != "object") return e;
+  if (e instanceof Date) return new Date(Date.prototype.getTime.call(e));
+  if (Array.isArray(e)) {
+    const o = [];
+    for (let n = 0; n < e.length; n++) o[n] = ue(Y(e, String(n)), t, r + 1);
+    return o;
+  }
+  return Object.fromEntries(Object.keys(e).map((o) => [o, ue(Y(e, o), t, r + 1)]));
 }
-function qr(e) {
-  return ce(e, { nodes: 0 }, 0);
+function oo(e) {
+  const t = ue(e, { nodes: 0 }, 0);
+  for (const r of t) for (const o of Object.values(r.datasets)) Nt(o);
+  return t;
 }
-async function ut(e, t, r = {}) {
+async function gt(e, t, r = {}) {
   const o = [], n = { ...r, knownTotalPages: void 0 };
-  for (const a of $r(e, t, n))
+  for (const a of Nr(e, t, n))
     o.push(a), o.length % 8 === 0 && await new Promise((s) => setTimeout(s, 0));
   if (r.signal?.aborted) {
     const a = new Error("报表重算已取消");
     throw a.name = "AbortError", a;
   }
-  return { schemaVersion: X, ...Q(e) ? { requiresRecalculation: !0 } : {}, pages: o };
+  return { schemaVersion: Q, ...te(e) ? { requiresRecalculation: !0 } : {}, pages: o };
 }
-const le = /* @__PURE__ */ new WeakMap();
-function Ko(e) {
-  return le.get(e);
+const fe = /* @__PURE__ */ new WeakMap();
+function Bo(e) {
+  return fe.get(e);
 }
-function _(e) {
+function q(e) {
   if (e?.aborted) {
     const t = new Error("报表重算已取消");
     throw t.name = "AbortError", t;
   }
 }
-function ft(e, t) {
+function ht(e, t) {
   return e[t] === void 0 ? "" : e[t];
 }
-function Ur(e, t) {
-  if (t.edits.length > 1e4) throw new b("limit");
+function no(e, t) {
+  if (t.edits.length > 1e4) throw new y("limit");
   const r = j(e), o = /* @__PURE__ */ new Set(), n = [], a = t.edits.map((s) => {
     const i = r(s.address);
-    if (!i?.source) throw new b("missing");
+    if (!i?.source) throw new y("missing");
     const c = C(s);
-    if (o.has(c)) throw new b("duplicate");
-    if (o.add(c), Me(i, s) || !Object.is(i.value, s.previousValue) || (i.cell.text ?? "") !== s.previousText) throw new b("conflict");
-    return n.push(i), z(i, s.value);
+    if (o.has(c)) throw new y("duplicate");
+    if (o.add(c), Se(i, s) || !Object.is(i.value, s.previousValue) || (i.cell.text ?? "") !== s.previousText) throw new y("conflict");
+    return n.push(i), _(i, s.value);
   });
   return { batch: { requestId: t.requestId, edits: a }, contexts: n };
 }
-function Xr(e, t) {
-  const r = nt(e);
+function ao(e, t) {
+  const r = it(e);
   return t.flatMap((o) => {
-    if (!o.source) throw new b("missing");
+    if (!o.source) throw new y("missing");
     return r(o.source).map((n) => {
-      if (!Object.is(ft(n.row, o.source.field), o.previousValue)) throw new b("conflict");
-      if (n.binding.rowKey === o.source.field) throw new b("readonly");
+      if (!Object.is(ht(n.row, o.source.field), o.previousValue)) throw new y("conflict");
+      if (n.binding.rowKey === o.source.field) throw new y("readonly");
       return { row: n, field: o.source.field, value: o.value };
     });
   });
 }
-function se(e, t, r) {
+function le(e, t, r) {
   const o = { ...e, value: t, source: { ...e.source, ...r?.revision === void 0 ? {} : { revision: r.revision }, ...r?.sourceToken === void 0 ? {} : { sourceToken: r.sourceToken } } };
-  return o.cell = { ...e.cell, value: o.value, text: J(o, o.value) }, o;
+  return o.cell = { ...e.cell, value: o.value, text: z(o, o.value) }, o;
 }
-function Yr(e, t, r) {
+function so(e, t, r) {
   if (!r || r.revision === void 0 && r.sourceToken === void 0) return [...e];
   const o = new Set(t.edits.flatMap((n) => n.source ? [L(n.source)] : []));
-  return at(e, Gr(e, o, r));
+  return ct(e, Yr(e, o, r));
 }
-function Qr(e, t, r) {
+function io(e, t, r) {
   const o = new Set(t.edits.map((n) => L(n.source)));
   for (const n of o) e.set(n, {
     ...e.get(n),
@@ -1257,31 +1326,31 @@ function Qr(e, t, r) {
   });
   return o;
 }
-function mt(e, t) {
+function pt(e, t) {
   let r = t.parts;
   const o = t.rebuild;
-  let n = _r(r), a = e, s;
+  let n = ro(r), a = e, s;
   const i = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map();
-  function d(u) {
-    if (u !== a) throw new b("conflict");
+  function l(u) {
+    if (u !== a) throw new y("conflict");
     if (s) return s;
-    if (!n?.()) throw new b("conflict");
-    return qr(r);
+    if (!n?.()) throw new y("conflict");
+    return oo(r);
   }
-  async function l(u, m, h, g = {}) {
-    _(g.signal), m = { requestId: m.requestId, edits: m.edits.map((S) => ({ ...S, address: { ...S.address }, source: S.source ? { ...S.source } : void 0, table: S.table ? { ...S.table } : void 0 })) }, h = h.map((S) => ({ ...S, address: { ...S.address }, source: S.source ? { ...S.source } : void 0, table: S.table ? { ...S.table } : void 0, cell: { ...S.cell } })), await new Promise((S) => setTimeout(S, 0)), _(g.signal);
-    const w = d(u), y = at(w, Xr(w, m.edits)), v = st(await o(y, g.signal), c);
-    _(g.signal);
+  async function d(u, m, h, g = {}) {
+    q(g.signal), m = { requestId: m.requestId, edits: m.edits.map((S) => ({ ...S, address: { ...S.address }, source: S.source ? { ...S.source } : void 0, table: S.table ? { ...S.table } : void 0 })) }, h = h.map((S) => ({ ...S, address: { ...S.address }, source: S.source ? { ...S.source } : void 0, table: S.table ? { ...S.table } : void 0, cell: { ...S.cell } })), await new Promise((S) => setTimeout(S, 0)), q(g.signal);
+    const p = l(u), b = ct(p, ao(p, m.edits)), M = lt(await o(b, g.signal), c);
+    q(g.signal);
     let T = !1;
-    return { plan: v, commit(S) {
-      if (_(g.signal), T || a !== u) throw new b("conflict");
-      if (S?.conflicts?.length) throw new b("conflict");
-      const K = Yr(y, m, S), O = Wr(v, m, S);
+    return { plan: M, commit(S) {
+      if (q(g.signal), T || a !== u) throw new y("conflict");
+      if (S?.conflicts?.length) throw new y("conflict");
+      const A = so(b, m, S), O = Qr(M, m, S);
       if (S) {
-        const I = Qr(c, m, S);
-        for (const [p, M] of i) I.has(L(M.source)) && i.set(p, se(M, M.value, S));
+        const I = io(c, m, S);
+        for (const [w, v] of i) I.has(L(v.source)) && i.set(w, le(v, v.value, S));
       }
-      return h.forEach((I, p) => i.set(C(I), se(I, m.edits[p].value, S))), T = !0, s = K, r = void 0, n = void 0, a = O, le.set(a, f), a;
+      return h.forEach((I, w) => i.set(C(I), le(I, m.edits[w].value, S))), T = !0, s = A, r = void 0, n = void 0, a = O, fe.set(a, f), a;
     } };
   }
   const f = {
@@ -1289,35 +1358,35 @@ function mt(e, t) {
       return a;
     },
     async prepare(u, m, h) {
-      const g = Ur(u, m);
-      return l(u, g.batch, g.contexts, h);
+      const g = no(u, m);
+      return d(u, g.batch, g.contexts, h);
     },
-    async prepareHistory(u, m, h, g, w) {
-      if (!g.trim() || m.length > 1e4) throw new b("limit");
-      const y = d(u), v = nt(y), T = it(u), S = /* @__PURE__ */ new Set(), O = m.map((M) => {
-        if (!M.source) throw new b("missing");
-        const x = C(M);
-        if (S.has(x)) throw new b("duplicate");
+    async prepareHistory(u, m, h, g, p) {
+      if (!g.trim() || m.length > 1e4) throw new y("limit");
+      const b = l(u), M = it(b), T = dt(u), S = /* @__PURE__ */ new Set(), O = m.map((v) => {
+        if (!v.source) throw new y("missing");
+        const x = C(v);
+        if (S.has(x)) throw new y("duplicate");
         S.add(x);
-        const $ = T.get(x) ?? i.get(x);
-        if (!$?.source) throw new b("missing");
-        const k = v($.source)[0];
-        return se($, ft(k.row, $.source.field));
-      }).map((M, x) => ({ context: M, edit: z(M, m[x][h]) })).filter(({ edit: M }) => !Object.is(M.previousValue, M.value)), I = { requestId: g, edits: O.map(({ edit: M }) => M) }, p = O.map(({ context: M }) => M);
-      return { batch: I, contexts: p, prepared: await l(u, I, p, w) };
+        const k = T.get(x) ?? i.get(x);
+        if (!k?.source) throw new y("missing");
+        const $ = M(k.source)[0];
+        return le(k, ht($.row, k.source.field));
+      }).map((v, x) => ({ context: v, edit: _(v, m[x][h]) })).filter(({ edit: v }) => !Object.is(v.previousValue, v.value)), I = { requestId: g, edits: O.map(({ edit: v }) => v) }, w = O.map(({ context: v }) => v);
+      return { batch: I, contexts: w, prepared: await d(u, I, w, p) };
     }
   };
-  return le.set(e, f), f;
+  return fe.set(e, f), f;
 }
-function Ao(e) {
-  const t = Ye(e.template, e.datasets, e.pagination).plan;
-  return mt(t, { parts: [{ template: e.template, datasets: e.datasets }], rebuild: (r, o) => ut(r[0].template, r[0].datasets, { ...e.pagination, signal: o }) });
+function Wo(e) {
+  const t = et(e.template, e.datasets, e.pagination).plan;
+  return pt(t, { parts: [{ template: e.template, datasets: e.datasets }], rebuild: (r, o) => gt(r[0].template, r[0].datasets, { ...e.pagination, signal: o }) });
 }
-let Zr = 0;
-function eo() {
-  return `report-${Date.now()}-${++Zr}`;
+let co = 0;
+function lo() {
+  return `report-${Date.now()}-${++co}`;
 }
-function Re(e, t, r) {
+function Ee(e, t, r) {
   if (!r?.aborted)
     try {
       const o = e?.({ ...t });
@@ -1326,14 +1395,14 @@ function Re(e, t, r) {
     } catch {
     }
 }
-function to(e) {
-  const t = e.taskId ?? eo(), r = (o, n, a) => {
-    Re(e.onEvent, { taskId: t, ...e.correlationId === void 0 ? {} : { correlationId: e.correlationId }, stage: o, status: n, ...a === void 0 ? {} : { reportId: a } }, e.signal);
+function uo(e) {
+  const t = e.taskId ?? lo(), r = (o, n, a) => {
+    Ee(e.onEvent, { taskId: t, ...e.correlationId === void 0 ? {} : { correlationId: e.correlationId }, stage: o, status: n, ...a === void 0 ? {} : { reportId: a } }, e.signal);
   };
   return {
     taskId: t,
     progress(o, n, a) {
-      Re(e.onEvent, { taskId: t, ...e.correlationId === void 0 ? {} : { correlationId: e.correlationId }, stage: o, status: "started", completed: n, total: a }, e.signal);
+      Ee(e.onEvent, { taskId: t, ...e.correlationId === void 0 ? {} : { correlationId: e.correlationId }, stage: o, status: "started", completed: n, total: a }, e.signal);
     },
     async run(o, n, a) {
       r(o, "started", a);
@@ -1355,18 +1424,25 @@ function to(e) {
     }
   };
 }
-function ro(e) {
+function wt(e) {
   if (!e || typeof e != "object" || Array.isArray(e)) return !1;
   const t = e, r = (o) => typeof o == "string" && o.trim().length > 0 && o.length <= 256;
   return !r(t.datasetId) || !r(t.field) || t.tableId !== void 0 && !r(t.tableId) || t.reportScope !== void 0 && (typeof t.reportScope != "string" || !t.reportScope.trim() || t.reportScope.length > 4096) ? !1 : t.rowKey === void 0 ? !0 : typeof t.rowKey == "string" ? t.rowKey.trim().length > 0 && t.rowKey.length <= 1024 : typeof t.rowKey == "number" && Number.isFinite(t.rowKey);
 }
-function oo(e) {
+function fo(e) {
   return e === "missing-source" || e === "not-applicable" || e === "not-calculable";
 }
-function no(e) {
-  return e.target !== void 0 && !ro(e.target) ? !1 : e.valueState === void 0 || oo(e.valueState) && e.target !== void 0;
+function mo(e) {
+  return e.target !== void 0 && !wt(e.target) ? !1 : e.valueState === void 0 || fo(e.valueState) && e.target !== void 0;
+}
+function Vo(e, t) {
+  if (Ge([], e), !wt(t)) throw new Error("数据说明目标无效");
+  const r = e.fields.find((n) => n.field === t.field);
+  if (!r) throw new Error("数据说明字段未在契约中声明");
+  const o = [];
+  return r.description && o.push({ code: "field-definition", severity: "info", message: r.description, target: { ...t } }), r.calculation && o.push({ code: "field-calculation", severity: "info", message: r.calculation.description, target: { ...t } }), o;
 }
-function gt(e, t, r = {}) {
+function yt(e, t, r = {}) {
   const o = /* @__PURE__ */ new Map();
   for (const a of e.pages) for (const s of a.components) {
     if (s.kind !== "list" || s.tree?.input !== "nested") continue;
@@ -1378,26 +1454,26 @@ function gt(e, t, r = {}) {
   const n = { ...t };
   for (const [a, s] of o) {
     const i = Math.min(s.maxRows ?? 1e5, r.maxRows ?? 1 / 0);
-    n[a] = je(t[a] ?? [], { ...s, maxRows: i }, r.signal);
+    n[a] = He(t[a] ?? [], { ...s, maxRows: i }, r.signal);
   }
   return n;
 }
-function No(e, t, r = {}) {
-  return Object.values(gt(e, t, r)).reduce((o, n) => o + n.length, 0);
+function Jo(e, t, r = {}) {
+  return Object.values(yt(e, t, r)).reduce((o, n) => o + n.length, 0);
 }
-function jo(e, t, r) {
-  const o = Wt(r), n = e?.pages.flatMap((i) => i.components).find((i) => i.kind === "list" && i.dataset === t && i.tree?.input === "nested");
+function zo(e, t, r) {
+  const o = qt(r), n = e?.pages.flatMap((i) => i.components).find((i) => i.kind === "list" && i.dataset === t && i.tree?.input === "nested");
   if (!n || n.kind !== "list" || !n.tree) return o;
   const a = o.items, s = n.tree.childrenField ?? "children";
   return { ...o, items: { $ref: "#/$defs/treeNode" }, $defs: { treeNode: { ...a, properties: { ...a.properties, [s]: { anyOf: [{ type: "null" }, { type: "array", items: { $ref: "#/$defs/treeNode" } }] } } } } };
 }
-function ht(e, t) {
+function bt(e, t) {
   return JSON.stringify([e, t]);
 }
-function pt(e, t, r) {
-  return r === void 0 ? ht(e, t) : JSON.stringify(["shared", r]);
+function Mt(e, t, r) {
+  return r === void 0 ? bt(e, t) : JSON.stringify(["shared", r]);
 }
-function wt(e, t, r) {
+function vt(e, t, r) {
   return e.map((o) => {
     const n = o.table ? {
       ...o.table,
@@ -1406,7 +1482,7 @@ function wt(e, t, r) {
     } : void 0, a = o.grid?.cells.map((s) => s.map((i) => !i || !i.source && !i.children ? i : {
       ...i,
       ...i.source ? { source: { ...i.source, sourceScope: t } } : {},
-      ...i.children ? { children: wt(i.children, t, r) } : {}
+      ...i.children ? { children: vt(i.children, t, r) } : {}
     }));
     return n || a ? {
       ...o,
@@ -1415,7 +1491,7 @@ function wt(e, t, r) {
     } : o;
   });
 }
-function Lo(e) {
+function _o(e) {
   if (!("mapData" in e)) return e;
   const { load: t, mapData: r, ...o } = e;
   return { ...o, load: async (n) => {
@@ -1433,17 +1509,17 @@ class P extends Error {
     super(r), this.name = "ReportSourceError", this.code = t, this.cause = o;
   }
 }
-function oe(e) {
+function se(e) {
   const t = new Error("报表加载已取消");
   return t.name = "AbortError", Object.defineProperty(t, "cause", { value: e.reason }), t;
 }
 function R(e) {
-  if (e?.aborted) throw oe(e);
+  if (e?.aborted) throw se(e);
 }
-function de(e, t) {
+function me(e, t) {
   return t ? new Promise((r, o) => {
     const n = () => t.removeEventListener("abort", a), a = () => {
-      n(), o(oe(t));
+      n(), o(se(t));
     };
     t.addEventListener("abort", a, { once: !0 }), t.aborted && a(), Promise.resolve(e).then(
       (s) => {
@@ -1455,75 +1531,75 @@ function de(e, t) {
     );
   }) : Promise.resolve(e);
 }
-function ao(e, t) {
+function go(e, t) {
   if (!e || typeof e != "object" || Array.isArray(e))
     throw new P("validate", `报表 ${t} 的数据集应为对象`);
   for (const [r, o] of Object.entries(e))
     if (!Array.isArray(o) || o.some((n) => !n || typeof n != "object" || Array.isArray(n)))
       throw new P("validate", `报表 ${t} 的数据集 ${r} 应为对象数组`);
 }
-async function so(e, t, r) {
+async function ho(e, t, r) {
   const { reportId: o, signal: n } = t;
   try {
-    const a = await de(e(t), n);
+    const a = await me(e(t), n);
     R(n);
-    const s = Lt(a);
+    const s = Wt(a);
     if (!s.ok)
       throw new P("validate", `报表 ${o} 模板校验失败：${s.errors.slice(0, 3).map((i) => `${i.path}: ${i.message}`).join("; ")}`);
     return r.push(...s.warnings.map((i) => `${o}: ${i.path}: ${i.message}`)), a;
   } catch (a) {
-    throw n?.aborted ? oe(n) : a instanceof P ? a : a instanceof Ht ? new P("validate", `报表 ${o} 模板校验失败：${a.message}`, a) : new P("fetch", `报表 ${o} 模板加载失败：${a instanceof Error ? a.message : String(a)}`, a);
+    throw n?.aborted ? se(n) : a instanceof P ? a : a instanceof Vt ? new P("validate", `报表 ${o} 模板校验失败：${a.message}`, a) : new P("fetch", `报表 ${o} 模板加载失败：${a instanceof Error ? a.message : String(a)}`, a);
   }
 }
-async function io(e, t, r, o) {
+async function po(e, t, r, o) {
   const n = t.signal;
   let a;
   try {
-    if (e.load) a = await de(e.load(t), n);
+    if (e.load) a = await me(e.load(t), n);
     else if (e.provider) {
-      const s = await de(e.provider.query(t), n);
-      R(n), co(s, r), a = s.datasets, o?.(r, s);
+      const s = await me(e.provider.query(t), n);
+      R(n), wo(s, r), a = s.datasets, o?.(r, s);
     } else a = e.datasets ?? {};
   } catch (s) {
-    throw n?.aborted ? oe(n) : s instanceof P ? s : new P("fetch", `报表 ${r} 取数失败：${s instanceof Error ? s.message : String(s)}`, s);
+    throw n?.aborted ? se(n) : s instanceof P ? s : new P("fetch", `报表 ${r} 取数失败：${s instanceof Error ? s.message : String(s)}`, s);
   }
   return R(n), a;
 }
-function co(e, t) {
+function wo(e, t) {
   if (!e || typeof e != "object" || Array.isArray(e)) throw new P("validate", `报表 ${t} Provider 应返回 datasets 结果对象`);
   for (const r of ["revision", "sourceToken"])
     if (e[r] !== void 0 && typeof e[r] != "string") throw new P("validate", `报表 ${t} Provider ${r} 应为字符串`);
   if (e.diagnostics !== void 0 && (!Array.isArray(e.diagnostics) || e.diagnostics.some((r) => !r || typeof r.code != "string" || typeof r.message != "string" || !["info", "warning", "error"].includes(r.severity))))
     throw new P("validate", `报表 ${t} Provider diagnostics 不符合结构化诊断契约`);
-  if (e.diagnostics?.some((r) => !no(r)))
+  if (e.diagnostics?.some((r) => !mo(r)))
     throw new P("validate", `报表 ${t} Provider 数据说明缺少有效的字段身份或值状态`);
 }
-function lo(e, t, r, o, n) {
+function yo(e, t, r, o, n) {
   try {
-    t = gt(o, t, { maxRows: e.dataValidation?.maxRows, signal: n });
+    t = yt(o, t, { maxRows: e.dataValidation?.maxRows, signal: n });
   } catch (a) {
     throw new P("validate", `报表 ${r} 树形数据无效：${a instanceof Error ? a.message : String(a)}`, a);
   }
   for (const [a, s] of Object.entries(e.dataSchema ?? {})) {
     let i;
     try {
-      i = Vt(Object.prototype.hasOwnProperty.call(t, a) ? t[a] : void 0, s, { ...e.dataValidation, path: `$.datasets.${a}` });
+      i = Ge(Object.prototype.hasOwnProperty.call(t, a) ? t[a] : void 0, s, { ...e.dataValidation, path: `$.datasets.${a}` });
     } catch (c) {
       throw new P("config", `报表 ${r} 数据集 ${a} 字段契约配置无效`, c);
     }
     if (!i.ok) throw new P("validate", `报表 ${r} 数据集 ${a} 不符合字段契约：${i.issues[0]?.message}`, { issues: i.issues });
   }
 }
-function yt(e, t) {
+function St(e, t) {
   if (!e.repeat) return !1;
   const r = Object.prototype.hasOwnProperty.call(t, e.repeat.dataset) ? t[e.repeat.dataset] : void 0;
   return Array.isArray(r) && r.length === 0;
 }
-function bt(e) {
+function xt(e) {
   const t = (r) => r.grid?.cells.reduce((o, n) => o + n.reduce((a, s) => a + (s ? 1 + (s.children?.reduce((i, c) => i + t(c), 0) ?? 0) : 0), 0), 0) ?? 0;
   return e.pages.reduce((r, o) => r + o.components.reduce((n, a) => n + t(a), 0), 0);
 }
-function Mt(e, t, r, o) {
+function Tt(e, t, r, o) {
   return {
     ...e,
     signal: o ?? e?.signal,
@@ -1531,45 +1607,45 @@ function Mt(e, t, r, o) {
     ...r === void 0 ? {} : { maxCells: Math.max(1, Math.min(r, e?.maxCells ?? r)) }
   };
 }
-function uo(e, t, r, o, n, a) {
+function bo(e, t, r, o, n, a) {
   const s = n.maxPages === void 0 ? void 0 : n.maxPages - n.usedPages, i = n.maxCells === void 0 ? void 0 : n.maxCells - n.usedCells;
   try {
-    if (s !== void 0 && s < 1 && e.pages.length && !yt(e, t)) throw new N(0, 1);
-    const c = Mt(r.pagination, s, i, a), d = Ye(e, t, c), l = bt(d.plan);
-    if (i !== void 0 && l > i) throw new D(i, l);
-    return { ...d, cells: l };
+    if (s !== void 0 && s < 1 && e.pages.length && !St(e, t)) throw new K(0, 1);
+    const c = Tt(r.pagination, s, i, a), l = et(e, t, c), d = xt(l.plan);
+    if (i !== void 0 && d > i) throw new D(i, d);
+    return { ...l, cells: d };
   } catch (c) {
-    let d = c;
-    throw c instanceof N && n.maxPages !== void 0 && c.limit === s && (d = new N(n.maxPages, n.usedPages + c.actual)), c instanceof D && n.maxCells !== void 0 && (d = new D(n.maxCells, n.usedCells + c.actual)), new P("validate", `报表 ${o} 排版失败：${d instanceof Error ? d.message : String(d)}`, d);
+    let l = c;
+    throw c instanceof K && n.maxPages !== void 0 && c.limit === s && (l = new K(n.maxPages, n.usedPages + c.actual)), c instanceof D && n.maxCells !== void 0 && (l = new D(n.maxCells, n.usedCells + c.actual)), new P("validate", `报表 ${o} 排版失败：${l instanceof Error ? l.message : String(l)}`, l);
   }
 }
-function vt(e, t, r, o, n) {
+function Pt(e, t, r, o, n) {
   const a = /* @__PURE__ */ new Map(), s = (i) => {
     let c = a.get(i);
     return c === void 0 && (c = JSON.stringify([r, o, i]), a.set(i, c)), c;
   };
   for (const i of t.pages) e.push({
     ...i,
-    meta: { ...i.meta, reportScope: ht(r, o) },
-    components: wt(i.components, n ?? pt(r, o), s)
+    meta: { ...i.meta, reportScope: bt(r, o) },
+    components: vt(i.components, n ?? Mt(r, o), s)
   });
 }
-async function fo(e, t, r, o, n) {
+async function Mo(e, t, r, o, n) {
   const a = [];
   let s = 0;
-  for (const [d, l] of e.entries()) {
+  for (const [l, d] of e.entries()) {
     R(n);
     const f = o.maxPages === void 0 ? void 0 : o.maxPages - a.length, u = o.maxCells === void 0 ? void 0 : o.maxCells - s;
-    if (f !== void 0 && f < 1 && l.template.pages.length && !yt(l.template, l.datasets)) throw new N(o.maxPages, a.length + 1);
-    const m = await ut(l.template, l.datasets, Mt(t[d]?.pagination, f, u, n));
-    if (s += bt(m), o.maxCells !== void 0 && s > o.maxCells) throw new D(o.maxCells, s);
-    vt(a, m, d, r[d], l.sourceScope);
+    if (f !== void 0 && f < 1 && d.template.pages.length && !St(d.template, d.datasets)) throw new K(o.maxPages, a.length + 1);
+    const m = await gt(d.template, d.datasets, Tt(t[l]?.pagination, f, u, n));
+    if (s += xt(m), o.maxCells !== void 0 && s > o.maxCells) throw new D(o.maxCells, s);
+    Pt(a, m, l, r[l], d.sourceScope);
   }
-  const i = { schemaVersion: X, ...e.some((d) => Q(d.template)) ? { requiresRecalculation: !0 } : {}, pages: a }, c = Le(i);
+  const i = { schemaVersion: Q, ...e.some((l) => te(l.template)) ? { requiresRecalculation: !0 } : {}, pages: a }, c = De(i);
   if (!c.ok) throw new P("validate", `重算渲染计划校验失败：${c.errors[0]?.message}`);
   return i;
 }
-function Ho(e, t = {}) {
+function qo(e, t = {}) {
   if (t.maxPages !== void 0 && (!Number.isSafeInteger(t.maxPages) || t.maxPages < 1)) throw new P("config", "maxPages 应为正安全整数");
   if (t.maxCells !== void 0 && (!Number.isSafeInteger(t.maxCells) || t.maxCells < 1)) throw new P("config", "maxCells 应为正安全整数");
   function r(n) {
@@ -1578,125 +1654,126 @@ function Ho(e, t = {}) {
     if (a.sourceScope !== void 0 && (typeof a.sourceScope != "string" || !a.sourceScope.trim() || a.sourceScope.length > 512)) throw new P("config", "sourceScope 应为不超过 512 字符的非空字符串");
     return a;
   }
-  return Object.assign(async ({ reportIds: n, params: a, signal: s, onWarning: i, onQueryResult: c, ...d }) => {
+  return Object.assign(async ({ reportIds: n, params: a, signal: s, onWarning: i, onQueryResult: c, ...l }) => {
     R(s);
-    const l = to({ ...d, signal: s }), f = [...n], u = { ...a };
+    const d = uo({ ...l, signal: s }), f = [...n], u = { ...a };
     if (f.length === 0) throw new P("config", "缺少报表 ID");
-    const m = f.map(r), h = l.runSync("validate", () => m.map((p) => xe(
-      p.params ?? (typeof p.template == "function" ? [] : p.template.params) ?? [],
+    const m = f.map(r), h = d.runSync("validate", () => m.map((w) => Te(
+      w.params ?? (typeof w.template == "function" ? [] : w.template.params) ?? [],
       u
-    ))), g = [], w = [];
-    let y = 0;
-    const v = [];
-    for (const [p, M] of m.entries()) {
+    ))), g = [], p = [];
+    let b = 0;
+    const M = [];
+    for (const [w, v] of m.entries()) {
       R(s);
-      const x = f[p], $ = { reportId: x, params: h[p], signal: s }, k = typeof M.template == "function" ? await l.run("query", () => so(M.template, $, v), x) : M.template;
-      $.params = l.runSync("validate", () => xe(M.params ?? k.params ?? [], $.params), x);
-      const F = await l.run("query", () => io(M, $, x, (ae, St) => c?.(ae, St, p)), x);
-      l.runSync("validate", () => {
-        ao(F, x), t.onDatasets?.(x, F, k), lo(M, F, x, k, s);
+      const x = f[w], k = { reportId: x, params: h[w], signal: s }, $ = typeof v.template == "function" ? await d.run("query", () => ho(v.template, k, M), x) : v.template;
+      k.params = d.runSync("validate", () => Te(v.params ?? $.params ?? [], k.params), x);
+      const F = await d.run("query", () => po(v, k, x, (ce, kt) => c?.(ce, kt, w)), x);
+      d.runSync("validate", () => {
+        go(F, x), t.onDatasets?.(x, F, $), yo(v, F, x, $, s);
       }, x), R(s);
-      const ne = l.runSync("layout", () => uo(k, F, M, x, { maxPages: t.maxPages, usedPages: g.length, maxCells: t.maxCells, usedCells: y }, s), x);
-      y += ne.cells;
-      const Se = pt(p, x, M.sourceScope);
-      w.push({ template: k, datasets: F, sourceScope: Se }), vt(g, ne.plan, p, x, Se), v.push(...ne.warnings.map((ae) => `${x}: ${ae}`));
+      const ie = d.runSync("layout", () => bo($, F, v, x, { maxPages: t.maxPages, usedPages: g.length, maxCells: t.maxCells, usedCells: b }, s), x);
+      b += ie.cells;
+      const xe = Mt(w, x, v.sourceScope);
+      p.push({ template: $, datasets: F, sourceScope: xe }), Pt(g, ie.plan, w, x, xe), M.push(...ie.warnings.map((ce) => `${x}: ${ce}`));
     }
     R(s);
-    const T = { schemaVersion: X, ...w.some((p) => Q(p.template)) ? { requiresRecalculation: !0 } : {}, pages: g }, S = l.runSync("validate", () => {
-      const p = Le(T);
-      if (!p.ok) throw new P("validate", `渲染计划校验失败：${p.errors.slice(0, 3).map((M) => `${M.path}: ${M.message}`).join("; ")}`);
-      return p;
+    const T = { schemaVersion: Q, ...p.some((w) => te(w.template)) ? { requiresRecalculation: !0 } : {}, pages: g }, S = d.runSync("validate", () => {
+      const w = De(T);
+      if (!w.ok) throw new P("validate", `渲染计划校验失败：${w.errors.slice(0, 3).map((v) => `${v.path}: ${v.message}`).join("; ")}`);
+      return w;
     });
-    v.push(...S.warnings.map((p) => `${p.path}: ${p.message}`));
-    const K = m.map((p) => ({ ...p, pagination: { ...p.pagination } })), O = { maxPages: t.maxPages, maxCells: t.maxCells };
+    M.push(...S.warnings.map((w) => `${w.path}: ${w.message}`));
+    const A = m.map((w) => ({ ...w, pagination: { ...w.pagination } })), O = { maxPages: t.maxPages, maxCells: t.maxCells };
     try {
-      mt(T, { parts: w, rebuild: (p, M) => fo(p, K, f, O, M) });
+      pt(T, { parts: p, rebuild: (w, v) => Mo(w, A, f, O, v) });
     } catch {
-      v.push("来源数据无法建立本地重算口径；当前预览仅支持计划内编辑，请使用可序列化模板数据启用规则重算");
+      M.push("来源数据无法建立本地重算口径；当前预览仅支持计划内编辑，请使用可序列化模板数据启用规则重算");
     }
-    const I = i ?? t.onWarning ?? ((p) => console.warn("[mach-report]", p));
-    for (const p of v)
-      R(s), I(p);
+    const I = i ?? t.onWarning ?? ((w) => console.warn("[mach-report]", w));
+    for (const w of M)
+      R(s), I(w);
     return R(s), T;
   }, {
-    getParamDefs: (n) => Dt(e, n)
+    getParamDefs: (n) => Jt(e, n)
   });
 }
-function Do(e, t) {
+function Uo(e, t) {
   const r = t.maxNodes ?? 1e6;
-  if (![t.maxBytes, r].every((l) => Number.isSafeInteger(l) && l > 0)) throw t.error("budget", "快照预算应为正安全整数");
+  if (![t.maxBytes, r].every((d) => Number.isSafeInteger(d) && d > 0)) throw t.error("budget", "快照预算应为正安全整数");
   let o = 0, n = 0;
   const a = /* @__PURE__ */ new Set();
-  function s(l) {
-    if (n += l, n > t.maxBytes) throw t.error("budget", "快照超过字节预算");
+  function s(d) {
+    if (n += d, n > t.maxBytes) throw t.error("budget", "快照超过字节预算");
   }
-  function i(l, f) {
+  function i(d, f) {
     if (++o > r || f > 64) throw t.error("budget", "快照节点或深度超过预算");
-    if (o % 1024 === 0 && t.check?.(), typeof l == "string")
-      return s(l.length + 2), l;
-    if (l === null || typeof l == "boolean" || typeof l == "number" && Number.isFinite(l))
-      return s(String(l).length), l;
-    if (!l || typeof l != "object" || a.has(l)) throw t.error("input", "快照应为无循环的有限 JSON 值");
-    return c(l, f);
+    if (o % 1024 === 0 && t.check?.(), typeof d == "string")
+      return s(d.length + 2), d;
+    if (d === null || typeof d == "boolean" || typeof d == "number" && Number.isFinite(d))
+      return s(String(d).length), d;
+    if (!d || typeof d != "object" || a.has(d)) throw t.error("input", "快照应为无循环的有限 JSON 值");
+    return c(d, f);
   }
-  function c(l, f) {
-    const u = Array.isArray(l), m = Object.getPrototypeOf(l);
-    if (m !== (u ? Array.prototype : Object.prototype) && !(m === null && !u) || Object.getOwnPropertySymbols(l).length) throw t.error("input", "快照应为普通 JSON 对象");
-    const h = Object.getOwnPropertyNames(l).filter((y) => !(u && y === "length"));
-    if (u && (h.length !== l.length || h.some((y, v) => y !== String(v)))) throw t.error("input", "快照数组应为连续数组");
-    a.add(l), s(2);
+  function c(d, f) {
+    const u = Array.isArray(d), m = Object.getPrototypeOf(d);
+    if (m !== (u ? Array.prototype : Object.prototype) && !(m === null && !u) || Object.getOwnPropertySymbols(d).length) throw t.error("input", "快照应为普通 JSON 对象");
+    const h = Object.getOwnPropertyNames(d).filter((b) => !(u && b === "length"));
+    if (u && (h.length !== d.length || h.some((b, M) => b !== String(M)))) throw t.error("input", "快照数组应为连续数组");
+    a.add(d), s(2);
     const g = /* @__PURE__ */ Object.create(null);
-    let w = 0;
-    for (const y of h) {
-      const v = Object.getOwnPropertyDescriptor(l, y);
-      if (v.get || v.set || !v.enumerable || ["__proto__", "constructor", "prototype"].includes(y)) throw t.error("input", "快照不允许访问器或危险键");
-      v.value === void 0 && !u || (s((w++ ? 1 : 0) + (u ? 0 : y.length + 3)), g[y] = i(v.value === void 0 ? null : v.value, f + 1));
+    let p = 0;
+    for (const b of h) {
+      const M = Object.getOwnPropertyDescriptor(d, b);
+      if (M.get || M.set || !M.enumerable || ["__proto__", "constructor", "prototype"].includes(b)) throw t.error("input", "快照不允许访问器或危险键");
+      M.value === void 0 && !u || (s((p++ ? 1 : 0) + (u ? 0 : b.length + 3)), g[b] = i(M.value === void 0 ? null : M.value, f + 1));
     }
-    return a.delete(l), u ? h.map((y) => g[y]) : g;
+    return a.delete(d), u ? h.map((b) => g[b]) : g;
   }
   t.check?.();
-  const d = JSON.stringify(i(e, 0));
-  if (new TextEncoder().encode(d).byteLength > t.maxBytes) throw t.error("budget", "快照超过字节预算");
-  return JSON.parse(d);
+  const l = JSON.stringify(i(e, 0));
+  if (new TextEncoder().encode(l).byteLength > t.maxBytes) throw t.error("budget", "快照超过字节预算");
+  return JSON.parse(l);
 }
 export {
-  Fo as A,
-  C as B,
-  Oo as C,
-  Yt as D,
-  Re as E,
-  gt as F,
-  No as G,
-  to as H,
-  jo as I,
-  eo as J,
-  ht as K,
+  pt as A,
+  Go as B,
+  C,
+  ir as D,
+  Do as E,
+  Ee as F,
+  yt as G,
+  Jo as H,
+  uo as I,
+  zo as J,
+  lo as K,
+  bt as L,
   D as P,
   P as R,
-  b as a,
-  N as b,
-  Io as c,
-  Lo as d,
-  Co as e,
-  Wr as f,
-  st as g,
-  $o as h,
-  Ro as i,
-  Eo as j,
+  y as a,
+  K as b,
+  jo as c,
+  _o as d,
+  Ho as e,
+  Qr as f,
+  lt as g,
+  Ao as h,
+  Ko as i,
+  Lo as j,
   j as k,
-  Ao as l,
-  Ho as m,
-  ko as n,
-  J as o,
-  tt as p,
-  be as q,
-  Ko as r,
-  Do as s,
-  no as t,
-  ro as u,
-  oo as v,
-  Ye as w,
-  $r as x,
-  zt as y,
-  mt as z
+  Wo as l,
+  qo as m,
+  No as n,
+  Vo as o,
+  nt as p,
+  z as q,
+  ve as r,
+  Uo as s,
+  Bo as t,
+  mo as u,
+  wt as v,
+  fo as w,
+  et as x,
+  Nr as y,
+  rr as z
 };