yh-report 2.4.114 → 2.4.115

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

@@ -870,28 +870,29 @@ function getConfig(t) {
     }
   }).then((e) => {
     if (e.data) {
-      let r = JSON.parse(e.data.info), { id: n, name: o, code: i, description: a, config: s, chartConfig: l } = r, c = [], u;
+      let r = JSON.parse(e.data.info), { id: n, name: o, code: i, description: a, config: s, chartConfig: l } = r, c = [], u, f;
       if (s) {
         if (s = JSON.parse(s), Array.isArray(s)) {
           if (s.length && s[0].type === "tableSheet")
             throw ElMessage.error("当前报表版本不支持老版本数据，如须使用老数据请不要升级本版"), useRouter().back(), new Error("当前报表版本不支持老版本数据，如须使用老数据请不要升级本版");
-          s = s.map((f) => (ItemTypes.value.includes(f.type) || (f.type = "report"), f)), c = c.concat(s);
+          s = s.map((d) => (ItemTypes.value.includes(d.type) || (d.type = "report"), d)), c = c.concat(s);
         } else if (s && typeof s == "object" && Array.isArray(s.options)) {
-          let f = s.options;
-          if (f.length && f[0].type === "tableSheet")
+          let d = s.options;
+          if (d.length && d[0].type === "tableSheet")
             throw ElMessage.error("当前报表版本不支持老版本数据，如须使用老数据请不要升级本版"), useRouter().back(), new Error("当前报表版本不支持老版本数据，如须使用老数据请不要升级本版");
-          f = f.map((d) => (ItemTypes.value.includes(d.type) || (d.type = "report"), d)), c = c.concat(f), u = s.printConfig;
+          d = d.map((p) => (ItemTypes.value.includes(p.type) || (p.type = "report"), p)), c = c.concat(d), u = s.printConfig;
         }
       }
-      return l && (l = JSON.parse(l), Array.isArray(l) ? (l.forEach((f) => {
-        f.data || (f.data = { source: [] });
-      }), c = c.concat(l)) : l && typeof l == "object" && (u = l)), Promise.resolve({
+      return l && (l = JSON.parse(l), Array.isArray(l) ? (l.forEach((d) => {
+        d.data || (d.data = { source: [] });
+      }), c = c.concat(l)) : l && typeof l == "object" && ("printConfig" in l || "exportConfig" in l ? (u = l.printConfig, f = l.exportConfig) : u = l)), Promise.resolve({
         id: n,
         name: o,
         code: i,
         description: a,
         remoteOptions: c,
-        printConfig: u
+        printConfig: u,
+        exportConfig: f
       });
     } else
       return Promise.reject("获取报表数据异常");
@@ -1133,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 $, y, v;
+    var x, y, v;
     const _ = `${d},${p}`;
     let E = l.get(_);
-    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 };
+    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 };
   }, f = r.mode === "none";
   t.forEach((d) => {
     var _, E;
@@ -1145,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(($) => {
+    }), 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) => {
       var C;
-      const y = getNeighborSide(d, $);
+      const y = getNeighborSide(d, x);
       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 }));
