@agile-team/mach-report 2.6.1 → 2.8.0

package/dist/{report-source-B9bENO0F.js → report-source-BXHNy_AD.js}

@@ -1,10 +1,11 @@
-import { R as W, d as ne, D as _, L as z } from "./render-plan-uzZYYSy1.js";
-import { h as re, w as K } from "./textwrap-DOl04hCQ.js";
-import { e as x, a as G } from "./style-Dv5o_x6b.js";
-import { c as oe } from "./validate-S6CgIm5d.js";
-import { g as ae } from "./report-params-B_VCihAh.js";
-import { v as ie, a as se } from "./template-registry-NpOakidD.js";
-import { a as O } from "./param-validation-BWNjLcN0.js";
+import { R as _, d as re, D as q, L as z } from "./render-plan-uzZYYSy1.js";
+import { h as oe, w as K } from "./textwrap-DOl04hCQ.js";
+import { e as $, a as G } from "./style-Dv5o_x6b.js";
+import { c as ae } from "./validate-S6CgIm5d.js";
+import { g as ie } from "./report-params-B_VCihAh.js";
+import { v as se, a as me } from "./template-registry-NpOakidD.js";
+import { a as B } from "./param-validation-BWNjLcN0.js";
+import { c as ce } from "./task-events-Dpsvf_t2.js";
 function Y(e) {
   if (!e || e.kind === "date") return;
   const t = e.digits;
@@ -16,7 +17,7 @@ function Y(e) {
     return t === void 0 ? e.thousands ? "#,##0.###############" : void 0 : `${e.thousands ? "#,##0" : "0"}${t ? `.${"0".repeat(t)}` : ""}`;
   }
 }
