yh-report 2.4.115 → 2.4.117

package/{index-D5s-AlK7.mjs → index-DgsSvRRw.mjs}

@@ -1134,10 +1134,10 @@ function applyBorderOperation(t, e, r) {
     d.row < n && (n = d.row), d.row > o && (o = d.row), d.col < i && (i = d.col), d.col > a && (a = d.col);
   });
   const s = new Set(t.map((d) => `${d.row},${d.col}`)), l = /* @__PURE__ */ new Map(), c = r.color ? { style: r.style, color: r.color } : { style: r.style }, u = (d, p, m, g) => {
-    var x, y, v;
+    var $, y, v;
     const _ = `${d},${p}`;
     let E = l.get(_);
-    E || (E = { row: d, col: p, border: cloneBorder((v = (y = (x = e[d]) == null ? void 0 : x[p]) == null ? void 0 : y.style) == null ? void 0 : v.border) }, l.set(_, E)), E.border[m] = { ...g };
+    E || (E = { row: d, col: p, border: cloneBorder((v = (y = ($ = e[d]) == null ? void 0 : $[p]) == null ? void 0 : y.style) == null ? void 0 : v.border) }, l.set(_, E)), E.border[m] = { ...g };
   }, f = r.mode === "none";
   t.forEach((d) => {
     var _, E;
@@ -1146,9 +1146,9 @@ function applyBorderOperation(t, e, r) {
     const m = cloneBorder((E = p.style) == null ? void 0 : E.border);
     f ? (m.top = { style: "none" }, m.right = { style: "none" }, m.bottom = { style: "none" }, m.left = { style: "none" }) : getSidesForMode(d, n, o, i, a, r.mode).forEach((y) => {
       m[y] = { ...c };
-    }), l.set(`${d.row},${d.col}`, { row: d.row, col: d.col, border: m }), (f ? getSidesForMode(d, n, o, i, a, "outside") : getSidesForMode(d, n, o, i, a, r.mode)).forEach((x) => {
+    }), l.set(`${d.row},${d.col}`, { row: d.row, col: d.col, border: m }), (f ? getSidesForMode(d, n, o, i, a, "outside") : getSidesForMode(d, n, o, i, a, r.mode)).forEach(($) => {
       var C;
-      const y = getNeighborSide(d, x);
+      const y = getNeighborSide(d, $);
       if (!y) return;
       const v = (C = e[y.row]) == null ? void 0 : C[y.col];
       v && (s.has(`${y.row},${y.col}`) || v.rowSpan === 0 || v.colSpan === 0 || u(y.row, y.col, y.side, f ? { style: "none" } : { ...c }));
@@ -1160,10 +1160,9 @@ function applyBorderOperation(t, e, r) {
   });
 }
 function generateNumFmt(t, e) {
-  if (typeof e != "number" || e < 0 || !Number.isInteger(e))
-    return "0";
-  let r = t ? "#,##0" : "0", n = "";
-  return e > 0 && (n = "." + "0".repeat(e)), r + n;
+  const r = Math.max(0, Math.floor(Number(e) || 0));
+  let n = t ? "#,##0" : "0";
+  return r > 0 && (n += "." + "0".repeat(r)), n;
 }
 function findMaxColTableIndex(t) {
   let e = 0, r = 0;
@@ -1250,11 +1249,11 @@ function writeReportConfigsToSheet(t, e, r, n) {
       const g = c.filter((y) => y.isHidden).map((y) => y.index), _ = l[p].filter((y) => !g.includes(y.col));
       let E = _.map((y) => y.text);
       p > 0 ? t.addRow(E) : i === n ? t.getRow(n + 1).values = E : t.addRow(E);
-      const x = t.getRow(i + p + 1);
-      m && m.size && !isNaN(m.size) ? m.size > 0 ? x.height = m.size < 25 ? 25 : m.size : x.hidden = !0 : x.height = 25;
+      const $ = t.getRow(i + p + 1);
+      m && m.size && !isNaN(m.size) ? m.size > 0 ? $.height = m.size < 25 ? 25 : m.size : $.hidden = !0 : $.height = 25;
       for (let y = 0; y < _.length; y++) {
-        const v = _[y], C = x.getCell(y + 1);
-        let { style: w, col: $, row: I, colSpan: A, rowSpan: O, format: N, formatType: U } = v;
+        const v = _[y], C = $.getCell(y + 1);
+        let { style: w, col: x, row: I, colSpan: A, rowSpan: O, format: N, formatType: U } = v;
         const L = {};
         if (w && w.color && (L.color = {
           argb: "FF" + ((f = w.color) == null ? void 0 : f.replace("#", ""))
@@ -1364,7 +1363,7 @@ var dayjs_min = { exports: {} };
   (function(r, n) {
     t.exports = n();
   })(commonjsGlobal, function() {
-    var r = 1e3, n = 6e4, o = 36e5, i = "millisecond", a = "second", s = "minute", l = "hour", c = "day", u = "week", f = "month", d = "quarter", p = "year", m = "date", g = "Invalid Date", _ = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/, E = /\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g, x = { name: "en", weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), ordinal: function(M) {
+    var r = 1e3, n = 6e4, o = 36e5, i = "millisecond", a = "second", s = "minute", l = "hour", c = "day", u = "week", f = "month", d = "quarter", p = "year", m = "date", g = "Invalid Date", _ = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/, E = /\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g, $ = { name: "en", weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), ordinal: function(M) {
       var T = ["th", "st", "nd", "rd"], b = M % 100;
       return "[" + M + (T[(b - 20) % 10] || T[b] || T[0]) + "]";
     } }, y = function(M, T, b) {
@@ -1384,9 +1383,9 @@ var dayjs_min = { exports: {} };
     }, u: function(M) {
       return M === void 0;
     } }, C = "en", w = {};
-    w[C] = x;
-    var $ = "$isDayjsObject", I = function(M) {
-      return M instanceof U || !(!M || !M[$]);
+    w[C] = $;
+    var x = "$isDayjsObject", I = function(M) {
+      return M instanceof U || !(!M || !M[x]);
     }, A = function M(T, b, D) {
       var S;
       if (!T) return C;
@@ -1410,7 +1409,7 @@ var dayjs_min = { exports: {} };
     };
     var U = function() {
       function M(b) {
-        this.$L = A(b.locale, null, !0), this.parse(b), this.$x = this.$x || b.x || {}, this[$] = !0;
+        this.$L = A(b.locale, null, !0), this.parse(b), this.$x = this.$x || b.x || {}, this[x] = !0;
       }
       var T = M.prototype;
       return T.parse = function(b) {
@@ -1858,7 +1857,7 @@ async function fetchReportData(t, e, r, n = !1) {
       const m = a.get(p.toUpperCase()), g = m != null && m.length ? { ...i, params: [...i.params || [], ...m] } : i, _ = await getDateSourceData(p, g);
       let E = _.data;
       if (n && Array.isArray(E)) {
-        const x = _.count || E.length, y = i.pageSize > 0 ? i.pageSize : FULL_FETCH_PAGE_SIZE, v = Math.min(Math.ceil(x / y), FULL_FETCH_MAX_PAGES);
+        const $ = _.count || E.length, y = i.pageSize > 0 ? i.pageSize : FULL_FETCH_PAGE_SIZE, v = Math.min(Math.ceil($ / y), FULL_FETCH_MAX_PAGES);
         for (let C = 2; C <= v; C++) {
           const w = await getDateSourceData(p, { ...g, pageNumber: C });
           if (!Array.isArray(w.data) || w.data.length === 0)
@@ -1988,7 +1987,7 @@ class Jsep {
    * @returns {string}
    */
   static get version() {
-    return "1.4.0";
+    return "1.6.0";
   }
   /**
    * @returns {string}
@@ -3158,7 +3157,7 @@ var divide = /* @__PURE__ */ function() {
     for (; !n[0] && n.length > 1; ) n.shift();
   }
   return function(n, o, i, a, s, l) {
-    var c, u, f, d, p, m, g, _, E, x, y, v, C, w, $, I, A, O, N, U, L = n.constructor, M = n.s == o.s ? 1 : -1, T = n.d, b = o.d;
+    var c, u, f, d, p, m, g, _, E, $, y, v, C, w, x, I, A, O, N, U, L = n.constructor, M = n.s == o.s ? 1 : -1, T = n.d, b = o.d;
     if (!T || !T[0] || !b || !b[0])
       return new L(
         // Return NaN if either NaN, or both Infinity or 0.
@@ -3167,28 +3166,28 @@ var divide = /* @__PURE__ */ function() {
           T && T[0] == 0 || !b ? M * 0 : M / 0
         )
       );
-    for (l ? (p = 1, u = n.e - o.e) : (l = BASE, p = LOG_BASE, u = mathfloor(n.e / p) - mathfloor(o.e / p)), N = b.length, A = T.length, E = new L(M), x = E.d = [], f = 0; b[f] == (T[f] || 0); f++) ;
+    for (l ? (p = 1, u = n.e - o.e) : (l = BASE, p = LOG_BASE, u = mathfloor(n.e / p) - mathfloor(o.e / p)), N = b.length, A = T.length, E = new L(M), $ = E.d = [], f = 0; b[f] == (T[f] || 0); f++) ;
     if (b[f] > (T[f] || 0) && u--, i == null ? (w = i = L.precision, a = L.rounding) : s ? w = i + (n.e - o.e) + 1 : w = i, w < 0)
-      x.push(1), m = !0;
+      $.push(1), m = !0;
     else {
       if (w = w / p + 2 | 0, f = 0, N == 1) {
         for (d = 0, b = b[0], w++; (f < A || d) && w--; f++)
-          $ = d * l + (T[f] || 0), x[f] = $ / b | 0, d = $ % b | 0;
+          x = d * l + (T[f] || 0), $[f] = x / b | 0, d = x % b | 0;
         m = d || f < A;
       } else {
         for (d = l / (b[0] + 1) | 0, d > 1 && (b = t(b, d, l), T = t(T, d, l), N = b.length, A = T.length), I = N, y = T.slice(0, N), v = y.length; v < N; ) y[v++] = 0;
         U = b.slice(), U.unshift(0), O = b[0], b[1] >= l / 2 && ++O;
         do
-          d = 0, c = e(b, y, N, v), c < 0 ? (C = y[0], N != v && (C = C * l + (y[1] || 0)), d = C / O | 0, d > 1 ? (d >= l && (d = l - 1), g = t(b, d, l), _ = g.length, v = y.length, c = e(g, y, _, v), c == 1 && (d--, r(g, N < _ ? U : b, _, l))) : (d == 0 && (c = d = 1), g = b.slice()), _ = g.length, _ < v && g.unshift(0), r(y, g, v, l), c == -1 && (v = y.length, c = e(b, y, N, v), c < 1 && (d++, r(y, N < v ? U : b, v, l))), v = y.length) : c === 0 && (d++, y = [0]), x[f++] = d, c && y[0] ? y[v++] = T[I] || 0 : (y = [T[I]], v = 1);
+          d = 0, c = e(b, y, N, v), c < 0 ? (C = y[0], N != v && (C = C * l + (y[1] || 0)), d = C / O | 0, d > 1 ? (d >= l && (d = l - 1), g = t(b, d, l), _ = g.length, v = y.length, c = e(g, y, _, v), c == 1 && (d--, r(g, N < _ ? U : b, _, l))) : (d == 0 && (c = d = 1), g = b.slice()), _ = g.length, _ < v && g.unshift(0), r(y, g, v, l), c == -1 && (v = y.length, c = e(b, y, N, v), c < 1 && (d++, r(y, N < v ? U : b, v, l))), v = y.length) : c === 0 && (d++, y = [0]), $[f++] = d, c && y[0] ? y[v++] = T[I] || 0 : (y = [T[I]], v = 1);
         while ((I++ < A || y[0] !== void 0) && w--);
         m = y[0] !== void 0;
       }
-      x[0] || x.shift();
+      $[0] || $.shift();
     }
     if (p == 1)
       E.e = u, inexact = m;
     else {
-      for (f = 1, d = x[0]; d >= 10; d /= 10) f++;
+      for (f = 1, d = $[0]; d >= 10; d /= 10) f++;
       E.e = f + u * p - 1, finalise(E, s ? i + E.e + 1 : i, a, m);
     }
     return E;
@@ -3305,7 +3304,7 @@ function naturalExponential(t, e) {
   }
 }
 function naturalLogarithm(t, e) {
-  var r, n, o, i, a, s, l, c, u, f, d, p = 1, m = 10, g = t, _ = g.d, E = g.constructor, x = E.rounding, y = E.precision;
+  var r, n, o, i, a, s, l, c, u, f, d, p = 1, m = 10, g = t, _ = g.d, E = g.constructor, $ = E.rounding, y = E.precision;
   if (g.s < 0 || !_ || !_[0] || !g.e && _[0] == 1 && _.length == 1)
     return new E(_ && !_[0] ? -1 / 0 : g.s != 1 ? NaN : _ ? 0 : g);
   if (e == null ? (external = !1, u = y) : u = e, E.precision = u += m, r = digitsToString(_), n = r.charAt(0), Math.abs(i = g.e) < 15e14) {
@@ -3313,14 +3312,14 @@ function naturalLogarithm(t, e) {
       g = g.times(t), r = digitsToString(g.d), n = r.charAt(0), p++;
     i = g.e, n > 1 ? (g = new E("0." + r), i++) : g = new E(n + "." + r.slice(1));
   } else
-    return c = getLn10(E, u + 2, y).times(i + ""), g = naturalLogarithm(new E(n + "." + r.slice(1)), u - m).plus(c), E.precision = y, e == null ? finalise(g, y, x, external = !0) : g;
+    return c = getLn10(E, u + 2, y).times(i + ""), g = naturalLogarithm(new E(n + "." + r.slice(1)), u - m).plus(c), E.precision = y, e == null ? finalise(g, y, $, external = !0) : g;
   for (f = g, l = a = g = divide(g.minus(1), g.plus(1), u, 1), d = finalise(g.times(g), u, 1), o = 3; ; ) {
     if (a = finalise(a.times(d), u, 1), c = l.plus(divide(a, new E(o), u, 1)), digitsToString(c.d).slice(0, u) === digitsToString(l.d).slice(0, u))
       if (l = l.times(2), i !== 0 && (l = l.plus(getLn10(E, u + 2, y).times(i + ""))), l = divide(l, new E(p), u, 1), e == null)
-        if (checkRoundingDigits(l.d, u - m, x, s))
+        if (checkRoundingDigits(l.d, u - m, $, s))
           E.precision = u += m, c = a = g = divide(f.minus(1), f.plus(1), u, 1), d = finalise(g.times(g), u, 1), o = s = 1;
         else
-          return finalise(l, E.precision = y, x, external = !0);
+          return finalise(l, E.precision = y, $, external = !0);
       else
         return E.precision = y, l;
     l = c, o += 2;
@@ -7096,9 +7095,9 @@ regex.testAlphanumeric = function t(e) {
     if (!i.isValid(p))
       throw new Error("Invalid QR Code version");
     typeof g > "u" && (g = o.BYTE);
-    const _ = e.getSymbolTotalCodewords(p), E = r.getTotalCodewordsCount(p, m), x = (_ - E) * 8;
-    if (g === o.MIXED) return x;
-    const y = x - c(g, p);
+    const _ = e.getSymbolTotalCodewords(p), E = r.getTotalCodewordsCount(p, m), $ = (_ - E) * 8;
+    if (g === o.MIXED) return $;
+    const y = $ - c(g, p);
     switch (g) {
       case o.NUMERIC:
         return Math.floor(y / 10 * 3);
@@ -7349,33 +7348,33 @@ var dijkstraExports = dijkstra.exports;
   function c(E) {
     return unescape(encodeURIComponent(E)).length;
   }
-  function u(E, x, y) {
+  function u(E, $, y) {
     const v = [];
     let C;
     for (; (C = E.exec(y)) !== null; )
       v.push({
         data: C[0],
         index: C.index,
-        mode: x,
+        mode: $,
         length: C[0].length
       });
     return v;
   }
   function f(E) {
-    const x = u(a.NUMERIC, e.NUMERIC, E), y = u(a.ALPHANUMERIC, e.ALPHANUMERIC, E);
+    const $ = u(a.NUMERIC, e.NUMERIC, E), y = u(a.ALPHANUMERIC, e.ALPHANUMERIC, E);
     let v, C;
-    return s.isKanjiModeEnabled() ? (v = u(a.BYTE, e.BYTE, E), C = u(a.KANJI, e.KANJI, E)) : (v = u(a.BYTE_KANJI, e.BYTE, E), C = []), x.concat(y, v, C).sort(function($, I) {
-      return $.index - I.index;
-    }).map(function($) {
+    return s.isKanjiModeEnabled() ? (v = u(a.BYTE, e.BYTE, E), C = u(a.KANJI, e.KANJI, E)) : (v = u(a.BYTE_KANJI, e.BYTE, E), C = []), $.concat(y, v, C).sort(function(x, I) {
+      return x.index - I.index;
+    }).map(function(x) {
       return {
-        data: $.data,
-        mode: $.mode,
-        length: $.length
+        data: x.data,
+        mode: x.mode,
+        length: x.length
       };
     });
   }
-  function d(E, x) {
-    switch (x) {
+  function d(E, $) {
+    switch ($) {
       case e.NUMERIC:
         return r.getBitsLength(E);
       case e.ALPHANUMERIC:
@@ -7387,54 +7386,54 @@ var dijkstraExports = dijkstra.exports;
     }
   }
   function p(E) {
-    return E.reduce(function(x, y) {
-      const v = x.length - 1 >= 0 ? x[x.length - 1] : null;
-      return v && v.mode === y.mode ? (x[x.length - 1].data += y.data, x) : (x.push(y), x);
+    return E.reduce(function($, y) {
+      const v = $.length - 1 >= 0 ? $[$.length - 1] : null;
+      return v && v.mode === y.mode ? ($[$.length - 1].data += y.data, $) : ($.push(y), $);
     }, []);
   }
   function m(E) {
-    const x = [];
+    const $ = [];
     for (let y = 0; y < E.length; y++) {
       const v = E[y];
       switch (v.mode) {
         case e.NUMERIC:
-          x.push([
+          $.push([
             v,
             { data: v.data, mode: e.ALPHANUMERIC, length: v.length },
             { data: v.data, mode: e.BYTE, length: v.length }
           ]);
           break;
         case e.ALPHANUMERIC:
-          x.push([
+          $.push([
             v,
             { data: v.data, mode: e.BYTE, length: v.length }
           ]);
           break;
         case e.KANJI:
-          x.push([
+          $.push([
             v,
             { data: v.data, mode: e.BYTE, length: c(v.data) }
           ]);
           break;
         case e.BYTE:
-          x.push([
+          $.push([
             { data: v.data, mode: e.BYTE, length: c(v.data) }
           ]);
       }
     }
-    return x;
+    return $;
   }
-  function g(E, x) {
+  function g(E, $) {
     const y = {}, v = { start: {} };
     let C = ["start"];
     for (let w = 0; w < E.length; w++) {
-      const $ = E[w], I = [];
-      for (let A = 0; A < $.length; A++) {
-        const O = $[A], N = "" + w + A;
+      const x = E[w], I = [];
+      for (let A = 0; A < x.length; A++) {
+        const O = x[A], N = "" + w + A;
         I.push(N), y[N] = { node: O, lastCount: 0 }, v[N] = {};
         for (let U = 0; U < C.length; U++) {
           const L = C[U];
-          y[L] && y[L].node.mode === O.mode ? (v[L][N] = d(y[L].lastCount + O.length, O.mode) - d(y[L].lastCount, O.mode), y[L].lastCount += O.length) : (y[L] && (y[L].lastCount = O.length), v[L][N] = d(O.length, O.mode) + 4 + e.getCharCountIndicator(O.mode, x));
+          y[L] && y[L].node.mode === O.mode ? (v[L][N] = d(y[L].lastCount + O.length, O.mode) - d(y[L].lastCount, O.mode), y[L].lastCount += O.length) : (y[L] && (y[L].lastCount = O.length), v[L][N] = d(O.length, O.mode) + 4 + e.getCharCountIndicator(O.mode, $));
         }
       }
       C = I;
@@ -7443,10 +7442,10 @@ var dijkstraExports = dijkstra.exports;
       v[C[w]].end = 0;
     return { map: v, table: y };
   }
-  function _(E, x) {
+  function _(E, $) {
     let y;
     const v = e.getBestModeForData(E);
-    if (y = e.from(x, v), y !== e.BYTE && y.bit < v.bit)
+    if (y = e.from($, v), y !== e.BYTE && y.bit < v.bit)
       throw new Error('"' + E + '" cannot be encoded with mode ' + e.toString(y) + `.
  Suggested mode is: ` + e.toString(v));
     switch (y === e.KANJI && !s.isKanjiModeEnabled() && (y = e.BYTE), y) {
@@ -7460,18 +7459,18 @@ var dijkstraExports = dijkstra.exports;
         return new o(E);
     }
   }
-  t.fromArray = function(x) {
-    return x.reduce(function(y, v) {
+  t.fromArray = function($) {
+    return $.reduce(function(y, v) {
       return typeof v == "string" ? y.push(_(v, null)) : v.data && y.push(_(v.data, v.mode)), y;
     }, []);
-  }, t.fromString = function(x, y) {
-    const v = f(x, s.isKanjiModeEnabled()), C = m(v), w = g(C, y), $ = l.find_path(w.map, "start", "end"), I = [];
-    for (let A = 1; A < $.length - 1; A++)
-      I.push(w.table[$[A]].node);
+  }, t.fromString = function($, y) {
+    const v = f($, s.isKanjiModeEnabled()), C = m(v), w = g(C, y), x = l.find_path(w.map, "start", "end"), I = [];
+    for (let A = 1; A < x.length - 1; A++)
+      I.push(w.table[x[A]].node);
     return t.fromArray(p(I));
-  }, t.rawSplit = function(x) {
+  }, t.rawSplit = function($) {
     return t.fromArray(
-      f(x, s.isKanjiModeEnabled())
+      f($, s.isKanjiModeEnabled())
     );
   };
 })(segments);
@@ -7549,10 +7548,10 @@ function createCodewords(t, e, r) {
   let m = 0;
   const g = new Array(a), _ = new Array(a);
   let E = 0;
-  const x = new Uint8Array(t.buffer);
-  for (let $ = 0; $ < a; $++) {
-    const I = $ < l ? u : f;
-    g[$] = x.slice(m, m + I), _[$] = p.encode(g[$]), m += I, E = Math.max(E, I);
+  const $ = new Uint8Array(t.buffer);
+  for (let x = 0; x < a; x++) {
+    const I = x < l ? u : f;
+    g[x] = $.slice(m, m + I), _[x] = p.encode(g[x]), m += I, E = Math.max(E, I);
   }
   const y = new Uint8Array(n);
   let v = 0, C, w;
@@ -7841,8 +7840,11 @@ function renderCellStyle(t) {
       }
   }), e;
 }
+function normalizeDecimalPlaces(t) {
+  return Math.max(0, Math.floor(Number(t) || 0));
+}
 function formatNumber$1(t, { numberDecimal: e, numberUseGrouping: r } = {}) {
-  const n = e === 0 ? Math.round(t) : new Decimal(t).toFixed(e ?? 0);
+  const n = e === 0 ? Math.round(t) : new Decimal(t).toFixed(normalizeDecimalPlaces(e));
   if (r) {
     const o = n.toString().split(".");
     return o[0] = o[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","), o.join(".");
@@ -7850,14 +7852,14 @@ function formatNumber$1(t, { numberDecimal: e, numberUseGrouping: r } = {}) {
     return n;
 }
 function formatCurrency(t, { numberDecimal: e, currencySymbol: r, numberUseGrouping: n } = {}) {
-  const o = new Decimal(t).toFixed(e > 0 ? e : 0);
-  let [i, a] = o.split(".");
-  n && (i = i.replace(/\B(?=(\d{3})+(?!\d))/g, ","));
-  let s = `${r}${i}`;
-  return e > 0 && (s += `.${a}`), s;
+  const o = normalizeDecimalPlaces(e), i = new Decimal(t).toFixed(o);
+  let [a, s] = i.split(".");
+  n && (a = a.replace(/\B(?=(\d{3})+(?!\d))/g, ","));
+  let l = `${r}${a}`;
+  return o > 0 && (l += `.${s}`), l;
 }
 function formatPercentage(t, { numberDecimal: e } = {}, r = !1) {
-  const n = r ? 1e3 : 100, o = new Decimal(t).times(n).toFixed(e ?? 0);
+  const n = r ? 1e3 : 100, o = new Decimal(t).times(n).toFixed(normalizeDecimalPlaces(e));
   return r ? `${o}‰` : `${o}%`;
 }
 function formatScientific(t, { scientificNotation: e = "e", digits: r = 6 } = {}) {
@@ -7886,7 +7888,7 @@ function formatCellValue(t, e = FormatType.TEXT, r) {
   let n = null;
   if ([FormatType.NUMBER, FormatType.CURRENCY, FormatType.PERCENT, FormatType.PROMILLE, FormatType.SCIENTIFIC].includes(e)) {
     let o = typeof t == "string" ? t.replace(/,/g, "") : String(t);
-    if (n = parseFloat(o), isNaN(n) && (n = 0), n === 0 && (r == null ? void 0 : r.defaultCellContent) !== void 0)
+    if (n = parseFloat(o), Number.isFinite(n) || (n = 0), n === 0 && (r == null ? void 0 : r.defaultCellContent) !== void 0)
       return r.defaultCellContent;
   }
   switch (e) {
@@ -7927,10 +7929,10 @@ function renderImageStyle(t) {
   return t.width !== void 0 && e.push(`width:${t.width}px`), t.height !== void 0 && e.push(`height:${t.height}px`), t.fit && e.push(`object-fit:${t.fit}`), e.length ? e.join(";") : "";
 }
 function renderCell(t, e, r) {
-  var x, y, v, C, w;
+  var $, y, v, C, w;
   const n = document.createElement("td");
   n.setAttribute("data-cell-config", `${e.row}-${e.col}`), n.setAttribute("rowspan", e.rowSpan), n.setAttribute("colspan", e.colSpan);
-  const o = ((x = e.style) == null ? void 0 : x.allowContentOverflow) === !0;
+  const o = (($ = e.style) == null ? void 0 : $.allowContentOverflow) === !0;
   n.style.boxSizing = "border-box", n.style.position = "relative", e.rowSpan <= 1 && (o ? n.style.minHeight = `${t.size ?? 25}px` : n.style.height = `${t.size ?? 25}px`);
   const i = { left: "flex-start", center: "center", right: "flex-end" }, a = { top: "flex-start", center: "center", bottom: "flex-end" }, s = i[(y = e.style) == null ? void 0 : y.textAlign] || "center", l = a[(v = e.style) == null ? void 0 : v.verticalAlign] || "center", c = document.createElement("div");
   o ? c.style.cssText = `overflow:visible;position:relative;display:flex;align-items:${l};justify-content:${s};` : c.style.cssText = `overflow:hidden;position:absolute;inset:0;display:flex;align-items:${l};justify-content:${s};`;
@@ -7940,13 +7942,13 @@ function renderCell(t, e, r) {
       d = `<i class="iconfont ${e.data}"></i>`, f = !0;
       break;
     case CellType.IMAGE: {
-      const $ = renderImageStyle(e.imageOptions);
-      d = `<img src="${e.rawData ?? e.data}" alt="" style="max-width:100%;max-height:100%;object-fit:contain${$ ? ";" + $ : ""}">`, f = !0;
+      const x = renderImageStyle(e.imageOptions);
+      d = `<img src="${e.rawData ?? e.data}" alt="" style="max-width:100%;max-height:100%;object-fit:contain${x ? ";" + x : ""}">`, f = !0;
       break;
     }
     case CellType.RICH: {
-      const $ = [void 0, null, ""].includes(e.text) ? ((C = e.formatType) == null ? void 0 : C.defaultCellContent) || "" : String(e.text);
-      $ && (d = $, f = !0);
+      const x = [void 0, null, ""].includes(e.text) ? ((C = e.formatType) == null ? void 0 : C.defaultCellContent) || "" : String(e.text);
+      x && (d = x, f = !0);
       break;
     }
     default:
@@ -7955,25 +7957,25 @@ function renderCell(t, e, r) {
   }
   if (!f && e.format === FormatType.BARCODE)
     try {
-      const $ = e.barcodeUrl || canvasPool.generateBarcode(u, e.barcodeOptions);
-      $ && (d = `<img src="${$}" alt="barcode" style="max-width:100%;max-height:100%;object-fit:contain">`, f = !0);
-    } catch ($) {
-      console.error(`条形码生成失败 [${e.row}:${e.col}]:`, $);
+      const x = e.barcodeUrl || canvasPool.generateBarcode(u, e.barcodeOptions);
+      x && (d = `<img src="${x}" alt="barcode" style="max-width:100%;max-height:100%;object-fit:contain">`, f = !0);
+    } catch (x) {
+      console.error(`条形码生成失败 [${e.row}:${e.col}]:`, x);
     }
   else if (!f && e.format === FormatType.QRCODE) {
-    const $ = e.qrcodeData;
-    $ && (d = `<img src="${$}" alt="qrcode" style="max-width:100%;max-height:100%;object-fit:contain">`, f = !0);
+    const x = e.qrcodeData;
+    x && (d = `<img src="${x}" alt="qrcode" style="max-width:100%;max-height:100%;object-fit:contain">`, f = !0);
   }
   if (f)
     c.innerHTML = d;
   else {
-    const $ = document.createElement("span");
-    $.style.cssText = "word-break:break-word;overflow-wrap:anywhere;", $.innerText = String(u), c.appendChild($);
+    const x = document.createElement("span");
+    x.style.cssText = "word-break:break-word;overflow-wrap:anywhere;", x.innerText = String(u), c.appendChild(x);
   }
   const p = e.style || {}, m = p.paddingTop ?? TD_DEFAULT_PADDING_VERTICAL, g = p.paddingRight ?? TD_DEFAULT_PADDING_HORIZONTAL, _ = p.paddingBottom ?? TD_DEFAULT_PADDING_VERTICAL, E = p.paddingLeft ?? TD_DEFAULT_PADDING_HORIZONTAL;
   if (c.style.paddingTop = `${m}px`, c.style.paddingRight = `${g}px`, c.style.paddingBottom = `${_}px`, c.style.paddingLeft = `${E}px`, n.appendChild(c), e.style && (n.setAttribute("style", renderCellStyle(e.style)), e.style.border)) {
-    const $ = normalizeBorder(e.style.border);
-    $ && (n.style.borderTop = getBorderCss($.top, r), n.style.borderRight = getBorderCss($.right, r), n.style.borderBottom = getBorderCss($.bottom, r), n.style.borderLeft = getBorderCss($.left, r));
+    const x = normalizeBorder(e.style.border);
+    x && (n.style.borderTop = getBorderCss(x.top, r), n.style.borderRight = getBorderCss(x.right, r), n.style.borderBottom = getBorderCss(x.bottom, r), n.style.borderLeft = getBorderCss(x.left, r));
   }
   return n.style.position = "relative", n;
 }
@@ -8042,16 +8044,16 @@ function renderReportByDomForPrint(t, e, r, n, o) {
     }
     u += (g.size ?? 25) - 1, _.style.height = `${g.size ?? 25}px`, f = 0;
     for (let E = 0; E < e.length; E++) {
-      const x = e[E];
-      if (x.isHidden) continue;
+      const $ = e[E];
+      if ($.isHidden) continue;
       const y = r[m][E];
       if (g && y && (g.size ?? 25) > 0) {
         const v = renderCell(g, y, n);
-        if (x.isFixed === !0 && (v.classList.add("fixed-td"), v.style.left = `${f - 1}px`), f += (x.size ?? 80) - 1, v.setAttribute("data-cell-data", `${m}-${E}`), y.rowSpan !== 0 && y.colSpan !== 0) {
+        if ($.isFixed === !0 && (v.classList.add("fixed-td"), v.style.left = `${f - 1}px`), f += ($.size ?? 80) - 1, v.setAttribute("data-cell-data", `${m}-${E}`), y.rowSpan !== 0 && y.colSpan !== 0) {
           if ([CellType.TEXT, CellType.FIELD, CellType.ICON, CellType.FUN, CellType.IMAGE, CellType.RICH].includes(y.type)) {
             y.style && v.setAttribute("style", renderCellPrintStyle(y.style, n)), y.style && y.style.border === !1 && v.classList.add("no-border");
-            const C = ((p = y.style) == null ? void 0 : p.allowContentOverflow) === !0, w = y.style || {}, $ = w.paddingTop ?? TD_DEFAULT_PADDING_VERTICAL, I = w.paddingRight ?? TD_DEFAULT_PADDING_HORIZONTAL, A = w.paddingBottom ?? TD_DEFAULT_PADDING_VERTICAL, O = w.paddingLeft ?? TD_DEFAULT_PADDING_HORIZONTAL;
-            v.style.paddingTop = `${$}px`, v.style.paddingRight = `${I}px`, v.style.paddingBottom = `${A}px`, v.style.paddingLeft = `${O}px`, v.style.boxSizing = "border-box", v.style.position = "relative", y.rowSpan <= 1 && (C ? v.style.minHeight = `${g.size ?? 25}px` : v.style.height = `${g.size ?? 25}px`);
+            const C = ((p = y.style) == null ? void 0 : p.allowContentOverflow) === !0, w = y.style || {}, x = w.paddingTop ?? TD_DEFAULT_PADDING_VERTICAL, I = w.paddingRight ?? TD_DEFAULT_PADDING_HORIZONTAL, A = w.paddingBottom ?? TD_DEFAULT_PADDING_VERTICAL, O = w.paddingLeft ?? TD_DEFAULT_PADDING_HORIZONTAL;
+            v.style.paddingTop = `${x}px`, v.style.paddingRight = `${I}px`, v.style.paddingBottom = `${A}px`, v.style.paddingLeft = `${O}px`, v.style.boxSizing = "border-box", v.style.position = "relative", y.rowSpan <= 1 && (C ? v.style.minHeight = `${g.size ?? 25}px` : v.style.height = `${g.size ?? 25}px`);
           }
           _.appendChild(v);
         }
@@ -8071,27 +8073,27 @@ function renderReportByDom(t, e, r, n, o, i) {
   const f = document.createDocumentFragment(), d = [], p = [], m = /* @__PURE__ */ new Map();
   let g = 0;
   for (let E = 0; E < t.length; E++) {
-    const x = t[E];
-    if (x.isHidden)
+    const $ = t[E];
+    if ($.isHidden)
       continue;
     const y = document.createElement("tr");
-    y.dataset.ri = String(g), x.isFixed && (y.style.top = `${c - 1}px`, y.classList.add("fixed-row")), c += (x.size ?? 25) - 1, y.style.height = `${x.size ?? 25}px`, u = 0;
+    y.dataset.ri = String(g), $.isFixed && (y.style.top = `${c - 1}px`, y.classList.add("fixed-row")), c += ($.size ?? 25) - 1, y.style.height = `${$.size ?? 25}px`, u = 0;
     for (let v = 0; v < e.length; v++) {
       const C = e[v];
       if (C.isHidden)
         continue;
       const w = r[E][v];
-      if (x && w && (x.size ?? 25) > 0) {
-        const $ = renderCell(x, w, i);
+      if ($ && w && ($.size ?? 25) > 0) {
+        const x = renderCell($, w, i);
         if (w.clickSortField) {
-          $.classList.add("click-sort-cell"), $.setAttribute("data-click-sort-field", w.clickSortField), $.setAttribute("data-click-sort-numeric", w.clickSortNumeric ? "1" : "0");
+          x.classList.add("click-sort-cell"), x.setAttribute("data-click-sort-field", w.clickSortField), x.setAttribute("data-click-sort-numeric", w.clickSortNumeric ? "1" : "0");
           const I = document.createElement("span");
-          I.className = "click-sort-arrow", (_ = $.querySelector(":scope > div")) == null || _.appendChild(I);
+          I.className = "click-sort-arrow", (_ = x.querySelector(":scope > div")) == null || _.appendChild(I);
         }
-        if (C.isFixed === !0 && ($.classList.add("fixed-td"), $.style.position = "sticky", $.style.left = `${u - 1}px`), u += (C.size ?? 80) - 1, $.setAttribute("data-cell-data", `${E}-${v}`), !(w.rowSpan === 0 || w.colSpan === 0)) {
-          if (w.style && w.style.border === !1 && $.classList.add("no-border"), y.appendChild($), w.rowSpan > 1) {
+        if (C.isFixed === !0 && (x.classList.add("fixed-td"), x.style.position = "sticky", x.style.left = `${u - 1}px`), u += (C.size ?? 80) - 1, x.setAttribute("data-cell-data", `${E}-${v}`), !(w.rowSpan === 0 || w.colSpan === 0)) {
+          if (w.style && w.style.border === !1 && x.classList.add("no-border"), y.appendChild(x), w.rowSpan > 1) {
             const I = d.length;
-            d.push($), p.push(w.rowSpan);
+            d.push(x), p.push(w.rowSpan);
             for (let A = 1; A < w.rowSpan; A++) {
               const O = g + A;
               m.has(O) || m.set(O, []), m.get(O).push(I);
@@ -8104,7 +8106,7 @@ function renderReportByDom(t, e, r, n, o, i) {
   }
   if (d.length > 0) {
     let E = -1;
-    const x = () => {
+    const $ = () => {
       var y;
       E >= 0 && ((y = m.get(E)) == null || y.forEach((v) => d[v].classList.remove("merge-hover"))), E = -1;
     };
@@ -8113,8 +8115,8 @@ function renderReportByDom(t, e, r, n, o, i) {
       const v = y.target.closest("tr");
       if (!v) return;
       const C = Number(v.dataset.ri);
-      C !== E && (x(), E = C, (w = m.get(C)) == null || w.forEach(($) => d[$].classList.add("merge-hover")));
-    }), s.addEventListener("mouseleave", x);
+      C !== E && ($(), E = C, (w = m.get(C)) == null || w.forEach((x) => d[x].classList.add("merge-hover")));
+    }), s.addEventListener("mouseleave", $);
   }
   s.appendChild(f);
 }
@@ -8404,7 +8406,7 @@ function evaluateExpression(t, e) {
         return t.name;
     case "BinaryExpression":
       let o = evaluateExpression(t.left, e || 0), i = evaluateExpression(t.right, e || 0), a = Number(o), s = Number(i);
-      switch (isNaN(a) && (a = 0), isNaN(s) && (s = 0), t.operator) {
+      switch (Number.isFinite(a) || (a = 0), Number.isFinite(s) || (s = 0), t.operator) {
         case "+":
           return new Decimal(a).plus(s).toNumber();
         case "-":
@@ -8495,10 +8497,10 @@ function getRangeValues(t, e, r) {
           );
         } else if (r.indexOf("c-") > -1) {
           const g = parseInt(r.split("-")[1]);
-          f = getCellValue(m).filter((x) => x.colGroupIndex === g).map(
-            (x) => {
+          f = getCellValue(m).filter(($) => $.colGroupIndex === g).map(
+            ($) => {
               var y;
-              return [null, void 0, ""].includes(x.rawData) ? (y = x.formatType) == null ? void 0 : y.defaultCellContent : x.rawData;
+              return [null, void 0, ""].includes($.rawData) ? (y = $.formatType) == null ? void 0 : y.defaultCellContent : $.rawData;
             }
           );
         }
@@ -8519,11 +8521,11 @@ const funHandlers = {
   SUM(t) {
     return t.flat().reduce((e, r) => {
       const n = parseFloat(r);
-      return isNaN(n) ? e : e.plus(n);
+      return Number.isFinite(n) ? e.plus(n) : e;
     }, new Decimal(0)).toNumber();
   },
   AVG(t) {
-    const r = t.flat().map((n) => parseFloat(n)).filter((n) => !isNaN(n));
+    const r = t.flat().map((n) => parseFloat(n)).filter((n) => Number.isFinite(n));
     return r.length > 0 ? r.reduce((n, o) => n.plus(o), new Decimal(0)).div(r.length).toNumber() : 0;
   },
   MAX(t) {
@@ -8578,8 +8580,8 @@ function evaluateFunction(t, e, r) {
       for (let g = 0; g < a; g++) {
         let _ = new Decimal(1);
         for (const E of i) {
-          const x = parseFloat(E[g]);
-          _ = _.times(isNaN(x) ? 0 : x);
+          const $ = parseFloat(E[g]);
+          _ = _.times(Number.isFinite($) ? $ : 0);
         }
         s = s.plus(_);
       }
@@ -8699,11 +8701,11 @@ function loopGroupCols(t, e, r, n) {
     s.forEach((m, g) => {
       const _ = getSeparatorKey("key", m);
       l[_] || (l[_] = /* @__PURE__ */ new Set());
-      let x = a[m].data.replace("col:", "").toUpperCase();
+      let $ = a[m].data.replace("col:", "").toUpperCase();
       if (g === 0)
         i.forEach((y) => {
-          if (x) {
-            let v = y[x];
+          if ($) {
+            let v = y[$];
             v || (v = "-");
             const C = getSeparatorKey("child", m, v), w = getSeparatorKey("data", v);
             l[C] ? l[C].push(y) : l[C] = [y], l[_].add(v), l[v] = [v], l[w] = [y];
@@ -8713,17 +8715,17 @@ function loopGroupCols(t, e, r, n) {
         let y = s[g - 1];
         const v = getSeparatorKey("key", y);
         Array.from(l[v]).forEach((w) => {
-          const $ = getSeparatorKey("child", y, w);
-          let A = (l[$] || []).map((O) => {
-            if (x) {
-              let N = O[x];
+          const x = getSeparatorKey("child", y, w);
+          let A = (l[x] || []).map((O) => {
+            if ($) {
+              let N = O[$];
               N || (N = "-");
               let U = !1;
               const L = getSeparatorKey("child", m, w, N), M = getSeparatorKey(w, N), T = getSeparatorKey("data", M);
               return l[L] ? l[L].push(O) : l[L] = [O], l[T] ? l[T].push(O) : l[T] = [O], l[_].has(M) || (U = !0), l[_].add(M), l[M] = l[w].concat([N]), U ? N : null;
             }
           }).filter((O) => !!O);
-          l[$] = A;
+          l[x] = A;
         });
       }
     });
@@ -8734,8 +8736,8 @@ function loopGroupCols(t, e, r, n) {
     if (c !== void 0) {
       const m = a[c], g = { order: m.groupSortOrder, numeric: m.groupSortNumeric };
       s.forEach((_) => {
-        const E = getSeparatorKey("key", _), x = Array.from(l[E]);
-        x.length > 1 && x.sort(createGroupSortComparator(g)), l[E] = new Set(x);
+        const E = getSeparatorKey("key", _), $ = Array.from(l[E]);
+        $.length > 1 && $.sort(createGroupSortComparator(g)), l[E] = new Set($);
       });
     }
     let u = 1, f = Math.max(...s), d = Math.min(...s);
@@ -8744,34 +8746,34 @@ function loopGroupCols(t, e, r, n) {
       const m = getSeparatorKey("key", f);
       p ? u = l[m].size : u = Array.from(l[m]).reduce((g, _) => {
         const E = getSeparatorKey("child", f, _);
-        let x = l[E];
-        return g + x.length;
+        let $ = l[E];
+        return g + $.length;
       }, 0);
     } else
       u = i.length;
     for (let m = 0; m < a.length; m++) {
-      const g = a[m], _ = t.findIndex((x) => x.index === o.index);
+      const g = a[m], _ = t.findIndex(($) => $.index === o.index);
       if (m === 0) {
-        const x = {
+        const $ = {
           ...o,
           loop: !1
-        }, y = Array.from({ length: u }, () => cloneDeep(x));
+        }, y = Array.from({ length: u }, () => cloneDeep($));
         t.splice(_, 1, ...y);
       }
       let E = r[g.row];
       if (E && Array.isArray(E)) {
-        let x = [];
+        let $ = [];
         if (s.includes(m)) {
           const y = getSeparatorKey("key", g.row);
           Array.from(l[y]).forEach((C, w) => {
-            const $ = p && m === f ? 1 : getGroupMinChildrenLength(l, C, f, p, s), I = l[C], A = I[I.length - 1], O = getSeparatorKey("data", C), N = l[O];
+            const x = p && m === f ? 1 : getGroupMinChildrenLength(l, C, f, p, s), I = l[C], A = I[I.length - 1], O = getSeparatorKey("data", C), N = l[O];
             let U = {
               ...g,
               text: A,
-              colSpan: $,
+              colSpan: x,
               colData: N
             };
-            if (x.push(U), $ > 1) {
+            if ($.push(U), x > 1) {
               let L = {
                 ...g,
                 text: A,
@@ -8779,10 +8781,10 @@ function loopGroupCols(t, e, r, n) {
                 colSpan: 0,
                 rowSpan: 0
               };
-              for (let M = 0; M < $ - 1; M++)
-                x.push(L);
+              for (let M = 0; M < x - 1; M++)
+                $.push(L);
             }
-          }), E.splice(g.col, 1, ...x);
+          }), E.splice(g.col, 1, ...$);
         } else {
           if (m > d && m < f) {
             let y = findMaxLessThan(s, m);
@@ -8804,7 +8806,7 @@ function loopGroupCols(t, e, r, n) {
             const y = getSeparatorKey("key", f);
             let v = l[y] ? Array.from(l[y]) : [], C = g.data.replace("col:", "").toUpperCase();
             if (g.isRowColCombine) {
-              let w = s.map((I) => a[I].data.replace("col:", "").toUpperCase()), $ = [];
+              let w = s.map((I) => a[I].data.replace("col:", "").toUpperCase()), x = [];
               v.forEach((I, A) => {
                 let O = {
                   ...g,
@@ -8812,10 +8814,10 @@ function loopGroupCols(t, e, r, n) {
                   combineValues: l[I],
                   colGroupIndex: A
                 };
-                $.push(O);
-              }), E.splice(g.col, 1, ...$);
+                x.push(O);
+              }), E.splice(g.col, 1, ...x);
             } else if (v.length)
-              v.forEach((w, $) => {
+              v.forEach((w, x) => {
                 let I = [];
                 const A = getSeparatorKey("data", w);
                 l[A].forEach((N) => {
@@ -8827,11 +8829,11 @@ function loopGroupCols(t, e, r, n) {
               });
             else {
               let w = [];
-              i.forEach(($) => {
+              i.forEach((x) => {
                 let I = {
                   ...g
                 };
-                delete I.combineKeys, delete I.combineValues, delete I.isRowColCombine, $[C] !== void 0 ? (I.rawData = $[C], I.colData = $) : I.rawData = "", w.push(I);
+                delete I.combineKeys, delete I.combineValues, delete I.isRowColCombine, x[C] !== void 0 ? (I.rawData = x[C], I.colData = x) : I.rawData = "", w.push(I);
               }), E.splice(g.col, 1, ...w);
             }
           } else if (g.type === CellType.FUN && p && g.colSpan !== 0) {
@@ -8849,7 +8851,7 @@ function loopGroupCols(t, e, r, n) {
               colData: i[0]
             };
             if (g.colSpan === 0 && g.mergeTarget && g.mergeTarget.length === 2 && g.row === g.mergeTarget[0]) {
-              let [w, $] = g.mergeTarget, I = r.reduce((A, O) => A.concat(O), []).filter((A) => A.row === w && A.col === $)[0];
+              let [w, x] = g.mergeTarget, I = r.reduce((A, O) => A.concat(O), []).filter((A) => A.row === w && A.col === x)[0];
               I && (I.colSpan += u - 1);
             } else (!Array.isArray(g.mergeTarget) || g.mergeTarget.length !== 2) && (y.colSpan = u);
             const v = {
@@ -8971,11 +8973,11 @@ function getGroupData(t, e, r) {
         const m = getSeparatorKey("child", u, p);
         let _ = (n[m] || []).map((E) => {
           if (c) {
-            let x = E[c];
-            x || (x = "[" + c + "]");
+            let $ = E[c];
+            $ || ($ = "[" + c + "]");
             let y = !1;
-            const v = getSeparatorKey("child", i, p, x), C = getSeparatorKey(p, x), w = getSeparatorKey("data", C);
-            return n[v] ? n[v].push(E) : n[v] = [E], n[w] ? n[w].push(E) : n[w] = [E], n[s].has(C) || (y = !0), n[s].add(C), n[C] = n[p].concat([x]), y ? x : null;
+            const v = getSeparatorKey("child", i, p, $), C = getSeparatorKey(p, $), w = getSeparatorKey("data", C);
+            return n[v] ? n[v].push(E) : n[v] = [E], n[w] ? n[w].push(E) : n[w] = [E], n[s].has(C) || (y = !0), n[s].add(C), n[C] = n[p].concat([$]), y ? $ : null;
           }
         }).filter((E) => !!E);
         n[m] = _;
@@ -9027,15 +9029,15 @@ function generateRowStructure(t, e, r, n, o, i, a, s, l, c) {
   let d = -1, p = null;
   const m = [], g = new Array(o).fill(!1);
   return t.forEach((_, E) => {
-    let x = u[E];
+    let $ = u[E];
     if (e.includes(_.col)) {
       const y = getSeparatorKey("key", _.col);
       let v = Array.from(n[y]), C = d;
       const w = e.indexOf(_.col);
-      v.forEach(($, I) => {
+      v.forEach((x, I) => {
         let A;
-        E === s && (i || a) ? A = 1 : A = getGroupMinChildrenLength(n, $, s, a, i);
-        const O = n[$], N = O[O.length - 1], U = getSeparatorKey("data", $);
+        E === s && (i || a) ? A = 1 : A = getGroupMinChildrenLength(n, x, s, a, i);
+        const O = n[x], N = O[O.length - 1], U = getSeparatorKey("data", x);
         n[U];
         let L = {
           ..._,
@@ -9048,7 +9050,7 @@ function generateRowStructure(t, e, r, n, o, i, a, s, l, c) {
           groupChildIndex: 0,
           computedType: ComputedType.loopRow
         };
-        x.push(L);
+        $.push(L);
         let M = {
           ..._,
           text: "",
@@ -9062,7 +9064,7 @@ function generateRowStructure(t, e, r, n, o, i, a, s, l, c) {
         };
         for (let T = 0; T < A - 1; T++) {
           let b = cloneDeep(M);
-          b.index = C + T + 1, b.groupChildIndex = T + 1, x.push(b);
+          b.index = C + T + 1, b.groupChildIndex = T + 1, $.push(b);
         }
         if (g[E] = !0, C += A, L.loopGroupRowIndex !== void 0 && L.loopGroupRowIndex !== "" && !isNaN(L.loopGroupRowIndex)) {
           let T = cloneDeep(l[L.loopGroupRowIndex]), b = cloneDeep(c[L.loopGroupRowIndex]).map((S) => (S.type === CellType.FUN && S.fun && (S.groupIndices = I, S.groupLevel = w, S.computedType = ComputedType.loopGroup), S)), D = 0;
@@ -9085,7 +9087,7 @@ function generateRowStructure(t, e, r, n, o, i, a, s, l, c) {
       if (_.isRowColCombine) {
         const v = getSeparatorKey("key", s);
         let C = n[v] ? Array.from(n[v]) : [];
-        C.length ? C.forEach((w, $) => {
+        C.length ? C.forEach((w, x) => {
           const I = getSeparatorKey("child", s, w);
           let A = n[I], O = _.combineKeys ? _.combineKeys.map((L, M) => {
             const T = _.combineValues ? _.combineValues[M] : void 0;
@@ -9097,15 +9099,15 @@ function generateRowStructure(t, e, r, n, o, i, a, s, l, c) {
           const N = A.filter((L) => O.every((M) => L[M.key] === M.val));
           let U = {
             ..._,
-            index: $
+            index: x
           };
           if (delete U.combineKeys, delete U.combineValues, delete U.isRowColCombine, N && N.length) {
             const L = N.map((M) => y ? M[y] : void 0);
             U.rawData = _.mergedValueAggregation ? aggregateMergedValues(L, _.mergedValueAggregation) : N[0][y], U.rowData = N[0];
           } else
             U.rawData = "", U.rowData = {};
-          x.push(U);
-        }) : r.forEach((w, $) => {
+          $.push(U);
+        }) : r.forEach((w, x) => {
           let A = (_.combineKeys ? _.combineKeys.map((N, U) => {
             const L = _.combineValues ? _.combineValues[U] : void 0;
             return {
@@ -9114,9 +9116,9 @@ function generateRowStructure(t, e, r, n, o, i, a, s, l, c) {
             };
           }) : []).every((N) => w[N.key] === N.val), O = {
             ..._,
-            index: $
+            index: x
           };
-          delete O.combineKeys, delete O.combineValues, delete O.isRowColCombine, A ? (O.rawData = y ? w[y] : "", O.rowData = w) : (O.rawData = "", O.rowData = w), O.type === CellType.FUN && O.fun && (O.computedType = ComputedType.loopRow), x.push(O);
+          delete O.combineKeys, delete O.combineValues, delete O.isRowColCombine, A ? (O.rawData = y ? w[y] : "", O.rowData = w) : (O.rawData = "", O.rowData = w), O.type === CellType.FUN && O.fun && (O.computedType = ComputedType.loopRow), $.push(O);
         });
       } else if (e.length === 0)
         r.forEach((v, C) => {
@@ -9124,29 +9126,29 @@ function generateRowStructure(t, e, r, n, o, i, a, s, l, c) {
             index: C,
             ..._
           };
-          delete w.combineKeys, delete w.combineValues, delete w.isRowColCombine, y && v[y] !== void 0 ? w.rawData = v[y] : w.rawData = "", w.rowData = v, w.computedType = ComputedType.loopRow, x.push(w);
+          delete w.combineKeys, delete w.combineValues, delete w.isRowColCombine, y && v[y] !== void 0 ? w.rawData = v[y] : w.rawData = "", w.rowData = v, w.computedType = ComputedType.loopRow, $.push(w);
         });
       else {
         const v = getSeparatorKey("key", s);
         let C = n[v] ? Array.from(n[v]) : [];
         if (C.length === 0) {
-          r.forEach(($, I) => {
+          r.forEach((x, I) => {
             let A = {
               index: I,
               ..._
             };
-            delete A.combineKeys, delete A.combineValues, delete A.isRowColCombine, y && $[y] !== void 0 ? A.rawData = $[y] : A.rawData = "", A.rowData = $, A.computedType = ComputedType.loopRow, x.push(A);
+            delete A.combineKeys, delete A.combineValues, delete A.isRowColCombine, y && x[y] !== void 0 ? A.rawData = x[y] : A.rawData = "", A.rowData = x, A.computedType = ComputedType.loopRow, $.push(A);
           });
           return;
         }
         const w = [];
-        if (C.forEach(($, I) => {
+        if (C.forEach((x, I) => {
           if (a) {
-            const A = getSeparatorKey("child", s, $);
+            const A = getSeparatorKey("child", s, x);
             let O = n[A] || [];
             w.push(O);
           } else {
-            const A = getSeparatorKey("child", s, $);
+            const A = getSeparatorKey("child", s, x);
             let O = n[A] || [];
             const N = i ? O.slice(0, 1) : O;
             O.length > 0 ? N.forEach((U) => {
@@ -9156,23 +9158,23 @@ function generateRowStructure(t, e, r, n, o, i, a, s, l, c) {
                 // 交叉表：函数格按当前行组聚合裂变列实例（供 jsep 按 groupIndices 过滤取值）
                 isCrossAggregate: i
               };
-              delete L.combineKeys, delete L.combineValues, delete L.isRowColCombine, y && U && U[y] !== void 0 ? L.rawData = U[y] : L.rawData = "", L.rowData = U, L.computedType = ComputedType.loopRow, x.push(L);
-            }) : x.push({
+              delete L.combineKeys, delete L.combineValues, delete L.isRowColCombine, y && U && U[y] !== void 0 ? L.rawData = U[y] : L.rawData = "", L.rowData = U, L.computedType = ComputedType.loopRow, $.push(L);
+            }) : $.push({
               index: 0,
               ..._,
               isCrossAggregate: i
             });
           }
         }), a) {
-          const $ = Math.max(...w.map((A) => A.length));
+          const x = Math.max(...w.map((A) => A.length));
           p || (p = {
-            count: $,
+            count: x,
             row: _.row,
             index: E
           });
           const I = {
             colIndex: E,
-            maxCount: $,
+            maxCount: x,
             groupColumnLoopItems: w,
             dataKey: _.data ? _.data.replace("row:", "").toUpperCase() : void 0,
             cell: _
@@ -9187,7 +9189,7 @@ function generateRowStructure(t, e, r, n, o, i, a, s, l, c) {
         index: 0
       };
       if (_.rowSpan === 0 && _.mergeTarget && _.mergeTarget.length === 2) {
-        let [$, I] = _.mergeTarget, A = c.reduce((O, N) => O.concat(N), []).filter((O) => O.row === $ && O.col === I)[0];
+        let [x, I] = _.mergeTarget, A = c.reduce((O, N) => O.concat(N), []).filter((O) => O.row === x && O.col === I)[0];
         A && (A.rowSpan += o - 1);
       } else
         v.rowSpan += o - 1;
@@ -9199,13 +9201,13 @@ function generateRowStructure(t, e, r, n, o, i, a, s, l, c) {
       };
       delete v.isRowColCombine;
       let w = Array.from({ length: o - 1 }, () => cloneDeep(C));
-      x.push(v, ...w);
+      $.push(v, ...w);
     } else if ((i || a) && e.length > 0) {
       const v = getSeparatorKey("key", s);
-      (n[v] ? Array.from(n[v]) : []).forEach((w, $) => {
+      (n[v] ? Array.from(n[v]) : []).forEach((w, x) => {
         const I = getSeparatorKey("data", w), A = n[I];
-        x.push({
-          index: $,
+        $.push({
+          index: x,
           ..._,
           computedType: ComputedType.loopRow,
           rowSpan: 1,
@@ -9215,7 +9217,7 @@ function generateRowStructure(t, e, r, n, o, i, a, s, l, c) {
       });
     } else if (e.length > 0)
       for (let v = 0; v < o; v++)
-        x.push({
+        $.push({
           index: v,
           ..._,
           computedType: ComputedType.loopRow,
@@ -9225,7 +9227,7 @@ function generateRowStructure(t, e, r, n, o, i, a, s, l, c) {
         });
     else
       r.forEach((v, C) => {
-        x.push({
+        $.push({
           index: C,
           ..._,
           computedType: ComputedType.loopRow,
@@ -9234,14 +9236,14 @@ function generateRowStructure(t, e, r, n, o, i, a, s, l, c) {
           rowData: v
         });
       });
-  }), a && m.length > 0 && m.forEach(({ colIndex: _, maxCount: E, cell: x, groupColumnLoopItems: y, dataKey: v }) => {
+  }), a && m.length > 0 && m.forEach(({ colIndex: _, maxCount: E, cell: $, groupColumnLoopItems: y, dataKey: v }) => {
     for (let C = 0; C < E; C++) {
       const w = [];
-      y.forEach(($, I) => {
-        const A = $[C];
+      y.forEach((x, I) => {
+        const A = x[C];
         let O = {
           index: I,
-          ...x
+          ...$
         };
         delete O.combineKeys, delete O.combineValues, delete O.isRowColCombine, v && A && A[v] !== void 0 ? (O.rawData = A[v], O.rowData = A) : (O.rawData = "", O.rowData = A || {}), O.computedType = ComputedType.loopRow, w.push(O);
       }), C === 0 ? u[_] = w : u.splice(_ + C, 0, w);
@@ -9257,20 +9259,20 @@ function loopGroupRows(t, e, r, n, o) {
     let s = e[a], l = o[s.data];
     if (!l || !l.length)
       continue;
-    let c = t.findIndex(($) => $.index === s.index), u = r[c], f = findGroupIndexs(u), d = getGroupData(f, u, l);
+    let c = t.findIndex((x) => x.index === s.index), u = r[c], f = findGroupIndexs(u), d = getGroupData(f, u, l);
     const { groupLen: p, hasRowColCombine: m, hasGroupColumnLoop: g, maxGroupIndex: _ } = analyzeGroupStructure(u, f, l, d);
     if (m && g)
       throw new Error("不能同时设置交叉和分组列循环");
     const E = {
       ...s,
       loop: !1
-    }, x = [], { rowBaseCols: y, loopGroupRows: v, groupColumnLoopData: C } = generateRowStructure(u, f, l, d, p, m, g, _, t, r);
+    }, $ = [], { rowBaseCols: y, loopGroupRows: v, groupColumnLoopData: C } = generateRowStructure(u, f, l, d, p, m, g, _, t, r);
     let w = transpose(y);
     if (w.forEach(() => {
-      x.push(cloneDeep(E));
-    }), v.forEach(({ row: $, cells: I, removeCount: A }, O) => {
+      $.push(cloneDeep(E));
+    }), v.forEach(({ row: x, cells: I, removeCount: A }, O) => {
       let [N, U, L] = O.split(":").map((D) => parseInt(D));
-      $.isLoopGroupComputed = !1;
+      x.isLoopGroupComputed = !1;
       const M = L + A;
       let T = w[M];
       I = I.map((D, S) => {
@@ -9291,35 +9293,35 @@ function loopGroupRows(t, e, r, n, o) {
         return D.type === CellType.FUN && D.fun && (D.computedType = ComputedType.loopGroup), D.isGroup = R ? !!R.isGroup : !1, D.groupIndices = R ? R.groupIndices : !1, D.linkedMergeCell = R ? !!R.linkedMergeCell : !1, D.linkedColIndex = R ? R.linkedColIndex : { rowSpan: 1, colSpan: 1 }, D.isLoopGroupComputedCell = !0, D;
       });
       const b = M + 1;
-      x.splice(b, 0, $), w.splice(b, 0, I);
-    }), w = mergeSameCells(w), w.forEach(($, I) => {
+      $.splice(b, 0, x), w.splice(b, 0, I);
+    }), w = mergeSameCells(w), w.forEach((x, I) => {
       let A = [];
-      $.forEach((O) => {
+      x.forEach((O) => {
         O && O.groupIndices !== void 0 && !isNaN(O.groupIndices) && A.push(O.groupIndices);
-      }), A.length > 0 && $.forEach((O) => {
+      }), A.length > 0 && x.forEach((O) => {
         O && (O.groupIndices = A);
       });
-    }), t.splice(c, 1, ...x), r.splice(c, 1, ...w), C) {
-      const { index: $, count: I } = C, A = n[$], O = [];
+    }), t.splice(c, 1, ...$), r.splice(c, 1, ...w), C) {
+      const { index: x, count: I } = C, A = n[x], O = [];
       for (let U = 0; U < I; U++)
         O.push(cloneDeep(A));
-      n.splice($, 1, ...O);
+      n.splice(x, 1, ...O);
       for (let U = 0; U < c; U++) {
         const L = r[U], M = [];
         for (let T = 0; T < I; T++) {
-          const b = cloneDeep(L[$]);
-          T === 0 ? b.colSpan = I : (b.colSpan = 0, b.mergeTarget = [b.row, $]), M.push(b);
+          const b = cloneDeep(L[x]);
+          T === 0 ? b.colSpan = I : (b.colSpan = 0, b.mergeTarget = [b.row, x]), M.push(b);
         }
-        L.splice($, L.length - $, ...M);
+        L.splice(x, L.length - x, ...M);
       }
       const N = c + w.length;
       for (let U = N; U < r.length; U++) {
         const L = r[U], M = [];
         for (let T = 0; T < I; T++) {
-          const b = cloneDeep(L[$]);
-          T === 0 ? b.colSpan = I : (b.colSpan = 0, b.mergeTarget = [b.row, $]), M.push(b);
+          const b = cloneDeep(L[x]);
+          T === 0 ? b.colSpan = I : (b.colSpan = 0, b.mergeTarget = [b.row, x]), M.push(b);
         }
-        L.splice($, L.length - $, ...M);
+        L.splice(x, L.length - x, ...M);
       }
     }
   }
@@ -9470,7 +9472,11 @@ function formatText(t, e) {
 }
 function formatNumber(t, e) {
   let r = Number(t);
-  return e.decimal && (r = parseFloat(new Decimal(r).toFixed(parseInt(e.decimal)))), r;
+  if (e.decimal && Number.isFinite(r)) {
+    const n = Math.max(0, Math.floor(Number(e.decimal) || 0));
+    r = parseFloat(new Decimal(r).toFixed(n));
+  }
+  return r;
 }
 function formatDateTime(t, e) {
   try {
@@ -9661,10 +9667,10 @@ function buildPageDom(t, e, r, n) {
   const { rowConfig: o, colConfig: i, config: a, fixedRows: s, watermark: l, header: c, footer: u, pageNumber: f, totalPages: d, title: p } = t, m = document.createElement("div");
   m.className = "print-page-wrapper", l != null && l.enabled && m.appendChild(renderWatermarkLayer(l, r, n)), c != null && c.enabled && m.appendChild(renderPrintArea(c, { page: f, total: d, title: p }, "center"));
   const g = [], _ = [];
-  for (const x of s)
-    g.push({ ...x.row }), _.push(cloneDeep(a[x.index]));
-  for (const x of e)
-    o[x].isFixed || (g.push({ ...o[x] }), _.push(cloneDeep(a[x])));
+  for (const $ of s)
+    g.push({ ...$.row }), _.push(cloneDeep(a[$.index]));
+  for (const $ of e)
+    o[$].isFixed || (g.push({ ...o[$] }), _.push(cloneDeep(a[$])));
   const E = renderReportByDomForPrint(g, i, _, t.themeColor, t.theme);
   return m.appendChild(E), u != null && u.enabled && m.appendChild(renderPrintArea(u, { page: f, total: d, title: p }, "center")), m;
 }
@@ -9856,8 +9862,8 @@ async function paginate(t, e, r, n) {
       }
       const _ = createReportSplitState(g.reportConfig, g.themeColor, { ...s, theme: g.theme });
       await m();
-      const E = o - u, x = splitNextReportPage(_, E, a, o);
-      x ? (c.push({ type: "report", dom: x.dom }), u += x.height, _.currentRowIdx < _.visibleRows.length && d.push(_)) : (c.length > 0 && await p(), d.push(_));
+      const E = o - u, $ = splitNextReportPage(_, E, a, o);
+      $ ? (c.push({ type: "report", dom: $.dom }), u += $.height, _.currentRowIdx < _.visibleRows.length && d.push(_)) : (c.length > 0 && await p(), d.push(_));
     }
     await m(), await p();
   } else {
@@ -9869,11 +9875,11 @@ async function paginate(t, e, r, n) {
         continue;
       }
       if (E.kind === "image") {
-        let w = E.width, $ = E.height;
-        E.stretch && w > 0 && ($ = Math.round($ * (a / w)), w = a), _.push({ type: "image", dom: createImageDom(E.src, w, $) });
+        let w = E.width, x = E.height;
+        E.stretch && w > 0 && (x = Math.round(x * (a / w)), w = a), _.push({ type: "image", dom: createImageDom(E.src, w, x) });
         continue;
       }
-      const { rowConfig: x, colConfig: y, config: v } = E.reportConfig, C = renderReportByDomForPrint(x, y, v, E.themeColor, E.theme);
+      const { rowConfig: $, colConfig: y, config: v } = E.reportConfig, C = renderReportByDomForPrint($, y, v, E.themeColor, E.theme);
       _.push({ type: "report", dom: C });
     }
     l.push({ items: _ });
@@ -10021,7 +10027,7 @@ function parseShiftConfig(t) {
   }), r;
 }
 function getDateRanges() {
-  const t = "YYYY-MM-DD HH:mm:ss", e = dayjs(), r = e.startOf("day").format(t), n = e.endOf("day").format(t), o = e.startOf("week").format(t), i = e.endOf("week").format(t), a = e.startOf("month").format(t), s = e.endOf("month").format(t), l = e.subtract(1, "month").startOf("month").format(t), c = e.subtract(1, "month").endOf("month").format(t), u = e.startOf("quarter").format(t), f = e.endOf("quarter").format(t), d = e.subtract(1, "quarter").startOf("quarter").format(t), p = e.subtract(1, "quarter").endOf("quarter").format(t), m = e.startOf("year").format(t), g = e.endOf("year").format(t), _ = e.subtract(1, "year").startOf("year").format(t), E = e.subtract(1, "year").endOf("year").format(t), x = e.format(t), y = e.subtract(2, "day").format(t), v = e.subtract(3, "day").format(t), C = e.subtract(7, "day").format(t), w = e.subtract(15, "day").format(t), $ = e.subtract(30, "day").format(t), I = e.subtract(2, "week").startOf("week").format(t), A = e.subtract(2, "month").format(t), O = e.subtract(3, "month").format(t), N = e.subtract(6, "month").format(t), U = e.subtract(1, "year").startOf("year").format(t), L = e.subtract(2, "year").startOf("year").format(t), M = e.subtract(3, "year").format(t), T = e.subtract(5, "year").format(t);
+  const t = "YYYY-MM-DD HH:mm:ss", e = dayjs(), r = e.startOf("day").format(t), n = e.endOf("day").format(t), o = e.startOf("week").format(t), i = e.endOf("week").format(t), a = e.startOf("month").format(t), s = e.endOf("month").format(t), l = e.subtract(1, "month").startOf("month").format(t), c = e.subtract(1, "month").endOf("month").format(t), u = e.startOf("quarter").format(t), f = e.endOf("quarter").format(t), d = e.subtract(1, "quarter").startOf("quarter").format(t), p = e.subtract(1, "quarter").endOf("quarter").format(t), m = e.startOf("year").format(t), g = e.endOf("year").format(t), _ = e.subtract(1, "year").startOf("year").format(t), E = e.subtract(1, "year").endOf("year").format(t), $ = e.format(t), y = e.subtract(2, "day").format(t), v = e.subtract(3, "day").format(t), C = e.subtract(7, "day").format(t), w = e.subtract(15, "day").format(t), x = e.subtract(30, "day").format(t), I = e.subtract(2, "week").startOf("week").format(t), A = e.subtract(2, "month").format(t), O = e.subtract(3, "month").format(t), N = e.subtract(6, "month").format(t), U = e.subtract(1, "year").startOf("year").format(t), L = e.subtract(2, "year").startOf("year").format(t), M = e.subtract(3, "year").format(t), T = e.subtract(5, "year").format(t);
   return {
     dateFormat: t,
     thisDayStart: r,
@@ -10040,12 +10046,12 @@ function getDateRanges() {
     thisYearEnd: g,
     lastYearStart: _,
     lastYearEnd: E,
-    now: x,
+    now: $,
     twoDay: y,
     threeDay: v,
     sevenDay: C,
     fifteenDay: w,
-    thirtyDay: $,
+    thirtyDay: x,
     twoWeek: I,
     twoMonth: A,
     threeMonth: O,
@@ -10113,7 +10119,7 @@ const _hoisted_1$6 = { class: "yh-report-view-conditions" }, _sfc_main$7 = /* @_
   },
   emits: ["change", "addCell"],
   setup(t, { expose: e, emit: r }) {
-    const n = t, o = r, i = useRoute(), { dateFormat: a, thisDayStart: s, thisDayEnd: l, thisWeekStart: c, thisMonthStart: u, thisMonthEnd: f, lastMonthStart: d, lastMonthEnd: p, thisQuarterStart: m, lastQuarterStart: g, thisYearStart: _, thisYearEnd: E, lastYearStart: x, lastYearEnd: y, now: v, twoDay: C, threeDay: w, sevenDay: $, fifteenDay: I, thirtyDay: A, twoWeek: O, twoMonth: N, threeMonth: U, sixMonth: L, oneYear: M, twoYear: T, threeYear: b, fiveYear: D } = getDateRanges(), S = ref([]), R = ref([]), k = computed(() => {
+    const n = t, o = r, i = useRoute(), { dateFormat: a, thisDayStart: s, thisDayEnd: l, thisWeekStart: c, thisMonthStart: u, thisMonthEnd: f, lastMonthStart: d, lastMonthEnd: p, thisQuarterStart: m, lastQuarterStart: g, thisYearStart: _, thisYearEnd: E, lastYearStart: $, lastYearEnd: y, now: v, twoDay: C, threeDay: w, sevenDay: x, fifteenDay: I, thirtyDay: A, twoWeek: O, twoMonth: N, threeMonth: U, sixMonth: L, oneYear: M, twoYear: T, threeYear: b, fiveYear: D } = getDateRanges(), S = ref([]), R = ref([]), k = computed(() => {
       let B = reactive({});
       return R.value.forEach((V) => {
         B[V.columnName] = V;
@@ -10139,13 +10145,13 @@ const _hoisted_1$6 = { class: "yh-report-view-conditions" }, _sfc_main$7 = /* @_
         for (let z = 0; z < n.config.length; z++) {
           const Q = cloneDeep(n.config[z]);
           let { dataType: Y, dateType: oe, type: te, selectorId: ce, remoteSearch: le, cellIndex: fe, cellIndexSort: _e, cellIndexSortOrder: ge, cellIndexSortNumeric: me, name: he, columnName: pe, defaultValue: Ee, isNull: Ce } = Q, ve = [DataSourceColumnDataType.DATE, DataSourceColumnDataType.DATETIME].includes(Y);
-          const { componentName: be, placeholerPrefix: we, type: $e } = componentTransition(Y, oe);
+          const { componentName: be, placeholerPrefix: we, type: xe } = componentTransition(Y, oe);
           let ye = {
             ...Q,
             elWidth: Q.elWidth || 210,
             formItemType: be,
             placeholder: rct(we + he || pe),
-            type: $e || "",
+            type: xe || "",
             optionData: [],
             value: "",
             shiftSegments: [],
@@ -10164,8 +10170,8 @@ const _hoisted_1$6 = { class: "yh-report-view-conditions" }, _sfc_main$7 = /* @_
           } else fe && (o("addCell", fe), on(`cell-change:${fe}`, (de) => {
             if (de = Object.values(de), de && Array.isArray(de) && de.length) {
               if (_e) {
-                const xe = createGroupSortComparator({ order: ge, numeric: me });
-                de.sort((Se, Te) => xe(Se.label, Te.label));
+                const $e = createGroupSortComparator({ order: ge, numeric: me });
+                de.sort((Se, Te) => $e(Se.label, Te.label));
               }
               ye.optionData = de, triggerRef(R);
             }
@@ -10212,11 +10218,11 @@ const _hoisted_1$6 = { class: "yh-report-view-conditions" }, _sfc_main$7 = /* @_
         thisMonth: [u, f],
         lastMonth: [d, p],
         thisYear: [_, E],
-        lastYear: [x, y],
+        lastYear: [$, y],
         now: [s, v],
         twoDay: [C, v],
         threeDay: [w, v],
-        sevenDay: [$, v],
+        sevenDay: [x, v],
         fifteenDay: [I, v],
         thirtyDay: [A, v],
         threeMonth: [U, v],
@@ -10246,7 +10252,7 @@ const _hoisted_1$6 = { class: "yh-report-view-conditions" }, _sfc_main$7 = /* @_
         thisDay: s,
         twoDay: C,
         threeDay: w,
-        sevenDay: $,
+        sevenDay: x,
         fifteenDay: I,
         thirtyDay: A
       }[V];
@@ -10522,7 +10528,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         width: n.config.widthType === "%" ? `calc(${n.config.width}% - 10px)` : `${n.config.width - 10}px`,
         height: n.config.fullHeight ? "calc(100% - 8px)" : `${n.config.height}px`
       };
-    }), _ = computed(() => getThemeColors(n.config.theme || "none")), E = computed(() => n.config && n.config.data ? !!n.config.data.pagination : !1), x = computed(() => n.config.params && Array.isArray(n.config.params) && n.config.params.filter((F) => F.isShow).length > 0), y = reactive({
+    }), _ = computed(() => getThemeColors(n.config.theme || "none")), E = computed(() => n.config && n.config.data ? !!n.config.data.pagination : !1), $ = computed(() => n.config.params && Array.isArray(n.config.params) && n.config.params.filter((F) => F.isShow).length > 0), y = reactive({
       pageSize: 100,
       pageSizes: [10, 20, 50, 100, 200, 1e4],
       pageIndex: 1,
@@ -10536,7 +10542,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
       let q = j.match(/[A-Z]+/)[0], X = j.match(/\d+/)[0] - 1, K = columnToNumber(q), re = `${H}:${X}:${K}`;
       C.value.includes(re) || C.value.push(re);
     };
-    function $(F) {
+    function x(F) {
       if (A && n.config.data.autoQuery === !1)
         return A = !1, !1;
       v.value = F, y.pageIndex = 1, W();
@@ -10855,10 +10861,10 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
           ref_key: "conditionsRef",
           ref: s,
           onAddCell: w,
-          onChange: $
+          onChange: x
         }, {
           search: withCtx(() => [
-            x.value ? (openBlock(), createBlock(j, {
+            $.value ? (openBlock(), createBlock(j, {
               key: 0,
               type: "primary",
               onClick: O
@@ -11155,8 +11161,8 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     }));
     const n = t, o = r, i = inject("isPrintMode", computed(() => !1)), a = inject("printConfig", void 0), s = computed(() => {
       let C = {};
-      return colors.forEach((w, $) => {
-        C[`color${$}`] = w;
+      return colors.forEach((w, x) => {
+        C[`color${x}`] = w;
       }), C;
     }), l = ref(!1), c = ref(), u = ref([]), f = computed(() => u.value.length === 1), d = computed(() => u.value[0]), p = computed(() => f.value ? {
       backgroundColor: n.config.singleColor || colors[0]
@@ -11173,30 +11179,30 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     }), g = computed(() => n.config ? `${n.config.height}px` : "10px"), _ = async (C) => {
       if (C && Object.keys(C).length > 0) {
         const w = cloneDeep(n.config);
-        await x(w, C);
+        await $(w, C);
       }
     }, E = {
       SUM(C) {
-        return C.map(($) => Number($)).filter(($) => !isNaN($)).reduce(($, I) => $ + I, 0);
+        return C.map((x) => Number(x)).filter((x) => !isNaN(x)).reduce((x, I) => x + I, 0);
       },
       AVG(C) {
-        const w = C.map(($) => Number($)).filter(($) => !isNaN($));
+        const w = C.map((x) => Number(x)).filter((x) => !isNaN(x));
         return w.length ? E.SUM(w) / w.length : 0;
       },
       MAX(C) {
-        const w = C.map(($) => Number($)).filter(($) => !isNaN($));
+        const w = C.map((x) => Number(x)).filter((x) => !isNaN(x));
         return w.length ? Math.max(...w) : 0;
       },
       MIN(C) {
-        const w = C.map(($) => Number($)).filter(($) => !isNaN($));
+        const w = C.map((x) => Number(x)).filter((x) => !isNaN(x));
         return w.length ? Math.min(...w) : 0;
       },
       COUNT(C) {
         return C.length;
       }
-    }, x = async (C, w) => {
+    }, $ = async (C, w) => {
       const {
-        data: { source: $ },
+        data: { source: x },
         notSingle: I,
         keyIds: A,
         dataIds: O,
@@ -11211,8 +11217,8 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
       w && (D = {
         ...w
       });
-      for (let S = 0; S < $.length; S++) {
-        const { key: R, url: k } = $[S];
+      for (let S = 0; S < x.length; S++) {
+        const { key: R, url: k } = x[S];
         try {
           const G = (await getDateSourceData(k, { id: n.id })).data;
           D[R] = G;
@@ -11269,7 +11275,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     }, y = async () => {
       l.value = !0;
       let C = cloneDeep(n.config);
-      C && x(C);
+      C && $(C);
     };
     e({
       setOutData: _,
@@ -11280,11 +11286,11 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     function v() {
       var M;
       if (!u.value.length) return null;
-      const C = Math.max(((M = c.value) == null ? void 0 : M.offsetWidth) || n.config.width || 200, 100), w = n.config.height || 100, $ = 2, I = document.createElement("canvas");
-      I.width = Math.round(C * $), I.height = Math.round(w * $);
+      const C = Math.max(((M = c.value) == null ? void 0 : M.offsetWidth) || n.config.width || 200, 100), w = n.config.height || 100, x = 2, I = document.createElement("canvas");
+      I.width = Math.round(C * x), I.height = Math.round(w * x);
       const A = I.getContext("2d");
       if (!A) return null;
-      A.scale($, $);
+      A.scale(x, x);
       const O = u.value, N = C / O.length, U = 14, L = Math.max(Math.round(w / 3.5), 12);
       return O.forEach((T, b) => {
         const D = b * N;
@@ -11292,7 +11298,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
       }), { base64: I.toDataURL("image/png"), width: C, height: w };
     }
     return (C, w) => {
-      const $ = resolveDirective("loading");
+      const x = resolveDirective("loading");
       return withDirectives((openBlock(), createElementBlock("div", {
         ref_key: "rootRef",
         ref: c,
@@ -11311,7 +11317,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
           createElementVNode("span", null, "仅展示，打印时会忽略", -1)
         ])])) : createCommentVNode("", !0)
       ], 14, _hoisted_1$3)), [
-        [$, l.value]
+        [x, l.value]
       ]);
     };
   }
@@ -11367,13 +11373,13 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
       C.style.position = "fixed", C.style.left = "-9999px", C.style.top = "-9999px", C.style.width = "0", C.style.height = "0", C.style.border = "none", document.body.appendChild(C);
       const w = C.contentDocument;
       w.open(), w.write(v), w.close(), C.onload = () => {
-        const $ = C.contentWindow, I = document.title;
+        const x = C.contentWindow, I = document.title;
         r.statementName && (document.title = r.statementName);
         const A = () => {
           document.title = I;
         };
-        $.addEventListener("afterprint", A), $.print(), A(), setTimeout(() => {
-          $.removeEventListener("afterprint", A), C.remove(), l.value = !1;
+        x.addEventListener("afterprint", A), x.print(), A(), setTimeout(() => {
+          x.removeEventListener("afterprint", A), C.remove(), l.value = !1;
         }, 500);
       };
     }
@@ -11409,8 +11415,8 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
                 L.push({ type: "report", dom: R.dom }), M += R.height, D.state.currentRowIdx >= D.state.visibleRows.length && T.shift();
               }
           };
-          r.silentRender && await x();
-          const $ = !!r.autoPrint, I = getPrintContentHeightPxMeasured(r.printConfig), A = I != null, O = getPrintContentWidthPxMeasured(r.printConfig), N = [];
+          r.silentRender && await $();
+          const x = !!r.autoPrint, I = getPrintContentHeightPxMeasured(r.printConfig), A = I != null, O = getPrintContentWidthPxMeasured(r.printConfig), N = [];
           for (let D = 0; D < r.configs.length; D++) {
             const S = r.configs[D];
             if (S.type === "report") {
@@ -11496,7 +11502,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
               S.appendChild(G), s.value.push(G);
             }
           }
-          $ && (await nextTick(), E(), setTimeout(() => {
+          x && (await nextTick(), E(), setTimeout(() => {
             n("update:visible", !1);
           }, 1e3));
         } finally {
@@ -11504,27 +11510,27 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         }
       }
     );
-    async function x() {
+    async function $() {
       u.value = /* @__PURE__ */ new Map(), f.value = /* @__PURE__ */ new Map();
       const y = r.fetchAll !== !1;
       for (let v = 0; v < r.configs.length; v++) {
         const C = r.configs[v];
         if (C.type !== "report") continue;
-        const w = C, $ = w.data, I = w.tableConfig;
-        if (!$ || !I || !$.source) continue;
+        const w = C, x = w.data, I = w.tableConfig;
+        if (!x || !I || !x.source) continue;
         const A = buildPrintParamsFromConfig(w, c.query), { resData: O } = await fetchReportData(
-          { id: r.reportId ?? "", data: $, tableConfig: I },
+          { id: r.reportId ?? "", data: x, tableConfig: I },
           A,
-          { pageSize: 5e3, pageIndex: 1, total: 0, isPagination: !!$.pagination },
+          { pageSize: 5e3, pageIndex: 1, total: 0, isPagination: !!x.pagination },
           y
         );
         let N = toUpdateData(O);
-        $.processData && (N = await getProcessData($.processData, N, A, {
+        x.processData && (N = await getProcessData(x.processData, N, A, {
           pageSize: 5e3,
           pageIndex: 1,
           total: 0
         }));
-        const U = $.source, L = U.find((M) => M.loopTable);
+        const U = x.source, L = U.find((M) => M.loopTable);
         if (L && L.key) {
           const M = await renderReportToConfigs(
             I,
@@ -11651,7 +11657,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
       const b = a.value.indexOf(T);
       b > -1 && a.value.splice(b, 1);
     }
-    const x = ref(!1);
+    const $ = ref(!1);
     function y(T) {
       d[T.key] = T.data, l.value.forEach((b) => {
         var D;
@@ -11671,13 +11677,13 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         if (ne.type === "report") {
           const ae = T[S];
           if (S += 1, !(ae != null && ae.buildExportConfigs)) continue;
-          $(`正在获取表格数据（${S}/${b}）...`);
+          x(`正在获取表格数据（${S}/${b}）...`);
           const ie = await ae.buildExportConfigs(!!f.value.exportAll);
           if (!ie) continue;
           const se = getThemeColors(ne.theme || "none").border;
           k.push({ type: "report", reportConfig: ie, subReportIndex: ne.subReprotIndex || 0 }), ie.forEach((F) => G.push({ type: "report", reportConfig: F, themeColor: se, theme: ne.theme || "none" }));
         } else {
-          R += 1, $(`正在截取图表/指标卡（${R}/${D}）...`);
+          R += 1, x(`正在截取图表/指标卡（${R}/${D}）...`);
           const ae = l.value[J];
           if (!ae) continue;
           let ie = null;
@@ -11693,7 +11699,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
       return { mergeItems: k, printItems: G };
     }
     let w = null;
-    function $(T) {
+    function x(T) {
       w || (w = ElLoading.service({
         target: s.value ?? void 0,
         background: "rgba(255, 255, 255, 0.75)"
@@ -11703,7 +11709,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
       w == null || w.close(), w = null;
     }
     async function A(T) {
-      $("正在准备导出...");
+      x("正在准备导出...");
       try {
         const { mergeItems: b, printItems: D } = await C();
         if (!b.length) {
@@ -11711,11 +11717,11 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
           return;
         }
         if (T === "excel") {
-          $("正在生成 Excel 文件...");
+          x("正在生成 Excel 文件...");
           const S = await exportReportMerged(b, o.value || "报表导出", "gray");
           S && downloadReport(S, o.value || "报表导出", "excel");
         } else T.startsWith("pdf") && await exportReportByBrowser(D, u.value, o.value, {
-          onProgress: (S) => $(S),
+          onProgress: (S) => x(S),
           orientation: T === "pdf-landscape" ? "landscape" : "portrait",
           singlePage: T === "pdf-single"
         });
@@ -11881,7 +11887,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
           withDirectives(createElementVNode("div", _hoisted_6$1, [...b[7] || (b[7] = [
             createElementVNode("i", { class: "iconfont icon-backtop" }, null, -1)
           ])], 512), [
-            [vShow, x.value]
+            [vShow, $.value]
           ])
         ], 6)), [
           [D, n.value]
@@ -12145,7 +12151,7 @@ function usePrinterClient() {
       }
       if (!g)
         throw ElMessage.error("未找到可用打印机"), new Error("未找到可用打印机");
-      const _ = p.printConfig, E = _ && typeof _.width == "number" ? { widthMm: _.width, heightMm: typeof _.height == "number" ? _.height : 297 } : void 0, x = await printerClient.printReport({
+      const _ = p.printConfig, E = _ && typeof _.width == "number" ? { widthMm: _.width, heightMm: typeof _.height == "number" ? _.height : 297 } : void 0, $ = await printerClient.printReport({
         options: p.remoteOptions,
         printConfig: p.printConfig,
         statementName: p.name,
@@ -12154,7 +12160,7 @@ function usePrinterClient() {
         copies: f,
         pageSize: E
       });
-      return x.success ? ElMessage.success(`打印已发送：${g}，共 ${x.copies || f} 份`) : ElMessage.error(x.message || "打印失败"), x;
+      return $.success ? ElMessage.success(`打印已发送：${g}，共 ${$.copies || f} 份`) : ElMessage.error($.message || "打印失败"), $;
     } finally {
       printerClient.printing.value = !1;
     }
@@ -12250,9 +12256,9 @@ const _hoisted_1 = ["title"], _hoisted_2 = { class: "user-actions" }, _hoisted_3
         `打印机：${n.value}`,
         `时间：${m}`,
         "如能正常打印，说明连接与打印机配置正确"
-      ], _ = g.map((E, x) => {
-        const y = { ...defaultCell, text: E, row: x + 1, col: 1 };
-        return y.style = { ...y.style, fontWeight: x === 0 ? "bold" : "normal" }, [y];
+      ], _ = g.map((E, $) => {
+        const y = { ...defaultCell, text: E, row: $ + 1, col: 1 };
+        return y.style = { ...y.style, fontWeight: $ === 0 ? "bold" : "normal" }, [y];
       });
       return [
         {
@@ -12279,7 +12285,7 @@ const _hoisted_1 = ["title"], _hoisted_2 = { class: "user-actions" }, _hoisted_3
       ];
     }
     return (m, g) => {
-      const _ = resolveComponent("YhIcon"), E = resolveComponent("el-button"), x = resolveComponent("el-input"), y = resolveComponent("el-divider"), v = resolveComponent("el-popover");
+      const _ = resolveComponent("YhIcon"), E = resolveComponent("el-button"), $ = resolveComponent("el-input"), y = resolveComponent("el-divider"), v = resolveComponent("el-popover");
       return openBlock(), createBlock(v, {
         placement: "bottom",
         "popper-class": "yh-printer-popover",
@@ -12310,7 +12316,7 @@ const _hoisted_1 = ["title"], _hoisted_2 = { class: "user-actions" }, _hoisted_3
               createElementVNode("span", _hoisted_4, toDisplayString(l.value), 1)
             ]),
             createElementVNode("div", _hoisted_5, [
-              createVNode(x, {
+              createVNode($, {
                 modelValue: i.value,
                 "onUpdate:modelValue": g[0] || (g[0] = (C) => i.value = C),
                 size: "small",
@@ -12380,7 +12386,7 @@ const silenceExport = async (t) => {
     r[n].type;
 };
 async function registerRoute(t, e) {
-  t && (e.addRoute("Index", {
+  t ? (e.addRoute("Index", {
     path: "statement/list",
     name: "报表列表",
     meta: {
@@ -12388,7 +12394,7 @@ async function registerRoute(t, e) {
       title: "报表列表",
       icon: "iconfont icon-s-grid"
     },
-    component: () => import("./StatementList-BFaOwqOO.mjs")
+    component: () => import("./StatementList-D1c4iGOZ.mjs")
   }), e.addRoute("Index", {
     path: "statement/design/:id",
     name: "报表设计",
@@ -12397,7 +12403,7 @@ async function registerRoute(t, e) {
       title: "报表设计",
       icon: "iconfont icon-s-grid"
     },
-    component: () => import("./StatementDesign-OzMH3MVW.mjs")
+    component: () => import("./StatementDesign-DhAUZTV6.mjs")
   }), e.addRoute("Index", {
     path: "statement/detail/:id",
     name: "后台报表查看",
@@ -12406,7 +12412,25 @@ async function registerRoute(t, e) {
       title: "后台报表查看",
       icon: "iconfont icon-s-grid"
     },
-    component: () => import("./StatementDetail-DkOrmDr6.mjs")
+    component: () => import("./StatementDetail-Br6zQ67Y.mjs")
+  })) : e.hasRoute("Index") && (e.addRoute("Index", {
+    path: "statement/design/:id",
+    name: "报表设计",
+    meta: {
+      id: "StatementDesign",
+      title: "报表设计",
+      icon: "iconfont icon-s-grid"
+    },
+    component: () => import("./StatementDesign-DhAUZTV6.mjs")
+  }), e.addRoute("Index", {
+    path: "statement/detail/:id",
+    name: "前台报表查看",
+    meta: {
+      id: "StatementDetail",
+      title: "报表查看",
+      icon: "iconfont icon-s-grid"
+    },
+    component: () => import("./StatementDetail-Br6zQ67Y.mjs")
   })), e.addRoute({
     path: "/statementdetail/:id",
     name: "报表查看",
@@ -12417,7 +12441,7 @@ async function registerRoute(t, e) {
       isWhite: !0
     },
     props: !0,
-    component: () => import("./StatementDetail-DkOrmDr6.mjs")
+    component: () => import("./StatementDetail-Br6zQ67Y.mjs")
   }), e.hasRoute("Index") && e.addRoute("Index", {
     path: "innerStatementdetail/:id",
     name: "系统内报表查看",
@@ -12428,7 +12452,7 @@ async function registerRoute(t, e) {
       noPadding: !0
     },
     props: !0,
-    component: () => import("./StatementDetail-DkOrmDr6.mjs")
+    component: () => import("./StatementDetail-Br6zQ67Y.mjs")
   });
 }
 const index = {
@@ -12444,7 +12468,8 @@ const index = {
         $addAdminMenu: i,
         $router: a,
         $clientStore: s,
-        $slotsStore: l
+        $slotsStore: l,
+        $mergeComponentMap: c
       } = t.config.globalProperties;
       n && (rct = n), i({
         id: "report",
@@ -12452,6 +12477,8 @@ const index = {
         iconPath: "table",
         url: "/admin/statement/list",
         menuType: "WINDOW"
+      }), c == null || c({
+        "/statement/list": () => import("./StatementList-D1c4iGOZ.mjs")
       }), o(async () => {
         !a || !a.hasRoute("Index") || registerRoute(s.isAdmin, a);
       }), l && (e != null && e.printEnabled) && l.registerSlot({
@@ -12548,4 +12575,4 @@ export {
   formatShiftOffset as y,
   numberToColumn as z
 };
-//# sourceMappingURL=index-D5s-AlK7.mjs.map
+//# sourceMappingURL=index-DgsSvRRw.mjs.map