@@ -1249,29 +1250,29 @@ 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 $ = 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;
+      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;
       for (let y = 0; y < _.length; y++) {
-        const v = _[y], C = $.getCell(y + 1);
-        let { style: w, col: b, row: N, colSpan: R, rowSpan: A, format: k, formatType: F } = v;
+        const v = _[y], C = x.getCell(y + 1);
+        let { style: w, col: $, 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("#", ""))
         }), w && w.fontSize && (L.size = w.fontSize), w && w.fontFamily && (L.name = w.fontFamily), w && w.fontWeight && w.fontWeight === "bold" && (L.bold = !0), C.font = L, w && w.border) {
-          const T = normalizeBorder(w.border);
-          if (T) {
-            const S = themeColors[r] || "#333333", I = (B) => {
-              if (!(!B || !B.style || B.style === "none"))
+          const D = normalizeBorder(w.border);
+          if (D) {
+            const S = themeColors[r] || "#333333", R = (k) => {
+              if (!(!k || !k.style || k.style === "none"))
                 return {
-                  style: B.style,
-                  color: { argb: "FF" + (B.color || S).replace("#", "") }
+                  style: k.style,
+                  color: { argb: "FF" + (k.color || S).replace("#", "") }
                 };
             };
             C.border = {
-              top: I(T.top),
-              left: I(T.left),
-              bottom: I(T.bottom),
-              right: I(T.right)
+              top: R(D.top),
+              left: R(D.left),
+              bottom: R(D.bottom),
+              right: R(D.right)
             };
           }
         } else (!w || w.border !== !1) && (C.border = {
@@ -1289,30 +1290,30 @@ function writeReportConfigsToSheet(t, e, r, n) {
             }
           };
         else {
-          const T = `${r}${p % 2}`;
+          const D = `${r}${p % 2}`;
           C.fill = {
             type: "pattern",
             pattern: "solid",
             fgColor: {
-              argb: "FF" + themeColors[T].replace("#", "")
+              argb: "FF" + themeColors[D].replace("#", "")
             }
           };
         }
-        const O = {
+        const M = {
           vertical: "middle",
           horizontal: "center",
           wrapText: !0
         };
-        w && w.textAlign && (O.horizontal = w.textAlign), w && w.verticalAlign && (O.vertical = w.verticalAlign === "center" ? "middle" : w.verticalAlign), C.alignment = O;
-        const x = A && !isNaN(A) && A > 1, D = R && !isNaN(R) && R > 1;
-        if (x || D) {
-          const T = i + p + 1, S = y + 1;
-          let I = T, B = S;
-          T && (I += A - 1), S && (B += R - 1), o.push([T, S, I, B]);
+        w && w.textAlign && (M.horizontal = w.textAlign), w && w.verticalAlign && (M.vertical = w.verticalAlign === "center" ? "middle" : w.verticalAlign), C.alignment = M;
+        const T = O && !isNaN(O) && O > 1, b = A && !isNaN(A) && A > 1;
+        if (T || b) {
+          const D = i + p + 1, S = y + 1;
+          let R = D, k = S;
+          D && (R += O - 1), S && (k += A - 1), o.push([D, S, R, k]);
         }
-        if (k && k === "number") {
-          let T = "", S = "";
-          F && (F.numberUseGrouping && (T = F.numberUseGrouping), F.numberDecimal && (S = F.numberDecimal)), C.numFmt = generateNumFmt(T, S), C.value = Number(v.text);
+        if (N && N === "number") {
+          let D = "", S = "";
+          U && (U.numberUseGrouping && (D = U.numberUseGrouping), U.numberDecimal && (S = U.numberDecimal)), C.numFmt = generateNumFmt(D, S), C.value = Number(v.text);
         }
       }
     }
@@ -1363,275 +1364,275 @@ 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, $ = { 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(O) {
-      var x = ["th", "st", "nd", "rd"], D = O % 100;
-      return "[" + O + (x[(D - 20) % 10] || x[D] || x[0]) + "]";
-    } }, y = function(O, x, D) {
-      var T = String(O);
-      return !T || T.length >= x ? O : "" + Array(x + 1 - T.length).join(D) + O;
-    }, v = { s: y, z: function(O) {
-      var x = -O.utcOffset(), D = Math.abs(x), T = Math.floor(D / 60), S = D % 60;
-      return (x <= 0 ? "+" : "-") + y(T, 2, "0") + ":" + y(S, 2, "0");
-    }, m: function O(x, D) {
-      if (x.date() < D.date()) return -O(D, x);
-      var T = 12 * (D.year() - x.year()) + (D.month() - x.month()), S = x.clone().add(T, f), I = D - S < 0, B = x.clone().add(T + (I ? -1 : 1), f);
-      return +(-(T + (D - S) / (I ? S - B : B - S)) || 0);
-    }, a: function(O) {
-      return O < 0 ? Math.ceil(O) || 0 : Math.floor(O);
-    }, p: function(O) {
-      return { M: f, y: p, w: u, d: c, D: m, h: l, m: s, s: a, ms: i, Q: d }[O] || String(O || "").toLowerCase().replace(/s$/, "");
-    }, u: function(O) {
-      return O === void 0;
+    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 T = ["th", "st", "nd", "rd"], b = M % 100;
+      return "[" + M + (T[(b - 20) % 10] || T[b] || T[0]) + "]";
+    } }, y = function(M, T, b) {
+      var D = String(M);
+      return !D || D.length >= T ? M : "" + Array(T + 1 - D.length).join(b) + M;
+    }, v = { s: y, z: function(M) {
+      var T = -M.utcOffset(), b = Math.abs(T), D = Math.floor(b / 60), S = b % 60;
+      return (T <= 0 ? "+" : "-") + y(D, 2, "0") + ":" + y(S, 2, "0");
+    }, m: function M(T, b) {
+      if (T.date() < b.date()) return -M(b, T);
+      var D = 12 * (b.year() - T.year()) + (b.month() - T.month()), S = T.clone().add(D, f), R = b - S < 0, k = T.clone().add(D + (R ? -1 : 1), f);
+      return +(-(D + (b - S) / (R ? S - k : k - S)) || 0);
+    }, a: function(M) {
+      return M < 0 ? Math.ceil(M) || 0 : Math.floor(M);
+    }, p: function(M) {
+      return { M: f, y: p, w: u, d: c, D: m, h: l, m: s, s: a, ms: i, Q: d }[M] || String(M || "").toLowerCase().replace(/s$/, "");
+    }, u: function(M) {
+      return M === void 0;
     } }, C = "en", w = {};
-    w[C] = $;
-    var b = "$isDayjsObject", N = function(O) {
-      return O instanceof F || !(!O || !O[b]);
-    }, R = function O(x, D, T) {
+    w[C] = x;
+    var $ = "$isDayjsObject", I = function(M) {
+      return M instanceof U || !(!M || !M[$]);
+    }, A = function M(T, b, D) {
       var S;
-      if (!x) return C;
-      if (typeof x == "string") {
-        var I = x.toLowerCase();
-        w[I] && (S = I), D && (w[I] = D, S = I);
-        var B = x.split("-");
-        if (!S && B.length > 1) return O(B[0]);
+      if (!T) return C;
+      if (typeof T == "string") {
+        var R = T.toLowerCase();
+        w[R] && (S = R), b && (w[R] = b, S = R);
+        var k = T.split("-");
+        if (!S && k.length > 1) return M(k[0]);
       } else {
-        var j = x.name;
-        w[j] = x, S = j;
+        var G = T.name;
+        w[G] = T, S = G;
       }
-      return !T && S && (C = S), S || !T && C;
-    }, A = function(O, x) {
-      if (N(O)) return O.clone();
-      var D = typeof x == "object" ? x : {};
-      return D.date = O, D.args = arguments, new F(D);
-    }, k = v;
-    k.l = R, k.i = N, k.w = function(O, x) {
-      return A(O, { locale: x.$L, utc: x.$u, x: x.$x, $offset: x.$offset });
+      return !D && S && (C = S), S || !D && C;
+    }, O = function(M, T) {
+      if (I(M)) return M.clone();
+      var b = typeof T == "object" ? T : {};
+      return b.date = M, b.args = arguments, new U(b);
+    }, N = v;
+    N.l = A, N.i = I, N.w = function(M, T) {
+      return O(M, { locale: T.$L, utc: T.$u, x: T.$x, $offset: T.$offset });
     };
-    var F = function() {
-      function O(D) {
-        this.$L = R(D.locale, null, !0), this.parse(D), this.$x = this.$x || D.x || {}, this[b] = !0;
+    var U = function() {
+      function M(b) {
+        this.$L = A(b.locale, null, !0), this.parse(b), this.$x = this.$x || b.x || {}, this[$] = !0;
       }
-      var x = O.prototype;
-      return x.parse = function(D) {
-        this.$d = function(T) {
-          var S = T.date, I = T.utc;
+      var T = M.prototype;
+      return T.parse = function(b) {
+        this.$d = function(D) {
+          var S = D.date, R = D.utc;
           if (S === null) return /* @__PURE__ */ new Date(NaN);
-          if (k.u(S)) return /* @__PURE__ */ new Date();
+          if (N.u(S)) return /* @__PURE__ */ new Date();
           if (S instanceof Date) return new Date(S);
           if (typeof S == "string" && !/Z$/i.test(S)) {
-            var B = S.match(_);
-            if (B) {
-              var j = B[2] - 1 || 0, X = (B[7] || "0").substring(0, 3);
-              return I ? new Date(Date.UTC(B[1], j, B[3] || 1, B[4] || 0, B[5] || 0, B[6] || 0, X)) : new Date(B[1], j, B[3] || 1, B[4] || 0, B[5] || 0, B[6] || 0, X);
+            var k = S.match(_);
+            if (k) {
+              var G = k[2] - 1 || 0, W = (k[7] || "0").substring(0, 3);
+              return R ? new Date(Date.UTC(k[1], G, k[3] || 1, k[4] || 0, k[5] || 0, k[6] || 0, W)) : new Date(k[1], G, k[3] || 1, k[4] || 0, k[5] || 0, k[6] || 0, W);
             }
           }
           return new Date(S);
-        }(D), this.init();
-      }, x.init = function() {
-        var D = this.$d;
-        this.$y = D.getFullYear(), this.$M = D.getMonth(), this.$D = D.getDate(), this.$W = D.getDay(), this.$H = D.getHours(), this.$m = D.getMinutes(), this.$s = D.getSeconds(), this.$ms = D.getMilliseconds();
-      }, x.$utils = function() {
-        return k;
-      }, x.isValid = function() {
+        }(b), this.init();
+      }, T.init = function() {
+        var b = this.$d;
+        this.$y = b.getFullYear(), this.$M = b.getMonth(), this.$D = b.getDate(), this.$W = b.getDay(), this.$H = b.getHours(), this.$m = b.getMinutes(), this.$s = b.getSeconds(), this.$ms = b.getMilliseconds();
+      }, T.$utils = function() {
+        return N;
+      }, T.isValid = function() {
         return this.$d.toString() !== g;
-      }, x.isSame = function(D, T) {
-        var S = A(D);
-        return this.startOf(T) <= S && S <= this.endOf(T);
-      }, x.isAfter = function(D, T) {
-        return A(D) < this.startOf(T);
-      }, x.isBefore = function(D, T) {
-        return this.endOf(T) < A(D);
-      }, x.$g = function(D, T, S) {
-        return k.u(D) ? this[T] : this.set(S, D);
-      }, x.unix = function() {
+      }, T.isSame = function(b, D) {
+        var S = O(b);
+        return this.startOf(D) <= S && S <= this.endOf(D);
+      }, T.isAfter = function(b, D) {
+        return O(b) < this.startOf(D);
+      }, T.isBefore = function(b, D) {
+        return this.endOf(D) < O(b);
+      }, T.$g = function(b, D, S) {
+        return N.u(b) ? this[D] : this.set(S, b);
+      }, T.unix = function() {
         return Math.floor(this.valueOf() / 1e3);
-      }, x.valueOf = function() {
+      }, T.valueOf = function() {
         return this.$d.getTime();
-      }, x.startOf = function(D, T) {
-        var S = this, I = !!k.u(T) || T, B = k.p(D), j = function(U, G) {
-          var V = k.w(S.$u ? Date.UTC(S.$y, G, U) : new Date(S.$y, G, U), S);
-          return I ? V : V.endOf(c);
-        }, X = function(U, G) {
-          return k.w(S.toDate()[U].apply(S.toDate("s"), (I ? [0, 0, 0, 0] : [23, 59, 59, 999]).slice(G)), S);
-        }, Z = this.$W, Q = this.$M, ee = this.$D, ie = "set" + (this.$u ? "UTC" : "");
-        switch (B) {
+      }, T.startOf = function(b, D) {
+        var S = this, R = !!N.u(D) || D, k = N.p(b), G = function(F, H) {
+          var j = N.w(S.$u ? Date.UTC(S.$y, H, F) : new Date(S.$y, H, F), S);
+          return R ? j : j.endOf(c);
+        }, W = function(F, H) {
+          return N.w(S.toDate()[F].apply(S.toDate("s"), (R ? [0, 0, 0, 0] : [23, 59, 59, 999]).slice(H)), S);
+        }, ee = this.$W, J = this.$M, ne = this.$D, ae = "set" + (this.$u ? "UTC" : "");
+        switch (k) {
           case p:
-            return I ? j(1, 0) : j(31, 11);
+            return R ? G(1, 0) : G(31, 11);
           case f:
-            return I ? j(1, Q) : j(0, Q + 1);
+            return R ? G(1, J) : G(0, J + 1);
           case u:
-            var ae = this.$locale().weekStart || 0, se = (Z < ae ? Z + 7 : Z) - ae;
-            return j(I ? ee - se : ee + (6 - se), Q);
+            var ie = this.$locale().weekStart || 0, se = (ee < ie ? ee + 7 : ee) - ie;
+            return G(R ? ne - se : ne + (6 - se), J);
           case c:
           case m:
-            return X(ie + "Hours", 0);
+            return W(ae + "Hours", 0);
           case l:
-            return X(ie + "Minutes", 1);
+            return W(ae + "Minutes", 1);
           case s:
-            return X(ie + "Seconds", 2);
+            return W(ae + "Seconds", 2);
           case a:
-            return X(ie + "Milliseconds", 3);
+            return W(ae + "Milliseconds", 3);
           default:
             return this.clone();
         }
-      }, x.endOf = function(D) {
-        return this.startOf(D, !1);
-      }, x.$set = function(D, T) {
-        var S, I = k.p(D), B = "set" + (this.$u ? "UTC" : ""), j = (S = {}, S[c] = B + "Date", S[m] = B + "Date", S[f] = B + "Month", S[p] = B + "FullYear", S[l] = B + "Hours", S[s] = B + "Minutes", S[a] = B + "Seconds", S[i] = B + "Milliseconds", S)[I], X = I === c ? this.$D + (T - this.$W) : T;
-        if (I === f || I === p) {
-          var Z = this.clone().set(m, 1);
-          Z.$d[j](X), Z.init(), this.$d = Z.set(m, Math.min(this.$D, Z.daysInMonth())).$d;
-        } else j && this.$d[j](X);
+      }, T.endOf = function(b) {
+        return this.startOf(b, !1);
+      }, T.$set = function(b, D) {
+        var S, R = N.p(b), k = "set" + (this.$u ? "UTC" : ""), G = (S = {}, S[c] = k + "Date", S[m] = k + "Date", S[f] = k + "Month", S[p] = k + "FullYear", S[l] = k + "Hours", S[s] = k + "Minutes", S[a] = k + "Seconds", S[i] = k + "Milliseconds", S)[R], W = R === c ? this.$D + (D - this.$W) : D;
+        if (R === f || R === p) {
+          var ee = this.clone().set(m, 1);
+          ee.$d[G](W), ee.init(), this.$d = ee.set(m, Math.min(this.$D, ee.daysInMonth())).$d;
+        } else G && this.$d[G](W);
         return this.init(), this;
-      }, x.set = function(D, T) {
-        return this.clone().$set(D, T);
-      }, x.get = function(D) {
-        return this[k.p(D)]();
-      }, x.add = function(D, T) {
-        var S, I = this;
-        D = Number(D);
-        var B = k.p(T), j = function(Q) {
-          var ee = A(I);
-          return k.w(ee.date(ee.date() + Math.round(Q * D)), I);
+      }, T.set = function(b, D) {
+        return this.clone().$set(b, D);
+      }, T.get = function(b) {
+        return this[N.p(b)]();
+      }, T.add = function(b, D) {
+        var S, R = this;
+        b = Number(b);
+        var k = N.p(D), G = function(J) {
+          var ne = O(R);
+          return N.w(ne.date(ne.date() + Math.round(J * b)), R);
         };
-        if (B === f) return this.set(f, this.$M + D);
-        if (B === p) return this.set(p, this.$y + D);
-        if (B === c) return j(1);
-        if (B === u) return j(7);
-        var X = (S = {}, S[s] = n, S[l] = o, S[a] = r, S)[B] || 1, Z = this.$d.getTime() + D * X;
-        return k.w(Z, this);
-      }, x.subtract = function(D, T) {
-        return this.add(-1 * D, T);
-      }, x.format = function(D) {
-        var T = this, S = this.$locale();
+        if (k === f) return this.set(f, this.$M + b);
+        if (k === p) return this.set(p, this.$y + b);
+        if (k === c) return G(1);
+        if (k === u) return G(7);
+        var W = (S = {}, S[s] = n, S[l] = o, S[a] = r, S)[k] || 1, ee = this.$d.getTime() + b * W;
+        return N.w(ee, this);
+      }, T.subtract = function(b, D) {
+        return this.add(-1 * b, D);
+      }, T.format = function(b) {
+        var D = this, S = this.$locale();
         if (!this.isValid()) return S.invalidDate || g;
-        var I = D || "YYYY-MM-DDTHH:mm:ssZ", B = k.z(this), j = this.$H, X = this.$m, Z = this.$M, Q = S.weekdays, ee = S.months, ie = S.meridiem, ae = function(G, V, Y, q) {
-          return G && (G[V] || G(T, I)) || Y[V].slice(0, q);
-        }, se = function(G) {
-          return k.s(j % 12 || 12, G, "0");
-        }, U = ie || function(G, V, Y) {
-          var q = G < 12 ? "AM" : "PM";
-          return Y ? q.toLowerCase() : q;
+        var R = b || "YYYY-MM-DDTHH:mm:ssZ", k = N.z(this), G = this.$H, W = this.$m, ee = this.$M, J = S.weekdays, ne = S.months, ae = S.meridiem, ie = function(H, j, q, X) {
+          return H && (H[j] || H(D, R)) || q[j].slice(0, X);
+        }, se = function(H) {
+          return N.s(G % 12 || 12, H, "0");
+        }, F = ae || function(H, j, q) {
+          var X = H < 12 ? "AM" : "PM";
+          return q ? X.toLowerCase() : X;
         };
-        return I.replace(E, function(G, V) {
-          return V || function(Y) {
-            switch (Y) {
+        return R.replace(E, function(H, j) {
+          return j || function(q) {
+            switch (q) {
               case "YY":
-                return String(T.$y).slice(-2);
+                return String(D.$y).slice(-2);
               case "YYYY":
-                return k.s(T.$y, 4, "0");
+                return N.s(D.$y, 4, "0");
               case "M":
-                return Z + 1;
+                return ee + 1;
               case "MM":
-                return k.s(Z + 1, 2, "0");
+                return N.s(ee + 1, 2, "0");
               case "MMM":
-                return ae(S.monthsShort, Z, ee, 3);
+                return ie(S.monthsShort, ee, ne, 3);
               case "MMMM":
-                return ae(ee, Z);
+                return ie(ne, ee);
               case "D":
-                return T.$D;
+                return D.$D;
               case "DD":
-                return k.s(T.$D, 2, "0");
+                return N.s(D.$D, 2, "0");
               case "d":
-                return String(T.$W);
+                return String(D.$W);
               case "dd":
-                return ae(S.weekdaysMin, T.$W, Q, 2);
+                return ie(S.weekdaysMin, D.$W, J, 2);
               case "ddd":
-                return ae(S.weekdaysShort, T.$W, Q, 3);
+                return ie(S.weekdaysShort, D.$W, J, 3);
               case "dddd":
-                return Q[T.$W];
+                return J[D.$W];
               case "H":
-                return String(j);
+                return String(G);
               case "HH":
-                return k.s(j, 2, "0");
+                return N.s(G, 2, "0");
               case "h":
                 return se(1);
               case "hh":
                 return se(2);
               case "a":
-                return U(j, X, !0);
+                return F(G, W, !0);
               case "A":
-                return U(j, X, !1);
+                return F(G, W, !1);
               case "m":
-                return String(X);
+                return String(W);
               case "mm":
-                return k.s(X, 2, "0");
+                return N.s(W, 2, "0");
               case "s":
-                return String(T.$s);
+                return String(D.$s);
               case "ss":
-                return k.s(T.$s, 2, "0");
+                return N.s(D.$s, 2, "0");
               case "SSS":
-                return k.s(T.$ms, 3, "0");
+                return N.s(D.$ms, 3, "0");
               case "Z":
-                return B;
+                return k;
             }
             return null;
-          }(G) || B.replace(":", "");
+          }(H) || k.replace(":", "");
         });
-      }, x.utcOffset = function() {
+      }, T.utcOffset = function() {
         return 15 * -Math.round(this.$d.getTimezoneOffset() / 15);
-      }, x.diff = function(D, T, S) {
-        var I, B = this, j = k.p(T), X = A(D), Z = (X.utcOffset() - this.utcOffset()) * n, Q = this - X, ee = function() {
-          return k.m(B, X);
+      }, T.diff = function(b, D, S) {
+        var R, k = this, G = N.p(D), W = O(b), ee = (W.utcOffset() - this.utcOffset()) * n, J = this - W, ne = function() {
+          return N.m(k, W);
         };
-        switch (j) {
+        switch (G) {
           case p:
-            I = ee() / 12;
+            R = ne() / 12;
             break;
           case f:
-            I = ee();
+            R = ne();
             break;
           case d:
-            I = ee() / 3;
+            R = ne() / 3;
             break;
           case u:
-            I = (Q - Z) / 6048e5;
+            R = (J - ee) / 6048e5;
             break;
           case c:
-            I = (Q - Z) / 864e5;
+            R = (J - ee) / 864e5;
             break;
           case l:
-            I = Q / o;
+            R = J / o;
             break;
           case s:
-            I = Q / n;
+            R = J / n;
             break;
           case a:
-            I = Q / r;
+            R = J / r;
             break;
           default:
-            I = Q;
+            R = J;
         }
-        return S ? I : k.a(I);
-      }, x.daysInMonth = function() {
+        return S ? R : N.a(R);
+      }, T.daysInMonth = function() {
         return this.endOf(f).$D;
-      }, x.$locale = function() {
+      }, T.$locale = function() {
         return w[this.$L];
-      }, x.locale = function(D, T) {
-        if (!D) return this.$L;
-        var S = this.clone(), I = R(D, T, !0);
-        return I && (S.$L = I), S;
-      }, x.clone = function() {
-        return k.w(this.$d, this);
-      }, x.toDate = function() {
+      }, T.locale = function(b, D) {
+        if (!b) return this.$L;
+        var S = this.clone(), R = A(b, D, !0);
+        return R && (S.$L = R), S;
+      }, T.clone = function() {
+        return N.w(this.$d, this);
+      }, T.toDate = function() {
         return new Date(this.valueOf());
-      }, x.toJSON = function() {
+      }, T.toJSON = function() {
         return this.isValid() ? this.toISOString() : null;
-      }, x.toISOString = function() {
+      }, T.toISOString = function() {
         return this.$d.toISOString();
-      }, x.toString = function() {
+      }, T.toString = function() {
         return this.$d.toUTCString();
-      }, O;
-    }(), L = F.prototype;
-    return A.prototype = L, [["$ms", i], ["$s", a], ["$m", s], ["$H", l], ["$W", c], ["$M", f], ["$y", p], ["$D", m]].forEach(function(O) {
-      L[O[1]] = function(x) {
-        return this.$g(x, O[0], O[1]);
+      }, M;
+    }(), L = U.prototype;
+    return O.prototype = L, [["$ms", i], ["$s", a], ["$m", s], ["$H", l], ["$W", c], ["$M", f], ["$y", p], ["$D", m]].forEach(function(M) {
+      L[M[1]] = function(T) {
+        return this.$g(T, M[0], M[1]);
       };
-    }), A.extend = function(O, x) {
-      return O.$i || (O(x, F, A), O.$i = !0), A;
-    }, A.locale = R, A.isDayjs = N, A.unix = function(O) {
-      return A(1e3 * O);
-    }, A.en = w[C], A.Ls = w, A.p = {}, A;
+    }), O.extend = function(M, T) {
+      return M.$i || (M(T, U, O), M.$i = !0), O;
+    }, O.locale = A, O.isDayjs = I, O.unix = function(M) {
+      return O(1e3 * M);
+    }, O.en = w[C], O.Ls = w, O.p = {}, O;
   });
 })(dayjs_min);
 var dayjs_minExports = dayjs_min.exports;
@@ -1833,6 +1834,9 @@ const DEFAULT_PRINT_HEADER = {
   header: { ...DEFAULT_PRINT_HEADER },
   footer: { ...DEFAULT_PRINT_FOOTER },
   watermark: { ...DEFAULT_PRINT_WATERMARK }
+}, DEFAULT_EXPORT_CONFIG = {
+  exportAll: !1,
+  pdfEnabled: !1
 };
 async function fetchReportData(t, e, r, n = !1) {
   if (!t.data.source)
@@ -1854,7 +1858,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 $ = _.count || E.length, y = i.pageSize > 0 ? i.pageSize : FULL_FETCH_PAGE_SIZE, v = Math.min(Math.ceil($ / y), FULL_FETCH_MAX_PAGES);
+        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);
         for (let C = 2; C <= v; C++) {
           const w = await getDateSourceData(p, { ...g, pageNumber: C });
           if (!Array.isArray(w.data) || w.data.length === 0)
@@ -3154,37 +3158,37 @@ 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, $, y, v, C, w, b, N, R, A, k, F, L = n.constructor, O = n.s == o.s ? 1 : -1, x = n.d, D = o.d;
-    if (!x || !x[0] || !D || !D[0])
+    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;
+    if (!T || !T[0] || !b || !b[0])
       return new L(
         // Return NaN if either NaN, or both Infinity or 0.
-        !n.s || !o.s || (x ? D && x[0] == D[0] : !D) ? NaN : (
+        !n.s || !o.s || (T ? b && T[0] == b[0] : !b) ? NaN : (
           // Return ±0 if x is 0 or y is ±Infinity, or return ±Infinity as y is 0.
-          x && x[0] == 0 || !D ? O * 0 : O / 0
+          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)), k = D.length, R = x.length, E = new L(O), $ = E.d = [], f = 0; D[f] == (x[f] || 0); f++) ;
-    if (D[f] > (x[f] || 0) && u--, i == null ? (w = i = L.precision, a = L.rounding) : s ? w = i + (n.e - o.e) + 1 : w = i, w < 0)
-      $.push(1), 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++) ;
+    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;
     else {
-      if (w = w / p + 2 | 0, f = 0, k == 1) {
-        for (d = 0, D = D[0], w++; (f < R || d) && w--; f++)
-          b = d * l + (x[f] || 0), $[f] = b / D | 0, d = b % D | 0;
-        m = d || f < R;
+      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;
+        m = d || f < A;
       } else {
-        for (d = l / (D[0] + 1) | 0, d > 1 && (D = t(D, d, l), x = t(x, d, l), k = D.length, R = x.length), N = k, y = x.slice(0, k), v = y.length; v < k; ) y[v++] = 0;
-        F = D.slice(), F.unshift(0), A = D[0], D[1] >= l / 2 && ++A;
+        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(D, y, k, v), c < 0 ? (C = y[0], k != v && (C = C * l + (y[1] || 0)), d = C / A | 0, d > 1 ? (d >= l && (d = l - 1), g = t(D, d, l), _ = g.length, v = y.length, c = e(g, y, _, v), c == 1 && (d--, r(g, k < _ ? F : D, _, l))) : (d == 0 && (c = d = 1), g = D.slice()), _ = g.length, _ < v && g.unshift(0), r(y, g, v, l), c == -1 && (v = y.length, c = e(D, y, k, v), c < 1 && (d++, r(y, k < v ? F : D, v, l))), v = y.length) : c === 0 && (d++, y = [0]), $[f++] = d, c && y[0] ? y[v++] = x[N] || 0 : (y = [x[N]], v = 1);
-        while ((N++ < R || y[0] !== void 0) && w--);
+          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);
+        while ((I++ < A || y[0] !== void 0) && w--);
         m = y[0] !== void 0;
       }
-      $[0] || $.shift();
+      x[0] || x.shift();
     }
     if (p == 1)
       E.e = u, inexact = m;
     else {
-      for (f = 1, d = $[0]; d >= 10; d /= 10) f++;
+      for (f = 1, d = x[0]; d >= 10; d /= 10) f++;
       E.e = f + u * p - 1, finalise(E, s ? i + E.e + 1 : i, a, m);
     }
     return E;
@@ -3301,7 +3305,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, $ = 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, x = 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) {
@@ -3309,14 +3313,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, $, 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, x, 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, $, s))
+        if (checkRoundingDigits(l.d, u - m, x, 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, $, external = !0);
+          return finalise(l, E.precision = y, x, external = !0);
       else
         return E.precision = y, l;
     l = c, o += 2;
@@ -7092,9 +7096,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), $ = (_ - E) * 8;
-    if (g === o.MIXED) return $;
-    const y = $ - c(g, p);
+    const _ = e.getSymbolTotalCodewords(p), E = r.getTotalCodewordsCount(p, m), x = (_ - E) * 8;
+    if (g === o.MIXED) return x;
+    const y = x - c(g, p);
     switch (g) {
       case o.NUMERIC:
         return Math.floor(y / 10 * 3);
@@ -7345,33 +7349,33 @@ var dijkstraExports = dijkstra.exports;
   function c(E) {
     return unescape(encodeURIComponent(E)).length;
   }
-  function u(E, $, y) {
+  function u(E, x, y) {
     const v = [];
     let C;
     for (; (C = E.exec(y)) !== null; )
       v.push({
         data: C[0],
         index: C.index,
-        mode: $,
+        mode: x,
         length: C[0].length
       });
     return v;
   }
   function f(E) {
-    const $ = u(a.NUMERIC, e.NUMERIC, E), y = u(a.ALPHANUMERIC, e.ALPHANUMERIC, E);
+    const x = 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 = []), $.concat(y, v, C).sort(function(b, N) {
-      return b.index - N.index;
-    }).map(function(b) {
+    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 {
-        data: b.data,
-        mode: b.mode,
-        length: b.length
+        data: $.data,
+        mode: $.mode,
+        length: $.length
       };
     });
   }
-  function d(E, $) {
-    switch ($) {
+  function d(E, x) {
+    switch (x) {
       case e.NUMERIC:
         return r.getBitsLength(E);
       case e.ALPHANUMERIC:
@@ -7383,66 +7387,66 @@ var dijkstraExports = dijkstra.exports;
     }
   }
   function p(E) {
-    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), $);
+    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);
     }, []);
   }
   function m(E) {
-    const $ = [];
+    const x = [];
     for (let y = 0; y < E.length; y++) {
       const v = E[y];
       switch (v.mode) {
         case e.NUMERIC:
-          $.push([
+          x.push([
             v,
             { data: v.data, mode: e.ALPHANUMERIC, length: v.length },
             { data: v.data, mode: e.BYTE, length: v.length }
           ]);
           break;
         case e.ALPHANUMERIC:
-          $.push([
+          x.push([
             v,
             { data: v.data, mode: e.BYTE, length: v.length }
           ]);
           break;
         case e.KANJI:
-          $.push([
+          x.push([
             v,
             { data: v.data, mode: e.BYTE, length: c(v.data) }
           ]);
           break;
         case e.BYTE:
-          $.push([
+          x.push([
             { data: v.data, mode: e.BYTE, length: c(v.data) }
           ]);
       }
     }
-    return $;
+    return x;
   }
-  function g(E, $) {
+  function g(E, x) {
     const y = {}, v = { start: {} };
     let C = ["start"];
     for (let w = 0; w < E.length; w++) {
-      const b = E[w], N = [];
-      for (let R = 0; R < b.length; R++) {
-        const A = b[R], k = "" + w + R;
-        N.push(k), y[k] = { node: A, lastCount: 0 }, v[k] = {};
-        for (let F = 0; F < C.length; F++) {
-          const L = C[F];
-          y[L] && y[L].node.mode === A.mode ? (v[L][k] = d(y[L].lastCount + A.length, A.mode) - d(y[L].lastCount, A.mode), y[L].lastCount += A.length) : (y[L] && (y[L].lastCount = A.length), v[L][k] = d(A.length, A.mode) + 4 + e.getCharCountIndicator(A.mode, $));
+      const $ = E[w], I = [];
+      for (let A = 0; A < $.length; A++) {
+        const O = $[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));
         }
       }
-      C = N;
+      C = I;
     }
     for (let w = 0; w < C.length; w++)
       v[C[w]].end = 0;
     return { map: v, table: y };
   }
-  function _(E, $) {
+  function _(E, x) {
     let y;
     const v = e.getBestModeForData(E);
-    if (y = e.from($, v), y !== e.BYTE && y.bit < v.bit)
+    if (y = e.from(x, 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) {
@@ -7456,18 +7460,18 @@ var dijkstraExports = dijkstra.exports;
         return new o(E);
     }
   }
-  t.fromArray = function($) {
-    return $.reduce(function(y, v) {
+  t.fromArray = function(x) {
+    return x.reduce(function(y, v) {
       return typeof v == "string" ? y.push(_(v, null)) : v.data && y.push(_(v.data, v.mode)), y;
     }, []);
-  }, t.fromString = function($, y) {
-    const v = f($, s.isKanjiModeEnabled()), C = m(v), w = g(C, y), b = l.find_path(w.map, "start", "end"), N = [];
-    for (let R = 1; R < b.length - 1; R++)
-      N.push(w.table[b[R]].node);
-    return t.fromArray(p(N));
-  }, t.rawSplit = function($) {
+  }, 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);
+    return t.fromArray(p(I));
+  }, t.rawSplit = function(x) {
     return t.fromArray(
-      f($, s.isKanjiModeEnabled())
+      f(x, s.isKanjiModeEnabled())
     );
   };
 })(segments);
@@ -7545,10 +7549,10 @@ function createCodewords(t, e, r) {
   let m = 0;
   const g = new Array(a), _ = new Array(a);
   let E = 0;
-  const $ = new Uint8Array(t.buffer);
-  for (let b = 0; b < a; b++) {
-    const N = b < l ? u : f;
-    g[b] = $.slice(m, m + N), _[b] = p.encode(g[b]), m += N, E = Math.max(E, N);
+  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 y = new Uint8Array(n);
   let v = 0, C, w;
@@ -7838,7 +7842,7 @@ function renderCellStyle(t) {
   }), e;
 }
 function formatNumber$1(t, { numberDecimal: e, numberUseGrouping: r } = {}) {
-  const n = e === 0 ? Math.round(t) : t.toFixed(e);
+  const n = e === 0 ? Math.round(t) : new Decimal(t).toFixed(e ?? 0);
   if (r) {
     const o = n.toString().split(".");
     return o[0] = o[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","), o.join(".");
@@ -7846,15 +7850,15 @@ function formatNumber$1(t, { numberDecimal: e, numberUseGrouping: r } = {}) {
     return n;
 }
 function formatCurrency(t, { numberDecimal: e, currencySymbol: r, numberUseGrouping: n } = {}) {
-  const o = e === 0 ? Math.round(t) : parseFloat(t.toFixed(e));
-  let [i, a] = o.toString().split(".");
+  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;
 }
 function formatPercentage(t, { numberDecimal: e } = {}, r = !1) {
-  const n = e === 0 ? Math.round(t) : t.toFixed(e);
-  return r ? `${n}‰` : `${n}%`;
+  const n = r ? 1e3 : 100, o = new Decimal(t).times(n).toFixed(e ?? 0);
+  return r ? `${o}‰` : `${o}%`;
 }
 function formatScientific(t, { scientificNotation: e = "e", digits: r = 6 } = {}) {
   return t.toExponential(r).replace(/e/, e);
@@ -7891,9 +7895,9 @@ function formatCellValue(t, e = FormatType.TEXT, r) {
     case FormatType.CURRENCY:
       return formatCurrency(n, r);
     case FormatType.PERCENT:
-      return formatPercentage(n * 100, r, !1);
+      return formatPercentage(n, r, !1);
     case FormatType.PROMILLE:
-      return formatPercentage(n * 1e3, r, !0);
+      return formatPercentage(n, r, !0);
     case FormatType.SCIENTIFIC:
       return formatScientific(n, r);
     case FormatType.DATETIME:
@@ -7923,10 +7927,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 $, y, v, C, w;
+  var x, 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 = (($ = e.style) == null ? void 0 : $.allowContentOverflow) === !0;
+  const o = ((x = e.style) == null ? void 0 : x.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};`;
@@ -7936,13 +7940,13 @@ function renderCell(t, e, r) {
       d = `<i class="iconfont ${e.data}"></i>`, f = !0;
       break;
     case CellType.IMAGE: {
-      const b = renderImageStyle(e.imageOptions);
-      d = `<img src="${e.rawData ?? e.data}" alt="" style="max-width:100%;max-height:100%;object-fit:contain${b ? ";" + b : ""}">`, f = !0;
+      const $ = renderImageStyle(e.imageOptions);
+      d = `<img src="${e.rawData ?? e.data}" alt="" style="max-width:100%;max-height:100%;object-fit:contain${$ ? ";" + $ : ""}">`, f = !0;
       break;
     }
     case CellType.RICH: {
-      const b = [void 0, null, ""].includes(e.text) ? ((C = e.formatType) == null ? void 0 : C.defaultCellContent) || "" : String(e.text);
-      b && (d = b, f = !0);
+      const $ = [void 0, null, ""].includes(e.text) ? ((C = e.formatType) == null ? void 0 : C.defaultCellContent) || "" : String(e.text);
+      $ && (d = $, f = !0);
       break;
     }
     default:
@@ -7951,25 +7955,25 @@ function renderCell(t, e, r) {
   }
   if (!f && e.format === FormatType.BARCODE)
     try {
-      const b = e.barcodeUrl || canvasPool.generateBarcode(u, e.barcodeOptions);
-      b && (d = `<img src="${b}" alt="barcode" style="max-width:100%;max-height:100%;object-fit:contain">`, f = !0);
-    } catch (b) {
-      console.error(`条形码生成失败 [${e.row}:${e.col}]:`, b);
+      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}]:`, $);
     }
   else if (!f && e.format === FormatType.QRCODE) {
-    const b = e.qrcodeData;
-    b && (d = `<img src="${b}" alt="qrcode" style="max-width:100%;max-height:100%;object-fit:contain">`, f = !0);
+    const $ = e.qrcodeData;
+    $ && (d = `<img src="${$}" alt="qrcode" style="max-width:100%;max-height:100%;object-fit:contain">`, f = !0);
   }
   if (f)
     c.innerHTML = d;
   else {
-    const b = document.createElement("span");
-    b.style.cssText = "word-break:break-word;overflow-wrap:anywhere;", b.innerText = String(u), c.appendChild(b);
+    const $ = document.createElement("span");
+    $.style.cssText = "word-break:break-word;overflow-wrap:anywhere;", $.innerText = String(u), c.appendChild($);
   }
   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 b = normalizeBorder(e.style.border);
-    b && (n.style.borderTop = getBorderCss(b.top, r), n.style.borderRight = getBorderCss(b.right, r), n.style.borderBottom = getBorderCss(b.bottom, r), n.style.borderLeft = getBorderCss(b.left, r));
+    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));
   }
   return n.style.position = "relative", n;
 }
@@ -8038,16 +8042,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 $ = e[E];
-      if ($.isHidden) continue;
+      const x = e[E];
+      if (x.isHidden) continue;
       const y = r[m][E];
       if (g && y && (g.size ?? 25) > 0) {
         const v = renderCell(g, y, n);
-        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 (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 ([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 || {}, b = w.paddingTop ?? TD_DEFAULT_PADDING_VERTICAL, N = w.paddingRight ?? TD_DEFAULT_PADDING_HORIZONTAL, R = w.paddingBottom ?? TD_DEFAULT_PADDING_VERTICAL, A = w.paddingLeft ?? TD_DEFAULT_PADDING_HORIZONTAL;
-            v.style.paddingTop = `${b}px`, v.style.paddingRight = `${N}px`, v.style.paddingBottom = `${R}px`, v.style.paddingLeft = `${A}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 || {}, $ = 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`);
           }
           _.appendChild(v);
         }
@@ -8067,30 +8071,30 @@ 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 $ = t[E];
-    if ($.isHidden)
+    const x = t[E];
+    if (x.isHidden)
       continue;
     const y = document.createElement("tr");
-    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;
+    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;
     for (let v = 0; v < e.length; v++) {
       const C = e[v];
       if (C.isHidden)
         continue;
       const w = r[E][v];
-      if ($ && w && ($.size ?? 25) > 0) {
-        const b = renderCell($, w, i);
+      if (x && w && (x.size ?? 25) > 0) {
+        const $ = renderCell(x, w, i);
         if (w.clickSortField) {
-          b.classList.add("click-sort-cell"), b.setAttribute("data-click-sort-field", w.clickSortField), b.setAttribute("data-click-sort-numeric", w.clickSortNumeric ? "1" : "0");
-          const N = document.createElement("span");
-          N.className = "click-sort-arrow", (_ = b.querySelector(":scope > div")) == null || _.appendChild(N);
+          $.classList.add("click-sort-cell"), $.setAttribute("data-click-sort-field", w.clickSortField), $.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);
         }
-        if (C.isFixed === !0 && (b.classList.add("fixed-td"), b.style.position = "sticky", b.style.left = `${u - 1}px`), u += (C.size ?? 80) - 1, b.setAttribute("data-cell-data", `${E}-${v}`), !(w.rowSpan === 0 || w.colSpan === 0)) {
-          if (w.style && w.style.border === !1 && b.classList.add("no-border"), y.appendChild(b), w.rowSpan > 1) {
-            const N = d.length;
-            d.push(b), p.push(w.rowSpan);
-            for (let R = 1; R < w.rowSpan; R++) {
-              const A = g + R;
-              m.has(A) || m.set(A, []), m.get(A).push(N);
+        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) {
+            const I = d.length;
+            d.push($), 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);
             }
           }
         }
@@ -8100,7 +8104,7 @@ function renderReportByDom(t, e, r, n, o, i) {
   }
   if (d.length > 0) {
     let E = -1;
-    const $ = () => {
+    const x = () => {
       var y;
       E >= 0 && ((y = m.get(E)) == null || y.forEach((v) => d[v].classList.remove("merge-hover"))), E = -1;
     };
@@ -8109,8 +8113,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 && ($(), E = C, (w = m.get(C)) == null || w.forEach((b) => d[b].classList.add("merge-hover")));
-    }), s.addEventListener("mouseleave", $);
+      C !== E && (x(), E = C, (w = m.get(C)) == null || w.forEach(($) => d[$].classList.add("merge-hover")));
+    }), s.addEventListener("mouseleave", x);
   }
   s.appendChild(f);
 }
@@ -8491,10 +8495,10 @@ function getRangeValues(t, e, r) {
           );
         } else if (r.indexOf("c-") > -1) {
           const g = parseInt(r.split("-")[1]);
-          f = getCellValue(m).filter(($) => $.colGroupIndex === g).map(
-            ($) => {
+          f = getCellValue(m).filter((x) => x.colGroupIndex === g).map(
+            (x) => {
               var y;
-              return [null, void 0, ""].includes($.rawData) ? (y = $.formatType) == null ? void 0 : y.defaultCellContent : $.rawData;
+              return [null, void 0, ""].includes(x.rawData) ? (y = x.formatType) == null ? void 0 : y.defaultCellContent : x.rawData;
             }
           );
         }
@@ -8574,8 +8578,8 @@ function evaluateFunction(t, e, r) {
       for (let g = 0; g < a; g++) {
         let _ = new Decimal(1);
         for (const E of i) {
-          const $ = parseFloat(E[g]);
-          _ = _.times(isNaN($) ? 0 : $);
+          const x = parseFloat(E[g]);
+          _ = _.times(isNaN(x) ? 0 : x);
         }
         s = s.plus(_);
       }
@@ -8695,11 +8699,11 @@ function loopGroupCols(t, e, r, n) {
     s.forEach((m, g) => {
       const _ = getSeparatorKey("key", m);
       l[_] || (l[_] = /* @__PURE__ */ new Set());
-      let $ = a[m].data.replace("col:", "").toUpperCase();
+      let x = a[m].data.replace("col:", "").toUpperCase();
       if (g === 0)
         i.forEach((y) => {
-          if ($) {
-            let v = y[$];
+          if (x) {
+            let v = y[x];
             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];
@@ -8709,17 +8713,17 @@ function loopGroupCols(t, e, r, n) {
         let y = s[g - 1];
         const v = getSeparatorKey("key", y);
         Array.from(l[v]).forEach((w) => {
-          const b = getSeparatorKey("child", y, w);
-          let R = (l[b] || []).map((A) => {
-            if ($) {
-              let k = A[$];
-              k || (k = "-");
-              let F = !1;
-              const L = getSeparatorKey("child", m, w, k), O = getSeparatorKey(w, k), x = getSeparatorKey("data", O);
-              return l[L] ? l[L].push(A) : l[L] = [A], l[x] ? l[x].push(A) : l[x] = [A], l[_].has(O) || (F = !0), l[_].add(O), l[O] = l[w].concat([k]), F ? k : null;
+          const $ = getSeparatorKey("child", y, w);
+          let A = (l[$] || []).map((O) => {
+            if (x) {
+              let N = O[x];
+              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((A) => !!A);
-          l[b] = R;
+          }).filter((O) => !!O);
+          l[$] = A;
         });
       }
     });
@@ -8730,8 +8734,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", _), $ = Array.from(l[E]);
-        $.length > 1 && $.sort(createGroupSortComparator(g)), l[E] = new Set($);
+        const E = getSeparatorKey("key", _), x = Array.from(l[E]);
+        x.length > 1 && x.sort(createGroupSortComparator(g)), l[E] = new Set(x);
       });
     }
     let u = 1, f = Math.max(...s), d = Math.min(...s);
@@ -8740,45 +8744,45 @@ 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 $ = l[E];
-        return g + $.length;
+        let x = l[E];
+        return g + x.length;
       }, 0);
     } else
       u = i.length;
     for (let m = 0; m < a.length; m++) {
-      const g = a[m], _ = t.findIndex(($) => $.index === o.index);
+      const g = a[m], _ = t.findIndex((x) => x.index === o.index);
       if (m === 0) {
-        const $ = {
+        const x = {
           ...o,
           loop: !1
-        }, y = Array.from({ length: u }, () => cloneDeep($));
+        }, y = Array.from({ length: u }, () => cloneDeep(x));
         t.splice(_, 1, ...y);
       }
       let E = r[g.row];
       if (E && Array.isArray(E)) {
-        let $ = [];
+        let x = [];
         if (s.includes(m)) {
           const y = getSeparatorKey("key", g.row);
           Array.from(l[y]).forEach((C, w) => {
-            const b = p && m === f ? 1 : getGroupMinChildrenLength(l, C, f, p, s), N = l[C], R = N[N.length - 1], A = getSeparatorKey("data", C), k = l[A];
-            let F = {
+            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];
+            let U = {
               ...g,
-              text: R,
-              colSpan: b,
-              colData: k
+              text: A,
+              colSpan: $,
+              colData: N
             };
-            if ($.push(F), b > 1) {
+            if (x.push(U), $ > 1) {
               let L = {
                 ...g,
-                text: R,
+                text: A,
                 type: "",
                 colSpan: 0,
                 rowSpan: 0
               };
-              for (let O = 0; O < b - 1; O++)
-                $.push(L);
+              for (let M = 0; M < $ - 1; M++)
+                x.push(L);
             }
-          }), E.splice(g.col, 1, ...$);
+          }), E.splice(g.col, 1, ...x);
         } else {
           if (m > d && m < f) {
             let y = findMaxLessThan(s, m);
@@ -8800,34 +8804,34 @@ 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((N) => a[N].data.replace("col:", "").toUpperCase()), b = [];
-              v.forEach((N, R) => {
-                let A = {
+              let w = s.map((I) => a[I].data.replace("col:", "").toUpperCase()), $ = [];
+              v.forEach((I, A) => {
+                let O = {
                   ...g,
                   combineKeys: w,
-                  combineValues: l[N],
-                  colGroupIndex: R
+                  combineValues: l[I],
+                  colGroupIndex: A
                 };
-                b.push(A);
-              }), E.splice(g.col, 1, ...b);
+                $.push(O);
+              }), E.splice(g.col, 1, ...$);
             } else if (v.length)
-              v.forEach((w, b) => {
-                let N = [];
-                const R = getSeparatorKey("data", w);
-                l[R].forEach((k) => {
-                  let F = {
+              v.forEach((w, $) => {
+                let I = [];
+                const A = getSeparatorKey("data", w);
+                l[A].forEach((N) => {
+                  let U = {
                     ...g
                   };
-                  delete F.combineKeys, delete F.combineValues, delete F.isRowColCombine, k[C] !== void 0 ? (F.rawData = k[C], F.colData = k) : F.rawData = "", N.push(F);
-                }), E.splice(g.col, 1, ...N);
+                  delete U.combineKeys, delete U.combineValues, delete U.isRowColCombine, N[C] !== void 0 ? (U.rawData = N[C], U.colData = N) : U.rawData = "", I.push(U);
+                }), E.splice(g.col, 1, ...I);
               });
             else {
               let w = [];
-              i.forEach((b) => {
-                let N = {
+              i.forEach(($) => {
+                let I = {
                   ...g
                 };
-                delete N.combineKeys, delete N.combineValues, delete N.isRowColCombine, b[C] !== void 0 ? (N.rawData = b[C], N.colData = b) : N.rawData = "", w.push(N);
+                delete I.combineKeys, delete I.combineValues, delete I.isRowColCombine, $[C] !== void 0 ? (I.rawData = $[C], I.colData = $) : I.rawData = "", w.push(I);
               }), E.splice(g.col, 1, ...w);
             }
           } else if (g.type === CellType.FUN && p && g.colSpan !== 0) {
@@ -8845,8 +8849,8 @@ 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, b] = g.mergeTarget, N = r.reduce((R, A) => R.concat(A), []).filter((R) => R.row === w && R.col === b)[0];
-              N && (N.colSpan += u - 1);
+              let [w, $] = g.mergeTarget, I = r.reduce((A, O) => A.concat(O), []).filter((A) => A.row === w && A.col === $)[0];
+              I && (I.colSpan += u - 1);
             } else (!Array.isArray(g.mergeTarget) || g.mergeTarget.length !== 2) && (y.colSpan = u);
             const v = {
               ...g,
@@ -8967,11 +8971,11 @@ function getGroupData(t, e, r) {
         const m = getSeparatorKey("child", u, p);
         let _ = (n[m] || []).map((E) => {
           if (c) {
-            let $ = E[c];
-            $ || ($ = "[" + c + "]");
+            let x = E[c];
+            x || (x = "[" + c + "]");
             let y = !1;
-            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;
+            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;
           }
         }).filter((E) => !!E);
         n[m] = _;
@@ -9023,56 +9027,56 @@ 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 $ = u[E];
+    let x = 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((b, N) => {
-        let R;
-        E === s && (i || a) ? R = 1 : R = getGroupMinChildrenLength(n, b, s, a, i);
-        const A = n[b], k = A[A.length - 1], F = getSeparatorKey("data", b);
-        n[F];
+      v.forEach(($, 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", $);
+        n[U];
         let L = {
           ..._,
           text: "",
-          index: N,
-          rowSpan: R,
-          rawData: formatGroupText(k),
+          index: I,
+          rowSpan: A,
+          rawData: formatGroupText(N),
           groupLevel: w,
-          groupIndices: N,
+          groupIndices: I,
           groupChildIndex: 0,
           computedType: ComputedType.loopRow
         };
-        $.push(L);
-        let O = {
+        x.push(L);
+        let M = {
           ..._,
           text: "",
-          rawData: formatGroupText(k),
+          rawData: formatGroupText(N),
           colSpan: 0,
           rowSpan: 0,
           groupLevel: w,
-          groupIndices: N,
+          groupIndices: I,
           computedType: ComputedType.loopRow,
           mergeTarget: [L.row, L.col]
         };
-        for (let x = 0; x < R - 1; x++) {
-          let D = cloneDeep(O);
-          D.index = C + x + 1, D.groupChildIndex = x + 1, $.push(D);
+        for (let T = 0; T < A - 1; T++) {
+          let b = cloneDeep(M);
+          b.index = C + T + 1, b.groupChildIndex = T + 1, x.push(b);
         }
-        if (g[E] = !0, C += R, L.loopGroupRowIndex !== void 0 && L.loopGroupRowIndex !== "" && !isNaN(L.loopGroupRowIndex)) {
-          let x = cloneDeep(l[L.loopGroupRowIndex]), D = cloneDeep(c[L.loopGroupRowIndex]).map((S) => (S.type === CellType.FUN && S.fun && (S.groupIndices = N, S.groupLevel = w, S.computedType = ComputedType.loopGroup), S)), T = 0;
+        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;
           if (w >= 0) {
             let S = w;
             for (; S >= 0; ) {
-              let I = e[S], j = u[I][C];
-              j && j.groupIndices !== void 0 && !isNaN(j.groupIndices) && (T = T + j.groupIndices), S--;
+              let R = e[S], G = u[R][C];
+              G && G.groupIndices !== void 0 && !isNaN(G.groupIndices) && (D = D + G.groupIndices), S--;
             }
           }
-          f.set(`${N}:${w}:${C}`, {
-            row: x,
-            cells: D,
-            removeCount: T
+          f.set(`${I}:${w}:${C}`, {
+            row: T,
+            cells: b,
+            removeCount: D
           });
         }
       });
@@ -9081,38 +9085,38 @@ 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, b) => {
-          const N = getSeparatorKey("child", s, w);
-          let R = n[N], A = _.combineKeys ? _.combineKeys.map((L, O) => {
-            const x = _.combineValues ? _.combineValues[O] : void 0;
+        C.length ? C.forEach((w, $) => {
+          const I = getSeparatorKey("child", s, w);
+          let A = n[I], O = _.combineKeys ? _.combineKeys.map((L, M) => {
+            const T = _.combineValues ? _.combineValues[M] : void 0;
             return {
               key: L,
-              val: x
+              val: T
             };
           }) : [];
-          const k = R.filter((L) => A.every((O) => L[O.key] === O.val));
-          let F = {
+          const N = A.filter((L) => O.every((M) => L[M.key] === M.val));
+          let U = {
             ..._,
-            index: b
+            index: $
           };
-          if (delete F.combineKeys, delete F.combineValues, delete F.isRowColCombine, k && k.length) {
-            const L = k.map((O) => y ? O[y] : void 0);
-            F.rawData = _.mergedValueAggregation ? aggregateMergedValues(L, _.mergedValueAggregation) : k[0][y], F.rowData = k[0];
+          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
-            F.rawData = "", F.rowData = {};
-          $.push(F);
-        }) : r.forEach((w, b) => {
-          let R = (_.combineKeys ? _.combineKeys.map((k, F) => {
-            const L = _.combineValues ? _.combineValues[F] : void 0;
+            U.rawData = "", U.rowData = {};
+          x.push(U);
+        }) : r.forEach((w, $) => {
+          let A = (_.combineKeys ? _.combineKeys.map((N, U) => {
+            const L = _.combineValues ? _.combineValues[U] : void 0;
             return {
-              key: k,
+              key: N,
               val: L
             };
-          }) : []).every((k) => w[k.key] === k.val), A = {
+          }) : []).every((N) => w[N.key] === N.val), O = {
             ..._,
-            index: b
+            index: $
           };
-          delete A.combineKeys, delete A.combineValues, delete A.isRowColCombine, R ? (A.rawData = y ? w[y] : "", A.rowData = w) : (A.rawData = "", A.rowData = w), A.type === CellType.FUN && A.fun && (A.computedType = ComputedType.loopRow), $.push(A);
+          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);
         });
       } else if (e.length === 0)
         r.forEach((v, C) => {
@@ -9120,60 +9124,60 @@ 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, $.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, x.push(w);
         });
       else {
         const v = getSeparatorKey("key", s);
         let C = n[v] ? Array.from(n[v]) : [];
         if (C.length === 0) {
-          r.forEach((b, N) => {
-            let R = {
-              index: N,
+          r.forEach(($, I) => {
+            let A = {
+              index: I,
               ..._
             };
-            delete R.combineKeys, delete R.combineValues, delete R.isRowColCombine, y && b[y] !== void 0 ? R.rawData = b[y] : R.rawData = "", R.rowData = b, R.computedType = ComputedType.loopRow, $.push(R);
+            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);
           });
           return;
         }
         const w = [];
-        if (C.forEach((b, N) => {
+        if (C.forEach(($, I) => {
           if (a) {
-            const R = getSeparatorKey("child", s, b);
-            let A = n[R] || [];
-            w.push(A);
+            const A = getSeparatorKey("child", s, $);
+            let O = n[A] || [];
+            w.push(O);
           } else {
-            const R = getSeparatorKey("child", s, b);
-            let A = n[R] || [];
-            const k = i ? A.slice(0, 1) : A;
-            A.length > 0 ? k.forEach((F) => {
+            const A = getSeparatorKey("child", s, $);
+            let O = n[A] || [];
+            const N = i ? O.slice(0, 1) : O;
+            O.length > 0 ? N.forEach((U) => {
               let L = {
-                index: N,
+                index: I,
                 ..._,
                 // 交叉表：函数格按当前行组聚合裂变列实例（供 jsep 按 groupIndices 过滤取值）
                 isCrossAggregate: i
               };
-              delete L.combineKeys, delete L.combineValues, delete L.isRowColCombine, y && F && F[y] !== void 0 ? L.rawData = F[y] : L.rawData = "", L.rowData = F, L.computedType = ComputedType.loopRow, $.push(L);
-            }) : $.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, x.push(L);
+            }) : x.push({
               index: 0,
               ..._,
               isCrossAggregate: i
             });
           }
         }), a) {
-          const b = Math.max(...w.map((R) => R.length));
+          const $ = Math.max(...w.map((A) => A.length));
           p || (p = {
-            count: b,
+            count: $,
             row: _.row,
             index: E
           });
-          const N = {
+          const I = {
             colIndex: E,
-            maxCount: b,
+            maxCount: $,
             groupColumnLoopItems: w,
             dataKey: _.data ? _.data.replace("row:", "").toUpperCase() : void 0,
             cell: _
           };
-          m.push(N);
+          m.push(I);
         }
       }
     } else if (_.isMergeInLoop !== !1) {
@@ -9183,8 +9187,8 @@ function generateRowStructure(t, e, r, n, o, i, a, s, l, c) {
         index: 0
       };
       if (_.rowSpan === 0 && _.mergeTarget && _.mergeTarget.length === 2) {
-        let [b, N] = _.mergeTarget, R = c.reduce((A, k) => A.concat(k), []).filter((A) => A.row === b && A.col === N)[0];
-        R && (R.rowSpan += o - 1);
+        let [$, I] = _.mergeTarget, A = c.reduce((O, N) => O.concat(N), []).filter((O) => O.row === $ && O.col === I)[0];
+        A && (A.rowSpan += o - 1);
       } else
         v.rowSpan += o - 1;
       const C = {
@@ -9195,23 +9199,23 @@ function generateRowStructure(t, e, r, n, o, i, a, s, l, c) {
       };
       delete v.isRowColCombine;
       let w = Array.from({ length: o - 1 }, () => cloneDeep(C));
-      $.push(v, ...w);
+      x.push(v, ...w);
     } else if ((i || a) && e.length > 0) {
       const v = getSeparatorKey("key", s);
-      (n[v] ? Array.from(n[v]) : []).forEach((w, b) => {
-        const N = getSeparatorKey("data", w), R = n[N];
-        $.push({
-          index: b,
+      (n[v] ? Array.from(n[v]) : []).forEach((w, $) => {
+        const I = getSeparatorKey("data", w), A = n[I];
+        x.push({
+          index: $,
           ..._,
           computedType: ComputedType.loopRow,
           rowSpan: 1,
           colSpan: 1,
-          rowData: R ? R[0] : void 0
+          rowData: A ? A[0] : void 0
         });
       });
     } else if (e.length > 0)
       for (let v = 0; v < o; v++)
-        $.push({
+        x.push({
           index: v,
           ..._,
           computedType: ComputedType.loopRow,
@@ -9221,7 +9225,7 @@ function generateRowStructure(t, e, r, n, o, i, a, s, l, c) {
         });
     else
       r.forEach((v, C) => {
-        $.push({
+        x.push({
           index: C,
           ..._,
           computedType: ComputedType.loopRow,
@@ -9230,16 +9234,16 @@ function generateRowStructure(t, e, r, n, o, i, a, s, l, c) {
           rowData: v
         });
       });
-  }), a && m.length > 0 && m.forEach(({ colIndex: _, maxCount: E, cell: $, groupColumnLoopItems: y, dataKey: v }) => {
+  }), a && m.length > 0 && m.forEach(({ colIndex: _, maxCount: E, cell: x, groupColumnLoopItems: y, dataKey: v }) => {
     for (let C = 0; C < E; C++) {
       const w = [];
-      y.forEach((b, N) => {
-        const R = b[C];
-        let A = {
-          index: N,
-          ...$
+      y.forEach(($, I) => {
+        const A = $[C];
+        let O = {
+          index: I,
+          ...x
         };
-        delete A.combineKeys, delete A.combineValues, delete A.isRowColCombine, v && R && R[v] !== void 0 ? (A.rawData = R[v], A.rowData = R) : (A.rawData = "", A.rowData = R || {}), A.computedType = ComputedType.loopRow, w.push(A);
+        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);
     }
   }), {
@@ -9253,69 +9257,69 @@ function loopGroupRows(t, e, r, n, o) {
     let s = e[a], l = o[s.data];
     if (!l || !l.length)
       continue;
-    let c = t.findIndex((b) => b.index === s.index), u = r[c], f = findGroupIndexs(u), d = getGroupData(f, u, l);
+    let c = t.findIndex(($) => $.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
-    }, $ = [], { rowBaseCols: y, loopGroupRows: v, groupColumnLoopData: C } = generateRowStructure(u, f, l, d, p, m, g, _, t, r);
+    }, x = [], { rowBaseCols: y, loopGroupRows: v, groupColumnLoopData: C } = generateRowStructure(u, f, l, d, p, m, g, _, t, r);
     let w = transpose(y);
     if (w.forEach(() => {
-      $.push(cloneDeep(E));
-    }), v.forEach(({ row: b, cells: N, removeCount: R }, A) => {
-      let [k, F, L] = A.split(":").map((T) => parseInt(T));
-      b.isLoopGroupComputed = !1;
-      const O = L + R;
-      let x = w[O];
-      N = N.map((T, S) => {
-        let I = x[S];
-        if (S < F) {
-          let B = [];
-          w.forEach((Z, Q) => {
-            Q <= O && Z.forEach((ee, ie) => {
-              ie === S && ee.rowSpan >= 1 && ["", "field"].includes(ee.type) && B.push(Q);
+      x.push(cloneDeep(E));
+    }), v.forEach(({ row: $, cells: I, removeCount: A }, O) => {
+      let [N, U, L] = O.split(":").map((D) => parseInt(D));
+      $.isLoopGroupComputed = !1;
+      const M = L + A;
+      let T = w[M];
+      I = I.map((D, S) => {
+        let R = T[S];
+        if (S < U) {
+          let k = [];
+          w.forEach((ee, J) => {
+            J <= M && ee.forEach((ne, ae) => {
+              ae === S && ne.rowSpan >= 1 && ["", "field"].includes(ne.type) && k.push(J);
             });
           });
-          let j = Math.max(...B), X = w[j][S];
-          X && (X.rowSpan += 1, T.mergeTarget = [X.row, X.col]), T.rowSpan = 0, T.colSpan = 0;
-        } else if (I && I.type === CellType.TEXT) {
-          let B = w[0][S];
-          B.rowSpan += 1, T.rowSpan = 0, T.colSpan = 0, T.mergeTarget = [B.row, B.col];
+          let G = Math.max(...k), W = w[G][S];
+          W && (W.rowSpan += 1, D.mergeTarget = [W.row, W.col]), D.rowSpan = 0, D.colSpan = 0;
+        } else if (R && R.type === CellType.TEXT) {
+          let k = w[0][S];
+          k.rowSpan += 1, D.rowSpan = 0, D.colSpan = 0, D.mergeTarget = [k.row, k.col];
         }
-        return T.type === CellType.FUN && T.fun && (T.computedType = ComputedType.loopGroup), T.isGroup = I ? !!I.isGroup : !1, T.groupIndices = I ? I.groupIndices : !1, T.linkedMergeCell = I ? !!I.linkedMergeCell : !1, T.linkedColIndex = I ? I.linkedColIndex : { rowSpan: 1, colSpan: 1 }, T.isLoopGroupComputedCell = !0, T;
+        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 D = O + 1;
-      $.splice(D, 0, b), w.splice(D, 0, N);
-    }), w = mergeSameCells(w), w.forEach((b, N) => {
-      let R = [];
-      b.forEach((A) => {
-        A && A.groupIndices !== void 0 && !isNaN(A.groupIndices) && R.push(A.groupIndices);
-      }), R.length > 0 && b.forEach((A) => {
-        A && (A.groupIndices = R);
+      const b = M + 1;
+      x.splice(b, 0, $), w.splice(b, 0, I);
+    }), w = mergeSameCells(w), w.forEach(($, I) => {
+      let A = [];
+      $.forEach((O) => {
+        O && O.groupIndices !== void 0 && !isNaN(O.groupIndices) && A.push(O.groupIndices);
+      }), A.length > 0 && $.forEach((O) => {
+        O && (O.groupIndices = A);
       });
-    }), t.splice(c, 1, ...$), r.splice(c, 1, ...w), C) {
-      const { index: b, count: N } = C, R = n[b], A = [];
-      for (let F = 0; F < N; F++)
-        A.push(cloneDeep(R));
-      n.splice(b, 1, ...A);
-      for (let F = 0; F < c; F++) {
-        const L = r[F], O = [];
-        for (let x = 0; x < N; x++) {
-          const D = cloneDeep(L[b]);
-          x === 0 ? D.colSpan = N : (D.colSpan = 0, D.mergeTarget = [D.row, b]), O.push(D);
+    }), t.splice(c, 1, ...x), r.splice(c, 1, ...w), C) {
+      const { index: $, count: I } = C, A = n[$], O = [];
+      for (let U = 0; U < I; U++)
+        O.push(cloneDeep(A));
+      n.splice($, 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);
         }
-        L.splice(b, L.length - b, ...O);
+        L.splice($, L.length - $, ...M);
       }
-      const k = c + w.length;
-      for (let F = k; F < r.length; F++) {
-        const L = r[F], O = [];
-        for (let x = 0; x < N; x++) {
-          const D = cloneDeep(L[b]);
-          x === 0 ? D.colSpan = N : (D.colSpan = 0, D.mergeTarget = [D.row, b]), O.push(D);
+      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);
         }
-        L.splice(b, L.length - b, ...O);
+        L.splice($, L.length - $, ...M);
       }
     }
   }
@@ -9466,7 +9470,7 @@ function formatText(t, e) {
 }
 function formatNumber(t, e) {
   let r = Number(t);
-  return e.decimal && (r = parseFloat(r.toFixed(parseInt(e.decimal)))), r;
+  return e.decimal && (r = parseFloat(new Decimal(r).toFixed(parseInt(e.decimal)))), r;
 }
 function formatDateTime(t, e) {
   try {
@@ -9657,10 +9661,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 $ of s)
-    g.push({ ...$.row }), _.push(cloneDeep(a[$.index]));
-  for (const $ of e)
-    o[$].isFixed || (g.push({ ...o[$] }), _.push(cloneDeep(a[$])));
+  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])));
   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;
 }
@@ -9852,8 +9856,8 @@ async function paginate(t, e, r, n) {
       }
       const _ = createReportSplitState(g.reportConfig, g.themeColor, { ...s, theme: g.theme });
       await m();
-      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(_));
+      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(_));
     }
     await m(), await p();
   } else {
@@ -9865,11 +9869,11 @@ async function paginate(t, e, r, n) {
         continue;
       }
       if (E.kind === "image") {
-        let w = E.width, b = E.height;
-        E.stretch && w > 0 && (b = Math.round(b * (a / w)), w = a), _.push({ type: "image", dom: createImageDom(E.src, w, b) });
+        let w = E.width, $ = E.height;
+        E.stretch && w > 0 && ($ = Math.round($ * (a / w)), w = a), _.push({ type: "image", dom: createImageDom(E.src, w, $) });
         continue;
       }
-      const { rowConfig: $, colConfig: y, config: v } = E.reportConfig, C = renderReportByDomForPrint($, y, v, E.themeColor, E.theme);
+      const { rowConfig: x, colConfig: y, config: v } = E.reportConfig, C = renderReportByDomForPrint(x, y, v, E.themeColor, E.theme);
       _.push({ type: "report", dom: C });
     }
     l.push({ items: _ });
@@ -10017,7 +10021,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), $ = 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), b = e.subtract(30, "day").format(t), N = e.subtract(2, "week").startOf("week").format(t), R = e.subtract(2, "month").format(t), A = e.subtract(3, "month").format(t), k = e.subtract(6, "month").format(t), F = e.subtract(1, "year").startOf("year").format(t), L = e.subtract(2, "year").startOf("year").format(t), O = e.subtract(3, "year").format(t), x = 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), 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);
   return {
     dateFormat: t,
     thisDayStart: r,
@@ -10036,20 +10040,20 @@ function getDateRanges() {
     thisYearEnd: g,
     lastYearStart: _,
     lastYearEnd: E,
-    now: $,
+    now: x,
     twoDay: y,
     threeDay: v,
     sevenDay: C,
     fifteenDay: w,
-    thirtyDay: b,
-    twoWeek: N,
-    twoMonth: R,
-    threeMonth: A,
-    sixMonth: k,
-    oneYear: F,
+    thirtyDay: $,
+    twoWeek: I,
+    twoMonth: A,
+    threeMonth: O,
+    sixMonth: N,
+    oneYear: U,
     twoYear: L,
-    threeYear: O,
-    fiveYear: x
+    threeYear: M,
+    fiveYear: T
   };
 }
 function componentTransition(t, e = "date") {
@@ -10109,36 +10113,36 @@ 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: $, lastYearEnd: y, now: v, twoDay: C, threeDay: w, sevenDay: b, fifteenDay: N, thirtyDay: R, twoWeek: A, twoMonth: k, threeMonth: F, sixMonth: L, oneYear: O, twoYear: x, threeYear: D, fiveYear: T } = getDateRanges(), S = ref([]), I = ref([]), B = computed(() => {
-      let M = reactive({});
-      return I.value.forEach((H) => {
-        M[H.columnName] = H;
-      }), M;
+    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(() => {
+      let B = reactive({});
+      return R.value.forEach((V) => {
+        B[V.columnName] = V;
+      }), B;
     });
-    let j = !1;
+    let G = !1;
     watch(
       () => n.config,
       () => {
-        X();
+        W();
       },
       {
         immediate: !0,
         deep: !0
       }
     );
-    function X() {
-      j = !1;
-      let M = [];
+    function W() {
+      G = !1;
+      let B = [];
       S.value = [];
-      const H = [];
+      const V = [];
       if (n.config && n.config.length)
         for (let z = 0; z < n.config.length; z++) {
-          const te = cloneDeep(n.config[z]);
-          let { dataType: K, dateType: oe, type: ne, selectorId: ce, remoteSearch: le, cellIndex: fe, cellIndexSort: _e, cellIndexSortOrder: ge, cellIndexSortNumeric: me, name: he, columnName: pe, defaultValue: Ee, isNull: Ce } = te, ve = [DataSourceColumnDataType.DATE, DataSourceColumnDataType.DATETIME].includes(K);
-          const { componentName: be, placeholerPrefix: we, type: $e } = componentTransition(K, oe);
+          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);
           let ye = {
-            ...te,
-            elWidth: te.elWidth || 210,
+            ...Q,
+            elWidth: Q.elWidth || 210,
             formItemType: be,
             placeholder: rct(we + he || pe),
             type: $e || "",
@@ -10147,50 +10151,50 @@ const _hoisted_1$6 = { class: "yh-report-view-conditions" }, _sfc_main$7 = /* @_
             shiftSegments: [],
             shiftValue: ""
           };
-          if (ye.shiftSegments = oe === DataParamDateTypes.DATE ? parseShiftConfig(te.shifts) : [], ye.value = Q(ye, ve), S.value.push({
+          if (ye.shiftSegments = oe === DataParamDateTypes.DATE ? parseShiftConfig(Q.shifts) : [], ye.value = J(ye, ve), S.value.push({
             name: pe,
             value: ye.value,
-            type: ne,
+            type: te,
             isNull: Ce
-          }), te.customOptions)
-            ye.optionData = te.customOptions.split(",").map((de) => de.trim()).filter(Boolean).map((de) => ({ label: de, value: de }));
+          }), Q.customOptions)
+            ye.optionData = Q.customOptions.split(",").map((de) => de.trim()).filter(Boolean).map((de) => ({ label: de, value: de }));
           else if (ce) {
-            const de = ae(ce, ye, "", le);
-            le || H.push(de);
+            const de = ie(ce, ye, "", le);
+            le || V.push(de);
           } 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));
               }
-              ye.optionData = de, triggerRef(I);
+              ye.optionData = de, triggerRef(R);
             }
           }));
-          M.push(ye), ne === "LT_GT_EQ" && !ve && U(ye, M, we, ne);
+          B.push(ye), te === "LT_GT_EQ" && !ve && F(ye, B, we, te);
         }
-      I.value = M, Z(), nextTick(async () => {
-        H.length > 0 && await Promise.allSettled(H), j || J();
+      R.value = B, ee(), nextTick(async () => {
+        V.length > 0 && await Promise.allSettled(V), G || Z();
       });
     }
-    function Z() {
-      Object.entries(i.query).forEach(([M, H]) => {
-        if (!M || H === null || H === void 0 || H === "") return;
-        const z = Array.isArray(H) ? H.join(",") : H, te = S.value.findIndex((K) => K.name === M);
-        if (te > -1) {
-          if (M.indexOf("end_") === 0) {
-            S.value[te].value = z;
-            const K = I.value.find((oe) => oe.columnName === M);
-            K && (K.value = z);
+    function ee() {
+      Object.entries(i.query).forEach(([B, V]) => {
+        if (!B || V === null || V === void 0 || V === "") return;
+        const z = Array.isArray(V) ? V.join(",") : V, Q = S.value.findIndex((Y) => Y.name === B);
+        if (Q > -1) {
+          if (B.indexOf("end_") === 0) {
+            S.value[Q].value = z;
+            const Y = R.value.find((oe) => oe.columnName === B);
+            Y && (Y.value = z);
           }
           return;
         }
-        S.value.push({ name: M, value: z, type: "EQ", isNull: !1 });
+        S.value.push({ name: B, value: z, type: "EQ", isNull: !1 });
       });
     }
-    function Q(M, H) {
-      let { dataType: z, dateType: te, defaultValue: K, startTime: oe, endTime: ne, columnName: ce } = M, le = K || "";
-      if (H && K)
-        te && (M.type = te), te && DATE_RANGE_TYPES.includes(te) ? le = ee(K, oe, ne) : le = ie(te, K, oe);
+    function J(B, V) {
+      let { dataType: z, dateType: Q, defaultValue: Y, startTime: oe, endTime: te, columnName: ce } = B, le = Y || "";
+      if (V && Y)
+        Q && (B.type = Q), Q && DATE_RANGE_TYPES.includes(Q) ? le = ne(Y, oe, te) : le = ae(Q, Y, oe);
       else if ([DataSourceColumnDataType.LIST, DataSourceColumnDataType.TABLE].includes(z)) {
         if (Array.isArray(le))
           return le;
@@ -10202,250 +10206,250 @@ const _hoisted_1$6 = { class: "yh-report-view-conditions" }, _sfc_main$7 = /* @_
         i.query[ce] && (le = i.query[ce]);
       return le;
     }
-    function ee(M, H, z) {
-      let K = {
+    function ne(B, V, z) {
+      let Y = {
         thisDay: [s, l],
         thisMonth: [u, f],
         lastMonth: [d, p],
         thisYear: [_, E],
-        lastYear: [$, y],
+        lastYear: [x, y],
         now: [s, v],
         twoDay: [C, v],
         threeDay: [w, v],
-        sevenDay: [b, v],
-        fifteenDay: [N, v],
-        thirtyDay: [R, v],
-        threeMonth: [F, v],
+        sevenDay: [$, v],
+        fifteenDay: [I, v],
+        thirtyDay: [A, v],
+        threeMonth: [U, v],
         sixMonth: [L, v],
-        oneYear: [O, v],
-        twoYear: [x, v],
-        threeYear: [D, v],
-        fiveYear: [T, v]
-      }[M] || [s, l];
-      return H && (K[0] = re(K[0], H, a)), z && (K[1] = re(K[1], z, a)), K;
-    }
-    function ie(M, H, z) {
-      let K = {
+        oneYear: [M, v],
+        twoYear: [T, v],
+        threeYear: [b, v],
+        fiveYear: [D, v]
+      }[B] || [s, l];
+      return V && (Y[0] = re(Y[0], V, a)), z && (Y[1] = re(Y[1], z, a)), Y;
+    }
+    function ae(B, V, z) {
+      let Y = {
         thisYear: _,
-        twoYear: x,
-        threeYear: D,
-        fiveYear: T,
+        twoYear: T,
+        threeYear: b,
+        fiveYear: D,
         thisMonth: u,
-        twoMonth: k,
-        threeMonth: F,
+        twoMonth: N,
+        threeMonth: U,
         sixMonth: L,
         thisWeek: c,
-        twoWeek: A,
+        twoWeek: O,
         thisQuarter: m,
         lastQuarter: g,
         now: v,
         thisDay: s,
         twoDay: C,
         threeDay: w,
-        sevenDay: b,
-        fifteenDay: N,
-        thirtyDay: R
-      }[H];
-      if (!K) {
-        let oe = dayjs().startOf(M);
-        oe.isValid() ? K = oe.format(a) : K = v;
+        sevenDay: $,
+        fifteenDay: I,
+        thirtyDay: A
+      }[V];
+      if (!Y) {
+        let oe = dayjs().startOf(B);
+        oe.isValid() ? Y = oe.format(a) : Y = v;
       }
-      return z && (K = re(K, z, a)), K;
+      return z && (Y = re(Y, z, a)), Y;
     }
-    function ae(M, H, z = "", te = !1) {
+    function ie(B, V, z = "", Q = !1) {
       return axios.request({
         url: "/sysSelector/list",
         method: "POST",
-        data: { id: M, f_value: z, remote: te }
-      }).then((K) => {
-        K.data && Array.isArray(K.data.data) && (H.optionData = K.data.data.map(({ NAME: oe, VALUE: ne }) => ({
+        data: { id: B, f_value: z, remote: Q }
+      }).then((Y) => {
+        Y.data && Array.isArray(Y.data.data) && (V.optionData = Y.data.data.map(({ NAME: oe, VALUE: te }) => ({
           label: oe,
-          value: ne
-        })), triggerRef(I));
-      }).catch((K) => {
-        console.warn(`选择器 ${M} 数据加载失败:`, K), H.optionData = [];
+          value: te
+        })), triggerRef(R));
+      }).catch((Y) => {
+        console.warn(`选择器 ${B} 数据加载失败:`, Y), V.optionData = [];
       });
     }
-    function se(M, H) {
-      H.selectorId && (H.selectorLoading = !0, axios.request({
+    function se(B, V) {
+      V.selectorId && (V.selectorLoading = !0, axios.request({
         url: "/sysSelector/list",
         method: "POST",
-        data: { id: H.selectorId, f_value: M, remote: !0 }
+        data: { id: V.selectorId, f_value: B, remote: !0 }
       }).then((z) => {
-        z.data && Array.isArray(z.data.data) && (H.optionData = z.data.data.map(({ NAME: te, VALUE: K }) => ({
-          label: te,
-          value: K
+        z.data && Array.isArray(z.data.data) && (V.optionData = z.data.data.map(({ NAME: Q, VALUE: Y }) => ({
+          label: Q,
+          value: Y
         })));
       }).finally(() => {
-        H.selectorLoading = !1, triggerRef(I);
+        V.selectorLoading = !1, triggerRef(R);
       }));
     }
-    function U(M, H, z, te) {
-      const { columnName: K, defaultValue: oe, isNull: ne } = M;
-      M.placeholder = rct(z + "开始");
-      const ce = cloneDeep(M);
-      ce.name = "-", ce.columnName = `end_${K}`, ce.placeholder = rct(z + "结束");
+    function F(B, V, z, Q) {
+      const { columnName: Y, defaultValue: oe, isNull: te } = B;
+      B.placeholder = rct(z + "开始");
+      const ce = cloneDeep(B);
+      ce.name = "-", ce.columnName = `end_${Y}`, ce.placeholder = rct(z + "结束");
       let le = oe || "";
       S.value.push({
-        name: `end_${K}`,
+        name: `end_${Y}`,
         value: le,
-        type: te,
-        isNull: ne
-      }), M.selectorId && ae(M.selectorId, ce, "", !!M.remoteSearch), H.push(ce);
+        type: Q,
+        isNull: te
+      }), B.selectorId && ie(B.selectorId, ce, "", !!B.remoteSearch), V.push(ce);
     }
-    function G(M) {
+    function H(B) {
       return {
-        label: rct(M.name),
-        required: M.isNull,
-        style: M.columnName.indexOf("end_") > -1 ? { marginLeft: "-22px" } : {}
+        label: rct(B.name),
+        required: B.isNull,
+        style: B.columnName.indexOf("end_") > -1 ? { marginLeft: "-22px" } : {}
       };
     }
-    function V(M) {
-      const H = {
-        modelValue: M.value,
-        type: M.type,
+    function j(B) {
+      const V = {
+        modelValue: B.value,
+        type: B.type,
         clearable: !0,
-        placeholder: M.placeholder,
-        "onUpdate:modelValue": (z) => Y(z, M)
+        placeholder: B.placeholder,
+        "onUpdate:modelValue": (z) => q(z, B)
       };
-      return M.formItemType === "ElDatePicker" && (H["value-format"] = a, DATE_RANGE_TYPES.includes(M.type) && (H.unlinkPanels = !0, H.singlePanel = !!M.singlePanel), DATE_VIEW_FORMAT[M.type] && (H.format = DATE_VIEW_FORMAT[M.type])), ["ElInput"].includes(M.formItemType) && (H.onBlur = () => q(M, "blur"), H.onKeyup = (z) => {
-        z.key === "Enter" && q(M, "enter");
-      }), ["ElSelect"].includes(M.formItemType) && (H.multiple = !0, H.collapseTags = !0, H.filterable = !0, M.remoteSearch && M.selectorId && (H.remote = !0, H.remoteMethod = (z) => se(z, M), H.loading = M.selectorLoading)), H;
+      return B.formItemType === "ElDatePicker" && (V["value-format"] = a, DATE_RANGE_TYPES.includes(B.type) && (V.unlinkPanels = !0, V.singlePanel = !!B.singlePanel), DATE_VIEW_FORMAT[B.type] && (V.format = DATE_VIEW_FORMAT[B.type])), ["ElInput"].includes(B.formItemType) && (V.onBlur = () => X(B, "blur"), V.onKeyup = (z) => {
+        z.key === "Enter" && X(B, "enter");
+      }), ["ElSelect"].includes(B.formItemType) && (V.multiple = !0, V.collapseTags = !0, V.filterable = !0, B.remoteSearch && B.selectorId && (V.remote = !0, V.remoteMethod = (z) => se(z, B), V.loading = B.selectorLoading)), V;
     }
-    function Y(M, H) {
-      let z = S.value.findIndex((te) => te.name === H.columnName);
-      if (H.value = M, S.value[z].value = M, ["ElSelect", "ElTreeSelect", "ElSwitch", "ElDatePicker", "ElTimePicker", "ElColorPicker"].includes(H.formItemType)) {
+    function q(B, V) {
+      let z = S.value.findIndex((Q) => Q.name === V.columnName);
+      if (V.value = B, S.value[z].value = B, ["ElSelect", "ElTreeSelect", "ElSwitch", "ElDatePicker", "ElTimePicker", "ElColorPicker"].includes(V.formItemType)) {
         if (!n.data.searchOnBlur)
           return !1;
-        j = !0, J();
+        G = !0, Z();
       }
     }
-    function q(M, H) {
-      if (["ElInput", "ElInputNumber"].includes(M.formItemType)) {
-        if (H === "blur" && !n.data.searchOnBlur)
+    function X(B, V) {
+      if (["ElInput", "ElInputNumber"].includes(B.formItemType)) {
+        if (V === "blur" && !n.data.searchOnBlur)
           return !1;
-        j = !0, J();
+        G = !0, Z();
       }
     }
-    function W(M, H) {
-      if (H.shiftValue = M || "", !n.data.searchOnBlur)
+    function K(B, V) {
+      if (V.shiftValue = B || "", !n.data.searchOnBlur)
         return !1;
-      j = !0, J();
+      G = !0, Z();
     }
-    function re(M, H, z) {
-      if (H && M) {
-        let te = H.split(",").map((oe) => {
-          let ne = oe.match(/[-+]/).index, ce = Number(oe.substring(ne)), le = oe.substring(0, ne);
+    function re(B, V, z) {
+      if (V && B) {
+        let Q = V.split(",").map((oe) => {
+          let te = oe.match(/[-+]/).index, ce = Number(oe.substring(te)), le = oe.substring(0, te);
           return {
             count: ce,
             type: le
           };
-        }), K = dayjs(M);
-        K.isValid() && (te.forEach(({ count: oe, type: ne }) => {
-          K = K.add(oe, ne);
-        }), M = K.format(z));
+        }), Y = dayjs(B);
+        Y.isValid() && (Q.forEach(({ count: oe, type: te }) => {
+          Y = Y.add(oe, te);
+        }), B = Y.format(z));
       }
-      return M;
-    }
-    function J() {
-      let M = cloneDeep(S.value);
-      M.forEach(({ name: H, value: z, type: te, isNull: K }, oe) => {
-        let ne = B.value[H];
-        if (!ne) {
-          Array.isArray(z) && (M[oe].value = z.join(","));
+      return B;
+    }
+    function Z() {
+      let B = cloneDeep(S.value);
+      B.forEach(({ name: V, value: z, type: Q, isNull: Y }, oe) => {
+        let te = k.value[V];
+        if (!te) {
+          Array.isArray(z) && (B[oe].value = z.join(","));
           return;
         }
-        if ([DataSourceColumnDataType.DATE, DataSourceColumnDataType.DATETIME].includes(ne.dataType) && z)
-          if (ne.dateType && DATE_RANGE_TYPES.includes(ne.dateType) && z && z.length === 2) {
+        if ([DataSourceColumnDataType.DATE, DataSourceColumnDataType.DATETIME].includes(te.dataType) && z)
+          if (te.dateType && DATE_RANGE_TYPES.includes(te.dateType) && z && z.length === 2) {
             let [fe, _e] = z;
-            const ge = DATE_RANGE_PERIOD_UNIT[ne.dateType];
+            const ge = DATE_RANGE_PERIOD_UNIT[te.dateType];
             if (ge) {
               const he = dayjs(fe), pe = dayjs(_e);
               he.isValid() && (fe = he.startOf(ge).format(a)), pe.isValid() && (_e = pe.endOf(ge).format(a));
             }
-            M[oe].value = fe;
-            let me = `end_${ne.columnName}`;
-            M.some((he) => he.name === me) || M.push({
+            B[oe].value = fe;
+            let me = `end_${te.columnName}`;
+            B.some((he) => he.name === me) || B.push({
               name: me,
               value: _e,
-              type: te,
-              isNull: K
+              type: Q,
+              isNull: Y
             });
           } else {
             let fe = dayjs(z);
-            if (fe.isValid() && ne.dateType) {
-              const _e = ne.shiftValue ? Number(ne.shiftValue) : -1, ge = ne.dateType === DataParamDateTypes.DATE ? (ne.shiftSegments || [])[_e] : void 0;
+            if (fe.isValid() && te.dateType) {
+              const _e = te.shiftValue ? Number(te.shiftValue) : -1, ge = te.dateType === DataParamDateTypes.DATE ? (te.shiftSegments || [])[_e] : void 0;
               if (ge) {
                 const me = fe.startOf("day");
-                M[oe].value = me.add(ge.startMinutes, "minute").format(a);
-                let he = `end_${ne.columnName}`;
-                M.some((pe) => pe.name === he) || M.push({
+                B[oe].value = me.add(ge.startMinutes, "minute").format(a);
+                let he = `end_${te.columnName}`;
+                B.some((pe) => pe.name === he) || B.push({
                   name: he,
                   value: me.add(ge.endMinutes, "minute").format(a),
-                  type: te,
-                  isNull: K
+                  type: Q,
+                  isNull: Y
                 });
               } else {
-                let me = fe.startOf(ne.dateType).format(a);
-                M[oe].value = re(me, ne.startTime, a);
-                let he = fe.endOf(ne.dateType).format(a), pe = `end_${ne.columnName}`;
-                M.some((Ee) => Ee.name === pe) || M.push({
+                let me = fe.startOf(te.dateType).format(a);
+                B[oe].value = re(me, te.startTime, a);
+                let he = fe.endOf(te.dateType).format(a), pe = `end_${te.columnName}`;
+                B.some((Ee) => Ee.name === pe) || B.push({
                   name: pe,
-                  value: re(he, ne.endTime, a),
-                  type: te,
-                  isNull: K
+                  value: re(he, te.endTime, a),
+                  type: Q,
+                  isNull: Y
                 });
               }
             }
           }
-        else Array.isArray(z) && (M[oe].value = z.join(","));
-      }), o("change", M);
+        else Array.isArray(z) && (B[oe].value = z.join(","));
+      }), o("change", B);
     }
     return e({
-      changeValue: J
+      changeValue: Z
     }), onMounted(() => {
-    }), (M, H) => (openBlock(), createElementBlock("div", _hoisted_1$6, [
+    }), (B, V) => (openBlock(), createElementBlock("div", _hoisted_1$6, [
       createVNode(unref(ElForm), { inline: "" }, {
         default: withCtx(() => [
-          (openBlock(!0), createElementBlock(Fragment, null, renderList(I.value, (z) => withDirectives((openBlock(), createBlock(unref(ElFormItem), mergeProps({ ref_for: !0 }, G(z)), {
+          (openBlock(!0), createElementBlock(Fragment, null, renderList(R.value, (z) => withDirectives((openBlock(), createBlock(unref(ElFormItem), mergeProps({ ref_for: !0 }, H(z)), {
             default: withCtx(() => {
-              var te;
+              var Q;
               return [
                 z.formItemType === "ElSelect" ? (openBlock(), createBlock(resolveDynamicComponent(z.formItemType), mergeProps({
                   key: 0,
                   ref_for: !0
-                }, V(z), {
+                }, j(z), {
                   style: { width: `${z.elWidth}px` }
                 }), {
                   default: withCtx(() => [
-                    (openBlock(!0), createElementBlock(Fragment, null, renderList(z.optionData, (K) => (openBlock(), createBlock(unref(ElOption), {
-                      key: K.value,
-                      label: K.label,
-                      value: K.value
+                    (openBlock(!0), createElementBlock(Fragment, null, renderList(z.optionData, (Y) => (openBlock(), createBlock(unref(ElOption), {
+                      key: Y.value,
+                      label: Y.label,
+                      value: Y.value
                     }, null, 8, ["label", "value"]))), 128))
                   ]),
                   _: 2
                 }, 1040, ["style"])) : (openBlock(), createBlock(resolveDynamicComponent(z.formItemType), mergeProps({
                   key: 1,
                   style: { width: `${z.elWidth}px` }
-                }, { ref_for: !0 }, V(z)), null, 16, ["style"])),
-                z.formItemType === "ElDatePicker" && z.type === "date" && ((te = z.shiftSegments) != null && te.length) ? (openBlock(), createBlock(unref(ElSelect), {
+                }, { ref_for: !0 }, j(z)), null, 16, ["style"])),
+                z.formItemType === "ElDatePicker" && z.type === "date" && ((Q = z.shiftSegments) != null && Q.length) ? (openBlock(), createBlock(unref(ElSelect), {
                   key: 2,
                   class: "shift-select",
                   clearable: "",
                   "model-value": z.shiftValue,
                   placeholder: unref(rct)("全部班次"),
-                  onChange: (K) => W(K, z)
+                  onChange: (Y) => K(Y, z)
                 }, {
                   default: withCtx(() => [
                     createVNode(unref(ElOption), {
                       value: "",
                       label: unref(rct)("全部班次")
                     }, null, 8, ["label"]),
-                    (openBlock(!0), createElementBlock(Fragment, null, renderList(z.shiftSegments, (K, oe) => (openBlock(), createBlock(unref(ElOption), {
+                    (openBlock(!0), createElementBlock(Fragment, null, renderList(z.shiftSegments, (Y, oe) => (openBlock(), createBlock(unref(ElOption), {
                       key: oe,
                       value: String(oe),
-                      label: K.label
+                      label: Y.label
                     }, null, 8, ["value", "label"]))), 128))
                   ]),
                   _: 2
@@ -10459,7 +10463,7 @@ const _hoisted_1$6 = { class: "yh-report-view-conditions" }, _sfc_main$7 = /* @_
         ]),
         _: 1
       }),
-      renderSlot(M.$slots, "search")
+      renderSlot(B.$slots, "search")
     ]));
   }
 });
@@ -10492,14 +10496,14 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   },
   emits: ["updateData", "report-error"],
   setup(t, { expose: e, emit: r }) {
-    useCssVars((U) => ({
-      v97ab70c2: _.value.border,
-      v772d91be: _.value.background,
-      v53837a5b: _.value.evenBackground,
-      v103a94a2: _.value.fixedBackground,
-      v19df01e9: _.value.fixedEvenBackground,
-      v3e47fd77: _.value.hoverBackground,
-      v2614906a: _.value.activeColor
+    useCssVars((F) => ({
+      v6890e5fc: _.value.border,
+      e5214204: _.value.background,
+      v5b486bb8: _.value.evenBackground,
+      v2e88201c: _.value.fixedBackground,
+      v2b3b62ac: _.value.fixedEvenBackground,
+      v2f2137ba: _.value.hoverBackground,
+      v7dd3642d: _.value.activeColor
     }));
     const n = t, o = r, i = inject(
       "isPrintMode",
@@ -10508,42 +10512,42 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     let u = null, f = null, d = null;
     const p = shallowRef([]), m = shallowRef([]), g = computed(() => {
       if (i.value && (a != null && a.value)) {
-        const U = a.value;
+        const F = a.value;
         return {
-          width: `${mmToPx(U.width)}px`,
-          padding: `${n.index === 0 ? mmToPx(U.marginTop) : 0}px ${mmToPx(U.marginLeft)}px ${n.index === n.length - 1 ? mmToPx(U.marginBottom) : 0}px ${mmToPx(U.marginLeft)}px`
+          width: `${mmToPx(F.width)}px`,
+          padding: `${n.index === 0 ? mmToPx(F.marginTop) : 0}px ${mmToPx(F.marginLeft)}px ${n.index === n.length - 1 ? mmToPx(F.marginBottom) : 0}px ${mmToPx(F.marginLeft)}px`
         };
       }
       return {
         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), $ = computed(() => n.config.params && Array.isArray(n.config.params) && n.config.params.filter((U) => U.isShow).length > 0), y = reactive({
+    }), _ = 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({
       pageSize: 100,
       pageSizes: [10, 20, 50, 100, 200, 1e4],
       pageIndex: 1,
       total: 0
-    }), v = ref([]), C = ref([]), w = (U) => {
-      let G = 0, V = U;
-      if (U.includes("!")) {
-        let J = U.split("!");
-        G = parseInt(J[0]), V = J[1];
+    }), v = ref([]), C = ref([]), w = (F) => {
+      let H = 0, j = F;
+      if (F.includes("!")) {
+        let Z = F.split("!");
+        H = parseInt(Z[0]), j = Z[1];
       }
-      let Y = V.match(/[A-Z]+/)[0], q = V.match(/\d+/)[0] - 1, W = columnToNumber(Y), re = `${G}:${q}:${W}`;
+      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 b(U) {
-      if (R && n.config.data.autoQuery === !1)
-        return R = !1, !1;
-      v.value = U, y.pageIndex = 1, X();
+    function $(F) {
+      if (A && n.config.data.autoQuery === !1)
+        return A = !1, !1;
+      v.value = F, y.pageIndex = 1, W();
     }
-    let N = !1, R = !0;
+    let I = !1, A = !0;
     watch(
       () => [y.pageSize, y.pageIndex],
-      (U, G) => {
-        if (U && G) {
-          let [V, Y] = U, [q, W] = U;
-          V !== q && (y.pageIndex = 1), N && X();
+      (F, H) => {
+        if (F && H) {
+          let [j, q] = F, [X, K] = F;
+          j !== X && (y.pageIndex = 1), I && W();
         }
       },
       {
@@ -10551,268 +10555,268 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         deep: !0
       }
     );
-    function A() {
-      var U;
-      (U = s.value) == null || U.changeValue();
+    function O() {
+      var F;
+      (F = s.value) == null || F.changeValue();
     }
-    const k = computed(() => n.config.exportMethod === "send" && window.opener), F = computed(() => k.value ? "保存" : "导出");
+    const N = computed(() => n.config.exportMethod === "send" && window.opener), U = computed(() => N.value ? "保存" : "导出");
     async function L() {
       if (p.value && p.value.length) {
-        let U = await exportReport(
+        let F = await exportReport(
           p.value,
           n.name,
           "excel",
           n.config.theme,
           n.config.subReprotIndex
         );
-        if (U === null) {
+        if (F === null) {
           await ElMessageBox.alert("表格导出失败");
           return;
         }
-        n.config.exportMethod === "send" && window.opener ? sendReport(U) : downloadReport(U, n.name, "excel");
+        n.config.exportMethod === "send" && window.opener ? sendReport(F) : downloadReport(F, n.name, "excel");
       } else
         ElMessage.success("配置未完成！");
     }
-    async function O() {
+    async function M(F = !1) {
       if (!(n.config && c.value && n.config.data.source)) return null;
-      if (n.config.data.source.some((q) => q.loopTable) && m.value.length) {
-        const q = [];
-        return m.value.forEach((W) => q.push(...W)), q.length ? q : null;
+      if (n.config.data.source.some((K) => K.loopTable) && m.value.length) {
+        const K = [];
+        return m.value.forEach((re) => K.push(...re)), K.length ? K : null;
       }
-      if (p.value.length)
+      if (!F && p.value.length)
         return [...p.value];
-      let U = [];
+      let H = [];
       try {
-        U = await ae(!1);
-      } catch (q) {
+        H = await ie(F);
+      } catch (K) {
         return o("report-error", {
           index: n.index,
-          message: getErrorMessage(q)
+          message: getErrorMessage(K)
         }), null;
       }
-      let G = ie(U);
-      if (n.config.data.processData && (G = await getProcessData(n.config.data.processData, G, v.value, y)), u && u.order !== "none") {
-        const q = G[u.key];
-        Array.isArray(q) && (G[u.key] = sortRowsByField(q, u.field, u.order, u.numeric));
+      let j = ae(H);
+      if (n.config.data.processData && (j = await getProcessData(n.config.data.processData, j, v.value, y)), u && u.order !== "none") {
+        const K = j[u.key];
+        Array.isArray(K) && (j[u.key] = sortRowsByField(K, u.field, u.order, u.numeric));
       }
-      let V = [];
-      const Y = [];
-      for (let q = 0; q < n.config.tableConfig.length; q++) {
-        const W = n.config.tableConfig[q];
-        let { rowConfig: re, colConfig: J, config: M } = cloneDeep(W), H = getLoopItem(J, G, "col", M), z = getLoopItem(re, G, "row", M);
-        H.length && loopGroupCols(J, H, M, G), z.length && loopGroupRows(re, z, M, J, G);
-        const te = transformArrayToObject(G, n.config.data.source);
-        computeCell(M, te, void 0, q), V.push({
-          config: M,
-          rowConfig: re,
-          colConfig: J
-        }), Y.push({ config: M });
+      let q = [];
+      const X = [];
+      for (let K = 0; K < n.config.tableConfig.length; K++) {
+        const re = n.config.tableConfig[K];
+        let { rowConfig: Z, colConfig: B, config: V } = cloneDeep(re), z = getLoopItem(B, j, "col", V), Q = getLoopItem(Z, j, "row", V);
+        z.length && loopGroupCols(B, z, V, j), Q.length && loopGroupRows(Z, Q, V, B, j);
+        const Y = transformArrayToObject(j, n.config.data.source);
+        computeCell(V, Y, void 0, K), q.push({
+          config: V,
+          rowConfig: Z,
+          colConfig: B
+        }), X.push({ config: V });
       }
-      return await preGenerateBarcodes(Y), V.length ? V : null;
+      return await preGenerateBarcodes(X), q.length ? q : null;
     }
-    async function x() {
-      const U = await O();
-      if (!U) {
+    async function T() {
+      const F = await M(!0);
+      if (!F) {
         ElMessage.warning("当前报表没有可导出的数据");
         return;
       }
-      let G = await exportReport(U, n.name, "excel", n.config.theme, n.config.subReprotIndex);
-      if (G === null) {
+      let H = await exportReport(F, n.name, "excel", n.config.theme, n.config.subReprotIndex);
+      if (H === null) {
         await ElMessageBox.alert("表格导出失败");
         return;
       }
-      n.config.exportMethod === "send" && window.opener ? sendReport(G) : downloadReport(G, n.name, "excel");
-    }
-    const D = ref(!1), T = ref(!1);
-    async function S(U, G) {
-      let V = !1, { rowConfig: Y, colConfig: q, config: W } = cloneDeep(U), re = getLoopItem(q, G, "col", W), J = getLoopItem(Y, G, "row", W);
-      re.length && (V = !0, loopGroupCols(q, re, W, G)), J.length && (V = !0, loopGroupRows(Y, J, W, q, G));
-      const M = transformArrayToObject(G, n.config.data.source);
-      return computeCell(W, M, C.value), await preGenerateBarcodes([{ config: W }]), {
-        reportConfig: { config: W, rowConfig: Y, colConfig: q },
-        hasLoop: V
+      n.config.exportMethod === "send" && window.opener ? sendReport(H) : downloadReport(H, n.name, "excel");
+    }
+    const b = ref(!1), D = ref(!1);
+    async function S(F, H) {
+      let j = !1, { rowConfig: q, colConfig: X, config: K } = cloneDeep(F), re = getLoopItem(X, H, "col", K), Z = getLoopItem(q, H, "row", K);
+      re.length && (j = !0, loopGroupCols(X, re, K, H)), Z.length && (j = !0, loopGroupRows(q, Z, K, X, H));
+      const B = transformArrayToObject(H, n.config.data.source);
+      return computeCell(K, B, C.value), await preGenerateBarcodes([{ config: K }]), {
+        reportConfig: { config: K, rowConfig: q, colConfig: X },
+        hasLoop: j
       };
     }
-    async function I(U, G) {
-      const V = U[G];
-      if (!(!Array.isArray(V) || V.length === 0)) {
+    async function R(F, H) {
+      const j = F[H];
+      if (!(!Array.isArray(j) || j.length === 0)) {
         m.value = [], l.value.innerHTML = "";
-        for (const Y of V) {
-          const q = { ...U, ...Y, [G]: [Y] }, W = [];
+        for (const q of j) {
+          const X = { ...F, ...q, [H]: [q] }, K = [];
           for (const re of n.config.tableConfig) {
-            const { reportConfig: J, hasLoop: M } = await S(re, q);
-            W.push(J), renderReportByDom(
-              J.rowConfig,
-              J.colConfig,
-              J.config,
+            const { reportConfig: Z, hasLoop: B } = await S(re, X);
+            K.push(Z), renderReportByDom(
+              Z.rowConfig,
+              Z.colConfig,
+              Z.config,
               l,
-              M,
+              B,
               _.value.border
             );
           }
-          m.value.push(W);
+          m.value.push(K);
         }
       }
     }
-    async function B(U) {
+    async function k(F) {
       if (n.config && c.value)
-        if (console.time("renderReport"), p.value = [], T.value = !!n.config.tableConfig, T.value) {
+        if (console.time("renderReport"), p.value = [], D.value = !!n.config.tableConfig, D.value) {
           l.value.innerHTML = "";
-          const G = [];
-          for (let V = 0; V < n.config.tableConfig.length; V++) {
-            const Y = n.config.tableConfig[V];
-            let q = !1, { rowConfig: W, colConfig: re, config: J } = cloneDeep(Y), M = getLoopItem(re, U, "col", J), H = getLoopItem(W, U, "row", J);
-            M.length && (q = !0, loopGroupCols(re, M, J, U)), H.length && (q = !0, loopGroupRows(W, H, J, re, U));
-            const z = transformArrayToObject(U, n.config.data.source);
-            computeCell(J, z, C.value, V), G.push({ config: J, rowConfig: W, colConfig: re, hasLoop: q }), p.value.push({
-              config: J,
-              rowConfig: W,
+          const H = [];
+          for (let j = 0; j < n.config.tableConfig.length; j++) {
+            const q = n.config.tableConfig[j];
+            let X = !1, { rowConfig: K, colConfig: re, config: Z } = cloneDeep(q), B = getLoopItem(re, F, "col", Z), V = getLoopItem(K, F, "row", Z);
+            B.length && (X = !0, loopGroupCols(re, B, Z, F)), V.length && (X = !0, loopGroupRows(K, V, Z, re, F));
+            const z = transformArrayToObject(F, n.config.data.source);
+            computeCell(Z, z, C.value, j), H.push({ config: Z, rowConfig: K, colConfig: re, hasLoop: X }), p.value.push({
+              config: Z,
+              rowConfig: K,
               colConfig: re
             });
           }
-          await preGenerateBarcodes(G), G.forEach((V) => {
-            renderReportByDom(V.rowConfig, V.colConfig, V.config, l, V.hasLoop, _.value.border);
+          await preGenerateBarcodes(H), H.forEach((j) => {
+            renderReportByDom(j.rowConfig, j.colConfig, j.config, l, j.hasLoop, _.value.border);
           }), console.timeEnd("renderReport"), nextTick(() => {
-            const V = l.value.querySelectorAll(".yh-report-table-context");
-            let Y = 0;
-            if (V.forEach((q) => {
-              const W = q.querySelector("table");
-              if (W) {
-                const re = W.querySelectorAll("colgroup col"), J = Array.from(re).reduce(
-                  (M, H) => M + parseInt(H.style.width || "80", 10),
+            const j = l.value.querySelectorAll(".yh-report-table-context");
+            let q = 0;
+            if (j.forEach((X) => {
+              const K = X.querySelector("table");
+              if (K) {
+                const re = K.querySelectorAll("colgroup col"), Z = Array.from(re).reduce(
+                  (B, V) => B + parseInt(V.style.width || "80", 10),
                   0
                 );
-                Y = Math.max(Y, J);
+                q = Math.max(q, Z);
               }
-            }), Y > 0) {
-              const q = l.value;
-              let W = 0;
-              if (q) {
-                const re = getComputedStyle(q);
-                W = q.clientWidth - parseFloat(re.paddingLeft || "0") - parseFloat(re.paddingRight || "0");
+            }), q > 0) {
+              const X = l.value;
+              let K = 0;
+              if (X) {
+                const re = getComputedStyle(X);
+                K = X.clientWidth - parseFloat(re.paddingLeft || "0") - parseFloat(re.paddingRight || "0");
               }
-              W > 0 && (Y = Math.max(Y, W)), V.forEach((re) => {
-                const J = re.querySelector("table");
-                if (J) {
-                  const M = J.querySelectorAll("colgroup col"), H = Array.from(M).reduce(
-                    (z, te) => z + parseInt(te.style.width || "80", 10),
+              K > 0 && (q = Math.max(q, K)), j.forEach((re) => {
+                const Z = re.querySelector("table");
+                if (Z) {
+                  const B = Z.querySelectorAll("colgroup col"), V = Array.from(B).reduce(
+                    (z, Q) => z + parseInt(Q.style.width || "80", 10),
                     0
                   );
-                  if (H > 0 && H < Y) {
-                    const z = Y / H;
-                    M.forEach((K) => {
-                      const oe = parseInt(K.style.width || "80", 10);
-                      K.style.width = `${Math.round(oe * z)}px`;
+                  if (V > 0 && V < q) {
+                    const z = q / V;
+                    B.forEach((Y) => {
+                      const oe = parseInt(Y.style.width || "80", 10);
+                      Y.style.width = `${Math.round(oe * z)}px`;
                     });
-                    const te = Array.from(M).map(
-                      (K) => parseInt(K.style.width || "80", 10)
+                    const Q = Array.from(B).map(
+                      (Y) => parseInt(Y.style.width || "80", 10)
                     );
-                    J.querySelectorAll("tr").forEach((K) => {
-                      let oe = 0, ne = 0;
-                      Array.from(K.children).forEach((ce) => {
-                        ce.classList.contains("fixed-td") && (ce.style.left = `${oe - 1}px`), ne < te.length && (oe += te[ne] - 1, ne++);
+                    Z.querySelectorAll("tr").forEach((Y) => {
+                      let oe = 0, te = 0;
+                      Array.from(Y.children).forEach((ce) => {
+                        ce.classList.contains("fixed-td") && (ce.style.left = `${oe - 1}px`), te < Q.length && (oe += Q[te] - 1, te++);
                       });
                     });
                   }
-                  J.style.width = `${Y}px`, J.style.minWidth = `${Y}px`;
+                  Z.style.width = `${q}px`, Z.style.minWidth = `${q}px`;
                 }
               });
             }
           });
         } else {
-          let G = !1, { rowConfig: V, colConfig: Y, config: q } = cloneDeep(n.config), W = getLoopItem(Y, U, "col", q), re = getLoopItem(V, U, "row", q);
-          W.length && (G = !0, loopGroupCols(Y, W, q, U)), re.length && (G = !0, loopGroupRows(V, re, q, Y, U));
-          const J = transformArrayToObject(U, n.config.data.source);
-          computeCell(q, J, C.value), await preGenerateBarcodes([{ config: q }]), p.value.push({
-            config: q,
-            rowConfig: V,
-            colConfig: Y
-          }), renderReportByDom(V, Y, q, c.value, G, _.value.border), console.timeEnd("renderReport");
+          let H = !1, { rowConfig: j, colConfig: q, config: X } = cloneDeep(n.config), K = getLoopItem(q, F, "col", X), re = getLoopItem(j, F, "row", X);
+          K.length && (H = !0, loopGroupCols(q, K, X, F)), re.length && (H = !0, loopGroupRows(j, re, X, q, F));
+          const Z = transformArrayToObject(F, n.config.data.source);
+          computeCell(X, Z, C.value), await preGenerateBarcodes([{ config: X }]), p.value.push({
+            config: X,
+            rowConfig: j,
+            colConfig: q
+          }), renderReportByDom(j, q, X, c.value, H, _.value.border), console.timeEnd("renderReport");
         }
     }
-    function j() {
-      let U = 0, G = [], V = {};
-      return n.config.params.forEach((Y) => {
-        Y.isNull && (V[Y.columnName] = Y);
-      }), v.value.forEach((Y) => {
-        Y.name && V[Y.name] && !Y.value && (G.push(V[Y.name].name), U++);
-      }), U > 0 && Object.keys(V).length > 0 ? (ElMessage.warning({
-        message: `请填写必填项：${G.join(",")}`,
+    function G() {
+      let F = 0, H = [], j = {};
+      return n.config.params.forEach((q) => {
+        q.isNull && (j[q.columnName] = q);
+      }), v.value.forEach((q) => {
+        q.name && j[q.name] && !q.value && (H.push(j[q.name].name), F++);
+      }), F > 0 && Object.keys(j).length > 0 ? (ElMessage.warning({
+        message: `请填写必填项：${H.join(",")}`,
         grouping: !0
       }), !1) : !0;
     }
-    async function X() {
-      var G;
-      if (R = !1, i.value || j()) {
-        D.value = !0;
+    async function W() {
+      var H;
+      if (A = !1, i.value || G()) {
+        b.value = !0;
         try {
-          let V = await ae(i.value), Y = ie(V);
-          n.config.data.processData && (Y = await getProcessData(
+          let j = await ie(i.value), q = ae(j);
+          n.config.data.processData && (q = await getProcessData(
             n.config.data.processData,
-            Y,
+            q,
             v.value,
             y
-          )), d = Y, f = { ...Y }, Z(), Y = f;
-          const q = (G = n.config.data.source) == null ? void 0 : G.find((W) => W.loopTable);
-          q && q.key ? await I(Y, q.key) : await B(Y), nextTick(ee);
-        } catch (V) {
-          console.error("数据源请求失败:", V), o("report-error", {
+          )), d = q, f = { ...q }, ee(), q = f;
+          const X = (H = n.config.data.source) == null ? void 0 : H.find((K) => K.loopTable);
+          X && X.key ? await R(q, X.key) : await k(q), nextTick(ne);
+        } catch (j) {
+          console.error("数据源请求失败:", j), o("report-error", {
             index: n.index,
-            message: getErrorMessage(V)
+            message: getErrorMessage(j)
           }), clearReportByDom(l);
         } finally {
-          D.value = !1, N = !0;
+          b.value = !1, I = !0;
         }
       } else
         clearReportByDom(l);
     }
-    function Z() {
-      if (!f || !d || !u) return;
-      const U = d[u.key];
-      Array.isArray(U) && (u.order === "none" ? f[u.key] = U : f[u.key] = sortRowsByField(U, u.field, u.order, u.numeric));
-    }
-    async function Q(U) {
-      var M;
-      const G = U.target.closest("td.click-sort-cell");
-      if (!G) return;
-      const V = G.getAttribute("data-click-sort-field") || "", Y = V.indexOf(".");
-      if (Y < 1) return;
-      const q = V.slice(0, Y).toUpperCase(), W = V.slice(Y + 1).toUpperCase();
-      if (!q || !W || !f) return;
-      const re = G.getAttribute("data-click-sort-numeric") === "1";
-      u && u.key === q && u.field === W ? u.order = u.order === "asc" ? "desc" : u.order === "desc" ? "none" : "asc" : u = { key: q, field: W, order: "asc", numeric: re }, Z();
-      const J = (M = n.config.data.source) == null ? void 0 : M.find((H) => H.loopTable);
-      J && J.key ? await I(f, J.key) : await B(f), nextTick(ee);
-    }
     function ee() {
-      var U;
-      (U = l.value) == null || U.querySelectorAll("td.click-sort-cell").forEach((G) => {
-        var W;
-        const V = ((W = G.getAttribute("data-click-sort-field")) == null ? void 0 : W.toUpperCase()) || "", q = u && V === `${u.key}.${u.field}` && u.order !== "none" ? u.order : "";
-        G.dataset.sortDir = q;
+      if (!f || !d || !u) return;
+      const F = d[u.key];
+      Array.isArray(F) && (u.order === "none" ? f[u.key] = F : f[u.key] = sortRowsByField(F, u.field, u.order, u.numeric));
+    }
+    async function J(F) {
+      var B;
+      const H = F.target.closest("td.click-sort-cell");
+      if (!H) return;
+      const j = H.getAttribute("data-click-sort-field") || "", q = j.indexOf(".");
+      if (q < 1) return;
+      const X = j.slice(0, q).toUpperCase(), K = j.slice(q + 1).toUpperCase();
+      if (!X || !K || !f) return;
+      const re = H.getAttribute("data-click-sort-numeric") === "1";
+      u && u.key === X && u.field === K ? u.order = u.order === "asc" ? "desc" : u.order === "desc" ? "none" : "asc" : u = { key: X, field: K, order: "asc", numeric: re }, ee();
+      const Z = (B = n.config.data.source) == null ? void 0 : B.find((V) => V.loopTable);
+      Z && Z.key ? await R(f, Z.key) : await k(f), nextTick(ne);
+    }
+    function ne() {
+      var F;
+      (F = l.value) == null || F.querySelectorAll("td.click-sort-cell").forEach((H) => {
+        var K;
+        const j = ((K = H.getAttribute("data-click-sort-field")) == null ? void 0 : K.toUpperCase()) || "", X = u && j === `${u.key}.${u.field}` && u.order !== "none" ? u.order : "";
+        H.dataset.sortDir = X;
       });
     }
     onMounted(() => {
-      var U;
-      (U = l.value) == null || U.addEventListener("click", Q);
+      var F;
+      (F = l.value) == null || F.addEventListener("click", J);
     });
-    function ie(U) {
-      let G = {};
-      return Array.isArray(U) || (U = [U]), U.forEach(({ key: V, data: Y }) => {
-        if (V !== "PARAM") {
-          let q = Y.filter((W) => W);
-          G[V] = q;
+    function ae(F) {
+      let H = {};
+      return Array.isArray(F) || (F = [F]), F.forEach(({ key: j, data: q }) => {
+        if (j !== "PARAM") {
+          let X = q.filter((K) => K);
+          H[j] = X;
         } else
-          G[V] = Y;
+          H[j] = q;
       }), o("updateData", {
         key: n.config.id,
-        data: G
-      }), G;
+        data: H
+      }), H;
     }
-    async function ae(U = !1) {
+    async function ie(F = !1) {
       if (!n.config.data.source)
         return [];
-      const { resData: G, total: V } = await fetchReportData(
+      const { resData: H, total: j } = await fetchReportData(
         { id: n.id, data: n.config.data, tableConfig: n.config.tableConfig },
         v.value,
         {
@@ -10821,14 +10825,14 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
           total: y.total,
           isPagination: E.value
         },
-        U
+        F
       );
-      return E.value && (y.total = V), G;
+      return E.value && (y.total = j), H;
     }
     function se() {
       if (n.config.data.pageSize !== void 0 && (y.pageSize = isNaN(n.config.data.pageSize) ? n.config.data.pagination ? 10 : 5e3 : n.config.data.pageSize), n.config.data.pagination && n.config.data.pageSizes !== void 0) {
-        let U = n.config.data.pageSizes.split(",").map((G) => parseInt(G));
-        y.pageSizes = Array.isArray(U) ? U : [10, 20, 50, 100, 200];
+        let F = n.config.data.pageSizes.split(",").map((H) => parseInt(H));
+        y.pageSizes = Array.isArray(F) ? F : [10, 20, 50, 100, 200];
       }
     }
     return se(), e({
@@ -10836,11 +10840,11 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
       batchTableConfigs: m,
       statementTableRef: l,
       /** 拉数据 + 渲染（供父组件主动调用，如打印按钮触发） */
-      renderHandler: X,
+      renderHandler: W,
       /** 装配导出配置（供父组件合并导出调用） */
-      buildExportConfigs: O
-    }), (U, G) => {
-      const V = resolveComponent("el-button"), Y = resolveComponent("el-pagination"), q = resolveDirective("loading");
+      buildExportConfigs: M
+    }), (F, H) => {
+      const j = resolveComponent("el-button"), q = resolveComponent("el-pagination"), X = resolveDirective("loading");
       return openBlock(), createElementBlock("div", {
         class: "yh-report-view-container",
         style: normalizeStyle(g.value)
@@ -10851,38 +10855,38 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
           ref_key: "conditionsRef",
           ref: s,
           onAddCell: w,
-          onChange: b
+          onChange: $
         }, {
           search: withCtx(() => [
-            $.value ? (openBlock(), createBlock(V, {
+            x.value ? (openBlock(), createBlock(j, {
               key: 0,
               type: "primary",
-              onClick: A
+              onClick: O
             }, {
               default: withCtx(() => [
                 createTextVNode(toDisplayString(unref(rct)("搜索")), 1)
               ]),
               _: 1
             })) : createCommentVNode("", !0),
-            k.value ? (openBlock(), createBlock(V, {
+            N.value ? (openBlock(), createBlock(j, {
               key: 1,
               text: "",
               type: "primary",
               onClick: L
             }, {
               default: withCtx(() => [
-                createTextVNode(toDisplayString(unref(rct)(F.value)), 1)
+                createTextVNode(toDisplayString(unref(rct)(U.value)), 1)
               ]),
               _: 1
             })) : createCommentVNode("", !0),
-            E.value && k.value ? (openBlock(), createBlock(V, {
+            E.value && N.value ? (openBlock(), createBlock(j, {
               key: 2,
               text: "",
               type: "primary",
-              onClick: x
+              onClick: T
             }, {
               default: withCtx(() => [
-                createTextVNode(toDisplayString(unref(rct)(F.value)) + toDisplayString(unref(rct)("全部")), 1)
+                createTextVNode(toDisplayString(unref(rct)(U.value)) + toDisplayString(unref(rct)("全部")), 1)
               ]),
               _: 1
             })) : createCommentVNode("", !0)
@@ -10901,14 +10905,14 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
             ref: c
           }, null, 512)
         ])), [
-          [q, D.value]
+          [X, b.value]
         ]),
-        E.value ? withDirectives((openBlock(), createBlock(Y, {
+        E.value ? withDirectives((openBlock(), createBlock(q, {
           key: 0,
           pageSize: y.pageSize,
-          "onUpdate:pageSize": G[0] || (G[0] = (W) => y.pageSize = W),
+          "onUpdate:pageSize": H[0] || (H[0] = (K) => y.pageSize = K),
           "current-page": y.pageIndex,
-          "onUpdate:currentPage": G[1] || (G[1] = (W) => y.pageIndex = W),
+          "onUpdate:currentPage": H[1] || (H[1] = (K) => y.pageIndex = K),
           "page-sizes": y.pageSizes,
           total: y.total,
           layout: "total, jumper, prev, pager, next, sizes"
@@ -11151,8 +11155,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, b) => {
-        C[`color${b}`] = w;
+      return colors.forEach((w, $) => {
+        C[`color${$}`] = 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]
@@ -11169,103 +11173,103 @@ 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 $(w, C);
+        await x(w, C);
       }
     }, E = {
       SUM(C) {
-        return C.map((b) => Number(b)).filter((b) => !isNaN(b)).reduce((b, N) => b + N, 0);
+        return C.map(($) => Number($)).filter(($) => !isNaN($)).reduce(($, I) => $ + I, 0);
       },
       AVG(C) {
-        const w = C.map((b) => Number(b)).filter((b) => !isNaN(b));
+        const w = C.map(($) => Number($)).filter(($) => !isNaN($));
         return w.length ? E.SUM(w) / w.length : 0;
       },
       MAX(C) {
-        const w = C.map((b) => Number(b)).filter((b) => !isNaN(b));
+        const w = C.map(($) => Number($)).filter(($) => !isNaN($));
         return w.length ? Math.max(...w) : 0;
       },
       MIN(C) {
-        const w = C.map((b) => Number(b)).filter((b) => !isNaN(b));
+        const w = C.map(($) => Number($)).filter(($) => !isNaN($));
         return w.length ? Math.min(...w) : 0;
       },
       COUNT(C) {
         return C.length;
       }
-    }, $ = async (C, w) => {
+    }, x = async (C, w) => {
       const {
-        data: { source: b },
-        notSingle: N,
-        keyIds: R,
-        dataIds: A,
-        groupBy: k,
-        orderBy: F,
+        data: { source: $ },
+        notSingle: I,
+        keyIds: A,
+        dataIds: O,
+        groupBy: N,
+        orderBy: U,
         cutLength: L,
-        singleComputed: O,
-        singleKey: x,
-        singleData: D
+        singleComputed: M,
+        singleKey: T,
+        singleData: b
       } = C;
-      let T = {};
-      w && (T = {
+      let D = {};
+      w && (D = {
         ...w
       });
-      for (let S = 0; S < b.length; S++) {
-        const { key: I, url: B } = b[S];
+      for (let S = 0; S < $.length; S++) {
+        const { key: R, url: k } = $[S];
         try {
-          const j = (await getDateSourceData(B, { id: n.id })).data;
-          T[I] = j;
-        } catch (j) {
+          const G = (await getDateSourceData(k, { id: n.id })).data;
+          D[R] = G;
+        } catch (G) {
           return o("report-error", {
             index: n.index,
-            message: getErrorMessage(j)
+            message: getErrorMessage(G)
           }), l.value = !1, !1;
         }
       }
-      if (Object.keys(T).length === 0)
+      if (Object.keys(D).length === 0)
         return l.value = !1, !1;
-      if (u.value = [], N) {
-        if (R.length < 2 || A.length < 2)
+      if (u.value = [], I) {
+        if (A.length < 2 || O.length < 2)
           return l.value = !1, !1;
-        let S = "", I = "";
-        R.length > 2 ? (S = R.splice(0, 2).join("."), I = R.at(0)) : (S = R.at(0), I = R.at(1));
-        let B = get(T, S);
-        if (!B)
+        let S = "", R = "";
+        A.length > 2 ? (S = A.splice(0, 2).join("."), R = A.at(0)) : (S = A.at(0), R = A.at(1));
+        let k = get(D, S);
+        if (!k)
           return l.value = !1, !1;
-        let j = B.map((ae) => ae[I]), X = "", Z = "";
-        A.length > 2 ? (X = A.splice(0, 2).join("."), Z = A.at(0)) : (X = A.at(0), Z = A.at(1));
-        let Q = [], ee = {}, ie = get(T, X);
-        if (!ie)
+        let G = k.map((ie) => ie[R]), W = "", ee = "";
+        O.length > 2 ? (W = O.splice(0, 2).join("."), ee = O.at(0)) : (W = O.at(0), ee = O.at(1));
+        let J = [], ne = {}, ae = get(D, W);
+        if (!ae)
           return l.value = !1, !1;
-        ie.map((ae) => {
-          let se = ae[I], U = ae[Z];
-          k ? se && j.includes(se) && (ee[se] ? ee[se].push(U) : ee[se] = [U]) : se && j.includes(se) && Q.push({
+        ae.map((ie) => {
+          let se = ie[R], F = ie[ee];
+          N ? se && G.includes(se) && (ne[se] ? ne[se].push(F) : ne[se] = [F]) : se && G.includes(se) && J.push({
             label: se,
-            value: U
+            value: F
           });
-        }), k && (Q = Object.keys(ee).map((ae) => {
-          let se = ee[ae];
+        }), N && (J = Object.keys(ne).map((ie) => {
+          let se = ne[ie];
           return {
-            label: ae,
+            label: ie,
             value: E.SUM(se)
           };
-        })), !isNaN(L) && L > 0 && (Q = Q.splice(0, L)), u.value = Q;
+        })), !isNaN(L) && L > 0 && (J = J.splice(0, L)), u.value = J;
       } else {
-        if (!D || D.length === 0)
+        if (!b || b.length === 0)
           return l.value = !1, !1;
-        let S = "", I = "";
-        D.length > 2 ? (S = D.splice(0, 2).join("."), I = D.at(0)) : (S = D.at(0), I = D.at(1));
-        let B = get(T, S);
-        if (!B)
+        let S = "", R = "";
+        b.length > 2 ? (S = b.splice(0, 2).join("."), R = b.at(0)) : (S = b.at(0), R = b.at(1));
+        let k = get(D, S);
+        if (!k)
           return l.value = !1, !1;
-        let j = B.map((X) => X[I]);
-        O && (j = E[O](j)), u.value.push({
-          label: x,
-          value: j
+        let G = k.map((W) => W[R]);
+        M && (G = E[M](G)), u.value.push({
+          label: T,
+          value: G
         });
       }
       l.value = !1;
     }, y = async () => {
       l.value = !0;
       let C = cloneDeep(n.config);
-      C && $(C);
+      C && x(C);
     };
     e({
       setOutData: _,
@@ -11274,21 +11278,21 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
       y();
     });
     function v() {
-      var O;
+      var M;
       if (!u.value.length) return null;
-      const C = Math.max(((O = c.value) == null ? void 0 : O.offsetWidth) || n.config.width || 200, 100), w = n.config.height || 100, b = 2, N = document.createElement("canvas");
-      N.width = Math.round(C * b), N.height = Math.round(w * b);
-      const R = N.getContext("2d");
-      if (!R) return null;
-      R.scale(b, b);
-      const A = u.value, k = C / A.length, F = 14, L = Math.max(Math.round(w / 3.5), 12);
-      return A.forEach((x, D) => {
-        const T = D * k;
-        R.fillStyle = f.value ? n.config.singleColor || colors[0] : colors[D % colors.length], R.fillRect(T, 0, k, w), R.fillStyle = "#fff", R.textAlign = "center", R.textBaseline = "top", R.font = `${F}px sans-serif`, R.fillText(String(x.label ?? ""), T + k / 2, w * 0.08, k - 8), R.font = `bold ${L}px sans-serif`, R.fillText(String(x.value ?? ""), T + k / 2, w * 0.28, k - 8);
-      }), { base64: N.toDataURL("image/png"), width: C, height: w };
+      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 A = I.getContext("2d");
+      if (!A) return null;
+      A.scale($, $);
+      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;
+        A.fillStyle = f.value ? n.config.singleColor || colors[0] : colors[b % colors.length], A.fillRect(D, 0, N, w), A.fillStyle = "#fff", A.textAlign = "center", A.textBaseline = "top", A.font = `${U}px sans-serif`, A.fillText(String(T.label ?? ""), D + N / 2, w * 0.08, N - 8), A.font = `bold ${L}px sans-serif`, A.fillText(String(T.value ?? ""), D + N / 2, w * 0.28, N - 8);
+      }), { base64: I.toDataURL("image/png"), width: C, height: w };
     }
     return (C, w) => {
-      const b = resolveDirective("loading");
+      const $ = resolveDirective("loading");
       return withDirectives((openBlock(), createElementBlock("div", {
         ref_key: "rootRef",
         ref: c,
@@ -11299,15 +11303,15 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         f.value ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
           createElementVNode("div", _hoisted_2$3, toDisplayString(d.value.label), 1),
           createElementVNode("div", _hoisted_3$2, toDisplayString(d.value.value), 1)
-        ], 64)) : (openBlock(!0), createElementBlock(Fragment, { key: 1 }, renderList(u.value, (N, R) => (openBlock(), createElementBlock("div", _hoisted_4$2, [
-          createElementVNode("div", _hoisted_5$2, toDisplayString(N.label), 1),
-          createElementVNode("div", _hoisted_6$2, toDisplayString(N.value), 1)
+        ], 64)) : (openBlock(!0), createElementBlock(Fragment, { key: 1 }, renderList(u.value, (I, A) => (openBlock(), createElementBlock("div", _hoisted_4$2, [
+          createElementVNode("div", _hoisted_5$2, toDisplayString(I.label), 1),
+          createElementVNode("div", _hoisted_6$2, toDisplayString(I.value), 1)
         ]))), 256)),
         unref(i) ? (openBlock(), createElementBlock("div", _hoisted_7$1, [...w[0] || (w[0] = [
           createElementVNode("span", null, "仅展示，打印时会忽略", -1)
         ])])) : createCommentVNode("", !0)
       ], 14, _hoisted_1$3)), [
-        [b, l.value]
+        [$, l.value]
       ]);
     };
   }
@@ -11363,13 +11367,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 b = C.contentWindow, N = document.title;
+        const $ = C.contentWindow, I = document.title;
         r.statementName && (document.title = r.statementName);
-        const R = () => {
-          document.title = N;
+        const A = () => {
+          document.title = I;
         };
-        b.addEventListener("afterprint", R), b.print(), R(), setTimeout(() => {
-          b.removeEventListener("afterprint", R), C.remove(), l.value = !1;
+        $.addEventListener("afterprint", A), $.print(), A(), setTimeout(() => {
+          $.removeEventListener("afterprint", A), C.remove(), l.value = !1;
         }, 500);
       };
     }
@@ -11384,37 +11388,37 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         await nextTick();
         try {
           let C = function() {
-            L.length > 0 && (F.push({ items: L }), L = [], O = 0);
+            L.length > 0 && (U.push({ items: L }), L = [], M = 0);
           }, w = function() {
-            if (R)
-              for (; x.length > 0; ) {
-                const T = x[0], S = N - O;
+            if (A)
+              for (; T.length > 0; ) {
+                const D = T[0], S = I - M;
                 if (S <= 0) {
                   if (L.length === 0) break;
                   C();
                   continue;
                 }
-                let I = splitNextReportPage(T.state, S, A, N);
-                if (!I) {
+                let R = splitNextReportPage(D.state, S, O, I);
+                if (!R) {
                   if (L.length > 0) {
                     C();
                     continue;
                   }
-                  I = splitNextReportPage(T.state, S, A, N, !0);
+                  R = splitNextReportPage(D.state, S, O, I, !0);
                 }
-                L.push({ type: "report", dom: I.dom }), O += I.height, T.state.currentRowIdx >= T.state.visibleRows.length && x.shift();
+                L.push({ type: "report", dom: R.dom }), M += R.height, D.state.currentRowIdx >= D.state.visibleRows.length && T.shift();
               }
           };
-          r.silentRender && await $();
-          const b = !!r.autoPrint, N = getPrintContentHeightPxMeasured(r.printConfig), R = N != null, A = getPrintContentWidthPxMeasured(r.printConfig), k = [];
-          for (let T = 0; T < r.configs.length; T++) {
-            const S = r.configs[T];
+          r.silentRender && await x();
+          const $ = !!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") {
-              const I = d().get(T);
-              if (I && I.length > 0)
-                for (const j of I) {
-                  const X = createReportSplitState(
-                    j,
+              const R = d().get(D);
+              if (R && R.length > 0)
+                for (const G of R) {
+                  const W = createReportSplitState(
+                    G,
                     getThemeColors(S.theme || "none").border,
                     {
                       header: r.printConfig.header,
@@ -11424,16 +11428,16 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
                       theme: S.theme || "none"
                     }
                   );
-                  await preGenerateBarcodes([{ config: X.config }]), k.push({ kind: "report", pending: { state: X } });
+                  await preGenerateBarcodes([{ config: W.config }]), N.push({ kind: "report", pending: { state: W } });
                 }
-              const B = p().get(T);
-              if (B && B.length > 0)
-                for (let j = 0; j < B.length; j++) {
-                  const X = B[j];
-                  j > 0 && k.push({ kind: "break" });
-                  for (const Z of X) {
-                    const Q = createReportSplitState(
-                      Z,
+              const k = p().get(D);
+              if (k && k.length > 0)
+                for (let G = 0; G < k.length; G++) {
+                  const W = k[G];
+                  G > 0 && N.push({ kind: "break" });
+                  for (const ee of W) {
+                    const J = createReportSplitState(
+                      ee,
                       getThemeColors(S.theme || "none").border,
                       {
                         header: r.printConfig.header,
@@ -11443,56 +11447,56 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
                         theme: S.theme || "none"
                       }
                     );
-                    await preGenerateBarcodes([{ config: Q.config }]), k.push({ kind: "report", pending: { state: Q } });
+                    await preGenerateBarcodes([{ config: J.config }]), N.push({ kind: "report", pending: { state: J } });
                   }
                 }
             } else if (S.type === "label")
               continue;
           }
-          const F = [];
-          let L = [], O = 0;
-          const x = [];
-          if (R) {
-            for (const T of k) {
-              if (T.kind === "break") {
+          const U = [];
+          let L = [], M = 0;
+          const T = [];
+          if (A) {
+            for (const D of N) {
+              if (D.kind === "break") {
                 C();
                 continue;
               }
-              if (T.kind === "report") {
-                const S = T.pending;
+              if (D.kind === "report") {
+                const S = D.pending;
                 w();
-                const I = N - O, B = splitNextReportPage(S.state, I, A, N);
-                B ? (L.push({ type: "report", dom: B.dom }), O += B.height, S.state.currentRowIdx < S.state.visibleRows.length && x.push(S)) : (L.length > 0 && C(), x.push(S));
+                const R = I - M, k = splitNextReportPage(S.state, R, O, I);
+                k ? (L.push({ type: "report", dom: k.dom }), M += k.height, S.state.currentRowIdx < S.state.visibleRows.length && T.push(S)) : (L.length > 0 && C(), T.push(S));
               }
             }
             w(), C();
           } else {
-            const T = r.printConfig, S = mmToPx(T.marginTop + T.marginBottom), I = [];
-            for (const B of k) {
-              if (B.kind === "break") {
-                const j = document.createElement("div");
-                j.style.height = `${S}px`, I.push({ type: "spacer", dom: j });
+            const D = r.printConfig, S = mmToPx(D.marginTop + D.marginBottom), R = [];
+            for (const k of N) {
+              if (k.kind === "break") {
+                const G = document.createElement("div");
+                G.style.height = `${S}px`, R.push({ type: "spacer", dom: G });
                 continue;
               }
-              if (B.kind === "report") {
-                const { state: j } = B.pending, { rowConfig: X, colConfig: Z, config: Q } = j, ee = renderReportByDomForPrint(X, Z, Q, j.themeColor, j.theme);
-                I.push({ type: "report", dom: ee });
+              if (k.kind === "report") {
+                const { state: G } = k.pending, { rowConfig: W, colConfig: ee, config: J } = G, ne = renderReportByDomForPrint(W, ee, J, G.themeColor, G.theme);
+                R.push({ type: "report", dom: ne });
               }
             }
-            F.push({ items: I });
+            U.push({ items: R });
           }
-          a.value = F.map((T) => T.items), await nextTick(), s.value.forEach((T) => T.remove()), s.value = [];
-          const D = i.value;
-          for (let T = 0; T < D.length && T < F.length; T++) {
-            const S = D[T];
+          a.value = U.map((D) => D.items), await nextTick(), s.value.forEach((D) => D.remove()), s.value = [];
+          const b = i.value;
+          for (let D = 0; D < b.length && D < U.length; D++) {
+            const S = b[D];
             S.innerHTML = "";
-            const I = F[T].items;
-            for (const B of I) {
-              const j = B.dom.cloneNode(!0);
-              S.appendChild(j), s.value.push(j);
+            const R = U[D].items;
+            for (const k of R) {
+              const G = k.dom.cloneNode(!0);
+              S.appendChild(G), s.value.push(G);
             }
           }
-          b && (await nextTick(), E(), setTimeout(() => {
+          $ && (await nextTick(), E(), setTimeout(() => {
             n("update:visible", !1);
           }, 1e3));
         } finally {
@@ -11500,44 +11504,44 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         }
       }
     );
-    async function $() {
+    async function x() {
       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, b = w.data, N = w.tableConfig;
-        if (!b || !N || !b.source) continue;
-        const R = buildPrintParamsFromConfig(w, c.query), { resData: A } = await fetchReportData(
-          { id: r.reportId ?? "", data: b, tableConfig: N },
-          R,
-          { pageSize: 5e3, pageIndex: 1, total: 0, isPagination: !!b.pagination },
+        const w = C, $ = w.data, I = w.tableConfig;
+        if (!$ || !I || !$.source) continue;
+        const A = buildPrintParamsFromConfig(w, c.query), { resData: O } = await fetchReportData(
+          { id: r.reportId ?? "", data: $, tableConfig: I },
+          A,
+          { pageSize: 5e3, pageIndex: 1, total: 0, isPagination: !!$.pagination },
           y
         );
-        let k = toUpdateData(A);
-        b.processData && (k = await getProcessData(b.processData, k, R, {
+        let N = toUpdateData(O);
+        $.processData && (N = await getProcessData($.processData, N, A, {
           pageSize: 5e3,
           pageIndex: 1,
           total: 0
         }));
-        const F = b.source, L = F.find((O) => O.loopTable);
+        const U = $.source, L = U.find((M) => M.loopTable);
         if (L && L.key) {
-          const O = await renderReportToConfigs(
+          const M = await renderReportToConfigs(
+            I,
             N,
-            k,
-            F,
+            U,
             [],
             L.key
           );
-          f.value.set(v, O);
+          f.value.set(v, M);
         } else {
-          const O = await renderReportToConfigs(
+          const M = await renderReportToConfigs(
+            I,
             N,
-            k,
-            F,
+            U,
             []
           );
-          u.value.set(v, O);
+          u.value.set(v, M);
         }
       }
     }
@@ -11612,179 +11616,181 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   setup(t, { emit: e }) {
     const r = t;
     ref();
-    const n = ref(!1), o = ref(""), i = ref(""), a = ref([]), s = ref(), l = ref([]), c = ref([]), u = ref({ ...DEFAULT_PRINT_CONFIG }), f = {}, d = computed(() => {
-      var O;
-      return !!((O = u.value) != null && O.enabled);
+    const n = ref(!1), o = ref(""), i = ref(""), a = ref([]), s = ref(), l = ref([]), c = ref([]), u = ref({ ...DEFAULT_PRINT_CONFIG }), f = ref({ ...DEFAULT_EXPORT_CONFIG }), d = {}, p = computed(() => {
+      var T;
+      return !!((T = u.value) != null && T.enabled);
     });
-    provide("printConfig", u), provide("isPrintMode", d);
-    const p = computed(() => {
-      if (!d.value) return {};
-      const O = u.value;
+    provide("printConfig", u), provide("isPrintMode", p);
+    const m = computed(() => {
+      if (!p.value) return {};
+      const T = u.value;
       return {
-        "--print-content-width": `${mmToPx(O.width - O.marginLeft - O.marginRight)}px`
+        "--print-content-width": `${mmToPx(T.width - T.marginLeft - T.marginRight)}px`
       };
     });
     watch(
       () => r.id,
-      (O) => {
-        m(O);
+      (T) => {
+        g(T);
       }
     );
-    function m(O) {
-      O ? (i.value = "", a.value = [], n.value = !0, getConfig(O).then(async (x) => {
-        let { name: D, remoteOptions: T, printConfig: S } = x;
-        o.value = D, c.value = T, S && (u.value = { ...DEFAULT_PRINT_CONFIG, ...S });
-      }).catch((x) => {
-        console.error("获取报表配置失败:", x), i.value = getErrorMessage(x);
+    function g(T) {
+      T ? (i.value = "", a.value = [], n.value = !0, getConfig(T).then(async (b) => {
+        let { name: D, remoteOptions: S, printConfig: R, exportConfig: k } = b;
+        o.value = D, c.value = S, R && (u.value = { ...DEFAULT_PRINT_CONFIG, ...R }), f.value = { ...DEFAULT_EXPORT_CONFIG, ...k || {} };
+      }).catch((b) => {
+        console.error("获取报表配置失败:", b), i.value = getErrorMessage(b);
       }).finally(() => {
         n.value = !1;
       })) : i.value = "报表ID不能为空";
     }
-    function g({ index: O, message: x }) {
-      a.value.some((D) => D.key === O) || a.value.push({ key: O, message: x });
+    function _({ index: T, message: b }) {
+      a.value.some((D) => D.key === T) || a.value.push({ key: T, message: b });
     }
-    function _(O) {
-      const x = a.value.indexOf(O);
-      x > -1 && a.value.splice(x, 1);
+    function E(T) {
+      const b = a.value.indexOf(T);
+      b > -1 && a.value.splice(b, 1);
     }
-    const E = ref(!1);
-    function $(O) {
-      f[O.key] = O.data, l.value.forEach((x) => {
+    const x = ref(!1);
+    function y(T) {
+      d[T.key] = T.data, l.value.forEach((b) => {
         var D;
-        (D = x == null ? void 0 : x.setOutData) == null || D.call(x, f);
+        (D = b == null ? void 0 : b.setOutData) == null || D.call(b, d);
       });
     }
-    function y(O, x) {
-      O ? l.value[x] = O : delete l.value[x];
-    }
-    async function v() {
-      var j, X;
-      const O = F.value || [], x = c.value.filter((Z) => Z.type === "report").length, D = c.value.length - x;
-      let T = 0, S = 0;
-      const I = [], B = [];
-      for (let Z = 0; Z < c.value.length; Z++) {
-        const Q = c.value[Z];
-        if (Q.type === "report") {
-          const ee = O[T];
-          if (T += 1, !(ee != null && ee.buildExportConfigs)) continue;
-          w(`正在获取表格数据（${T}/${x}）...`);
-          const ie = await ee.buildExportConfigs();
+    function v(T, b) {
+      T ? l.value[b] = T : delete l.value[b];
+    }
+    async function C() {
+      var W, ee;
+      const T = L.value || [], b = c.value.filter((J) => J.type === "report").length, D = c.value.length - b;
+      let S = 0, R = 0;
+      const k = [], G = [];
+      for (let J = 0; J < c.value.length; J++) {
+        const ne = c.value[J];
+        if (ne.type === "report") {
+          const ae = T[S];
+          if (S += 1, !(ae != null && ae.buildExportConfigs)) continue;
+          $(`正在获取表格数据（${S}/${b}）...`);
+          const ie = await ae.buildExportConfigs(!!f.value.exportAll);
           if (!ie) continue;
-          const ae = getThemeColors(Q.theme || "none").border;
-          I.push({ type: "report", reportConfig: ie, subReportIndex: Q.subReprotIndex || 0 }), ie.forEach((se) => B.push({ type: "report", reportConfig: se, themeColor: ae, theme: Q.theme || "none" }));
+          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 {
-          S += 1, w(`正在截取图表/指标卡（${S}/${D}）...`);
-          const ee = l.value[Z];
-          if (!ee) continue;
+          R += 1, $(`正在截取图表/指标卡（${R}/${D}）...`);
+          const ae = l.value[J];
+          if (!ae) continue;
           let ie = null;
-          Q.type === "label" ? ie = ((j = ee.getLabelImage) == null ? void 0 : j.call(ee)) || null : ie = ((X = ee.getChartImage) == null ? void 0 : X.call(ee)) || null, ie && (I.push({ type: "image", image: ie }), B.push({
+          ne.type === "label" ? ie = ((W = ae.getLabelImage) == null ? void 0 : W.call(ae)) || null : ie = ((ee = ae.getChartImage) == null ? void 0 : ee.call(ae)) || null, ie && (k.push({ type: "image", image: ie }), G.push({
             type: "image",
             src: ie.base64,
             width: ie.width,
             height: ie.height,
-            stretch: Q.type !== "label"
+            stretch: ne.type !== "label"
           }));
         }
       }
-      return { mergeItems: I, printItems: B };
+      return { mergeItems: k, printItems: G };
     }
-    let C = null;
-    function w(O) {
-      C || (C = ElLoading.service({
+    let w = null;
+    function $(T) {
+      w || (w = ElLoading.service({
         target: s.value ?? void 0,
         background: "rgba(255, 255, 255, 0.75)"
-      })), C.setText(O);
+      })), w.setText(T);
     }
-    function b() {
-      C == null || C.close(), C = null;
+    function I() {
+      w == null || w.close(), w = null;
     }
-    async function N(O) {
-      w("正在准备导出...");
+    async function A(T) {
+      $("正在准备导出...");
       try {
-        const { mergeItems: x, printItems: D } = await v();
-        if (!x.length) {
+        const { mergeItems: b, printItems: D } = await C();
+        if (!b.length) {
           ElMessage.warning("当前报表没有可导出的内容");
           return;
         }
-        if (O === "excel") {
-          w("正在生成 Excel 文件...");
-          const T = await exportReportMerged(x, o.value || "报表导出", "gray");
-          T && downloadReport(T, o.value || "报表导出", "excel");
-        } else O.startsWith("pdf") && await exportReportByBrowser(D, u.value, o.value, {
-          onProgress: (T) => w(T),
-          orientation: O === "pdf-landscape" ? "landscape" : "portrait",
-          singlePage: O === "pdf-single"
+        if (T === "excel") {
+          $("正在生成 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),
+          orientation: T === "pdf-landscape" ? "landscape" : "portrait",
+          singlePage: T === "pdf-single"
         });
       } finally {
-        b();
+        I();
       }
     }
-    const R = ref(!1), A = ref(/* @__PURE__ */ new Map()), k = ref(/* @__PURE__ */ new Map()), F = ref([]);
-    async function L() {
-      var D, T;
-      if (F.value) {
-        const S = F.value.filter((I) => I && typeof I.renderHandler == "function").map((I) => I.renderHandler());
-        S.length > 0 && (n.value = !0, await Promise.all(S), n.value = !1);
+    const O = ref(!1), N = ref(/* @__PURE__ */ new Map()), U = ref(/* @__PURE__ */ new Map()), L = ref([]);
+    async function M() {
+      var D, S;
+      if (L.value) {
+        const R = L.value.filter((k) => k && typeof k.renderHandler == "function").map((k) => k.renderHandler());
+        R.length > 0 && (n.value = !0, await Promise.all(R), n.value = !1);
       }
-      const O = /* @__PURE__ */ new Map(), x = /* @__PURE__ */ new Map();
-      if (F.value) {
-        for (let S = 0; S < c.value.length; S++)
-          if (c.value[S].type === "report") {
-            const I = F.value.find((B, j) => c.value.filter((Z) => Z.type === "report")[j] === c.value[S]);
-            I && ((T = (D = c.value[S].data) == null ? void 0 : D.source) != null && T.some((B) => B.loopTable) ? I.batchTableConfigs && x.set(
-              S,
-              I.batchTableConfigs.map((B) => B.length > 0 ? [B[0]] : [])
-            ) : I.tableConfig && O.set(S, I.tableConfig.length > 0 ? [I.tableConfig[0]] : []));
+      const T = /* @__PURE__ */ new Map(), b = /* @__PURE__ */ new Map();
+      if (L.value) {
+        for (let R = 0; R < c.value.length; R++)
+          if (c.value[R].type === "report") {
+            const k = L.value.find((G, W) => c.value.filter((J) => J.type === "report")[W] === c.value[R]);
+            k && ((S = (D = c.value[R].data) == null ? void 0 : D.source) != null && S.some((G) => G.loopTable) ? k.batchTableConfigs && b.set(
+              R,
+              k.batchTableConfigs.map((G) => G.length > 0 ? [G[0]] : [])
+            ) : k.tableConfig && T.set(R, k.tableConfig.length > 0 ? [k.tableConfig[0]] : []));
           }
       }
-      A.value = O, k.value = x, R.value = !0;
+      N.value = T, U.value = b, O.value = !0;
     }
     return onMounted(() => {
-      m(r.id);
-    }), (O, x) => {
+      g(r.id);
+    }), (T, b) => {
       const D = resolveDirective("loading");
       return openBlock(), createElementBlock(Fragment, null, [
         createElementVNode("div", _hoisted_1$1, [
           createElementVNode("span", _hoisted_2$1, toDisplayString(o.value), 1),
-          d.value ? createCommentVNode("", !0) : (openBlock(), createElementBlock("div", _hoisted_3$1, [
+          p.value ? createCommentVNode("", !0) : (openBlock(), createElementBlock("div", _hoisted_3$1, [
             createVNode(unref(ElDropdown), {
               trigger: "click",
-              onCommand: N
+              onCommand: A
             }, {
               dropdown: withCtx(() => [
                 createVNode(unref(ElDropdownMenu), null, {
                   default: withCtx(() => [
                     createVNode(unref(ElDropdownItem), { command: "excel" }, {
-                      default: withCtx(() => [...x[2] || (x[2] = [
-                        createElementVNode("i", { class: "yhreport-icon report-excel" }, null, -1),
-                        createTextVNode("导出Excel", -1)
-                      ])]),
-                      _: 1
-                    }),
-                    createVNode(unref(ElDropdownItem), {
-                      command: "pdf",
-                      divided: ""
-                    }, {
-                      default: withCtx(() => [...x[3] || (x[3] = [
-                        createElementVNode("i", { class: "yhreport-icon report-pdf" }, null, -1),
-                        createTextVNode("导出PDF（纵向）", -1)
-                      ])]),
+                      default: withCtx(() => [
+                        b[2] || (b[2] = createElementVNode("i", { class: "yhreport-icon report-excel" }, null, -1)),
+                        createTextVNode(toDisplayString(f.value.exportAll ? "导出Excel（全部数据）" : "导出Excel"), 1)
+                      ]),
                       _: 1
                     }),
-                    createVNode(unref(ElDropdownItem), { command: "pdf-landscape" }, {
-                      default: withCtx(() => [...x[4] || (x[4] = [
-                        createElementVNode("i", { class: "yhreport-icon report-pdf" }, null, -1),
-                        createTextVNode("导出PDF（横向）", -1)
-                      ])]),
-                      _: 1
-                    }),
-                    createVNode(unref(ElDropdownItem), { command: "pdf-single" }, {
-                      default: withCtx(() => [...x[5] || (x[5] = [
-                        createElementVNode("i", { class: "yhreport-icon report-pdf" }, null, -1),
-                        createTextVNode("导出PDF（屏幕宽度）", -1)
-                      ])]),
-                      _: 1
-                    })
+                    f.value.pdfEnabled ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+                      createVNode(unref(ElDropdownItem), {
+                        command: "pdf",
+                        divided: ""
+                      }, {
+                        default: withCtx(() => [...b[3] || (b[3] = [
+                          createElementVNode("i", { class: "yhreport-icon report-pdf" }, null, -1),
+                          createTextVNode("导出PDF（纵向）", -1)
+                        ])]),
+                        _: 1
+                      }),
+                      createVNode(unref(ElDropdownItem), { command: "pdf-landscape" }, {
+                        default: withCtx(() => [...b[4] || (b[4] = [
+                          createElementVNode("i", { class: "yhreport-icon report-pdf" }, null, -1),
+                          createTextVNode("导出PDF（横向）", -1)
+                        ])]),
+                        _: 1
+                      }),
+                      createVNode(unref(ElDropdownItem), { command: "pdf-single" }, {
+                        default: withCtx(() => [...b[5] || (b[5] = [
+                          createElementVNode("i", { class: "yhreport-icon report-pdf" }, null, -1),
+                          createTextVNode("导出PDF（屏幕宽度）", -1)
+                        ])]),
+                        _: 1
+                      })
+                    ], 64)) : createCommentVNode("", !0)
                   ]),
                   _: 1
                 })
@@ -11794,7 +11800,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
                   type: "primary",
                   size: "small"
                 }, {
-                  default: withCtx(() => [...x[1] || (x[1] = [
+                  default: withCtx(() => [...b[1] || (b[1] = [
                     createElementVNode("i", { class: "yhreport-icon report-export" }, null, -1),
                     createTextVNode(" 导出报表 ", -1)
                   ])]),
@@ -11805,13 +11811,13 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
             })
           ]))
         ]),
-        d.value ? (openBlock(), createElementBlock("div", _hoisted_4$1, [
+        p.value ? (openBlock(), createElementBlock("div", _hoisted_4$1, [
           createVNode(unref(ElButton), {
             type: "primary",
             size: "small",
-            onClick: L
+            onClick: M
           }, {
-            default: withCtx(() => [...x[6] || (x[6] = [
+            default: withCtx(() => [...b[6] || (b[6] = [
               createTextVNode(" 打印预览 ", -1)
             ])]),
             _: 1
@@ -11825,69 +11831,69 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
           }, null, 8, ["sub-title"])
         ])) : withDirectives((openBlock(), createElementBlock("section", {
           key: 2,
-          class: normalizeClass(["yh-report-viewer-wrapper", { "print-mode": d.value }]),
-          style: normalizeStyle(p.value),
+          class: normalizeClass(["yh-report-viewer-wrapper", { "print-mode": p.value }]),
+          style: normalizeStyle(m.value),
           ref_key: "viewWrapper",
           ref: s
         }, [
-          (openBlock(!0), createElementBlock(Fragment, null, renderList(a.value, (T) => (openBlock(), createBlock(unref(ElAlert), {
-            key: T.key,
+          (openBlock(!0), createElementBlock(Fragment, null, renderList(a.value, (S) => (openBlock(), createBlock(unref(ElAlert), {
+            key: S.key,
             class: "yh-report-data-source-error",
             type: "error",
             "show-icon": "",
             closable: !0,
-            title: T.message,
-            onClose: (S) => _(T)
+            title: S.message,
+            onClose: (R) => E(S)
           }, null, 8, ["title", "onClose"]))), 128)),
-          (openBlock(!0), createElementBlock(Fragment, null, renderList(c.value, (T, S) => (openBlock(), createElementBlock(Fragment, null, [
-            T.type === "report" ? (openBlock(), createBlock(_sfc_main$6, {
+          (openBlock(!0), createElementBlock(Fragment, null, renderList(c.value, (S, R) => (openBlock(), createElementBlock(Fragment, null, [
+            S.type === "report" ? (openBlock(), createBlock(_sfc_main$6, {
               key: 0,
-              "is-print-mode": d.value,
+              "is-print-mode": p.value,
               ref_for: !0,
               ref_key: "reportViewItemRefs",
-              ref: F,
-              index: S,
+              ref: L,
+              index: R,
               length: c.value.length,
               id: t.id,
               name: o.value,
-              config: T,
-              onUpdateData: $,
-              onReportError: g
-            }, null, 8, ["is-print-mode", "index", "length", "id", "name", "config"])) : T.type === "label" ? (openBlock(), createBlock(labelItem, {
+              config: S,
+              onUpdateData: y,
+              onReportError: _
+            }, null, 8, ["is-print-mode", "index", "length", "id", "name", "config"])) : S.type === "label" ? (openBlock(), createBlock(labelItem, {
               key: 1,
               ref_for: !0,
-              ref: (I) => y(I, S),
-              index: S,
+              ref: (k) => v(k, R),
+              index: R,
               length: c.value.length,
               id: t.id,
-              config: T,
-              onReportError: g
+              config: S,
+              onReportError: _
             }, null, 8, ["index", "length", "id", "config"])) : (openBlock(), createBlock(_sfc_main$4, {
               key: 2,
               ref_for: !0,
-              ref: (I) => y(I, S),
-              config: T,
+              ref: (k) => v(k, R),
+              config: S,
               id: t.id,
-              index: S,
+              index: R,
               length: c.value.length
             }, null, 8, ["config", "id", "index", "length"]))
           ], 64))), 256)),
-          withDirectives(createElementVNode("div", _hoisted_6$1, [...x[7] || (x[7] = [
+          withDirectives(createElementVNode("div", _hoisted_6$1, [...b[7] || (b[7] = [
             createElementVNode("i", { class: "iconfont icon-backtop" }, null, -1)
           ])], 512), [
-            [vShow, E.value]
+            [vShow, x.value]
           ])
         ], 6)), [
           [D, n.value]
         ]),
         createVNode(_sfc_main$2, {
-          visible: R.value,
-          "onUpdate:visible": x[0] || (x[0] = (T) => R.value = T),
+          visible: O.value,
+          "onUpdate:visible": b[0] || (b[0] = (S) => O.value = S),
           configs: c.value,
           "print-config": u.value,
           "statement-name": o.value,
-          "table-configs": A.value,
-          "batch-table-configs": k.value
+          "table-configs": N.value,
+          "batch-table-configs": U.value
         }, null, 8, ["visible", "configs", "print-config", "statement-name", "table-configs", "batch-table-configs"])
       ], 64);
     };
@@ -12139,7 +12145,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, $ = await printerClient.printReport({
+      const _ = p.printConfig, E = _ && typeof _.width == "number" ? { widthMm: _.width, heightMm: typeof _.height == "number" ? _.height : 297 } : void 0, x = await printerClient.printReport({
         options: p.remoteOptions,
         printConfig: p.printConfig,
         statementName: p.name,
@@ -12148,7 +12154,7 @@ function usePrinterClient() {
         copies: f,
         pageSize: E
       });
-      return $.success ? ElMessage.success(`打印已发送：${g}，共 ${$.copies || f} 份`) : ElMessage.error($.message || "打印失败"), $;
+      return x.success ? ElMessage.success(`打印已发送：${g}，共 ${x.copies || f} 份`) : ElMessage.error(x.message || "打印失败"), x;
     } finally {
       printerClient.printing.value = !1;
     }
@@ -12244,9 +12250,9 @@ const _hoisted_1 = ["title"], _hoisted_2 = { class: "user-actions" }, _hoisted_3
         `打印机：${n.value}`,
         `时间：${m}`,
         "如能正常打印，说明连接与打印机配置正确"
-      ], _ = g.map((E, $) => {
-        const y = { ...defaultCell, text: E, row: $ + 1, col: 1 };
-        return y.style = { ...y.style, fontWeight: $ === 0 ? "bold" : "normal" }, [y];
+      ], _ = 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];
       });
       return [
         {
@@ -12273,7 +12279,7 @@ const _hoisted_1 = ["title"], _hoisted_2 = { class: "user-actions" }, _hoisted_3
       ];
     }
     return (m, g) => {
-      const _ = resolveComponent("YhIcon"), E = resolveComponent("el-button"), $ = resolveComponent("el-input"), y = resolveComponent("el-divider"), v = resolveComponent("el-popover");
+      const _ = resolveComponent("YhIcon"), E = resolveComponent("el-button"), x = resolveComponent("el-input"), y = resolveComponent("el-divider"), v = resolveComponent("el-popover");
       return openBlock(), createBlock(v, {
         placement: "bottom",
         "popper-class": "yh-printer-popover",
@@ -12304,7 +12310,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($, {
+              createVNode(x, {
                 modelValue: i.value,
                 "onUpdate:modelValue": g[0] || (g[0] = (C) => i.value = C),
                 size: "small",
@@ -12382,7 +12388,7 @@ async function registerRoute(t, e) {
       title: "报表列表",
       icon: "iconfont icon-s-grid"
     },
-    component: () => import("./StatementList-DcYuvG-K.mjs")
+    component: () => import("./StatementList-BFaOwqOO.mjs")
   }), e.addRoute("Index", {
     path: "statement/design/:id",
     name: "报表设计",
@@ -12391,7 +12397,7 @@ async function registerRoute(t, e) {
       title: "报表设计",
       icon: "iconfont icon-s-grid"
     },
-    component: () => import("./StatementDesign-Cxh5YK4D.mjs")
+    component: () => import("./StatementDesign-OzMH3MVW.mjs")
   }), e.addRoute("Index", {
     path: "statement/detail/:id",
     name: "后台报表查看",
@@ -12400,7 +12406,7 @@ async function registerRoute(t, e) {
       title: "后台报表查看",
       icon: "iconfont icon-s-grid"
     },
-    component: () => import("./StatementDetail-Cx7VdXGa.mjs")
+    component: () => import("./StatementDetail-DkOrmDr6.mjs")
   })), e.addRoute({
     path: "/statementdetail/:id",
     name: "报表查看",
@@ -12411,7 +12417,7 @@ async function registerRoute(t, e) {
       isWhite: !0
     },
     props: !0,
-    component: () => import("./StatementDetail-Cx7VdXGa.mjs")
+    component: () => import("./StatementDetail-DkOrmDr6.mjs")
   }), e.hasRoute("Index") && e.addRoute("Index", {
     path: "innerStatementdetail/:id",
     name: "系统内报表查看",
@@ -12422,7 +12428,7 @@ async function registerRoute(t, e) {
       noPadding: !0
     },
     props: !0,
-    component: () => import("./StatementDetail-Cx7VdXGa.mjs")
+    component: () => import("./StatementDetail-DkOrmDr6.mjs")
   });
 }
 const index = {
@@ -12488,31 +12494,32 @@ function dynamicReportView(t) {
   );
 }
 export {
-  applyBorderOperation as A,
-  validateAndCompleteTableConfig as B,
+  getLoopSourceColumns as A,
+  applyBorderOperation as B,
   CellType as C,
-  DEFAULT_PRINT_CONFIG as D,
-  DEFAULT_PRINT_HEADER as E,
+  DEFAULT_EXPORT_CONFIG as D,
+  validateAndCompleteTableConfig as E,
   FormatType as F,
-  DEFAULT_PRINT_FOOTER as G,
-  DEFAULT_PRINT_WATERMARK as H,
-  chartsTypeList as I,
-  getDateSourceColumns as J,
-  getDateSourceList as K,
-  getDateSourceData as L,
-  transformArrayToObject as M,
-  _sfc_main$1 as N,
-  _sfc_main$2 as O,
-  ItemTypes as P,
-  getReportDefaultOption as Q,
-  PrinterClient as R,
-  index as S,
+  DEFAULT_PRINT_HEADER as G,
+  DEFAULT_PRINT_FOOTER as H,
+  DEFAULT_PRINT_WATERMARK as I,
+  chartsTypeList as J,
+  getDateSourceColumns as K,
+  getDateSourceList as L,
+  getDateSourceData as M,
+  transformArrayToObject as N,
+  _sfc_main$1 as O,
+  _sfc_main$2 as P,
+  ItemTypes as Q,
+  getReportDefaultOption as R,
+  PrinterClient as S,
   TypeItems as T,
-  dynamicReportView as U,
-  fetchReportForPrint as V,
-  printReportByBrowser as W,
-  silenceExport as X,
-  usePrinterClient as Y,
+  index as U,
+  dynamicReportView as V,
+  fetchReportForPrint as W,
+  printReportByBrowser as X,
+  silenceExport as Y,
+  usePrinterClient as Z,
   _export_sfc as _,
   del as a,
   defaultCol as b,
@@ -12521,24 +12528,24 @@ export {
   defaultCell as e,
   defaultRow as f,
   getList as g,
-  completeBasicReportProperties as h,
-  getConfig as i,
-  getThemeColors as j,
-  renderCellStyle as k,
-  getBorderCss as l,
-  componentTransition as m,
+  DEFAULT_PRINT_CONFIG as h,
+  completeBasicReportProperties as i,
+  getConfig as j,
+  getThemeColors as k,
+  renderCellStyle as l,
+  getBorderCss as m,
   normalizeBorder as n,
-  mmToPx as o,
+  componentTransition as o,
   parseExpression as p,
-  colors as q,
+  mmToPx as q,
   rct as r,
   save as s,
-  chartItem as t,
-  DataSourceColumnDataType as u,
-  DATE_RANGE_TYPES as v,
-  parseShiftOffset as w,
-  formatShiftOffset as x,
-  numberToColumn as y,
-  getLoopSourceColumns as z
-};
-//# sourceMappingURL=index-Dm_dNt8a.mjs.map
+  colors as t,
+  chartItem as u,
+  DataSourceColumnDataType as v,
+  DATE_RANGE_TYPES as w,
+  parseShiftOffset as x,
+  formatShiftOffset as y,
+  numberToColumn as z
+};
+//# sourceMappingURL=index-D5s-AlK7.mjs.map