-function me(e) {
+function ue(e) {
   const t = /^(\d{4})[-/](\d{1,2})[-/](\d{1,2})$/.exec(e.trim());
   if (t) {
     const r = new Date(Number(t[1]), Number(t[2]) - 1, Number(t[3]));
@@ -31,55 +32,55 @@ function A(e, t) {
     maximumFractionDigits: t
   });
 }
-function ce(e, t) {
+function le(e, t) {
   const n = (r) => String(r).padStart(2, "0");
   return t.replace(/YYYY/g, String(e.getFullYear())).replace(/MM/g, n(e.getMonth() + 1)).replace(/DD/g, n(e.getDate())).replace(/hh/g, n(e.getHours())).replace(/mm/g, n(e.getMinutes())).replace(/ss/g, n(e.getSeconds()));
 }
-function ue(e, t, n) {
+function de(e, t, n) {
   return n != null ? t ? A(e, n) : e.toFixed(n) : t ? A(e) : String(e);
 }
-function D(e) {
+function H(e) {
   const t = typeof e == "number" ? e : Number(String(e).replace(/,/g, ""));
   return Number.isFinite(t) ? t : null;
 }
-function q(e, t) {
+function V(e, t) {
   if (e == null || e === "" || !t) return String(e ?? "");
   switch (t.kind) {
     case "number": {
-      const n = D(e);
-      return n == null ? String(e) : ue(n, t.thousands === !0, t.digits);
+      const n = H(e);
+      return n == null ? String(e) : de(n, t.thousands === !0, t.digits);
     }
     case "percent": {
-      const n = D(e);
+      const n = H(e);
       return n == null ? String(e) : `${A(n * 100, t.digits ?? 2)}%`;
     }
     case "date": {
-      const n = t.pattern ?? "YYYY-MM-DD", r = e instanceof Date ? e : me(String(e));
-      return r ? ce(r, n) : String(e);
+      const n = t.pattern ?? "YYYY-MM-DD", r = e instanceof Date ? e : ue(String(e));
+      return r ? le(r, n) : String(e);
     }
     default:
       return String(e);
   }
 }
-function le(e, t) {
+function fe(e, t) {
   const n = e[t.field];
   if (n == null || n === "") return !1;
   if (typeof t.value == "number") {
-    const a = D(n);
-    if (a == null) return !1;
+    const i = H(n);
+    if (i == null) return !1;
     switch (t.op) {
       case ">":
-        return a > t.value;
+        return i > t.value;
       case ">=":
-        return a >= t.value;
+        return i >= t.value;
       case "<":
-        return a < t.value;
+        return i < t.value;
       case "<=":
-        return a <= t.value;
+        return i <= t.value;
       case "==":
-        return a === t.value;
+        return i === t.value;
       case "!=":
-        return a !== t.value;
+        return i !== t.value;
     }
   }
   const r = String(n), o = String(t.value);
@@ -99,53 +100,53 @@ function le(e, t) {
   }
   return !1;
 }
-const de = ["text", "number", "boolean", "date", "decimal"], fe = /* @__PURE__ */ new Set(["__proto__", "prototype", "constructor"]);
+const ge = ["text", "number", "boolean", "date", "decimal"], he = /* @__PURE__ */ new Set(["__proto__", "prototype", "constructor"]);
 function v(e) {
   throw new Error(`数据契约无效：${e}`);
 }
-function V(e) {
+function J(e) {
   (!e || !Array.isArray(e.fields) || !e.fields.length || e.fields.length > 2048) && v("fields 应包含 1–2048 个字段");
   const t = /* @__PURE__ */ new Set();
   for (const n of e.fields)
-    (!n || typeof n.field != "string" || !n.field.trim() || fe.has(n.field) || t.has(n.field)) && v("字段名应安全、非空且唯一"), t.add(n.field), de.includes(n.type) || v(`未知字段类型 ${n.type}`), ye(n), pe(n), ge(n);
-  he(e, t);
+    (!n || typeof n.field != "string" || !n.field.trim() || he.has(n.field) || t.has(n.field)) && v("字段名应安全、非空且唯一"), t.add(n.field), ge.includes(n.type) || v(`未知字段类型 ${n.type}`), be(n), we(n), pe(n);
+  ye(e, t);
 }
-function ge(e) {
-  e.enum !== void 0 && (!Array.isArray(e.enum) || !e.enum.length || e.enum.some((t) => !J(t, e.type))) && v("enum 应为匹配字段类型的非空标量数组");
+function pe(e) {
+  e.enum !== void 0 && (!Array.isArray(e.enum) || !e.enum.length || e.enum.some((t) => !U(t, e.type))) && v("enum 应为匹配字段类型的非空标量数组");
 }
-function he(e, t) {
+function ye(e, t) {
   e.rowKey !== void 0 && ((typeof e.rowKey != "string" || !e.rowKey.trim() || !t.has(e.rowKey)) && v("rowKey 应为引用已声明字段的非空字符串"), e.fields.find((n) => n.field === e.rowKey)?.type === "boolean" && v("布尔字段不能作为业务主键"));
 }
-function pe(e) {
+function we(e) {
   for (const t of ["label", "unit"]) e[t] !== void 0 && typeof e[t] != "string" && v(`${t} 应为字符串`);
   for (const t of ["required", "nullable"]) e[t] !== void 0 && typeof e[t] != "boolean" && v(`${t} 应为布尔值`);
   e.semanticRole !== void 0 && !["identifier", "dimension", "measure", "date", "text"].includes(e.semanticRole) && v("未知字段语义");
 }
-function ye(e) {
+function be(e) {
   for (const t of ["min", "max", "minLength", "maxLength"]) {
     const n = e[t];
     n !== void 0 && (!Number.isFinite(n) || t.includes("Length") && (!Number.isInteger(n) || n < 0)) && v(`${t} 无效`);
   }
   e.min !== void 0 && e.max !== void 0 && e.min > e.max && v("min 不能超过 max"), e.minLength !== void 0 && e.maxLength !== void 0 && e.minLength > e.maxLength && v("minLength 不能超过 maxLength"), e.type !== "number" && (e.min !== void 0 || e.max !== void 0) && v("min/max 仅适用于 number，精确小数文本需业务校验"), ["number", "boolean"].includes(e.type) && (e.minLength !== void 0 || e.maxLength !== void 0) && v("长度约束仅适用于文本类型");
 }
-function we(e) {
+function Me(e) {
   const t = /^(\d{4})-(\d{2})-(\d{2})$/.exec(e);
   if (!t) return !1;
-  const n = Number(t[1]), r = Number(t[2]), o = Number(t[3]), a = n % 4 === 0 && (n % 100 !== 0 || n % 400 === 0);
-  return n > 0 && r >= 1 && r <= 12 && o >= 1 && o <= [31, a ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][r - 1];
+  const n = Number(t[1]), r = Number(t[2]), o = Number(t[3]), i = n % 4 === 0 && (n % 100 !== 0 || n % 400 === 0);
+  return n > 0 && r >= 1 && r <= 12 && o >= 1 && o <= [31, i ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][r - 1];
 }
-function J(e, t) {
-  return t === "number" ? typeof e == "number" && Number.isFinite(e) : t === "boolean" ? typeof e == "boolean" : typeof e != "string" ? !1 : t === "date" ? we(e) : t === "decimal" ? e.length <= 1e4 && /^-?(?:0|[1-9]\d*)(?:\.\d+)?$/.test(e) : !0;
+function U(e, t) {
+  return t === "number" ? typeof e == "number" && Number.isFinite(e) : t === "boolean" ? typeof e == "boolean" : typeof e != "string" ? !1 : t === "date" ? Me(e) : t === "decimal" ? e.length <= 1e4 && /^-?(?:0|[1-9]\d*)(?:\.\d+)?$/.test(e) : !0;
 }
-function be(e, t) {
+function Se(e, t) {
   if (e == null)
     return t.required || e === null && t.nullable === !1 ? { code: "required", message: "缺少必需字段值" } : void 0;
-  if (!J(e, t.type)) return { code: "type", message: `值应为 ${t.type}，不会自动转换原始值` };
+  if (!U(e, t.type)) return { code: "type", message: `值应为 ${t.type}，不会自动转换原始值` };
   if (t.enum && !t.enum.includes(e)) return { code: "enum", message: "值不在允许的枚举中" };
   if (typeof e == "number" && (t.min !== void 0 && e < t.min || t.max !== void 0 && e > t.max)) return { code: "range", message: "数值超出范围" };
-  if (typeof e == "string" && !Me(e, t)) return { code: "range", message: "文本长度超出范围" };
+  if (typeof e == "string" && !ve(e, t)) return { code: "range", message: "文本长度超出范围" };
 }
-function Me(e, t) {
+function ve(e, t) {
   if (t.minLength === void 0 && t.maxLength === void 0) return !0;
   let n = 0;
   for (const r of e) n++;
@@ -156,72 +157,72 @@ function E(e, t) {
   if (!Number.isInteger(n) || n < 1) throw new Error("数据校验预算应为正整数");
   return n;
 }
-function Se(e, t, n) {
+function xe(e, t, n) {
   const r = Object.prototype.hasOwnProperty.call(e, t) ? e[t] : void 0;
   if ((typeof r != "string" || !r.trim()) && !(typeof r == "number" && Number.isFinite(r))) return "业务主键应为非空字符串或有限数字";
   const o = JSON.stringify([typeof r, r]);
   if (n.has(o)) return "业务主键重复";
   n.add(o);
 }
-function ve(e, t, n = {}) {
-  V(t);
-  const r = n.path ?? "$.rows", o = [], a = E(n.maxIssues, 100);
+function $e(e, t, n = {}) {
+  J(t);
+  const r = n.path ?? "$.rows", o = [], i = E(n.maxIssues, 100);
   if (!Array.isArray(e)) return { ok: !1, issues: [{ code: "row", path: r, message: "数据集应为对象数组" }] };
   if (e.length > E(n.maxRows, 1e5) || e.length * t.fields.length > E(n.maxCells, 2e6)) return { ok: !1, issues: [{ code: "budget", path: r, message: "数据校验超出行数或单元格预算" }] };
-  const i = /* @__PURE__ */ new Set();
-  for (let s = 0; s < e.length && o.length < a; s++) {
-    const l = e[s];
-    if (!l || typeof l != "object" || Array.isArray(l)) {
+  const a = /* @__PURE__ */ new Set();
+  for (let s = 0; s < e.length && o.length < i; s++) {
+    const d = e[s];
+    if (!d || typeof d != "object" || Array.isArray(d)) {
       o.push({ code: "row", path: `${r}[${s}]`, rowIndex: s, message: "行应为对象" });
       continue;
     }
-    xe(l, t, s, r, i, o, a);
+    Pe(d, t, s, r, a, o, i);
   }
   return { ok: o.length === 0, issues: o };
 }
-function xe(e, t, n, r, o, a, i) {
+function Pe(e, t, n, r, o, i, a) {
   for (const s of t.fields) {
-    if (a.length >= i) return;
-    const l = be(Object.prototype.hasOwnProperty.call(e, s.field) ? e[s.field] : void 0, s);
-    l && a.push({ ...l, rowIndex: n, field: s.field, path: `${r}[${n}].${s.field}` });
+    if (i.length >= a) return;
+    const d = Se(Object.prototype.hasOwnProperty.call(e, s.field) ? e[s.field] : void 0, s);
+    d && i.push({ ...d, rowIndex: n, field: s.field, path: `${r}[${n}].${s.field}` });
   }
-  if (t.rowKey && a.length < i) {
-    const s = Se(e, t.rowKey, o);
-    s && a.push({ code: "row-key", path: `${r}[${n}].${t.rowKey}`, message: s, rowIndex: n, field: t.rowKey });
+  if (t.rowKey && i.length < a) {
+    const s = xe(e, t.rowKey, o);
+    s && i.push({ code: "row-key", path: `${r}[${n}].${t.rowKey}`, message: s, rowIndex: n, field: t.rowKey });
   }
 }
-function tt(e) {
-  return V(e), { $schema: "https://json-schema.org/draft/2020-12/schema", type: "array", items: { type: "object", properties: Object.fromEntries(e.fields.map((n) => [n.field, $e(n, n.field === e.rowKey)])), required: e.fields.filter((n) => n.required || n.field === e.rowKey).map((n) => n.field), additionalProperties: !0 }, ...e.rowKey ? { "x-report-rowKey": e.rowKey } : {} };
+function ot(e) {
+  return J(e), { $schema: "https://json-schema.org/draft/2020-12/schema", type: "array", items: { type: "object", properties: Object.fromEntries(e.fields.map((n) => [n.field, ke(n, n.field === e.rowKey)])), required: e.fields.filter((n) => n.required || n.field === e.rowKey).map((n) => n.field), additionalProperties: !0 }, ...e.rowKey ? { "x-report-rowKey": e.rowKey } : {} };
 }
-function $e(e, t) {
+function ke(e, t) {
   const n = !t && e.nullable !== !1 && !e.required;
   return {
-    type: n ? [B(e.type), "null"] : B(e.type),
+    type: n ? [j(e.type), "null"] : j(e.type),
     ...e.label ? { title: e.label } : {},
     ...e.type === "date" ? { format: "date" } : {},
     ...e.type === "decimal" ? { pattern: "^-?(?:0|[1-9]\\d*)(?:\\.\\d+)?$" } : {},
     ...e.enum ? { enum: n ? [...e.enum, null] : [...e.enum] } : {},
     ...e.min === void 0 ? {} : { minimum: e.min },
     ...e.max === void 0 ? {} : { maximum: e.max },
-    ...Pe(e, t),
+    ...Re(e, t),
     ...t && e.type === "text" ? { pattern: "\\S" } : {},
     ...e.unit ? { "x-report-unit": e.unit } : {},
     ...e.semanticRole ? { "x-report-semanticRole": e.semanticRole } : {}
   };
 }
-function Pe(e, t) {
+function Re(e, t) {
   const n = {};
   return (e.minLength !== void 0 || t && e.type !== "number") && (n.minLength = Math.max(e.minLength ?? 0, t ? 1 : 0)), e.type === "decimal" ? n.maxLength = Math.min(e.maxLength ?? 1e4, 1e4) : e.maxLength !== void 0 && (n.maxLength = e.maxLength), n;
 }
-function B(e) {
+function j(e) {
   return e === "text" || e === "date" || e === "decimal" ? "string" : e;
 }
-class R extends Error {
+class N extends Error {
   constructor(t, n) {
     super(`报表页数超出上限 ${t}（至少 ${n} 页）`), this.limit = t, this.actual = n, this.code = "page-limit", this.name = "PaginatePageLimitError";
   }
 }
-function ke(e) {
+function Te(e) {
   return {
     widthMm: e.widthMm,
     heightMm: e.heightMm,
@@ -235,7 +236,7 @@ function ke(e) {
 function Le(e, t) {
   return t.heightMm - (e.layout === "wide" ? t.marginBottomMm : e.marginBottomMm ?? t.marginBottomMm);
 }
-function U(e) {
+function Q(e) {
   if (e == null) return "";
   if (typeof e == "string") return e;
   if (typeof e == "number") return String(e);
@@ -247,14 +248,14 @@ function U(e) {
     return String(e);
   }
 }
-function Q(e, t) {
+function X(e, t) {
   let n = e.textMetrics.get(t);
   if (!n) {
     const r = G(t).fontSizePt;
     n = {
       measureOptions: {
         fontSizePt: r,
-        fontFamily: t.fontFamily ?? _,
+        fontFamily: t.fontFamily ?? q,
         italic: t.italic,
         bold: t.bold,
         letterSpacingPt: t.letterSpacing
@@ -264,125 +265,125 @@ function Q(e, t) {
   }
   return n;
 }
-function X(e, t, n) {
+function Z(e, t, n) {
   return n === "identifier" || n === "dimension" || n === "date" ? "center" : n === "measure" ? "right" : n === "text" ? "left" : t?.kind === "number" || t?.kind === "percent" ? "right" : t?.kind === "date" || e instanceof Date || typeof e == "boolean" ? "center" : typeof e == "number" && Number.isFinite(e) ? "right" : "left";
 }
-function Te(e) {
+function Ne(e) {
   if (e === null || typeof e == "string" || typeof e == "boolean" || typeof e == "number" && Number.isFinite(e)) return e;
 }
-function Re(e, t) {
-  const n = e.fontSizePt ?? ne, r = e.paddingMm ?? 1, o = e.columns.map((m) => m.align ?? m.style?.align ?? e.align ?? "left"), a = e.columns.map((m, c) => ({
-    ...x({
+function Fe(e, t) {
+  const n = e.fontSizePt ?? re, r = e.paddingMm ?? 1, o = e.columns.map((m) => m.align ?? m.style?.align ?? e.align ?? "left"), i = e.columns.map((m, u) => ({
+    ...$({
       fontSize: n,
       verticalAlign: "middle"
     }, m.style),
-    align: o[c] === "auto" ? "left" : o[c]
-  })), i = a.map((m, c) => o[c] === "auto" ? { left: m, center: { ...m, align: "center" }, right: { ...m, align: "right" } } : void 0), s = e.columns.map((m, c) => m.rules?.map((M) => {
-    const h = i[c];
-    if (h) return {
-      left: x(h.left, M.style),
-      center: x(h.center, M.style),
-      right: x(h.right, M.style)
+    align: o[u] === "auto" ? "left" : o[u]
+  })), a = i.map((m, u) => o[u] === "auto" ? { left: m, center: { ...m, align: "center" }, right: { ...m, align: "right" } } : void 0), s = e.columns.map((m, u) => m.rules?.map((b) => {
+    const x = a[u];
+    if (x) return {
+      left: $(x.left, b.style),
+      center: $(x.center, b.style),
+      right: $(x.right, b.style)
     };
-    const S = x(a[c], M.style);
-    return { left: S, center: S, right: S };
-  })), l = e.columns.map((m) => {
-    let c = x({
+    const k = $(i[u], b.style);
+    return { left: k, center: k, right: k };
+  })), d = e.columns.map((m) => {
+    let u = $({
       fontSize: n,
       bold: e.headerBold ?? !0,
       align: "center",
       verticalAlign: "middle",
       backgroundColor: e.headerBackgroundColor
     }, m.style);
-    return e.headerAlign !== void 0 && (c.align = e.headerAlign), c = x(c, e.headerStyle), m.headerAlign !== void 0 && (c.align = m.headerAlign), x(c, m.headerStyle);
-  }), d = e.columns.map((m) => m.header);
-  let u = e.rowHeightMm ?? 0;
-  for (let m = 0; m < d.length; m++) {
-    const c = l[m], M = G(c).fontSizePt, h = K(
-      d[m],
+    return e.headerAlign !== void 0 && (u.align = e.headerAlign), u = $(u, e.headerStyle), m.headerAlign !== void 0 && (u.align = m.headerAlign), $(u, m.headerStyle);
+  }), g = e.columns.map((m) => m.header);
+  let c = e.rowHeightMm ?? 0;
+  for (let m = 0; m < g.length; m++) {
+    const u = d[m], b = G(u).fontSizePt, x = K(
+      g[m],
       e.columns[m].widthMm - r * 2,
-      { fontSizePt: M, fontFamily: c.fontFamily ?? _, italic: c.italic, bold: c.bold, letterSpacingPt: c.letterSpacing },
+      { fontSizePt: b, fontFamily: u.fontFamily ?? q, italic: u.italic, bold: u.bold, letterSpacingPt: u.letterSpacing },
       t
-    ), S = M * (c.lineHeight ?? z) * 25.4 / 72;
-    u = Math.max(u, Math.max(h.length, 1) * S + r * 2);
+    ), k = b * (u.lineHeight ?? z) * 25.4 / 72;
+    c = Math.max(c, Math.max(x.length, 1) * k + r * 2);
   }
-  const f = d.map((m, c) => ({
+  const f = g.map((m, u) => ({
     text: m,
-    style: l[c]
-  })), b = e.border === !1 ? { borderTop: !1, borderRight: !1, borderBottom: !1, borderLeft: !1 } : { borderBottom: !0, borderLeft: !0, borderRight: !0, borderTop: !0 }, y = e.columns.map((m) => m.widthMm), g = Ne(e.headerGrid, y, {
+    style: d[u]
+  })), w = e.border === !1 ? { borderTop: !1, borderRight: !1, borderBottom: !1, borderLeft: !1 } : { borderBottom: !0, borderLeft: !0, borderRight: !0, borderTop: !0 }, p = e.columns.map((m) => m.widthMm), h = Ee(e.headerGrid, p, {
     cells: [f],
-    colWidthsMm: y,
-    rowHeightsMm: [u],
+    colWidthsMm: p,
+    rowHeightsMm: [c],
     paddingMm: r
   });
   return {
     fontSizePt: n,
     paddingMm: r,
-    cellStyles: a,
-    autoStyles: i,
+    cellStyles: i,
+    autoStyles: a,
     ruleStyles: s,
     textMetrics: /* @__PURE__ */ new WeakMap(),
     numberFormats: e.columns.map((m) => Y(m.format)),
-    borderStyle: b,
-    headerHeightMm: g.rowHeightsMm.reduce((m, c) => m + c, 0),
-    headerGrid: g,
-    colWidthsMm: y,
+    borderStyle: w,
+    headerHeightMm: h.rowHeightsMm.reduce((m, u) => m + u, 0),
+    headerGrid: h,
+    colWidthsMm: p,
     columns: e.columns
   };
 }
-function Ne(e, t, n) {
+function Ee(e, t, n) {
   if (!e) return n;
   if (!e.cells.length) throw new Error("自定义列表表头至少需要一行");
   const r = e.rowHeightsMm ?? e.cells.map(() => n.rowHeightsMm[0]);
   if (r.length !== e.cells.length || r.some((o) => !Number.isFinite(o) || o <= 0)) throw new Error("自定义列表表头行高无效");
   return { ...e, colWidthsMm: t, rowHeightsMm: r };
 }
-function Fe(e, t, n) {
+function Ae(e, t, n) {
   const r = t.format?.kind === "number" || t.format?.kind === "percent";
   t.valueType !== void 0 ? e.valueType = t.valueType : r && (e.valueType = "number"), t.editable !== void 0 && (e.editable = t.editable), (typeof e.value == "number" || e.value == null) && n !== void 0 && (e.numberFormat = n);
 }
-function j(e, t, n) {
+function C(e, t, n) {
   const r = e.columns;
   let o = e.rowHeightFloorMm;
-  const a = new Array(r.length);
-  for (let i = 0; i < r.length; i++) {
-    const s = r[i], l = t[s.field], d = e.autoStyles[i] ? X(l, s.format, s.semanticRole) : "left";
-    let u = e.autoStyles[i]?.[d] ?? e.cellStyles[i];
+  const i = new Array(r.length);
+  for (let a = 0; a < r.length; a++) {
+    const s = r[a], d = t[s.field], g = e.autoStyles[a] ? Z(d, s.format, s.semanticRole) : "left";
+    let c = e.autoStyles[a]?.[g] ?? e.cellStyles[a];
     if (s.rules)
-      for (let c = 0; c < s.rules.length; c++) {
-        const M = s.rules[c];
-        if (le(t, M.when)) {
-          u = e.ruleStyles[i][c][d];
+      for (let u = 0; u < s.rules.length; u++) {
+        const b = s.rules[u];
+        if (fe(t, b.when)) {
+          c = e.ruleStyles[a][u][g];
           break;
         }
       }
-    const f = s.format ? q(l, s.format) : U(l), b = Q(e, u), y = K(f, s.widthMm - e.paddingMm * 2, b.measureOptions, n);
-    o = Math.max(o, y.length * b.lineMm + e.paddingMm * 2);
-    const g = Te(l), m = { text: f, style: u };
-    g !== void 0 && (m.value = g), Fe(m, s, e.numberFormats[i]), a[i] = m;
+    const f = s.format ? V(d, s.format) : Q(d), w = X(e, c), p = K(f, s.widthMm - e.paddingMm * 2, w.measureOptions, n);
+    o = Math.max(o, p.length * w.lineMm + e.paddingMm * 2);
+    const h = Ne(d), m = { text: f, style: c };
+    h !== void 0 && (m.value = h), Ae(m, s, e.numberFormats[a]), i[a] = m;
   }
   return {
-    grid: { cells: [a], colWidthsMm: e.colWidthsMm, rowHeightsMm: [o], paddingMm: e.paddingMm },
+    grid: { cells: [i], colWidthsMm: e.colWidthsMm, rowHeightsMm: [o], paddingMm: e.paddingMm },
     heightMm: o
   };
 }
-function* Ee(e, t) {
+function* He(e, t) {
   if (!t) {
     for (const r of e) yield { kind: "row", row: r };
     return;
   }
   const n = /* @__PURE__ */ new Map();
   for (const r of e) {
-    const o = U(r[t.field]), a = n.get(o);
-    a ? a.push(r) : n.set(o, [r]);
+    const o = Q(r[t.field]), i = n.get(o);
+    i ? i.push(r) : n.set(o, [r]);
   }
   for (const [r, o] of n) {
     yield { kind: "groupHeader", label: (t.headerTemplate ?? "{value}").replace(/\{value\}/g, r), firstRow: o[0] };
-    for (const a of o) yield { kind: "row", row: a };
+    for (const i of o) yield { kind: "row", row: i };
     t.subtotal?.length && (yield { kind: "subtotal", label: t.subtotalLabel ?? "小计", rows: o });
   }
 }
-function Ae(e, t) {
+function De(e, t) {
   let n = 0;
   for (const r of e) {
     const o = typeof r[t] == "number" ? r[t] : Number(r[t]);
@@ -390,91 +391,91 @@ function Ae(e, t) {
   }
   return n;
 }
-function Z(e, t, n) {
+function ee(e, t, n) {
   return new Map(n.map((r) => {
-    const o = e.find((i) => i.field === r)?.format ?? { kind: "number", thousands: !0 }, a = Ae(t, r);
-    return [r, { text: q(a, o), value: a, numberFormat: Y(o) }];
+    const o = e.find((a) => a.field === r)?.format ?? { kind: "number", thousands: !0 }, i = De(t, r);
+    return [r, { text: V(i, o), value: i, numberFormat: Y(o) }];
   }));
 }
-function ee(e, t) {
+function te(e, t) {
   const n = e.findIndex((r) => t.includes(r.field));
   return n > 0 ? n : 1;
 }
-function H(e, t, n, r, o, a) {
-  const i = [], s = Math.max(1, Math.min(a, e.columns.length)), l = x({ fontSize: e.fontSizePt }, o);
-  i.push({ text: n, colSpan: s, style: { bold: !0, ...l } });
+function D(e, t, n, r, o, i) {
+  const a = [], s = Math.max(1, Math.min(i, e.columns.length)), d = $({ fontSize: e.fontSizePt }, o);
+  a.push({ text: n, colSpan: s, style: { bold: !0, ...d } });
   for (let f = s; f < e.columns.length; f++) {
-    const b = e.columns[f], y = r.get(b.field), g = e.autoStyles[f]?.[X(y?.value, b.format)] ?? e.cellStyles[f];
-    i.push({ ...y, text: y?.text ?? "", style: x(g, o) });
+    const w = e.columns[f], p = r.get(w.field), h = e.autoStyles[f]?.[Z(p?.value, w.format)] ?? e.cellStyles[f];
+    a.push({ ...p, text: p?.text ?? "", style: $(h, o) });
   }
-  let d = e.rowHeightFloorMm, u = 0;
-  for (const f of i) {
-    let b = 0;
-    const y = u + (f.colSpan ?? 1);
-    for (; u < y; u++) b += e.colWidthsMm[u] ?? 0;
-    const g = Q(e, f.style), m = K(f.text ?? "", b - e.paddingMm * 2, g.measureOptions, t);
-    d = Math.max(d, m.length * g.lineMm + e.paddingMm * 2);
+  let g = e.rowHeightFloorMm, c = 0;
+  for (const f of a) {
+    let w = 0;
+    const p = c + (f.colSpan ?? 1);
+    for (; c < p; c++) w += e.colWidthsMm[c] ?? 0;
+    const h = X(e, f.style), m = K(f.text ?? "", w - e.paddingMm * 2, h.measureOptions, t);
+    g = Math.max(g, m.length * h.lineMm + e.paddingMm * 2);
   }
   return {
-    grid: { cells: [i], colWidthsMm: e.colWidthsMm, rowHeightsMm: [d], paddingMm: e.paddingMm },
-    heightMm: d
+    grid: { cells: [a], colWidthsMm: e.colWidthsMm, rowHeightsMm: [g], paddingMm: e.paddingMm },
+    heightMm: g
   };
 }
-function De(e, t, n) {
-  const { templatePage: r, current: o, warnings: a, nextId: i, pushCurrent: s } = n, l = () => Le(r, o), d = o.marginTopMm, u = {
+function Ie(e, t, n) {
+  const { templatePage: r, current: o, warnings: i, nextId: a, pushCurrent: s } = n, d = () => Le(r, o), g = o.marginTopMm, c = {
     id: n.tableId,
-    columnKeys: e.columns.map((p) => p.field),
+    columnKeys: e.columns.map((l) => l.field),
     ...e.layout === void 0 ? {} : { layout: e.layout },
     ...e.title === void 0 ? {} : { title: e.title }
   };
   let f = 0;
-  const b = {
+  const w = {
     kind: "rect",
     leftMm: e.leftMm,
     topMm: 0,
     widthMm: e.widthMm,
     heightMm: t.headerHeightMm,
     grid: t.headerGrid,
-    nid: i("listh"),
-    table: { ...u, role: "header", rowIndex: -1 },
+    nid: a("listh"),
+    table: { ...c, role: "header", rowIndex: -1 },
     style: t.borderStyle
-  }, y = (p) => o.components.push({ ...b, topMm: p });
-  let g = e.topMm;
-  y(g), g += t.headerHeightMm + n.mmPerRow;
+  }, p = (l) => o.components.push({ ...w, topMm: l });
+  let h = e.topMm;
+  p(h), h += t.headerHeightMm + n.mmPerRow;
   function m() {
-    const p = r.layout === "wide" ? 0 : e.topMm;
-    return e.headerEveryPage !== !1 ? p + t.headerHeightMm : r.layout === "wide" ? 0 : d;
+    const l = r.layout === "wide" ? 0 : e.topMm;
+    return e.headerEveryPage !== !1 ? l + t.headerHeightMm : r.layout === "wide" ? 0 : g;
   }
-  function c() {
-    const p = r.layout === "wide" ? 0 : o.marginBottomMm;
-    return r.heightMm - p - m();
+  function u() {
+    const l = r.layout === "wide" ? 0 : o.marginBottomMm;
+    return r.heightMm - l - m();
   }
-  function M(p) {
-    if (g + p <= l()) return;
+  function b(l) {
+    if (h + l <= d()) return;
     s(), o.components = [], o.heightMm = r.heightMm, r.layout === "wide" && (o.marginTopMm = 0, o.marginBottomMm = 0);
-    const P = r.layout === "wide" ? 0 : e.topMm;
-    e.headerEveryPage !== !1 ? (y(P), g = P + t.headerHeightMm) : g = r.layout === "wide" ? 0 : d;
+    const M = r.layout === "wide" ? 0 : e.topMm;
+    e.headerEveryPage !== !1 ? (p(M), h = M + t.headerHeightMm) : h = r.layout === "wide" ? 0 : g;
   }
-  function h(p, P, k, T) {
-    const L = c();
-    p.heightMm > L && a.push(`列表 ${e.id ?? e.dataset} 行高 ${p.heightMm.toFixed(2)}mm 超出单页可用高度 ${L.toFixed(2)}mm，预览与打印可能截断内容`), M(p.heightMm), o.components.push({
+  function x(l, M, S, R) {
+    const T = u();
+    l.heightMm > T && i.push(`列表 ${e.id ?? e.dataset} 行高 ${l.heightMm.toFixed(2)}mm 超出单页可用高度 ${T.toFixed(2)}mm，预览与打印可能截断内容`), b(l.heightMm), o.components.push({
       kind: "rect",
       leftMm: e.leftMm,
-      topMm: g,
+      topMm: h,
       widthMm: e.widthMm,
-      heightMm: p.heightMm,
-      grid: p.grid,
-      nid: i(P),
-      table: { ...u, role: k, rowIndex: f++, ...T ? { source: T } : {} },
+      heightMm: l.heightMm,
+      grid: l.grid,
+      nid: a(M),
+      table: { ...c, role: S, rowIndex: f++, ...R ? { source: R } : {} },
       style: t.borderStyle
-    }), g += p.heightMm;
+    }), h += l.heightMm;
   }
-  function S(p) {
-    p <= c() && M(p);
+  function k(l) {
+    l <= u() && b(l);
   }
-  return { keepTogether: S, placeGridRow: h };
+  return { keepTogether: k, placeGridRow: x };
 }
-function He(e, t) {
+function Ke(e, t) {
   if (!e.rowKey) return;
   const n = t[e.rowKey];
   if ((typeof n != "string" || !n.trim()) && !(typeof n == "number" && Number.isFinite(n)))
@@ -484,47 +485,47 @@ function He(e, t) {
   if (o !== void 0 && typeof o != "string") throw new Error("来源令牌应为字符串");
   return { datasetId: e.dataset, rowKey: n, ...r === void 0 ? {} : { revision: r }, ...o === void 0 ? {} : { sourceToken: o } };
 }
-function Ie(e, t) {
+function Oe(e, t) {
   const n = /* @__PURE__ */ new Map();
   if (!e.rowKey) return n;
   const r = /* @__PURE__ */ new Set();
   for (const o of t) {
-    const a = He(e, o), i = JSON.stringify(a.rowKey);
-    if (r.has(i)) throw new Error(`数据集 ${e.dataset} 的业务主键重复：${String(a.rowKey)}`);
-    r.add(i), n.set(o, a);
+    const i = Ke(e, o), a = JSON.stringify(i.rowKey);
+    if (r.has(a)) throw new Error(`数据集 ${e.dataset} 的业务主键重复：${String(i.rowKey)}`);
+    r.add(a), n.set(o, i);
   }
   return n;
 }
-function Ke(e, t, n, r, o) {
+function Be(e, t, n, r, o) {
   if (!e.grandTotal) return;
-  const a = typeof e.grandTotal == "object" ? e.grandTotal : void 0, i = a?.fields ?? e.groupBy?.subtotal ?? [];
-  if (i.length === 0) {
+  const i = typeof e.grandTotal == "object" ? e.grandTotal : void 0, a = i?.fields ?? e.groupBy?.subtotal ?? [];
+  if (a.length === 0) {
     r.warnings.push(`列表 ${e.id ?? ""} 配置了 grandTotal 但未提供合计字段（groupBy.subtotal 或 grandTotal.fields）`);
     return;
   }
-  const s = H(n, r.measurer, a?.label ?? "合计", Z(e.columns, t, i), a?.style ?? {}, ee(e.columns, i));
+  const s = D(n, r.measurer, i?.label ?? "合计", ee(e.columns, t, a), i?.style ?? {}, te(e.columns, a));
   o.placeGridRow(s, "listgt", "grand-total");
 }
-function Oe(e, t, n) {
-  const r = Ie(e, t), o = e.columns.reduce((u, f) => u + f.widthMm, 0), a = o > e.widthMm ? e.widthMm / o : 1, i = a === 1 ? e : { ...e, columns: e.columns.map((u) => ({ ...u, widthMm: u.widthMm * a })) }, s = { ...Re(i, n.measurer), rowHeightFloorMm: i.rowHeightMm ?? 0 }, l = De(i, s, n);
-  let d;
-  for (const u of Ee(t, i.groupBy))
-    if (u.kind === "row")
-      l.placeGridRow(d ?? j(s, u.row, n.measurer), "listr", "body", r.get(u.row)), d = void 0;
-    else if (u.kind === "groupHeader") {
-      const f = H(s, n.measurer, u.label, /* @__PURE__ */ new Map(), i.groupBy?.headerStyle ?? {}, i.columns.length);
-      d = j(s, u.firstRow, n.measurer), i.groupBy?.keepWithNext !== !1 && l.keepTogether(f.heightMm + d.heightMm), l.placeGridRow(f, "listg", "group-header");
+function je(e, t, n) {
+  const r = Oe(e, t), o = e.columns.reduce((c, f) => c + f.widthMm, 0), i = o > e.widthMm ? e.widthMm / o : 1, a = i === 1 ? e : { ...e, columns: e.columns.map((c) => ({ ...c, widthMm: c.widthMm * i })) }, s = { ...Fe(a, n.measurer), rowHeightFloorMm: a.rowHeightMm ?? 0 }, d = Ie(a, s, n);
+  let g;
+  for (const c of He(t, a.groupBy))
+    if (c.kind === "row")
+      d.placeGridRow(g ?? C(s, c.row, n.measurer), "listr", "body", r.get(c.row)), g = void 0;
+    else if (c.kind === "groupHeader") {
+      const f = D(s, n.measurer, c.label, /* @__PURE__ */ new Map(), a.groupBy?.headerStyle ?? {}, a.columns.length);
+      g = C(s, c.firstRow, n.measurer), a.groupBy?.keepWithNext !== !1 && d.keepTogether(f.heightMm + g.heightMm), d.placeGridRow(f, "listg", "group-header");
     } else {
-      const f = i.groupBy?.subtotal ?? [], b = H(s, n.measurer, u.label, Z(i.columns, u.rows, f), i.groupBy?.subtotalStyle ?? {}, ee(i.columns, f));
-      l.placeGridRow(b, "listst", "subtotal");
+      const f = a.groupBy?.subtotal ?? [], w = D(s, n.measurer, c.label, ee(a.columns, c.rows, f), a.groupBy?.subtotalStyle ?? {}, te(a.columns, f));
+      d.placeGridRow(w, "listst", "subtotal");
     }
-  Ke(i, t, s, n, l);
+  Be(a, t, s, n, d);
 }
-function C(e) {
+function W(e) {
   return e.kind === "text" && typeof e.text == "string" && (e.text.includes("{page}") || e.text.includes("{totalPages}"));
 }
-function Be(e, t, n, r, o, a) {
-  const i = {
+function Ce(e, t, n, r, o, i) {
+  const a = {
     pageWidthMm: t.widthMm,
     pageHeightMm: t.heightMm,
     ...e.layout === void 0 ? {} : { layout: e.layout },
@@ -534,217 +535,221 @@ function Be(e, t, n, r, o, a) {
     marginRightMm: t.marginRightMm,
     components: t.components
   };
-  r.push(i);
+  r.push(a);
   for (const s of n) {
-    const l = { ...s, text: String(s.text ?? "").replace(/\{page\}/g, String(r.length)) };
-    i.components.push(l), l.text.includes("{totalPages}") && o.push(l);
+    const d = { ...s, text: String(s.text ?? "").replace(/\{page\}/g, String(r.length)) };
+    a.components.push(d), d.text.includes("{totalPages}") && o.push(d);
   }
   if (e.layout === "wide") {
-    const s = i.components.reduce((l, d) => Math.max(l, d.topMm + d.heightMm), 0);
-    i.marginBottomMm = a ? e.marginBottomMm ?? 0 : 0, i.pageHeightMm = Math.max(1, s + i.marginBottomMm);
+    const s = a.components.reduce((d, g) => Math.max(d, g.topMm + g.heightMm), 0);
+    a.marginBottomMm = i ? e.marginBottomMm ?? 0 : 0, a.pageHeightMm = Math.max(1, s + a.marginBottomMm);
   }
 }
-function je(e, t, n = {}) {
+function We(e, t, n = {}) {
   const r = typeof n == "number" ? { mmPerRow: n } : n;
   if (r.maxPages !== void 0 && (!Number.isSafeInteger(r.maxPages) || r.maxPages < 1)) throw new RangeError("maxPages 应为正安全整数");
-  const o = [], a = [], i = [];
+  const o = [], i = [], a = [];
   let s = 0;
-  const l = (d) => `${d}_${(++s).toString(36)}`;
-  for (const [d, u] of e.pages.entries()) {
-    const f = ke(u), b = u.components.filter(C), y = (g = !1) => {
-      if (r.maxPages !== void 0 && a.length >= r.maxPages) throw new R(r.maxPages, a.length + 1);
-      Be(u, f, b, a, i, g);
+  const d = (g) => `${g}_${(++s).toString(36)}`;
+  for (const [g, c] of e.pages.entries()) {
+    const f = Te(c), w = c.components.filter(W), p = (h = !1) => {
+      if (r.maxPages !== void 0 && i.length >= r.maxPages) throw new N(r.maxPages, i.length + 1);
+      Ce(c, f, w, i, a, h);
     };
-    for (const [g, m] of u.components.entries()) {
-      if (C(m)) continue;
+    for (const [h, m] of c.components.entries()) {
+      if (W(m)) continue;
       if (m.kind !== "list") {
         f.components.push(m);
         continue;
       }
-      const c = t[m.dataset];
-      Array.isArray(c) || o.push(`数据集 ${m.dataset} 未提供数据，列表 ${m.id ?? ""} 输出为空`), Oe(m, Array.isArray(c) ? c : [], {
-        templatePage: u,
+      const u = t[m.dataset];
+      Array.isArray(u) || o.push(`数据集 ${m.dataset} 未提供数据，列表 ${m.id ?? ""} 输出为空`), je(m, Array.isArray(u) ? u : [], {
+        templatePage: c,
         current: f,
         warnings: o,
-        nextId: l,
-        pushCurrent: y,
-        measurer: r.measurer ?? re,
+        nextId: d,
+        pushCurrent: p,
+        measurer: r.measurer ?? oe,
         mmPerRow: r.mmPerRow ?? 0,
-        tableId: `table:${d}:${g}`
+        tableId: `table:${g}:${h}`
       });
     }
-    y(!0);
+    p(!0);
   }
-  for (const d of i) d.text = d.text.replace(/\{totalPages\}/g, String(a.length));
-  return { plan: { schemaVersion: W, pages: a }, warnings: o };
+  for (const g of a) g.text = g.text.replace(/\{totalPages\}/g, String(i.length));
+  return { plan: { schemaVersion: _, pages: i }, warnings: o };
 }
-function nt(e) {
+function at(e) {
   if (!("mapData" in e)) return e;
   const { load: t, mapData: n, ...r } = e;
   return { ...r, load: async (o) => {
-    const a = await t(o);
-    $(o.signal);
+    const i = await t(o);
+    P(o.signal);
     try {
-      return n(a, o);
-    } catch (i) {
-      throw new w("validate", `报表 ${o.reportId} 数据映射失败`, i);
+      return n(i, o);
+    } catch (a) {
+      throw new y("validate", `报表 ${o.reportId} 数据映射失败`, a);
     }
   } };
 }
-class w extends Error {
+class y extends Error {
   constructor(t, n, r) {
     super(n), this.name = "ReportSourceError", this.code = t, this.cause = r;
   }
 }
-function N(e) {
+function F(e) {
   const t = new Error("报表加载已取消");
   return t.name = "AbortError", Object.defineProperty(t, "cause", { value: e.reason }), t;
 }
-function $(e) {
-  if (e?.aborted) throw N(e);
+function P(e) {
+  if (e?.aborted) throw F(e);
 }
 function I(e, t) {
   return t ? new Promise((n, r) => {
-    const o = () => t.removeEventListener("abort", a), a = () => {
-      o(), r(N(t));
+    const o = () => t.removeEventListener("abort", i), i = () => {
+      o(), r(F(t));
     };
-    t.addEventListener("abort", a, { once: !0 }), t.aborted && a(), Promise.resolve(e).then(
-      (i) => {
-        o(), n(i);
+    t.addEventListener("abort", i, { once: !0 }), t.aborted && i(), Promise.resolve(e).then(
+      (a) => {
+        o(), n(a);
       },
-      (i) => {
-        o(), r(i);
+      (a) => {
+        o(), r(a);
       }
     );
   }) : Promise.resolve(e);
 }
-function Ce(e, t) {
+function _e(e, t) {
   if (!e || typeof e != "object" || Array.isArray(e))
-    throw new w("validate", `报表 ${t} 的数据集应为对象`);
+    throw new y("validate", `报表 ${t} 的数据集应为对象`);
   for (const [n, r] of Object.entries(e))
     if (!Array.isArray(r) || r.some((o) => !o || typeof o != "object" || Array.isArray(o)))
-      throw new w("validate", `报表 ${t} 的数据集 ${n} 应为对象数组`);
+      throw new y("validate", `报表 ${t} 的数据集 ${n} 应为对象数组`);
 }
-async function We(e, t, n) {
+async function qe(e, t, n) {
   const { reportId: r, signal: o } = t;
   try {
-    const a = await I(e(t), o);
-    $(o);
-    const i = ie(a);
-    if (!i.ok)
-      throw new w("validate", `报表 ${r} 模板校验失败：${i.errors.slice(0, 3).map((s) => `${s.path}: ${s.message}`).join("; ")}`);
-    return n.push(...i.warnings.map((s) => `${r}: ${s.path}: ${s.message}`)), a;
-  } catch (a) {
-    throw o?.aborted ? N(o) : a instanceof w ? a : a instanceof se ? new w("validate", `报表 ${r} 模板校验失败：${a.message}`, a) : new w("fetch", `报表 ${r} 模板加载失败：${a instanceof Error ? a.message : String(a)}`, a);
+    const i = await I(e(t), o);
+    P(o);
+    const a = se(i);
+    if (!a.ok)
+      throw new y("validate", `报表 ${r} 模板校验失败：${a.errors.slice(0, 3).map((s) => `${s.path}: ${s.message}`).join("; ")}`);
+    return n.push(...a.warnings.map((s) => `${r}: ${s.path}: ${s.message}`)), i;
+  } catch (i) {
+    throw o?.aborted ? F(o) : i instanceof y ? i : i instanceof me ? new y("validate", `报表 ${r} 模板校验失败：${i.message}`, i) : new y("fetch", `报表 ${r} 模板加载失败：${i instanceof Error ? i.message : String(i)}`, i);
   }
 }
-async function _e(e, t, n, r, o) {
-  const a = t.signal;
+async function ze(e, t, n, r) {
+  const o = t.signal;
   let i;
   try {
-    if (e.load) i = await I(e.load(t), a);
+    if (e.load) i = await I(e.load(t), o);
     else if (e.provider) {
-      const s = await I(e.provider.query(t), a);
-      $(a), ze(s, n), i = s.datasets, r?.(n, s);
+      const a = await I(e.provider.query(t), o);
+      P(o), Ge(a, n), i = a.datasets, r?.(n, a);
     } else i = e.datasets ?? {};
-  } catch (s) {
-    throw a?.aborted ? N(a) : s instanceof w ? s : new w("fetch", `报表 ${n} 取数失败：${s instanceof Error ? s.message : String(s)}`, s);
+  } catch (a) {
+    throw o?.aborted ? F(o) : a instanceof y ? a : new y("fetch", `报表 ${n} 取数失败：${a instanceof Error ? a.message : String(a)}`, a);
   }
-  return $(a), Ce(i, n), o?.(n, i), Ge(e, i, n), i;
+  return P(o), i;
 }
-function ze(e, t) {
-  if (!e || typeof e != "object" || Array.isArray(e)) throw new w("validate", `报表 ${t} Provider 应返回 datasets 结果对象`);
+function Ge(e, t) {
+  if (!e || typeof e != "object" || Array.isArray(e)) throw new y("validate", `报表 ${t} Provider 应返回 datasets 结果对象`);
   for (const n of ["revision", "sourceToken"])
-    if (e[n] !== void 0 && typeof e[n] != "string") throw new w("validate", `报表 ${t} Provider ${n} 应为字符串`);
+    if (e[n] !== void 0 && typeof e[n] != "string") throw new y("validate", `报表 ${t} Provider ${n} 应为字符串`);
   if (e.diagnostics !== void 0 && (!Array.isArray(e.diagnostics) || e.diagnostics.some((n) => !n || typeof n.code != "string" || typeof n.message != "string" || !["info", "warning", "error"].includes(n.severity))))
-    throw new w("validate", `报表 ${t} Provider diagnostics 不符合结构化诊断契约`);
+    throw new y("validate", `报表 ${t} Provider diagnostics 不符合结构化诊断契约`);
 }
-function Ge(e, t, n) {
+function Ye(e, t, n) {
   for (const [r, o] of Object.entries(e.dataSchema ?? {})) {
-    let a;
+    let i;
     try {
-      a = ve(Object.prototype.hasOwnProperty.call(t, r) ? t[r] : void 0, o, { ...e.dataValidation, path: `$.datasets.${r}` });
-    } catch (i) {
-      throw new w("config", `报表 ${n} 数据集 ${r} 字段契约配置无效`, i);
+      i = $e(Object.prototype.hasOwnProperty.call(t, r) ? t[r] : void 0, o, { ...e.dataValidation, path: `$.datasets.${r}` });
+    } catch (a) {
+      throw new y("config", `报表 ${n} 数据集 ${r} 字段契约配置无效`, a);
     }
-    if (!a.ok) throw new w("validate", `报表 ${n} 数据集 ${r} 不符合字段契约：${a.issues[0]?.message}`, { issues: a.issues });
+    if (!i.ok) throw new y("validate", `报表 ${n} 数据集 ${r} 不符合字段契约：${i.issues[0]?.message}`, { issues: i.issues });
   }
 }
-function Ye(e, t, n, r, o) {
-  const a = o ? o.maxPages - o.usedPages : void 0;
+function Ve(e, t, n, r, o) {
+  const i = o ? o.maxPages - o.usedPages : void 0;
   try {
-    if (a !== void 0 && a < 1 && e.pages.length) throw new R(0, 1);
-    const i = a === void 0 ? n.pagination : {
+    if (i !== void 0 && i < 1 && e.pages.length) throw new N(0, 1);
+    const a = i === void 0 ? n.pagination : {
       ...n.pagination,
-      maxPages: Math.max(1, Math.min(a, n.pagination?.maxPages ?? a))
+      maxPages: Math.max(1, Math.min(i, n.pagination?.maxPages ?? i))
     };
-    return je(e, t, i);
-  } catch (i) {
-    const s = i instanceof R && o && i.limit === a ? new R(o.maxPages, o.usedPages + i.actual) : i;
-    throw new w("validate", `报表 ${r} 排版失败：${s instanceof Error ? s.message : String(s)}`, s);
+    return We(e, t, a);
+  } catch (a) {
+    const s = a instanceof N && o && a.limit === i ? new N(o.maxPages, o.usedPages + a.actual) : a;
+    throw new y("validate", `报表 ${r} 排版失败：${s instanceof Error ? s.message : String(s)}`, s);
   }
 }
-function qe(e, t, n, r) {
-  const o = /* @__PURE__ */ new Map(), a = (i) => {
-    let s = o.get(i);
-    return s === void 0 && (s = JSON.stringify([n, r, i]), o.set(i, s)), s;
+function Je(e, t, n, r) {
+  const o = /* @__PURE__ */ new Map(), i = (a) => {
+    let s = o.get(a);
+    return s === void 0 && (s = JSON.stringify([n, r, a]), o.set(a, s)), s;
   };
-  for (const i of t.pages) e.push({
-    ...i,
-    components: i.components.map((s) => s.table ? {
+  for (const a of t.pages) e.push({
+    ...a,
+    components: a.components.map((s) => s.table ? {
       ...s,
-      table: { ...s.table, id: a(s.table.id) }
+      table: { ...s.table, id: i(s.table.id) }
     } : s)
   });
 }
-function rt(e, t = {}) {
-  if (t.maxPages !== void 0 && (!Number.isSafeInteger(t.maxPages) || t.maxPages < 1)) throw new w("config", "maxPages 应为正安全整数");
+function it(e, t = {}) {
+  if (t.maxPages !== void 0 && (!Number.isSafeInteger(t.maxPages) || t.maxPages < 1)) throw new y("config", "maxPages 应为正安全整数");
   function n(o) {
-    const a = Object.prototype.hasOwnProperty.call(e, o) ? e[o] : void 0;
-    if (!a) throw new w("config", `未注册报表 ${o}`);
-    return a;
-  }
-  return Object.assign(async ({ reportIds: o, params: a, signal: i, onWarning: s, onQueryResult: l }) => {
-    $(i);
-    const d = [...o], u = { ...a };
-    if (d.length === 0) throw new w("config", "缺少报表 ID");
-    const f = d.map(n), b = f.map((h) => O(
-      h.params ?? (typeof h.template == "function" ? [] : h.template.params) ?? [],
-      u
-    )), y = [], g = [];
-    for (const [h, S] of f.entries()) {
-      $(i);
-      const p = d[h], P = { reportId: p, params: b[h], signal: i }, k = typeof S.template == "function" ? await We(S.template, P, g) : S.template;
-      P.params = O(S.params ?? k.params ?? [], P.params);
-      const T = await _e(S, P, p, l, t.onDatasets ? (F, te) => t.onDatasets(F, te, k) : void 0);
-      $(i);
-      const L = Ye(k, T, S, p, t.maxPages === void 0 ? void 0 : { maxPages: t.maxPages, usedPages: y.length });
-      qe(y, L.plan, h, p), g.push(...L.warnings.map((F) => `${p}: ${F}`));
+    const i = Object.prototype.hasOwnProperty.call(e, o) ? e[o] : void 0;
+    if (!i) throw new y("config", `未注册报表 ${o}`);
+    return i;
+  }
+  return Object.assign(async ({ reportIds: o, params: i, signal: a, onWarning: s, onQueryResult: d, ...g }) => {
+    P(a);
+    const c = ce({ ...g, signal: a }), f = [...o], w = { ...i };
+    if (f.length === 0) throw new y("config", "缺少报表 ID");
+    const p = f.map(n), h = c.runSync("validate", () => p.map((l) => B(
+      l.params ?? (typeof l.template == "function" ? [] : l.template.params) ?? [],
+      w
+    ))), m = [], u = [];
+    for (const [l, M] of p.entries()) {
+      P(a);
+      const S = f[l], R = { reportId: S, params: h[l], signal: a }, T = typeof M.template == "function" ? await c.run("query", () => qe(M.template, R, u), S) : M.template;
+      R.params = c.runSync("validate", () => B(M.params ?? T.params ?? [], R.params), S);
+      const L = await c.run("query", () => ze(M, R, S, d), S);
+      c.runSync("validate", () => {
+        _e(L, S), t.onDatasets?.(S, L, T), Ye(M, L, S);
+      }, S), P(a);
+      const O = c.runSync("layout", () => Ve(T, L, M, S, t.maxPages === void 0 ? void 0 : { maxPages: t.maxPages, usedPages: m.length }), S);
+      Je(m, O.plan, l, S), u.push(...O.warnings.map((ne) => `${S}: ${ne}`));
     }
-    $(i);
-    const m = { schemaVersion: W, pages: y }, c = oe(m);
-    if (!c.ok)
-      throw new w("validate", `渲染计划校验失败：${c.errors.slice(0, 3).map((h) => `${h.path}: ${h.message}`).join("; ")}`);
-    g.push(...c.warnings.map((h) => `${h.path}: ${h.message}`));
-    const M = s ?? t.onWarning ?? ((h) => console.warn("[mach-report]", h));
-    for (const h of g)
-      $(i), M(h);
-    return $(i), m;
+    P(a);
+    const b = { schemaVersion: _, pages: m }, x = c.runSync("validate", () => {
+      const l = ae(b);
+      if (!l.ok) throw new y("validate", `渲染计划校验失败：${l.errors.slice(0, 3).map((M) => `${M.path}: ${M.message}`).join("; ")}`);
+      return l;
+    });
+    u.push(...x.warnings.map((l) => `${l.path}: ${l.message}`));
+    const k = s ?? t.onWarning ?? ((l) => console.warn("[mach-report]", l));
+    for (const l of u)
+      P(a), k(l);
+    return P(a), b;
   }, {
-    getParamDefs: (o) => ae(e, o)
+    getParamDefs: (o) => ie(e, o)
   });
 }
 export {
-  R as P,
-  w as R,
-  nt as a,
-  me as b,
-  rt as c,
-  tt as d,
-  le as e,
-  q as f,
-  D as g,
-  je as p,
+  N as P,
+  y as R,
+  at as a,
+  ue as b,
+  it as c,
+  ot as d,
+  fe as e,
+  V as f,
+  H as g,
+  We as p,
   Y as t,
-  ve as v
+  $e as v
 };