yh-report 2.0.18 → 2.0.19

package/{index-bd85b7d3.mjs → index-d5e71e5f.mjs}

@@ -756,8 +756,8 @@ ${a}`,
             if (t.groupBy) {
               let m = {};
               E.forEach((w) => {
-                let M = w[d], P = w[C];
-                M && !isNaN(P) && (m[M] || (m[M] = 0), m[M] = P);
+                let M = w[d], B = w[C];
+                M && !isNaN(B) && (m[M] || (m[M] = 0), m[M] = B);
               }), k = n.map((w) => m[w]);
             } else
               k = E.map((m) => m[C]);
@@ -767,8 +767,8 @@ ${a}`,
             if (t.groupBy) {
               let m = {};
               E.forEach((w) => {
-                let M = w[d], P = w[C];
-                M && !isNaN(P) && (m[M] || (m[M] = 0), m[M] = P);
+                let M = w[d], B = w[C];
+                M && !isNaN(B) && (m[M] || (m[M] = 0), m[M] = B);
               }), k = n.map((w) => ({ value: m[w], name: w }));
             } else
               k = E.map((m) => ({ value: m[C], name: m[d] }));
@@ -778,8 +778,8 @@ ${a}`,
             if (t.groupBy) {
               let m = {};
               E.forEach((w) => {
-                let M = w[d], P = w[C];
-                M && !isNaN(P) && (m[M] || (m[M] = 0), m[M] = P);
+                let M = w[d], B = w[C];
+                M && !isNaN(B) && (m[M] || (m[M] = 0), m[M] = B);
               }), k = n.map((w) => [w, m[w]]);
             } else
               k = E.map((m) => [m[d], m[C]]);
@@ -789,10 +789,10 @@ ${a}`,
             if (t.groupBy) {
               let m = {};
               E.forEach((w) => {
-                let M = w[d], P = w[C];
-                M && !isNaN(P) && (m[M] || (m[M] = 0), m[M] = P);
+                let M = w[d], B = w[C];
+                M && !isNaN(B) && (m[M] || (m[M] = 0), m[M] = B);
               }), k = n.map((w) => {
-                const M = w ? w.split("").map((P) => P.charCodeAt()) : [];
+                const M = w ? w.split("").map((B) => B.charCodeAt()) : [];
                 return [m[w], M];
               });
             } else
