@agile-team/mach-report 2.20.0 → 2.21.0

package/dist/{json-snapshot-By4ZVVUt.js → json-snapshot-Kgn459Oj.js}

@@ -1,28 +1,27 @@
-import { R as te } from "./component-tree-CvW4lzpv.js";
-import { r as re, L as ve, b as Gt, i as Vt, f as N, D as Ve } from "./style-67OqfNed.js";
-import { w as z, h as We } from "./textwrap-BEIg2w8y.js";
-import { e as Me, k as L, b as Se, n as K, o as Wt, q as Jt } from "./computed-C8NRZQss.js";
-import { c as Je, R as I, g as ze, b as zt, i as _t, l as xe, t as _e, h as qe, f as Ue, j as qt, k as Ut } from "./record-bindings-DEJtmo3p.js";
-import { a as Xt, c as Yt } from "./charts-Dlv8j2AG.js";
-import { b as Qt, c as Zt, e as er } from "./matrix-Dy-tyY7E.js";
-import { r as oe } from "./grid-geometry-BNptEcMm.js";
-import { f as Xe, b as tr, d as rr, c as Ye } from "./column-visual-BpgQVWwT.js";
-import { i as or, r as nr, j as ar, b as Qe, v as sr, R as ir } from "./template-registry-BIhIHOab.js";
-import { g as cr } from "./report-params-D9tBuM9B.js";
-import { a as Oe } from "./param-validation-CnDEd2l-.js";
-import { f as lr, i as dr } from "./number-format-BA_KwrZe.js";
-import { v as Ze, d as ur } from "./dataset-DL83majE.js";
-const fr = 4096, Ae = 128 * 1024;
-function mr(e) {
+import { R as be } from "./component-tree-1_QCiQJX.js";
+import { r as re, a as ne, L as ve, c as Vt, j as Jt, g as j, D as Ve } from "./grid-geometry-D3SJgWFv.js";
+import { w as _, h as Je } from "./textwrap-CkGjRFT3.js";
+import { e as Me, k as H, b as Se, n as K, o as zt, q as _t } from "./computed-C8NRZQss.js";
+import { c as ze, R as I, g as _e, b as qt, i as Ut, l as xe, t as qe, h as Ue, f as Xe, j as Xt, k as Yt } from "./record-bindings-VZGS-Qd8.js";
+import { a as Qt, c as Zt } from "./charts-Dlv8j2AG.js";
+import { b as er, c as tr, e as rr } from "./matrix-Dy-tyY7E.js";
+import { f as Ye, b as nr, d as or, c as Qe } from "./template-serialization-Cc3h-miv.js";
+import { i as ar, r as sr, j as ir, b as Ze, v as cr, R as lr } from "./template-registry-DhBqoD7W.js";
+import { g as dr } from "./report-params-D9tBuM9B.js";
+import { a as Ae } from "./param-validation-CnDEd2l-.js";
+import { f as ur, i as fr } from "./number-format-BA_KwrZe.js";
+import { v as et, d as mr } from "./dataset-DL83majE.js";
+const hr = 4096, Ne = 128 * 1024;
+function gr(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);
+  return { measureMm(n, o) {
+    const a = JSON.stringify([n, o.fontSizePt, o.fontFamily, o.bold, o.italic, o.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 <= Ae) {
-      for (; t.size >= fr || r + a.length > Ae; ) {
+    const i = e.measureMm(n, o);
+    if (Number.isFinite(i) && a.length <= Ne) {
+      for (; t.size >= hr || r + a.length > Ne; ) {
         const c = t.keys().next().value;
         r -= c.length, t.delete(c);
       }
@@ -31,65 +30,65 @@ function mr(e) {
     return i;
   } };
 }
-class G extends Error {
+class W extends Error {
   constructor(t, r) {
     super(`报表页数超出上限 ${t}（至少 ${r} 页）`), this.limit = t, this.actual = r, this.code = "page-limit", this.name = "PaginatePageLimitError";
   }
 }
-class X extends Error {
+class Y extends Error {
   constructor(t, r) {
     super(`报表单元格数量超出上限 ${t}（至少 ${r} 格）`), this.limit = t, this.actual = r, this.code = "cell-limit", this.name = "PaginateCellLimitError";
   }
 }
-class Y extends Error {
+class Q extends Error {
   constructor(t, r) {
     super(`报表图表图元数量预计超出上限 ${t}（本次估算 ${r}）`), this.limit = t, this.estimated = r, this.code = "chart-component-limit", this.name = "PaginateChartComponentLimitError";
   }
 }
 const Ce = 5e4;
-function ne(e = Ce) {
+function oe(e = Ce) {
   if (!Number.isSafeInteger(e) || e < 1 || e > 1e6) throw new RangeError("maxChartComponents 应为 1..1000000 的安全整数");
 }
-function hr(e, t, r) {
-  const o = e.chartBinding;
+function pr(e, t, r) {
+  const n = e.chartBinding;
   if (e.kind !== "chart" || e.grid || e.imageData || e.binding || e.pageAnchor) throw new TypeError("绑定图表不能同时设置图片、网格、记录绑定或页眉页脚");
-  const n = Object.prototype.hasOwnProperty.call(t, o.dataset) ? t[o.dataset] : void 0;
-  if (!Array.isArray(n)) throw new TypeError(`图表数据集 ${o.dataset} 未提供`);
-  return { ...Qt(n, o, r), type: o.type, leftMm: e.leftMm, topMm: e.topMm, widthMm: e.widthMm, heightMm: e.heightMm, title: o.title, showValues: o.showValues };
+  const o = Object.prototype.hasOwnProperty.call(t, n.dataset) ? t[n.dataset] : void 0;
+  if (!Array.isArray(o)) throw new TypeError(`图表数据集 ${n.dataset} 未提供`);
+  return { ...er(o, n, r), type: n.type, leftMm: e.leftMm, topMm: e.topMm, widthMm: e.widthMm, heightMm: e.heightMm, title: n.title, showValues: n.showValues };
 }
-function gr(e, t, r = Ce) {
-  ne(r);
-  let o = 0;
+function wr(e, t, r = Ce) {
+  oe(r);
+  let n = 0;
   return Object.assign((a) => {
     if (!a.chartBinding) return [a];
-    const s = hr(a, e, t), i = o + (s.categories.length ? Xt(s) : 1);
+    const s = pr(a, e, t), i = n + (s.categories.length ? Qt(s) : 1);
     if (!Number.isSafeInteger(i)) throw new RangeError("图表图元估算应为有限安全整数");
-    if (i > r) throw new Y(r, i);
-    const c = s.categories.length ? Yt(s) : [{ kind: "text", leftMm: a.leftMm, topMm: a.topMm, widthMm: a.widthMm, heightMm: a.heightMm, text: "—", style: { align: "center", verticalAlign: "middle", color: "#94a3b8", fontSize: 10 } }];
-    return o += c.length, c;
-  }, { used: () => o });
+    if (i > r) throw new Q(r, i);
+    const c = s.categories.length ? Zt(s) : [{ kind: "text", leftMm: a.leftMm, topMm: a.topMm, widthMm: a.widthMm, heightMm: a.heightMm, text: "—", style: { align: "center", verticalAlign: "middle", color: "#94a3b8", fontSize: 10 } }];
+    return n += c.length, c;
+  }, { used: () => n });
 }
-function pr(e, t) {
+function yr(e, t) {
   return { member: "body", subtotal: "subtotal", total: "grand-total" }[e?.rows.get(t)?.kind ?? "member"];
 }
-function wr(e) {
+function br(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: "加权平均" };
+  const r = new Map(e.columns.map((o) => [o.field, o.header])), n = { 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;
+    row: { ...t.hierarchy.row, labels: t.hierarchy.row?.labels ?? t.rowFields.map((o) => r.get(o) ?? o) },
+    column: { ...t.hierarchy.column, labels: t.hierarchy.column?.labels ?? t.columnFields.map((o) => r.get(o) ?? o) }
+  }, measures: t.measures.map((o) => {
+    const a = r.get(o.field) ?? r.get(o.valueField ?? o.field);
+    return o.label === void 0 && a ? { ...o, label: `${a}（${n[o.op]}）` } : o;
   }) };
 }
-function yr(e, t) {
+function vr(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 = Zt(t, wr(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 r = tr(t, br(e)), n = 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" })), o = { ...e, columns: n, headerGrid: r.headerGrid, rowKey: void 0, revisionField: void 0, sourceTokenField: void 0 };
+  e.layout === "wide" && (o.widthMm = n.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,
@@ -97,92 +96,92 @@ function yr(e, t) {
     columnFields: a.columnFields,
     columnLabels: a.columnLabels
   } } : void 0;
-  return { list: n, rows: r.rows, ...s ? { matrix: s } : {} };
+  return { list: o, rows: r.rows, ...s ? { matrix: s } : {} };
 }
-function br(e, t) {
+function Mr(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 = oe({ ...e.headerGrid, colWidthsMm: n }, n.reduce((c, l) => c + l, 0), o.length), s = /* @__PURE__ */ new WeakMap();
+  const r = e.paddingMm ?? 1, n = e.headerGrid.cells.map(() => e.rowHeightMm ?? 0), o = e.columns.map((c) => c.widthMm), a = re({ ...e.headerGrid, colWidthsMm: o }, o.reduce((c, l) => c + l, 0), n.length), s = /* @__PURE__ */ new WeakMap();
   for (const { cell: c, ci: l, ri: d, widthMm: f } of a.cells) {
-    const u = { ...Je(e, e.columns[l]), ...c.style }, h = re(u).fontSizePt, v = (z(c.text ?? "", Math.max(1, f - r * 2), { fontSizePt: h, fontFamily: u.fontFamily, bold: u.bold, italic: u.italic, letterSpacingPt: u.letterSpacing }, t).length * h * (u.lineHeight ?? ve) * 25.4 / 72 + r * 2) / (c.rowSpan ?? 1);
-    for (let y = d; y < d + (c.rowSpan ?? 1); y++) o[y] = Math.max(o[y] ?? 0, v);
+    const u = { ...ze(e, e.columns[l]), ...c.style }, h = ne(u).fontSizePt, v = (_(c.text ?? "", Math.max(1, f - r * 2), { fontSizePt: h, fontFamily: u.fontFamily, bold: u.bold, italic: u.italic, letterSpacingPt: u.letterSpacing }, t).length * h * (u.lineHeight ?? ve) * 25.4 / 72 + r * 2) / (c.rowSpan ?? 1);
+    for (let y = d; y < d + (c.rowSpan ?? 1); y++) n[y] = Math.max(n[y] ?? 0, v);
     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 };
+  return { ...e.headerGrid, cells: i, rowHeightsMm: n };
 }
-function vr(e, t, r) {
-  const o = /* @__PURE__ */ new Set(), n = e.cells.map((a, s) => {
+function Sr(e, t, r) {
+  const n = /* @__PURE__ */ new Set(), o = e.cells.map((a, s) => {
     const i = [];
     let c = 0;
     for (const l of a) {
-      for (; o.has(`${s}:${c}`); ) c++;
+      for (; n.has(`${s}:${c}`); ) c++;
       const d = l?.colSpan ?? 1, f = l?.rowSpan ?? 1;
       let u = 0;
       for (let h = c; h < c + d; h++) {
         t.has(h) && u++;
         for (let m = s + 1; m < s + f; m++)
-          o.add(`${m}:${h}`);
+          n.add(`${m}:${h}`);
       }
       u && i.push(l ? { ...l, colSpan: u } : null), c += d;
     }
     return i;
   });
-  return { ...e, cells: n, colWidthsMm: r };
+  return { ...e, cells: o, colWidthsMm: r };
 }
-function Mr(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));
+function xr(e) {
+  if (!e.columns.some((n) => n.hidden)) return e;
+  const t = /* @__PURE__ */ new Set(), r = e.columns.filter((n, o) => n.hidden ? !1 : (t.add(o), !0));
   if (!r.length) throw new Error("列表至少需要一列可见列");
   return {
     ...e,
     columns: r,
     ...e.headerGrid ? {
-      headerGrid: vr(
+      headerGrid: Sr(
         e.headerGrid,
         t,
-        r.map((o) => o.widthMm)
+        r.map((n) => n.widthMm)
       )
     } : {}
   };
 }
-function* Sr(e) {
+function* Cr(e) {
   const { page: t } = e;
-  or(t.components, t.flow);
-  let r = 0, o = 0;
-  for (const n of nr(t.components, t.flow)) {
+  ar(t.components, t.flow);
+  let r = 0, n = 0;
+  for (const o of sr(t.components, t.flow)) {
     e.active();
-    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);
+    const a = o.band, s = o.components.some((d) => d.kind === "list" && d.cardinality !== "record"), i = s ? 0 : o.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(), n + 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 l = c + i;
-    for (const d of n.components) {
+    for (const d of o.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 = l, r = a.topMm + a.heightMm;
+    n = l, r = a.topMm + a.heightMm;
   }
 }
-function xr(e) {
+function kr(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 || t.visual));
 }
-function ae(e) {
-  return e.pages.some((t) => t.components.some((r) => r.kind === "list" ? xr(r) : !!r.chartBinding));
+function ke(e) {
+  return e.pages.some((t) => t.components.some((r) => r.kind === "list" ? kr(r) : !!r.chartBinding));
 }
-const Cr = 512, Ne = 256 * 1024;
-function kr() {
+const Tr = 512, je = 256 * 1024;
+function Pr() {
   const e = /* @__PURE__ */ new Map();
   let t = 0, r;
-  return (o, n, a, s) => {
+  return (n, o, a, s) => {
     s !== r && (e.clear(), t = 0, r = s);
-    const i = JSON.stringify([o, n, a.fontSizePt, a.fontFamily, a.bold, a.italic, a.letterSpacingPt]), c = e.get(i);
+    const i = JSON.stringify([n, o, 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 l = z(o, n, a, s), d = i.length + l.reduce((f, u) => f + u.length, 0);
-    if (d <= Ne) {
-      for (; e.size >= Cr || t + d > Ne; ) {
+    const l = _(n, o, a, s), d = i.length + l.reduce((f, u) => f + u.length, 0);
+    if (d <= je) {
+      for (; e.size >= Tr || t + d > je; ) {
         const f = e.keys().next().value;
         t -= e.get(f).units, e.delete(f);
       }
@@ -192,97 +191,97 @@ function kr() {
   };
 }
 const Er = 1e4, Ke = 25e4;
-function ke(e) {
+function Te(e) {
   if (e?.aborted) throw e.reason ?? new DOMException("标签生成已取消", "AbortError");
 }
-function et(e, t, r) {
-  const o = typeof e.copies == "object" ? ze(t, e.copies.field, r) : e.copies ?? 1;
-  if (typeof o != "number" || !Number.isSafeInteger(o) || o < 1 || o > 1e3) throw new I(`$.datasets.${r.dataset}[${r.rowIndex}]`, "每条记录复制数必须是 1..1000 的数值型整数", r.rowIndex, typeof e.copies == "object" ? e.copies.field : void 0);
-  return o;
-}
 function tt(e, t, r) {
+  const n = typeof e.copies == "object" ? _e(t, e.copies.field, r) : e.copies ?? 1;
+  if (typeof n != "number" || !Number.isSafeInteger(n) || n < 1 || n > 1e3) throw new I(`$.datasets.${r.dataset}[${r.rowIndex}]`, "每条记录复制数必须是 1..1000 的数值型整数", r.rowIndex, typeof e.copies == "object" ? e.copies.field : void 0);
+  return n;
+}
+function rt(e, t, r) {
   if (e.rowKey === void 0) return;
-  const o = ze(t, e.rowKey, r);
-  if (typeof o == "string" && o.trim() || typeof o == "number" && Number.isFinite(o)) return o;
+  const n = _e(t, e.rowKey, r);
+  if (typeof n == "string" && n.trim() || typeof n == "number" && Number.isFinite(n)) return n;
   throw new I(`$.datasets.${r.dataset}[${r.rowIndex}].${e.rowKey}`, "业务主键必须是非空字符串或有限数字", r.rowIndex, e.rowKey);
 }
-function Tr(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 Rr(e) {
+  const t = (r) => 1 + (r.grid?.cells.reduce((n, o) => n + 1 + o.length + o.reduce((a, s) => a + (s?.children?.reduce((i, c) => i + t(c), 0) ?? 0), 0), 0) ?? 0);
+  return e.pages.reduce((r, n) => r + n.components.reduce((o, a) => o + t(a), 0), 0);
 }
-function Pr(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 I(`$.datasets.${o.dataset}`, "逐记录标签数据集缺失，应提供对象数组（允许空数组）");
-  const a = /* @__PURE__ */ new Set(), s = r.maxPages ?? Er, i = Tr(e);
+function $r(e, t, r) {
+  const n = e.repeat, o = Object.prototype.hasOwnProperty.call(t, n.dataset) ? t[n.dataset] : void 0;
+  if (!Array.isArray(o)) throw new I(`$.datasets.${n.dataset}`, "逐记录标签数据集缺失，应提供对象数组（允许空数组）");
+  const a = /* @__PURE__ */ new Set(), s = r.maxPages ?? Er, i = Rr(e);
   let c = 0, l = 0;
-  for (const [d, f] of n.entries()) {
-    if (ke(r.signal), !f || typeof f != "object" || Array.isArray(f)) throw new I(`$.datasets.${o.dataset}[${d}]`, "标签记录应为对象", d);
-    const u = { rowIndex: d, dataset: o.dataset }, h = tt(o, f, u);
+  for (const [d, f] of o.entries()) {
+    if (Te(r.signal), !f || typeof f != "object" || Array.isArray(f)) throw new I(`$.datasets.${n.dataset}[${d}]`, "标签记录应为对象", d);
+    const u = { rowIndex: d, dataset: n.dataset }, h = rt(n, f, u);
     if (h !== void 0) {
       const v = JSON.stringify([typeof h, h]);
-      if (a.has(v)) throw new I(`$.datasets.${o.dataset}[${d}].${o.rowKey}`, "业务主键重复；请先确认记录来源，避免重复打印标签", d, o.rowKey);
+      if (a.has(v)) throw new I(`$.datasets.${n.dataset}[${d}].${n.rowKey}`, "业务主键重复；请先确认记录来源，避免重复打印标签", d, n.rowKey);
       a.add(v);
     }
-    const m = et(o, f, u);
-    if (c += m * e.pages.length, l += m * i, c > s) throw new G(s, c);
+    const m = tt(n, f, u);
+    if (c += m * e.pages.length, l += m * i, c > s) throw new W(s, c);
     if (l > Ke) throw new I("$.repeat", `标签组件总量（含网格行、槽位及嵌套组件）超过安全预算 ${Ke}，请分批生成`, d);
   }
-  return n;
+  return o;
 }
-function Rr(e, t, r) {
+function Ir(e, t, r) {
   if (!e.binding) return e;
-  const { binding: o, ...n } = e, a = zt(o, t.row, t);
+  const { binding: n, ...o } = e, a = qt(n, t.row, t);
   if (e.kind === "image") {
     if (!a) return;
-    if (!_t(a)) throw new I(`${r}.binding`, "图片字段只接受 PNG/JPEG base64 data URL；业务 URL 应由宿主安全加载后转换", t.rowIndex, o.field);
-    return { ...n, imageData: a };
+    if (!Ut(a)) throw new I(`${r}.binding`, "图片字段只接受 PNG/JPEG base64 data URL；业务 URL 应由宿主安全加载后转换", t.rowIndex, n.field);
+    return { ...o, 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 });
+  return e.kind === "barcode" || e.kind === "qrcode" ? (delete o.imageData, { ...o, code: { ...o.code, value: a }, fallbackText: a }) : (delete o.lines, delete o.richParagraphs, { ...o, text: a });
 }
-function $r(e, t, r) {
+function Fr(e, t, r) {
   if (e.kind !== "text" || e.grid || e.richParagraphs?.length) return e;
-  const o = e.style ?? {}, n = re(o).fontSizePt, a = e.text ?? e.lines?.join(`
+  const n = e.style ?? {}, o = ne(n).fontSizePt, a = e.text ?? e.lines?.join(`
 `) ?? "";
   if (a.length > 16384) throw new I(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 ?? We), i = s.length * n * Gt(o) * 25.4 / 72;
+  const s = t.wrapText(a, e.widthMm, { fontSizePt: o, bold: n.bold, italic: n.italic, fontFamily: n.fontFamily, letterSpacingPt: n.letterSpacing }, t.options.measurer ?? Je), i = s.length * o * Vt(n) * 25.4 / 72;
   if (i > e.heightMm + 0.05) throw new I(r, `标签文字需要约 ${i.toFixed(2)}mm 高，超出 ${e.heightMm}mm；请增大文本区域、减少内容或调整字号`, t.rowIndex, e.binding?.field);
   return { ...e, lines: s };
 }
-function rt(e, t, r) {
-  ke(t.options.signal);
-  const o = Rr(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((l, d) => {
-    const f = rt(l, t, `${r}.grid.cells.${s}.${c}.children.${d}`);
+function nt(e, t, r) {
+  Te(t.options.signal);
+  const n = Ir(e, t, r);
+  if (!n) return;
+  let o = n.grid;
+  return o && (o = { ...o, cells: o.cells.map((a, s) => a.map((i, c) => i?.children?.length ? { ...i, children: i.children.flatMap((l, d) => {
+    const f = nt(l, t, `${r}.grid.cells.${s}.${c}.children.${d}`);
     return f ? [f] : [];
-  }) } : i)) }), $r(n === o.grid ? o : { ...o, grid: n }, t, r);
+  }) } : i)) }), Fr(o === n.grid ? n : { ...n, grid: o }, t, r);
 }
-function Ir(e, t, r, o, n, a) {
+function Or(e, t, r, n, o, a) {
   return {
     ...e,
     components: e.components.flatMap((s, i) => {
-      const c = rt(s, r, `$.pages.${t}.components.${i}`);
+      const c = nt(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 } }
+    meta: { ...e.meta, record: { dataset: r.dataset, rowIndex: r.rowIndex, ...a === void 0 ? {} : { rowKey: a }, copyIndex: n, copyCount: o, templatePageIndex: t } }
   };
 }
-function* Fr(e, t, r) {
-  const o = [];
-  if (ar(e, o), o.length) throw new I(o[0].path, o[0].message);
+function* Ar(e, t, r) {
+  const n = [];
+  if (ir(e, n), n.length) throw new I(n[0].path, n[0].message);
   if (!e.repeat) {
     for (const [i, c] of e.pages.entries()) yield { page: c, pageIndex: i };
     return;
   }
-  const n = e.repeat, a = Pr(e, t, r), s = kr();
+  const o = e.repeat, a = $r(e, t, r), s = Pr();
   for (const [i, c] of a.entries()) {
-    const l = { row: c, rowIndex: i, dataset: n.dataset, options: r, wrapText: s }, d = et(n, c, l), f = tt(n, c, l);
+    const l = { row: c, rowIndex: i, dataset: o.dataset, options: r, wrapText: s }, d = tt(o, c, l), f = rt(o, c, l);
     for (let u = 0; u < d; u++) for (const [h, m] of e.pages.entries())
-      ke(r.signal), yield { page: Ir(m, h, l, u, d, f), pageIndex: h };
+      Te(r.signal), yield { page: Or(m, h, l, u, d, f), pageIndex: h };
   }
 }
-function Or(e) {
+function Nr(e) {
   return {
     widthMm: e.widthMm,
     heightMm: e.heightMm,
@@ -293,9 +292,9 @@ function Or(e) {
     components: []
   };
 }
-function Q(e, t) {
+function Z(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);
+  return e.components.reduce((n, o) => o.kind !== "list" && o.pageAnchor === "footer" ? Math.min(n, o.topMm) : n, r);
 }
 function V(e) {
   return e.components.reduce((t, r) => r.kind !== "list" && r.pageAnchor === "header" ? Math.max(t, r.topMm + r.heightMm) : t, 0);
@@ -303,70 +302,70 @@ function V(e) {
 function ot(e, t) {
   let r = e.textMetrics.get(t);
   if (!r) {
-    const o = re(t).fontSizePt;
+    const n = ne(t).fontSizePt;
     r = {
       measureOptions: {
-        fontSizePt: o,
+        fontSizePt: n,
         fontFamily: t.fontFamily ?? Ve,
         italic: t.italic,
         bold: t.bold,
         letterSpacingPt: t.letterSpacing
       },
-      lineMm: o * (t.lineHeight ?? ve) * 25.4 / 72
+      lineMm: n * (t.lineHeight ?? ve) * 25.4 / 72
     }, e.textMetrics.set(t, r);
   }
   return r;
 }
-function Ar(e) {
+function jr(e) {
   if (e === null || typeof e == "string" || typeof e == "boolean" || typeof e == "number" && Number.isFinite(e)) return e;
 }
-function Ee(e, t, r = [], o) {
-  const n = e.fontSizePt ?? Vt, a = e.paddingMm ?? 1, s = e.columns.map((g) => g.align ?? g.style?.align ?? e.align ?? "left"), i = e.columns.map((g, w) => ({
-    ...N({
-      fontSize: n,
+function Pe(e, t, r = [], n) {
+  const o = e.fontSizePt ?? Jt, a = e.paddingMm ?? 1, s = e.columns.map((g) => g.align ?? g.style?.align ?? e.align ?? "left"), i = e.columns.map((g, w) => ({
+    ...j({
+      fontSize: o,
       verticalAlign: "middle"
     }, g.style),
     align: s[w] === "auto" ? "left" : s[w]
   })), c = i.map((g, w) => s[w] === "auto" ? { left: g, center: { ...g, align: "center" }, right: { ...g, align: "right" } } : void 0), l = e.columns.map((g, w) => g.rules?.map((x) => {
-    const P = c[w];
-    if (P) return {
-      left: N(P.left, x.style),
-      center: N(P.center, x.style),
-      right: N(P.right, x.style)
+    const E = c[w];
+    if (E) return {
+      left: j(E.left, x.style),
+      center: j(E.center, x.style),
+      right: j(E.right, x.style)
     };
-    const E = N(i[w], x.style);
-    return { left: E, center: E, right: E };
-  })), d = e.columns.map((g) => Je(e, g)), f = e.columns.map((g) => g.header);
+    const k = j(i[w], x.style);
+    return { left: k, center: k, right: k };
+  })), d = e.columns.map((g) => ze(e, g)), f = e.columns.map((g) => g.header);
   let u = e.rowHeightMm ?? 0;
   for (let g = 0; g < f.length; g++) {
-    const w = d[g], x = re(w).fontSizePt, P = z(
+    const w = d[g], x = ne(w).fontSizePt, E = _(
       f[g],
       e.columns[g].widthMm - a * 2,
       { fontSizePt: x, fontFamily: w.fontFamily ?? Ve, italic: w.italic, bold: w.bold, letterSpacingPt: w.letterSpacing },
       t
-    ), E = x * (w.lineHeight ?? ve) * 25.4 / 72;
-    u = Math.max(u, Math.max(P.length, 1) * E + a * 2);
+    ), k = x * (w.lineHeight ?? ve) * 25.4 / 72;
+    u = Math.max(u, Math.max(E.length, 1) * k + a * 2);
   }
   const h = f.map((g, w) => ({
     text: g,
     style: d[w]
-  })), m = e.border === !1 ? { borderTop: !1, borderRight: !1, borderBottom: !1, borderLeft: !1 } : { borderBottom: !0, borderLeft: !0, borderRight: !0, borderTop: !0 }, v = e.columns.map((g) => g.widthMm), y = Nr(br(e, t), v, {
+  })), m = e.border === !1 ? { borderTop: !1, borderRight: !1, borderBottom: !1, borderLeft: !1 } : { borderBottom: !0, borderLeft: !0, borderRight: !0, borderTop: !0 }, v = e.columns.map((g) => g.widthMm), y = Kr(Mr(e, t), v, {
     cells: [h],
     colWidthsMm: v,
     rowHeightsMm: [u],
     paddingMm: a
   });
   return {
-    fontSizePt: n,
+    fontSizePt: o,
     paddingMm: a,
-    visuals: rr(e.columns, r, o),
-    visibility: e.columns.map((g) => g.visibleWhen ? L(g.visibleWhen) : void 0),
-    ruleReaders: e.columns.map((g) => g.rules?.map((w) => L(w.when))),
+    visuals: or(e.columns, r, n),
+    visibility: e.columns.map((g) => g.visibleWhen ? H(g.visibleWhen) : void 0),
+    ruleReaders: e.columns.map((g) => g.rules?.map((w) => H(w.when))),
     cellStyles: i,
     autoStyles: c,
     ruleStyles: l,
     textMetrics: /* @__PURE__ */ new WeakMap(),
-    numberFormats: e.columns.map((g) => _e(g.format)),
+    numberFormats: e.columns.map((g) => qe(g.format)),
     derivedFields: new Set(e.computed?.map((g) => g.field)),
     borderStyle: m,
     headerHeightMm: y.rowHeightsMm.reduce((g, w) => g + w, 0),
@@ -375,23 +374,23 @@ function Ee(e, t, r = [], o) {
     columns: e.columns
   };
 }
-function Nr(e, t, r) {
+function Kr(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 };
+  const n = e.rowHeightsMm ?? e.cells.map(() => r.rowHeightsMm[0]);
+  if (n.length !== e.cells.length || n.some((o) => !Number.isFinite(o) || o <= 0)) throw new Error("自定义列表表头行高无效");
+  return { ...e, colWidthsMm: t, rowHeightsMm: n };
 }
-function Kr(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);
+function Lr(e, t, r) {
+  const n = t.format?.kind === "number" || t.format?.kind === "percent";
+  t.valueType !== void 0 ? e.valueType = t.valueType : n && (e.valueType = "number"), t.editable !== void 0 && (e.editable = t.editable), (typeof e.value == "number" || e.value == null) && r !== void 0 && (e.numberFormat = r);
 }
-function W(e, t, r) {
-  const o = e.columns, n = e.tree?.rows.get(t);
+function J(e, t, r) {
+  const n = e.columns, o = e.tree?.rows.get(t);
   let a = e.rowHeightFloorMm;
-  const s = new Array(o.length);
-  for (let i = 0; i < o.length; i++) {
-    const c = o[i], l = e.visibility[i]?.(t) !== !1, d = l ? t[c.field] : null, f = e.autoStyles[i] ? qe(d, c.format, c.semanticRole) : "left";
+  const s = new Array(n.length);
+  for (let i = 0; i < n.length; i++) {
+    const c = n[i], l = e.visibility[i]?.(t) !== !1, d = l ? t[c.field] : null, f = e.autoStyles[i] ? Ue(d, c.format, c.semanticRole) : "left";
     let u = e.autoStyles[i]?.[f] ?? e.cellStyles[i];
     if (c.rules) {
       for (let x = 0; x < c.rules.length; x++)
@@ -400,12 +399,12 @@ function W(e, t, r) {
           break;
         }
     }
-    const h = c.format ? Ue(d, c.format) : xe(d), m = jr(e, c, n);
-    u = Lr(e, c, u, n);
-    const v = ot(e, u), y = z(h, Math.max(1, c.widthMm - e.paddingMm * 2 - m), v.measureOptions, r);
+    const h = c.format ? Xe(d, c.format) : xe(d), m = Hr(e, c, o);
+    u = Dr(e, c, u, o);
+    const v = ot(e, u), y = _(h, Math.max(1, c.widthMm - e.paddingMm * 2 - m), v.measureOptions, r);
     a = Math.max(a, y.length * v.lineMm + e.paddingMm * 2);
-    const g = Ar(d), w = { text: h, style: u };
-    d != null && e.visuals[i]?.apply(w, t), g !== void 0 && (w.value = g), Kr(w, c, e.numberFormats[i]), Hr(w, c, e, n, m), e.derivedFields.has(c.field) && (w.derived = !0, w.editable = !1), l || (w.editable = !1), s[i] = w;
+    const g = jr(d), w = { text: h, style: u };
+    d != null && e.visuals[i]?.apply(w, t), g !== void 0 && (w.value = g), Lr(w, c, e.numberFormats[i]), Br(w, c, e, o, m), e.derivedFields.has(c.field) && (w.derived = !0, w.editable = !1), l || (w.editable = !1), s[i] = w;
   }
   return {
     grid: { cells: [s], colWidthsMm: e.colWidthsMm, rowHeightsMm: [a], paddingMm: e.paddingMm },
@@ -413,70 +412,70 @@ function W(e, t, r) {
     ...e.matrix ? { meta: { matrix: { row: e.matrix.rows.get(t) } } } : {}
   };
 }
-function jr(e, t, r) {
-  return !r || t.field !== e.tree.list.tree.labelField ? 0 : qt(e.tree.list, t, r, e.paddingMm);
+function Hr(e, t, r) {
+  return !r || t.field !== e.tree.list.tree.labelField ? 0 : Xt(e.tree.list, t, r, e.paddingMm);
 }
-function Lr(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, n) {
+  return !n || t.field !== e.tree.list.tree.labelField || r.align === "left" ? r : { ...r, align: "left" };
 }
-function Hr(e, t, r, o, n = 0) {
-  o && (n && (e.indentMm = n), Ut(e, t, o, r.tree.list));
+function Br(e, t, r, n, o = 0) {
+  n && (o && (e.indentMm = o), Yt(e, t, n, r.tree.list));
 }
-function nt(e) {
+function at(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* at(e, t, r = 0) {
-  const o = t[r];
-  if (!o) {
+function* st(e, t, r = 0) {
+  const n = t[r];
+  if (!n) {
     for (const a of e) yield { kind: "row", row: a };
     return;
   }
-  const n = /* @__PURE__ */ new Map();
+  const o = /* @__PURE__ */ new Map();
   for (const a of e) {
-    const s = nt(a[o.field]), i = n.get(s);
-    i ? i.push(a) : n.set(s, [a]);
+    const s = at(a[n.field]), i = o.get(s);
+    i ? i.push(a) : o.set(s, [a]);
   }
-  for (const a of n.values())
-    yield { kind: "groupHeader", label: (o.headerTemplate ?? "{value}").replace(/\{value\}/g, xe(a[0][o.field])), firstRow: a[0], group: o, depth: r, rows: a }, yield* at(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 };
+  for (const a of o.values())
+    yield { kind: "groupHeader", label: (n.headerTemplate ?? "{value}").replace(/\{value\}/g, xe(a[0][n.field])), firstRow: a[0], group: n, depth: r, rows: a }, yield* st(a, t, r + 1), (n.subtotal?.length || n.aggregates?.length) && (yield { kind: "subtotal", label: n.subtotalLabel ?? "小计", rows: a, group: n, depth: r }), yield { kind: "groupEnd", depth: r };
 }
-function st(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) => {
+function it(e, t, r, n = []) {
+  const o = [...r.filter((a) => !n.some((s) => s.field === a)).map((a) => ({ field: a, op: "sum" })), ...n];
+  return new Map(o.map((a) => {
     const s = e.find((c) => c.field === a.field)?.format ?? { kind: "number", thousands: !0 }, i = Se(t, { ...a, field: a.valueField ?? a.field });
-    return [a.field, { text: Ue(i, s), ...i === null ? {} : { value: i }, ...typeof i == "number" ? { numberFormat: _e(s) } : {} }];
+    return [a.field, { text: Xe(i, s), ...i === null ? {} : { value: i }, ...typeof i == "number" ? { numberFormat: qe(s) } : {} }];
   }));
 }
-function it(e, t) {
-  const r = e.findIndex((o) => t.includes(o.field));
+function ct(e, t) {
+  const r = e.findIndex((n) => t.includes(n.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 = N({ fontSize: e.fontSizePt }, n);
+function G(e, t, r, n, o, a) {
+  const s = [], i = Math.max(0, Math.min(a, e.columns.length)), c = j({ fontSize: e.fontSizePt }, o);
   i && s.push({ text: r, colSpan: i, style: { bold: !0, ...c } });
   for (let u = i; u < e.columns.length; u++) {
-    const h = e.columns[u], m = o.get(h.field), v = e.autoStyles[u]?.[qe(m?.value, h.format)] ?? e.cellStyles[u];
-    s.push({ ...m, text: m?.text ?? "", style: N(v, n) });
+    const h = e.columns[u], m = n.get(h.field), v = e.autoStyles[u]?.[Ue(m?.value, h.format)] ?? e.cellStyles[u];
+    s.push({ ...m, text: m?.text ?? "", style: j(v, o) });
   }
-  const l = { text: r, colSpan: e.columns.length, style: { bold: !0, ...c } }, d = i ? [s] : [[l], s], f = d.map((u) => Dr(e, u, t));
+  const l = { text: r, colSpan: e.columns.length, style: { bold: !0, ...c } }, d = i ? [s] : [[l], s], f = d.map((u) => Gr(e, u, t));
   return {
     grid: { cells: d, colWidthsMm: e.colWidthsMm, rowHeightsMm: f, paddingMm: e.paddingMm },
     heightMm: f.reduce((u, h) => u + h, 0)
   };
 }
-function Dr(e, t, r) {
-  let o = e.rowHeightFloorMm, n = 0;
+function Gr(e, t, r) {
+  let n = e.rowHeightFloorMm, o = 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 = ot(e, a.style), l = z(a.text ?? "", s - e.paddingMm * 2, c.measureOptions, r);
-    o = Math.max(o, l.length * c.lineMm + e.paddingMm * 2);
+    const i = o + (a.colSpan ?? 1);
+    for (; o < i; o++) s += e.colWidthsMm[o] ?? 0;
+    const c = ot(e, a.style), l = _(a.text ?? "", s - e.paddingMm * 2, c.measureOptions, r);
+    n = Math.max(n, l.length * c.lineMm + e.paddingMm * 2);
   }
-  return o;
+  return n;
 }
-function Br(e, t, r) {
-  const { templatePage: o, current: n, warnings: a, nextId: s, pushCurrent: i } = r, c = () => Q(o, n), l = Math.max(n.marginTopMm, V(o)), d = o.layout === "wide" ? V(o) : l, f = {
+function Wr(e, t, r) {
+  const { templatePage: n, current: o, warnings: a, nextId: s, pushCurrent: i } = r, c = () => Z(n, o), l = Math.max(o.marginTopMm, V(n)), d = n.layout === "wide" ? V(n) : l, f = {
     id: r.tableId,
     columnKeys: e.columns.map((p) => p.field),
     ...e.layout === void 0 ? {} : { layout: e.layout },
@@ -492,33 +491,33 @@ function Br(e, t, r) {
     table: { ...f, role: "header", rowIndex: -1 },
     style: t.borderStyle,
     ...e.meta || t.matrix ? { meta: { ...e.meta, ...t.matrix ? { matrix: t.matrix.header } : {} } } : {}
-  }, v = (p) => n.components.push({ ...m, topMm: p });
+  }, v = (p) => o.components.push({ ...m, topMm: p });
   if (r.flow && e.header !== !1 && t.headerHeightMm > c() - l + 1e-3) throw new Error(`流式列表 ${e.id ?? e.dataset} 的表头高度超出单页可用范围`);
   let y = Math.max(r.startTop ?? e.topMm, l);
   e.header !== !1 && (v(y), y += t.headerHeightMm + r.mmPerRow);
   function g() {
-    const p = Math.max(r.flow || o.layout === "wide" ? 0 : e.topMm, d);
-    return (e.header !== !1 && e.headerEveryPage !== !1 ? p + t.headerHeightMm : d) + [...h.values()].reduce((S, T) => S + T.heightMm, 0);
+    const p = Math.max(r.flow || n.layout === "wide" ? 0 : e.topMm, d);
+    return (e.header !== !1 && e.headerEveryPage !== !1 ? p + t.headerHeightMm : d) + [...h.values()].reduce((S, P) => S + P.heightMm, 0);
   }
   function w() {
-    const p = o.layout === "wide" ? 0 : n.marginBottomMm;
-    return Math.min(o.heightMm - p, Q(o, n)) - g();
+    const p = n.layout === "wide" ? 0 : o.marginBottomMm;
+    return Math.min(n.heightMm - p, Z(n, o)) - g();
   }
   function x(p) {
     if (y + p <= c()) return;
-    i(), n.components = [], n.heightMm = o.heightMm, o.layout === "wide" && (n.marginTopMm = 0, n.marginBottomMm = 0);
-    const b = Math.max(r.flow || o.layout === "wide" ? 0 : e.topMm, d);
+    i(), o.components = [], o.heightMm = n.heightMm, n.layout === "wide" && (o.marginTopMm = 0, o.marginBottomMm = 0);
+    const b = Math.max(r.flow || n.layout === "wide" ? 0 : e.topMm, d);
     e.header !== !1 && e.headerEveryPage !== !1 ? (v(b), y = b + t.headerHeightMm) : y = d;
-    for (const S of h.values()) E(S, "listgr", "group-header");
+    for (const S of h.values()) k(S, "listgr", "group-header");
   }
-  function P(p, b, S, T) {
-    const k = w();
-    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，预览与打印可能截断内容`), x(p.heightMm), E(p, b, S, T);
+  function E(p, b, S, P) {
+    const T = w();
+    if (r.flow && p.heightMm > T + 1e-3) throw new Error(`流式列表 ${e.id ?? e.dataset} 的单行高度超出单页可用范围`);
+    p.heightMm > T && a.push(`列表 ${e.id ?? e.dataset} 行高 ${p.heightMm.toFixed(2)}mm 超出单页可用高度 ${T.toFixed(2)}mm，预览与打印可能截断内容`), x(p.heightMm), k(p, b, S, P);
   }
-  function E(p, b, S, T) {
-    const k = p.table?.id ?? f.id, R = S === "header" ? -1 : u.get(k) ?? 0;
-    S !== "header" && u.set(k, R + p.grid.cells.length), n.components.push({
+  function k(p, b, S, P) {
+    const T = p.table?.id ?? f.id, R = S === "header" ? -1 : u.get(T) ?? 0;
+    S !== "header" && u.set(T, R + p.grid.cells.length), o.components.push({
       kind: "rect",
       leftMm: e.leftMm,
       topMm: y,
@@ -526,7 +525,7 @@ function Br(e, t, r) {
       heightMm: p.heightMm,
       grid: p.grid,
       nid: s(b),
-      table: { ...f, ...p.table, role: S, rowIndex: R, ...T ? { source: T } : {} },
+      table: { ...f, ...p.table, role: S, rowIndex: R, ...P ? { source: P } : {} },
       style: t.borderStyle,
       ...e.meta || p.meta ? { meta: { ...e.meta, ...p.meta } } : {}
     }), y += p.heightMm;
@@ -534,182 +533,182 @@ function Br(e, t, r) {
   function O(p) {
     p <= w() && x(p);
   }
-  return { keepTogether: O, placeGridRow: P, setGroupHeader: (p, b) => {
+  return { keepTogether: O, placeGridRow: E, setGroupHeader: (p, b) => {
     b ? h.set(p, b) : h.delete(p);
   }, bottom: () => y };
 }
-function Gr(e, t) {
+function Vr(e, t) {
   if (!e.rowKey) return;
   const r = t[e.rowKey];
   if ((typeof r != "string" || !r.trim()) && !(typeof r == "number" && Number.isFinite(r)))
     throw new Error(`数据集 ${e.dataset} 的 ${e.rowKey} 应为稳定的字符串或有限数字主键`);
-  const o = e.revisionField ? t[e.revisionField] : void 0, n = e.sourceTokenField ? t[e.sourceTokenField] : void 0;
-  if (o !== void 0 && typeof o != "string" && !(typeof o == "number" && Number.isFinite(o))) throw new Error("业务修订号应为字符串或有限数字");
-  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 } };
+  const n = e.revisionField ? t[e.revisionField] : void 0, o = e.sourceTokenField ? t[e.sourceTokenField] : void 0;
+  if (n !== void 0 && typeof n != "string" && !(typeof n == "number" && Number.isFinite(n))) throw new Error("业务修订号应为字符串或有限数字");
+  if (o !== void 0 && typeof o != "string") throw new Error("来源令牌应为字符串");
+  return { datasetId: e.dataset, rowKey: r, ...n === void 0 ? {} : { revision: n }, ...o === void 0 ? {} : { sourceToken: o } };
 }
-function se(e, t) {
+function ae(e, t) {
   const r = /* @__PURE__ */ new Map();
   if (!e.rowKey) return r;
-  const o = /* @__PURE__ */ new Set();
-  for (const n of t) {
-    const a = Gr(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);
+  const n = /* @__PURE__ */ new Set();
+  for (const o of t) {
+    const a = Vr(e, o), s = JSON.stringify(a.rowKey);
+    if (n.has(s)) throw new Error(`数据集 ${e.dataset} 的业务主键重复：${String(a.rowKey)}`);
+    n.add(s), r.set(o, a);
   }
   return r;
 }
-function Vr(e, t, r, o, n) {
+function Jr(e, t, r, n, o) {
   if (!e.grandTotal) return;
-  const a = typeof e.grandTotal == "object" ? e.grandTotal : void 0, s = ie(e)[0], i = a?.fields ?? s?.subtotal ?? [], c = a?.aggregates ?? s?.aggregates ?? [];
+  const a = typeof e.grandTotal == "object" ? e.grandTotal : void 0, s = se(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）`);
+    n.warnings.push(`列表 ${e.id ?? ""} 配置了 grandTotal 但未提供合计字段（groupBy.subtotal 或 grandTotal.fields）`);
     return;
   }
-  const l = B(r, o.measurer, a?.label ?? "合计", st(e.columns, t, i, c), a?.style ?? {}, it(e.columns, [...i, ...c.map((d) => d.field)]));
-  n.placeGridRow(l, "listgt", "grand-total");
+  const l = G(r, n.measurer, a?.label ?? "合计", it(e.columns, t, i, c), a?.style ?? {}, ct(e.columns, [...i, ...c.map((d) => d.field)]));
+  o.placeGridRow(l, "listgt", "grand-total");
 }
-function J(e) {
+function N(e) {
   if (e?.aborted) {
     const t = new Error("报表排版已取消");
     throw t.name = "AbortError", t;
   }
 }
-function ie(e) {
+function se(e) {
   const t = e.groups ?? (e.groupBy ? [e.groupBy] : []);
   if (t.length > 16) throw new Error("列表最多支持 16 级分组");
   return t;
 }
-function Te(e) {
-  const t = Mr(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 Ee(e) {
+  const t = xr(e), r = t.columns.reduce((o, a) => o + a.widthMm, 0), n = r > t.widthMm ? t.widthMm / r : 1;
+  return n === 1 ? t : { ...t, columns: t.columns.map((o) => ({ ...o, widthMm: o.widthMm * n })) };
 }
-function Wr(e, t, r) {
-  const o = e.detail;
-  if (!o) return;
-  const n = /* @__PURE__ */ new Set();
+function zr(e, t, r) {
+  const n = e.detail;
+  if (!n) return;
+  const o = /* @__PURE__ */ new Set();
   for (const l of t) {
-    const d = he(l[o.parentKey]);
-    if (n.has(d)) throw new Error("主从明细的主表关联键重复");
-    n.add(d);
+    const d = he(l[n.parentKey]);
+    if (o.has(d)) throw new Error("主从明细的主表关联键重复");
+    o.add(d);
   }
-  const a = r.datasets[o.dataset] ?? [], s = /* @__PURE__ */ new Map(), i = [];
+  const a = r.datasets[n.dataset] ?? [], s = /* @__PURE__ */ new Map(), i = [];
   for (const l of a) {
-    const d = l[o.foreignKey];
-    if (!ct(d) && o.unmatched === "ignore") continue;
+    const d = l[n.foreignKey];
+    if (!lt(d) && n.unmatched === "ignore") continue;
     const f = he(d);
-    if (!n.has(f)) {
-      if (o.unmatched !== "ignore") throw new Error(`明细数据集 ${o.dataset} 存在未关联的业务键`);
+    if (!o.has(f)) {
+      if (n.unmatched !== "ignore") throw new Error(`明细数据集 ${n.dataset} 存在未关联的业务键`);
       continue;
     }
     const u = s.get(f);
     u ? u.push(l) : s.set(f, [l]), i.push(l);
   }
-  const c = Te({ ...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: { ...Ee(c, r.measurer, i, r.signal), rowHeightFloorMm: c.rowHeightMm ?? 0 }, rows: s, sources: se(c, i) };
+  const c = Ee({ ...e, id: `${e.id ?? e.dataset}:detail`, dataset: n.dataset, rowKey: n.rowKey, revisionField: n.revisionField, sourceTokenField: n.sourceTokenField, computed: void 0, columns: n.columns, headerGrid: void 0, rowHeightMm: n.rowHeightMm ?? e.rowHeightMm, detail: void 0 });
+  return { list: c, inter: { ...Pe(c, r.measurer, i, r.signal), rowHeightFloorMm: c.rowHeightMm ?? 0 }, rows: s, sources: ae(c, i) };
 }
-function ct(e) {
+function lt(e) {
   return typeof e == "string" && !!e.trim() || typeof e == "number" && Number.isFinite(e);
 }
 function he(e) {
-  if (!ct(e)) throw new Error("主从关联键必须是非空字符串或有限数字");
-  return nt(e);
+  if (!lt(e)) throw new Error("主从关联键必须是非空字符串或有限数字");
+  return at(e);
 }
-function* Jr(e, t, r, o, n) {
+function* _r(e, t, r, n, o) {
   if (!r) return;
   const a = r.rows.get(he(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();
+  const s = { id: `${n.tableId}:detail`, columnKeys: r.list.columns.map((i) => i.field), title: e.detail.label };
+  e.detail.label && o.placeGridRow({ ...G(r.inter, n.measurer, e.detail.label, /* @__PURE__ */ new Map(), {}, r.list.columns.length), table: s }, "listdl", "group-header"), e.detail.header !== !1 && o.placeGridRow({ grid: r.inter.headerGrid, heightMm: r.inter.headerHeightMm, table: s }, "listdh", "header"), yield* n.takePages();
   for (const i of a)
-    J(o.signal), n.placeGridRow({ ...W(r.inter, i, o.measurer), table: s }, "listdr", "body", r.sources.get(i)), yield* o.takePages();
+    N(n.signal), o.placeGridRow({ ...J(r.inter, i, n.measurer), table: s }, "listdr", "body", r.sources.get(i)), yield* n.takePages();
 }
-function lt(e) {
+function dt(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("树形布局需要可见的标签列");
-  tr(e.tree, e.computed);
+  nr(e.tree, e.computed);
 }
-function zr(e, t, r) {
-  lt(e);
-  const o = Ye(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 = se(n, o.entries.map((c) => c.original)), s = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new WeakMap();
-  for (const c of o.entries)
+function qr(e, t, r) {
+  dt(e);
+  const n = Qe(t, e.tree, { signal: r.signal, computed: e.computed?.length ? { fields: e.computed, formula: r.formula } : void 0 }), o = { ...e, rowKey: e.tree.idField }, a = ae(o, n.entries.map((c) => c.original)), s = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new WeakMap();
+  for (const c of n.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 };
+  return { list: o, rows: n.rows, sources: s, treeRows: i, totalRows: n.leaves };
 }
-function _r(e, t) {
+function Ur(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 dt(e, t, r) {
-  const o = r.prepared.get(e);
-  if (o) return o;
-  const n = _r(e, t);
-  if (n)
-    return r.prepared.set(e, n), n;
+function ut(e, t, r) {
+  const n = r.prepared.get(e);
+  if (n) return n;
+  const o = Ur(e, t);
+  if (o)
+    return r.prepared.set(e, o), o;
   if (e.tree) {
-    const c = zr(e, t, r);
+    const c = qr(e, t, r);
     return r.prepared.set(e, c), c;
   }
   let a = e.computed?.length ? Me(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(L(e.rowVisibleWhen)));
-  const i = yr(e, a);
+  e.rowVisibleWhen && (a = a.filter(H(e.rowVisibleWhen)));
+  const i = vr(e, a);
   if (!e.matrix) {
-    const c = se(e, s ? a.map((l) => s.get(l)) : a);
+    const c = ae(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 qr(e, t, r, o) {
-  if (!o.flow) return;
-  const { current: n, templatePage: a } = o, s = Math.max(n.marginTopMm, V(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, V(a)));
-}
-function* Ur(e, t, r) {
-  const o = dt(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 ?? se(e, n), s = Te(e), i = ie(s), c = { ...Ee(s, r.measurer, n, r.signal), rowHeightFloorMm: s.rowHeightMm ?? 0, matrix: o.matrix, ...o.treeRows ? { tree: { list: s, rows: o.treeRows } } : {} };
-  qr(s, c, n, r);
-  const l = Br(s, c, r), d = Wr(s, n, r);
+function Xr(e, t, r, n) {
+  if (!n.flow) return;
+  const { current: o, templatePage: a } = n, s = Math.max(o.marginTopMm, V(a)), i = Math.max(n.startTop ?? e.topMm, s), c = (e.header === !1 ? 0 : t.headerHeightMm) + (r[0] ? J(t, r[0], n.measurer).heightMm : 0);
+  i + c <= Z(a, o) + 1e-3 || i <= s + 1e-3 || (n.pushCurrent(), o.components = [], o.heightMm = a.heightMm, a.layout === "wide" && (o.marginTopMm = 0, o.marginBottomMm = 0), n.startTop = Math.max(o.marginTopMm, V(a)));
+}
+function* Yr(e, t, r) {
+  const n = ut(e, t, r), o = n.rows;
+  e = n.list, e.layout === "wide" && (r.current.widthMm = Math.max(r.current.widthMm, e.leftMm + e.widthMm + r.current.marginRightMm));
+  const a = n.sources ?? ae(e, o), s = Ee(e), i = se(s), c = { ...Pe(s, r.measurer, o, r.signal), rowHeightFloorMm: s.rowHeightMm ?? 0, matrix: n.matrix, ...n.treeRows ? { tree: { list: s, rows: n.treeRows } } : {} };
+  Xr(s, c, o, r);
+  const l = Wr(s, c, r), d = zr(s, o, r);
   let f;
-  for (const u of at(n, i)) {
-    if (J(r.signal), u.kind === "row")
-      l.placeGridRow(f ?? W(c, u.row, r.measurer), "listr", pr(o.matrix, u.row), a.get(u.row)), f = void 0, yield* r.takePages(), yield* Jr(s, u.row, d, r, l);
+  for (const u of st(o, i)) {
+    if (N(r.signal), u.kind === "row")
+      l.placeGridRow(f ?? J(c, u.row, r.measurer), "listr", yr(n.matrix, u.row), a.get(u.row)), f = void 0, yield* r.takePages(), yield* _r(s, u.row, d, r, l);
     else if (u.kind === "groupHeader") {
-      const h = B(c, r.measurer, u.label, /* @__PURE__ */ new Map(), u.group.headerStyle ?? {}, s.columns.length);
-      f ??= W(c, u.firstRow, r.measurer);
-      const m = i.slice(u.depth + 1).reduce((v, y) => v + B(c, r.measurer, (y.headerTemplate ?? "{value}").replace(/\{value\}/g, xe(u.firstRow[y.field])), /* @__PURE__ */ new Map(), y.headerStyle ?? {}, s.columns.length).heightMm, 0);
+      const h = G(c, r.measurer, u.label, /* @__PURE__ */ new Map(), u.group.headerStyle ?? {}, s.columns.length);
+      f ??= J(c, u.firstRow, r.measurer);
+      const m = i.slice(u.depth + 1).reduce((v, y) => v + G(c, r.measurer, (y.headerTemplate ?? "{value}").replace(/\{value\}/g, xe(u.firstRow[y.field])), /* @__PURE__ */ new Map(), y.headerStyle ?? {}, s.columns.length).heightMm, 0);
       u.group.keepWithNext !== !1 && l.keepTogether(h.heightMm + m + f.heightMm), l.placeGridRow(h, "listg", "group-header"), u.group.repeatHeader && l.setGroupHeader(u.depth, h);
     } else if (u.kind === "subtotal") {
-      const h = u.group.subtotal ?? [], m = u.group.aggregates ?? [], v = B(c, r.measurer, u.label, st(s.columns, u.rows, h, m), u.group.subtotalStyle ?? {}, it(s.columns, [...h, ...m.map((y) => y.field)]));
+      const h = u.group.subtotal ?? [], m = u.group.aggregates ?? [], v = G(c, r.measurer, u.label, it(s.columns, u.rows, h, m), u.group.subtotalStyle ?? {}, ct(s.columns, [...h, ...m.map((y) => y.field)]));
       l.placeGridRow(v, "listst", "subtotal");
     } else l.setGroupHeader(u.depth);
     yield* r.takePages();
   }
-  Vr(s, o.totalRows ?? n, c, r, l), r.finished?.(l.bottom()), yield* r.takePages();
+  Jr(s, n.totalRows ?? o, c, r, l), r.finished?.(l.bottom()), yield* r.takePages();
 }
-function ce(e) {
+function ie(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 le(e, t) {
+function ce(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) => le(n, t)) } : {} } : null)) } } : {}
+    ...e.richParagraphs ? { richParagraphs: e.richParagraphs.map((r) => ({ ...r, segments: r.segments.map((n) => ({ ...n, ...n.text === void 0 ? {} : { text: t(n.text) } })) })) } : {},
+    ...e.grid ? { grid: { ...e.grid, cells: e.grid.cells.map((r) => r.map((n) => n ? { ...n, ...n.text === void 0 ? {} : { text: t(n.text) }, ...n.children ? { children: n.children.map((o) => ce(o, t)) } : {} } : null)) } } : {}
   };
 }
-function Xr(e) {
+function Qr(e) {
   let t = !1;
-  for (const r of e.pages) for (const o of r.components) ce(o) && le(o, (n) => (n.includes("{totalPages}") && (t = !0), n));
+  for (const r of e.pages) for (const n of r.components) ie(n) && ce(n, (o) => (o.includes("{totalPages}") && (t = !0), o));
   return t;
 }
-function Yr(e, t, r, o, n, a) {
+function Zr(e, t, r, n, o, a) {
   const s = {
     pageWidthMm: t.widthMm,
     pageHeightMm: t.heightMm,
@@ -721,41 +720,41 @@ function Yr(e, t, r, o, n, a) {
     components: t.components,
     ...e.meta ? { meta: e.meta } : {}
   }, i = (c) => {
-    const l = c.replace(/\{page\}/g, String(o));
+    const l = c.replace(/\{page\}/g, String(n));
     return a === void 0 ? l : l.replace(/\{totalPages\}/g, String(a));
   };
-  for (const c of r) s.components.push(le(c, i));
+  for (const c of r) s.components.push(ce(c, i));
   if (e.layout === "wide") {
     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);
+    s.marginBottomMm = o ? e.marginBottomMm ?? 0 : 0, s.pageHeightMm = Math.max(1, c + s.marginBottomMm);
   }
   return s;
 }
-function Pe(e) {
-  return e.cells.reduce((t, r) => t + r.reduce((o, n) => o + (n ? 1 + (n.children?.reduce((a, s) => a + ut(s), 0) ?? 0) : 0), 0), 0);
+function Re(e) {
+  return e.cells.reduce((t, r) => t + r.reduce((n, o) => n + (o ? 1 + (o.children?.reduce((a, s) => a + ft(s), 0) ?? 0) : 0), 0), 0);
 }
-function ut(e) {
-  return e.grid ? Pe(e.grid) : 0;
+function ft(e) {
+  return e.grid ? Re(e.grid) : 0;
 }
-function Re(e) {
+function le(e) {
   for (const t of ["maxPages", "maxCells", "knownTotalPages"]) if (e[t] !== void 0 && (!Number.isSafeInteger(e[t]) || e[t] < 1)) throw new RangeError(`${t} 应为正安全整数`);
-  ne(e.maxChartComponents);
+  oe(e.maxChartComponents);
 }
-function Qr(e, t) {
-  const r = dt(e, t.datasets[e.dataset] ?? [], t), o = Te(r.list), n = { ...Ee(o, t.measurer, r.rows, t.signal), 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 en(e, t) {
+  const r = ut(e, t.datasets[e.dataset] ?? [], t), n = Ee(r.list), o = { ...Pe(n, t.measurer, r.rows, t.signal), rowHeightFloorMm: n.rowHeightMm ?? 0 };
+  return (n.header === !1 ? 0 : o.headerHeightMm) + r.rows.reduce((a, s) => a + J(o, s, t.measurer).heightMm, 0);
 }
-function* Zr(e) {
-  const { templatePage: t, current: r } = e, o = new Map(t.components.map((a, s) => [a, s])), n = (a, s, i) => {
+function* tn(e) {
+  const { templatePage: t, current: r } = e, n = new Map(t.components.map((a, s) => [a, s])), o = (a, s, i) => {
     const c = e.datasets[a.dataset];
-    return Array.isArray(c) || e.warnings.push(`数据集 ${a.dataset} 未提供数据，列表 ${a.id ?? ""} 输出为空`), Ur(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 ?? ""} 输出为空`), Yr(a, Array.isArray(c) ? c : [], { ...e, tableId: `${e.tableId}:${n.get(a)}`, startTop: s, finished: i, flow: !!t.flow });
   };
   if (t.flow) {
-    yield* Sr({
+    yield* Cr({
       page: t,
-      active: () => J(e.signal),
+      active: () => N(e.signal),
       top: () => Math.max(r.marginTopMm, V(t)),
-      bottom: () => Q(t, r),
+      bottom: () => Z(t, r),
       append: (a) => {
         r.components.push(...e.resolveChart(a));
       },
@@ -763,34 +762,34 @@ function* Zr(e) {
         e.pushCurrent(), r.components = [], r.heightMm = t.heightMm, t.layout === "wide" && (r.marginTopMm = 0, r.marginBottomMm = 0);
       },
       takePages: e.takePages,
-      height: (a) => Qr(a, e),
-      list: n
+      height: (a) => en(a, e),
+      list: o
     });
     return;
   }
   for (const a of t.components)
-    ce(a) || (a.kind === "list" ? yield* n(a) : r.components.push(...e.resolveChart(a)));
+    ie(a) || (a.kind === "list" ? yield* o(a) : r.components.push(...e.resolveChart(a)));
 }
-function* Z(e, t, r, o, n, a = /* @__PURE__ */ new WeakMap(), s) {
+function* z(e, t, r, n, o, a = /* @__PURE__ */ new WeakMap(), s) {
   let i = 0, c = 0, l = 0;
-  const d = mr(r.measurer ?? We), f = gr(t, r.signal, r.maxChartComponents), u = (h) => `${h}_${(++i).toString(36)}`;
-  for (const { pageIndex: h, page: m } of Fr(e, t, r)) {
-    J(r.signal);
-    const v = Or(m), y = m.components.filter(ce);
+  const d = gr(r.measurer ?? Je), f = wr(t, r.signal, r.maxChartComponents), u = (h) => `${h}_${(++i).toString(36)}`;
+  for (const { pageIndex: h, page: m } of Ar(e, t, r)) {
+    N(r.signal);
+    const v = Nr(m), y = m.components.filter(ie);
     let g = [];
-    const w = (P = !1) => {
-      if (J(r.signal), r.maxPages !== void 0 && c >= r.maxPages) throw new G(r.maxPages, c + 1);
-      if (r.maxCells !== void 0 && (l += [...v.components, ...y].reduce((E, O) => E + ut(O), 0), l > r.maxCells))
-        throw new X(r.maxCells, l);
-      g.push(Yr(m, v, y, ++c, P, n));
+    const w = (E = !1) => {
+      if (N(r.signal), r.maxPages !== void 0 && c >= r.maxPages) throw new W(r.maxPages, c + 1);
+      if (r.maxCells !== void 0 && (l += [...v.components, ...y].reduce((k, O) => k + ft(O), 0), l > r.maxCells))
+        throw new Y(r.maxCells, l);
+      g.push(Zr(m, v, y, ++c, E, o));
     }, x = () => {
-      const P = g;
-      return g = [], P;
+      const E = g;
+      return g = [], E;
     };
-    yield* Zr({
+    yield* tn({
       templatePage: m,
       current: v,
-      warnings: o,
+      warnings: n,
       nextId: u,
       pushCurrent: w,
       takePages: x,
@@ -806,75 +805,86 @@ function* Z(e, t, r, o, n, a = /* @__PURE__ */ new WeakMap(), s) {
   }
   s && (s.chartComponents = f.used());
 }
-function dn(e, t, r = {}) {
-  Re(r);
-  let o = 0;
-  for (const n of Z(e, t, { ...r, onWarning: void 0 }, [])) o++;
-  return o;
+function mo(e, t, r = {}) {
+  le(r);
+  let n = 0;
+  for (const o of z(e, t, { ...r, onWarning: void 0 }, [])) n++;
+  return n;
 }
-function* un(e, t, r = {}) {
-  yield* ft(e, t, r);
+function* ho(e, t, r = {}) {
+  yield* rn(e, t, r);
 }
-function* ft(e, t, r, o) {
-  Re(r);
-  const n = Xr(e), a = /* @__PURE__ */ new WeakMap();
+function* rn(e, t, r, n) {
+  le(r);
+  const o = Qr(e), a = /* @__PURE__ */ new WeakMap();
   let s = r.knownTotalPages;
-  if (n && s === void 0) {
+  if (o && s === void 0) {
     s = 0;
-    for (const l of Z(e, t, r, [], void 0, a)) s++;
+    for (const l of z(e, t, r, [], void 0, a)) s++;
   }
   const i = [];
   let c = 0;
-  for (const l of Z(e, t, r, i, s, a, o)) {
+  for (const l of z(e, t, r, i, s, a, n)) {
     for (; c < i.length; c++) r.onWarning?.(i[c]);
     yield l;
   }
 }
 function mt(e, t, r = {}) {
-  const o = typeof r == "number" ? { mmPerRow: r } : r;
-  Re(o);
-  const n = [], a = { chartComponents: 0 }, s = [...Z(e, t, o, n, o.knownTotalPages, void 0, a)];
-  for (const i of s) i.components = i.components.map((c) => ce(c) ? le(c, (l) => l.replace(/\{totalPages\}/g, String(s.length))) : c);
-  return n.forEach((i) => o.onWarning?.(i)), { plan: { schemaVersion: te, ...ae(e) ? { requiresRecalculation: !0 } : {}, pages: s }, warnings: n, ...a };
-}
-function eo(e) {
+  const n = typeof r == "number" ? { mmPerRow: r } : r;
+  le(n);
+  const o = [], a = { chartComponents: 0 }, s = [...z(e, t, n, o, n.knownTotalPages, void 0, a)];
+  return gt(e, n, s, o, a);
+}
+async function ht(e, t, r = {}) {
+  le(r), N(r.signal);
+  const n = [], o = [], a = { chartComponents: 0 };
+  let s = performance.now(), i = 0;
+  for (const c of z(e, t, r, n, r.knownTotalPages, void 0, a))
+    o.push(c), (++i >= 8 || performance.now() - s >= 8) && (await new Promise((l) => setTimeout(l, 0)), N(r.signal), s = performance.now(), i = 0);
+  return N(r.signal), gt(e, r, o, n, a);
+}
+function gt(e, t, r, n, o) {
+  for (const a of r) a.components = a.components.map((s) => ie(s) ? ce(s, (i) => i.replace(/\{totalPages\}/g, String(r.length))) : s);
+  return n.forEach((a) => t.onWarning?.(a)), { plan: { schemaVersion: be, ...ke(e) ? { requiresRecalculation: !0 } : {}, pages: r }, warnings: n, ...o };
+}
+function nn(e) {
   const t = e.columns.find((a) => !a.hidden)?.field;
   if (!t) return { groups: 0, total: 0 };
-  const r = ie(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)) };
+  const r = se(e), n = (a = [], s = []) => a.includes(t) || s.some((i) => i.field === t), o = typeof e.grandTotal == "object" ? e.grandTotal : void 0;
+  return { groups: r.filter((a) => n(a.subtotal, a.aggregates)).length, total: Number(n(o?.fields ?? r[0]?.subtotal, o?.aggregates ?? r[0]?.aggregates)) };
 }
-function to(e, t, r) {
-  lt(e);
-  const o = Xe(t[e.dataset] ?? [], e.tree, r), n = e.columns.filter((s) => !s.hidden).length, a = e.header === !1 ? 0 : e.headerGrid ? Pe(e.headerGrid) : n;
-  return o.length * n + a + +!!e.grandTotal * 2 * n;
+function on(e, t, r) {
+  dt(e);
+  const n = Ye(t[e.dataset] ?? [], e.tree, r), o = e.columns.filter((s) => !s.hidden).length, a = e.header === !1 ? 0 : e.headerGrid ? Re(e.headerGrid) : o;
+  return n.length * o + a + +!!e.grandTotal * 2 * o;
 }
-function fn(e, t, r = {}) {
-  if (e.tree) return to(e, t, r.signal);
+function go(e, t, r = {}) {
+  if (e.tree) return on(e, t, r.signal);
   if (e.matrix) {
     let c = t[e.dataset] ?? [];
-    e.computed?.length && (c = Me(c, { fields: e.computed, ...r }).rows), e.rowVisibleWhen && (c = c.filter(L(e.rowVisibleWhen)));
-    const l = er(c, e.matrix);
+    e.computed?.length && (c = Me(c, { fields: e.computed, ...r }).rows), e.rowVisibleWhen && (c = c.filter(H(e.rowVisibleWhen)));
+    const l = rr(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 = ie(e).length, s = eo(e);
-  let i = (o * (1 + 2 * a + s.groups) + +!!e.grandTotal * (1 + s.total)) * n;
-  if (i += e.header === !1 ? 0 : e.headerGrid ? Pe(e.headerGrid) : n, e.cardinality === "record" && o === 0 && (i += n), e.detail) {
+  const n = t[e.dataset]?.length ?? 0, o = e.columns.filter((c) => !c.hidden).length, a = se(e).length, s = nn(e);
+  let i = (n * (1 + 2 * a + s.groups) + +!!e.grandTotal * (1 + s.total)) * o;
+  if (i += e.header === !1 ? 0 : e.headerGrid ? Re(e.headerGrid) : o, e.cardinality === "record" && n === 0 && (i += o), 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;
+    i += (c + n * (+(e.detail.header !== !1) + +!!e.detail.label)) * l;
   }
   if (!Number.isSafeInteger(i)) throw new RangeError("报表单元格估算超出安全整数预算");
   return i;
 }
-class ro extends Error {
+class an extends Error {
   constructor(t) {
     super(t.map((r) => r.message).join("；")), this.issues = t, this.name = "ReportValidationError";
   }
 }
-function je(e, t, r) {
+function Le(e, t, r) {
   if (!Number.isSafeInteger(e) || e < 1 || e > r) throw new Error(`校验 ${t} 超出预算`);
   return e;
 }
-function oo(e) {
+function sn(e) {
   if (e.aggregates && e.scope !== "dataset") throw new Error("仅数据集规则允许汇总");
   if (e.aggregates && (!Array.isArray(e.aggregates) || e.aggregates.length > 64)) throw new Error("校验汇总最多 64 项");
   const t = /* @__PURE__ */ new Set();
@@ -883,7 +893,7 @@ function oo(e) {
     t.add(r.field), r.valueField !== void 0 && K(r.valueField), r.weightField !== void 0 && K(r.weightField), Se([], { ...r, field: r.valueField ?? r.field });
   }
 }
-function ht(e) {
+function pt(e) {
   if (!Array.isArray(e) || e.length > 256 || Object.keys(e).length !== e.length) throw new Error("校验规则最多 256 条且不允许空位");
   const t = /* @__PURE__ */ new Set();
   return e.map((r) => {
@@ -892,118 +902,118 @@ function ht(e) {
     if (t.add(r.id), r.field !== void 0 && K(r.field), r.dataset !== void 0 && K(r.dataset), typeof r.message != "string" || !r.message.trim() || r.message.length > 2048) throw new Error("校验规则需要有界提示文案");
     if (r.severity !== void 0 && !["error", "warning"].includes(r.severity)) throw new Error("未知校验严重程度");
     if (r.scope !== void 0 && !["row", "dataset"].includes(r.scope)) throw new Error("未知校验范围");
-    oo(r);
-    const o = { nodes: 0 }, n = L(r.assert, o), a = r.when ? L(r.when, o) : void 0;
-    return { rule: r, assert: n, when: a, checks: o.nodes };
+    sn(r);
+    const n = { nodes: 0 }, o = H(r.assert, n), a = r.when ? H(r.when, n) : void 0;
+    return { rule: r, assert: o, when: a, checks: n.nodes };
   });
 }
-function Le(e) {
+function He(e) {
   if (e?.aborted) {
     const t = new Error("报表校验已取消");
     throw t.name = "AbortError", t;
   }
 }
-function no(e, t, r, o) {
-  const n = o && Object.prototype.hasOwnProperty.call(t, o) ? t[o] : void 0;
-  if (n !== void 0 && typeof n != "string" && !(typeof n == "number" && Number.isFinite(n))) throw new Error("校验定位需要稳定的文本或数值业务键");
-  return { ruleId: e.id, rowIndex: r, ...n === void 0 ? {} : { rowKey: n }, field: e.field, severity: e.severity ?? "error", message: e.message };
+function cn(e, t, r, n) {
+  const o = n && Object.prototype.hasOwnProperty.call(t, n) ? t[n] : void 0;
+  if (o !== void 0 && typeof o != "string" && !(typeof o == "number" && Number.isFinite(o))) throw new Error("校验定位需要稳定的文本或数值业务键");
+  return { ruleId: e.id, rowIndex: r, ...o === void 0 ? {} : { rowKey: o }, field: e.field, severity: e.severity ?? "error", message: e.message };
 }
-function ao(e, t) {
+function ln(e, t) {
   const r = t.computed?.length ? { fields: t.computed, formula: t.formula, signal: t.signal } : void 0;
   if (t.tree) {
-    const n = Ye(e, t.tree, { signal: t.signal, computed: r });
-    if (n.rows.length > 1e5) throw new Error("校验展开后数据最多 100000 行");
-    return { rows: n.rows, summaryRows: n.leaves, rowKey: t.tree.idField };
+    const o = Qe(e, t.tree, { signal: t.signal, computed: r });
+    if (o.rows.length > 1e5) throw new Error("校验展开后数据最多 100000 行");
+    return { rows: o.rows, summaryRows: o.leaves, rowKey: t.tree.idField };
   }
-  const o = r ? Me(e, r).rows : e;
-  return { rows: o, summaryRows: o, rowKey: t.rowKey };
+  const n = r ? Me(e, r).rows : e;
+  return { rows: n, summaryRows: n, rowKey: t.rowKey };
 }
-function so(e, t) {
+function dn(e, t) {
   const r = /* @__PURE__ */ new Set();
-  e.forEach((o) => {
-    if (!o || typeof o != "object" || Array.isArray(o)) throw new Error("校验数据行应为对象");
+  e.forEach((n) => {
+    if (!n || typeof n != "object" || Array.isArray(n)) throw new Error("校验数据行应为对象");
     if (!t) return;
-    const n = Object.prototype.hasOwnProperty.call(o, t) ? o[t] : void 0;
-    if (!(typeof n == "string" && n.trim()) && !(typeof n == "number" && Number.isFinite(n))) throw new Error("校验定位需要稳定业务键");
-    if (r.has(n)) throw new Error("校验业务键重复");
-    r.add(n);
+    const o = Object.prototype.hasOwnProperty.call(n, t) ? n[t] : void 0;
+    if (!(typeof o == "string" && o.trim()) && !(typeof o == "number" && Number.isFinite(o))) throw new Error("校验定位需要稳定业务键");
+    if (r.has(o)) throw new Error("校验业务键重复");
+    r.add(o);
   });
 }
-function mn(e, t) {
-  return gt(e, t, { checks: 0 });
+function po(e, t) {
+  return wt(e, t, { checks: 0 });
 }
-function gt(e, t, r) {
+function wt(e, t, r) {
   if (!Array.isArray(e) || e.length > 1e5) throw new Error("校验数据最多 100000 行");
-  Le(t.signal);
-  const o = je(t.maxChecks ?? 2e6, "maxChecks", 1e7), n = je(t.maxIssues ?? 1e3, "maxIssues", 1e4);
+  He(t.signal);
+  const n = Le(t.maxChecks ?? 2e6, "maxChecks", 1e7), o = Le(t.maxIssues ?? 1e3, "maxIssues", 1e4);
   t.rowKey !== void 0 && K(t.rowKey);
-  const a = ao(e, t), { rows: s, summaryRows: i, rowKey: c } = a;
-  so(s, c);
-  const l = ht(t.rules), d = l.reduce((u, h) => u + (h.rule.scope === "dataset" ? h.checks + i.length * (h.rule.aggregates?.length ?? 0) : s.length * h.checks), 0);
-  if (r.checks += d, r.checks > o) throw new Error("整批校验超出 maxChecks 预算");
+  const a = ln(e, t), { rows: s, summaryRows: i, rowKey: c } = a;
+  dn(s, c);
+  const l = pt(t.rules), d = l.reduce((u, h) => u + (h.rule.scope === "dataset" ? h.checks + i.length * (h.rule.aggregates?.length ?? 0) : s.length * h.checks), 0);
+  if (r.checks += d, r.checks > n) throw new Error("整批校验超出 maxChecks 预算");
   const f = [];
   for (const u of l)
     (u.rule.scope === "dataset" ? [Object.fromEntries((u.rule.aggregates ?? []).map((m) => [m.field, Se(i, { ...m, field: m.valueField ?? m.field })]))] : s).forEach((m, v) => {
-      if (Le(t.signal), !m || typeof m != "object" || Array.isArray(m)) throw new Error("校验数据行应为对象");
+      if (He(t.signal), !m || typeof m != "object" || Array.isArray(m)) throw new Error("校验数据行应为对象");
       if (!(u.when && !u.when(m) || u.assert(m))) {
-        if (f.length >= n) throw new Error("校验问题超出 maxIssues 预算，请缩小范围");
-        f.push(no(u.rule, m, u.rule.scope === "dataset" ? void 0 : v, u.rule.scope === "dataset" ? void 0 : c));
+        if (f.length >= o) throw new Error("校验问题超出 maxIssues 预算，请缩小范围");
+        f.push(cn(u.rule, m, u.rule.scope === "dataset" ? void 0 : v, u.rule.scope === "dataset" ? void 0 : c));
       }
     });
   return f;
 }
-function io(e, t = "allow") {
+function un(e, t = "allow") {
   if (!["allow", "block"].includes(t)) throw new Error("未知校验警告策略");
   if (!Array.isArray(e) || e.length > 1e4 || e.some((r) => !r || !["error", "warning"].includes(r.severity) || typeof r.ruleId != "string" || !r.ruleId.trim() || typeof r.message != "string" || !r.message.trim())) throw new Error("校验问题结构无效");
-  if (e.some((r) => r.severity === "error" || t === "block")) throw new ro(e);
+  if (e.some((r) => r.severity === "error" || t === "block")) throw new an(e);
 }
-function He(e, t, r) {
-  const o = e.get(t);
-  if (o && JSON.stringify(o) !== JSON.stringify(r)) throw new Error("同一数据集的校验计算/业务键存在歧义，请统一绑定");
+function De(e, t, r) {
+  const n = e.get(t);
+  if (n && JSON.stringify(n) !== JSON.stringify(r)) throw new Error("同一数据集的校验计算/业务键存在歧义，请统一绑定");
   e.set(t, r);
 }
-function co(e, t, r, o = []) {
-  ht(t.rules);
-  const n = [], a = { checks: 0 };
+function fn(e, t, r, n = []) {
+  pt(t.rules);
+  const o = [], a = { checks: 0 };
   for (const [i, c] of e.entries()) {
     const l = /* @__PURE__ */ new Map();
     for (const d of c.template.pages) for (const f of d.components)
-      f.kind === "list" && (He(l, f.dataset, { rowKey: f.tree?.idField ?? f.rowKey, computed: f.computed, tree: f.tree }), f.detail && He(l, f.detail.dataset, { rowKey: f.detail.rowKey }));
+      f.kind === "list" && (De(l, f.dataset, { rowKey: f.tree?.idField ?? f.rowKey, computed: f.computed, tree: f.tree }), f.detail && De(l, f.detail.dataset, { rowKey: f.detail.rowKey }));
     for (const [d, f] of l) {
       const u = t.rules.filter((h) => !h.dataset || h.dataset === d);
-      if (u.length && (n.push(...gt(c.datasets[d] ?? [], { ...t, rules: u, ...f, formula: o[i], signal: r }, a).map((h) => ({ ...h, dataset: d, sourceScope: c.sourceScope }))), n.length > (t.maxIssues ?? 1e3)))
+      if (u.length && (o.push(...wt(c.datasets[d] ?? [], { ...t, rules: u, ...f, formula: n[i], signal: r }, a).map((h) => ({ ...h, dataset: d, sourceScope: c.sourceScope }))), o.length > (t.maxIssues ?? 1e3)))
         throw new Error("整批候选校验问题超出 maxIssues 预算");
     }
   }
   const s = new Set(e.flatMap((i) => i.template.pages.flatMap((c) => c.components.flatMap((l) => l.kind === "list" ? [l.dataset, ...l.detail ? [l.detail.dataset] : []] : []))));
   if (t.rules.some((i) => i.dataset && !s.has(i.dataset))) throw new Error("校验目标数据集不存在");
-  return n;
+  return o;
 }
-function pt(e) {
+function yt(e) {
   return !e || typeof e != "object" ? !1 : [e.pageIndex, e.componentIndex, e.rowIndex, e.columnIndex].every((t) => Number.isInteger(t) && t >= 0);
 }
-function wt(e, t, r) {
-  const o = e.grid;
-  if (!o) return null;
-  const n = o.cells[t];
+function bt(e, t, r) {
+  const n = e.grid;
   if (!n) return null;
-  const s = oe(o, e.widthMm, e.heightMm).cells.filter((c) => c.ri === t).findIndex((c) => c.ci === r), i = n[s];
+  const o = n.cells[t];
+  if (!o) return null;
+  const s = re(n, e.widthMm, e.heightMm).cells.filter((c) => c.ri === t).findIndex((c) => c.ci === r), i = o[s];
   return i ? { cell: i, sourceColumnIndex: s } : null;
 }
-function lo(e) {
+function mn(e) {
   return e.value !== void 0 ? e.value : e.rawText ?? e.text ?? null;
 }
-function uo(e, t) {
+function hn(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 fo(e, t) {
+function gn(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 mo(e, t) {
+function pn(e, t) {
   const r = e.table;
   if (r)
     return {
@@ -1013,54 +1023,54 @@ function mo(e, t) {
       columnKey: r.columnKeys[t.columnIndex]
     };
 }
-function ho(e, t, r) {
+function wn(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 };
+  const n = t.table?.source, o = t.table?.columnKeys[r.columnIndex];
+  if (!(!n || n.rowKey === void 0 || o === void 0))
+    return { ...n, rowKey: n.rowKey, field: o };
 }
-function yt(e, t, r) {
-  const o = lo(r), n = fo(r, e);
+function vt(e, t, r) {
+  const n = mn(r), o = gn(r, e);
   return {
     address: { ...t },
     cell: r,
     component: e,
-    value: o,
-    valueType: uo(r, o),
-    table: mo(e, t),
-    source: ho(r, e, t),
-    editable: n === void 0,
-    readOnlyReason: n
+    value: n,
+    valueType: hn(r, n),
+    table: pn(e, t),
+    source: wn(r, e, t),
+    editable: o === void 0,
+    readOnlyReason: o
   };
 }
 function $e(e, t) {
-  if (!pt(t)) return null;
+  if (!yt(t)) return null;
   const r = e.pages[t.pageIndex]?.components[t.componentIndex];
   if (!r) return null;
-  const o = wt(r, t.rowIndex, t.columnIndex);
-  return o ? yt(r, t, o.cell) : null;
+  const n = bt(r, t.rowIndex, t.columnIndex);
+  return n ? vt(r, t, n.cell) : null;
 }
-function H(e) {
+function D(e) {
   const t = /* @__PURE__ */ new Map();
   return (r) => {
-    if (!pt(r)) return null;
-    const o = e.pages[r.pageIndex]?.components[r.componentIndex];
-    if (!o?.grid) return null;
-    let n = t.get(o);
-    if (!n) {
+    if (!yt(r)) return null;
+    const n = e.pages[r.pageIndex]?.components[r.componentIndex];
+    if (!n?.grid) return null;
+    let o = t.get(n);
+    if (!o) {
       const s = /* @__PURE__ */ new Map();
-      n = /* @__PURE__ */ new Map();
-      for (const i of oe(o.grid, o.widthMm, o.heightMm).cells) {
+      o = /* @__PURE__ */ new Map();
+      for (const i of re(n.grid, n.widthMm, n.heightMm).cells) {
         const c = s.get(i.ri) ?? 0;
         s.set(i.ri, c + 1);
-        const l = o.grid.cells[i.ri]?.[c];
-        l && n.set(`${i.ri}:${i.ci}`, l);
+        const l = n.grid.cells[i.ri]?.[c];
+        l && o.set(`${i.ri}:${i.ci}`, l);
       }
-      t.set(o, n);
+      t.set(n, o);
     }
-    const a = n.get(`${r.rowIndex}:${r.columnIndex}`);
-    return a ? yt(o, r, a) : null;
+    const a = o.get(`${r.rowIndex}:${r.columnIndex}`);
+    return a ? vt(n, r, a) : null;
   };
 }
 class M extends Error {
@@ -1068,20 +1078,20 @@ class M extends Error {
     super(`Invalid report cell edit: ${t}`), this.code = t, this.name = "ReportCellEditError";
   }
 }
-function go(e, t) {
+function yn(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 M("number");
-  return Number(r) / (o ? 100 : 1);
+  const n = t && r.endsWith("%");
+  if (n && (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 M("number");
+  return Number(r) / (n ? 100 : 1);
 }
-function po(e, t) {
+function bn(e, t) {
   if (e === null || typeof e == "string" && e.trim() === "") return null;
   if (typeof e != "string" && typeof e != "number") throw new M("number");
-  const r = typeof e == "number" ? e : go(e, dr(t.cell.numberFormat));
+  const r = typeof e == "number" ? e : yn(e, fr(t.cell.numberFormat));
   if (!Number.isFinite(r) || Number.isInteger(r) && !Number.isSafeInteger(r)) throw new M("number");
   return r;
 }
-function wo(e) {
+function vn(e) {
   if (e === null || typeof e == "string" && e.trim() === "") return null;
   if (typeof e == "boolean") return e;
   const t = String(e).trim().toLowerCase();
@@ -1089,24 +1099,24 @@ function wo(e) {
   if (["false", "no", "否", "0"].includes(t)) return !1;
   throw new M("boolean");
 }
-function bt(e, t) {
-  return e.valueType === "number" ? po(t, e) : e.valueType === "boolean" ? wo(t) : t === null ? null : String(t);
+function Mt(e, t) {
+  return e.valueType === "number" ? bn(t, e) : e.valueType === "boolean" ? vn(t) : t === null ? null : String(t);
 }
-function yo(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 Mn(e, t) {
+  const r = t.cell.text, o = [["是", "否"], ["TRUE", "FALSE"], ["True", "False"], ["true", "false"], ["1", "0"]].find((a) => a.includes(r ?? ""));
+  return o ? o[e ? 0 : 1] : String(e);
 }
-function _(e, t) {
-  return t === null ? "" : typeof t == "boolean" ? yo(t, e) : typeof t == "number" ? lr(t, e.cell.numberFormat) : String(t);
+function q(e, t) {
+  return t === null ? "" : typeof t == "boolean" ? Mn(t, e) : typeof t == "number" ? ur(t, e.cell.numberFormat) : String(t);
 }
-function hn(e, t, r) {
-  const o = $e(e, t);
-  if (!o) throw new M("missing");
-  return q(o, r);
+function wo(e, t, r) {
+  const n = $e(e, t);
+  if (!n) throw new M("missing");
+  return U(n, r);
 }
-function q(e, t) {
+function U(e, t) {
   if (!e.editable) throw new M("readonly");
-  const r = bt(e, t);
+  const r = Mt(e, t);
   return {
     address: { ...e.address },
     table: e.table,
@@ -1114,136 +1124,136 @@ function q(e, t) {
     previousValue: e.value,
     previousText: e.cell.text ?? "",
     value: r,
-    text: _(e, r)
+    text: q(e, r)
   };
 }
-function bo(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 Sn(e, t) {
+  const r = e.table, n = t.table;
+  return !r || !n || r.columnKey === void 0 ? !1 : r.id === n.id && r.rowIndex === n.rowIndex && r.role === n.role && r.columnKey === n.columnKey;
 }
-function vt(e, t, r) {
-  const o = e.grid, { rowIndex: n, columnIndex: a } = t.address, s = wt(e, n, a), i = [...o.cells], c = [...i[n]], l = _(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 St(e, t, r) {
+  const n = e.grid, { rowIndex: o, columnIndex: a } = t.address, s = bt(e, o, a), i = [...n.cells], c = [...i[o]], l = q(t, r.value), d = { ...s.cell, value: r.value, text: l, rawText: l };
+  return c[s.sourceColumnIndex] = d, i[o] = c, { ...e, grid: { ...n, cells: i } };
 }
-function vo(e, t) {
-  const r = e.table?.columnKeys, o = t.table?.columnKey;
-  return r && o !== void 0 ? r.flatMap((n, a) => n === o ? [a] : []) : [];
+function xn(e, t) {
+  const r = e.table?.columnKeys, n = t.table?.columnKey;
+  return r && n !== void 0 ? r.flatMap((o, a) => o === n ? [a] : []) : [];
 }
-function Mo(e, t, r, o, n, a) {
-  const s = t.table, i = n.table;
+function Cn(e, t, r, n, o, a) {
+  const s = t.table, i = o.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 l = t;
-  for (const d of vo(t, n)) {
-    const f = $e(e, { pageIndex: r, componentIndex: o, rowIndex: c, columnIndex: d });
-    f?.editable && bo(n, f) && (l = vt(l, f, a));
+  for (const d of xn(t, o)) {
+    const f = $e(e, { pageIndex: r, componentIndex: n, rowIndex: c, columnIndex: d });
+    f?.editable && Sn(o, f) && (l = St(l, f, a));
   }
   return l;
 }
-function So(e, t, r, o, n, a) {
-  const s = n.address;
-  return n.table?.columnKey !== void 0 ? Mo(e, t, r, o, n, a) : s.pageIndex === r && s.componentIndex === o ? vt(t, n, a) : t;
+function kn(e, t, r, n, o, a) {
+  const s = o.address;
+  return o.table?.columnKey !== void 0 ? Cn(e, t, r, n, o, a) : s.pageIndex === r && s.componentIndex === n ? St(t, o, a) : t;
 }
 function Ie(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]));
+  const n = e.source;
+  return !n || ["sourceScope", "datasetId", "rowKey", "field", "revision", "sourceToken"].some((o) => !Object.is(n[o], r[o]));
 }
-function gn(e, t) {
+function yo(e, t) {
   const r = $e(e, t.address);
   if (!r) throw new M("missing");
   if (!r.editable) throw new M("readonly");
   if (Ie(r, t)) throw new M("conflict");
   if (!Object.is(r.value, t.previousValue) || (r.cell.text ?? "") !== t.previousText) throw new M("conflict");
-  const o = bt(r, t.value), n = { ...t, value: o, text: _(r, o) };
-  if (Object.is(o, r.value) && n.text === r.cell.text) return e;
+  const n = Mt(r, t.value), o = { ...t, value: n, text: q(r, n) };
+  if (Object.is(n, r.value) && o.text === r.cell.text) return e;
   const a = e.pages.map((s, i) => {
-    const c = s.components.map((l, d) => So(e, l, i, d, r, n));
+    const c = s.components.map((l, d) => kn(e, l, i, d, r, o));
     return c.every((l, d) => l === s.components[d]) ? s : { ...s, components: c };
   });
   return { ...e, pages: a };
 }
-function Mt(e) {
+function xt(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] ?? [] } }));
+  for (const r of e.template.pages) for (const n of r.components)
+    n.kind === "list" && (t.push(n.tree ? { ...n, rowKey: n.tree.idField } : n), n.detail && t.push({ ...n.detail, relation: { detail: n.detail, parentRows: e.datasets[n.dataset] ?? [] } }));
   return t;
 }
-function D(e) {
+function B(e) {
   return JSON.stringify([e.sourceScope, e.datasetId]);
 }
-function De(e) {
+function Be(e) {
   return JSON.stringify([e.sourceScope, e.datasetId, e.rowKey]);
 }
-function St(e) {
+function Ct(e) {
   const t = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Set();
-  return e.forEach((o, n) => {
-    for (const a of Mt(o)) {
+  return e.forEach((n, o) => {
+    for (const a of xt(n)) {
       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, l) => {
+      (n.datasets[a.dataset] ?? []).forEach((c, l) => {
         if (s && !i.has(JSON.stringify(c[s.detail.foreignKey]))) return;
         const d = c[a.rowKey];
         if (typeof d != "string" && typeof d != "number") return;
-        const f = `${n}:${a.dataset}:${l}:${a.rowKey}`;
+        const f = `${o}:${a.dataset}:${l}:${a.rowKey}`;
         if (r.has(f)) return;
         r.add(f);
-        const u = De({ sourceScope: o.sourceScope, datasetId: a.dataset, rowKey: d }), h = t.get(u) ?? [];
-        h.push({ partIndex: n, dataset: a.dataset, rowIndex: l, row: c, binding: a }), t.set(u, h);
+        const u = Be({ sourceScope: n.sourceScope, datasetId: a.dataset, rowKey: d }), h = t.get(u) ?? [];
+        h.push({ partIndex: o, dataset: a.dataset, rowIndex: l, row: c, binding: a }), t.set(u, h);
       });
     }
-  }), (o) => {
-    const n = t.get(De(o));
-    if (!n?.length) throw new M("missing");
-    if (new Set(n.map((a) => `${a.partIndex}:${a.dataset}`)).size !== n.length) throw new M("conflict");
-    return n;
+  }), (n) => {
+    const o = t.get(Be(n));
+    if (!o?.length) throw new M("missing");
+    if (new Set(o.map((a) => `${a.partIndex}:${a.dataset}`)).size !== o.length) throw new M("conflict");
+    return o;
   };
 }
-function xt(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 = 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 };
+function kt(e, t) {
+  const r = e.map((o) => ({ ...o, datasets: { ...o.datasets } })), n = /* @__PURE__ */ new Set();
+  for (const { row: o, field: a, value: s } of t) {
+    const i = r[o.partIndex], c = JSON.stringify([o.partIndex, o.dataset]);
+    n.has(c) || (i.datasets[o.dataset] = [...i.datasets[o.dataset]], n.add(c)), i.datasets[o.dataset][o.rowIndex] = { ...i.datasets[o.dataset][o.rowIndex], [a]: s };
   }
-  for (const n of o) {
-    const [a, s] = JSON.parse(n);
-    Wt(e[a].datasets[s], r[a].datasets[s]);
+  for (const o of n) {
+    const [a, s] = JSON.parse(o);
+    zt(e[a].datasets[s], r[a].datasets[s]);
   }
   return r;
 }
-function xo(e, t, r) {
-  const o = [], n = /* @__PURE__ */ new Set();
+function Tn(e, t, r) {
+  const n = [], o = /* @__PURE__ */ new Set();
   return e.forEach((a, s) => {
-    for (const i of Mt(a))
-      t.has(D({ sourceScope: a.sourceScope, datasetId: i.dataset })) && (a.datasets[i.dataset] ?? []).forEach((c, l) => {
+    for (const i of xt(a))
+      t.has(B({ 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 h = `${s}:${i.dataset}:${l}:${f}`;
-          n.has(h) || (n.add(h), o.push({ row: d, field: f, value: u }));
+          o.has(h) || (o.add(h), n.push({ row: d, field: f, value: u }));
         }
       });
-  }), o;
+  }), n;
 }
-function Co(e, t, r) {
+function Pn(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 ? [D(n.source)] : []));
-  return Ct(e, new Map([...o].map((n) => [n, r])));
+  const n = new Set(t.edits.flatMap((o) => o.source ? [B(o.source)] : []));
+  return Tt(e, new Map([...n].map((o) => [o, r])));
 }
-function Ct(e, t) {
+function Tt(e, t) {
   if (!t.size) return e;
   function r(a) {
-    const s = a.datasetId && t.get(D({ ...a, datasetId: a.datasetId }));
+    const s = a.datasetId && t.get(B({ ...a, datasetId: a.datasetId }));
     return !s || (s.revision === void 0 || Object.is(s.revision, a.revision)) && (s.sourceToken === void 0 || s.sourceToken === a.sourceToken) ? a : { ...a, ...s.revision !== void 0 ? { revision: s.revision } : {}, ...s.sourceToken !== void 0 ? { sourceToken: s.sourceToken } : {} };
   }
-  function o(a) {
+  function n(a) {
     const s = a.map((i) => {
       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 h = u.map((m) => {
           if (!m) return m;
-          const v = m.source ? r(m.source) : void 0, y = m.children ? o(m.children) : void 0;
+          const v = m.source ? r(m.source) : void 0, y = m.children ? n(m.children) : void 0;
           return v === m.source && y === m.children ? m : { ...m, source: v, children: y };
         });
         return h.some((m, v) => m !== u[v]) ? h : u;
@@ -1252,32 +1262,32 @@ function Ct(e, t) {
     });
     return s.some((i, c) => i !== a[c]) ? s : a;
   }
-  const n = e.pages.map((a) => {
-    const s = o(a.components);
+  const o = e.pages.map((a) => {
+    const s = n(a.components);
     return s !== a.components ? { ...a, components: s } : a;
   });
-  return n.some((a, s) => a !== e.pages[s]) ? { ...e, pages: n } : e;
+  return o.some((a, s) => a !== e.pages[s]) ? { ...e, pages: o } : e;
 }
-function ko(e) {
+function En(e) {
   return JSON.stringify([e.pageIndex, e.componentIndex, e.rowIndex, e.columnIndex]);
 }
-function Be(e) {
+function Ge(e) {
   const t = e.table;
-  return t?.columnKey !== void 0 ? JSON.stringify([t.id, t.role, t.rowIndex, t.columnKey]) : ko(e.address);
+  return t?.columnKey !== void 0 ? JSON.stringify([t.id, t.role, t.rowIndex, t.columnKey]) : En(e.address);
 }
-function Eo(e, t) {
+function Rn(e, t) {
   if (!t.length) return e;
-  const r = new Map(t.map((c) => [Be(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 = H(e);
+  const r = new Map(t.map((c) => [Ge(c), c])), n = new Set(t.flatMap((c) => c.table ? [c.table.id] : [])), o = new Set(t.map((c) => `${c.address.pageIndex}:${c.address.componentIndex}`)), a = D(e);
   function s(c, l, d) {
     const f = c.grid;
-    if (!f || !n.has(`${l}:${d}`) && !o.has(c.table?.id ?? "")) return c;
+    if (!f || !o.has(`${l}:${d}`) && !n.has(c.table?.id ?? "")) return c;
     const u = /* @__PURE__ */ new Map(), h = /* @__PURE__ */ new Map();
-    for (const m of oe(f, c.widthMm, c.heightMm).cells) {
+    for (const m of re(f, c.widthMm, c.heightMm).cells) {
       const v = h.get(m.ri) ?? 0;
       h.set(m.ri, v + 1);
-      const y = a({ pageIndex: l, componentIndex: d, rowIndex: m.ri, columnIndex: m.ci }), g = y && r.get(Be(y));
+      const y = a({ pageIndex: l, componentIndex: d, rowIndex: m.ri, columnIndex: m.ci }), g = y && r.get(Ge(y));
       if (!g || !y.editable) continue;
-      const w = u.get(m.ri) ?? [...f.cells[m.ri]], x = _(y, g.value);
+      const w = u.get(m.ri) ?? [...f.cells[m.ri]], x = q(y, g.value);
       Object.is(y.value, g.value) && x === y.cell.text || (w[v] = { ...m.cell, value: g.value, text: x, rawText: x }, u.set(m.ri, w));
     }
     return u.size ? { ...c, grid: { ...f, cells: f.cells.map((m, v) => u.get(v) ?? m) } } : c;
@@ -1293,55 +1303,55 @@ function F(e) {
   if (t) return JSON.stringify([t.sourceScope, t.datasetId, t.rowKey, t.field]);
   const r = e.table;
   if (r?.columnKey !== void 0) return JSON.stringify([r.id, r.role, r.rowIndex, r.columnKey]);
-  const o = e.address;
-  return JSON.stringify([o.pageIndex, o.componentIndex, o.rowIndex, o.columnIndex]);
+  const n = e.address;
+  return JSON.stringify([n.pageIndex, n.componentIndex, n.rowIndex, n.columnIndex]);
 }
-function pn(e, t, r) {
+function bo(e, t, r) {
   if (typeof r != "string" || !r.trim() || !Array.isArray(t)) throw new M("missing");
   if (t.length > 1e4) throw new M("limit");
-  const o = /* @__PURE__ */ new Set(), n = H(e), a = t.map(({ address: s, value: i }) => {
-    const c = n(s);
+  const n = /* @__PURE__ */ new Set(), o = D(e), a = t.map(({ address: s, value: i }) => {
+    const c = o(s);
     if (!c) throw new M("missing");
-    const l = q(c, i), d = F(l);
-    if (o.has(d)) throw new M("duplicate");
-    return o.add(d), l;
+    const l = U(c, i), d = F(l);
+    if (n.has(d)) throw new M("duplicate");
+    return n.add(d), l;
   });
   return { requestId: r, edits: a };
 }
-function wn(e, t) {
+function vo(e, t) {
   if (t.edits.length > 1e4) throw new M("limit");
-  const r = H(e), o = /* @__PURE__ */ new Set(), n = t.edits.map((a) => {
+  const r = D(e), n = /* @__PURE__ */ new Set(), o = t.edits.map((a) => {
     const s = r(a.address);
     if (!s) throw new M("missing");
     const i = F(a);
-    if (o.has(i)) throw new M("duplicate");
-    if (o.add(i), Ie(s, a) || !Object.is(s.value, a.previousValue) || (s.cell.text ?? "") !== a.previousText) throw new M("conflict");
-    return q(s, a.value);
+    if (n.has(i)) throw new M("duplicate");
+    if (n.add(i), Ie(s, a) || !Object.is(s.value, a.previousValue) || (s.cell.text ?? "") !== a.previousText) throw new M("conflict");
+    return U(s, a.value);
   });
-  return Eo(e, n);
+  return Rn(e, o);
 }
-function yn(e) {
+function Mo(e) {
   const t = /* @__PURE__ */ new Map();
   for (const r of e) {
-    const o = F(r), n = t.get(o), a = n ? { ...r, previousValue: n.previousValue, previousText: n.previousText } : { ...r };
-    Object.is(a.previousValue, a.value) ? t.delete(o) : t.set(o, a);
+    const n = F(r), o = t.get(n), a = o ? { ...r, previousValue: o.previousValue, previousText: o.previousText } : { ...r };
+    Object.is(a.previousValue, a.value) ? t.delete(n) : t.set(n, a);
   }
   return [...t.values()];
 }
-function kt(e) {
-  const t = /* @__PURE__ */ new Map(), r = H(e);
-  return e.pages.forEach((o, n) => o.components.forEach((a, s) => {
+function Pt(e) {
+  const t = /* @__PURE__ */ new Map(), r = D(e);
+  return e.pages.forEach((n, o) => n.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 l = r({ pageIndex: n, componentIndex: s, rowIndex: i, columnIndex: c });
+        const l = r({ pageIndex: o, componentIndex: s, rowIndex: i, columnIndex: c });
         l?.source && l.editable && t.set(F(l), l);
       }
   })), t;
 }
-function bn(e, t, r) {
-  const o = kt(e), n = H(e);
+function So(e, t, r) {
+  const n = Pt(e), o = D(e);
   return t.map((a) => {
-    const s = a.source ? o.get(F(a)) : n(a.address);
+    const s = a.source ? n.get(F(a)) : o(a.address);
     if (!s || F(s) !== F(a)) throw new M("missing");
     return { address: { ...s.address }, value: a[r] };
   });
@@ -1354,7 +1364,7 @@ function ee(e, t) {
   if (!r || r.get || r.set) throw new M("conflict");
   return r.value;
 }
-function Tt(e) {
+function Fe(e) {
   if (Object.getOwnPropertyDescriptor(e, "toJSON")) throw new M("conflict");
   const t = Object.getPrototypeOf(e);
   if (Array.isArray(e) && (t !== Array.prototype || Object.keys(e).length !== e.length)) throw new M("conflict");
@@ -1365,10 +1375,10 @@ function Tt(e) {
       if (e instanceof Date || Array.isArray(e) && !/^(0|[1-9]\d*)$/.test(r)) throw new M("conflict");
     }
 }
-function Pt(e, t, r, o, n) {
-  if (Et(o, n), typeof e == "function" || typeof e == "symbol") throw new M("conflict");
+function Rt(e, t, r, n, o) {
+  if (Et(n, o), typeof e == "function" || typeof e == "symbol") throw new M("conflict");
   if (e === null || typeof e != "object") return;
-  if (Tt(e), r.has(e)) throw new M("conflict");
+  if (Fe(e), r.has(e)) throw new M("conflict");
   r.add(e);
   const a = Object.keys(e), s = a.map((i) => ee(e, i));
   t.push({
@@ -1379,139 +1389,139 @@ function Pt(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) Pt(i, t, r, o, n + 1);
+  for (const i of s) Rt(i, t, r, n, o + 1);
   r.delete(e);
 }
-function To(e) {
-  const { object: t, keys: r, values: o } = e;
-  if (Tt(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(ee(t, a), o[s]));
+function $n(e) {
+  const { object: t, keys: r, values: n } = e;
+  if (Fe(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 o = Object.keys(t);
+  return o.length === r.length && r.every((a, s) => o[s] === a && Object.is(ee(t, a), n[s]));
 }
-function Po(e) {
+function In(e) {
   const t = [];
-  return Pt(e, t, /* @__PURE__ */ new Set(), { nodes: 0 }, 0), () => {
+  return Rt(e, t, /* @__PURE__ */ new Set(), { nodes: 0 }, 0), () => {
     try {
-      return t.every(To);
+      return t.every($n);
     } catch {
       return !1;
     }
   };
 }
-function ge(e, t, r) {
-  if (Et(t, r), e === null || typeof e != "object") return e;
+function te(e, t, r, n = !1) {
+  if (Et(t, r), n) {
+    if (typeof e == "function" || typeof e == "symbol") throw new M("conflict");
+    e !== null && typeof e == "object" && Fe(e);
+  }
+  if (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] = ge(ee(e, String(n)), t, r + 1);
+    for (let a = 0; a < e.length; a++) o[a] = te(ee(e, String(a)), t, r + 1, n);
     return o;
   }
-  return Object.fromEntries(Object.keys(e).map((o) => [o, ge(ee(e, o), t, r + 1)]));
+  return Object.fromEntries(Object.keys(e).map((o) => [o, te(ee(e, o), t, r + 1, n)]));
+}
+function Fn(e) {
+  return te(e, { nodes: 0 }, 0, !0);
 }
-function Ro(e) {
-  const t = ge(e, { nodes: 0 }, 0);
-  for (const r of t) for (const o of Object.values(r.datasets)) Jt(o);
+function On(e) {
+  const t = te(e, { nodes: 0 }, 0);
+  for (const r of t) for (const n of Object.values(r.datasets)) _t(n);
   return t;
 }
-async function $o(e, t, r = {}) {
-  return (await Rt(e, t, r)).plan;
+async function An(e, t, r = {}) {
+  return (await $t(e, t, r)).plan;
 }
-async function Rt(e, t, r = {}) {
-  const o = [], n = { chartComponents: 0 }, a = { ...r, knownTotalPages: void 0 };
-  for (const s of ft(e, t, a, n))
-    o.push(s), o.length % 8 === 0 && await new Promise((i) => setTimeout(i, 0));
-  if (r.signal?.aborted) {
-    const s = new Error("报表重算已取消");
-    throw s.name = "AbortError", s;
-  }
-  return { plan: { schemaVersion: te, ...ae(e) ? { requiresRecalculation: !0 } : {}, pages: o }, ...n };
+async function $t(e, t, r = {}) {
+  return ht(e, t, { ...r, knownTotalPages: void 0 });
 }
-const pe = /* @__PURE__ */ new WeakMap();
-function vn(e) {
-  return pe.get(e);
+const ge = /* @__PURE__ */ new WeakMap();
+function xo(e) {
+  return ge.get(e);
 }
-function U(e) {
+function X(e) {
   if (e?.aborted) {
     const t = new Error("报表重算已取消");
     throw t.name = "AbortError", t;
   }
 }
-function $t(e, t) {
+function It(e, t) {
   return e[t] === void 0 ? "" : e[t];
 }
-function Io(e, t) {
+function Nn(e, t) {
   if (t.edits.length > 1e4) throw new M("limit");
-  const r = H(e), o = /* @__PURE__ */ new Set(), n = [], a = t.edits.map((s) => {
+  const r = D(e), n = /* @__PURE__ */ new Set(), o = [], a = t.edits.map((s) => {
     const i = r(s.address);
     if (!i?.source) throw new M("missing");
     const c = F(s);
-    if (o.has(c)) throw new M("duplicate");
-    if (o.add(c), Ie(i, s) || !Object.is(i.value, s.previousValue) || (i.cell.text ?? "") !== s.previousText) throw new M("conflict");
-    return n.push(i), q(i, s.value);
+    if (n.has(c)) throw new M("duplicate");
+    if (n.add(c), Ie(i, s) || !Object.is(i.value, s.previousValue) || (i.cell.text ?? "") !== s.previousText) throw new M("conflict");
+    return o.push(i), U(i, s.value);
   });
-  return { batch: { requestId: t.requestId, edits: a }, contexts: n };
-}
-function Fo(e, t) {
-  const r = St(e);
-  return t.flatMap((o) => {
-    if (!o.source) throw new M("missing");
-    return r(o.source).map((n) => {
-      if (!Object.is($t(n.row, o.source.field), o.previousValue)) throw new M("conflict");
-      if (n.binding.rowKey === o.source.field) throw new M("readonly");
-      return { row: n, field: o.source.field, value: o.value };
+  return { batch: { requestId: t.requestId, edits: a }, contexts: o };
+}
+function jn(e, t) {
+  const r = Ct(e);
+  return t.flatMap((n) => {
+    if (!n.source) throw new M("missing");
+    return r(n.source).map((o) => {
+      if (!Object.is(It(o.row, n.source.field), n.previousValue)) throw new M("conflict");
+      if (o.binding.rowKey === n.source.field) throw new M("readonly");
+      return { row: o, field: n.source.field, value: n.value };
     });
   });
 }
 function fe(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: _(o, o.value) }, o;
+  const n = { ...e, value: t, source: { ...e.source, ...r?.revision === void 0 ? {} : { revision: r.revision }, ...r?.sourceToken === void 0 ? {} : { sourceToken: r.sourceToken } } };
+  return n.cell = { ...e.cell, value: n.value, text: q(n, n.value) }, n;
 }
-function Oo(e, t, r) {
+function Kn(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 ? [D(n.source)] : []));
-  return xt(e, xo(e, o, r));
+  const n = new Set(t.edits.flatMap((o) => o.source ? [B(o.source)] : []));
+  return kt(e, Tn(e, n, r));
 }
-function Ao(e, t, r) {
-  const o = new Set(t.edits.map((n) => D(n.source)));
-  for (const n of o) e.set(n, {
-    ...e.get(n),
+function Ln(e, t, r) {
+  const n = new Set(t.edits.map((o) => B(o.source)));
+  for (const o of n) e.set(o, {
+    ...e.get(o),
     ...r.revision !== void 0 ? { revision: r.revision } : {},
     ...r.sourceToken !== void 0 ? { sourceToken: r.sourceToken } : {}
   });
-  return o;
+  return n;
 }
-function It(e, t) {
+function Ft(e, t) {
   let r = t.parts;
-  const o = t.rebuild, n = [...t.validationFormulas ?? []];
-  let a = Po(r), s = e, i;
+  const n = t.rebuild, o = [...t.validationFormulas ?? []];
+  let a = In(r), s = e, i;
   const c = /* @__PURE__ */ new Map(), l = /* @__PURE__ */ new Map();
   function d(h) {
     if (h !== s) throw new M("conflict");
     if (i) return i;
     if (!a?.()) throw new M("conflict");
-    return Ro(r);
+    return On(r);
   }
   async function f(h, m, v, y = {}) {
-    U(y.signal), m = { requestId: m.requestId, edits: m.edits.map((b) => ({ ...b, address: { ...b.address }, source: b.source ? { ...b.source } : void 0, table: b.table ? { ...b.table } : void 0 })) }, v = v.map((b) => ({ ...b, address: { ...b.address }, source: b.source ? { ...b.source } : void 0, table: b.table ? { ...b.table } : void 0, cell: { ...b.cell } })), await new Promise((b) => setTimeout(b, 0)), U(y.signal);
-    const g = d(h), w = xt(g, Fo(g, m.edits)), x = Ct(await o(w, y.signal), l);
-    U(y.signal);
-    let P = !1, E = [], O = "allow", A = !1;
+    X(y.signal), m = { requestId: m.requestId, edits: m.edits.map((b) => ({ ...b, address: { ...b.address }, source: b.source ? { ...b.source } : void 0, table: b.table ? { ...b.table } : void 0 })) }, v = v.map((b) => ({ ...b, address: { ...b.address }, source: b.source ? { ...b.source } : void 0, table: b.table ? { ...b.table } : void 0, cell: { ...b.cell } })), await new Promise((b) => setTimeout(b, 0)), X(y.signal);
+    const g = d(h), w = kt(g, jn(g, m.edits)), x = Tt(await n(w, y.signal), l);
+    X(y.signal);
+    let E = !1, k = [], O = "allow", A = !1;
     function p(b) {
-      return A = !0, E = Object.freeze(co(w, b, y.signal, n).map((S) => Object.freeze({ ...S }))), A = !1, O = b.warningPolicy ?? "allow", E;
+      return A = !0, k = Object.freeze(fn(w, b, y.signal, o).map((S) => Object.freeze({ ...S }))), A = !1, O = b.warningPolicy ?? "allow", k;
     }
     return y.validation && p(y.validation), { plan: x, get validationIssues() {
-      return E;
+      return k;
     }, validate: p, commit(b) {
-      if (U(y.signal), P || s !== h) throw new M("conflict");
+      if (X(y.signal), E || s !== h) throw new M("conflict");
       if (b?.conflicts?.length) throw new M("conflict");
       if (A) throw new Error("候选规则校验未完成，不能提交");
-      io(E, O);
-      const S = Oo(w, m, b), T = Co(x, m, b);
+      un(k, O);
+      const S = Kn(w, m, b), P = Pn(x, m, b);
       if (b) {
-        const k = Ao(l, m, b);
-        for (const [R, j] of c) k.has(D(j.source)) && c.set(R, fe(j, j.value, b));
+        const T = Ln(l, m, b);
+        for (const [R, L] of c) T.has(B(L.source)) && c.set(R, fe(L, L.value, b));
       }
-      return v.forEach((k, R) => c.set(F(k), fe(k, m.edits[R].value, b))), P = !0, i = S, r = void 0, a = void 0, s = T, pe.set(s, u), s;
+      return v.forEach((T, R) => c.set(F(T), fe(T, m.edits[R].value, b))), E = !0, i = S, r = void 0, a = void 0, s = P, ge.set(s, u), s;
     } };
   }
   const u = {
@@ -1519,194 +1529,194 @@ function It(e, t) {
       return s;
     },
     async prepare(h, m, v) {
-      const y = Io(h, m);
+      const y = Nn(h, m);
       return f(h, y.batch, y.contexts, v);
     },
     async prepareHistory(h, m, v, y, g) {
       if (!y.trim() || m.length > 1e4) throw new M("limit");
-      const w = d(h), x = St(w), P = kt(h), E = /* @__PURE__ */ new Set(), A = m.map((S) => {
+      const w = d(h), x = Ct(w), E = Pt(h), k = /* @__PURE__ */ new Set(), A = m.map((S) => {
         if (!S.source) throw new M("missing");
-        const T = F(S);
-        if (E.has(T)) throw new M("duplicate");
-        E.add(T);
-        const k = P.get(T) ?? c.get(T);
-        if (!k?.source) throw new M("missing");
-        const R = x(k.source)[0];
-        return fe(k, $t(R.row, k.source.field));
-      }).map((S, T) => ({ context: S, edit: q(S, m[T][v]) })).filter(({ edit: S }) => !Object.is(S.previousValue, S.value)), p = { requestId: y, edits: A.map(({ edit: S }) => S) }, b = A.map(({ context: S }) => S);
+        const P = F(S);
+        if (k.has(P)) throw new M("duplicate");
+        k.add(P);
+        const T = E.get(P) ?? c.get(P);
+        if (!T?.source) throw new M("missing");
+        const R = x(T.source)[0];
+        return fe(T, It(R.row, T.source.field));
+      }).map((S, P) => ({ context: S, edit: U(S, m[P][v]) })).filter(({ edit: S }) => !Object.is(S.previousValue, S.value)), p = { requestId: y, edits: A.map(({ edit: S }) => S) }, b = A.map(({ context: S }) => S);
       return { batch: p, contexts: b, prepared: await f(h, p, b, g) };
     }
   };
-  return pe.set(e, u), u;
+  return ge.set(e, u), u;
 }
-function Mn(e) {
+function Co(e) {
   const t = mt(e.template, e.datasets, e.pagination).plan;
-  return It(t, { validationFormulas: [e.pagination?.formula], parts: [{ template: e.template, datasets: e.datasets }], rebuild: (r, o) => $o(r[0].template, r[0].datasets, { ...e.pagination, signal: o }) });
+  return Ft(t, { validationFormulas: [e.pagination?.formula], parts: [{ template: e.template, datasets: e.datasets }], rebuild: (r, n) => An(r[0].template, r[0].datasets, { ...e.pagination, signal: n }) });
 }
-let No = 0;
-function Ko() {
-  return `report-${Date.now()}-${++No}`;
+let Hn = 0;
+function Dn() {
+  return `report-${Date.now()}-${++Hn}`;
 }
-function Ge(e, t, r) {
+function We(e, t, r) {
   if (!r?.aborted)
     try {
-      const o = e?.({ ...t });
-      o && typeof o.then == "function" && Promise.resolve(o).catch(() => {
+      const n = e?.({ ...t });
+      n && typeof n.then == "function" && Promise.resolve(n).catch(() => {
       });
     } catch {
     }
 }
-function jo(e) {
-  const t = e.taskId ?? Ko(), r = (o, n, a) => {
-    Ge(e.onEvent, { taskId: t, ...e.correlationId === void 0 ? {} : { correlationId: e.correlationId }, stage: o, status: n, ...a === void 0 ? {} : { reportId: a } }, e.signal);
+function Bn(e) {
+  const t = e.taskId ?? Dn(), r = (n, o, a) => {
+    We(e.onEvent, { taskId: t, ...e.correlationId === void 0 ? {} : { correlationId: e.correlationId }, stage: n, status: o, ...a === void 0 ? {} : { reportId: a } }, e.signal);
   };
   return {
     taskId: t,
-    progress(o, n, a) {
-      Ge(e.onEvent, { taskId: t, ...e.correlationId === void 0 ? {} : { correlationId: e.correlationId }, stage: o, status: "started", completed: n, total: a }, e.signal);
+    progress(n, o, a) {
+      We(e.onEvent, { taskId: t, ...e.correlationId === void 0 ? {} : { correlationId: e.correlationId }, stage: n, status: "started", completed: o, total: a }, e.signal);
     },
-    async run(o, n, a) {
-      r(o, "started", a);
+    async run(n, o, a) {
+      r(n, "started", a);
       try {
-        const s = await n();
-        return r(o, "completed", a), s;
+        const s = await o();
+        return r(n, "completed", a), s;
       } catch (s) {
-        throw r(o, "failed", a), s;
+        throw r(n, "failed", a), s;
       }
     },
-    runSync(o, n, a) {
-      r(o, "started", a);
+    runSync(n, o, a) {
+      r(n, "started", a);
       try {
-        const s = n();
-        return r(o, "completed", a), s;
+        const s = o();
+        return r(n, "completed", a), s;
       } catch (s) {
-        throw r(o, "failed", a), s;
+        throw r(n, "failed", a), s;
       }
     }
   };
 }
-function Ft(e) {
+function Ot(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;
+  const t = e, r = (n) => typeof n == "string" && n.trim().length > 0 && n.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 Lo(e) {
+function Gn(e) {
   return e === "missing-source" || e === "not-applicable" || e === "not-calculable";
 }
-function Ho(e) {
-  return e.target !== void 0 && !Ft(e.target) ? !1 : e.valueState === void 0 || Lo(e.valueState) && e.target !== void 0;
+function Wn(e) {
+  return e.target !== void 0 && !Ot(e.target) ? !1 : e.valueState === void 0 || Gn(e.valueState) && e.target !== void 0;
 }
-function Sn(e, t) {
-  if (Ze([], e), !Ft(t)) throw new Error("数据说明目标无效");
-  const r = e.fields.find((n) => n.field === t.field);
+function ko(e, t) {
+  if (et([], e), !Ot(t)) throw new Error("数据说明目标无效");
+  const r = e.fields.find((o) => o.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;
+  const n = [];
+  return r.description && n.push({ code: "field-definition", severity: "info", message: r.description, target: { ...t } }), r.calculation && n.push({ code: "field-calculation", severity: "info", message: r.calculation.description, target: { ...t } }), n;
 }
-function Ot(e, t, r = {}) {
-  const o = /* @__PURE__ */ new Map();
+function At(e, t, r = {}) {
+  const n = /* @__PURE__ */ new Map();
   for (const a of e.pages) for (const s of a.components) {
     if (s.kind !== "list" || s.tree?.input !== "nested") continue;
-    const i = o.get(s.dataset);
+    const i = n.get(s.dataset);
     if (i && (i.childrenField ?? "children") !== (s.tree.childrenField ?? "children")) throw new Error("同一数据集的嵌套树应使用相同 childrenField");
-    o.set(s.dataset, s.tree);
+    n.set(s.dataset, s.tree);
   }
-  if (!o.size) return t;
-  const n = { ...t };
-  for (const [a, s] of o) {
+  if (!n.size) return t;
+  const o = { ...t };
+  for (const [a, s] of n) {
     const i = Math.min(s.maxRows ?? 1e5, r.maxRows ?? 1 / 0);
-    n[a] = Xe(t[a] ?? [], { ...s, maxRows: i }, r.signal);
+    o[a] = Ye(t[a] ?? [], { ...s, maxRows: i }, r.signal);
   }
-  return n;
+  return o;
 }
-function xn(e, t, r = {}) {
-  return Object.values(Ot(e, t, r)).reduce((o, n) => o + n.length, 0);
+function To(e, t, r = {}) {
+  return Object.values(At(e, t, r)).reduce((n, o) => n + o.length, 0);
 }
-function Cn(e, t, r) {
-  const o = ur(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 Po(e, t, r) {
+  const n = mr(r), o = e?.pages.flatMap((i) => i.components).find((i) => i.kind === "list" && i.dataset === t && i.tree?.input === "nested");
+  if (!o || o.kind !== "list" || !o.tree) return n;
+  const a = n.items, s = o.tree.childrenField ?? "children";
+  return { ...n, items: { $ref: "#/$defs/treeNode" }, $defs: { treeNode: { ...a, properties: { ...a.properties, [s]: { anyOf: [{ type: "null" }, { type: "array", items: { $ref: "#/$defs/treeNode" } }] } } } } };
 }
-function At(e, t) {
+function Nt(e, t) {
   return JSON.stringify([e, t]);
 }
-function Nt(e, t, r) {
-  return r === void 0 ? At(e, t) : JSON.stringify(["shared", r]);
+function jt(e, t, r) {
+  return r === void 0 ? Nt(e, t) : JSON.stringify(["shared", r]);
 }
 function Kt(e, t, r) {
-  return e.map((o) => {
-    const n = o.table ? {
-      ...o.table,
-      id: r(o.table.id),
-      ...o.table.source ? { source: { ...o.table.source, sourceScope: t } } : {}
-    } : void 0, a = o.grid?.cells.map((s) => s.map((i) => !i || !i.source && !i.children ? i : {
+  return e.map((n) => {
+    const o = n.table ? {
+      ...n.table,
+      id: r(n.table.id),
+      ...n.table.source ? { source: { ...n.table.source, sourceScope: t } } : {}
+    } : void 0, a = n.grid?.cells.map((s) => s.map((i) => !i || !i.source && !i.children ? i : {
       ...i,
       ...i.source ? { source: { ...i.source, sourceScope: t } } : {},
       ...i.children ? { children: Kt(i.children, t, r) } : {}
     }));
-    return n || a ? {
-      ...o,
-      ...n ? { table: n } : {},
-      ...a ? { grid: { ...o.grid, cells: a } } : {}
-    } : o;
+    return o || a ? {
+      ...n,
+      ...o ? { table: o } : {},
+      ...a ? { grid: { ...n.grid, cells: a } } : {}
+    } : n;
   });
 }
-function we(e) {
-  return ne(e.maxChartComponents), { maxPages: e.maxPages, maxCells: e.maxCells, maxChartComponents: e.maxChartComponents ?? Ce, usedPages: 0, usedCells: 0, usedChartComponents: 0 };
+function pe(e) {
+  return oe(e.maxChartComponents), { maxPages: e.maxPages, maxCells: e.maxCells, maxChartComponents: e.maxChartComponents ?? Ce, usedPages: 0, usedCells: 0, usedChartComponents: 0 };
 }
-function Do(e, t) {
+function Vn(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 Bo(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 Jn(e) {
+  const t = (r) => r.grid?.cells.reduce((n, o) => n + o.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, n) => r + n.components.reduce((o, a) => o + t(a), 0), 0);
 }
-function ye(e, t) {
+function we(e, t) {
   return e === void 0 ? void 0 : e - t;
 }
 function me(e, t) {
   return e === void 0 ? t : Math.max(1, Math.min(e, t ?? e));
 }
-function jt(e, t, r, o, n) {
-  ne(e?.maxChartComponents);
-  const a = ye(t.maxPages, t.usedPages), s = t.maxChartComponents - t.usedChartComponents;
-  if (a !== void 0 && a < 1 && r.pages.length && !Do(r, o)) throw new G(0, 1);
-  if (s < 1 && r.pages.some((i) => i.components.some((c) => c.kind !== "list" && c.chartBinding))) throw new Y(s, 1);
+function Lt(e, t, r, n, o) {
+  oe(e?.maxChartComponents);
+  const a = we(t.maxPages, t.usedPages), s = t.maxChartComponents - t.usedChartComponents;
+  if (a !== void 0 && a < 1 && r.pages.length && !Vn(r, n)) throw new W(0, 1);
+  if (s < 1 && r.pages.some((i) => i.components.some((c) => c.kind !== "list" && c.chartBinding))) throw new Q(s, 1);
   return {
     ...e,
-    signal: n ?? e?.signal,
+    signal: o ?? e?.signal,
     maxPages: me(a, e?.maxPages),
-    maxCells: me(ye(t.maxCells, t.usedCells), e?.maxCells),
+    maxCells: me(we(t.maxCells, t.usedCells), e?.maxCells),
     maxChartComponents: me(s, e?.maxChartComponents)
   };
 }
-function Lt(e, t) {
-  const r = Bo(t.plan), o = ye(e.maxCells, e.usedCells);
-  if (o !== void 0 && r > o) throw new X(o, r);
+function Ht(e, t) {
+  const r = Jn(t.plan), n = we(e.maxCells, e.usedCells);
+  if (n !== void 0 && r > n) throw new Y(n, r);
   e.usedPages += t.plan.pages.length, e.usedCells += r, e.usedChartComponents += t.chartComponents;
 }
-function Ht(e, t) {
-  return e instanceof G && t.maxPages !== void 0 && (e.limit === t.maxPages - t.usedPages || e.limit === 0) ? new G(t.maxPages, t.usedPages + e.actual) : e instanceof X && t.maxCells !== void 0 ? new X(t.maxCells, t.usedCells + e.actual) : e instanceof Y && e.limit === t.maxChartComponents - t.usedChartComponents ? new Y(t.maxChartComponents, t.usedChartComponents + e.estimated) : e;
+function Dt(e, t) {
+  return e instanceof W && t.maxPages !== void 0 && (e.limit === t.maxPages - t.usedPages || e.limit === 0) ? new W(t.maxPages, t.usedPages + e.actual) : e instanceof Y && t.maxCells !== void 0 ? new Y(t.maxCells, t.usedCells + e.actual) : e instanceof Q && e.limit === t.maxChartComponents - t.usedChartComponents ? new Q(t.maxChartComponents, t.usedChartComponents + e.estimated) : e;
 }
-function kn(e) {
+function Eo(e) {
   if (!("mapData" in e)) return e;
-  const { load: t, mapData: r, ...o } = e;
-  return { ...o, load: async (n) => {
-    const a = await t(n);
-    $(n.signal);
+  const { load: t, mapData: r, ...n } = e;
+  return { ...n, load: async (o) => {
+    const a = await t(o);
+    $(o.signal);
     try {
-      return r(a, n);
+      return r(a, o);
     } catch (s) {
-      throw new C("validate", `报表 ${n.reportId} 数据映射失败`, s);
+      throw new C("validate", `报表 ${o.reportId} 数据映射失败`, s);
     }
   } };
 }
 class C extends Error {
-  constructor(t, r, o) {
-    super(r), this.name = "ReportSourceError", this.code = t, this.cause = o;
+  constructor(t, r, n) {
+    super(r), this.name = "ReportSourceError", this.code = t, this.cause = n;
   }
 }
 function de(e) {
@@ -1716,158 +1726,164 @@ function de(e) {
 function $(e) {
   if (e?.aborted) throw de(e);
 }
-function be(e, t) {
-  return t ? new Promise((r, o) => {
-    const n = () => t.removeEventListener("abort", a), a = () => {
-      n(), o(de(t));
+function ye(e, t) {
+  return t ? new Promise((r, n) => {
+    const o = () => t.removeEventListener("abort", a), a = () => {
+      o(), n(de(t));
     };
     t.addEventListener("abort", a, { once: !0 }), t.aborted && a(), Promise.resolve(e).then(
       (s) => {
-        n(), r(s);
+        o(), r(s);
       },
       (s) => {
-        n(), o(s);
+        o(), n(s);
       }
     );
   }) : Promise.resolve(e);
 }
-function Go(e, t) {
+function zn(e, t) {
   if (!e || typeof e != "object" || Array.isArray(e))
     throw new C("validate", `报表 ${t} 的数据集应为对象`);
-  for (const [r, o] of Object.entries(e))
-    if (!Array.isArray(o) || o.some((n) => !n || typeof n != "object" || Array.isArray(n)))
+  for (const [r, n] of Object.entries(e))
+    if (!Array.isArray(n) || n.some((o) => !o || typeof o != "object" || Array.isArray(o)))
       throw new C("validate", `报表 ${t} 的数据集 ${r} 应为对象数组`);
 }
-async function Vo(e, t, r) {
-  const { reportId: o, signal: n } = t;
+async function _n(e, t, r) {
+  const { reportId: n, signal: o } = t;
   try {
-    const a = await be(e(t), n);
-    $(n);
-    const s = sr(a);
+    const a = await ye(e(t), o);
+    $(o);
+    const s = cr(a);
     if (!s.ok)
-      throw new C("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;
+      throw new C("validate", `报表 ${n} 模板校验失败：${s.errors.slice(0, 3).map((i) => `${i.path}: ${i.message}`).join("; ")}`);
+    return r.push(...s.warnings.map((i) => `${n}: ${i.path}: ${i.message}`)), a;
   } catch (a) {
-    throw n?.aborted ? de(n) : a instanceof C ? a : a instanceof ir ? new C("validate", `报表 ${o} 模板校验失败：${a.message}`, a) : new C("fetch", `报表 ${o} 模板加载失败：${a instanceof Error ? a.message : String(a)}`, a);
+    throw o?.aborted ? de(o) : a instanceof C ? a : a instanceof lr ? new C("validate", `报表 ${n} 模板校验失败：${a.message}`, a) : new C("fetch", `报表 ${n} 模板加载失败：${a instanceof Error ? a.message : String(a)}`, a);
   }
 }
-async function Wo(e, t, r, o) {
-  const n = t.signal;
+async function qn(e, t, r, n) {
+  const o = t.signal;
   let a;
   try {
-    if (e.load) a = await be(e.load(t), n);
+    if (e.load) a = await ye(e.load(t), o);
     else if (e.provider) {
-      const s = await be(e.provider.query(t), n);
-      $(n), Jo(s, r), a = s.datasets, o?.(r, s);
+      const s = await ye(e.provider.query(t), o);
+      $(o), Un(s, r), a = s.datasets, n?.(r, s);
     } else a = e.datasets ?? {};
   } catch (s) {
-    throw n?.aborted ? de(n) : s instanceof C ? s : new C("fetch", `报表 ${r} 取数失败：${s instanceof Error ? s.message : String(s)}`, s);
+    throw o?.aborted ? de(o) : s instanceof C ? s : new C("fetch", `报表 ${r} 取数失败：${s instanceof Error ? s.message : String(s)}`, s);
   }
-  return $(n), a;
+  return $(o), a;
 }
-function Jo(e, t) {
+function Un(e, t) {
   if (!e || typeof e != "object" || Array.isArray(e)) throw new C("validate", `报表 ${t} Provider 应返回 datasets 结果对象`);
   for (const r of ["revision", "sourceToken"])
     if (e[r] !== void 0 && typeof e[r] != "string") throw new C("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 C("validate", `报表 ${t} Provider diagnostics 不符合结构化诊断契约`);
-  if (e.diagnostics?.some((r) => !Ho(r)))
+  if (e.diagnostics?.some((r) => !Wn(r)))
     throw new C("validate", `报表 ${t} Provider 数据说明缺少有效的字段身份或值状态`);
 }
-function zo(e, t, r, o, n) {
+function Xn(e, t, r, n, o) {
   try {
-    t = Ot(o, t, { maxRows: e.dataValidation?.maxRows, signal: n });
+    t = At(n, t, { maxRows: e.dataValidation?.maxRows, signal: o });
   } catch (a) {
     throw new C("validate", `报表 ${r} 树形数据无效：${a instanceof Error ? a.message : String(a)}`, a);
   }
   for (const [a, s] of Object.entries(e.dataSchema ?? {})) {
     let i;
     try {
-      i = Ze(Object.prototype.hasOwnProperty.call(t, a) ? t[a] : void 0, s, { ...e.dataValidation, path: `$.datasets.${a}` });
+      i = et(Object.prototype.hasOwnProperty.call(t, a) ? t[a] : void 0, s, { ...e.dataValidation, path: `$.datasets.${a}` });
     } catch (c) {
       throw new C("config", `报表 ${r} 数据集 ${a} 字段契约配置无效`, c);
     }
     if (!i.ok) throw new C("validate", `报表 ${r} 数据集 ${a} 不符合字段契约：${i.issues[0]?.message}`, { issues: i.issues });
   }
 }
-function _o(e, t, r, o, n, a) {
+async function Yn(e, t, r, n, o) {
   try {
-    const s = jt(r.pagination, n, e, t, a), i = mt(e, t, s);
-    return Lt(n, i), i;
-  } catch (s) {
-    const i = Ht(s, n);
-    throw new C("validate", `报表 ${o} 排版失败：${i instanceof Error ? i.message : String(i)}`, i);
+    let a;
+    try {
+      a = Fn(e);
+    } catch {
+    }
+    const s = a ?? e, i = Lt(t.pagination, n, s.template, s.datasets, o), c = a ? await ht(s.template, s.datasets, i) : mt(s.template, s.datasets, i);
+    return Ht(n, c), { result: c, part: s };
+  } catch (a) {
+    $(o);
+    const s = Dt(a, n);
+    throw new C("validate", `报表 ${r} 排版失败：${s instanceof Error ? s.message : String(s)}`, s);
   }
 }
-function Dt(e, t, r, o, n) {
+function Bt(e, t, r, n, o) {
   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;
+    return c === void 0 && (c = JSON.stringify([r, n, i]), a.set(i, c)), c;
   };
   for (const i of t.pages) e.push({
     ...i,
-    meta: { ...i.meta, reportScope: At(r, o) },
-    components: Kt(i.components, n ?? Nt(r, o), s)
+    meta: { ...i.meta, reportScope: Nt(r, n) },
+    components: Kt(i.components, o ?? jt(r, n), s)
   });
 }
-async function qo(e, t, r, o, n) {
-  const a = [], s = we(o);
+async function Qn(e, t, r, n, o) {
+  const a = [], s = pe(n);
   for (const [l, d] of e.entries()) {
-    $(n);
+    $(o);
     try {
-      const f = await Rt(d.template, d.datasets, jt(t[l]?.pagination, s, d.template, d.datasets, n));
-      Lt(s, f), Dt(a, f.plan, l, r[l], d.sourceScope);
+      const f = await $t(d.template, d.datasets, Lt(t[l]?.pagination, s, d.template, d.datasets, o));
+      Ht(s, f), Bt(a, f.plan, l, r[l], d.sourceScope);
     } catch (f) {
-      throw Ht(f, s);
+      throw Dt(f, s);
     }
   }
-  const i = { schemaVersion: te, ...e.some((l) => ae(l.template)) ? { requiresRecalculation: !0 } : {}, pages: a }, c = Qe(i);
+  const i = { schemaVersion: be, ...e.some((l) => ke(l.template)) ? { requiresRecalculation: !0 } : {}, pages: a }, c = Ze(i);
   if (!c.ok) throw new C("validate", `重算渲染计划校验失败：${c.errors[0]?.message}`);
   return i;
 }
-function En(e, t = {}) {
+function Ro(e, t = {}) {
   if (t.maxPages !== void 0 && (!Number.isSafeInteger(t.maxPages) || t.maxPages < 1)) throw new C("config", "maxPages 应为正安全整数");
   if (t.maxCells !== void 0 && (!Number.isSafeInteger(t.maxCells) || t.maxCells < 1)) throw new C("config", "maxCells 应为正安全整数");
   try {
-    we(t);
-  } catch (n) {
-    throw new C("config", "maxChartComponents 应为 1..1000000 的安全整数", n);
+    pe(t);
+  } catch (o) {
+    throw new C("config", "maxChartComponents 应为 1..1000000 的安全整数", o);
   }
-  function r(n) {
-    const a = Object.prototype.hasOwnProperty.call(e, n) ? e[n] : void 0;
-    if (!a) throw new C("config", `未注册报表 ${n}`);
+  function r(o) {
+    const a = Object.prototype.hasOwnProperty.call(e, o) ? e[o] : void 0;
+    if (!a) throw new C("config", `未注册报表 ${o}`);
     if (a.sourceScope !== void 0 && (typeof a.sourceScope != "string" || !a.sourceScope.trim() || a.sourceScope.length > 512)) throw new C("config", "sourceScope 应为不超过 512 字符的非空字符串");
     return a;
   }
-  return Object.assign(async ({ reportIds: n, params: a, signal: s, onWarning: i, onQueryResult: c, ...l }) => {
+  return Object.assign(async ({ reportIds: o, params: a, signal: s, onWarning: i, onQueryResult: c, ...l }) => {
     $(s);
-    const d = jo({ ...l, signal: s }), f = [...n], u = { ...a };
+    const d = Bn({ ...l, signal: s }), f = [...o], u = { ...a };
     if (f.length === 0) throw new C("config", "缺少报表 ID");
-    const h = f.map(r), m = d.runSync("validate", () => h.map((p) => Oe(
+    const h = f.map(r), m = d.runSync("validate", () => h.map((p) => Ae(
       p.params ?? (typeof p.template == "function" ? [] : p.template.params) ?? [],
       u
-    ))), v = [], y = [], g = we(t), w = [];
+    ))), v = [], y = [], g = pe(t), w = [];
     for (const [p, b] of h.entries()) {
       $(s);
-      const S = f[p], T = { reportId: S, params: m[p], signal: s }, k = typeof b.template == "function" ? await d.run("query", () => Vo(b.template, T, w), S) : b.template;
-      T.params = d.runSync("validate", () => Oe(b.params ?? k.params ?? [], T.params), S);
-      const R = await d.run("query", () => Wo(b, T, S, (ue, Bt) => c?.(ue, Bt, p)), S);
+      const S = f[p], P = { reportId: S, params: m[p], signal: s }, T = typeof b.template == "function" ? await d.run("query", () => _n(b.template, P, w), S) : b.template;
+      P.params = d.runSync("validate", () => Ae(b.params ?? T.params ?? [], P.params), S);
+      const R = await d.run("query", () => qn(b, P, S, (ue, Wt) => c?.(ue, Wt, p)), S);
       d.runSync("validate", () => {
-        Go(R, S), t.onDatasets?.(S, R, k), zo(b, R, S, k, s);
+        zn(R, S), t.onDatasets?.(S, R, T), Xn(b, R, S, T, s);
       }, S), $(s);
-      const j = d.runSync("layout", () => _o(k, R, b, S, g, s), S), Fe = Nt(p, S, b.sourceScope);
-      y.push({ template: k, datasets: R, sourceScope: Fe }), Dt(v, j.plan, p, S, Fe), w.push(...j.warnings.map((ue) => `${S}: ${ue}`));
+      const L = jt(p, S, b.sourceScope), { result: Oe, part: Gt } = await d.run("layout", () => Yn({ template: T, datasets: R, sourceScope: L }, b, S, g, s), S);
+      y.push(Gt), Bt(v, Oe.plan, p, S, L), w.push(...Oe.warnings.map((ue) => `${S}: ${ue}`));
     }
     $(s);
-    const x = { schemaVersion: te, ...y.some((p) => ae(p.template)) ? { requiresRecalculation: !0 } : {}, pages: v }, P = d.runSync("validate", () => {
-      const p = Qe(x);
+    const x = { schemaVersion: be, ...y.some((p) => ke(p.template)) ? { requiresRecalculation: !0 } : {}, pages: v }, E = d.runSync("validate", () => {
+      const p = Ze(x);
       if (!p.ok) throw new C("validate", `渲染计划校验失败：${p.errors.slice(0, 3).map((b) => `${b.path}: ${b.message}`).join("; ")}`);
       return p;
     });
-    w.push(...P.warnings.map((p) => `${p.path}: ${p.message}`));
-    const E = h.map((p) => ({ ...p, pagination: { ...p.pagination } })), O = { maxPages: t.maxPages, maxCells: t.maxCells, maxChartComponents: t.maxChartComponents };
+    w.push(...E.warnings.map((p) => `${p.path}: ${p.message}`));
+    const k = h.map((p) => ({ ...p, pagination: { ...p.pagination } })), O = { maxPages: t.maxPages, maxCells: t.maxCells, maxChartComponents: t.maxChartComponents };
     try {
-      It(x, { parts: y, validationFormulas: E.map((p) => p.pagination?.formula), rebuild: (p, b) => qo(p, E, f, O, b) });
+      Ft(x, { parts: y, validationFormulas: k.map((p) => p.pagination?.formula), rebuild: (p, b) => Qn(p, k, f, O, b) });
     } catch {
       w.push("来源数据无法建立本地重算口径；当前预览仅支持计划内编辑，请使用可序列化模板数据启用规则重算");
     }
@@ -1876,20 +1892,20 @@ function En(e, t = {}) {
       $(s), A(p);
     return $(s), x;
   }, {
-    getParamDefs: (n) => cr(e, n)
+    getParamDefs: (o) => dr(e, o)
   });
 }
-function Tn(e, t) {
+function $o(e, t) {
   const r = t.maxNodes ?? 1e6;
   if (![t.maxBytes, r].every((d) => Number.isSafeInteger(d) && d > 0)) throw t.error("budget", "快照预算应为正安全整数");
-  let o = 0, n = 0;
+  let n = 0, o = 0;
   const a = /* @__PURE__ */ new Set();
   function s(d) {
-    if (n += d, n > t.maxBytes) throw t.error("budget", "快照超过字节预算");
+    if (o += d, o > t.maxBytes) throw t.error("budget", "快照超过字节预算");
   }
   function i(d, f) {
-    if (++o > r || f > 64) throw t.error("budget", "快照节点或深度超过预算");
-    if (o % 1024 === 0 && t.check?.(), typeof d == "string")
+    if (++n > r || f > 64) throw t.error("budget", "快照节点或深度超过预算");
+    if (n % 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;
@@ -1918,50 +1934,50 @@ function Tn(e, t) {
 }
 export {
   mt as A,
-  un as B,
-  Mr as C,
+  ho as B,
+  xr as C,
   Er as D,
-  It as E,
-  bn as F,
+  Ft as E,
+  So as F,
   F as G,
-  yn as H,
-  mn as I,
-  Ge as J,
-  Ot as K,
-  xn as L,
-  Nt as M,
+  Mo as H,
+  po as I,
+  We as J,
+  At as K,
+  To as L,
+  jt as M,
   Ie as N,
-  q as O,
-  X as P,
-  jo as Q,
+  U as O,
+  Y as P,
+  Bn as Q,
   C as R,
-  Cn as S,
-  Ko as T,
-  At as U,
+  Po as S,
+  Dn as T,
+  Nt as U,
   M as a,
-  Y as b,
-  G as c,
-  kn as d,
-  ro as e,
-  gn as f,
-  wn as g,
-  Co as h,
-  Ct as i,
-  io as j,
-  dn as k,
-  hn as l,
-  pn as m,
-  H as n,
-  Mn as o,
-  bt as p,
-  En as q,
-  fn as r,
-  Tn as s,
-  Sn as t,
-  _ as u,
+  Q as b,
+  W as c,
+  Eo as d,
+  an as e,
+  yo as f,
+  vo as g,
+  Pn as h,
+  Tt as i,
+  un as j,
+  mo as k,
+  wo as l,
+  bo as m,
+  D as n,
+  Co as o,
+  Mt as p,
+  Ro as q,
+  go as r,
+  $o as s,
+  ko as t,
+  q as u,
   $e as v,
-  vn as w,
-  Ho as x,
-  Ft as y,
-  Lo as z
+  xo as w,
+  Wn as x,
+  Ot as y,
+  Gn as z
 };