@agile-team/mach-report 2.12.0 → 2.13.0

package/dist/{template-review-BzpcI-tR.js → template-review-PgEe_Wr9.js}

@@ -1,21 +1,21 @@
 import { R as ee } from "./render-plan-Ck6koX9L.js";
-import { c as Oe } from "./validate-DbgEM1Hh.js";
-import { g as $t } from "./report-params-B44imUd4.js";
-import { e as xt, r as St, f as Tt, v as It, R as Pt, p as de } from "./template-registry-BjE1VS6g.js";
-import { a as Pe, d as kt } from "./param-validation-BlHHXs6u.js";
+import { c as Ke } from "./validate-DbgEM1Hh.js";
+import { g as xt } from "./report-params-B44imUd4.js";
+import { e as St, r as Tt, f as It, v as Pt, R as kt, p as de } from "./template-registry-BjE1VS6g.js";
+import { a as Pe, d as Rt } from "./param-validation-BlHHXs6u.js";
 import { r as pe } from "./grid-geometry-BNptEcMm.js";
-import { f as Rt, i as Et } from "./number-format-BA_KwrZe.js";
-import { c as Ct } from "./task-events-Dpsvf_t2.js";
-import { d as Ft, v as Ke } from "./dataset-H5pFuQGU.js";
-import { c as At, D as je, L as Ne } from "./defaults-DXhiM1ZD.js";
-import { w as te, h as Le } from "./assets-Q0wUwNrV.js";
-import { R as F, g as He, b as Ot, i as Kt, e as D, l as he, c as jt, t as Be, h as We, f as De, j as Nt, k as Lt } from "./record-bindings-D-5jQlTj.js";
-import { d as Ve, b as Ht } from "./computed-Bvk0W15F.js";
-import { e as Bt, a as Wt } from "./matrix-yZsGnldA.js";
-import { f as Ge, a as Dt, c as Vt } from "./tree-CqcQ99NM.js";
-import { r as we, b as Gt, e as j } from "./style-CQ1PK8ZB.js";
-import { i as zt } from "./capabilities-CK_7hizc.js";
-function Jt(e, t, r) {
+import { f as Et, i as Ct } from "./number-format-BA_KwrZe.js";
+import { c as Ft } from "./task-events-Dpsvf_t2.js";
+import { d as At, v as je } from "./dataset-H5pFuQGU.js";
+import { c as Ot, D as Ne, L as Le } from "./defaults-DXhiM1ZD.js";
+import { w as te, h as He } from "./assets-Q0wUwNrV.js";
+import { R as F, g as Be, b as Kt, i as jt, e as D, l as he, c as Nt, t as We, h as De, f as Ve, j as Lt, k as Ht } from "./record-bindings-D-5jQlTj.js";
+import { d as Ge, b as Bt } from "./computed-Bvk0W15F.js";
+import { e as Wt, a as Dt } from "./matrix-yZsGnldA.js";
+import { f as ze, a as Vt, c as Gt } from "./tree-CqcQ99NM.js";
+import { r as we, b as zt, e as j } from "./style-CQ1PK8ZB.js";
+import { i as Jt } from "./capabilities-CK_7hizc.js";
+function qt(e, t, r) {
   const n = /* @__PURE__ */ new Set(), o = e.cells.map((a, s) => {
     const c = [];
     let i = 0;
@@ -25,8 +25,8 @@ function Jt(e, t, r) {
       let f = 0;
       for (let m = i; m < i + d; m++) {
         t.has(m) && f++;
-        for (let w = s + 1; w < s + u; w++)
-          n.add(`${w}:${m}`);
+        for (let p = s + 1; p < s + u; p++)
+          n.add(`${p}:${m}`);
       }
       f && c.push(l ? { ...l, colSpan: f } : null), i += d;
     }
@@ -34,7 +34,7 @@ function Jt(e, t, r) {
   });
   return { ...e, cells: o, colWidthsMm: r };
 }
-function qt(e) {
+function _t(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("列表至少需要一列可见列");
@@ -42,7 +42,7 @@ function qt(e) {
     ...e,
     columns: r,
     ...e.headerGrid ? {
-      headerGrid: Jt(
+      headerGrid: qt(
         e.headerGrid,
         t,
         r.map((n) => n.widthMm)
@@ -50,11 +50,11 @@ function qt(e) {
     } : {}
   };
 }
-function* _t(e) {
+function* Ut(e) {
   const { page: t } = e;
-  xt(t.components, t.flow);
+  St(t.components, t.flow);
   let r = 0, n = 0;
-  for (const o of St(t.components, t.flow)) {
+  for (const o of Tt(t.components, t.flow)) {
     e.active();
     const a = o.band, s = o.components.some((d) => d.kind === "list" && d.cardinality !== "record"), c = s ? 0 : o.components.reduce((d, u) => Math.max(d, u.topMm - a.topMm + (u.kind === "list" ? e.height(u) : u.heightMm)), a.heightMm);
     let i = Math.max(e.top(), n + a.topMm - r);
@@ -70,11 +70,31 @@ function* _t(e) {
     n = l, r = a.topMm + a.heightMm;
   }
 }
-function Ut(e) {
+function Xt(e) {
   return !!(e.computed?.length || e.groups?.length || e.groupBy || e.grandTotal || e.rowVisibleWhen || e.matrix || e.tree || e.detail || e.columns.some((t) => t.rules?.length || t.visibleWhen));
 }
 function re(e) {
-  return e.pages.some((t) => t.components.some((r) => r.kind === "list" && Ut(r)));
+  return e.pages.some((t) => t.components.some((r) => r.kind === "list" && Xt(r)));
+}
+const Yt = 512, ke = 256 * 1024;
+function Qt() {
+  const e = /* @__PURE__ */ new Map();
+  let t = 0, r;
+  return (n, o, a, s) => {
+    s !== r && (e.clear(), t = 0, r = s);
+    const c = JSON.stringify([n, o, a.fontSizePt, a.fontFamily, a.bold, a.italic, a.letterSpacingPt]), i = e.get(c);
+    if (i)
+      return e.delete(c), e.set(c, i), i.lines.slice();
+    const l = te(n, o, a, s), d = c.length + l.reduce((u, f) => u + f.length, 0);
+    if (d <= ke) {
+      for (; e.size >= Yt || t + d > ke; ) {
+        const u = e.keys().next().value;
+        t -= e.get(u).units, e.delete(u);
+      }
+      e.set(c, { lines: l.slice(), units: d }), t += d;
+    }
+    return l;
+  };
 }
 class H extends Error {
   constructor(t, r) {
@@ -86,98 +106,98 @@ class V extends Error {
     super(`报表单元格数量超出上限 ${t}（至少 ${r} 格）`), this.limit = t, this.actual = r, this.code = "cell-limit", this.name = "PaginateCellLimitError";
   }
 }
-const Yt = 1e4, ke = 25e4;
+const Zt = 1e4, Re = 25e4;
 function ye(e) {
   if (e?.aborted) throw e.reason ?? new DOMException("标签生成已取消", "AbortError");
 }
-function ze(e, t, r) {
-  const n = typeof e.copies == "object" ? He(t, e.copies.field, r) : e.copies ?? 1;
+function Je(e, t, r) {
+  const n = typeof e.copies == "object" ? Be(t, e.copies.field, r) : e.copies ?? 1;
   if (typeof n != "number" || !Number.isSafeInteger(n) || n < 1 || n > 1e3) throw new F(`$.datasets.${r.dataset}[${r.rowIndex}]`, "每条记录复制数必须是 1..1000 的数值型整数", r.rowIndex, typeof e.copies == "object" ? e.copies.field : void 0);
   return n;
 }
-function Je(e, t, r) {
+function qe(e, t, r) {
   if (e.rowKey === void 0) return;
-  const n = He(t, e.rowKey, r);
+  const n = Be(t, e.rowKey, r);
   if (typeof n == "string" && n.trim() || typeof n == "number" && Number.isFinite(n)) return n;
   throw new F(`$.datasets.${r.dataset}[${r.rowIndex}].${e.rowKey}`, "业务主键必须是非空字符串或有限数字", r.rowIndex, e.rowKey);
 }
-function Xt(e) {
+function er(e) {
   const t = (r) => 1 + (r.grid?.cells.reduce((n, o) => n + 1 + o.length + o.reduce((a, s) => a + (s?.children?.reduce((c, i) => c + t(i), 0) ?? 0), 0), 0) ?? 0);
   return e.pages.reduce((r, n) => r + n.components.reduce((o, a) => o + t(a), 0), 0);
 }
-function Qt(e, t, r) {
+function tr(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 F(`$.datasets.${n.dataset}`, "逐记录标签数据集缺失，应提供对象数组（允许空数组）");
-  const a = /* @__PURE__ */ new Set(), s = r.maxPages ?? Yt, c = Xt(e);
+  const a = /* @__PURE__ */ new Set(), s = r.maxPages ?? Zt, c = er(e);
   let i = 0, l = 0;
   for (const [d, u] of o.entries()) {
     if (ye(r.signal), !u || typeof u != "object" || Array.isArray(u)) throw new F(`$.datasets.${n.dataset}[${d}]`, "标签记录应为对象", d);
-    const f = { rowIndex: d, dataset: n.dataset }, m = Je(n, u, f);
+    const f = { rowIndex: d, dataset: n.dataset }, m = qe(n, u, f);
     if (m !== void 0) {
       const g = JSON.stringify([typeof m, m]);
       if (a.has(g)) throw new F(`$.datasets.${n.dataset}[${d}].${n.rowKey}`, "业务主键重复；请先确认记录来源，避免重复打印标签", d, n.rowKey);
       a.add(g);
     }
-    const w = ze(n, u, f);
-    if (i += w * e.pages.length, l += w * c, i > s) throw new H(s, i);
-    if (l > ke) throw new F("$.repeat", `标签组件总量（含网格行、槽位及嵌套组件）超过安全预算 ${ke}，请分批生成`, d);
+    const p = Je(n, u, f);
+    if (i += p * e.pages.length, l += p * c, i > s) throw new H(s, i);
+    if (l > Re) throw new F("$.repeat", `标签组件总量（含网格行、槽位及嵌套组件）超过安全预算 ${Re}，请分批生成`, d);
   }
   return o;
 }
-function Zt(e, t, r) {
+function rr(e, t, r) {
   if (!e.binding) return e;
-  const { binding: n, ...o } = e, a = Ot(n, t.row, t);
+  const { binding: n, ...o } = e, a = Kt(n, t.row, t);
   if (e.kind === "image") {
     if (!a) return;
-    if (!Kt(a)) throw new F(`${r}.binding`, "图片字段只接受 PNG/JPEG base64 data URL；业务 URL 应由宿主安全加载后转换", t.rowIndex, n.field);
+    if (!jt(a)) throw new F(`${r}.binding`, "图片字段只接受 PNG/JPEG base64 data URL；业务 URL 应由宿主安全加载后转换", t.rowIndex, n.field);
     return { ...o, imageData: 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 er(e, t, r) {
+function nr(e, t, r) {
   if (e.kind !== "text" || e.grid || e.richParagraphs?.length) return e;
   const n = e.style ?? {}, o = we(n).fontSizePt, a = e.text ?? e.lines?.join(`
 `) ?? "";
   if (a.length > 16384) throw new F(r, "标签文本超过 16384 字符预算，请缩小字段内容", t.rowIndex);
-  const s = te(a, e.widthMm, { fontSizePt: o, bold: n.bold, italic: n.italic, fontFamily: n.fontFamily, letterSpacingPt: n.letterSpacing }, t.options.measurer ?? Le), c = s.length * o * Gt(n) * 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 ?? He), c = s.length * o * zt(n) * 25.4 / 72;
   if (c > e.heightMm + 0.05) throw new F(r, `标签文字需要约 ${c.toFixed(2)}mm 高，超出 ${e.heightMm}mm；请增大文本区域、减少内容或调整字号`, t.rowIndex, e.binding?.field);
   return { ...e, lines: s };
 }
-function qe(e, t, r) {
+function _e(e, t, r) {
   ye(t.options.signal);
-  const n = Zt(e, t, r);
+  const n = rr(e, t, r);
   if (!n) return;
   let o = n.grid;
   return o && (o = { ...o, cells: o.cells.map((a, s) => a.map((c, i) => c?.children?.length ? { ...c, children: c.children.flatMap((l, d) => {
-    const u = qe(l, t, `${r}.grid.cells.${s}.${i}.children.${d}`);
+    const u = _e(l, t, `${r}.grid.cells.${s}.${i}.children.${d}`);
     return u ? [u] : [];
-  }) } : c)) }), er(o === n.grid ? n : { ...n, grid: o }, t, r);
+  }) } : c)) }), nr(o === n.grid ? n : { ...n, grid: o }, t, r);
 }
-function tr(e, t, r, n, o, a) {
+function or(e, t, r, n, o, a) {
   return {
     ...e,
     components: e.components.flatMap((s, c) => {
-      const i = qe(s, r, `$.pages.${t}.components.${c}`);
+      const i = _e(s, r, `$.pages.${t}.components.${c}`);
       return i ? [{ ...i, meta: { ...i.meta, labelSource: { pageIndex: t, componentIndex: c } } }] : [];
     }),
     meta: { ...e.meta, record: { dataset: r.dataset, rowIndex: r.rowIndex, ...a === void 0 ? {} : { rowKey: a }, copyIndex: n, copyCount: o, templatePageIndex: t } }
   };
 }
-function* rr(e, t, r) {
+function* ar(e, t, r) {
   const n = [];
-  if (Tt(e, n), n.length) throw new F(n[0].path, n[0].message);
+  if (It(e, n), n.length) throw new F(n[0].path, n[0].message);
   if (!e.repeat) {
-    for (const [s, c] of e.pages.entries()) yield { page: c, pageIndex: s };
+    for (const [c, i] of e.pages.entries()) yield { page: i, pageIndex: c };
     return;
   }
-  const o = e.repeat, a = Qt(e, t, r);
-  for (const [s, c] of a.entries()) {
-    const i = { row: c, rowIndex: s, dataset: o.dataset, options: r }, l = ze(o, c, i), d = Je(o, c, i);
-    for (let u = 0; u < l; u++) for (const [f, m] of e.pages.entries())
-      ye(r.signal), yield { page: tr(m, f, i, u, l, d), pageIndex: f };
+  const o = e.repeat, a = tr(e, t, r), s = Qt();
+  for (const [c, i] of a.entries()) {
+    const l = { row: i, rowIndex: c, dataset: o.dataset, options: r, wrapText: s }, d = Je(o, i, l), u = qe(o, i, l);
+    for (let f = 0; f < d; f++) for (const [m, p] of e.pages.entries())
+      ye(r.signal), yield { page: or(p, m, l, f, d, u), pageIndex: m };
   }
 }
-function nr(e) {
+function sr(e) {
   return {
     widthMm: e.widthMm,
     heightMm: e.heightMm,
@@ -195,57 +215,57 @@ function Q(e, t) {
 function z(e) {
   return e.components.reduce((t, r) => r.kind !== "list" && r.pageAnchor === "header" ? Math.max(t, r.topMm + r.heightMm) : t, 0);
 }
-function _e(e, t) {
+function Ue(e, t) {
   let r = e.textMetrics.get(t);
   if (!r) {
     const n = we(t).fontSizePt;
     r = {
       measureOptions: {
         fontSizePt: n,
-        fontFamily: t.fontFamily ?? je,
+        fontFamily: t.fontFamily ?? Ne,
         italic: t.italic,
         bold: t.bold,
         letterSpacingPt: t.letterSpacing
       },
-      lineMm: n * (t.lineHeight ?? Ne) * 25.4 / 72
+      lineMm: n * (t.lineHeight ?? Le) * 25.4 / 72
     }, e.textMetrics.set(t, r);
   }
   return r;
 }
-function or(e) {
+function ir(e) {
   if (e === null || typeof e == "string" || typeof e == "boolean" || typeof e == "number" && Number.isFinite(e)) return e;
 }
 function be(e, t) {
-  const r = e.fontSizePt ?? At, n = e.paddingMm ?? 1, o = e.columns.map((g) => g.align ?? g.style?.align ?? e.align ?? "left"), a = e.columns.map((g, p) => ({
+  const r = e.fontSizePt ?? Ot, n = e.paddingMm ?? 1, o = e.columns.map((g) => g.align ?? g.style?.align ?? e.align ?? "left"), a = e.columns.map((g, h) => ({
     ...j({
       fontSize: r,
       verticalAlign: "middle"
     }, g.style),
-    align: o[p] === "auto" ? "left" : o[p]
-  })), s = a.map((g, p) => o[p] === "auto" ? { left: g, center: { ...g, align: "center" }, right: { ...g, align: "right" } } : void 0), c = e.columns.map((g, p) => g.rules?.map((v) => {
-    const M = s[p];
+    align: o[h] === "auto" ? "left" : o[h]
+  })), s = a.map((g, h) => o[h] === "auto" ? { left: g, center: { ...g, align: "center" }, right: { ...g, align: "right" } } : void 0), c = e.columns.map((g, h) => g.rules?.map((v) => {
+    const M = s[h];
     if (M) return {
       left: j(M.left, v.style),
       center: j(M.center, v.style),
       right: j(M.right, v.style)
     };
-    const y = j(a[p], v.style);
+    const y = j(a[h], v.style);
     return { left: y, center: y, right: y };
-  })), i = e.columns.map((g) => jt(e, g)), l = e.columns.map((g) => g.header);
+  })), i = e.columns.map((g) => Nt(e, g)), l = e.columns.map((g) => g.header);
   let d = e.rowHeightMm ?? 0;
   for (let g = 0; g < l.length; g++) {
-    const p = i[g], v = we(p).fontSizePt, M = te(
+    const h = i[g], v = we(h).fontSizePt, M = te(
       l[g],
       e.columns[g].widthMm - n * 2,
-      { fontSizePt: v, fontFamily: p.fontFamily ?? je, italic: p.italic, bold: p.bold, letterSpacingPt: p.letterSpacing },
+      { fontSizePt: v, fontFamily: h.fontFamily ?? Ne, italic: h.italic, bold: h.bold, letterSpacingPt: h.letterSpacing },
       t
-    ), y = v * (p.lineHeight ?? Ne) * 25.4 / 72;
+    ), y = v * (h.lineHeight ?? Le) * 25.4 / 72;
     d = Math.max(d, Math.max(M.length, 1) * y + n * 2);
   }
-  const u = l.map((g, p) => ({
+  const u = l.map((g, h) => ({
     text: g,
-    style: i[p]
-  })), f = e.border === !1 ? { borderTop: !1, borderRight: !1, borderBottom: !1, borderLeft: !1 } : { borderBottom: !0, borderLeft: !0, borderRight: !0, borderTop: !0 }, m = e.columns.map((g) => g.widthMm), w = ar(e.headerGrid, m, {
+    style: i[h]
+  })), f = e.border === !1 ? { borderTop: !1, borderRight: !1, borderBottom: !1, borderLeft: !1 } : { borderBottom: !0, borderLeft: !0, borderRight: !0, borderTop: !0 }, m = e.columns.map((g) => g.widthMm), p = cr(e.headerGrid, m, {
     cells: [u],
     colWidthsMm: m,
     rowHeightsMm: [d],
@@ -258,23 +278,23 @@ function be(e, t) {
     autoStyles: s,
     ruleStyles: c,
     textMetrics: /* @__PURE__ */ new WeakMap(),
-    numberFormats: e.columns.map((g) => Be(g.format)),
+    numberFormats: e.columns.map((g) => We(g.format)),
     derivedFields: new Set(e.computed?.map((g) => g.field)),
     borderStyle: f,
-    headerHeightMm: w.rowHeightsMm.reduce((g, p) => g + p, 0),
-    headerGrid: w,
+    headerHeightMm: p.rowHeightsMm.reduce((g, h) => g + h, 0),
+    headerGrid: p,
     colWidthsMm: m,
     columns: e.columns
   };
 }
-function ar(e, t, r) {
+function cr(e, t, r) {
   if (!e) return r;
   if (!e.cells.length) throw new Error("自定义列表表头至少需要一行");
   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 sr(e, t, 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);
 }
@@ -283,7 +303,7 @@ function J(e, t, r) {
   let a = e.rowHeightFloorMm;
   const s = new Array(n.length);
   for (let c = 0; c < n.length; c++) {
-    const i = n[c], l = i.visibleWhen && !D(t, i.visibleWhen) ? null : t[i.field], d = e.autoStyles[c] ? We(l, i.format, i.semanticRole) : "left";
+    const i = n[c], l = i.visibleWhen && !D(t, i.visibleWhen) ? null : t[i.field], d = e.autoStyles[c] ? De(l, i.format, i.semanticRole) : "left";
     let u = e.autoStyles[c]?.[d] ?? e.cellStyles[c];
     if (i.rules)
       for (let M = 0; M < i.rules.length; M++) {
@@ -293,28 +313,28 @@ function J(e, t, r) {
           break;
         }
       }
-    const f = i.format ? De(l, i.format) : he(l), m = ir(e, i, o);
-    u = cr(e, i, u, o);
-    const w = _e(e, u), g = te(f, Math.max(1, i.widthMm - e.paddingMm * 2 - m), w.measureOptions, r);
-    a = Math.max(a, g.length * w.lineMm + e.paddingMm * 2);
-    const p = or(l), v = { text: f, style: u };
-    p !== void 0 && (v.value = p), sr(v, i, e.numberFormats[c]), lr(v, i, e, o, m), e.derivedFields.has(i.field) && (v.derived = !0, v.editable = !1), i.visibleWhen && l === null && !D(t, i.visibleWhen) && (v.editable = !1), s[c] = v;
+    const f = i.format ? Ve(l, i.format) : he(l), m = dr(e, i, o);
+    u = ur(e, i, u, o);
+    const p = Ue(e, u), g = te(f, Math.max(1, i.widthMm - e.paddingMm * 2 - m), p.measureOptions, r);
+    a = Math.max(a, g.length * p.lineMm + e.paddingMm * 2);
+    const h = ir(l), v = { text: f, style: u };
+    h !== void 0 && (v.value = h), lr(v, i, e.numberFormats[c]), fr(v, i, e, o, m), e.derivedFields.has(i.field) && (v.derived = !0, v.editable = !1), i.visibleWhen && l === null && !D(t, i.visibleWhen) && (v.editable = !1), s[c] = v;
   }
   return {
     grid: { cells: [s], colWidthsMm: e.colWidthsMm, rowHeightsMm: [a], paddingMm: e.paddingMm },
     heightMm: a
   };
 }
-function ir(e, t, r) {
-  return !r || t.field !== e.tree.list.tree.labelField ? 0 : Nt(e.tree.list, t, r, e.paddingMm);
+function dr(e, t, r) {
+  return !r || t.field !== e.tree.list.tree.labelField ? 0 : Lt(e.tree.list, t, r, e.paddingMm);
 }
-function cr(e, t, r, n) {
+function ur(e, t, r, n) {
   return !n || t.field !== e.tree.list.tree.labelField || r.align === "left" ? r : { ...r, align: "left" };
 }
-function lr(e, t, r, n, o = 0) {
-  n && (o && (e.indentMm = o), Lt(e, t, n, r.tree.list));
+function fr(e, t, r, n, o = 0) {
+  n && (o && (e.indentMm = o), Ht(e, t, n, r.tree.list));
 }
-function Ue(e) {
+function Xe(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]);
 }
@@ -326,20 +346,20 @@ function* Ye(e, t, r = 0) {
   }
   const o = /* @__PURE__ */ new Map();
   for (const a of e) {
-    const s = Ue(a[n.field]), c = o.get(s);
+    const s = Xe(a[n.field]), c = o.get(s);
     c ? c.push(a) : o.set(s, [a]);
   }
   for (const a of o.values())
     yield { kind: "groupHeader", label: (n.headerTemplate ?? "{value}").replace(/\{value\}/g, he(a[0][n.field])), firstRow: a[0], group: n, depth: r, rows: a }, yield* Ye(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 Xe(e, t, r, n = []) {
+function Qe(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((i) => i.field === a.field)?.format ?? { kind: "number", thousands: !0 }, c = Ht(t, { ...a, field: a.valueField ?? a.field });
-    return [a.field, { text: De(c, s), ...c === null ? {} : { value: c }, ...typeof c == "number" ? { numberFormat: Be(s) } : {} }];
+    const s = e.find((i) => i.field === a.field)?.format ?? { kind: "number", thousands: !0 }, c = Bt(t, { ...a, field: a.valueField ?? a.field });
+    return [a.field, { text: Ve(c, s), ...c === null ? {} : { value: c }, ...typeof c == "number" ? { numberFormat: We(s) } : {} }];
   }));
 }
-function Qe(e, t) {
+function Ze(e, t) {
   const r = e.findIndex((n) => t.includes(n.field));
   return r < 0 ? 1 : r;
 }
@@ -347,33 +367,33 @@ function G(e, t, r, n, o, a) {
   const s = [], c = Math.max(0, Math.min(a, e.columns.length)), i = j({ fontSize: e.fontSizePt }, o);
   c && s.push({ text: r, colSpan: c, style: { bold: !0, ...i } });
   for (let f = c; f < e.columns.length; f++) {
-    const m = e.columns[f], w = n.get(m.field), g = e.autoStyles[f]?.[We(w?.value, m.format)] ?? e.cellStyles[f];
-    s.push({ ...w, text: w?.text ?? "", style: j(g, o) });
+    const m = e.columns[f], p = n.get(m.field), g = e.autoStyles[f]?.[De(p?.value, m.format)] ?? e.cellStyles[f];
+    s.push({ ...p, text: p?.text ?? "", style: j(g, o) });
   }
-  const l = { text: r, colSpan: e.columns.length, style: { bold: !0, ...i } }, d = c ? [s] : [[l], s], u = d.map((f) => dr(e, f, t));
+  const l = { text: r, colSpan: e.columns.length, style: { bold: !0, ...i } }, d = c ? [s] : [[l], s], u = d.map((f) => mr(e, f, t));
   return {
     grid: { cells: d, colWidthsMm: e.colWidthsMm, rowHeightsMm: u, paddingMm: e.paddingMm },
     heightMm: u.reduce((f, m) => f + m, 0)
   };
 }
-function dr(e, t, r) {
+function mr(e, t, r) {
   let n = e.rowHeightFloorMm, o = 0;
   for (const a of t) {
     let s = 0;
     const c = o + (a.colSpan ?? 1);
     for (; o < c; o++) s += e.colWidthsMm[o] ?? 0;
-    const i = _e(e, a.style), l = te(a.text ?? "", s - e.paddingMm * 2, i.measureOptions, r);
+    const i = Ue(e, a.style), l = te(a.text ?? "", s - e.paddingMm * 2, i.measureOptions, r);
     n = Math.max(n, l.length * i.lineMm + e.paddingMm * 2);
   }
   return n;
 }
-function ur(e, t, r) {
+function gr(e, t, r) {
   const { templatePage: n, current: o, warnings: a, nextId: s, pushCurrent: c } = r, i = () => Q(n, o), l = Math.max(o.marginTopMm, z(n)), d = n.layout === "wide" ? z(n) : l, u = {
     id: r.tableId,
-    columnKeys: e.columns.map((h) => h.field),
+    columnKeys: e.columns.map((w) => w.field),
     ...e.layout === void 0 ? {} : { layout: e.layout },
     ...e.title === void 0 ? {} : { title: e.title }
-  }, f = /* @__PURE__ */ new Map(), m = /* @__PURE__ */ new Map(), w = {
+  }, f = /* @__PURE__ */ new Map(), m = /* @__PURE__ */ new Map(), p = {
     kind: "rect",
     leftMm: e.leftMm,
     topMm: 0,
@@ -384,53 +404,53 @@ function ur(e, t, r) {
     table: { ...u, role: "header", rowIndex: -1 },
     style: t.borderStyle,
     ...e.meta ? { meta: e.meta } : {}
-  }, g = (h) => o.components.push({ ...w, topMm: h });
+  }, g = (w) => o.components.push({ ...p, topMm: w });
   if (r.flow && e.header !== !1 && t.headerHeightMm > i() - l + 1e-3) throw new Error(`流式列表 ${e.id ?? e.dataset} 的表头高度超出单页可用范围`);
-  let p = Math.max(r.startTop ?? e.topMm, l);
-  e.header !== !1 && (g(p), p += t.headerHeightMm + r.mmPerRow);
+  let h = Math.max(r.startTop ?? e.topMm, l);
+  e.header !== !1 && (g(h), h += t.headerHeightMm + r.mmPerRow);
   function v() {
-    const h = Math.max(r.flow || n.layout === "wide" ? 0 : e.topMm, d);
-    return (e.header !== !1 && e.headerEveryPage !== !1 ? h + t.headerHeightMm : d) + [...m.values()].reduce((x, I) => x + I.heightMm, 0);
+    const w = Math.max(r.flow || n.layout === "wide" ? 0 : e.topMm, d);
+    return (e.header !== !1 && e.headerEveryPage !== !1 ? w + t.headerHeightMm : d) + [...m.values()].reduce((x, I) => x + I.heightMm, 0);
   }
   function M() {
-    const h = n.layout === "wide" ? 0 : o.marginBottomMm;
-    return Math.min(n.heightMm - h, Q(n, o)) - v();
+    const w = n.layout === "wide" ? 0 : o.marginBottomMm;
+    return Math.min(n.heightMm - w, Q(n, o)) - v();
   }
-  function y(h) {
-    if (p + h <= i()) return;
+  function y(w) {
+    if (h + w <= i()) return;
     c(), o.components = [], o.heightMm = n.heightMm, n.layout === "wide" && (o.marginTopMm = 0, o.marginBottomMm = 0);
     const $ = Math.max(r.flow || n.layout === "wide" ? 0 : e.topMm, d);
-    e.header !== !1 && e.headerEveryPage !== !1 ? (g($), p = $ + t.headerHeightMm) : p = d;
+    e.header !== !1 && e.headerEveryPage !== !1 ? (g($), h = $ + t.headerHeightMm) : h = d;
     for (const x of m.values()) O(x, "listgr", "group-header");
   }
-  function N(h, $, x, I) {
+  function N(w, $, x, I) {
     const P = M();
-    if (r.flow && h.heightMm > P + 1e-3) throw new Error(`流式列表 ${e.id ?? e.dataset} 的单行高度超出单页可用范围`);
-    h.heightMm > P && a.push(`列表 ${e.id ?? e.dataset} 行高 ${h.heightMm.toFixed(2)}mm 超出单页可用高度 ${P.toFixed(2)}mm，预览与打印可能截断内容`), y(h.heightMm), O(h, $, x, I);
+    if (r.flow && w.heightMm > P + 1e-3) throw new Error(`流式列表 ${e.id ?? e.dataset} 的单行高度超出单页可用范围`);
+    w.heightMm > P && a.push(`列表 ${e.id ?? e.dataset} 行高 ${w.heightMm.toFixed(2)}mm 超出单页可用高度 ${P.toFixed(2)}mm，预览与打印可能截断内容`), y(w.heightMm), O(w, $, x, I);
   }
-  function O(h, $, x, I) {
-    const P = h.table?.id ?? u.id, K = x === "header" ? -1 : f.get(P) ?? 0;
-    x !== "header" && f.set(P, K + h.grid.cells.length), o.components.push({
+  function O(w, $, x, I) {
+    const P = w.table?.id ?? u.id, K = x === "header" ? -1 : f.get(P) ?? 0;
+    x !== "header" && f.set(P, K + w.grid.cells.length), o.components.push({
       kind: "rect",
       leftMm: e.leftMm,
-      topMm: p,
+      topMm: h,
       widthMm: e.widthMm,
-      heightMm: h.heightMm,
-      grid: h.grid,
+      heightMm: w.heightMm,
+      grid: w.grid,
       nid: s($),
-      table: { ...u, ...h.table, role: x, rowIndex: K, ...I ? { source: I } : {} },
+      table: { ...u, ...w.table, role: x, rowIndex: K, ...I ? { source: I } : {} },
       style: t.borderStyle,
       ...e.meta ? { meta: e.meta } : {}
-    }), p += h.heightMm;
+    }), h += w.heightMm;
   }
-  function k(h) {
-    h <= M() && y(h);
+  function k(w) {
+    w <= M() && y(w);
   }
-  return { keepTogether: k, placeGridRow: N, setGroupHeader: (h, $) => {
-    $ ? m.set(h, $) : m.delete(h);
-  }, bottom: () => p };
+  return { keepTogether: k, placeGridRow: N, setGroupHeader: (w, $) => {
+    $ ? m.set(w, $) : m.delete(w);
+  }, bottom: () => h };
 }
-function fr(e, t) {
+function pr(e, t) {
   if (!e.rowKey) return;
   const r = t[e.rowKey];
   if ((typeof r != "string" || !r.trim()) && !(typeof r == "number" && Number.isFinite(r)))
@@ -445,20 +465,20 @@ function ne(e, t) {
   if (!e.rowKey) return r;
   const n = /* @__PURE__ */ new Set();
   for (const o of t) {
-    const a = fr(e, o), s = JSON.stringify(a.rowKey);
+    const a = pr(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 mr(e, t, r, n, o) {
+function hr(e, t, r, n, o) {
   if (!e.grandTotal) return;
   const a = typeof e.grandTotal == "object" ? e.grandTotal : void 0, s = oe(e)[0], c = a?.fields ?? s?.subtotal ?? [], i = a?.aggregates ?? s?.aggregates ?? [];
   if (c.length === 0 && i.length === 0) {
     n.warnings.push(`列表 ${e.id ?? ""} 配置了 grandTotal 但未提供合计字段（groupBy.subtotal 或 grandTotal.fields）`);
     return;
   }
-  const l = G(r, n.measurer, a?.label ?? "合计", Xe(e.columns, t, c, i), a?.style ?? {}, Qe(e.columns, [...c, ...i.map((d) => d.field)]));
+  const l = G(r, n.measurer, a?.label ?? "合计", Qe(e.columns, t, c, i), a?.style ?? {}, Ze(e.columns, [...c, ...i.map((d) => d.field)]));
   o.placeGridRow(l, "listgt", "grand-total");
 }
 function q(e) {
@@ -473,10 +493,10 @@ function oe(e) {
   return t;
 }
 function ve(e) {
-  const t = qt(e), r = t.columns.reduce((o, a) => o + a.widthMm, 0), n = r > t.widthMm ? t.widthMm / r : 1;
+  const t = _t(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 gr(e, t, r) {
+function wr(e, t, r) {
   const n = e.detail;
   if (!n) return;
   const o = /* @__PURE__ */ new Set();
@@ -488,7 +508,7 @@ function gr(e, t, r) {
   const a = r.datasets[n.dataset] ?? [], s = /* @__PURE__ */ new Map(), c = [];
   for (const l of a) {
     const d = l[n.foreignKey];
-    if (!Ze(d) && n.unmatched === "ignore") continue;
+    if (!et(d) && n.unmatched === "ignore") continue;
     const u = ue(d);
     if (!o.has(u)) {
       if (n.unmatched !== "ignore") throw new Error(`明细数据集 ${n.dataset} 存在未关联的业务键`);
@@ -500,14 +520,14 @@ function gr(e, t, r) {
   const i = ve({ ...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: i, inter: { ...be(i, r.measurer), rowHeightFloorMm: i.rowHeightMm ?? 0 }, rows: s, sources: ne(i, c) };
 }
-function Ze(e) {
+function et(e) {
   return typeof e == "string" && !!e.trim() || typeof e == "number" && Number.isFinite(e);
 }
 function ue(e) {
-  if (!Ze(e)) throw new Error("主从关联键必须是非空字符串或有限数字");
-  return Ue(e);
+  if (!et(e)) throw new Error("主从关联键必须是非空字符串或有限数字");
+  return Xe(e);
 }
-function* pr(e, t, r, n, o) {
+function* yr(e, t, r, n, o) {
   if (!r) return;
   const a = r.rows.get(ue(t[e.detail.parentKey])) ?? [];
   if (!a.length) return;
@@ -516,79 +536,79 @@ function* pr(e, t, r, n, o) {
   for (const c of a)
     q(n.signal), o.placeGridRow({ ...J(r.inter, c, n.measurer), table: s }, "listdr", "body", r.sources.get(c)), yield* n.takePages();
 }
-function hr(e, t) {
+function br(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 = Wt(t, e.matrix), n = r.columns.map((a, s) => ({ ...a, widthMm: s === 0 ? e.matrix.rowWidthMm ?? 40 : e.matrix.columnWidthMm ?? 28, editable: !1, align: s === 0 ? "center" : "right" })), o = { ...e, columns: n, headerGrid: void 0, rowKey: void 0, revisionField: void 0, sourceTokenField: void 0 };
+  const r = Dt(t, e.matrix), n = r.columns.map((a, s) => ({ ...a, widthMm: s === 0 ? e.matrix.rowWidthMm ?? 40 : e.matrix.columnWidthMm ?? 28, editable: !1, align: s === 0 ? "center" : "right" })), o = { ...e, columns: n, headerGrid: void 0, rowKey: void 0, revisionField: void 0, sourceTokenField: void 0 };
   return e.layout === "wide" && (o.widthMm = n.reduce((a, s) => a + s.widthMm, 0)), { list: o, rows: r.rows };
 }
-function et(e) {
+function tt(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("树形布局需要可见的标签列");
-  Dt(e.tree, e.computed);
+  Vt(e.tree, e.computed);
 }
-function wr(e, t, r) {
-  et(e);
-  const n = Vt(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 = ne(o, n.entries.map((i) => i.original)), s = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new WeakMap();
+function vr(e, t, r) {
+  tt(e);
+  const n = Gt(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 = ne(o, n.entries.map((i) => i.original)), s = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new WeakMap();
   for (const i of n.entries)
     s.set(i.row, a.get(i.original)), c.set(i.row, i);
   return { list: o, rows: n.rows, sources: s, treeRows: c, totalRows: n.leaves };
 }
-function yr(e, t) {
+function Mr(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 tt(e, t, r) {
+function rt(e, t, r) {
   const n = r.prepared.get(e);
   if (n) return n;
-  const o = yr(e, t);
+  const o = Mr(e, t);
   if (o)
     return r.prepared.set(e, o), o;
   if (e.tree) {
-    const i = wr(e, t, r);
+    const i = vr(e, t, r);
     return r.prepared.set(e, i), i;
   }
-  let a = e.computed?.length ? Ve(t, { fields: e.computed, signal: r.signal, formula: r.formula }).rows : t;
+  let a = e.computed?.length ? Ge(t, { fields: e.computed, signal: r.signal, formula: r.formula }).rows : t;
   const s = a === t ? void 0 : new Map(a.map((i, l) => [i, t[l]]));
   e.rowVisibleWhen && (a = a.filter((i) => D(i, e.rowVisibleWhen)));
-  const c = hr(e, a);
+  const c = br(e, a);
   if (!e.matrix) {
     const i = ne(e, s ? a.map((l) => s.get(l)) : a);
     c.sources = s ? new Map(a.map((l) => [l, i.get(s.get(l))])) : i;
   }
   return r.prepared.set(e, c), c;
 }
-function br(e, t, r, n) {
+function $r(e, t, r, n) {
   if (!n.flow) return;
   const { current: o, templatePage: a } = n, s = Math.max(o.marginTopMm, z(a)), c = Math.max(n.startTop ?? e.topMm, s), i = (e.header === !1 ? 0 : t.headerHeightMm) + (r[0] ? J(t, r[0], n.measurer).heightMm : 0);
   c + i <= Q(a, o) + 1e-3 || c <= 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, z(a)));
 }
-function* vr(e, t, r) {
-  const n = tt(e, t, r), o = n.rows;
+function* xr(e, t, r) {
+  const n = rt(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 ?? ne(e, o), s = ve(e), c = oe(s), i = { ...be(s, r.measurer), rowHeightFloorMm: s.rowHeightMm ?? 0, ...n.treeRows ? { tree: { list: s, rows: n.treeRows } } : {} };
-  br(s, i, o, r);
-  const l = ur(s, i, r), d = gr(s, o, r);
+  $r(s, i, o, r);
+  const l = gr(s, i, r), d = wr(s, o, r);
   let u;
   for (const f of Ye(o, c)) {
     if (q(r.signal), f.kind === "row")
-      l.placeGridRow(u ?? J(i, f.row, r.measurer), "listr", "body", a.get(f.row)), u = void 0, yield* r.takePages(), yield* pr(s, f.row, d, r, l);
+      l.placeGridRow(u ?? J(i, f.row, r.measurer), "listr", "body", a.get(f.row)), u = void 0, yield* r.takePages(), yield* yr(s, f.row, d, r, l);
     else if (f.kind === "groupHeader") {
       const m = G(i, r.measurer, f.label, /* @__PURE__ */ new Map(), f.group.headerStyle ?? {}, s.columns.length);
       u ??= J(i, f.firstRow, r.measurer);
-      const w = c.slice(f.depth + 1).reduce((g, p) => g + G(i, r.measurer, (p.headerTemplate ?? "{value}").replace(/\{value\}/g, he(f.firstRow[p.field])), /* @__PURE__ */ new Map(), p.headerStyle ?? {}, s.columns.length).heightMm, 0);
-      f.group.keepWithNext !== !1 && l.keepTogether(m.heightMm + w + u.heightMm), l.placeGridRow(m, "listg", "group-header"), f.group.repeatHeader && l.setGroupHeader(f.depth, m);
+      const p = c.slice(f.depth + 1).reduce((g, h) => g + G(i, r.measurer, (h.headerTemplate ?? "{value}").replace(/\{value\}/g, he(f.firstRow[h.field])), /* @__PURE__ */ new Map(), h.headerStyle ?? {}, s.columns.length).heightMm, 0);
+      f.group.keepWithNext !== !1 && l.keepTogether(m.heightMm + p + u.heightMm), l.placeGridRow(m, "listg", "group-header"), f.group.repeatHeader && l.setGroupHeader(f.depth, m);
     } else if (f.kind === "subtotal") {
-      const m = f.group.subtotal ?? [], w = f.group.aggregates ?? [], g = G(i, r.measurer, f.label, Xe(s.columns, f.rows, m, w), f.group.subtotalStyle ?? {}, Qe(s.columns, [...m, ...w.map((p) => p.field)]));
+      const m = f.group.subtotal ?? [], p = f.group.aggregates ?? [], g = G(i, r.measurer, f.label, Qe(s.columns, f.rows, m, p), f.group.subtotalStyle ?? {}, Ze(s.columns, [...m, ...p.map((h) => h.field)]));
       l.placeGridRow(g, "listst", "subtotal");
     } else l.setGroupHeader(f.depth);
     yield* r.takePages();
   }
-  mr(s, n.totalRows ?? o, i, r, l), r.finished?.(l.bottom()), yield* r.takePages();
+  hr(s, n.totalRows ?? o, i, r, l), r.finished?.(l.bottom()), yield* r.takePages();
 }
 function ae(e) {
   return e.kind !== "list" && (e.pageAnchor !== void 0 || e.kind === "text" && typeof e.text == "string" && (e.text.includes("{page}") || e.text.includes("{totalPages}")));
@@ -602,12 +622,12 @@ function se(e, t) {
     ...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) => se(o, t)) } : {} } : null)) } } : {}
   };
 }
-function Mr(e) {
+function Sr(e) {
   let t = !1;
   for (const r of e.pages) for (const n of r.components) ae(n) && se(n, (o) => (o.includes("{totalPages}") && (t = !0), o));
   return t;
 }
-function $r(e, t, r, n, o, a) {
+function Tr(e, t, r, n, o, a) {
   const s = {
     pageWidthMm: t.widthMm,
     pageHeightMm: t.heightMm,
@@ -630,25 +650,25 @@ function $r(e, t, r, n, o, a) {
   return s;
 }
 function Me(e) {
-  return e.cells.reduce((t, r) => t + r.reduce((n, o) => n + (o ? 1 + (o.children?.reduce((a, s) => a + rt(s), 0) ?? 0) : 0), 0), 0);
+  return e.cells.reduce((t, r) => t + r.reduce((n, o) => n + (o ? 1 + (o.children?.reduce((a, s) => a + nt(s), 0) ?? 0) : 0), 0), 0);
 }
-function rt(e) {
+function nt(e) {
   return e.grid ? Me(e.grid) : 0;
 }
 function $e(e) {
   for (const t of ["maxPages", "maxCells", "knownTotalPages"]) if (e[t] !== void 0 && (!Number.isSafeInteger(e[t]) || e[t] < 1)) throw new RangeError(`${t} 应为正安全整数`);
 }
-function xr(e, t) {
-  const r = tt(e, t.datasets[e.dataset] ?? [], t), n = ve(r.list), o = { ...be(n, t.measurer), rowHeightFloorMm: n.rowHeightMm ?? 0 };
+function Ir(e, t) {
+  const r = rt(e, t.datasets[e.dataset] ?? [], t), n = ve(r.list), o = { ...be(n, t.measurer), 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* Sr(e) {
+function* Pr(e) {
   const { templatePage: t, current: r } = e, n = new Map(t.components.map((a, s) => [a, s])), o = (a, s, c) => {
     const i = e.datasets[a.dataset];
-    return Array.isArray(i) || e.warnings.push(`数据集 ${a.dataset} 未提供数据，列表 ${a.id ?? ""} 输出为空`), vr(a, Array.isArray(i) ? i : [], { ...e, tableId: `${e.tableId}:${n.get(a)}`, startTop: s, finished: c, flow: !!t.flow });
+    return Array.isArray(i) || e.warnings.push(`数据集 ${a.dataset} 未提供数据，列表 ${a.id ?? ""} 输出为空`), xr(a, Array.isArray(i) ? i : [], { ...e, tableId: `${e.tableId}:${n.get(a)}`, startTop: s, finished: c, flow: !!t.flow });
   };
   if (t.flow) {
-    yield* _t({
+    yield* Ut({
       page: t,
       active: () => q(e.signal),
       top: () => Math.max(r.marginTopMm, z(t)),
@@ -660,7 +680,7 @@ function* Sr(e) {
         e.pushCurrent(), r.components = [], r.heightMm = t.heightMm, t.layout === "wide" && (r.marginTopMm = 0, r.marginBottomMm = 0);
       },
       takePages: e.takePages,
-      height: (a) => xr(a, e),
+      height: (a) => Ir(a, e),
       list: o
     });
     return;
@@ -671,45 +691,45 @@ function* Sr(e) {
 function* Z(e, t, r, n, o, a = /* @__PURE__ */ new WeakMap()) {
   let s = 0, c = 0, i = 0;
   const l = (d) => `${d}_${(++s).toString(36)}`;
-  for (const { pageIndex: d, page: u } of rr(e, t, r)) {
+  for (const { pageIndex: d, page: u } of ar(e, t, r)) {
     q(r.signal);
-    const f = nr(u), m = u.components.filter(ae);
-    let w = [];
+    const f = sr(u), m = u.components.filter(ae);
+    let p = [];
     const g = (v = !1) => {
       if (q(r.signal), r.maxPages !== void 0 && c >= r.maxPages) throw new H(r.maxPages, c + 1);
-      if (r.maxCells !== void 0 && (i += [...f.components, ...m].reduce((M, y) => M + rt(y), 0), i > r.maxCells))
+      if (r.maxCells !== void 0 && (i += [...f.components, ...m].reduce((M, y) => M + nt(y), 0), i > r.maxCells))
         throw new V(r.maxCells, i);
-      w.push($r(u, f, m, ++c, v, o));
-    }, p = () => {
-      const v = w;
-      return w = [], v;
+      p.push(Tr(u, f, m, ++c, v, o));
+    }, h = () => {
+      const v = p;
+      return p = [], v;
     };
-    yield* Sr({
+    yield* Pr({
       templatePage: u,
       current: f,
       warnings: n,
       nextId: l,
       pushCurrent: g,
-      takePages: p,
+      takePages: h,
       datasets: t,
       signal: r.signal,
       formula: r.formula,
       prepared: a,
-      measurer: r.measurer ?? Le,
+      measurer: r.measurer ?? He,
       mmPerRow: r.mmPerRow ?? 0,
       tableId: `table:${d}`
-    }), g(!0), yield* p();
+    }), g(!0), yield* h();
   }
 }
-function Fn(e, t, r = {}) {
+function Kn(e, t, r = {}) {
   $e(r);
   let n = 0;
   for (const o of Z(e, t, { ...r, onWarning: void 0 }, [])) n++;
   return n;
 }
-function* Tr(e, t, r = {}) {
+function* kr(e, t, r = {}) {
   $e(r);
-  const n = Mr(e), o = /* @__PURE__ */ new WeakMap();
+  const n = Sr(e), o = /* @__PURE__ */ new WeakMap();
   let a = r.knownTotalPages;
   if (n && a === void 0) {
     a = 0;
@@ -729,26 +749,26 @@ function xe(e, t, r = {}) {
   for (const s of a) s.components = s.components.map((c) => ae(c) ? se(c, (i) => i.replace(/\{totalPages\}/g, String(a.length))) : c);
   return o.forEach((s) => n.onWarning?.(s)), { plan: { schemaVersion: ee, ...re(e) ? { requiresRecalculation: !0 } : {}, pages: a }, warnings: o };
 }
-function Ir(e) {
+function Rr(e) {
   const t = e.columns.find((a) => !a.hidden)?.field;
   if (!t) return { groups: 0, total: 0 };
   const r = oe(e), n = (a = [], s = []) => a.includes(t) || s.some((c) => c.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 Pr(e, t, r) {
-  et(e);
-  const n = Ge(t[e.dataset] ?? [], e.tree, r), o = e.columns.filter((s) => !s.hidden).length, a = e.header === !1 ? 0 : e.headerGrid ? Me(e.headerGrid) : o;
+function Er(e, t, r) {
+  tt(e);
+  const n = ze(t[e.dataset] ?? [], e.tree, r), o = e.columns.filter((s) => !s.hidden).length, a = e.header === !1 ? 0 : e.headerGrid ? Me(e.headerGrid) : o;
   return n.length * o + a + +!!e.grandTotal * 2 * o;
 }
-function An(e, t, r = {}) {
-  if (e.tree) return Pr(e, t, r.signal);
+function jn(e, t, r = {}) {
+  if (e.tree) return Er(e, t, r.signal);
   if (e.matrix) {
     let i = t[e.dataset] ?? [];
-    e.computed?.length && (i = Ve(i, { fields: e.computed, ...r }).rows), e.rowVisibleWhen && (i = i.filter((d) => D(d, e.rowVisibleWhen)));
-    const l = Bt(i, e.matrix);
+    e.computed?.length && (i = Ge(i, { fields: e.computed, ...r }).rows), e.rowVisibleWhen && (i = i.filter((d) => D(d, e.rowVisibleWhen)));
+    const l = Wt(i, e.matrix);
     return l.cells + l.columnCount;
   }
-  const n = t[e.dataset]?.length ?? 0, o = e.columns.filter((i) => !i.hidden).length, a = oe(e).length, s = Ir(e);
+  const n = t[e.dataset]?.length ?? 0, o = e.columns.filter((i) => !i.hidden).length, a = oe(e).length, s = Rr(e);
   let c = (n * (1 + 2 * a + s.groups) + +!!e.grandTotal * (1 + s.total)) * o;
   if (c += e.header === !1 ? 0 : e.headerGrid ? Me(e.headerGrid) : o, e.cardinality === "record" && n === 0 && (c += o), e.detail) {
     const i = t[e.detail.dataset]?.length ?? 0, l = e.detail.columns.filter((d) => !d.hidden).length;
@@ -757,10 +777,10 @@ function An(e, t, r = {}) {
   if (!Number.isSafeInteger(c)) throw new RangeError("报表单元格估算超出安全整数预算");
   return c;
 }
-function nt(e) {
+function ot(e) {
   return !e || typeof e != "object" ? !1 : [e.pageIndex, e.componentIndex, e.rowIndex, e.columnIndex].every((t) => Number.isInteger(t) && t >= 0);
 }
-function ot(e, t, r) {
+function at(e, t, r) {
   const n = e.grid;
   if (!n) return null;
   const o = n.cells[t];
@@ -768,20 +788,20 @@ function ot(e, t, r) {
   const s = pe(n, e.widthMm, e.heightMm).cells.filter((i) => i.ri === t).findIndex((i) => i.ci === r), c = o[s];
   return c ? { cell: c, sourceColumnIndex: s } : null;
 }
-function kr(e) {
+function Cr(e) {
   return e.value !== void 0 ? e.value : e.rawText ?? e.text ?? null;
 }
-function Rr(e, t) {
+function Fr(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 Er(e, t) {
+function Ar(e, t) {
   if (e.derived) return "derived";
   if (e.editable === !1) return "cell";
   if (e.formula !== void 0) return "formula";
   if (e.children?.length) return "complex";
   if (t.table && t.table.role !== "body" && e.editable !== !0) return "structure";
 }
-function Cr(e, t) {
+function Or(e, t) {
   const r = e.table;
   if (r)
     return {
@@ -791,38 +811,38 @@ function Cr(e, t) {
       columnKey: r.columnKeys[t.columnIndex]
     };
 }
-function Fr(e, t, r) {
+function Kr(e, t, r) {
   if (e.derived) return;
   if (e.source) return { ...e.source };
   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 at(e, t, r) {
-  const n = kr(r), o = Er(r, e);
+function st(e, t, r) {
+  const n = Cr(r), o = Ar(r, e);
   return {
     address: { ...t },
     cell: r,
     component: e,
     value: n,
-    valueType: Rr(r, n),
-    table: Cr(e, t),
-    source: Fr(r, e, t),
+    valueType: Fr(r, n),
+    table: Or(e, t),
+    source: Kr(r, e, t),
     editable: o === void 0,
     readOnlyReason: o
   };
 }
 function Se(e, t) {
-  if (!nt(t)) return null;
+  if (!ot(t)) return null;
   const r = e.pages[t.pageIndex]?.components[t.componentIndex];
   if (!r) return null;
-  const n = ot(r, t.rowIndex, t.columnIndex);
-  return n ? at(r, t, n.cell) : null;
+  const n = at(r, t.rowIndex, t.columnIndex);
+  return n ? st(r, t, n.cell) : null;
 }
 function W(e) {
   const t = /* @__PURE__ */ new Map();
   return (r) => {
-    if (!nt(r)) return null;
+    if (!ot(r)) return null;
     const n = e.pages[r.pageIndex]?.components[r.componentIndex];
     if (!n?.grid) return null;
     let o = t.get(n);
@@ -838,7 +858,7 @@ function W(e) {
       t.set(n, o);
     }
     const a = o.get(`${r.rowIndex}:${r.columnIndex}`);
-    return a ? at(n, r, a) : null;
+    return a ? st(n, r, a) : null;
   };
 }
 class b extends Error {
@@ -846,20 +866,20 @@ class b extends Error {
     super(`Invalid report cell edit: ${t}`), this.code = t, this.name = "ReportCellEditError";
   }
 }
-function Ar(e, t) {
+function jr(e, t) {
   let r = e.trim();
   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 b("number");
   return Number(r) / (n ? 100 : 1);
 }
-function Or(e, t) {
+function Nr(e, t) {
   if (e === null || typeof e == "string" && e.trim() === "") return null;
   if (typeof e != "string" && typeof e != "number") throw new b("number");
-  const r = typeof e == "number" ? e : Ar(e, Et(t.cell.numberFormat));
+  const r = typeof e == "number" ? e : jr(e, Ct(t.cell.numberFormat));
   if (!Number.isFinite(r) || Number.isInteger(r) && !Number.isSafeInteger(r)) throw new b("number");
   return r;
 }
-function Kr(e) {
+function Lr(e) {
   if (e === null || typeof e == "string" && e.trim() === "") return null;
   if (typeof e == "boolean") return e;
   const t = String(e).trim().toLowerCase();
@@ -867,24 +887,24 @@ function Kr(e) {
   if (["false", "no", "否", "0"].includes(t)) return !1;
   throw new b("boolean");
 }
-function st(e, t) {
-  return e.valueType === "number" ? Or(t, e) : e.valueType === "boolean" ? Kr(t) : t === null ? null : String(t);
+function it(e, t) {
+  return e.valueType === "number" ? Nr(t, e) : e.valueType === "boolean" ? Lr(t) : t === null ? null : String(t);
 }
-function jr(e, t) {
+function Hr(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" ? jr(t, e) : typeof t == "number" ? Rt(t, e.cell.numberFormat) : String(t);
+  return t === null ? "" : typeof t == "boolean" ? Hr(t, e) : typeof t == "number" ? Et(t, e.cell.numberFormat) : String(t);
 }
-function On(e, t, r) {
+function Nn(e, t, r) {
   const n = Se(e, t);
   if (!n) throw new b("missing");
   return U(n, r);
 }
 function U(e, t) {
   if (!e.editable) throw new b("readonly");
-  const r = st(e, t);
+  const r = it(e, t);
   return {
     address: { ...e.address },
     table: e.table,
@@ -895,33 +915,33 @@ function U(e, t) {
     text: _(e, r)
   };
 }
-function Nr(e, t) {
+function Br(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 it(e, t, r) {
-  const n = e.grid, { rowIndex: o, columnIndex: a } = t.address, s = ot(e, o, a), c = [...n.cells], i = [...c[o]], l = _(t, r.value), d = { ...s.cell, value: r.value, text: l, rawText: l };
+function ct(e, t, r) {
+  const n = e.grid, { rowIndex: o, columnIndex: a } = t.address, s = at(e, o, a), c = [...n.cells], i = [...c[o]], l = _(t, r.value), d = { ...s.cell, value: r.value, text: l, rawText: l };
   return i[s.sourceColumnIndex] = d, c[o] = i, { ...e, grid: { ...n, cells: c } };
 }
-function Lr(e, t) {
+function Wr(e, t) {
   const r = e.table?.columnKeys, n = t.table?.columnKey;
   return r && n !== void 0 ? r.flatMap((o, a) => o === n ? [a] : []) : [];
 }
-function Hr(e, t, r, n, o, a) {
+function Dr(e, t, r, n, o, a) {
   const s = t.table, c = o.table;
   if (!s || !c || s.id !== c.id || s.role !== c.role || !t.grid) return t;
   const i = c.rowIndex - s.rowIndex;
   if (i < 0 || i >= t.grid.cells.length) return t;
   let l = t;
-  for (const d of Lr(t, o)) {
+  for (const d of Wr(t, o)) {
     const u = Se(e, { pageIndex: r, componentIndex: n, rowIndex: i, columnIndex: d });
-    u?.editable && Nr(o, u) && (l = it(l, u, a));
+    u?.editable && Br(o, u) && (l = ct(l, u, a));
   }
   return l;
 }
-function Br(e, t, r, n, o, a) {
+function Vr(e, t, r, n, o, a) {
   const s = o.address;
-  return o.table?.columnKey !== void 0 ? Hr(e, t, r, n, o, a) : s.pageIndex === r && s.componentIndex === n ? it(t, o, a) : t;
+  return o.table?.columnKey !== void 0 ? Dr(e, t, r, n, o, a) : s.pageIndex === r && s.componentIndex === n ? ct(t, o, a) : t;
 }
 function Te(e, t) {
   const r = t.source;
@@ -929,21 +949,21 @@ function Te(e, t) {
   const n = e.source;
   return !n || ["datasetId", "rowKey", "field", "revision", "sourceToken"].some((o) => !Object.is(n[o], r[o]));
 }
-function Kn(e, t) {
+function Ln(e, t) {
   const r = Se(e, t.address);
   if (!r) throw new b("missing");
   if (!r.editable) throw new b("readonly");
   if (Te(r, t)) throw new b("conflict");
   if (!Object.is(r.value, t.previousValue) || (r.cell.text ?? "") !== t.previousText) throw new b("conflict");
-  const n = st(r, t.value), o = { ...t, value: n, text: _(r, n) };
+  const n = it(r, t.value), o = { ...t, value: n, text: _(r, n) };
   if (Object.is(n, r.value) && o.text === r.cell.text) return e;
   const a = e.pages.map((s, c) => {
-    const i = s.components.map((l, d) => Br(e, l, c, d, r, o));
+    const i = s.components.map((l, d) => Vr(e, l, c, d, r, o));
     return i.every((l, d) => l === s.components[d]) ? s : { ...s, components: i };
   });
   return { ...e, pages: a };
 }
-function Wr(e, t, r) {
+function Gr(e, t, r) {
   if (!r || r.revision === void 0 && r.sourceToken === void 0) return e;
   const n = new Set(t.edits.flatMap((s) => s.source ? [s.source.datasetId] : []));
   if (!n.size) return e;
@@ -953,42 +973,42 @@ function Wr(e, t, r) {
   const a = e.pages.map((s) => {
     const c = s.components.map((i) => {
       const l = i.table?.source ? o(i.table.source) : void 0, d = i.table && l !== i.table.source ? { ...i.table, source: l } : i.table, u = i.grid?.cells.map((m) => {
-        const w = m.map((g) => {
+        const p = m.map((g) => {
           if (!g?.source) return g;
-          const p = o(g.source);
-          return p === g.source ? g : { ...g, source: p };
+          const h = o(g.source);
+          return h === g.source ? g : { ...g, source: h };
         });
-        return w.some((g, p) => g !== m[p]) ? w : m;
-      }), f = i.grid && u?.some((m, w) => m !== i.grid.cells[w]) ? { ...i.grid, cells: u } : i.grid;
+        return p.some((g, h) => g !== m[h]) ? p : m;
+      }), f = i.grid && u?.some((m, p) => m !== i.grid.cells[p]) ? { ...i.grid, cells: u } : i.grid;
       return d !== i.table || f !== i.grid ? { ...i, table: d, grid: f } : i;
     });
     return c.some((i, l) => i !== s.components[l]) ? { ...s, components: c } : s;
   });
   return a.some((s, c) => s !== e.pages[c]) ? { ...e, pages: a } : e;
 }
-function Dr(e) {
+function zr(e) {
   return JSON.stringify([e.pageIndex, e.componentIndex, e.rowIndex, e.columnIndex]);
 }
-function Re(e) {
+function Ee(e) {
   const t = e.table;
-  return t?.columnKey !== void 0 ? JSON.stringify([t.id, t.role, t.rowIndex, t.columnKey]) : Dr(e.address);
+  return t?.columnKey !== void 0 ? JSON.stringify([t.id, t.role, t.rowIndex, t.columnKey]) : zr(e.address);
 }
-function Vr(e, t) {
+function Jr(e, t) {
   if (!t.length) return e;
-  const r = new Map(t.map((i) => [Re(i), i])), n = new Set(t.flatMap((i) => i.table ? [i.table.id] : [])), o = new Set(t.map((i) => `${i.address.pageIndex}:${i.address.componentIndex}`)), a = W(e);
+  const r = new Map(t.map((i) => [Ee(i), i])), n = new Set(t.flatMap((i) => i.table ? [i.table.id] : [])), o = new Set(t.map((i) => `${i.address.pageIndex}:${i.address.componentIndex}`)), a = W(e);
   function s(i, l, d) {
     const u = i.grid;
     if (!u || !o.has(`${l}:${d}`) && !n.has(i.table?.id ?? "")) return i;
     const f = /* @__PURE__ */ new Map(), m = /* @__PURE__ */ new Map();
-    for (const w of pe(u, i.widthMm, i.heightMm).cells) {
-      const g = m.get(w.ri) ?? 0;
-      m.set(w.ri, g + 1);
-      const p = a({ pageIndex: l, componentIndex: d, rowIndex: w.ri, columnIndex: w.ci }), v = p && r.get(Re(p));
-      if (!v || !p.editable) continue;
-      const M = f.get(w.ri) ?? [...u.cells[w.ri]], y = _(p, v.value);
-      Object.is(p.value, v.value) && y === p.cell.text || (M[g] = { ...w.cell, value: v.value, text: y, rawText: y }, f.set(w.ri, M));
+    for (const p of pe(u, i.widthMm, i.heightMm).cells) {
+      const g = m.get(p.ri) ?? 0;
+      m.set(p.ri, g + 1);
+      const h = a({ pageIndex: l, componentIndex: d, rowIndex: p.ri, columnIndex: p.ci }), v = h && r.get(Ee(h));
+      if (!v || !h.editable) continue;
+      const M = f.get(p.ri) ?? [...u.cells[p.ri]], y = _(h, v.value);
+      Object.is(h.value, v.value) && y === h.cell.text || (M[g] = { ...p.cell, value: v.value, text: y, rawText: y }, f.set(p.ri, M));
     }
-    return f.size ? { ...i, grid: { ...u, cells: u.cells.map((w, g) => f.get(g) ?? w) } } : i;
+    return f.size ? { ...i, grid: { ...u, cells: u.cells.map((p, g) => f.get(g) ?? p) } } : i;
   }
   const c = e.pages.map((i, l) => {
     const d = i.components.map((u, f) => s(u, l, f));
@@ -1004,7 +1024,7 @@ function A(e) {
   const n = e.address;
   return JSON.stringify([n.pageIndex, n.componentIndex, n.rowIndex, n.columnIndex]);
 }
-function jn(e, t, r) {
+function Hn(e, t, r) {
   if (typeof r != "string" || !r.trim() || !Array.isArray(t)) throw new b("missing");
   if (t.length > 1e4) throw new b("limit");
   const n = /* @__PURE__ */ new Set(), o = W(e), a = t.map(({ address: s, value: c }) => {
@@ -1016,7 +1036,7 @@ function jn(e, t, r) {
   });
   return { requestId: r, edits: a };
 }
-function Nn(e, t) {
+function Bn(e, t) {
   if (t.edits.length > 1e4) throw new b("limit");
   const r = W(e), n = /* @__PURE__ */ new Set(), o = t.edits.map((a) => {
     const s = r(a.address);
@@ -1026,9 +1046,9 @@ function Nn(e, t) {
     if (n.add(c), Te(s, a) || !Object.is(s.value, a.previousValue) || (s.cell.text ?? "") !== a.previousText) throw new b("conflict");
     return U(s, a.value);
   });
-  return Vr(e, o);
+  return Jr(e, o);
 }
-function Ln(e) {
+function Wn(e) {
   const t = /* @__PURE__ */ new Map();
   for (const r of e) {
     const n = A(r), o = t.get(n), a = o ? { ...r, previousValue: o.previousValue, previousText: o.previousText } : { ...r };
@@ -1042,12 +1062,12 @@ function B(e, t) {
     e.first = Math.imul(e.first ^ n, 16777619), e.second = Math.imul(e.second, 33) ^ n, e.count++;
   }
 }
-function Gr(e, t, r) {
+function qr(e, t, r) {
   const n = Object.getOwnPropertyDescriptor(e, t);
   if (!n || n.get || n.set) throw new b("conflict");
-  B(r, `${t.length}:${t}`), ct(n.value, r);
+  B(r, `${t.length}:${t}`), lt(n.value, r);
 }
-function zr(e, t) {
+function _r(e, t) {
   if (Object.getOwnPropertyDescriptor(e, "toJSON")) throw new b("conflict");
   if (t.active.has(e)) throw new b("conflict");
   if (t.active.add(e), e instanceof Date) B(t, `date:${Date.prototype.getTime.call(e)};`);
@@ -1055,27 +1075,27 @@ function zr(e, t) {
     const r = Object.getPrototypeOf(e);
     if (!Array.isArray(e) && r !== Object.prototype && r !== null) throw new b("conflict");
     const n = Object.keys(e);
-    B(t, `${Array.isArray(e) ? "array" : "object"}:${Array.isArray(e) ? e.length : n.length}:{`), n.forEach((o) => Gr(e, o, t)), B(t, "}");
+    B(t, `${Array.isArray(e) ? "array" : "object"}:${Array.isArray(e) ? e.length : n.length}:{`), n.forEach((o) => qr(e, o, t)), B(t, "}");
   }
   t.active.delete(e);
 }
-function ct(e, t) {
+function lt(e, t) {
   if (++t.nodes > 1e6) throw new b("limit");
   if (e === null) {
     B(t, "null;");
     return;
   }
   if (typeof e == "object") {
-    zr(e, t);
+    _r(e, t);
     return;
   }
   if (typeof e == "function" || typeof e == "symbol") throw new b("conflict");
   const r = String(e);
   B(t, `${typeof e}:${r.length}:${r};`);
 }
-function Ee(e) {
+function Ce(e) {
   const t = { first: 2166136261, second: 5381, count: 0, nodes: 0, active: /* @__PURE__ */ new Set() };
-  return ct(e, t), `${t.count}:${t.first >>> 0}:${t.second >>> 0}`;
+  return lt(e, t), `${t.count}:${t.first >>> 0}:${t.second >>> 0}`;
 }
 function fe(e, t, r) {
   if (++r.nodes > 1e6) throw new b("limit");
@@ -1088,22 +1108,22 @@ function fe(e, t, r) {
   const n = Array.isArray(e) ? e.map((o) => fe(o, t, r)) : Object.fromEntries(Object.entries(e).map(([o, a]) => [o, fe(a, t, r)]));
   return t.delete(e), n;
 }
-function Jr(e) {
+function Ur(e) {
   return fe(e, /* @__PURE__ */ new Set(), { nodes: 0, text: 0 });
 }
-function lt(e) {
+function dt(e) {
   const t = [];
   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 Ce(e) {
+function Fe(e) {
   return JSON.stringify([e.datasetId, e.rowKey]);
 }
-function dt(e) {
+function ut(e) {
   const t = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Set();
   return e.forEach((n, o) => {
-    for (const a of lt(n)) {
+    for (const a of dt(n)) {
       if (!a.rowKey) continue;
       const s = a.relation, c = s ? new Set(s.parentRows.map((i) => JSON.stringify(i[s.detail.parentKey]))) : void 0;
       (n.datasets[a.dataset] ?? []).forEach((i, l) => {
@@ -1113,18 +1133,18 @@ function dt(e) {
         const u = `${o}:${a.dataset}:${l}:${a.rowKey}`;
         if (r.has(u)) return;
         r.add(u);
-        const f = Ce({ datasetId: a.dataset, rowKey: d }), m = t.get(f) ?? [];
+        const f = Fe({ datasetId: a.dataset, rowKey: d }), m = t.get(f) ?? [];
         m.push({ partIndex: o, dataset: a.dataset, rowIndex: l, row: i, binding: a }), t.set(f, m);
       });
     }
   }), (n) => {
-    const o = t.get(Ce(n));
+    const o = t.get(Fe(n));
     if (!o?.length) throw new b("missing");
     if (new Set(o.map((a) => `${a.partIndex}:${a.dataset}`)).size !== o.length) throw new b("conflict");
     return o;
   };
 }
-function ut(e, t) {
+function ft(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 c = r[o.partIndex], i = `${o.partIndex}:${o.dataset}`;
@@ -1132,10 +1152,10 @@ function ut(e, t) {
   }
   return r;
 }
-function qr(e, t, r) {
+function Xr(e, t, r) {
   const n = [], o = /* @__PURE__ */ new Set();
   return e.forEach((a, s) => {
-    for (const c of lt(a))
+    for (const c of dt(a))
       t.has(c.dataset) && (a.datasets[c.dataset] ?? []).forEach((i, l) => {
         const d = { partIndex: s, dataset: c.dataset, rowIndex: l, row: i, binding: c };
         for (const [u, f] of [[c.revisionField, r.revision], [c.sourceTokenField, r.sourceToken]]) {
@@ -1146,7 +1166,7 @@ function qr(e, t, r) {
       });
   }), n;
 }
-function ft(e) {
+function mt(e) {
   const t = /* @__PURE__ */ new Map(), r = W(e);
   return e.pages.forEach((n, o) => n.components.forEach((a, s) => {
     if (!(!a.grid || a.table?.role !== "body"))
@@ -1156,17 +1176,17 @@ function ft(e) {
       }
   })), t;
 }
-function Hn(e, t, r) {
-  const n = ft(e), o = W(e);
+function Dn(e, t, r) {
+  const n = mt(e), o = W(e);
   return t.map((a) => {
     const s = a.source ? n.get(A(a)) : o(a.address);
     if (!s || A(s) !== A(a)) throw new b("missing");
     return { address: { ...s.address }, value: a[r] };
   });
 }
-async function mt(e, t, r = {}) {
+async function gt(e, t, r = {}) {
   const n = [], o = { ...r, knownTotalPages: void 0 };
-  for (const a of Tr(e, t, o))
+  for (const a of kr(e, t, o))
     n.push(a), n.length % 8 === 0 && await new Promise((s) => setTimeout(s, 0));
   if (r.signal?.aborted) {
     const a = new Error("报表重算已取消");
@@ -1175,19 +1195,19 @@ async function mt(e, t, r = {}) {
   return { schemaVersion: ee, ...re(e) ? { requiresRecalculation: !0 } : {}, pages: n };
 }
 const me = /* @__PURE__ */ new WeakMap();
-function Bn(e) {
+function Vn(e) {
   return me.get(e);
 }
-function Y(e) {
+function X(e) {
   if (e?.aborted) {
     const t = new Error("报表重算已取消");
     throw t.name = "AbortError", t;
   }
 }
-function gt(e, t) {
+function pt(e, t) {
   return e[t] === void 0 ? "" : e[t];
 }
-function _r(e, t) {
+function Yr(e, t) {
   if (t.edits.length > 1e4) throw new b("limit");
   const r = W(e), n = /* @__PURE__ */ new Set(), o = [], a = t.edits.map((s) => {
     const c = r(s.address);
@@ -1199,12 +1219,12 @@ function _r(e, t) {
   });
   return { batch: { requestId: t.requestId, edits: a }, contexts: o };
 }
-function Ur(e, t) {
-  const r = dt(e);
+function Qr(e, t) {
+  const r = ut(e);
   return t.flatMap((n) => {
     if (!n.source) throw new b("missing");
     return r(n.source).map((o) => {
-      if (!Object.is(gt(o.row, n.source.field), n.previousValue)) throw new b("conflict");
+      if (!Object.is(pt(o.row, n.source.field), n.previousValue)) throw new b("conflict");
       if (o.binding.rowKey === n.source.field) throw new b("readonly");
       return { row: o, field: n.source.field, value: n.value };
     });
@@ -1214,34 +1234,34 @@ function le(e, t, r) {
   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: _(n, n.value) }, n;
 }
-function Yr(e, t, r) {
+function Zr(e, t, r) {
   if (!r || r.revision === void 0 && r.sourceToken === void 0) return [...e];
   const n = new Set(t.edits.flatMap((o) => o.source ? [o.source.datasetId] : []));
-  return ut(e, qr(e, n, r));
+  return ft(e, Xr(e, n, r));
 }
-function pt(e, t) {
+function ht(e, t) {
   let r = t.parts;
-  const n = t.rebuild, o = Ee(r);
+  const n = t.rebuild, o = Ce(r);
   let a = e, s;
   const c = /* @__PURE__ */ new Map();
   function i(u) {
     if (u !== a) throw new b("conflict");
     if (s) return s;
-    if (Ee(r) !== o) throw new b("conflict");
-    return Jr(r);
+    if (Ce(r) !== o) throw new b("conflict");
+    return Ur(r);
   }
-  async function l(u, f, m, w = {}) {
-    Y(w.signal), f = { requestId: f.requestId, edits: f.edits.map((y) => ({ ...y, address: { ...y.address }, source: y.source ? { ...y.source } : void 0, table: y.table ? { ...y.table } : void 0 })) }, m = m.map((y) => ({ ...y, address: { ...y.address }, source: y.source ? { ...y.source } : void 0, table: y.table ? { ...y.table } : void 0, cell: { ...y.cell } })), await new Promise((y) => setTimeout(y, 0)), Y(w.signal);
-    const g = i(u), p = ut(g, Ur(g, f.edits)), v = await n(p, w.signal);
-    Y(w.signal);
+  async function l(u, f, m, p = {}) {
+    X(p.signal), f = { requestId: f.requestId, edits: f.edits.map((y) => ({ ...y, address: { ...y.address }, source: y.source ? { ...y.source } : void 0, table: y.table ? { ...y.table } : void 0 })) }, m = m.map((y) => ({ ...y, address: { ...y.address }, source: y.source ? { ...y.source } : void 0, table: y.table ? { ...y.table } : void 0, cell: { ...y.cell } })), await new Promise((y) => setTimeout(y, 0)), X(p.signal);
+    const g = i(u), h = ft(g, Qr(g, f.edits)), v = await n(h, p.signal);
+    X(p.signal);
     let M = !1;
     return { plan: v, commit(y) {
-      if (Y(w.signal), M || a !== u) throw new b("conflict");
+      if (X(p.signal), M || a !== u) throw new b("conflict");
       if (y?.conflicts?.length) throw new b("conflict");
-      const N = Yr(p, f, y), O = Wr(v, f, y);
+      const N = Zr(h, f, y), O = Gr(v, f, y);
       if (y) {
         const k = new Set(f.edits.map((R) => R.source.datasetId));
-        for (const [R, h] of c) k.has(h.source.datasetId) && c.set(R, le(h, h.value, y));
+        for (const [R, w] of c) k.has(w.source.datasetId) && c.set(R, le(w, w.value, y));
       }
       return m.forEach((k, R) => c.set(A(k), le(k, f.edits[R].value, y))), M = !0, s = N, r = void 0, a = O, me.set(a, d), a;
     } };
@@ -1251,29 +1271,29 @@ function pt(e, t) {
       return a;
     },
     async prepare(u, f, m) {
-      const w = _r(u, f);
-      return l(u, w.batch, w.contexts, m);
+      const p = Yr(u, f);
+      return l(u, p.batch, p.contexts, m);
     },
-    async prepareHistory(u, f, m, w, g) {
-      if (!w.trim() || f.length > 1e4) throw new b("limit");
-      const p = i(u), v = dt(p), M = ft(u), y = /* @__PURE__ */ new Set(), O = f.map((h) => {
-        if (!h.source) throw new b("missing");
-        const $ = A(h);
+    async prepareHistory(u, f, m, p, g) {
+      if (!p.trim() || f.length > 1e4) throw new b("limit");
+      const h = i(u), v = ut(h), M = mt(u), y = /* @__PURE__ */ new Set(), O = f.map((w) => {
+        if (!w.source) throw new b("missing");
+        const $ = A(w);
         if (y.has($)) throw new b("duplicate");
         y.add($);
         const x = M.get($) ?? c.get($);
         if (!x?.source) throw new b("missing");
         const I = v(x.source)[0];
-        return le(x, gt(I.row, x.source.field));
-      }).map((h, $) => ({ context: h, edit: U(h, f[$][m]) })).filter(({ edit: h }) => !Object.is(h.previousValue, h.value)), k = { requestId: w, edits: O.map(({ edit: h }) => h) }, R = O.map(({ context: h }) => h);
+        return le(x, pt(I.row, x.source.field));
+      }).map((w, $) => ({ context: w, edit: U(w, f[$][m]) })).filter(({ edit: w }) => !Object.is(w.previousValue, w.value)), k = { requestId: p, edits: O.map(({ edit: w }) => w) }, R = O.map(({ context: w }) => w);
       return { batch: k, contexts: R, prepared: await l(u, k, R, g) };
     }
   };
   return me.set(e, d), d;
 }
-function Wn(e) {
+function Gn(e) {
   const t = xe(e.template, e.datasets, e.pagination).plan;
-  return pt(t, { parts: [{ template: e.template, datasets: e.datasets }], rebuild: (r, n) => mt(r[0].template, r[0].datasets, { ...e.pagination, signal: n }) });
+  return ht(t, { parts: [{ template: e.template, datasets: e.datasets }], rebuild: (r, n) => gt(r[0].template, r[0].datasets, { ...e.pagination, signal: n }) });
 }
 function Ie(e, t, r = {}) {
   const n = /* @__PURE__ */ new Map();
@@ -1287,20 +1307,20 @@ function Ie(e, t, r = {}) {
   const o = { ...t };
   for (const [a, s] of n) {
     const c = Math.min(s.maxRows ?? 1e5, r.maxRows ?? 1 / 0);
-    o[a] = Ge(t[a] ?? [], { ...s, maxRows: c }, r.signal);
+    o[a] = ze(t[a] ?? [], { ...s, maxRows: c }, r.signal);
   }
   return o;
 }
-function Xr(e, t, r = {}) {
+function en(e, t, r = {}) {
   return Object.values(Ie(e, t, r)).reduce((n, o) => n + o.length, 0);
 }
-function Dn(e, t, r) {
-  const n = Ft(r), o = e?.pages.flatMap((c) => c.components).find((c) => c.kind === "list" && c.dataset === t && c.tree?.input === "nested");
+function zn(e, t, r) {
+  const n = At(r), o = e?.pages.flatMap((c) => c.components).find((c) => c.kind === "list" && c.dataset === t && c.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 Vn(e) {
+function Jn(e) {
   if (!("mapData" in e)) return e;
   const { load: t, mapData: r, ...n } = e;
   return { ...n, load: async (o) => {
@@ -1340,48 +1360,48 @@ function ge(e, t) {
     );
   }) : Promise.resolve(e);
 }
-function Qr(e, t) {
+function tn(e, t) {
   if (!e || typeof e != "object" || Array.isArray(e))
     throw new S("validate", `报表 ${t} 的数据集应为对象`);
   for (const [r, n] of Object.entries(e))
     if (!Array.isArray(n) || n.some((o) => !o || typeof o != "object" || Array.isArray(o)))
       throw new S("validate", `报表 ${t} 的数据集 ${r} 应为对象数组`);
 }
-async function Zr(e, t, r) {
+async function rn(e, t, r) {
   const { reportId: n, signal: o } = t;
   try {
     const a = await ge(e(t), o);
     C(o);
-    const s = It(a);
+    const s = Pt(a);
     if (!s.ok)
       throw new S("validate", `报表 ${n} 模板校验失败：${s.errors.slice(0, 3).map((c) => `${c.path}: ${c.message}`).join("; ")}`);
     return r.push(...s.warnings.map((c) => `${n}: ${c.path}: ${c.message}`)), a;
   } catch (a) {
-    throw o?.aborted ? ie(o) : a instanceof S ? a : a instanceof Pt ? new S("validate", `报表 ${n} 模板校验失败：${a.message}`, a) : new S("fetch", `报表 ${n} 模板加载失败：${a instanceof Error ? a.message : String(a)}`, a);
+    throw o?.aborted ? ie(o) : a instanceof S ? a : a instanceof kt ? new S("validate", `报表 ${n} 模板校验失败：${a.message}`, a) : new S("fetch", `报表 ${n} 模板加载失败：${a instanceof Error ? a.message : String(a)}`, a);
   }
 }
-async function en(e, t, r, n) {
+async function nn(e, t, r, n) {
   const o = t.signal;
   let a;
   try {
     if (e.load) a = await ge(e.load(t), o);
     else if (e.provider) {
       const s = await ge(e.provider.query(t), o);
-      C(o), tn(s, r), a = s.datasets, n?.(r, s);
+      C(o), on(s, r), a = s.datasets, n?.(r, s);
     } else a = e.datasets ?? {};
   } catch (s) {
     throw o?.aborted ? ie(o) : s instanceof S ? s : new S("fetch", `报表 ${r} 取数失败：${s instanceof Error ? s.message : String(s)}`, s);
   }
   return C(o), a;
 }
-function tn(e, t) {
+function on(e, t) {
   if (!e || typeof e != "object" || Array.isArray(e)) throw new S("validate", `报表 ${t} Provider 应返回 datasets 结果对象`);
   for (const r of ["revision", "sourceToken"])
     if (e[r] !== void 0 && typeof e[r] != "string") throw new S("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 S("validate", `报表 ${t} Provider diagnostics 不符合结构化诊断契约`);
 }
-function rn(e, t, r, n, o) {
+function an(e, t, r, n, o) {
   try {
     t = Ie(n, t, { maxRows: e.dataValidation?.maxRows, signal: o });
   } catch (a) {
@@ -1390,23 +1410,23 @@ function rn(e, t, r, n, o) {
   for (const [a, s] of Object.entries(e.dataSchema ?? {})) {
     let c;
     try {
-      c = Ke(Object.prototype.hasOwnProperty.call(t, a) ? t[a] : void 0, s, { ...e.dataValidation, path: `$.datasets.${a}` });
+      c = je(Object.prototype.hasOwnProperty.call(t, a) ? t[a] : void 0, s, { ...e.dataValidation, path: `$.datasets.${a}` });
     } catch (i) {
       throw new S("config", `报表 ${r} 数据集 ${a} 字段契约配置无效`, i);
     }
     if (!c.ok) throw new S("validate", `报表 ${r} 数据集 ${a} 不符合字段契约：${c.issues[0]?.message}`, { issues: c.issues });
   }
 }
-function ht(e, t) {
+function wt(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 wt(e) {
+function yt(e) {
   const t = (r) => r.grid?.cells.reduce((n, o) => n + o.reduce((a, s) => a + (s ? 1 + (s.children?.reduce((c, i) => c + t(i), 0) ?? 0) : 0), 0), 0) ?? 0;
   return e.pages.reduce((r, n) => r + n.components.reduce((o, a) => o + t(a), 0), 0);
 }
-function yt(e, t, r, n) {
+function bt(e, t, r, n) {
   return {
     ...e,
     signal: n ?? e?.signal,
@@ -1414,11 +1434,11 @@ function yt(e, t, r, n) {
     ...r === void 0 ? {} : { maxCells: Math.max(1, Math.min(r, e?.maxCells ?? r)) }
   };
 }
-function nn(e, t, r, n, o, a) {
+function sn(e, t, r, n, o, a) {
   const s = o.maxPages === void 0 ? void 0 : o.maxPages - o.usedPages, c = o.maxCells === void 0 ? void 0 : o.maxCells - o.usedCells;
   try {
-    if (s !== void 0 && s < 1 && e.pages.length && !ht(e, t)) throw new H(0, 1);
-    const i = yt(r.pagination, s, c, a), l = xe(e, t, i), d = wt(l.plan);
+    if (s !== void 0 && s < 1 && e.pages.length && !wt(e, t)) throw new H(0, 1);
+    const i = bt(r.pagination, s, c, a), l = xe(e, t, i), d = yt(l.plan);
     if (c !== void 0 && d > c) throw new V(c, d);
     return { ...l, cells: d };
   } catch (i) {
@@ -1426,7 +1446,7 @@ function nn(e, t, r, n, o, a) {
     throw i instanceof H && o.maxPages !== void 0 && i.limit === s && (l = new H(o.maxPages, o.usedPages + i.actual)), i instanceof V && o.maxCells !== void 0 && (l = new V(o.maxCells, o.usedCells + i.actual)), new S("validate", `报表 ${n} 排版失败：${l instanceof Error ? l.message : String(l)}`, l);
   }
 }
-function bt(e, t, r, n) {
+function vt(e, t, r, n) {
   const o = /* @__PURE__ */ new Map(), a = (s) => {
     let c = o.get(s);
     return c === void 0 && (c = JSON.stringify([r, n, s]), o.set(s, c)), c;
@@ -1440,22 +1460,22 @@ function bt(e, t, r, n) {
     } : c)
   });
 }
-async function on(e, t, r, n, o) {
+async function cn(e, t, r, n, o) {
   const a = [];
   let s = 0;
   for (const [l, d] of e.entries()) {
     C(o);
     const u = n.maxPages === void 0 ? void 0 : n.maxPages - a.length, f = n.maxCells === void 0 ? void 0 : n.maxCells - s;
-    if (u !== void 0 && u < 1 && d.template.pages.length && !ht(d.template, d.datasets)) throw new H(n.maxPages, a.length + 1);
-    const m = await mt(d.template, d.datasets, yt(t[l]?.pagination, u, f, o));
-    if (s += wt(m), n.maxCells !== void 0 && s > n.maxCells) throw new V(n.maxCells, s);
-    bt(a, m, l, r[l]);
+    if (u !== void 0 && u < 1 && d.template.pages.length && !wt(d.template, d.datasets)) throw new H(n.maxPages, a.length + 1);
+    const m = await gt(d.template, d.datasets, bt(t[l]?.pagination, u, f, o));
+    if (s += yt(m), n.maxCells !== void 0 && s > n.maxCells) throw new V(n.maxCells, s);
+    vt(a, m, l, r[l]);
   }
-  const c = { schemaVersion: ee, ...e.some((l) => re(l.template)) ? { requiresRecalculation: !0 } : {}, pages: a }, i = Oe(c);
+  const c = { schemaVersion: ee, ...e.some((l) => re(l.template)) ? { requiresRecalculation: !0 } : {}, pages: a }, i = Ke(c);
   if (!i.ok) throw new S("validate", `重算渲染计划校验失败：${i.errors[0]?.message}`);
   return c;
 }
-function Gn(e, t = {}) {
+function qn(e, t = {}) {
   if (t.maxPages !== void 0 && (!Number.isSafeInteger(t.maxPages) || t.maxPages < 1)) throw new S("config", "maxPages 应为正安全整数");
   if (t.maxCells !== void 0 && (!Number.isSafeInteger(t.maxCells) || t.maxCells < 1)) throw new S("config", "maxCells 应为正安全整数");
   function r(o) {
@@ -1465,55 +1485,55 @@ function Gn(e, t = {}) {
   }
   return Object.assign(async ({ reportIds: o, params: a, signal: s, onWarning: c, onQueryResult: i, ...l }) => {
     C(s);
-    const d = Ct({ ...l, signal: s }), u = [...o], f = { ...a };
+    const d = Ft({ ...l, signal: s }), u = [...o], f = { ...a };
     if (u.length === 0) throw new S("config", "缺少报表 ID");
-    const m = u.map(r), w = d.runSync("validate", () => m.map((h) => Pe(
-      h.params ?? (typeof h.template == "function" ? [] : h.template.params) ?? [],
+    const m = u.map(r), p = d.runSync("validate", () => m.map((w) => Pe(
+      w.params ?? (typeof w.template == "function" ? [] : w.template.params) ?? [],
       f
-    ))), g = [], p = [];
+    ))), g = [], h = [];
     let v = 0;
     const M = [];
-    for (const [h, $] of m.entries()) {
+    for (const [w, $] of m.entries()) {
       C(s);
-      const x = u[h], I = { reportId: x, params: w[h], signal: s }, P = typeof $.template == "function" ? await d.run("query", () => Zr($.template, I, M), x) : $.template;
+      const x = u[w], I = { reportId: x, params: p[w], signal: s }, P = typeof $.template == "function" ? await d.run("query", () => rn($.template, I, M), x) : $.template;
       I.params = d.runSync("validate", () => Pe($.params ?? P.params ?? [], I.params), x);
-      const K = await d.run("query", () => en($, I, x, i), x);
+      const K = await d.run("query", () => nn($, I, x, i), x);
       d.runSync("validate", () => {
-        Qr(K, x), t.onDatasets?.(x, K, P), rn($, K, x, P, s);
+        tn(K, x), t.onDatasets?.(x, K, P), an($, K, x, P, s);
       }, x), C(s);
-      const ce = d.runSync("layout", () => nn(P, K, $, x, { maxPages: t.maxPages, usedPages: g.length, maxCells: t.maxCells, usedCells: v }, s), x);
-      v += ce.cells, p.push({ template: P, datasets: K }), bt(g, ce.plan, h, x), M.push(...ce.warnings.map((Mt) => `${x}: ${Mt}`));
+      const ce = d.runSync("layout", () => sn(P, K, $, x, { maxPages: t.maxPages, usedPages: g.length, maxCells: t.maxCells, usedCells: v }, s), x);
+      v += ce.cells, h.push({ template: P, datasets: K }), vt(g, ce.plan, w, x), M.push(...ce.warnings.map(($t) => `${x}: ${$t}`));
     }
     C(s);
-    const y = { schemaVersion: ee, ...p.some((h) => re(h.template)) ? { requiresRecalculation: !0 } : {}, pages: g }, N = d.runSync("validate", () => {
-      const h = Oe(y);
-      if (!h.ok) throw new S("validate", `渲染计划校验失败：${h.errors.slice(0, 3).map(($) => `${$.path}: ${$.message}`).join("; ")}`);
-      return h;
+    const y = { schemaVersion: ee, ...h.some((w) => re(w.template)) ? { requiresRecalculation: !0 } : {}, pages: g }, N = d.runSync("validate", () => {
+      const w = Ke(y);
+      if (!w.ok) throw new S("validate", `渲染计划校验失败：${w.errors.slice(0, 3).map(($) => `${$.path}: ${$.message}`).join("; ")}`);
+      return w;
     });
-    M.push(...N.warnings.map((h) => `${h.path}: ${h.message}`));
-    const O = m.map((h) => ({ ...h, pagination: { ...h.pagination } })), k = { maxPages: t.maxPages, maxCells: t.maxCells };
+    M.push(...N.warnings.map((w) => `${w.path}: ${w.message}`));
+    const O = m.map((w) => ({ ...w, pagination: { ...w.pagination } })), k = { maxPages: t.maxPages, maxCells: t.maxCells };
     try {
-      pt(y, { parts: p, rebuild: (h, $) => on(h, O, u, k, $) });
+      ht(y, { parts: h, rebuild: (w, $) => cn(w, O, u, k, $) });
     } catch {
       M.push("来源数据无法建立本地重算口径；当前预览仅支持计划内编辑，请使用可序列化模板数据启用规则重算");
     }
-    const R = c ?? t.onWarning ?? ((h) => console.warn("[mach-report]", h));
-    for (const h of M)
-      C(s), R(h);
+    const R = c ?? t.onWarning ?? ((w) => console.warn("[mach-report]", w));
+    for (const w of M)
+      C(s), R(w);
     return C(s), y;
   }, {
-    getParamDefs: (o) => $t(e, o)
+    getParamDefs: (o) => xt(e, o)
   });
 }
-function Fe(e) {
+function Ae(e) {
   if (e === void 0) return;
   const t = typeof e == "string" ? e : JSON.stringify(e);
   return t.length > 160 ? t.slice(0, 157) + "…" : t;
 }
-function an(e) {
+function ln(e) {
   return /\.(?:repeat|binding)(?:\.|$)/.test(e) ? /\.format(?:\.|$)/.test(e) ? "format" : "binding" : /\.tree\.(?:idField|parentField|childrenField|labelField|input)$/.test(e) ? "binding" : /\.tree\.parentValues$/.test(e) ? "calculation" : /\.tree\.indentMm$/.test(e) ? "format" : /\.(?:computed|computeOptions|groups|groupBy|aggregates|grandTotal)(?:\.|\[|$)/.test(e) ? "calculation" : /\.(?:dataset|field|rowKey|revisionField|sourceTokenField|foreignKey|parentKey)$/.test(e) ? "binding" : /\.(?:style|headerStyle|format|rules|align|headerAlign|semanticRole|unit)(?:\.|\[|$)/.test(e) ? "format" : e.startsWith("$.template") ? "structure" : "metadata";
 }
-function Ae(e) {
+function Oe(e) {
   const t = /* @__PURE__ */ new Map();
   for (const r of e) {
     if (!r || typeof r != "object" || !("field" in r) || typeof r.field != "string" || t.has(r.field)) return;
@@ -1521,26 +1541,26 @@ function Ae(e) {
   }
   return t;
 }
-function sn(e, t, r) {
+function dn(e, t, r) {
   return !e.startsWith("$.template.params") || t === "moved" ? !1 : /\.(?:type|required|min|max|minLength|maxLength|options|defaultValue)(?:\[|$)/.test(e) ? !0 : t !== "added" ? !1 : Array.isArray(r) ? r.some((n) => !!n && typeof n == "object" && "required" in n && n.required === !0) : !!r && typeof r == "object" && "required" in r && r.required === !0;
 }
-function cn(e, t, r = {}) {
+function un(e, t, r = {}) {
   const n = de(e), o = de(t), a = r.maxChanges ?? 500;
   if (!Number.isSafeInteger(a) || a < 1 || a > 1e4) throw new RangeError("maxChanges must be between 1 and 10000");
   const s = { changes: [], totalChanges: 0, breakingChanges: 0, truncated: !1 };
   function c(d, u, f, m) {
-    const w = an(u), g = d !== "moved" && (w === "binding" || u === "$.id" || d === "removed" && w === "structure" || sn(u, d, m));
-    s.totalChanges++, g && s.breakingChanges++, s.changes.length < a && s.changes.push({ kind: d, category: w, path: u, before: Fe(f), after: Fe(m), breaking: g });
+    const p = ln(u), g = d !== "moved" && (p === "binding" || u === "$.id" || d === "removed" && p === "structure" || dn(u, d, m));
+    s.totalChanges++, g && s.breakingChanges++, s.changes.length < a && s.changes.push({ kind: d, category: p, path: u, before: Ae(f), after: Ae(m), breaking: g });
   }
   function i(d, u, f) {
-    const m = Ae(d), w = Ae(u);
-    if (!m || !w) return !1;
-    const g = new Map(u.map((p, v) => [p.field, v]));
-    Array.from(m).forEach(([p, v], M) => {
-      const y = `${f}[${JSON.stringify(p)}]`;
-      w.has(p) ? (g.get(p) !== M && c("moved", y, M, g.get(p)), l(v, w.get(p), y)) : c("removed", y, v, void 0);
+    const m = Oe(d), p = Oe(u);
+    if (!m || !p) return !1;
+    const g = new Map(u.map((h, v) => [h.field, v]));
+    Array.from(m).forEach(([h, v], M) => {
+      const y = `${f}[${JSON.stringify(h)}]`;
+      p.has(h) ? (g.get(h) !== M && c("moved", y, M, g.get(h)), l(v, p.get(h), y)) : c("removed", y, v, void 0);
     });
-    for (const [p, v] of w) m.has(p) || c("added", `${f}[${JSON.stringify(p)}]`, void 0, v);
+    for (const [h, v] of p) m.has(h) || c("added", `${f}[${JSON.stringify(h)}]`, void 0, v);
     return !0;
   }
   function l(d, u, f) {
@@ -1553,8 +1573,8 @@ function cn(e, t, r = {}) {
         if ((f.endsWith(".columns") || f.endsWith(".params")) && i(d, u, f)) return;
         for (let m = 0; m < Math.max(d.length, u.length); m++) l(d[m], u[m], `${f}[${m}]`);
       } else if (d && u && typeof d == "object" && typeof u == "object" && !Array.isArray(d) && !Array.isArray(u)) {
-        const m = d, w = u;
-        for (const g of /* @__PURE__ */ new Set([...Object.keys(m), ...Object.keys(w)])) l(m[g], w[g], `${f}.${g}`);
+        const m = d, p = u;
+        for (const g of /* @__PURE__ */ new Set([...Object.keys(m), ...Object.keys(p)])) l(m[g], p[g], `${f}.${g}`);
       } else c("modified", f, d, u);
     }
   }
@@ -1575,26 +1595,26 @@ function L(e, t, r) {
     for (const [n, o] of Object.entries(e))
       ["field", "weightField"].includes(n) ? T(o, `${t}.${n}`, r) : n !== "value" && n !== "style" && L(o, `${t}.${n}`, r);
 }
-function X(e, t, r) {
+function Y(e, t, r) {
   Array.isArray(e) && e.forEach((n, o) => {
     E(n) && (typeof n.field == "string" && n.valueField !== void 0 && n.valueField !== n.field && r.summaries.add(n.field), T(n.valueField ?? n.field, `${t}[${o}].valueField`, r.fields), T(n.weightField, `${t}[${o}].weightField`, r.fields));
   });
 }
-function ln(e, t, r) {
+function fn(e, t, r) {
   for (const o of ["rowKey", "revisionField", "sourceTokenField"]) T(e[o], `${t}.${o}`, r.fields);
   if (!e.matrix && Array.isArray(e.columns) && e.columns.forEach((o, a) => {
     E(o) && (typeof o.field == "string" && r.fields.push({ field: o.field, path: `${t}.columns[${a}].field`, summary: !0 }), L(o.rules, `${t}.columns[${a}].rules`, r.fields), L(o.visibleWhen, `${t}.columns[${a}].visibleWhen`, r.fields));
   }), L(e.rowVisibleWhen, `${t}.rowVisibleWhen`, r.fields), Array.isArray(e.computed) && e.computed.forEach((o, a) => {
     E(o) && (typeof o.field == "string" && r.generated.add(o.field), L(o.expression, `${t}.computed[${a}].expression`, r.fields), T(o.dependsOn, `${t}.computed[${a}].dependsOn`, r.fields), T(o.groupBy, `${t}.computed[${a}].groupBy`, r.fields));
   }), (Array.isArray(e.groups) ? e.groups : e.groupBy ? [e.groupBy] : []).forEach((o, a) => {
-    E(o) && (T(o.field, `${t}.groups[${a}].field`, r.fields), T(o.subtotal, `${t}.groups[${a}].subtotal`, r.fields), X(o.aggregates, `${t}.groups[${a}].aggregates`, r));
-  }), E(e.grandTotal) && (T(e.grandTotal.fields, `${t}.grandTotal.fields`, r.fields), X(e.grandTotal.aggregates, `${t}.grandTotal.aggregates`, r)), E(e.matrix) && (T(e.matrix.rowFields, `${t}.matrix.rowFields`, r.fields), T(e.matrix.columnFields, `${t}.matrix.columnFields`, r.fields), X(e.matrix.measures, `${t}.matrix.measures`, r)), E(e.tree)) {
+    E(o) && (T(o.field, `${t}.groups[${a}].field`, r.fields), T(o.subtotal, `${t}.groups[${a}].subtotal`, r.fields), Y(o.aggregates, `${t}.groups[${a}].aggregates`, r));
+  }), E(e.grandTotal) && (T(e.grandTotal.fields, `${t}.grandTotal.fields`, r.fields), Y(e.grandTotal.aggregates, `${t}.grandTotal.aggregates`, r)), E(e.matrix) && (T(e.matrix.rowFields, `${t}.matrix.rowFields`, r.fields), T(e.matrix.columnFields, `${t}.matrix.columnFields`, r.fields), Y(e.matrix.measures, `${t}.matrix.measures`, r)), E(e.tree)) {
     for (const o of ["idField", "parentField", "labelField"]) T(e.tree[o], `${t}.tree.${o}`, r.fields);
-    X(e.tree.aggregates, `${t}.tree.aggregates`, r);
+    Y(e.tree.aggregates, `${t}.tree.aggregates`, r);
   }
   E(e.detail) && T(e.detail.parentKey, `${t}.detail.parentKey`, r.fields);
 }
-function vt(e) {
+function Mt(e) {
   const t = [], r = e.repeat, n = r ? { dataset: r.dataset, path: "$.template.repeat", fields: [], generated: /* @__PURE__ */ new Set(), summaries: /* @__PURE__ */ new Set() } : void 0;
   n && r && (T(r.rowKey, "$.template.repeat.rowKey", n.fields), typeof r.copies == "object" && T(r.copies.field, "$.template.repeat.copies.field", n.fields), t.push(n));
   function o(a, s) {
@@ -1605,15 +1625,15 @@ function vt(e) {
     if (E(a)) {
       if (n && E(a.binding) && T(a.binding.field, `${s}.binding.field`, n.fields), typeof a.dataset == "string" && Array.isArray(a.columns)) {
         const c = { dataset: a.dataset, path: s, fields: [], generated: /* @__PURE__ */ new Set(), summaries: /* @__PURE__ */ new Set() };
-        ln(a, s, c), typeof a.foreignKey == "string" && T(a.foreignKey, `${s}.foreignKey`, c.fields), t.push(c);
+        fn(a, s, c), typeof a.foreignKey == "string" && T(a.foreignKey, `${s}.foreignKey`, c.fields), t.push(c);
       }
       for (const [c, i] of Object.entries(a)) o(i, `${s}.${c}`);
     }
   }
   return o(e, "$.template"), t;
 }
-function dn(e, t, r) {
-  for (const n of vt(e)) {
+function mn(e, t, r) {
+  for (const n of Mt(e)) {
     const o = Object.prototype.hasOwnProperty.call(t, n.dataset) ? t[n.dataset] : void 0;
     if (!o) {
       r.push({ code: "dataset", severity: "error", path: `${n.path}.dataset`, message: `未声明数据集 ${n.dataset}` });
@@ -1625,7 +1645,7 @@ function dn(e, t, r) {
     });
   }
 }
-function un(e, t, r, n) {
+function gn(e, t, r, n) {
   const o = r.maxSampleRows ?? 1e3;
   let a;
   try {
@@ -1636,24 +1656,24 @@ function un(e, t, r, n) {
   const s = Object.values(a).reduce((i, l) => i + l.length, 0);
   if (s > o)
     return n.push({ code: "sample", severity: "error", path: "$.fixtures", fixture: e.name, message: `样例 ${s} 行超过预算 ${o}，请显式选择验收样例` }), !1;
-  const c = new Set(vt(t).map((i) => i.dataset));
+  const c = new Set(Mt(t).map((i) => i.dataset));
   for (const [i, l] of Object.entries(r.dataSchemas ?? {}).filter(([d]) => c.has(d)))
     try {
-      const d = Ke(a[i], l, { path: `$.datasets.${i}`, maxRows: o });
+      const d = je(a[i], l, { path: `$.datasets.${i}`, maxRows: o });
       if (n.push(...d.issues.map((u) => ({ ...u, code: "sample", severity: "error", fixture: e.name }))), !d.ok) return !1;
     } catch (d) {
       return n.push({ code: "dataset", severity: "error", path: `$.dataSchemas.${i}`, message: String(d) }), !1;
     }
   return !0;
 }
-function fn(e, t) {
+function pn(e, t) {
   const r = e.pages[t.pageIndex]?.components[t.componentIndex]?.meta?.labelSource;
   if (r && typeof r == "object" && "pageIndex" in r && "componentIndex" in r && typeof r.pageIndex == "number" && typeof r.componentIndex == "number") return { path: `$.template.pages[${r.pageIndex}].components[${r.componentIndex}]`, pageIndex: r.pageIndex, componentIndex: r.componentIndex };
   const n = e.pages[t.pageIndex]?.meta?.record;
   if (n && typeof n == "object" && "templatePageIndex" in n && typeof n.templatePageIndex == "number") return { path: `$.template.pages[${n.templatePageIndex}].components[${t.componentIndex}]`, pageIndex: n.templatePageIndex, componentIndex: t.componentIndex };
 }
-function mn(e, t, r) {
-  const n = fn(t, r);
+function hn(e, t, r) {
+  const n = pn(t, r);
   if (n) return n;
   const o = t.pages[r.pageIndex]?.components[r.componentIndex], a = /^table:(\d+):(\d+)(?::|$)/.exec(o?.table?.id ?? "");
   if (a) return { path: `$.template.pages[${a[1]}].components[${a[2]}]`, pageIndex: Number(a[1]), componentIndex: Number(a[2]) };
@@ -1663,24 +1683,24 @@ function mn(e, t, r) {
   }
   return { path: "$.template" };
 }
-function gn(e, t, r, n, o) {
-  const a = kt(e.template.params ?? [], t.params ?? {});
-  if (o.issues.push(...a.issues.map((s) => ({ ...s, code: "params", severity: "error", fixture: t.name, path: s.path.replace(/^\$\.params/, `$.fixtures[${r}].params`) }))), !!a.ok && un(t, e.template, n, o.issues))
+function wn(e, t, r, n, o) {
+  const a = Rt(e.template.params ?? [], t.params ?? {});
+  if (o.issues.push(...a.issues.map((s) => ({ ...s, code: "params", severity: "error", fixture: t.name, path: s.path.replace(/^\$\.params/, `$.fixtures[${r}].params`) }))), !!a.ok && gn(t, e.template, n, o.issues))
     try {
-      const { plan: s, warnings: c } = xe(e.template, t.datasets, { maxPages: n.maxPages ?? 100, maxCells: n.maxCells ?? 25e4 }), i = (n.formats ?? ["pdf", "xlsx"]).flatMap((l) => zt(s, l));
-      o.issues.push(...c.map((l) => ({ code: "layout", severity: "warning", path: "$.template", fixture: t.name, message: l }))), o.issues.push(...i.map((l) => ({ code: "output", severity: n.strictOutputs ? "error" : "warning", ...mn(e.template, s, l), fixture: t.name, message: `${l.format}: ${l.message}`, diagnostic: l }))), o.samples.push({ name: t.name, pages: s.pages.length, rows: Xr(e.template, t.datasets), diagnostics: i });
+      const { plan: s, warnings: c } = xe(e.template, t.datasets, { maxPages: n.maxPages ?? 100, maxCells: n.maxCells ?? 25e4 }), i = (n.formats ?? ["pdf", "xlsx"]).flatMap((l) => Jt(s, l));
+      o.issues.push(...c.map((l) => ({ code: "layout", severity: "warning", path: "$.template", fixture: t.name, message: l }))), o.issues.push(...i.map((l) => ({ code: "output", severity: n.strictOutputs ? "error" : "warning", ...hn(e.template, s, l), fixture: t.name, message: `${l.format}: ${l.message}`, diagnostic: l }))), o.samples.push({ name: t.name, pages: s.pages.length, rows: en(e.template, t.datasets), diagnostics: i });
     } catch (s) {
       o.issues.push({ code: "layout", severity: "error", path: "$.template", fixture: t.name, message: s instanceof Error ? s.message : String(s) });
     }
 }
-function zn(e, t = {}) {
+function _n(e, t = {}) {
   const r = { ok: !1, issues: [], samples: [] };
   try {
     for (const [o, a] of [["maxPages", t.maxPages], ["maxCells", t.maxCells], ["maxSampleRows", t.maxSampleRows]]) if (a !== void 0 && (!Number.isSafeInteger(a) || a < 1)) throw new RangeError(`${o} must be a positive safe integer`);
     if ((t.fixtures?.length ?? 0) > 20) throw new RangeError("At most 20 review fixtures are allowed");
     const n = de(e);
-    t.previous && (r.changes = cn(t.previous, n), r.changes.breakingChanges && !t.allowBreakingChanges && r.issues.push({ code: "compatibility", severity: "error", path: "$.template", message: `${r.changes.breakingChanges} 项字段或结构变更需要明确确认兼容性` })), t.dataSchemas && dn(n.template, t.dataSchemas, r.issues);
-    for (const [o, a] of (t.fixtures ?? []).entries()) gn(n, a, o, t, r);
+    t.previous && (r.changes = un(t.previous, n), r.changes.breakingChanges && !t.allowBreakingChanges && r.issues.push({ code: "compatibility", severity: "error", path: "$.template", message: `${r.changes.breakingChanges} 项字段或结构变更需要明确确认兼容性` })), t.dataSchemas && mn(n.template, t.dataSchemas, r.issues);
+    for (const [o, a] of (t.fixtures ?? []).entries()) wn(n, a, o, t, r);
     t.fixtures?.length || r.issues.push({ code: "sample", severity: "warning", path: "$.fixtures", message: "未提供验收样例，仅完成结构和字段检查，尚未验证排版与输出" });
   } catch (n) {
     r.issues.push({ code: "template", severity: "error", path: "$", message: n instanceof Error ? n.message : String(n) });
@@ -1688,35 +1708,35 @@ function zn(e, t = {}) {
   return r.ok = r.issues.every((n) => n.severity !== "error"), r;
 }
 export {
-  Dn as A,
-  Xr as B,
-  Yt as D,
+  zn as A,
+  en as B,
+  Zt as D,
   V as P,
-  b as R,
-  H as a,
-  S as b,
-  Kn as c,
-  Nn as d,
-  Wr as e,
-  Fn as f,
-  On as g,
-  jn as h,
-  W as i,
-  Wn as j,
+  S as R,
+  b as a,
+  H as b,
+  Ln as c,
+  Jn as d,
+  Bn as e,
+  Gr as f,
+  Kn as g,
+  Nn as h,
+  Hn as i,
+  W as j,
   Gn as k,
-  Vn as l,
-  cn as m,
-  An as n,
+  qn as l,
+  un as m,
+  jn as n,
   _ as o,
-  st as p,
+  it as p,
   Se as q,
-  Bn as r,
+  Vn as r,
   xe as s,
-  Tr as t,
-  qt as u,
-  pt as v,
-  Hn as w,
+  kr as t,
+  _t as u,
+  ht as v,
+  Dn as w,
   A as x,
-  zn as y,
-  Ln as z
+  _n as y,
+  Wn as z
 };