@@ -876,13 +876,13 @@ var dayjs_min = { exports: {} };
   (function(r, a) {
     t.exports = a();
   })(commonjsGlobal, function() {
-    var r = 1e3, a = 6e4, n = 36e5, d = "millisecond", s = "second", g = "minute", u = "hour", E = "day", C = "week", x = "month", k = "quarter", m = "year", w = "date", M = "Invalid Date", P = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/, J = /\[([^\]]+)]|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, j = { 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(p) {
+    var r = 1e3, a = 6e4, n = 36e5, d = "millisecond", s = "second", g = "minute", u = "hour", E = "day", C = "week", x = "month", k = "quarter", m = "year", w = "date", M = "Invalid Date", B = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/, J = /\[([^\]]+)]|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, j = { 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(p) {
       var c = ["th", "st", "nd", "rd"], o = p % 100;
       return "[" + p + (c[(o - 20) % 10] || c[o] || c[0]) + "]";
     } }, W = function(p, c, o) {
       var f = String(p);
       return !f || f.length >= c ? p : "" + Array(c + 1 - f.length).join(o) + p;
-    }, ne = { s: W, z: function(p) {
+    }, ae = { s: W, z: function(p) {
       var c = -p.utcOffset(), o = Math.abs(c), f = Math.floor(o / 60), l = o % 60;
       return (c <= 0 ? "+" : "-") + W(f, 2, "0") + ":" + W(l, 2, "0");
     }, m: function p(c, o) {
@@ -920,7 +920,7 @@ var dayjs_min = { exports: {} };
         return p.clone();
       var o = typeof c == "object" ? c : {};
       return o.date = p, o.args = arguments, new v(o);
-    }, H = ne;
+    }, H = ae;
     H.l = ee, H.i = Z, H.w = function(p, c) {
       return X(p, { locale: c.$L, utc: c.$u, x: c.$x, $offset: c.$offset });
     };
@@ -939,7 +939,7 @@ var dayjs_min = { exports: {} };
           if (l instanceof Date)
             return new Date(l);
           if (typeof l == "string" && !/Z$/i.test(l)) {
-            var i = l.match(P);
+            var i = l.match(B);
             if (i) {
               var D = i[2] - 1 || 0, S = (i[7] || "0").substring(0, 3);
               return y ? new Date(Date.UTC(i[1], D, i[3] || 1, i[4] || 0, i[5] || 0, i[6] || 0, S)) : new Date(i[1], D, i[3] || 1, i[4] || 0, i[5] || 0, i[6] || 0, S);
@@ -969,19 +969,19 @@ var dayjs_min = { exports: {} };
         return this.$d.getTime();
       }, c.startOf = function(o, f) {
         var l = this, y = !!H.u(f) || f, i = H.p(o), D = function(T, _) {
-          var $ = H.w(l.$u ? Date.UTC(l.$y, _, T) : new Date(l.$y, _, T), l);
-          return y ? $ : $.endOf(E);
+          var I = H.w(l.$u ? Date.UTC(l.$y, _, T) : new Date(l.$y, _, T), l);
+          return y ? I : I.endOf(E);
         }, S = function(T, _) {
           return H.w(l.toDate()[T].apply(l.toDate("s"), (y ? [0, 0, 0, 0] : [23, 59, 59, 999]).slice(_)), l);
-        }, B = this.$W, z = this.$M, L = this.$D, N = "set" + (this.$u ? "UTC" : "");
+        }, P = this.$W, U = this.$M, L = this.$D, N = "set" + (this.$u ? "UTC" : "");
         switch (i) {
           case m:
             return y ? D(1, 0) : D(31, 11);
           case x:
-            return y ? D(1, z) : D(0, z + 1);
+            return y ? D(1, U) : D(0, U + 1);
           case C:
-            var F = this.$locale().weekStart || 0, O = (B < F ? B + 7 : B) - F;
-            return D(y ? L - O : L + (6 - O), z);
+            var F = this.$locale().weekStart || 0, O = (P < F ? P + 7 : P) - F;
+            return D(y ? L - O : L + (6 - O), U);
           case E:
           case w:
             return S(N + "Hours", 0);
@@ -999,8 +999,8 @@ var dayjs_min = { exports: {} };
       }, c.$set = function(o, f) {
         var l, y = H.p(o), i = "set" + (this.$u ? "UTC" : ""), D = (l = {}, l[E] = i + "Date", l[w] = i + "Date", l[x] = i + "Month", l[m] = i + "FullYear", l[u] = i + "Hours", l[g] = i + "Minutes", l[s] = i + "Seconds", l[d] = i + "Milliseconds", l)[y], S = y === E ? this.$D + (f - this.$W) : f;
         if (y === x || y === m) {
-          var B = this.clone().set(w, 1);
-          B.$d[D](S), B.init(), this.$d = B.set(w, Math.min(this.$D, B.daysInMonth())).$d;
+          var P = this.clone().set(w, 1);
+          P.$d[D](S), P.init(), this.$d = P.set(w, Math.min(this.$D, P.daysInMonth())).$d;
         } else
           D && this.$d[D](S);
         return this.init(), this;
@@ -1011,9 +1011,9 @@ var dayjs_min = { exports: {} };
       }, c.add = function(o, f) {
         var l, y = this;
         o = Number(o);
-        var i = H.p(f), D = function(z) {
+        var i = H.p(f), D = function(U) {
           var L = X(y);
-          return H.w(L.date(L.date() + Math.round(z * o)), y);
+          return H.w(L.date(L.date() + Math.round(U * o)), y);
         };
         if (i === x)
           return this.set(x, this.$M + o);
@@ -1023,37 +1023,37 @@ var dayjs_min = { exports: {} };
           return D(1);
         if (i === C)
           return D(7);
-        var S = (l = {}, l[g] = a, l[u] = n, l[s] = r, l)[i] || 1, B = this.$d.getTime() + o * S;
-        return H.w(B, this);
+        var S = (l = {}, l[g] = a, l[u] = n, l[s] = r, l)[i] || 1, P = this.$d.getTime() + o * S;
+        return H.w(P, this);
       }, c.subtract = function(o, f) {
         return this.add(-1 * o, f);
       }, c.format = function(o) {
         var f = this, l = this.$locale();
         if (!this.isValid())
           return l.invalidDate || M;
-        var y = o || "YYYY-MM-DDTHH:mm:ssZ", i = H.z(this), D = this.$H, S = this.$m, B = this.$M, z = l.weekdays, L = l.months, N = l.meridiem, F = function(_, $, A, I) {
-          return _ && (_[$] || _(f, y)) || A[$].slice(0, I);
+        var y = o || "YYYY-MM-DDTHH:mm:ssZ", i = H.z(this), D = this.$H, S = this.$m, P = this.$M, U = l.weekdays, L = l.months, N = l.meridiem, F = function(_, I, A, $) {
+          return _ && (_[I] || _(f, y)) || A[I].slice(0, $);
         }, O = function(_) {
           return H.s(D % 12 || 12, _, "0");
-        }, T = N || function(_, $, A) {
-          var I = _ < 12 ? "AM" : "PM";
-          return A ? I.toLowerCase() : I;
+        }, T = N || function(_, I, A) {
+          var $ = _ < 12 ? "AM" : "PM";
+          return A ? $.toLowerCase() : $;
         };
-        return y.replace(J, function(_, $) {
-          return $ || function(A) {
+        return y.replace(J, function(_, I) {
+          return I || function(A) {
             switch (A) {
               case "YY":
                 return String(f.$y).slice(-2);
               case "YYYY":
                 return H.s(f.$y, 4, "0");
               case "M":
-                return B + 1;
+                return P + 1;
               case "MM":
-                return H.s(B + 1, 2, "0");
+                return H.s(P + 1, 2, "0");
               case "MMM":
-                return F(l.monthsShort, B, L, 3);
+                return F(l.monthsShort, P, L, 3);
               case "MMMM":
-                return F(L, B);
+                return F(L, P);
               case "D":
                 return f.$D;
               case "DD":
@@ -1061,11 +1061,11 @@ var dayjs_min = { exports: {} };
               case "d":
                 return String(f.$W);
               case "dd":
-                return F(l.weekdaysMin, f.$W, z, 2);
+                return F(l.weekdaysMin, f.$W, U, 2);
               case "ddd":
-                return F(l.weekdaysShort, f.$W, z, 3);
+                return F(l.weekdaysShort, f.$W, U, 3);
               case "dddd":
-                return z[f.$W];
+                return U[f.$W];
               case "H":
                 return String(D);
               case "HH":
@@ -1097,7 +1097,7 @@ var dayjs_min = { exports: {} };
       }, c.utcOffset = function() {
         return 15 * -Math.round(this.$d.getTimezoneOffset() / 15);
       }, c.diff = function(o, f, l) {
-        var y, i = this, D = H.p(f), S = X(o), B = (S.utcOffset() - this.utcOffset()) * a, z = this - S, L = function() {
+        var y, i = this, D = H.p(f), S = X(o), P = (S.utcOffset() - this.utcOffset()) * a, U = this - S, L = function() {
           return H.m(i, S);
         };
         switch (D) {
@@ -1111,22 +1111,22 @@ var dayjs_min = { exports: {} };
             y = L() / 3;
             break;
           case C:
-            y = (z - B) / 6048e5;
+            y = (U - P) / 6048e5;
             break;
           case E:
-            y = (z - B) / 864e5;
+            y = (U - P) / 864e5;
             break;
           case u:
-            y = z / n;
+            y = U / n;
             break;
           case g:
-            y = z / a;
+            y = U / a;
             break;
           case s:
-            y = z / r;
+            y = U / r;
             break;
           default:
-            y = z;
+            y = U;
         }
         return l ? y : H.a(y);
       }, c.daysInMonth = function() {
@@ -1243,12 +1243,12 @@ const _hoisted_1$1 = { class: "yh-statement-view-conditions" }, _sfc_main$4 = /*
       }
     );
     function m() {
-      let P = [];
+      let B = [];
       if (x.value = [], r.config && r.config.length) {
         for (let J = 0; J < r.config.length; J++) {
           const j = cloneDeep(r.config[J]);
-          let { dataType: W, dateType: ne, type: Q, selectorId: q, name: re, columnName: Z, defaultValue: ee, isNull: X } = j, H = [DataSourceColumnDataType.DATE, DataSourceColumnDataType.DATETIME].includes(W);
-          const { componentName: v, placeholerPrefix: b, type: p } = componentTransition(W, ne);
+          let { dataType: W, dateType: ae, type: Q, selectorId: q, name: re, columnName: Z, defaultValue: ee, isNull: X } = j, H = [DataSourceColumnDataType.DATE, DataSourceColumnDataType.DATETIME].includes(W);
+          const { componentName: v, placeholerPrefix: b, type: p } = componentTransition(W, ae);
           j.formItemType = v, j.placeholder = b + re || Z, p && (j.type = p), j.optionData = [];
           let c = ee || "";
           if (H)
@@ -1279,7 +1279,7 @@ const _hoisted_1$1 = { class: "yh-statement-view-conditions" }, _sfc_main$4 = /*
               label: f,
               value: l
             })));
-          }), P.push(j), Q === "LT_GT_EQ") {
+          }), B.push(j), Q === "LT_GT_EQ") {
             j.placeholder = b + "开始";
             const o = cloneDeep(j);
             o.name = "-", o.columnName = `end_${Z}`, o.placeholder = b + "结束";
@@ -1312,23 +1312,23 @@ const _hoisted_1$1 = { class: "yh-statement-view-conditions" }, _sfc_main$4 = /*
                 label: y,
                 value: i
               })));
-            }), P.push(o);
+            }), B.push(o);
           }
         }
         r.config.map((J) => J.isNull).includes(!0) && nextTick(() => {
           e("change", x.value);
         });
       }
-      k.value = P;
+      k.value = B;
     }
-    function w(P, J) {
+    function w(B, J) {
       let j = x.value.findIndex((W) => W.name === J.columnName);
-      J.value = P, x.value[j].value = P, ["ElSelect", "ElTreeSelect", "ElSwitch", "ElDatePicker", "ElTimePicker", "ElColorPicker"].includes(J.formItemType) && e("change", x.value);
+      J.value = B, x.value[j].value = B, ["ElSelect", "ElTreeSelect", "ElSwitch", "ElDatePicker", "ElTimePicker", "ElColorPicker"].includes(J.formItemType) && e("change", x.value);
     }
-    function M(P) {
-      ["ElInput", "ElInputNumber"].includes(P.formItemType) && e("change", x.value);
+    function M(B) {
+      ["ElInput", "ElInputNumber"].includes(B.formItemType) && e("change", x.value);
     }
-    return (P, J) => (openBlock(), createElementBlock("div", _hoisted_1$1, [
+    return (B, J) => (openBlock(), createElementBlock("div", _hoisted_1$1, [
       createVNode(unref(ElForm), { inline: "" }, {
         default: withCtx(() => [
           (openBlock(!0), createElementBlock(Fragment, null, renderList(k.value, (j) => withDirectives((openBlock(), createBlock(unref(ElFormItem), {
@@ -1372,7 +1372,7 @@ const _hoisted_1$1 = { class: "yh-statement-view-conditions" }, _sfc_main$4 = /*
         ]),
         _: 1
       }),
-      renderSlot(P.$slots, "search")
+      renderSlot(B.$slots, "search")
     ]));
   }
 }), reportConditions_vue_vue_type_style_index_0_lang = "";
@@ -2293,10 +2293,16 @@ function changeConfig(config) {
           ...cell.colData,
           ...cell.rowData
         };
+        console.log(cell);
         const fun = function() {
           return eval(
             `async (cell,data) => {
+            let style = {
+              ...cell.style
+            }
             ${cell.customRender}
+            cell.style = style
+            return cell
           }`
           );
         }();
@@ -2521,15 +2527,18 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         if (i) {
           if (l = { ...l, data: i }, p === "row" && l.index !== void 0 && l.index >= 0 && l.index < c.length) {
             const D = c[l.index], S = D.length;
-            for (let B = 0; B < S; B++) {
-              const z = D[B];
-              z.rowData = l.data, z.isStaticData = !0;
+            for (let P = 0; P < S; P++) {
+              const U = D[P];
+              U.data && (U.rowData = l.data, U.isStaticData = !0);
             }
           } else if (p === "col" && l.index !== void 0 && l.index >= 0) {
             const D = c.length;
             for (let S = 0; S < D; S++) {
-              const B = c[S];
-              l.index < B.length && (B[l.index].colData = l.data, B[l.index].isStaticData = !0);
+              const P = c[S];
+              if (l.index < P.length) {
+                const U = P[l.index];
+                U.data && (U.colData = l.data, U.isStaticData = !0);
+              }
             }
           }
         }
@@ -2545,7 +2554,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
       }
       return c;
     }
-    function P(v, b, p, c, o) {
+    function B(v, b, p, c, o) {
       if (c) {
         let i = o.findIndex((D) => D === p);
         p = o[i - 1];
@@ -2566,56 +2575,56 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         let i = {};
         y.forEach((O, T) => {
           i[O] || (i[O] = /* @__PURE__ */ new Set());
-          let $ = l[O].data.replace("row:", "").toUpperCase();
+          let I = l[O].data.replace("row:", "").toUpperCase();
           if (T === 0)
             f.forEach((A) => {
-              if ($) {
-                let I = A[$];
-                if (I) {
-                  const Y = `${O}-${I}`;
-                  i[Y] ? i[Y].push(A) : i[Y] = [A], i[O].add(I), i[I] = [I];
+              if (I) {
+                let $ = A[I];
+                if ($) {
+                  const Y = `${O}-${$}`;
+                  i[Y] ? i[Y].push(A) : i[Y] = [A], i[O].add($), i[$] = [$], i[`${$}-data`] = [A];
                 }
               }
             });
           else {
             let A = y[T - 1];
             Array.from(i[A]).forEach((Y) => {
-              const U = `${A}-${Y}`;
-              let V = i[U].map((G) => {
-                if ($) {
-                  let K = G[$];
+              const z = `${A}-${Y}`;
+              let V = i[z].map((G) => {
+                if (I) {
+                  let K = G[I];
                   if (K) {
                     let te = !1;
-                    const ae = `${O}-${Y}-${K}`, ie = `${Y}-${K}`;
-                    return i[ae] ? i[ae].push(G) : i[ae] = [G], i[O].has(ie) || (te = !0), i[O].add(ie), i[ie] = i[Y].concat([K]), te ? K : null;
+                    const ie = `${O}-${Y}-${K}`, ne = `${Y}-${K}`;
+                    return i[ie] ? i[ie].push(G) : i[ie] = [G], i[ne + "-data"] ? i[ne + "-data"].push(G) : i[ne + "-data"] = [G], i[O].has(ne) || (te = !0), i[O].add(ne), i[ne] = i[Y].concat([K]), te ? K : null;
                   }
                 }
               }).filter((G) => !!G);
-              i[U] = V;
+              i[z] = V;
             });
           }
         });
         let D = 1, S = Math.max(...y);
-        const B = l.some((O) => O.isRowColCombine);
-        y.length > 0 ? B ? D = i[S].size : D = Array.from(i[S]).reduce((O, T) => {
+        const P = l.some((O) => O.isRowColCombine);
+        y.length > 0 ? P ? D = i[S].size : D = Array.from(i[S]).reduce((O, T) => {
           let _ = i[`${S}-${T}`];
           return O + _.length;
         }, 0) : D = f.length;
-        const z = {
+        const U = {
           ...o,
           loop: !1
-        }, L = Array.from({ length: D }, () => cloneDeep(z));
+        }, L = Array.from({ length: D }, () => cloneDeep(U));
         v.splice(o.index, 1, ...L);
         const N = Array.from({ length: l.length }, () => []);
         l.forEach((O, T) => {
           let _ = N[T];
           if (y.includes(O.col))
-            console.log(i[O.col], T, O.col), Array.from(i[O.col]).forEach((A, I) => {
-              let Y = B && T === S ? 1 : P(i, A, S, B, y), U = i[A], R = U[i[A].length - 1], V = {
+            console.log(i[O.col], T, O.col), Array.from(i[O.col]).forEach((A, $) => {
+              let Y = P && T === S ? 1 : B(i, A, S, P, y), z = i[A + "-data"], R = i[A][i[A].length - 1], V = {
                 ...O,
                 text: R,
                 rowSpan: Y,
-                rowData: U
+                rowData: z
               };
               _.push(V);
               let G = {
@@ -2629,16 +2638,16 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
                 _.push(G);
             });
           else if (O.data) {
-            let $ = i[S] ? Array.from(i[S]) : [], A = O.data.replace("row:", "").toUpperCase();
-            O.isRowColCombine ? $.length ? $.forEach((I, Y) => {
-              let U = i[`${S}-${I}`], R = O.combineKeys.map((K, te) => {
-                const ae = O.combineValues[te];
+            let I = i[S] ? Array.from(i[S]) : [], A = O.data.replace("row:", "").toUpperCase();
+            O.isRowColCombine ? I.length ? I.forEach(($, Y) => {
+              let z = i[`${S}-${$}`], R = O.combineKeys.map((K, te) => {
+                const ie = O.combineValues[te];
                 return {
                   key: K,
-                  val: ae
+                  val: ie
                 };
               });
-              const V = U.filter((K) => R.every((te) => K[te.key] === te.val));
+              const V = z.filter((K) => R.every((te) => K[te.key] === te.val));
               let G = {
                 ...O
               };
@@ -2648,49 +2657,49 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
               } else
                 G.text = "", G.rowData = {};
               _.push(G);
-            }) : f.forEach((I) => {
-              let U = O.combineKeys.map((V, G) => {
+            }) : f.forEach(($) => {
+              let z = O.combineKeys.map((V, G) => {
                 const K = O.combineValues[G];
                 return {
                   key: V,
                   val: K
                 };
-              }).every((V) => I[V.key] === V.val), R = {
+              }).every((V) => $[V.key] === V.val), R = {
                 ...O
               };
-              delete R.combineKeys, delete R.combineValues, delete R.isRowColCombine, U ? (R.text = I[A], R.rowData = I) : R.text = "", _.push(R);
-            }) : $.length ? $.forEach((I, Y) => {
-              i[`${S}-${I}`].forEach((R) => {
+              delete R.combineKeys, delete R.combineValues, delete R.isRowColCombine, z ? (R.text = $[A], R.rowData = $) : R.text = "", _.push(R);
+            }) : I.length ? I.forEach(($, Y) => {
+              i[`${S}-${$}`].forEach((R) => {
                 let V = {
                   ...O
                 };
                 delete V.combineKeys, delete V.combineValues, delete V.isRowColCombine, R[A] ? (V.text = R[A], V.rowData = R) : V.text = "", _.push(V);
               });
-            }) : f.forEach((I) => {
+            }) : f.forEach(($) => {
               let Y = {
                 ...O
               };
-              delete Y.combineKeys, delete Y.combineValues, delete Y.isRowColCombine, I[A] ? (Y.text = I[A], Y.rowData = I) : Y.text = "", _.push(Y);
+              delete Y.combineKeys, delete Y.combineValues, delete Y.isRowColCombine, $[A] ? (Y.text = $[A], Y.rowData = $) : Y.text = "", _.push(Y);
             });
           } else {
-            const $ = {
+            const I = {
               ...O,
               rowData: f[0]
             };
             if (O.rowSpan === 0 && O.mergeTarget && O.mergeTarget.length === 2) {
-              let [Y, U] = O.mergeTarget, R = p.reduce((V, G) => V.concat(G), []).filter((V) => V.row === Y && V.col === U)[0];
+              let [Y, z] = O.mergeTarget, R = p.reduce((V, G) => V.concat(G), []).filter((V) => V.row === Y && V.col === z)[0];
               R && (R.rowSpan += D - 1);
             } else
-              $.rowSpan += D - 1;
+              I.rowSpan += D - 1;
             const A = {
               ...O,
               type: "",
               colSpan: 0,
               rowSpan: 0
             };
-            delete $.isRowColCombine;
-            let I = Array.from({ length: D - 1 }, () => cloneDeep(A));
-            _.push($, ...I);
+            delete I.isRowColCombine;
+            let $ = Array.from({ length: D - 1 }, () => cloneDeep(A));
+            _.push(I, ...$);
           }
         });
         const F = M(N);
@@ -2713,32 +2722,32 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
               if (O) {
                 let _ = T[O];
                 if (_) {
-                  const $ = `${L}-${_}`;
-                  i[$] ? i[$].push(T) : i[$] = [T], i[L].add(_), i[_] = [_], i[`${_}-data`] = [T];
+                  const I = `${L}-${_}`;
+                  i[I] ? i[I].push(T) : i[I] = [T], i[L].add(_), i[_] = [_], i[`${_}-data`] = [T];
                 }
               }
             });
           else {
             let T = y[N - 1];
-            Array.from(i[T]).forEach(($) => {
-              const A = `${T}-${$}`;
-              let Y = i[A].map((U) => {
+            Array.from(i[T]).forEach((I) => {
+              const A = `${T}-${I}`;
+              let Y = i[A].map((z) => {
                 if (O) {
-                  let R = U[O];
+                  let R = z[O];
                   if (R) {
                     let V = !1;
-                    const G = `${L}-${$}-${R}`, K = `${$}-${R}`;
-                    return i[G] ? i[G].push(U) : i[G] = [U], i[K + "-data"] ? i[K + "-data"].push(U) : i[K + "-data"] = [U], i[L].has(K) || (V = !0), i[L].add(K), i[K] = i[$].concat([R]), V ? R : null;
+                    const G = `${L}-${I}-${R}`, K = `${I}-${R}`;
+                    return i[G] ? i[G].push(z) : i[G] = [z], i[K + "-data"] ? i[K + "-data"].push(z) : i[K + "-data"] = [z], i[L].has(K) || (V = !0), i[L].add(K), i[K] = i[I].concat([R]), V ? R : null;
                   }
                 }
-              }).filter((U) => !!U);
+              }).filter((z) => !!z);
               i[A] = Y;
             });
           }
         });
-        let D = 1, S = Math.max(...y), B = Math.min(...y);
-        const z = l.some((L) => L.isRowColCombine);
-        y.length > 0 ? z ? D = i[S].size : D = Array.from(i[S]).reduce((L, N) => {
+        let D = 1, S = Math.max(...y), P = Math.min(...y);
+        const U = l.some((L) => L.isRowColCombine);
+        y.length > 0 ? U ? D = i[S].size : D = Array.from(i[S]).reduce((L, N) => {
           let F = i[`${S}-${N}`];
           return L + F.length;
         }, 0) : D = f.length;
@@ -2755,37 +2764,37 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
           if (F && Array.isArray(F)) {
             let O = [];
             if (y.includes(L))
-              Array.from(i[N.row]).forEach((_, $) => {
-                let A = z && L === S ? 1 : P(i, _, S, z, y), I = i[_][i[_].length - 1], Y = {
+              Array.from(i[N.row]).forEach((_, I) => {
+                let A = U && L === S ? 1 : B(i, _, S, U, y), $ = i[_][i[_].length - 1], Y = {
                   ...N,
-                  text: I,
+                  text: $,
                   colSpan: A,
                   colData: i[_ + "-data"]
                 };
                 if (O.push(Y), A > 1) {
-                  let U = {
+                  let z = {
                     ...N,
-                    text: I,
+                    text: $,
                     type: "",
                     colSpan: 0,
                     rowSpan: 0
                   };
                   for (let R = 0; R < A - 1; R++)
-                    O.push(U);
+                    O.push(z);
                 }
               }), F.splice(N.col, 1, ...O);
             else {
-              if (L > B && L < S) {
+              if (L > P && L < S) {
                 let T = J(y, L);
                 if (T !== null) {
                   let _ = p[T].slice(o.index, o.index + D);
-                  _ = _.map(($) => {
-                    let A = $.colData;
+                  _ = _.map((I) => {
+                    let A = I.colData;
                     return Array.isArray(A) && (A = A[0]), {
                       ...N,
                       colData: A,
-                      colSpan: $.colSpan,
-                      rowSpan: $.rowSpan
+                      colSpan: I.colSpan,
+                      rowSpan: I.rowSpan
                     };
                   }), F.splice(o.index, 1, ..._);
                   continue;
@@ -2794,33 +2803,33 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
               if (N.data) {
                 let T = i[S] ? Array.from(i[S]) : [], _ = N.data.replace("col:", "").toUpperCase();
                 if (N.isRowColCombine) {
-                  let $ = y.map((I) => l[I].data.replace("col:", "").toUpperCase()), A = [];
-                  T.forEach((I, Y) => {
-                    let U = {
+                  let I = y.map(($) => l[$].data.replace("col:", "").toUpperCase()), A = [];
+                  T.forEach(($, Y) => {
+                    let z = {
                       ...N,
-                      combineKeys: $,
-                      combineValues: i[I]
+                      combineKeys: I,
+                      combineValues: i[$]
                     };
-                    A.push(U);
+                    A.push(z);
                   }), F.splice(N.col, 1, ...A);
                 } else if (T.length)
-                  T.forEach(($, A) => {
-                    let I = i[`${S}-${$}`], Y = [];
-                    I.forEach((U) => {
+                  T.forEach((I, A) => {
+                    let $ = i[`${S}-${I}`], Y = [];
+                    $.forEach((z) => {
                       let R = {
                         ...N
                       };
-                      delete R.combineKeys, delete R.combineValues, delete R.isRowColCombine, U[_] ? (R.text = U[_], R.colData = U) : R.text = "", Y.push(R);
+                      delete R.combineKeys, delete R.combineValues, delete R.isRowColCombine, z[_] ? (R.text = z[_], R.colData = z) : R.text = "", Y.push(R);
                     }), F.splice(N.col, 1, ...Y);
                   });
                 else {
-                  let $ = [];
+                  let I = [];
                   f.forEach((A) => {
-                    let I = {
+                    let $ = {
                       ...N
                     };
-                    delete I.combineKeys, delete I.combineValues, delete I.isRowColCombine, A[_] ? (I.text = A[_], I.colData = A) : I.text = "", $.push(I);
-                  }), F.splice(N.col, 1, ...$);
+                    delete $.combineKeys, delete $.combineValues, delete $.isRowColCombine, A[_] ? ($.text = A[_], $.colData = A) : $.text = "", I.push($);
+                  }), F.splice(N.col, 1, ...I);
                 }
               } else {
                 const T = {
@@ -2828,7 +2837,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
                   colData: f[0]
                 };
                 if (N.colSpan === 0 && N.mergeTarget && N.mergeTarget.length === 2 && N.row === N.mergeTarget[0]) {
-                  let [A, I] = N.mergeTarget, Y = p.reduce((U, R) => U.concat(R), []).filter((U) => U.row === A && U.col === I)[0];
+                  let [A, $] = N.mergeTarget, Y = p.reduce((z, R) => z.concat(R), []).filter((z) => z.row === A && z.col === $)[0];
                   Y && (Y.colSpan += D - 1);
                 } else
                   (!Array.isArray(N.mergeTarget) || N.mergeTarget.length !== 2) && (T.colSpan = D);
@@ -2837,15 +2846,15 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
                   colSpan: 0,
                   rowSpan: 0
                 };
-                let $ = Array.from({ length: D - 1 }, () => cloneDeep(_));
-                F.splice(N.col, 1, T, ...$);
+                let I = Array.from({ length: D - 1 }, () => cloneDeep(_));
+                F.splice(N.col, 1, T, ...I);
               }
             }
           }
         }
       });
     }
-    function ne(v) {
+    function ae(v) {
       if (r.config && n.value) {
         n.value.innerHTML = "", console.time("transformConfig");
         let { rowConfig: b, colConfig: p, config: c } = cloneDeep(r.config), o = w(p, v, "col", c), f = w(b, v, "row", c);
@@ -2886,10 +2895,10 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         const i = v[y], D = document.createElement("tr");
         i.isFixed && (D.style.top = `${f - 1}px`, D.classList.add("fixed-row")), f += i.size, D.style.height = `${i.size}px`;
         for (let S = 0; S < b.length; S++) {
-          const B = p[y][S];
-          if (i && B && i.size > 0) {
-            const z = q(i, B);
-            z.setAttribute("data-cell-data", `${y}-${S}`), B.rowSpan === 0 || B.colSpan === 0 || D.appendChild(z);
+          const P = p[y][S];
+          if (i && P && i.size > 0) {
+            const U = q(i, P);
+            U.setAttribute("data-cell-data", `${y}-${S}`), P.rowSpan === 0 || P.colSpan === 0 || D.appendChild(U);
           }
         }
         l.appendChild(D);
@@ -2899,7 +2908,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     async function Z() {
       m.value = !0;
       let v = await X(), b = ee(v);
-      r.config.data.processData && (b = await getProcessData(r.config.data.processData, b, E.value)), ne(b), m.value = !1;
+      r.config.data.processData && (b = await getProcessData(r.config.data.processData, b, E.value)), ae(b), m.value = !1;
     }
     function ee(v) {
       let b = {};
@@ -3165,8 +3174,8 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     );
     function C(m) {
       m ? (n.value = !1, a.value = !0, getConfig(m).then(async (w) => {
-        let { name: M, remoteOptions: P } = w;
-        d.value = M, u.value = P;
+        let { name: M, remoteOptions: B } = w;
+        d.value = M, u.value = B;
       }).finally(() => {
         a.value = !1;
       })) : n.value = !0;
@@ -3192,7 +3201,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
           default: withCtx(() => [
             createVNode(unref(ElButton), {
               type: "primary",
-              onClick: w[0] || (w[0] = (P) => m.$router.back())
+              onClick: w[0] || (w[0] = (B) => m.$router.back())
             }, {
               default: withCtx(() => [
                 createTextVNode(" 返回 ")
@@ -3207,15 +3216,15 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
           ref_key: "viewWrapper",
           ref: s
         }, [
-          (openBlock(!0), createElementBlock(Fragment, null, renderList(u.value, (P, J) => (openBlock(), createElementBlock(Fragment, null, [
-            P.type === "report" ? (openBlock(), createBlock(_sfc_main$3, {
+          (openBlock(!0), createElementBlock(Fragment, null, renderList(u.value, (B, J) => (openBlock(), createElementBlock(Fragment, null, [
+            B.type === "report" ? (openBlock(), createBlock(_sfc_main$3, {
               key: 0,
               index: J,
-              config: P,
+              config: B,
               onUpdateData: k
             }, null, 8, ["index", "config"])) : (openBlock(), createBlock(_sfc_main$1, {
               key: 1,
-              config: P,
+              config: B,
               ref_for: !0,
               ref_key: "chartViewItemRef",
               ref: g,
@@ -3242,7 +3251,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         title: "报表列表",
         icon: "iconfont icon-s-grid"
       },
-      component: () => import("./StatementList-e0bf4f12.mjs")
+      component: () => import("./StatementList-ba318e74.mjs")
     }), r.addRoute("Index", {
       path: "statement/design/:id",
       name: "报表设计",
@@ -3251,7 +3260,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         title: "报表设计",
         icon: "iconfont icon-s-grid"
       },
-      component: () => import("./StatementDesign-d92e1f36.mjs")
+      component: () => import("./StatementDesign-885718f0.mjs")
     }), r.addRoute("Index", {
       path: "statement/detail/:id",
       name: "后台报表查看",
@@ -3260,7 +3269,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         title: "后台报表查看",
         icon: "iconfont icon-s-grid"
       },
-      component: () => import("./StatementDetail-509cca8d.mjs")
+      component: () => import("./StatementDetail-5756056a.mjs")
     })), r.addRoute({
       path: "/statementdetail/:id",
       name: "报表查看",
@@ -3269,7 +3278,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         title: "报表查看",
         icon: "iconfont icon-s-grid"
       },
-      component: () => import("./StatementDetail-509cca8d.mjs")
+      component: () => import("./StatementDetail-5756056a.mjs")
     });
   }
 };
@@ -3325,4 +3334,4 @@ export {
   renderCellStyle as r,
   save as s
 };
-//# sourceMappingURL=index-bd85b7d3.mjs.map
+//# sourceMappingURL=index-d5e71e5f.mjs.map