qk-pc-ui 3.4.2 → 3.4.3

package/dist/qk-pc-ui.mjs

@@ -1,11 +1,11 @@
-import { openBlock, createElementBlock, createVNode, unref, withCtx, renderSlot, createTextVNode, toDisplayString, computed, createElementVNode, createBlock, createCommentVNode, ref, reactive, watch, Fragment, renderList, onMounted, normalizeStyle, useSlots, nextTick, onBeforeUnmount, normalizeClass, onUnmounted, withDirectives, vModelText, withKeys } from "vue";
+import { openBlock, createElementBlock, createVNode, unref, withCtx, renderSlot, createTextVNode, toDisplayString, computed, createElementVNode, createBlock, createCommentVNode, ref, reactive, watch, Fragment, renderList, onMounted, normalizeStyle, useSlots, nextTick, mergeModels, useModel, onBeforeUnmount, normalizeClass, onUnmounted, withDirectives, vModelText, withKeys } from "vue";
 import { ElForm, ElFormItem, ElButton, ElPagination, ElDialog, ElRow, ElSelect, ElOption, ElMessageBox, ElMessage, ElTable, ElTableColumn, ElPopover, ElIcon, ElInput, ElCheckboxGroup, ElCheckbox, ElImage, ElLink, ElDropdown, ElDropdownMenu, ElDropdownItem, ElLoading, ElDatePicker, ElUpload, ElButtonGroup, ElRadioGroup, ElRadioButton, ElSwitch, ElTag, ElTabs, ElTabPane, ElCascader } from "element-plus";
 import { L, Sleep, SaasApi, AndroidApi, GetUrlParam, SystemModuleApi, AjaxCallWeb, LocalApi, GetEnumName, MemberApi, UnRegisterKeyboard, RegisterKeyboard, PlayTTS, InfrastructureApi } from "qk-lib-v3";
 import { Setting, Plus } from "@element-plus/icons-vue";
 import E from "wangeditor";
 import axios from "axios";
 import { useRouter, useRoute } from "vue-router";
-const _sfc_main$m = {
+const _sfc_main$o = {
   __name: "Filter",
   props: {
     labelWidth: { type: String, default: "" }
@@ -44,7 +44,7 @@ const _sfc_main$m = {
   for (const [a, n] of r)
     t[a] = n;
   return t;
-}, _hoisted_1$f = { class: "tmain" }, _sfc_main$l = {
+}, _hoisted_1$h = { class: "tmain" }, _sfc_main$n = {
   __name: "Tool",
   props: ["total", "pageIndex", "pageSize"],
   emits: ["update:pageIndex", "update:pageSize", "updateData"],
@@ -62,7 +62,7 @@ const _sfc_main$m = {
       },
       get: () => t.pageSize
     });
-    return (l, o) => (openBlock(), createElementBlock("div", _hoisted_1$f, [
+    return (l, o) => (openBlock(), createElementBlock("div", _hoisted_1$h, [
       createElementVNode("div", null, [
         renderSlot(l.$slots, "ToolItem", {}, void 0, !0)
       ]),
@@ -83,7 +83,7 @@ const _sfc_main$m = {
       ])
     ]));
   }
-}, Tool = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["__scopeId", "data-v-638a8f96"]]);
+}, Tool = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["__scopeId", "data-v-638a8f96"]]);
 /*! xlsx.js (C) 2013-present SheetJS -- http://sheetjs.com */
 var XLSX = {};
 XLSX.version = "0.18.5";
@@ -364,8 +364,8 @@ var table_fmt = {
   44: '_("$"* #,##0.00_);_("$"* \\(#,##0.00\\);_("$"* "-"??_);_(@_)'
 };
 function SSF_frac(e, r, t) {
-  for (var a = e < 0 ? -1 : 1, n = e * a, i = 0, s = 1, l = 0, o = 1, f = 0, c = 0, p = Math.floor(n); f < r && (p = Math.floor(n), l = p * s + i, c = p * f + o, !(n - p < 5e-8)); )
-    n = 1 / (n - p), i = s, s = l, o = f, f = c;
+  for (var a = e < 0 ? -1 : 1, n = e * a, i = 0, s = 1, l = 0, o = 1, f = 0, c = 0, h = Math.floor(n); f < r && (h = Math.floor(n), l = h * s + i, c = h * f + o, !(n - h < 5e-8)); )
+    n = 1 / (n - h), i = s, s = l, o = f, f = c;
   if (c > r && (f > r ? (c = o, l = i) : (c = f, l = s)), !t) return [0, a * l, c];
   var _ = Math.floor(a * l / c);
   return [_, a * l - _ * c, c];
@@ -656,8 +656,8 @@ function write_num_flt(e, r, t) {
     return n = pad0r(t, 0), r.length <= n.length ? n : hashq(r.substr(0, r.length - n.length)) + n;
   if (i = r.match(/^([#0?]+)\.([#0]+)$/)) {
     n = "" + t.toFixed(Math.min(i[2].length, 10)).replace(/([^0])0+$/, "$1"), s = n.indexOf(".");
-    var p = r.indexOf(".") - s, _ = r.length - n.length - p;
-    return hashq(r.substr(0, p) + n + r.substr(r.length - _));
+    var h = r.indexOf(".") - s, _ = r.length - n.length - h;
+    return hashq(r.substr(0, h) + n + r.substr(r.length - _));
   }
   if (i = r.match(/^00,000\.([#0]*0)$/))
     return s = dec(t, i[1].length), t < 0 ? "-" + write_num_flt(e, r, -t) : commaify(flr(t)).replace(/^\d,\d{3}$/, "0$&").replace(/^\d*$/, function(m) {
@@ -669,8 +669,8 @@ function write_num_flt(e, r, t) {
     case "###,###":
     case "##,###":
     case "#,###":
-      var h = commaify(pad0r(o, 0));
-      return h !== "0" ? f + h : "";
+      var d = commaify(pad0r(o, 0));
+      return d !== "0" ? f + d : "";
     case "###,###.00":
       return write_num_flt(e, "###,##0.00", t).replace(/^0\./, ".");
     case "#,###.00":
@@ -755,8 +755,8 @@ function write_num_int(e, r, t) {
     return n = "" + t, r.length <= n.length ? n : hashq(r.substr(0, r.length - n.length)) + n;
   if (i = r.match(/^([#0]+)\.([#0]+)$/)) {
     n = "" + t.toFixed(Math.min(i[2].length, 10)).replace(/([^0])0+$/, "$1"), s = n.indexOf(".");
-    var p = r.indexOf(".") - s, _ = r.length - n.length - p;
-    return hashq(r.substr(0, p) + n + r.substr(r.length - _));
+    var h = r.indexOf(".") - s, _ = r.length - n.length - h;
+    return hashq(r.substr(0, h) + n + r.substr(r.length - _));
   }
   if (i = r.match(/^00,000\.([#0]*0)$/))
     return t < 0 ? "-" + write_num_int(e, r, -t) : commaify("" + t).replace(/^\d,\d{3}$/, "0$&").replace(/^\d*$/, function(m) {
@@ -766,8 +766,8 @@ function write_num_int(e, r, t) {
     case "###,###":
     case "##,###":
     case "#,###":
-      var h = commaify("" + o);
-      return h !== "0" ? f + h : "";
+      var d = commaify("" + o);
+      return d !== "0" ? f + d : "";
     default:
       if (r.match(/\.[0#?]*$/)) return write_num_int(e, r.slice(0, r.lastIndexOf(".")), t) + hashq(r.slice(r.lastIndexOf(".")));
   }
@@ -886,19 +886,19 @@ function fmt_is_date(e) {
   return !1;
 }
 function eval_fmt(e, r, t, a) {
-  for (var n = [], i = "", s = 0, l = "", o = "t", f, c, p, _ = "H"; s < e.length; )
+  for (var n = [], i = "", s = 0, l = "", o = "t", f, c, h, _ = "H"; s < e.length; )
     switch (l = e.charAt(s)) {
       case "G":
         if (!SSF_isgeneral(e, s)) throw new Error("unrecognized character " + l + " in " + e);
         n[n.length] = { t: "G", v: "General" }, s += 7;
         break;
       case '"':
-        for (i = ""; (p = e.charCodeAt(++s)) !== 34 && s < e.length; ) i += String.fromCharCode(p);
+        for (i = ""; (h = e.charCodeAt(++s)) !== 34 && s < e.length; ) i += String.fromCharCode(h);
         n[n.length] = { t: "t", v: i }, ++s;
         break;
       case "\\":
-        var h = e.charAt(++s), m = h === "(" || h === ")" ? h : "t";
-        n[n.length] = { t: m, v: h }, ++s;
+        var d = e.charAt(++s), m = d === "(" || d === ")" ? d : "t";
+        n[n.length] = { t: m, v: d }, ++s;
         break;
       case "_":
         n[n.length] = { t: "t", v: " " }, s += 2;
@@ -994,15 +994,15 @@ function eval_fmt(e, r, t, a) {
         n[n.length] = { t: "t", v: l }, ++s;
         break;
     }
-  var d = 0, A = 0, I;
+  var p = 0, A = 0, I;
   for (s = n.length - 1, o = "t"; s >= 0; --s)
     switch (n[s].t) {
       case "h":
       case "H":
-        n[s].t = _, o = "h", d < 1 && (d = 1);
+        n[s].t = _, o = "h", p < 1 && (p = 1);
         break;
       case "s":
-        (I = n[s].v.match(/\.0+$/)) && (A = Math.max(A, I[0].length - 1)), d < 3 && (d = 3);
+        (I = n[s].v.match(/\.0+$/)) && (A = Math.max(A, I[0].length - 1)), p < 3 && (p = 3);
       case "d":
       case "y":
       case "M":
@@ -1010,14 +1010,14 @@ function eval_fmt(e, r, t, a) {
         o = n[s].t;
         break;
       case "m":
-        o === "s" && (n[s].t = "M", d < 2 && (d = 2));
+        o === "s" && (n[s].t = "M", p < 2 && (p = 2));
         break;
       case "X":
         break;
       case "Z":
-        d < 1 && n[s].v.match(/[Hh]/) && (d = 1), d < 2 && n[s].v.match(/[Mm]/) && (d = 2), d < 3 && n[s].v.match(/[Ss]/) && (d = 3);
+        p < 1 && n[s].v.match(/[Hh]/) && (p = 1), p < 2 && n[s].v.match(/[Mm]/) && (p = 2), p < 3 && n[s].v.match(/[Ss]/) && (p = 3);
     }
-  switch (d) {
+  switch (p) {
     case 0:
       break;
     case 1:
@@ -1193,23 +1193,23 @@ function dateNF_regex(e) {
 }
 function dateNF_fix(e, r, t) {
   var a = -1, n = -1, i = -1, s = -1, l = -1, o = -1;
-  (r.match(dateNFregex) || []).forEach(function(p, _) {
-    var h = parseInt(t[_ + 1], 10);
-    switch (p.toLowerCase().charAt(0)) {
+  (r.match(dateNFregex) || []).forEach(function(h, _) {
+    var d = parseInt(t[_ + 1], 10);
+    switch (h.toLowerCase().charAt(0)) {
       case "y":
-        a = h;
+        a = d;
         break;
       case "d":
-        i = h;
+        i = d;
         break;
       case "h":
-        s = h;
+        s = d;
         break;
       case "s":
-        o = h;
+        o = d;
         break;
       case "m":
-        s >= 0 ? l = h : n = h;
+        s >= 0 ? l = d : n = d;
         break;
     }
   }), o >= 0 && l == -1 && n >= 0 && (l = n, n = -1);
@@ -1236,13 +1236,13 @@ var CRC32 = /* @__PURE__ */ function() {
     for (F = 1; F != 16; ++F) R[F - 1] = typeof Int32Array < "u" ? B.subarray(F * 256, F * 256 + 256) : B.slice(F * 256, F * 256 + 256);
     return R;
   }
-  var n = a(t), i = n[0], s = n[1], l = n[2], o = n[3], f = n[4], c = n[5], p = n[6], _ = n[7], h = n[8], m = n[9], u = n[10], d = n[11], A = n[12], I = n[13], k = n[14];
+  var n = a(t), i = n[0], s = n[1], l = n[2], o = n[3], f = n[4], c = n[5], h = n[6], _ = n[7], d = n[8], m = n[9], u = n[10], p = n[11], A = n[12], I = n[13], k = n[14];
   function O(C, D) {
     for (var S = D ^ -1, F = 0, B = C.length; F < B; ) S = S >>> 8 ^ t[(S ^ C.charCodeAt(F++)) & 255];
     return ~S;
   }
   function H(C, D) {
-    for (var S = D ^ -1, F = C.length - 15, B = 0; B < F; ) S = k[C[B++] ^ S & 255] ^ I[C[B++] ^ S >> 8 & 255] ^ A[C[B++] ^ S >> 16 & 255] ^ d[C[B++] ^ S >>> 24] ^ u[C[B++]] ^ m[C[B++]] ^ h[C[B++]] ^ _[C[B++]] ^ p[C[B++]] ^ c[C[B++]] ^ f[C[B++]] ^ o[C[B++]] ^ l[C[B++]] ^ s[C[B++]] ^ i[C[B++]] ^ t[C[B++]];
+    for (var S = D ^ -1, F = C.length - 15, B = 0; B < F; ) S = k[C[B++] ^ S & 255] ^ I[C[B++] ^ S >> 8 & 255] ^ A[C[B++] ^ S >> 16 & 255] ^ p[C[B++] ^ S >>> 24] ^ u[C[B++]] ^ m[C[B++]] ^ d[C[B++]] ^ _[C[B++]] ^ h[C[B++]] ^ c[C[B++]] ^ f[C[B++]] ^ o[C[B++]] ^ l[C[B++]] ^ s[C[B++]] ^ i[C[B++]] ^ t[C[B++]];
     for (F += 15; B < F; ) S = S >>> 8 ^ t[(S ^ C[B++]) & 255];
     return ~S;
   }
@@ -1318,7 +1318,7 @@ var CRC32 = /* @__PURE__ */ function() {
       x.slice(0, 512)
     );
     prep_blob(W, 0);
-    var Y = p(W);
+    var Y = h(W);
     switch (g = Y[0], g) {
       case 3:
         w = 512;
@@ -1344,19 +1344,19 @@ var CRC32 = /* @__PURE__ */ function() {
     W.l += 4, V = W.read_shift(4, "i"), W.l += 4, W.chk("00100000", "Mini Stream Cutoff Size: "), z = W.read_shift(4, "i"), T = W.read_shift(4, "i"), M = W.read_shift(4, "i"), y = W.read_shift(4, "i");
     for (var J = -1, Q = 0; Q < 109 && (J = W.read_shift(4, "i"), !(J < 0)); ++Q)
       U[Q] = J;
-    var oe = h(x, w);
-    d(M, y, oe, w, U);
-    var de = I(oe, V, U, w);
-    de[V].name = "!Directory", T > 0 && z !== j && (de[z].name = "!MiniFAT"), de[U[0]].name = "!FAT", de.fat_addrs = U, de.ssz = w;
+    var oe = d(x, w);
+    p(M, y, oe, w, U);
+    var he = I(oe, V, U, w);
+    he[V].name = "!Directory", T > 0 && z !== j && (he[z].name = "!MiniFAT"), he[U[0]].name = "!FAT", he.fat_addrs = U, he.ssz = w;
     var _e = {}, ve = [], Be = [], De = [];
-    k(V, de, oe, ve, T, _e, Be, z), m(Be, De, ve), ve.shift();
+    k(V, he, oe, ve, T, _e, Be, z), m(Be, De, ve), ve.shift();
     var Le = {
       FileIndex: Be,
       FullPaths: De
     };
     return v && v.raw && (Le.raw = { header: q, sectors: oe }), Le;
   }
-  function p(x) {
+  function h(x) {
     if (x[x.l] == 80 && x[x.l + 1] == 75) return [0, 0];
     x.chk(le, "Header Signature: "), x.l += 16;
     var v = x.read_shift(2, "u");
@@ -1376,7 +1376,7 @@ var CRC32 = /* @__PURE__ */ function() {
     }
     x.chk("0600", "Mini Sector Shift: "), x.chk("000000000000", "Reserved: ");
   }
-  function h(x, v) {
+  function d(x, v) {
     for (var g = Math.ceil(x.length / v) - 1, w = [], T = 1; T < g; ++T) w[T - 1] = x.slice(T * v, (T + 1) * v);
     return w[g - 1] = x.slice(g * v), w;
   }
@@ -1401,7 +1401,7 @@ var CRC32 = /* @__PURE__ */ function() {
       y.push(v.slice(V * R, V * R + R)), T -= R, V = __readInt32LE(g, V * 4);
     return y.length === 0 ? new_buf(0) : bconcat(y).slice(0, x.size);
   }
-  function d(x, v, g, w, T) {
+  function p(x, v, g, w, T) {
     var y = j;
     if (x === j) {
       if (v !== 0) throw new Error("DIFAT chain shorter than expected");
@@ -1410,7 +1410,7 @@ var CRC32 = /* @__PURE__ */ function() {
       if (!V) return;
       for (var M = 0; M < z && (y = __readInt32LE(V, M * 4)) !== j; ++M)
         T.push(y);
-      d(__readInt32LE(V, w - 4), v - 1, g, w, T);
+      p(__readInt32LE(V, w - 4), v - 1, g, w, T);
     }
   }
   function A(x, v, g, w, T) {
@@ -1462,8 +1462,8 @@ var CRC32 = /* @__PURE__ */ function() {
         size: 0
       }, oe = J.read_shift(2) + J.read_shift(2) + J.read_shift(2) + J.read_shift(2);
       oe !== 0 && (Q.ct = O(J, J.l - 8));
-      var de = J.read_shift(2) + J.read_shift(2) + J.read_shift(2) + J.read_shift(2);
-      de !== 0 && (Q.mt = O(J, J.l - 8)), Q.start = J.read_shift(4, "i"), Q.size = J.read_shift(4, "i"), Q.size < 0 && Q.start < 0 && (Q.size = Q.type = 0, Q.start = j, Q.name = ""), Q.type === 5 ? (M = Q.start, T > 0 && M !== j && (v[M].name = "!StreamData")) : Q.size >= 4096 ? (Q.storage = "fat", v[Q.start] === void 0 && (v[Q.start] = A(g, Q.start, v.fat_addrs, v.ssz)), v[Q.start].name = Q.name, Q.content = v[Q.start].data.slice(0, Q.size)) : (Q.storage = "minifat", Q.size < 0 ? Q.size = 0 : M !== j && Q.start !== j && v[M] && (Q.content = u(Q, v[M].data, (v[z] || {}).data))), Q.content && prep_blob(Q.content, 0), y[ee] = Q, V.push(Q);
+      var he = J.read_shift(2) + J.read_shift(2) + J.read_shift(2) + J.read_shift(2);
+      he !== 0 && (Q.mt = O(J, J.l - 8)), Q.start = J.read_shift(4, "i"), Q.size = J.read_shift(4, "i"), Q.size < 0 && Q.start < 0 && (Q.size = Q.type = 0, Q.start = j, Q.name = ""), Q.type === 5 ? (M = Q.start, T > 0 && M !== j && (v[M].name = "!StreamData")) : Q.size >= 4096 ? (Q.storage = "fat", v[Q.start] === void 0 && (v[Q.start] = A(g, Q.start, v.fat_addrs, v.ssz)), v[Q.start].name = Q.name, Q.content = v[Q.start].data.slice(0, Q.size)) : (Q.storage = "minifat", Q.size < 0 ? Q.size = 0 : M !== j && Q.start !== j && v[M] && (Q.content = u(Q, v[M].data, (v[z] || {}).data))), Q.content && prep_blob(Q.content, 0), y[ee] = Q, V.push(Q);
     }
   }
   function O(x, v) {
@@ -1559,9 +1559,9 @@ var CRC32 = /* @__PURE__ */ function() {
     }
     var w = function(ee) {
       for (var J = 0, Q = 0, oe = 0; oe < ee.FileIndex.length; ++oe) {
-        var de = ee.FileIndex[oe];
-        if (de.content) {
-          var _e = de.content.length;
+        var he = ee.FileIndex[oe];
+        if (he.content) {
+          var _e = he.content.length;
           _e > 0 && (_e < 4096 ? J += _e + 63 >> 6 : Q += _e + 511 >> 9);
         }
       }
@@ -1708,7 +1708,7 @@ var CRC32 = /* @__PURE__ */ function() {
     var v = (x << 1 | x << 11) & 139536 | (x << 5 | x << 15) & 558144;
     return (v >> 16 | v >> 8 | v) & 255;
   }
-  for (var re = typeof Uint8Array < "u", Z = re ? new Uint8Array(256) : [], he = 0; he < 256; ++he) Z[he] = ie(he);
+  for (var re = typeof Uint8Array < "u", Z = re ? new Uint8Array(256) : [], de = 0; de < 256; ++de) Z[de] = ie(de);
   function fe(x, v) {
     var g = Z[x & 255];
     return v <= 8 ? g >>> 8 - v : (g = g << 8 | Z[x >> 8 & 255], v <= 16 ? g >>> 16 - v : (g = g << 8 | Z[x >> 16 & 255], g >>> 24 - v));
@@ -1840,8 +1840,8 @@ var CRC32 = /* @__PURE__ */ function() {
             for (; z[Q + oe] == z[W + oe] && oe < 250; ) ++oe;
           if (oe > 2) {
             J = T[oe], J <= 22 ? U = Ie(M, U, Z[J + 1] >> 1) - 1 : (Ie(M, U, 3), U += 5, Ie(M, U, Z[J - 23] >> 5), U += 3);
-            var de = J < 8 ? 0 : J - 4 >> 2;
-            de > 0 && ($e(M, U, oe - K[J]), U += de), J = v[W - Q], U = Ie(M, U, Z[J] >> 3), U -= 3;
+            var he = J < 8 ? 0 : J - 4 >> 2;
+            he > 0 && ($e(M, U, oe - K[J]), U += he), J = v[W - Q], U = Ie(M, U, Z[J] >> 3), U -= 3;
             var _e = J < 4 ? 0 : J - 2 >> 1;
             _e > 0 && ($e(M, U, W - Q - ne[J]), U += _e);
             for (var ve = 0; ve < oe; ++ve)
@@ -1897,10 +1897,10 @@ var CRC32 = /* @__PURE__ */ function() {
           oe.push(ee), M < ee && (M = ee);
           break;
       }
-    var de = oe.slice(0, g), _e = oe.slice(g);
-    for (q = g; q < 286; ++q) de[q] = 0;
+    var he = oe.slice(0, g), _e = oe.slice(g);
+    for (q = g; q < 286; ++q) he[q] = 0;
     for (q = w; q < 30; ++q) _e[q] = 0;
-    return ze = Pe(de, Xe, 286), je = Pe(_e, He, 30), v;
+    return ze = Pe(he, Xe, 286), je = Pe(_e, He, 30), v;
   }
   function Qe(x, v) {
     if (x[0] == 3 && !(x[1] & 3))
@@ -1999,14 +1999,14 @@ var CRC32 = /* @__PURE__ */ function() {
       default:
         throw new Error("Unsupported ZIP Compression method " + V);
     }
-    var de = !1;
-    y & 8 && (M = x.read_shift(4), M == 134695760 && (M = x.read_shift(4), de = !0), U = x.read_shift(4), W = x.read_shift(4)), U != v && Ye(de, "Bad compressed size: " + v + " != " + U), W != g && Ye(de, "Bad uncompressed size: " + g + " != " + W), Ve(w, ee, oe, { unsafe: !0, mt: z });
+    var he = !1;
+    y & 8 && (M = x.read_shift(4), M == 134695760 && (M = x.read_shift(4), he = !0), U = x.read_shift(4), W = x.read_shift(4)), U != v && Ye(he, "Bad compressed size: " + v + " != " + U), W != g && Ye(he, "Bad uncompressed size: " + g + " != " + W), Ve(w, ee, oe, { unsafe: !0, mt: z });
   }
   function tt(x, v) {
     var g = v || {}, w = [], T = [], y = new_buf(1), V = g.compression ? 8 : 0, z = 0, M = 0, U = 0, W = 0, Y = 0, q = x.FullPaths[0], ee = q, J = x.FileIndex[0], Q = [], oe = 0;
     for (M = 1; M < x.FullPaths.length; ++M)
       if (ee = x.FullPaths[M].slice(q.length), J = x.FileIndex[M], !(!J.size || !J.content || ee == "
Sh33tJ5")) {
-        var de = W, _e = new_buf(ee.length);
+        var he = W, _e = new_buf(ee.length);
         for (U = 0; U < ee.length; ++U) _e.write_shift(1, ee.charCodeAt(U) & 127);
         _e = _e.slice(0, _e.l), Q[Y] = CRC32.buf(
           /*::((*/
@@ -2022,7 +2022,7 @@ var CRC32 = /* @__PURE__ */ function() {
           4,
           /*::(*/
           J.content.length
-        ), y.write_shift(2, _e.length), y.write_shift(2, 0), y.write_shift(2, 0), y.write_shift(2, 0), y.write_shift(2, 0), y.write_shift(4, 0), y.write_shift(4, de), oe += y.l, T.push(y), oe += _e.length, T.push(_e), ++Y;
+        ), y.write_shift(2, _e.length), y.write_shift(2, 0), y.write_shift(2, 0), y.write_shift(2, 0), y.write_shift(2, 0), y.write_shift(4, 0), y.write_shift(4, he), oe += y.l, T.push(y), oe += _e.length, T.push(_e), ++Y;
       }
     return y = new_buf(22), y.write_shift(4, 101010256), y.write_shift(2, 0), y.write_shift(2, 0), y.write_shift(2, Y), y.write_shift(2, Y), y.write_shift(4, oe), y.write_shift(4, W), y.write_shift(2, 0), bconcat([bconcat(w), bconcat(T), y]);
   }
@@ -2189,7 +2189,7 @@ var CRC32 = /* @__PURE__ */ function() {
     }
     return !1;
   }
-  function ht(x) {
+  function dt(x) {
     S(x, !0);
   }
   return r.find = B, r.read = G, r.parse = c, r.write = we, r.writeFile = ge, r.utils = {
@@ -2197,7 +2197,7 @@ var CRC32 = /* @__PURE__ */ function() {
     cfb_add: Ve,
     cfb_del: ct,
     cfb_mov: ut,
-    cfb_gc: ht,
+    cfb_gc: dt,
     ReadShift,
     CheckField,
     prep_blob,
@@ -2949,25 +2949,25 @@ function sheet_add_aoa(e, r, t) {
     var c = safe_decode_range(i["!ref"]);
     f.s.c = c.s.c, f.s.r = c.s.r, f.e.c = Math.max(f.e.c, c.e.c), f.e.r = Math.max(f.e.r, c.e.r), s == -1 && (f.e.r = s = c.e.r + 1);
   }
-  for (var p = 0; p != r.length; ++p)
-    if (r[p]) {
-      if (!Array.isArray(r[p])) throw new Error("aoa_to_sheet expects an array of arrays");
-      for (var _ = 0; _ != r[p].length; ++_)
-        if (!(typeof r[p][_] > "u")) {
-          var h = { v: r[p][_] }, m = s + p, u = l + _;
-          if (f.s.r > m && (f.s.r = m), f.s.c > u && (f.s.c = u), f.e.r < m && (f.e.r = m), f.e.c < u && (f.e.c = u), r[p][_] && typeof r[p][_] == "object" && !Array.isArray(r[p][_]) && !(r[p][_] instanceof Date)) h = r[p][_];
-          else if (Array.isArray(h.v) && (h.f = r[p][_][1], h.v = h.v[0]), h.v === null)
-            if (h.f) h.t = "n";
+  for (var h = 0; h != r.length; ++h)
+    if (r[h]) {
+      if (!Array.isArray(r[h])) throw new Error("aoa_to_sheet expects an array of arrays");
+      for (var _ = 0; _ != r[h].length; ++_)
+        if (!(typeof r[h][_] > "u")) {
+          var d = { v: r[h][_] }, m = s + h, u = l + _;
+          if (f.s.r > m && (f.s.r = m), f.s.c > u && (f.s.c = u), f.e.r < m && (f.e.r = m), f.e.c < u && (f.e.c = u), r[h][_] && typeof r[h][_] == "object" && !Array.isArray(r[h][_]) && !(r[h][_] instanceof Date)) d = r[h][_];
+          else if (Array.isArray(d.v) && (d.f = r[h][_][1], d.v = d.v[0]), d.v === null)
+            if (d.f) d.t = "n";
             else if (a.nullError)
-              h.t = "e", h.v = 0;
-            else if (a.sheetStubs) h.t = "z";
+              d.t = "e", d.v = 0;
+            else if (a.sheetStubs) d.t = "z";
             else continue;
-          else typeof h.v == "number" ? h.t = "n" : typeof h.v == "boolean" ? h.t = "b" : h.v instanceof Date ? (h.z = a.dateNF || table_fmt[14], a.cellDates ? (h.t = "d", h.w = SSF_format(h.z, datenum(h.v))) : (h.t = "n", h.v = datenum(h.v), h.w = SSF_format(h.z, h.v))) : h.t = "s";
+          else typeof d.v == "number" ? d.t = "n" : typeof d.v == "boolean" ? d.t = "b" : d.v instanceof Date ? (d.z = a.dateNF || table_fmt[14], a.cellDates ? (d.t = "d", d.w = SSF_format(d.z, datenum(d.v))) : (d.t = "n", d.v = datenum(d.v), d.w = SSF_format(d.z, d.v))) : d.t = "s";
           if (n)
-            i[m] || (i[m] = []), i[m][u] && i[m][u].z && (h.z = i[m][u].z), i[m][u] = h;
+            i[m] || (i[m] = []), i[m][u] && i[m][u].z && (d.z = i[m][u].z), i[m][u] = d;
           else {
-            var d = encode_cell({ c: u, r: m });
-            i[d] && i[d].z && (h.z = i[d].z), i[d] = h;
+            var p = encode_cell({ c: u, r: m });
+            i[p] && i[p].z && (d.z = i[p].z), i[p] = d;
           }
         }
     }
@@ -3928,28 +3928,28 @@ function write_PropertySet(e, r, t) {
     f = new_buf(8), f.write_shift(4, 0), n.unshift(f);
     var c = [new_buf(4)];
     for (c[0].write_shift(4, e.length), l = 0; l < e.length; ++l) {
-      var p = e[l][0];
-      for (o = new_buf(8 + 2 * (p.length + 1) + (p.length % 2 ? 0 : 2)), o.write_shift(4, l + 2), o.write_shift(4, p.length + 1), o.write_shift(0, p, "dbcs"); o.l != o.length; ) o.write_shift(1, 0);
+      var h = e[l][0];
+      for (o = new_buf(8 + 2 * (h.length + 1) + (h.length % 2 ? 0 : 2)), o.write_shift(4, l + 2), o.write_shift(4, h.length + 1), o.write_shift(0, h, "dbcs"); o.l != o.length; ) o.write_shift(1, 0);
       c.push(o);
     }
     o = bconcat(c), i.unshift(o), s += 8 + o.length;
   }
   for (l = 0; l < e.length; ++l)
     if (!(r && !r[e[l][0]]) && !(XLSPSSkip.indexOf(e[l][0]) > -1 || PseudoPropsPairs.indexOf(e[l][0]) > -1) && e[l][1] != null) {
-      var _ = e[l][1], h = 0;
+      var _ = e[l][1], d = 0;
       if (r) {
-        h = +r[e[l][0]];
-        var m = t[h];
+        d = +r[e[l][0]];
+        var m = t[d];
         if (m.p == "version" && typeof _ == "string") {
           var u = _.split(".");
           _ = (+u[0] << 16) + (+u[1] || 0);
         }
         o = write_TypedPropertyValue(m.t, _);
       } else {
-        var d = guess_property_type(_);
-        d == -1 && (d = 31, _ = String(_)), o = write_TypedPropertyValue(d, _);
+        var p = guess_property_type(_);
+        p == -1 && (p = 31, _ = String(_)), o = write_TypedPropertyValue(p, _);
       }
-      i.push(o), f = new_buf(8), f.write_shift(4, r ? h : 2 + l), n.push(f), s += 8 + o.length;
+      i.push(o), f = new_buf(8), f.write_shift(4, r ? d : 2 + l), n.push(f), s += 8 + o.length;
     }
   var A = 8 * (i.length + 1);
   for (l = 0; l < i.length; ++l)
@@ -4439,17 +4439,17 @@ var DBF = /* @__PURE__ */ function() {
         break;
     }
     prep_blob(c, 0);
-    var p = c.read_shift(1), _ = !!(p & 136), h = !1, m = !1;
-    switch (p) {
+    var h = c.read_shift(1), _ = !!(h & 136), d = !1, m = !1;
+    switch (h) {
       case 2:
         break;
       case 3:
         break;
       case 48:
-        h = !0, _ = !0;
+        d = !0, _ = !0;
         break;
       case 49:
-        h = !0, _ = !0;
+        d = !0, _ = !0;
         break;
       case 131:
         break;
@@ -4461,16 +4461,16 @@ var DBF = /* @__PURE__ */ function() {
       case 245:
         break;
       default:
-        throw new Error("DBF Unsupported Version: " + p.toString(16));
+        throw new Error("DBF Unsupported Version: " + h.toString(16));
     }
-    var u = 0, d = 521;
-    p == 2 && (u = c.read_shift(2)), c.l += 3, p != 2 && (u = c.read_shift(4)), u > 1048576 && (u = 1e6), p != 2 && (d = c.read_shift(2));
+    var u = 0, p = 521;
+    h == 2 && (u = c.read_shift(2)), c.l += 3, h != 2 && (u = c.read_shift(4)), u > 1048576 && (u = 1e6), h != 2 && (p = c.read_shift(2));
     var A = c.read_shift(2), I = o.codepage || 1252;
-    p != 2 && (c.l += 16, c.read_shift(1), c[c.l] !== 0 && (I = e[c[c.l]]), c.l += 1, c.l += 2), m && (c.l += 36);
-    for (var k = [], O = {}, H = Math.min(c.length, p == 2 ? 521 : d - 10 - (h ? 264 : 0)), G = m ? 32 : 11; c.l < H && c[c.l] != 13; )
-      switch (O = {}, O.name = $cptable.utils.decode(I, c.slice(c.l, c.l + G)).replace(/[\u0000\r\n].*$/g, ""), c.l += G, O.type = String.fromCharCode(c.read_shift(1)), p != 2 && !m && (O.offset = c.read_shift(4)), O.len = c.read_shift(1), p == 2 && (O.offset = c.read_shift(2)), O.dec = c.read_shift(1), O.name.length && k.push(O), p != 2 && (c.l += m ? 13 : 14), O.type) {
+    h != 2 && (c.l += 16, c.read_shift(1), c[c.l] !== 0 && (I = e[c[c.l]]), c.l += 1, c.l += 2), m && (c.l += 36);
+    for (var k = [], O = {}, H = Math.min(c.length, h == 2 ? 521 : p - 10 - (d ? 264 : 0)), G = m ? 32 : 11; c.l < H && c[c.l] != 13; )
+      switch (O = {}, O.name = $cptable.utils.decode(I, c.slice(c.l, c.l + G)).replace(/[\u0000\r\n].*$/g, ""), c.l += G, O.type = String.fromCharCode(c.read_shift(1)), h != 2 && !m && (O.offset = c.read_shift(4)), O.len = c.read_shift(1), h == 2 && (O.offset = c.read_shift(2)), O.dec = c.read_shift(1), O.name.length && k.push(O), h != 2 && (c.l += m ? 13 : 14), O.type) {
         case "B":
-          (!h || O.len != 8) && o.WTF && console.log("Skipping " + O.name + ":" + O.type);
+          (!d || O.len != 8) && o.WTF && console.log("Skipping " + O.name + ":" + O.type);
           break;
         case "G":
         case "P":
@@ -4493,8 +4493,8 @@ var DBF = /* @__PURE__ */ function() {
         default:
           throw new Error("Unknown Field Type: " + O.type);
       }
-    if (c[c.l] !== 13 && (c.l = d - 1), c.read_shift(1) !== 13) throw new Error("DBF Terminator not found " + c.l + " " + c[c.l]);
-    c.l = d;
+    if (c[c.l] !== 13 && (c.l = p - 1), c.read_shift(1) !== 13) throw new Error("DBF Terminator not found " + c.l + " " + c[c.l]);
+    c.l = p;
     var C = 0, D = 0;
     for (f[0] = [], D = 0; D != k.length; ++D) f[0][D] = k[D].name;
     for (; u-- > 0; ) {
@@ -4538,7 +4538,7 @@ var DBF = /* @__PURE__ */ function() {
             }
             break;
           case "M":
-            if (!_) throw new Error("DBF Unexpected MEMO for type " + p.toString(16));
+            if (!_) throw new Error("DBF Unexpected MEMO for type " + h.toString(16));
             f[C][D] = "##MEMO##" + (m ? parseInt(F.trim(), 10) : S.read_shift(4));
             break;
           case "N":
@@ -4557,7 +4557,7 @@ var DBF = /* @__PURE__ */ function() {
             f[C][D] = -S.read_shift(-8, "f");
             break;
           case "B":
-            if (h && k[D].len == 8) {
+            if (d && k[D].len == 8) {
               f[C][D] = S.read_shift(8, "f");
               break;
             }
@@ -4572,17 +4572,17 @@ var DBF = /* @__PURE__ */ function() {
         }
       }
     }
-    if (p != 2 && c.l < c.length && c[c.l++] != 26) throw new Error("DBF EOF Marker missing " + (c.l - 1) + " of " + c.length + " " + c[c.l - 1].toString(16));
+    if (h != 2 && c.l < c.length && c[c.l++] != 26) throw new Error("DBF EOF Marker missing " + (c.l - 1) + " of " + c.length + " " + c[c.l - 1].toString(16));
     return o && o.sheetRows && (f = f.slice(0, o.sheetRows)), o.DBF = k, f;
   }
   function a(l, o) {
     var f = o || {};
     f.dateNF || (f.dateNF = "yyyymmdd");
     var c = aoa_to_sheet(t(l, f), f);
-    return c["!cols"] = f.DBF.map(function(p) {
+    return c["!cols"] = f.DBF.map(function(h) {
       return {
-        wch: p.len,
-        DBF: p
+        wch: h.len,
+        DBF: h
       };
     }), delete f.DBF, c;
   }
@@ -4598,7 +4598,7 @@ var DBF = /* @__PURE__ */ function() {
   function s(l, o) {
     var f = o || {};
     if (+f.codepage >= 0 && set_cp(+f.codepage), f.type == "string") throw new Error("Cannot write DBF to JS string");
-    var c = buf_array(), p = sheet_to_json(l, { header: 1, raw: !0, cellDates: !0 }), _ = p[0], h = p.slice(1), m = l["!cols"] || [], u = 0, d = 0, A = 0, I = 1;
+    var c = buf_array(), h = sheet_to_json(l, { header: 1, raw: !0, cellDates: !0 }), _ = h[0], d = h.slice(1), m = l["!cols"] || [], u = 0, p = 0, A = 0, I = 1;
     for (u = 0; u < _.length; ++u) {
       if (((m[u] || {}).DBF || {}).name) {
         _[u] = m[u].DBF.name, ++A;
@@ -4607,9 +4607,9 @@ var DBF = /* @__PURE__ */ function() {
       if (_[u] != null) {
         if (++A, typeof _[u] == "number" && (_[u] = _[u].toString(10)), typeof _[u] != "string") throw new Error("DBF Invalid column name " + _[u] + " |" + typeof _[u] + "|");
         if (_.indexOf(_[u]) !== u) {
-          for (d = 0; d < 1024; ++d)
-            if (_.indexOf(_[u] + "_" + d) == -1) {
-              _[u] += "_" + d;
+          for (p = 0; p < 1024; ++p)
+            if (_.indexOf(_[u] + "_" + p) == -1) {
+              _[u] += "_" + p;
               break;
             }
         }
@@ -4618,14 +4618,14 @@ var DBF = /* @__PURE__ */ function() {
     var k = safe_decode_range(l["!ref"]), O = [], H = [], G = [];
     for (u = 0; u <= k.e.c - k.s.c; ++u) {
       var C = "", D = "", S = 0, F = [];
-      for (d = 0; d < h.length; ++d)
-        h[d][u] != null && F.push(h[d][u]);
+      for (p = 0; p < d.length; ++p)
+        d[p][u] != null && F.push(d[p][u]);
       if (F.length == 0 || _[u] == null) {
         O[u] = "?";
         continue;
       }
-      for (d = 0; d < F.length; ++d) {
-        switch (typeof F[d]) {
+      for (p = 0; p < F.length; ++p) {
+        switch (typeof F[p]) {
           case "number":
             D = "B";
             break;
@@ -4636,50 +4636,50 @@ var DBF = /* @__PURE__ */ function() {
             D = "L";
             break;
           case "object":
-            D = F[d] instanceof Date ? "D" : "C";
+            D = F[p] instanceof Date ? "D" : "C";
             break;
           default:
             D = "C";
         }
-        S = Math.max(S, String(F[d]).length), C = C && C != D ? "C" : D;
+        S = Math.max(S, String(F[p]).length), C = C && C != D ? "C" : D;
       }
       S > 250 && (S = 250), D = ((m[u] || {}).DBF || {}).type, D == "C" && m[u].DBF.len > S && (S = m[u].DBF.len), C == "B" && D == "N" && (C = "N", G[u] = m[u].DBF.dec, S = m[u].DBF.len), H[u] = C == "C" || D == "N" ? S : i[C] || 0, I += H[u], O[u] = C;
     }
     var B = c.next(32);
-    for (B.write_shift(4, 318902576), B.write_shift(4, h.length), B.write_shift(2, 296 + 32 * A), B.write_shift(2, I), u = 0; u < 4; ++u) B.write_shift(4, 0);
+    for (B.write_shift(4, 318902576), B.write_shift(4, d.length), B.write_shift(2, 296 + 32 * A), B.write_shift(2, I), u = 0; u < 4; ++u) B.write_shift(4, 0);
     for (B.write_shift(4, 0 | (+r[
       /*::String(*/
       current_ansi
       /*::)*/
-    ] || 3) << 8), u = 0, d = 0; u < _.length; ++u)
+    ] || 3) << 8), u = 0, p = 0; u < _.length; ++u)
       if (_[u] != null) {
         var R = c.next(32), j = (_[u].slice(-10) + "\0\0\0\0\0\0\0\0\0\0\0").slice(0, 11);
-        R.write_shift(1, j, "sbcs"), R.write_shift(1, O[u] == "?" ? "C" : O[u], "sbcs"), R.write_shift(4, d), R.write_shift(1, H[u] || i[O[u]] || 0), R.write_shift(1, G[u] || 0), R.write_shift(1, 2), R.write_shift(4, 0), R.write_shift(1, 0), R.write_shift(4, 0), R.write_shift(4, 0), d += H[u] || i[O[u]] || 0;
+        R.write_shift(1, j, "sbcs"), R.write_shift(1, O[u] == "?" ? "C" : O[u], "sbcs"), R.write_shift(4, p), R.write_shift(1, H[u] || i[O[u]] || 0), R.write_shift(1, G[u] || 0), R.write_shift(1, 2), R.write_shift(4, 0), R.write_shift(1, 0), R.write_shift(4, 0), R.write_shift(4, 0), p += H[u] || i[O[u]] || 0;
       }
     var le = c.next(264);
     for (le.write_shift(4, 13), u = 0; u < 65; ++u) le.write_shift(4, 0);
-    for (u = 0; u < h.length; ++u) {
+    for (u = 0; u < d.length; ++u) {
       var se = c.next(I);
-      for (se.write_shift(1, 0), d = 0; d < _.length; ++d)
-        if (_[d] != null)
-          switch (O[d]) {
+      for (se.write_shift(1, 0), p = 0; p < _.length; ++p)
+        if (_[p] != null)
+          switch (O[p]) {
             case "L":
-              se.write_shift(1, h[u][d] == null ? 63 : h[u][d] ? 84 : 70);
+              se.write_shift(1, d[u][p] == null ? 63 : d[u][p] ? 84 : 70);
               break;
             case "B":
-              se.write_shift(8, h[u][d] || 0, "f");
+              se.write_shift(8, d[u][p] || 0, "f");
               break;
             case "N":
               var ae = "0";
-              for (typeof h[u][d] == "number" && (ae = h[u][d].toFixed(G[d] || 0)), A = 0; A < H[d] - ae.length; ++A) se.write_shift(1, 32);
+              for (typeof d[u][p] == "number" && (ae = d[u][p].toFixed(G[p] || 0)), A = 0; A < H[p] - ae.length; ++A) se.write_shift(1, 32);
               se.write_shift(1, ae, "sbcs");
               break;
             case "D":
-              h[u][d] ? (se.write_shift(4, ("0000" + h[u][d].getFullYear()).slice(-4), "sbcs"), se.write_shift(2, ("00" + (h[u][d].getMonth() + 1)).slice(-2), "sbcs"), se.write_shift(2, ("00" + h[u][d].getDate()).slice(-2), "sbcs")) : se.write_shift(8, "00000000", "sbcs");
+              d[u][p] ? (se.write_shift(4, ("0000" + d[u][p].getFullYear()).slice(-4), "sbcs"), se.write_shift(2, ("00" + (d[u][p].getMonth() + 1)).slice(-2), "sbcs"), se.write_shift(2, ("00" + d[u][p].getDate()).slice(-2), "sbcs")) : se.write_shift(8, "00000000", "sbcs");
               break;
             case "C":
-              var ce = String(h[u][d] != null ? h[u][d] : "").slice(0, H[d]);
-              for (se.write_shift(1, ce, "sbcs"), A = 0; A < H[d] - ce.length; ++A) se.write_shift(1, 32);
+              var ce = String(d[u][p] != null ? d[u][p] : "").slice(0, H[p]);
+              for (se.write_shift(1, ce, "sbcs"), A = 0; A < H[p] - ce.length; ++A) se.write_shift(1, 32);
               break;
           }
     }
@@ -4786,30 +4786,30 @@ var DBF = /* @__PURE__ */ function() {
     ">": 190,
     "?": 191,
     "{": 223
-  }, r = new RegExp("\x1BN(" + keys(e).join("|").replace(/\|\|\|/, "|\\||").replace(/([?()+])/g, "\\$1") + "|\\|)", "gm"), t = function(_, h) {
-    var m = e[h];
+  }, r = new RegExp("\x1BN(" + keys(e).join("|").replace(/\|\|\|/, "|\\||").replace(/([?()+])/g, "\\$1") + "|\\|)", "gm"), t = function(_, d) {
+    var m = e[d];
     return typeof m == "number" ? _getansi(m) : m;
-  }, a = function(_, h, m) {
-    var u = h.charCodeAt(0) - 32 << 4 | m.charCodeAt(0) - 48;
+  }, a = function(_, d, m) {
+    var u = d.charCodeAt(0) - 32 << 4 | m.charCodeAt(0) - 48;
     return u == 59 ? _ : _getansi(u);
   };
   e["|"] = 254;
-  function n(_, h) {
-    switch (h.type) {
+  function n(_, d) {
+    switch (d.type) {
       case "base64":
-        return i(Base64_decode(_), h);
+        return i(Base64_decode(_), d);
       case "binary":
-        return i(_, h);
+        return i(_, d);
       case "buffer":
-        return i(has_buf && Buffer.isBuffer(_) ? _.toString("binary") : a2s(_), h);
+        return i(has_buf && Buffer.isBuffer(_) ? _.toString("binary") : a2s(_), d);
       case "array":
-        return i(cc2str(_), h);
+        return i(cc2str(_), d);
     }
-    throw new Error("Unrecognized type " + h.type);
+    throw new Error("Unrecognized type " + d.type);
   }
-  function i(_, h) {
-    var m = _.split(/[\n\r]+/), u = -1, d = -1, A = 0, I = 0, k = [], O = [], H = null, G = {}, C = [], D = [], S = [], F = 0, B;
-    for (+h.codepage >= 0 && set_cp(+h.codepage); A !== m.length; ++A) {
+  function i(_, d) {
+    var m = _.split(/[\n\r]+/), u = -1, p = -1, A = 0, I = 0, k = [], O = [], H = null, G = {}, C = [], D = [], S = [], F = 0, B;
+    for (+d.codepage >= 0 && set_cp(+d.codepage); A !== m.length; ++A) {
       F = 0;
       var R = m[A].trim().replace(/\x1B([\x20-\x2F])([\x30-\x3F])/g, a).replace(r, t), j = R.replace(/;;/g, "\0").split(";").map(function(P) {
         return P.replace(/\u0000/g, ";");
@@ -4834,21 +4834,21 @@ var DBF = /* @__PURE__ */ function() {
             case "A":
               break;
             case "X":
-              d = parseInt(j[I].slice(1)) - 1, ce = !0;
+              p = parseInt(j[I].slice(1)) - 1, ce = !0;
               break;
             case "Y":
-              for (u = parseInt(j[I].slice(1)) - 1, ce || (d = 0), B = k.length; B <= u; ++B) k[B] = [];
+              for (u = parseInt(j[I].slice(1)) - 1, ce || (p = 0), B = k.length; B <= u; ++B) k[B] = [];
               break;
             case "K":
               se = j[I].slice(1), se.charAt(0) === '"' ? se = se.slice(1, se.length - 1) : se === "TRUE" ? se = !0 : se === "FALSE" ? se = !1 : isNaN(fuzzynum(se)) ? isNaN(fuzzydate(se).getDate()) || (se = parseDate(se)) : (se = fuzzynum(se), H !== null && fmt_is_date(H) && (se = numdate(se))), ae = !0;
               break;
             case "E":
               me = !0;
-              var N = rc_to_a1(j[I].slice(1), { r: u, c: d });
-              k[u][d] = [k[u][d], N];
+              var N = rc_to_a1(j[I].slice(1), { r: u, c: p });
+              k[u][p] = [k[u][p], N];
               break;
             case "S":
-              ge = !0, k[u][d] = [k[u][d], "S5S"];
+              ge = !0, k[u][p] = [k[u][p], "S5S"];
               break;
             case "G":
               break;
@@ -4859,20 +4859,20 @@ var DBF = /* @__PURE__ */ function() {
               xe = parseInt(j[I].slice(1)) - 1;
               break;
             default:
-              if (h && h.WTF) throw new Error("SYLK bad record " + R);
+              if (d && d.WTF) throw new Error("SYLK bad record " + R);
           }
-          if (ae && (k[u][d] && k[u][d].length == 2 ? k[u][d][0] = se : k[u][d] = se, H = null), ge) {
+          if (ae && (k[u][p] && k[u][p].length == 2 ? k[u][p][0] = se : k[u][p] = se, H = null), ge) {
             if (me) throw new Error("SYLK shared formula cannot have own formula");
             var X = we > -1 && k[we][xe];
             if (!X || !X[1]) throw new Error("SYLK shared formula cannot find base");
-            k[u][d][1] = shift_formula_str(X[1], { r: u - we, c: d - xe });
+            k[u][p][1] = shift_formula_str(X[1], { r: u - we, c: p - xe });
           }
           break;
         case "F":
           var b = 0;
           for (I = 1; I < j.length; ++I) switch (j[I].charAt(0)) {
             case "X":
-              d = parseInt(j[I].slice(1)) - 1, ++b;
+              p = parseInt(j[I].slice(1)) - 1, ++b;
               break;
             case "Y":
               for (u = parseInt(j[I].slice(1)) - 1, B = k.length; B <= u; ++B) k[B] = [];
@@ -4898,70 +4898,70 @@ var DBF = /* @__PURE__ */ function() {
                 F = parseInt(S[2], 10), D[B - 1] = F === 0 ? { hidden: !0 } : { wch: F }, process_col(D[B - 1]);
               break;
             case "C":
-              d = parseInt(j[I].slice(1)) - 1, D[d] || (D[d] = {});
+              p = parseInt(j[I].slice(1)) - 1, D[p] || (D[p] = {});
               break;
             case "R":
               u = parseInt(j[I].slice(1)) - 1, C[u] || (C[u] = {}), F > 0 ? (C[u].hpt = F, C[u].hpx = pt2px(F)) : F === 0 && (C[u].hidden = !0);
               break;
             default:
-              if (h && h.WTF) throw new Error("SYLK bad record " + R);
+              if (d && d.WTF) throw new Error("SYLK bad record " + R);
           }
           b < 1 && (H = null);
           break;
         default:
-          if (h && h.WTF) throw new Error("SYLK bad record " + R);
+          if (d && d.WTF) throw new Error("SYLK bad record " + R);
       }
     }
-    return C.length > 0 && (G["!rows"] = C), D.length > 0 && (G["!cols"] = D), h && h.sheetRows && (k = k.slice(0, h.sheetRows)), [k, G];
+    return C.length > 0 && (G["!rows"] = C), D.length > 0 && (G["!cols"] = D), d && d.sheetRows && (k = k.slice(0, d.sheetRows)), [k, G];
   }
-  function s(_, h) {
-    var m = n(_, h), u = m[0], d = m[1], A = aoa_to_sheet(u, h);
-    return keys(d).forEach(function(I) {
-      A[I] = d[I];
+  function s(_, d) {
+    var m = n(_, d), u = m[0], p = m[1], A = aoa_to_sheet(u, d);
+    return keys(p).forEach(function(I) {
+      A[I] = p[I];
     }), A;
   }
-  function l(_, h) {
-    return sheet_to_workbook(s(_, h), h);
+  function l(_, d) {
+    return sheet_to_workbook(s(_, d), d);
   }
-  function o(_, h, m, u) {
-    var d = "C;Y" + (m + 1) + ";X" + (u + 1) + ";K";
+  function o(_, d, m, u) {
+    var p = "C;Y" + (m + 1) + ";X" + (u + 1) + ";K";
     switch (_.t) {
       case "n":
-        d += _.v || 0, _.f && !_.F && (d += ";E" + a1_to_rc(_.f, { r: m, c: u }));
+        p += _.v || 0, _.f && !_.F && (p += ";E" + a1_to_rc(_.f, { r: m, c: u }));
         break;
       case "b":
-        d += _.v ? "TRUE" : "FALSE";
+        p += _.v ? "TRUE" : "FALSE";
         break;
       case "e":
-        d += _.w || _.v;
+        p += _.w || _.v;
         break;
       case "d":
-        d += '"' + (_.w || _.v) + '"';
+        p += '"' + (_.w || _.v) + '"';
         break;
       case "s":
-        d += '"' + _.v.replace(/"/g, "").replace(/;/g, ";;") + '"';
+        p += '"' + _.v.replace(/"/g, "").replace(/;/g, ";;") + '"';
         break;
     }
-    return d;
+    return p;
   }
-  function f(_, h) {
-    h.forEach(function(m, u) {
-      var d = "F;W" + (u + 1) + " " + (u + 1) + " ";
-      m.hidden ? d += "0" : (typeof m.width == "number" && !m.wpx && (m.wpx = width2px(m.width)), typeof m.wpx == "number" && !m.wch && (m.wch = px2char(m.wpx)), typeof m.wch == "number" && (d += Math.round(m.wch))), d.charAt(d.length - 1) != " " && _.push(d);
+  function f(_, d) {
+    d.forEach(function(m, u) {
+      var p = "F;W" + (u + 1) + " " + (u + 1) + " ";
+      m.hidden ? p += "0" : (typeof m.width == "number" && !m.wpx && (m.wpx = width2px(m.width)), typeof m.wpx == "number" && !m.wch && (m.wch = px2char(m.wpx)), typeof m.wch == "number" && (p += Math.round(m.wch))), p.charAt(p.length - 1) != " " && _.push(p);
     });
   }
-  function c(_, h) {
-    h.forEach(function(m, u) {
-      var d = "F;";
-      m.hidden ? d += "M0;" : m.hpt ? d += "M" + 20 * m.hpt + ";" : m.hpx && (d += "M" + 20 * px2pt(m.hpx) + ";"), d.length > 2 && _.push(d + "R" + (u + 1));
+  function c(_, d) {
+    d.forEach(function(m, u) {
+      var p = "F;";
+      m.hidden ? p += "M0;" : m.hpt ? p += "M" + 20 * m.hpt + ";" : m.hpx && (p += "M" + 20 * px2pt(m.hpx) + ";"), p.length > 2 && _.push(p + "R" + (u + 1));
     });
   }
-  function p(_, h) {
-    var m = ["ID;PWXL;N;E"], u = [], d = safe_decode_range(_["!ref"]), A, I = Array.isArray(_), k = `\r
+  function h(_, d) {
+    var m = ["ID;PWXL;N;E"], u = [], p = safe_decode_range(_["!ref"]), A, I = Array.isArray(_), k = `\r
 `;
-    m.push("P;PGeneral"), m.push("F;P0;DG0G8;M255"), _["!cols"] && f(m, _["!cols"]), _["!rows"] && c(m, _["!rows"]), m.push("B;Y" + (d.e.r - d.s.r + 1) + ";X" + (d.e.c - d.s.c + 1) + ";D" + [d.s.c, d.s.r, d.e.c, d.e.r].join(" "));
-    for (var O = d.s.r; O <= d.e.r; ++O)
-      for (var H = d.s.c; H <= d.e.c; ++H) {
+    m.push("P;PGeneral"), m.push("F;P0;DG0G8;M255"), _["!cols"] && f(m, _["!cols"]), _["!rows"] && c(m, _["!rows"]), m.push("B;Y" + (p.e.r - p.s.r + 1) + ";X" + (p.e.c - p.s.c + 1) + ";D" + [p.s.c, p.s.r, p.e.c, p.e.r].join(" "));
+    for (var O = p.s.r; O <= p.e.r; ++O)
+      for (var H = p.s.c; H <= p.e.c; ++H) {
         var G = encode_cell({ r: O, c: H });
         A = I ? (_[O] || [])[H] : _[G], !(!A || A.v == null && (!A.f || A.F)) && u.push(o(A, _, O, H));
       }
@@ -4970,7 +4970,7 @@ var DBF = /* @__PURE__ */ function() {
   return {
     to_workbook: l,
     to_sheet: s,
-    from_sheet: p
+    from_sheet: h
   };
 }(), DIF = /* @__PURE__ */ function() {
   function e(i, s) {
@@ -4988,34 +4988,34 @@ var DBF = /* @__PURE__ */ function() {
   }
   function r(i, s) {
     for (var l = i.split(`
-`), o = -1, f = -1, c = 0, p = []; c !== l.length; ++c) {
+`), o = -1, f = -1, c = 0, h = []; c !== l.length; ++c) {
       if (l[c].trim() === "BOT") {
-        p[++o] = [], f = 0;
+        h[++o] = [], f = 0;
         continue;
       }
       if (!(o < 0)) {
-        var _ = l[c].trim().split(","), h = _[0], m = _[1];
+        var _ = l[c].trim().split(","), d = _[0], m = _[1];
         ++c;
         for (var u = l[c] || ""; (u.match(/["]/g) || []).length & 1 && c < l.length - 1; ) u += `
 ` + l[++c];
-        switch (u = u.trim(), +h) {
+        switch (u = u.trim(), +d) {
           case -1:
             if (u === "BOT") {
-              p[++o] = [], f = 0;
+              h[++o] = [], f = 0;
               continue;
             } else if (u !== "EOD") throw new Error("Unrecognized DIF special command " + u);
             break;
           case 0:
-            u === "TRUE" ? p[o][f] = !0 : u === "FALSE" ? p[o][f] = !1 : isNaN(fuzzynum(m)) ? isNaN(fuzzydate(m).getDate()) ? p[o][f] = m : p[o][f] = parseDate(m) : p[o][f] = fuzzynum(m), ++f;
+            u === "TRUE" ? h[o][f] = !0 : u === "FALSE" ? h[o][f] = !1 : isNaN(fuzzynum(m)) ? isNaN(fuzzydate(m).getDate()) ? h[o][f] = m : h[o][f] = parseDate(m) : h[o][f] = fuzzynum(m), ++f;
             break;
           case 1:
-            u = u.slice(1, u.length - 1), u = u.replace(/""/g, '"'), u && u.match(/^=".*"$/) && (u = u.slice(2, -1)), p[o][f++] = u !== "" ? u : null;
+            u = u.slice(1, u.length - 1), u = u.replace(/""/g, '"'), u && u.match(/^=".*"$/) && (u = u.slice(2, -1)), h[o][f++] = u !== "" ? u : null;
             break;
         }
         if (u === "EOD") break;
       }
     }
-    return s && s.sheetRows && (p = p.slice(0, s.sheetRows)), p;
+    return s && s.sheetRows && (h = h.slice(0, s.sheetRows)), h;
   }
   function t(i, s) {
     return aoa_to_sheet(e(i, s), s);
@@ -5024,35 +5024,35 @@ var DBF = /* @__PURE__ */ function() {
     return sheet_to_workbook(t(i, s), s);
   }
   var n = /* @__PURE__ */ function() {
-    var i = function(o, f, c, p, _) {
-      o.push(f), o.push(c + "," + p), o.push('"' + _.replace(/"/g, '""') + '"');
-    }, s = function(o, f, c, p) {
-      o.push(f + "," + c), o.push(f == 1 ? '"' + p.replace(/"/g, '""') + '"' : p);
+    var i = function(o, f, c, h, _) {
+      o.push(f), o.push(c + "," + h), o.push('"' + _.replace(/"/g, '""') + '"');
+    }, s = function(o, f, c, h) {
+      o.push(f + "," + c), o.push(f == 1 ? '"' + h.replace(/"/g, '""') + '"' : h);
     };
     return function(o) {
-      var f = [], c = safe_decode_range(o["!ref"]), p, _ = Array.isArray(o);
+      var f = [], c = safe_decode_range(o["!ref"]), h, _ = Array.isArray(o);
       i(f, "TABLE", 0, 1, "sheetjs"), i(f, "VECTORS", 0, c.e.r - c.s.r + 1, ""), i(f, "TUPLES", 0, c.e.c - c.s.c + 1, ""), i(f, "DATA", 0, 0, "");
-      for (var h = c.s.r; h <= c.e.r; ++h) {
+      for (var d = c.s.r; d <= c.e.r; ++d) {
         s(f, -1, 0, "BOT");
         for (var m = c.s.c; m <= c.e.c; ++m) {
-          var u = encode_cell({ r: h, c: m });
-          if (p = _ ? (o[h] || [])[m] : o[u], !p) {
+          var u = encode_cell({ r: d, c: m });
+          if (h = _ ? (o[d] || [])[m] : o[u], !h) {
             s(f, 1, 0, "");
             continue;
           }
-          switch (p.t) {
+          switch (h.t) {
             case "n":
-              var d = p.w;
-              !d && p.v != null && (d = p.v), d == null ? p.f && !p.F ? s(f, 1, 0, "=" + p.f) : s(f, 1, 0, "") : s(f, 0, d, "V");
+              var p = h.w;
+              !p && h.v != null && (p = h.v), p == null ? h.f && !h.F ? s(f, 1, 0, "=" + h.f) : s(f, 1, 0, "") : s(f, 0, p, "V");
               break;
             case "b":
-              s(f, 0, p.v ? 1 : 0, p.v ? "TRUE" : "FALSE");
+              s(f, 0, h.v ? 1 : 0, h.v ? "TRUE" : "FALSE");
               break;
             case "s":
-              s(f, 1, 0, isNaN(p.v) ? p.v : '="' + p.v + '"');
+              s(f, 1, 0, isNaN(h.v) ? h.v : '="' + h.v + '"');
               break;
             case "d":
-              p.w || (p.w = SSF_format(p.z || table_fmt[14], datenum(parseDate(p.v)))), s(f, 0, p.w, "V");
+              h.w || (h.w = SSF_format(h.z || table_fmt[14], datenum(parseDate(h.v)))), s(f, 0, h.w, "V");
               break;
             default:
               s(f, 1, 0, "");
@@ -5071,17 +5071,17 @@ var DBF = /* @__PURE__ */ function() {
     from_sheet: n
   };
 }(), ETH = /* @__PURE__ */ function() {
-  function e(p) {
-    return p.replace(/\\b/g, "\\").replace(/\\c/g, ":").replace(/\\n/g, `
+  function e(h) {
+    return h.replace(/\\b/g, "\\").replace(/\\c/g, ":").replace(/\\n/g, `
 `);
   }
-  function r(p) {
-    return p.replace(/\\/g, "\\b").replace(/:/g, "\\c").replace(/\n/g, "\\n");
+  function r(h) {
+    return h.replace(/\\/g, "\\b").replace(/:/g, "\\c").replace(/\n/g, "\\n");
   }
-  function t(p, _) {
-    for (var h = p.split(`
-`), m = -1, u = -1, d = 0, A = []; d !== h.length; ++d) {
-      var I = h[d].trim().split(":");
+  function t(h, _) {
+    for (var d = h.split(`
+`), m = -1, u = -1, p = 0, A = []; p !== d.length; ++p) {
+      var I = d[p].trim().split(":");
       if (I[0] === "cell") {
         var k = decode_cell(I[1]);
         if (A.length <= k.r) for (m = A.length; m <= k.r; ++m) A[m] || (A[m] = []);
@@ -5109,11 +5109,11 @@ var DBF = /* @__PURE__ */ function() {
     }
     return _ && _.sheetRows && (A = A.slice(0, _.sheetRows)), A;
   }
-  function a(p, _) {
-    return aoa_to_sheet(t(p, _), _);
+  function a(h, _) {
+    return aoa_to_sheet(t(h, _), _);
   }
-  function n(p, _) {
-    return sheet_to_workbook(a(p, _), _);
+  function n(h, _) {
+    return sheet_to_workbook(a(h, _), _);
   }
   var i = [
     "socialcalc:version:1.5",
@@ -5130,36 +5130,36 @@ var DBF = /* @__PURE__ */ function() {
     "part:sheet"
   ].join(`
 `), o = "--SocialCalcSpreadsheetControlSave--";
-  function f(p) {
-    if (!p || !p["!ref"]) return "";
-    for (var _ = [], h = [], m, u = "", d = decode_range(p["!ref"]), A = Array.isArray(p), I = d.s.r; I <= d.e.r; ++I)
-      for (var k = d.s.c; k <= d.e.c; ++k)
-        if (u = encode_cell({ r: I, c: k }), m = A ? (p[I] || [])[k] : p[u], !(!m || m.v == null || m.t === "z")) {
-          switch (h = ["cell", u, "t"], m.t) {
+  function f(h) {
+    if (!h || !h["!ref"]) return "";
+    for (var _ = [], d = [], m, u = "", p = decode_range(h["!ref"]), A = Array.isArray(h), I = p.s.r; I <= p.e.r; ++I)
+      for (var k = p.s.c; k <= p.e.c; ++k)
+        if (u = encode_cell({ r: I, c: k }), m = A ? (h[I] || [])[k] : h[u], !(!m || m.v == null || m.t === "z")) {
+          switch (d = ["cell", u, "t"], m.t) {
             case "s":
             case "str":
-              h.push(r(m.v));
+              d.push(r(m.v));
               break;
             case "n":
-              m.f ? (h[2] = "vtf", h[3] = "n", h[4] = m.v, h[5] = r(m.f)) : (h[2] = "v", h[3] = m.v);
+              m.f ? (d[2] = "vtf", d[3] = "n", d[4] = m.v, d[5] = r(m.f)) : (d[2] = "v", d[3] = m.v);
               break;
             case "b":
-              h[2] = "vt" + (m.f ? "f" : "c"), h[3] = "nl", h[4] = m.v ? "1" : "0", h[5] = r(m.f || (m.v ? "TRUE" : "FALSE"));
+              d[2] = "vt" + (m.f ? "f" : "c"), d[3] = "nl", d[4] = m.v ? "1" : "0", d[5] = r(m.f || (m.v ? "TRUE" : "FALSE"));
               break;
             case "d":
               var O = datenum(parseDate(m.v));
-              h[2] = "vtc", h[3] = "nd", h[4] = "" + O, h[5] = m.w || SSF_format(m.z || table_fmt[14], O);
+              d[2] = "vtc", d[3] = "nd", d[4] = "" + O, d[5] = m.w || SSF_format(m.z || table_fmt[14], O);
               break;
             case "e":
               continue;
           }
-          _.push(h.join(":"));
+          _.push(d.join(":"));
         }
-    return _.push("sheet:c:" + (d.e.c - d.s.c + 1) + ":r:" + (d.e.r - d.s.r + 1) + ":tvf:1"), _.push("valueformat:1:text-wiki"), _.join(`
+    return _.push("sheet:c:" + (p.e.c - p.s.c + 1) + ":r:" + (p.e.r - p.s.r + 1) + ":tvf:1"), _.push("valueformat:1:text-wiki"), _.join(`
 `);
   }
-  function c(p) {
-    return [i, s, l, s, f(p), o].join(`
+  function c(h) {
+    return [i, s, l, s, f(h), o].join(`
 `);
   }
   return {
@@ -5168,22 +5168,22 @@ var DBF = /* @__PURE__ */ function() {
     from_sheet: c
   };
 }(), PRN = /* @__PURE__ */ function() {
-  function e(c, p, _, h, m) {
-    m.raw ? p[_][h] = c : c === "" || (c === "TRUE" ? p[_][h] = !0 : c === "FALSE" ? p[_][h] = !1 : isNaN(fuzzynum(c)) ? isNaN(fuzzydate(c).getDate()) ? p[_][h] = c : p[_][h] = parseDate(c) : p[_][h] = fuzzynum(c));
+  function e(c, h, _, d, m) {
+    m.raw ? h[_][d] = c : c === "" || (c === "TRUE" ? h[_][d] = !0 : c === "FALSE" ? h[_][d] = !1 : isNaN(fuzzynum(c)) ? isNaN(fuzzydate(c).getDate()) ? h[_][d] = c : h[_][d] = parseDate(c) : h[_][d] = fuzzynum(c));
   }
-  function r(c, p) {
-    var _ = p || {}, h = [];
-    if (!c || c.length === 0) return h;
+  function r(c, h) {
+    var _ = h || {}, d = [];
+    if (!c || c.length === 0) return d;
     for (var m = c.split(/[\r\n]/), u = m.length - 1; u >= 0 && m[u].length === 0; ) --u;
-    for (var d = 10, A = 0, I = 0; I <= u; ++I)
-      A = m[I].indexOf(" "), A == -1 ? A = m[I].length : A++, d = Math.max(d, A);
+    for (var p = 10, A = 0, I = 0; I <= u; ++I)
+      A = m[I].indexOf(" "), A == -1 ? A = m[I].length : A++, p = Math.max(p, A);
     for (I = 0; I <= u; ++I) {
-      h[I] = [];
+      d[I] = [];
       var k = 0;
-      for (e(m[I].slice(0, d).trim(), h, I, k, _), k = 1; k <= (m[I].length - d) / 10 + 1; ++k)
-        e(m[I].slice(d + (k - 1) * 10, d + k * 10).trim(), h, I, k, _);
+      for (e(m[I].slice(0, p).trim(), d, I, k, _), k = 1; k <= (m[I].length - p) / 10 + 1; ++k)
+        e(m[I].slice(p + (k - 1) * 10, p + k * 10).trim(), d, I, k, _);
     }
-    return _.sheetRows && (h = h.slice(0, _.sheetRows)), h;
+    return _.sheetRows && (d = d.slice(0, _.sheetRows)), d;
   }
   var t = {
     /*::[*/
@@ -5205,22 +5205,22 @@ var DBF = /* @__PURE__ */ function() {
     124: 0
   };
   function n(c) {
-    for (var p = {}, _ = !1, h = 0, m = 0; h < c.length; ++h)
-      (m = c.charCodeAt(h)) == 34 ? _ = !_ : !_ && m in t && (p[m] = (p[m] || 0) + 1);
+    for (var h = {}, _ = !1, d = 0, m = 0; d < c.length; ++d)
+      (m = c.charCodeAt(d)) == 34 ? _ = !_ : !_ && m in t && (h[m] = (h[m] || 0) + 1);
     m = [];
-    for (h in p) Object.prototype.hasOwnProperty.call(p, h) && m.push([p[h], h]);
+    for (d in h) Object.prototype.hasOwnProperty.call(h, d) && m.push([h[d], d]);
     if (!m.length) {
-      p = a;
-      for (h in p) Object.prototype.hasOwnProperty.call(p, h) && m.push([p[h], h]);
+      h = a;
+      for (d in h) Object.prototype.hasOwnProperty.call(h, d) && m.push([h[d], d]);
     }
-    return m.sort(function(u, d) {
-      return u[0] - d[0] || a[u[1]] - a[d[1]];
+    return m.sort(function(u, p) {
+      return u[0] - p[0] || a[u[1]] - a[p[1]];
     }), t[m.pop()[1]] || 44;
   }
-  function i(c, p) {
-    var _ = p || {}, h = "", m = _.dense ? [] : {}, u = { s: { c: 0, r: 0 }, e: { c: 0, r: 0 } };
-    c.slice(0, 4) == "sep=" ? c.charCodeAt(5) == 13 && c.charCodeAt(6) == 10 ? (h = c.charAt(4), c = c.slice(7)) : c.charCodeAt(5) == 13 || c.charCodeAt(5) == 10 ? (h = c.charAt(4), c = c.slice(6)) : h = n(c.slice(0, 1024)) : _ && _.FS ? h = _.FS : h = n(c.slice(0, 1024));
-    var d = 0, A = 0, I = 0, k = 0, O = 0, H = h.charCodeAt(0), G = !1, C = 0, D = c.charCodeAt(0);
+  function i(c, h) {
+    var _ = h || {}, d = "", m = _.dense ? [] : {}, u = { s: { c: 0, r: 0 }, e: { c: 0, r: 0 } };
+    c.slice(0, 4) == "sep=" ? c.charCodeAt(5) == 13 && c.charCodeAt(6) == 10 ? (d = c.charAt(4), c = c.slice(7)) : c.charCodeAt(5) == 13 || c.charCodeAt(5) == 10 ? (d = c.charAt(4), c = c.slice(6)) : d = n(c.slice(0, 1024)) : _ && _.FS ? d = _.FS : d = n(c.slice(0, 1024));
+    var p = 0, A = 0, I = 0, k = 0, O = 0, H = d.charCodeAt(0), G = !1, C = 0, D = c.charCodeAt(0);
     c = c.replace(/\r\n/mg, `
 `);
     var S = _.dateNF != null ? dateNF_regex(_.dateNF) : null;
@@ -5245,8 +5245,8 @@ var DBF = /* @__PURE__ */ function() {
         S && B.match(S) && (B = dateNF_fix(B, _.dateNF, B.match(S) || []), j = 1), _.cellDates ? (R.t = "d", R.v = parseDate(B, j)) : (R.t = "n", R.v = datenum(parseDate(B, j))), _.cellText !== !1 && (R.w = SSF_format(R.z, R.v instanceof Date ? datenum(R.v) : R.v)), _.cellNF || delete R.z;
       } else
         R.t = "s", R.v = B;
-      if (R.t == "z" || (_.dense ? (m[d] || (m[d] = []), m[d][A] = R) : m[encode_cell({ c: A, r: d })] = R), k = O + 1, D = c.charCodeAt(k), u.e.c < A && (u.e.c = A), u.e.r < d && (u.e.r = d), C == H) ++A;
-      else if (A = 0, ++d, _.sheetRows && _.sheetRows <= d) return !0;
+      if (R.t == "z" || (_.dense ? (m[p] || (m[p] = []), m[p][A] = R) : m[encode_cell({ c: A, r: p })] = R), k = O + 1, D = c.charCodeAt(k), u.e.c < A && (u.e.c = A), u.e.r < p && (u.e.r = p), C == H) ++A;
+      else if (A = 0, ++p, _.sheetRows && _.sheetRows <= p) return !0;
     }
     e: for (; O < c.length; ++O) switch (C = c.charCodeAt(O)) {
       case 34:
@@ -5260,12 +5260,12 @@ var DBF = /* @__PURE__ */ function() {
     }
     return O - k > 0 && F(), m["!ref"] = encode_range(u), m;
   }
-  function s(c, p) {
-    return !(p && p.PRN) || p.FS || c.slice(0, 4) == "sep=" || c.indexOf("	") >= 0 || c.indexOf(",") >= 0 || c.indexOf(";") >= 0 ? i(c, p) : aoa_to_sheet(r(c, p), p);
+  function s(c, h) {
+    return !(h && h.PRN) || h.FS || c.slice(0, 4) == "sep=" || c.indexOf("	") >= 0 || c.indexOf(",") >= 0 || c.indexOf(";") >= 0 ? i(c, h) : aoa_to_sheet(r(c, h), h);
   }
-  function l(c, p) {
-    var _ = "", h = p.type == "string" ? [0, 0, 0, 0] : firstbyte(c, p);
-    switch (p.type) {
+  function l(c, h) {
+    var _ = "", d = h.type == "string" ? [0, 0, 0, 0] : firstbyte(c, h);
+    switch (h.type) {
       case "base64":
         _ = Base64_decode(c);
         break;
@@ -5273,7 +5273,7 @@ var DBF = /* @__PURE__ */ function() {
         _ = c;
         break;
       case "buffer":
-        p.codepage == 65001 ? _ = c.toString("utf8") : p.codepage && typeof $cptable < "u" ? _ = $cptable.utils.decode(p.codepage, c) : _ = has_buf && Buffer.isBuffer(c) ? c.toString("binary") : a2s(c);
+        h.codepage == 65001 ? _ = c.toString("utf8") : h.codepage && typeof $cptable < "u" ? _ = $cptable.utils.decode(h.codepage, c) : _ = has_buf && Buffer.isBuffer(c) ? c.toString("binary") : a2s(c);
         break;
       case "array":
         _ = cc2str(c);
@@ -5282,27 +5282,27 @@ var DBF = /* @__PURE__ */ function() {
         _ = c;
         break;
       default:
-        throw new Error("Unrecognized type " + p.type);
+        throw new Error("Unrecognized type " + h.type);
     }
-    return h[0] == 239 && h[1] == 187 && h[2] == 191 ? _ = utf8read(_.slice(3)) : p.type != "string" && p.type != "buffer" && p.codepage == 65001 ? _ = utf8read(_) : p.type == "binary" && typeof $cptable < "u" && p.codepage && (_ = $cptable.utils.decode(p.codepage, $cptable.utils.encode(28591, _))), _.slice(0, 19) == "socialcalc:version:" ? ETH.to_sheet(p.type == "string" ? _ : utf8read(_), p) : s(_, p);
+    return d[0] == 239 && d[1] == 187 && d[2] == 191 ? _ = utf8read(_.slice(3)) : h.type != "string" && h.type != "buffer" && h.codepage == 65001 ? _ = utf8read(_) : h.type == "binary" && typeof $cptable < "u" && h.codepage && (_ = $cptable.utils.decode(h.codepage, $cptable.utils.encode(28591, _))), _.slice(0, 19) == "socialcalc:version:" ? ETH.to_sheet(h.type == "string" ? _ : utf8read(_), h) : s(_, h);
   }
-  function o(c, p) {
-    return sheet_to_workbook(l(c, p), p);
+  function o(c, h) {
+    return sheet_to_workbook(l(c, h), h);
   }
   function f(c) {
-    for (var p = [], _ = safe_decode_range(c["!ref"]), h, m = Array.isArray(c), u = _.s.r; u <= _.e.r; ++u) {
-      for (var d = [], A = _.s.c; A <= _.e.c; ++A) {
+    for (var h = [], _ = safe_decode_range(c["!ref"]), d, m = Array.isArray(c), u = _.s.r; u <= _.e.r; ++u) {
+      for (var p = [], A = _.s.c; A <= _.e.c; ++A) {
         var I = encode_cell({ r: u, c: A });
-        if (h = m ? (c[u] || [])[A] : c[I], !h || h.v == null) {
-          d.push("          ");
+        if (d = m ? (c[u] || [])[A] : c[I], !d || d.v == null) {
+          p.push("          ");
           continue;
         }
-        for (var k = (h.w || (format_cell(h), h.w) || "").slice(0, 10); k.length < 10; ) k += " ";
-        d.push(k + (A === 0 ? " " : ""));
+        for (var k = (d.w || (format_cell(d), d.w) || "").slice(0, 10); k.length < 10; ) k += " ";
+        p.push(k + (A === 0 ? " " : ""));
       }
-      p.push(d.join(""));
+      h.push(p.join(""));
     }
-    return p.join(`
+    return h.join(`
 `);
   }
   return {
@@ -5334,7 +5334,7 @@ var DBF = /* @__PURE__ */ function() {
   }
   function t(N, X) {
     if (!N) return N;
-    var b = X || {}, P = b.dense ? [] : {}, K = "Sheet1", ne = "", ie = 0, re = {}, Z = [], he = [], fe = { s: { r: 0, c: 0 }, e: { r: 0, c: 0 } }, Ee = b.sheetRows || 0;
+    var b = X || {}, P = b.dense ? [] : {}, K = "Sheet1", ne = "", ie = 0, re = {}, Z = [], de = [], fe = { s: { r: 0, c: 0 }, e: { r: 0, c: 0 } }, Ee = b.sheetRows || 0;
     if (N[2] == 0 && (N[3] == 8 || N[3] == 9) && N.length >= 16 && N[14] == 5 && N[15] === 108)
       throw new Error("Unsupported Works 3 for Mac file");
     if (N[2] == 2)
@@ -5386,16 +5386,16 @@ var DBF = /* @__PURE__ */ function() {
             b.dense ? (P[te[0].r] || (P[te[0].r] = []), P[te[0].r][te[0].c] = te[1]) : P[encode_cell(te[0])] = te[1], fe.e.c < te[0].c && (fe.e.c = te[0].c), fe.e.r < te[0].r && (fe.e.r = te[0].r);
             break;
           case 27:
-            te[14e3] && (he[te[14e3][0]] = te[14e3][1]);
+            te[14e3] && (de[te[14e3][0]] = te[14e3][1]);
             break;
           case 1537:
-            he[te[0]] = te[1], te[0] == ie && (K = te[1]);
+            de[te[0]] = te[1], te[0] == ie && (K = te[1]);
             break;
         }
       }, b);
     else throw new Error("Unrecognized LOTUS BOF " + N[2]);
-    if (P["!ref"] = encode_range(fe), re[ne || K] = P, Z.push(ne || K), !he.length) return { SheetNames: Z, Sheets: re };
-    for (var ue = {}, Se = [], pe = 0; pe < he.length; ++pe) re[Z[pe]] ? (Se.push(he[pe] || Z[pe]), ue[he[pe]] = re[he[pe]] || re[Z[pe]]) : (Se.push(he[pe]), ue[he[pe]] = { "!ref": "A1" });
+    if (P["!ref"] = encode_range(fe), re[ne || K] = P, Z.push(ne || K), !de.length) return { SheetNames: Z, Sheets: re };
+    for (var ue = {}, Se = [], pe = 0; pe < de.length; ++pe) re[Z[pe]] ? (Se.push(de[pe] || Z[pe]), ue[de[pe]] = re[de[pe]] || re[Z[pe]]) : (Se.push(de[pe]), ue[de[pe]] = { "!ref": "A1" });
     return { SheetNames: Se, Sheets: ue };
   }
   function a(N, X) {
@@ -5404,15 +5404,15 @@ var DBF = /* @__PURE__ */ function() {
     var P = buf_array(), K = safe_decode_range(N["!ref"]), ne = Array.isArray(N), ie = [];
     write_biff_rec(P, 0, i(1030)), write_biff_rec(P, 6, o(K));
     for (var re = Math.min(K.e.r, 8191), Z = K.s.r; Z <= re; ++Z)
-      for (var he = encode_row(Z), fe = K.s.c; fe <= K.e.c; ++fe) {
+      for (var de = encode_row(Z), fe = K.s.c; fe <= K.e.c; ++fe) {
         Z === K.s.r && (ie[fe] = encode_col(fe));
-        var Ee = ie[fe] + he, ue = ne ? (N[Z] || [])[fe] : N[Ee];
+        var Ee = ie[fe] + de, ue = ne ? (N[Z] || [])[fe] : N[Ee];
         if (!(!ue || ue.t == "z"))
           if (ue.t == "n")
-            (ue.v | 0) == ue.v && ue.v >= -32768 && ue.v <= 32767 ? write_biff_rec(P, 13, h(Z, fe, ue.v)) : write_biff_rec(P, 14, u(Z, fe, ue.v));
+            (ue.v | 0) == ue.v && ue.v >= -32768 && ue.v <= 32767 ? write_biff_rec(P, 13, d(Z, fe, ue.v)) : write_biff_rec(P, 14, u(Z, fe, ue.v));
           else {
             var Se = format_cell(ue);
-            write_biff_rec(P, 15, p(Z, fe, Se.slice(0, 239)));
+            write_biff_rec(P, 15, h(Z, fe, Se.slice(0, 239)));
           }
       }
     return write_biff_rec(P, 1), P.end();
@@ -5427,10 +5427,10 @@ var DBF = /* @__PURE__ */ function() {
     for (K = 0; K < N.SheetNames.length; ++K) {
       var re = N.Sheets[N.SheetNames[K]];
       if (!(!re || !re["!ref"])) {
-        for (var Z = safe_decode_range(re["!ref"]), he = Array.isArray(re), fe = [], Ee = Math.min(Z.e.r, 8191), ue = Z.s.r; ue <= Ee; ++ue)
+        for (var Z = safe_decode_range(re["!ref"]), de = Array.isArray(re), fe = [], Ee = Math.min(Z.e.r, 8191), ue = Z.s.r; ue <= Ee; ++ue)
           for (var Se = encode_row(ue), pe = Z.s.c; pe <= Z.e.c; ++pe) {
             ue === Z.s.r && (fe[pe] = encode_col(pe));
-            var te = fe[pe] + Se, Te = he ? (re[ue] || [])[pe] : re[te];
+            var te = fe[pe] + Se, Te = de ? (re[ue] || [])[pe] : re[te];
             if (!(!Te || Te.t == "z"))
               if (Te.t == "n")
                 write_biff_rec(P, 23, F(ue, pe, ie, Te.v));
@@ -5482,7 +5482,7 @@ var DBF = /* @__PURE__ */ function() {
     }
     return b.qpro && N.l++, K[1].v = N.read_shift(P - N.l, "cstr"), K;
   }
-  function p(N, X, b) {
+  function h(N, X, b) {
     var P = new_buf(7 + b.length);
     P.write_shift(1, 255), P.write_shift(2, X), P.write_shift(2, N), P.write_shift(1, 39);
     for (var K = 0; K < P.length; ++K) {
@@ -5495,7 +5495,7 @@ var DBF = /* @__PURE__ */ function() {
     var P = f(N, X, b);
     return P[1].v = N.read_shift(2, "i"), P;
   }
-  function h(N, X, b) {
+  function d(N, X, b) {
     var P = new_buf(7);
     return P.write_shift(1, 255), P.write_shift(2, X), P.write_shift(2, N), P.write_shift(2, b, "i"), P;
   }
@@ -5507,7 +5507,7 @@ var DBF = /* @__PURE__ */ function() {
     var P = new_buf(13);
     return P.write_shift(1, 255), P.write_shift(2, X), P.write_shift(2, N), P.write_shift(8, b, "f"), P;
   }
-  function d(N, X, b) {
+  function p(N, X, b) {
     var P = N.l + X, K = f(N, X, b);
     if (K[1].v = N.read_shift(8, "f"), b.qpro) N.l = P;
     else {
@@ -5581,8 +5581,8 @@ var DBF = /* @__PURE__ */ function() {
           break;
         case 2:
           {
-            var he = A(X[0].c, N.read_shift(2), !0), fe = A(X[0].r, N.read_shift(2), !1);
-            ne = A(X[0].c, N.read_shift(2), !0), K = A(X[0].r, N.read_shift(2), !1), b.push(he + fe + ":" + ne + K);
+            var de = A(X[0].c, N.read_shift(2), !0), fe = A(X[0].r, N.read_shift(2), !1);
+            ne = A(X[0].c, N.read_shift(2), !0), K = A(X[0].r, N.read_shift(2), !1), b.push(de + fe + ":" + ne + K);
           }
           break;
         case 3:
@@ -5782,7 +5782,7 @@ var DBF = /* @__PURE__ */ function() {
     /*::[*/
     15: { n: "LABEL", f: c },
     /*::[*/
-    16: { n: "FORMULA", f: d },
+    16: { n: "FORMULA", f: p },
     /*::[*/
     24: { n: "TABLE" },
     /*::[*/
@@ -6192,19 +6192,19 @@ var RTF = /* @__PURE__ */ function() {
     var s = i || {}, l = s.dense ? [] : {}, o = n.match(/\\trowd.*?\\row\b/g);
     if (!o.length) throw new Error("RTF missing table");
     var f = { s: { c: 0, r: 0 }, e: { c: 0, r: o.length - 1 } };
-    return o.forEach(function(c, p) {
-      Array.isArray(l) && (l[p] = []);
-      for (var _ = /\\\w+\b/g, h = 0, m, u = -1; m = _.exec(c); ) {
+    return o.forEach(function(c, h) {
+      Array.isArray(l) && (l[h] = []);
+      for (var _ = /\\\w+\b/g, d = 0, m, u = -1; m = _.exec(c); ) {
         switch (m[0]) {
           case "\\cell":
-            var d = c.slice(h, _.lastIndex - m[0].length);
-            if (d[0] == " " && (d = d.slice(1)), ++u, d.length) {
-              var A = { v: d, t: "s" };
-              Array.isArray(l) ? l[p][u] = A : l[encode_cell({ r: p, c: u })] = A;
+            var p = c.slice(d, _.lastIndex - m[0].length);
+            if (p[0] == " " && (p = p.slice(1)), ++u, p.length) {
+              var A = { v: p, t: "s" };
+              Array.isArray(l) ? l[h][u] = A : l[encode_cell({ r: h, c: u })] = A;
             }
             break;
         }
-        h = _.lastIndex;
+        d = _.lastIndex;
       }
       u > f.e.c && (f.e.c = u);
     }), l["!ref"] = encode_range(f), l;
@@ -6217,8 +6217,8 @@ var RTF = /* @__PURE__ */ function() {
       i.push("\\trowd\\trautofit1");
       for (var c = s.s.c; c <= s.e.c; ++c) i.push("\\cellx" + (c + 1));
       for (i.push("\\pard\\intbl"), c = s.s.c; c <= s.e.c; ++c) {
-        var p = encode_cell({ r: f, c });
-        l = o ? (n[f] || [])[c] : n[p], !(!l || l.v == null && (!l.f || l.F)) && (i.push(" " + (l.w || (format_cell(l), l.w))), i.push("\\cell"));
+        var h = encode_cell({ r: f, c });
+        l = o ? (n[f] || [])[c] : n[h], !(!l || l.v == null && (!l.f || l.F)) && (i.push(" " + (l.w || (format_cell(l), l.w))), i.push("\\cell"));
       }
       i.push("\\pard\\intbl\\row");
     }
@@ -6749,8 +6749,8 @@ var VBAFMTS = ["xlsb", "xlsm", "xlam", "biff8", "xla"], rc_to_a1 = /* @__PURE__
 }(), crefregex = /(^|[^._A-Z0-9])([$]?)([A-Z]{1,2}|[A-W][A-Z]{2}|X[A-E][A-Z]|XF[A-D])([$]?)(10[0-3]\d{4}|104[0-7]\d{3}|1048[0-4]\d{2}|10485[0-6]\d|104857[0-6]|[1-9]\d{0,5})(?![_.\(A-Za-z0-9])/g, a1_to_rc = /* @__PURE__ */ function() {
   return function(r, t) {
     return r.replace(crefregex, function(a, n, i, s, l, o) {
-      var f = decode_col(s) - (i ? 0 : t.c), c = decode_row(o) - (l ? 0 : t.r), p = c == 0 ? "" : l ? c + 1 : "[" + c + "]", _ = f == 0 ? "" : i ? f + 1 : "[" + f + "]";
-      return n + "R" + p + "C" + _;
+      var f = decode_col(s) - (i ? 0 : t.c), c = decode_row(o) - (l ? 0 : t.r), h = c == 0 ? "" : l ? c + 1 : "[" + c + "]", _ = f == 0 ? "" : i ? f + 1 : "[" + f + "]";
+      return n + "R" + h + "C" + _;
     });
   };
 }();
@@ -7444,9 +7444,9 @@ function stringify_formula(e, r, t, a, n) {
   var i = n && n.biff || 8, s = (
     /*range != null ? range :*/
     { s: { c: 0, r: 0 }, e: { c: 0, r: 0 } }
-  ), l = [], o, f, c, p = 0, _ = 0, h, m = "";
+  ), l = [], o, f, c, h = 0, _ = 0, d, m = "";
   if (!e[0] || !e[0][0]) return "";
-  for (var u = -1, d = "", A = 0, I = e[0].length; A < I; ++A) {
+  for (var u = -1, p = "", A = 0, I = e[0].length; A < I; ++A) {
     var k = e[0][A];
     switch (k[0]) {
       case "PtgUminus":
@@ -7473,15 +7473,15 @@ function stringify_formula(e, r, t, a, n) {
         if (o = l.pop(), f = l.pop(), u >= 0) {
           switch (e[0][u][1][0]) {
             case 0:
-              d = fill(" ", e[0][u][1][1]);
+              p = fill(" ", e[0][u][1][1]);
               break;
             case 1:
-              d = fill("\r", e[0][u][1][1]);
+              p = fill("\r", e[0][u][1][1]);
               break;
             default:
-              if (d = "", n.WTF) throw new Error("Unexpected PtgAttrSpaceType " + e[0][u][1][0]);
+              if (p = "", n.WTF) throw new Error("Unexpected PtgAttrSpaceType " + e[0][u][1][0]);
           }
-          f = f + d, u = -1;
+          f = f + p, u = -1;
         }
         l.push(f + PtgBinOp[k[0]] + o);
         break;
@@ -7509,8 +7509,8 @@ function stringify_formula(e, r, t, a, n) {
         c = t ? shift_cell_xls(k[1][1], t, n) : k[1][1], l.push(encode_cell_xls(c, i));
         break;
       case "PtgRef3d":
-        p = /*::Number(*/
-        k[1][1], c = shift_cell_xls(k[1][2], s, n), m = get_ixti(a, p, n), l.push(m + "!" + encode_cell_xls(c, i));
+        h = /*::Number(*/
+        k[1][1], c = shift_cell_xls(k[1][2], s, n), m = get_ixti(a, h, n), l.push(m + "!" + encode_cell_xls(c, i));
         break;
       case "PtgFunc":
       case "PtgFuncVar":
@@ -7543,14 +7543,14 @@ function stringify_formula(e, r, t, a, n) {
         );
         break;
       case "PtgAreaN":
-        h = shift_range_xls(k[1][1], t ? { s: t } : s, n), l.push(encode_range_xls(h, n));
+        d = shift_range_xls(k[1][1], t ? { s: t } : s, n), l.push(encode_range_xls(d, n));
         break;
       case "PtgArea":
-        h = shift_range_xls(k[1][1], s, n), l.push(encode_range_xls(h, n));
+        d = shift_range_xls(k[1][1], s, n), l.push(encode_range_xls(d, n));
         break;
       case "PtgArea3d":
-        p = /*::Number(*/
-        k[1][1], h = k[1][2], m = get_ixti(a, p, n), l.push(m + "!" + encode_range_xls(h, n));
+        h = /*::Number(*/
+        k[1][1], d = k[1][2], m = get_ixti(a, h, n), l.push(m + "!" + encode_range_xls(d, n));
         break;
       case "PtgAttrSum":
         l.push("SUM(" + l.pop() + ")");
@@ -7585,7 +7585,7 @@ function stringify_formula(e, r, t, a, n) {
       case "PtgParen":
         var j = "(", le = ")";
         if (u >= 0) {
-          switch (d = "", e[0][u][1][0]) {
+          switch (p = "", e[0][u][1][0]) {
             case 2:
               j = fill(" ", e[0][u][1][1]) + j;
               break;
@@ -7694,17 +7694,17 @@ function stringify_formula(e, r, t, a, n) {
         case 4:
           me = !1;
         case 0:
-          d = fill(" ", k[1][1]);
+          p = fill(" ", k[1][1]);
           break;
         case 5:
           me = !1;
         case 1:
-          d = fill("\r", k[1][1]);
+          p = fill("\r", k[1][1]);
           break;
         default:
-          if (d = "", n.WTF) throw new Error("Unexpected PtgAttrSpaceType " + k[1][0]);
+          if (p = "", n.WTF) throw new Error("Unexpected PtgAttrSpaceType " + k[1][0]);
       }
-      l.push((me ? d : "") + l.pop() + (me ? "" : d)), u = -1;
+      l.push((me ? p : "") + l.pop() + (me ? "" : p)), u = -1;
     }
   }
   if (l.length > 1 && n.WTF) throw new Error("bad formula stack");
@@ -7721,8 +7721,8 @@ function write_Formula(e, r, t, a, n) {
   var i = write_XLSCell(r, t, n), s = write_FormulaValue(e.v), l = new_buf(6), o = 33;
   l.write_shift(2, o), l.write_shift(4, 0);
   for (var f = new_buf(e.bf.length), c = 0; c < e.bf.length; ++c) f[c] = e.bf[c];
-  var p = bconcat([i, s, l, f]);
-  return p;
+  var h = bconcat([i, s, l, f]);
+  return h;
 }
 function parse_XLSBParsedFormula(e, r, t) {
   var a = e.read_shift(4), n = parse_Rgce(e, a, t), i = e.read_shift(4), s = i > 0 ? parse_RgbExtra(e, i, n, t) : null;
@@ -9037,18 +9037,18 @@ function write_ws_xml_cell(e, r, t, a) {
   return e.l && t["!links"].push([r, e.l]), e.D && (o.cm = 1), writextag("c", l, o);
 }
 function write_ws_xml_data(e, r, t, a) {
-  var n = [], i = [], s = safe_decode_range(e["!ref"]), l = "", o, f = "", c = [], p = 0, _ = 0, h = e["!rows"], m = Array.isArray(e), u = { r: f }, d, A = -1;
+  var n = [], i = [], s = safe_decode_range(e["!ref"]), l = "", o, f = "", c = [], h = 0, _ = 0, d = e["!rows"], m = Array.isArray(e), u = { r: f }, p, A = -1;
   for (_ = s.s.c; _ <= s.e.c; ++_) c[_] = encode_col(_);
-  for (p = s.s.r; p <= s.e.r; ++p) {
-    for (i = [], f = encode_row(p), _ = s.s.c; _ <= s.e.c; ++_) {
+  for (h = s.s.r; h <= s.e.r; ++h) {
+    for (i = [], f = encode_row(h), _ = s.s.c; _ <= s.e.c; ++_) {
       o = c[_] + f;
-      var I = m ? (e[p] || [])[_] : e[o];
+      var I = m ? (e[h] || [])[_] : e[o];
       I !== void 0 && (l = write_ws_xml_cell(I, o, e, r)) != null && i.push(l);
     }
-    (i.length > 0 || h && h[p]) && (u = { r: f }, h && h[p] && (d = h[p], d.hidden && (u.hidden = 1), A = -1, d.hpx ? A = px2pt(d.hpx) : d.hpt && (A = d.hpt), A > -1 && (u.ht = A, u.customHeight = 1), d.level && (u.outlineLevel = d.level)), n[n.length] = writextag("row", i.join(""), u));
+    (i.length > 0 || d && d[h]) && (u = { r: f }, d && d[h] && (p = d[h], p.hidden && (u.hidden = 1), A = -1, p.hpx ? A = px2pt(p.hpx) : p.hpt && (A = p.hpt), A > -1 && (u.ht = A, u.customHeight = 1), p.level && (u.outlineLevel = p.level)), n[n.length] = writextag("row", i.join(""), u));
   }
-  if (h) for (; p < h.length; ++p)
-    h && h[p] && (u = { r: p + 1 }, d = h[p], d.hidden && (u.hidden = 1), A = -1, d.hpx ? A = px2pt(d.hpx) : d.hpt && (A = d.hpt), A > -1 && (u.ht = A, u.customHeight = 1), d.level && (u.outlineLevel = d.level), n[n.length] = writextag("row", "", u));
+  if (d) for (; h < d.length; ++h)
+    d && d[h] && (u = { r: h + 1 }, p = d[h], p.hidden && (u.hidden = 1), A = -1, p.hpx ? A = px2pt(p.hpx) : p.hpt && (A = p.hpt), A > -1 && (u.ht = A, u.customHeight = 1), p.level && (u.outlineLevel = p.level), n[n.length] = writextag("row", "", u));
   return n.join("");
 }
 function write_ws_xml(e, r, t, a) {
@@ -9063,18 +9063,18 @@ function write_ws_xml(e, r, t, a) {
     c.e.c = Math.min(c.e.c, 16383), c.e.r = Math.min(c.e.c, 1048575), f = encode_range(c);
   }
   a || (a = {}), o["!comments"] = [];
-  var p = [];
+  var h = [];
   write_ws_xml_sheetpr(o, t, e, r, n), n[n.length] = writextag("dimension", null, { ref: f }), n[n.length] = write_ws_xml_sheetviews(o, r, e, t), r.sheetFormat && (n[n.length] = writextag("sheetFormatPr", null, {
     defaultRowHeight: r.sheetFormat.defaultRowHeight || "16",
     baseColWidth: r.sheetFormat.baseColWidth || "10",
     outlineLevelRow: r.sheetFormat.outlineLevelRow || "7"
   })), o["!cols"] != null && o["!cols"].length > 0 && (n[n.length] = write_ws_xml_cols(o, o["!cols"])), n[s = n.length] = "<sheetData/>", o["!links"] = [], o["!ref"] != null && (l = write_ws_xml_data(o, r), l.length > 0 && (n[n.length] = l)), n.length > s + 1 && (n[n.length] = "</sheetData>", n[s] = n[s].replace("/>", ">")), o["!protect"] && (n[n.length] = write_ws_xml_protection(o["!protect"])), o["!autofilter"] != null && (n[n.length] = write_ws_xml_autofilter(o["!autofilter"], o, t, e)), o["!merges"] != null && o["!merges"].length > 0 && (n[n.length] = write_ws_xml_merges(o["!merges"]));
-  var _ = -1, h, m = -1;
+  var _ = -1, d, m = -1;
   return (
     /*::(*/
     o["!links"].length > 0 && (n[n.length] = "<hyperlinks>", o["!links"].forEach(function(u) {
-      u[1].Target && (h = { ref: u[0] }, u[1].Target.charAt(0) != "#" && (m = add_rels(a, -1, escapexml(u[1].Target).replace(/#.*$/, ""), RELS.HLINK), h["r:id"] = "rId" + m), (_ = u[1].Target.indexOf("#")) > -1 && (h.location = escapexml(u[1].Target.slice(_ + 1))), u[1].Tooltip && (h.tooltip = escapexml(u[1].Tooltip)), n[n.length] = writextag("hyperlink", null, h));
-    }), n[n.length] = "</hyperlinks>"), delete o["!links"], o["!margins"] != null && (n[n.length] = write_ws_xml_margins(o["!margins"])), (!r || r.ignoreEC || r.ignoreEC == null) && (n[n.length] = writetag("ignoredErrors", writextag("ignoredError", null, { numberStoredAsText: 1, sqref: f }))), p.length > 0 && (m = add_rels(a, -1, "../drawings/drawing" + (e + 1) + ".xml", RELS.DRAW), n[n.length] = writextag("drawing", null, { "r:id": "rId" + m }), o["!drawing"] = p), o["!comments"].length > 0 && (m = add_rels(a, -1, "../drawings/vmlDrawing" + (e + 1) + ".vml", RELS.VML), n[n.length] = writextag("legacyDrawing", null, { "r:id": "rId" + m }), o["!legacy"] = m), n.length > 1 && (n[n.length] = "</worksheet>", n[1] = n[1].replace("/>", ">")), n.join("")
+      u[1].Target && (d = { ref: u[0] }, u[1].Target.charAt(0) != "#" && (m = add_rels(a, -1, escapexml(u[1].Target).replace(/#.*$/, ""), RELS.HLINK), d["r:id"] = "rId" + m), (_ = u[1].Target.indexOf("#")) > -1 && (d.location = escapexml(u[1].Target.slice(_ + 1))), u[1].Tooltip && (d.tooltip = escapexml(u[1].Tooltip)), n[n.length] = writextag("hyperlink", null, d));
+    }), n[n.length] = "</hyperlinks>"), delete o["!links"], o["!margins"] != null && (n[n.length] = write_ws_xml_margins(o["!margins"])), (!r || r.ignoreEC || r.ignoreEC == null) && (n[n.length] = writetag("ignoredErrors", writextag("ignoredError", null, { numberStoredAsText: 1, sqref: f }))), h.length > 0 && (m = add_rels(a, -1, "../drawings/drawing" + (e + 1) + ".xml", RELS.DRAW), n[n.length] = writextag("drawing", null, { "r:id": "rId" + m }), o["!drawing"] = h), o["!comments"].length > 0 && (m = add_rels(a, -1, "../drawings/vmlDrawing" + (e + 1) + ".vml", RELS.VML), n[n.length] = writextag("legacyDrawing", null, { "r:id": "rId" + m }), o["!legacy"] = m), n.length > 1 && (n[n.length] = "</worksheet>", n[1] = n[1].replace("/>", ">")), n.join("")
   );
 }
 function parse_BrtRowHdr(e, r) {
@@ -9096,12 +9096,12 @@ function write_BrtRowHdr(e, r, t) {
   a.l += 4;
   for (var f = { r: e, c: 0 }, c = 0; c < 16; ++c)
     if (!(r.s.c > c + 1 << 10 || r.e.c < c << 10)) {
-      for (var p = -1, _ = -1, h = c << 10; h < c + 1 << 10; ++h) {
-        f.c = h;
+      for (var h = -1, _ = -1, d = c << 10; d < c + 1 << 10; ++d) {
+        f.c = d;
         var m = Array.isArray(t) ? (t[f.r] || [])[f.c] : t[encode_cell(f)];
-        m && (p < 0 && (p = h), _ = h);
+        m && (h < 0 && (h = d), _ = d);
       }
-      p < 0 || (++l, a.write_shift(4, p), a.write_shift(4, _));
+      h < 0 || (++l, a.write_shift(4, h), a.write_shift(4, _));
     }
   var u = a.l;
   return a.l = o, a.write_shift(4, l), a.l = u, a.length > a.l ? a.slice(0, a.l) : a;
@@ -9423,15 +9423,15 @@ function write_CELLTABLE(e, r, t, a) {
   r["!rows"] && (f = Math.max(n.e.r, r["!rows"].length - 1));
   for (var c = n.s.r; c <= f; ++c) {
     s = encode_row(c), write_row_header(e, r, n, c);
-    var p = !1;
+    var h = !1;
     if (c <= n.e.r) for (var _ = n.s.c; _ <= n.e.c; ++_) {
       c === n.s.r && (l[_] = encode_col(_)), i = l[_] + s;
-      var h = o ? (r[c] || [])[_] : r[i];
-      if (!h) {
-        p = !1;
+      var d = o ? (r[c] || [])[_] : r[i];
+      if (!d) {
+        h = !1;
         continue;
       }
-      p = write_ws_bin_cell(e, h, c, _, a, r, p);
+      h = write_ws_bin_cell(e, d, c, _, a, r, h);
     }
   }
   write_record(
@@ -9817,30 +9817,30 @@ function write_ws_xlml_cell(e, r, t, a, n, i, s) {
   if (e.l && e.l.Target && (l["ss:HRef"] = escapexml(e.l.Target), e.l.Tooltip && (l["x:HRefScreenTip"] = escapexml(e.l.Tooltip))), t["!merges"])
     for (var f = t["!merges"], c = 0; c != f.length; ++c)
       f[c].s.c != s.c || f[c].s.r != s.r || (f[c].e.c > f[c].s.c && (l["ss:MergeAcross"] = f[c].e.c - f[c].s.c), f[c].e.r > f[c].s.r && (l["ss:MergeDown"] = f[c].e.r - f[c].s.r));
-  var p = "", _ = "";
+  var h = "", _ = "";
   switch (e.t) {
     case "z":
       if (!a.sheetStubs) return "";
       break;
     case "n":
-      p = "Number", _ = String(e.v);
+      h = "Number", _ = String(e.v);
       break;
     case "b":
-      p = "Boolean", _ = e.v ? "1" : "0";
+      h = "Boolean", _ = e.v ? "1" : "0";
       break;
     case "e":
-      p = "Error", _ = BErr[e.v];
+      h = "Error", _ = BErr[e.v];
       break;
     case "d":
-      p = "DateTime", _ = new Date(e.v).toISOString(), e.z == null && (e.z = e.z || table_fmt[14]);
+      h = "DateTime", _ = new Date(e.v).toISOString(), e.z == null && (e.z = e.z || table_fmt[14]);
       break;
     case "s":
-      p = "String", _ = escapexlml(e.v || "");
+      h = "String", _ = escapexlml(e.v || "");
       break;
   }
-  var h = get_cell_style(a.cellXfs, e, a);
-  l["ss:StyleID"] = "s" + (21 + h), l["ss:Index"] = s.c + 1;
-  var m = e.v != null ? _ : "", u = e.t == "z" ? "" : '<Data ss:Type="' + p + '">' + m + "</Data>";
+  var d = get_cell_style(a.cellXfs, e, a);
+  l["ss:StyleID"] = "s" + (21 + d), l["ss:Index"] = s.c + 1;
+  var m = e.v != null ? _ : "", u = e.t == "z" ? "" : '<Data ss:Type="' + h + '">' + m + "</Data>";
   return (e.c || []).length > 0 && (u += write_ws_xlml_comment(e.c)), writextag("Cell", u, l);
 }
 function write_ws_xlml_row(e, r) {
@@ -9850,22 +9850,22 @@ function write_ws_xlml_row(e, r) {
 function write_ws_xlml_table(e, r, t, a) {
   if (!e["!ref"]) return "";
   var n = safe_decode_range(e["!ref"]), i = e["!merges"] || [], s = 0, l = [];
-  e["!cols"] && e["!cols"].forEach(function(d, A) {
-    process_col(d);
-    var I = !!d.width, k = col_obj_w(A, d), O = { "ss:Index": A + 1 };
-    I && (O["ss:Width"] = width2px(k.width)), d.hidden && (O["ss:Hidden"] = "1"), l.push(writextag("Column", null, O));
+  e["!cols"] && e["!cols"].forEach(function(p, A) {
+    process_col(p);
+    var I = !!p.width, k = col_obj_w(A, p), O = { "ss:Index": A + 1 };
+    I && (O["ss:Width"] = width2px(k.width)), p.hidden && (O["ss:Hidden"] = "1"), l.push(writextag("Column", null, O));
   });
   for (var o = Array.isArray(e), f = n.s.r; f <= n.e.r; ++f) {
-    for (var c = [write_ws_xlml_row(f, (e["!rows"] || [])[f])], p = n.s.c; p <= n.e.c; ++p) {
+    for (var c = [write_ws_xlml_row(f, (e["!rows"] || [])[f])], h = n.s.c; h <= n.e.c; ++h) {
       var _ = !1;
       for (s = 0; s != i.length; ++s)
-        if (!(i[s].s.c > p) && !(i[s].s.r > f) && !(i[s].e.c < p) && !(i[s].e.r < f)) {
-          (i[s].s.c != p || i[s].s.r != f) && (_ = !0);
+        if (!(i[s].s.c > h) && !(i[s].s.r > f) && !(i[s].e.c < h) && !(i[s].e.r < f)) {
+          (i[s].s.c != h || i[s].s.r != f) && (_ = !0);
           break;
         }
       if (!_) {
-        var h = { r: f, c: p }, m = encode_cell(h), u = o ? (e[f] || [])[p] : e[m];
-        c.push(write_ws_xlml_cell(u, m, e, r, t, a, h));
+        var d = { r: f, c: h }, m = encode_cell(d), u = o ? (e[f] || [])[h] : e[m];
+        c.push(write_ws_xlml_cell(u, m, e, r, t, a, d));
       }
     }
     c.push("</Row>"), c.length > 2 && l.push(c.join(""));
@@ -14069,8 +14069,8 @@ function write_ws_biff2(e, r, t, a) {
     l = encode_row(f);
     for (var c = i.s.c; c <= i.e.c; ++c) {
       f === i.s.r && (o[c] = encode_col(c)), s = o[c] + l;
-      var p = n ? (r[f] || [])[c] : r[s];
-      p && write_ws_biff2_cell(e, p, f, c);
+      var h = n ? (r[f] || [])[c] : r[s];
+      h && write_ws_biff2_cell(e, h, f, c);
     }
   }
 }
@@ -14152,18 +14152,18 @@ function write_ws_biff8_cell(e, r, t, a, n) {
   }
 }
 function write_ws_biff8(e, r, t) {
-  var a = buf_array(), n = t.SheetNames[e], i = t.Sheets[n] || {}, s = (t || {}).Workbook || {}, l = (s.Sheets || [])[e] || {}, o = Array.isArray(i), f = r.biff == 8, c, p = "", _ = [], h = safe_decode_range(i["!ref"] || "A1"), m = f ? 65536 : 16384;
-  if (h.e.c > 255 || h.e.r >= m) {
+  var a = buf_array(), n = t.SheetNames[e], i = t.Sheets[n] || {}, s = (t || {}).Workbook || {}, l = (s.Sheets || [])[e] || {}, o = Array.isArray(i), f = r.biff == 8, c, h = "", _ = [], d = safe_decode_range(i["!ref"] || "A1"), m = f ? 65536 : 16384;
+  if (d.e.c > 255 || d.e.r >= m) {
     if (r.WTF) throw new Error("Range " + (i["!ref"] || "A1") + " exceeds format limit A1:IV16384");
-    h.e.c = Math.min(h.e.c, 255), h.e.r = Math.min(h.e.c, m - 1);
-  }
-  write_biff_rec(a, 2057, write_BOF(t, 16, r)), write_biff_rec(a, 13, writeuint16(1)), write_biff_rec(a, 12, writeuint16(100)), write_biff_rec(a, 15, writebool(!0)), write_biff_rec(a, 17, writebool(!1)), write_biff_rec(a, 16, write_Xnum(1e-3)), write_biff_rec(a, 95, writebool(!0)), write_biff_rec(a, 42, writebool(!1)), write_biff_rec(a, 43, writebool(!1)), write_biff_rec(a, 130, writeuint16(1)), write_biff_rec(a, 128, write_Guts()), write_biff_rec(a, 131, writebool(!1)), write_biff_rec(a, 132, writebool(!1)), f && write_ws_cols_biff8(a, i["!cols"]), write_biff_rec(a, 512, write_Dimensions(h, r)), f && (i["!links"] = []);
-  for (var u = h.s.r; u <= h.e.r; ++u) {
-    p = encode_row(u);
-    for (var d = h.s.c; d <= h.e.c; ++d) {
-      u === h.s.r && (_[d] = encode_col(d)), c = _[d] + p;
-      var A = o ? (i[u] || [])[d] : i[c];
-      A && (write_ws_biff8_cell(a, A, u, d, r), f && A.l && i["!links"].push([c, A.l]));
+    d.e.c = Math.min(d.e.c, 255), d.e.r = Math.min(d.e.c, m - 1);
+  }
+  write_biff_rec(a, 2057, write_BOF(t, 16, r)), write_biff_rec(a, 13, writeuint16(1)), write_biff_rec(a, 12, writeuint16(100)), write_biff_rec(a, 15, writebool(!0)), write_biff_rec(a, 17, writebool(!1)), write_biff_rec(a, 16, write_Xnum(1e-3)), write_biff_rec(a, 95, writebool(!0)), write_biff_rec(a, 42, writebool(!1)), write_biff_rec(a, 43, writebool(!1)), write_biff_rec(a, 130, writeuint16(1)), write_biff_rec(a, 128, write_Guts()), write_biff_rec(a, 131, writebool(!1)), write_biff_rec(a, 132, writebool(!1)), f && write_ws_cols_biff8(a, i["!cols"]), write_biff_rec(a, 512, write_Dimensions(d, r)), f && (i["!links"] = []);
+  for (var u = d.s.r; u <= d.e.r; ++u) {
+    h = encode_row(u);
+    for (var p = d.s.c; p <= d.e.c; ++p) {
+      u === d.s.r && (_[p] = encode_col(p)), c = _[p] + h;
+      var A = o ? (i[u] || [])[p] : i[c];
+      A && (write_ws_biff8_cell(a, A, u, p, r), f && A.l && i["!links"].push([c, A.l]));
     }
   }
   var I = l.CodeName || l.name || n;
@@ -14209,20 +14209,20 @@ function write_biff8_global(e, r, t) {
     write_biff_rec(a, 442, write_XLUnicodeString(f));
   }
   write_biff_rec(a, 156, writeuint16(17)), write_biff_rec(a, 25, writebool(!1)), write_biff_rec(a, 18, writebool(!1)), write_biff_rec(a, 19, writeuint16(0)), l && write_biff_rec(a, 431, writebool(!1)), l && write_biff_rec(a, 444, writeuint16(0)), write_biff_rec(a, 61, write_Window1()), write_biff_rec(a, 64, writebool(!1)), write_biff_rec(a, 141, writeuint16(0)), write_biff_rec(a, 34, writebool(safe1904(e) == "true")), write_biff_rec(a, 14, writebool(!0)), l && write_biff_rec(a, 439, writebool(!1)), write_biff_rec(a, 218, writeuint16(0)), write_FONTS_biff8(a, e, t), write_FMTS_biff8(a, e.SSF, t), write_CELLXFS_biff8(a, t), l && write_biff_rec(a, 352, writebool(!1));
-  var c = a.end(), p = buf_array();
-  l && write_biff_rec(p, 140, write_Country()), l && t.Strings && write_biff_continue(p, 252, write_SST(t.Strings)), write_biff_rec(
-    p,
+  var c = a.end(), h = buf_array();
+  l && write_biff_rec(h, 140, write_Country()), l && t.Strings && write_biff_continue(h, 252, write_SST(t.Strings)), write_biff_rec(
+    h,
     10
     /* EOF */
   );
-  var _ = p.end(), h = buf_array(), m = 0, u = 0;
+  var _ = h.end(), d = buf_array(), m = 0, u = 0;
   for (u = 0; u < e.SheetNames.length; ++u) m += (l ? 12 : 11) + (l ? 2 : 1) * e.SheetNames[u].length;
-  var d = c.length + m + _.length;
+  var p = c.length + m + _.length;
   for (u = 0; u < e.SheetNames.length; ++u) {
     var A = i[u] || {};
-    write_biff_rec(h, 133, write_BoundSheet8({ pos: d, hs: A.Hidden || 0, dt: 0, name: e.SheetNames[u] }, t)), d += r[u].length;
+    write_biff_rec(d, 133, write_BoundSheet8({ pos: p, hs: A.Hidden || 0, dt: 0, name: e.SheetNames[u] }, t)), p += r[u].length;
   }
-  var I = h.end();
+  var I = d.end();
   if (m != I.length) throw new Error("BS8 " + m + " != " + I.length);
   var k = [];
   return c.length && k.push(c), I.length && k.push(I), _.length && k.push(_), bconcat(k);
@@ -14266,8 +14266,8 @@ function make_html_row(e, r, t, a) {
         break;
       }
     if (!(l < 0)) {
-      var c = encode_cell({ r: t, c: s }), p = a.dense ? (e[t] || [])[s] : e[c], _ = p && p.v != null && (p.h || escapehtml(p.w || (format_cell(p), p.w) || "")) || "", h = {};
-      l > 1 && (h.rowspan = l), o > 1 && (h.colspan = o), a.editable ? _ = '<span contenteditable="true">' + _ + "</span>" : p && (h["data-t"] = p && p.t || "z", p.v != null && (h["data-v"] = p.v), p.z != null && (h["data-z"] = p.z), p.l && (p.l.Target || "#").charAt(0) != "#" && (_ = '<a href="' + p.l.Target + '">' + _ + "</a>")), h.id = (a.id || "sjs") + "-" + c, i.push(writextag("td", _, h));
+      var c = encode_cell({ r: t, c: s }), h = a.dense ? (e[t] || [])[s] : e[c], _ = h && h.v != null && (h.h || escapehtml(h.w || (format_cell(h), h.w) || "")) || "", d = {};
+      l > 1 && (d.rowspan = l), o > 1 && (d.colspan = o), a.editable ? _ = '<span contenteditable="true">' + _ + "</span>" : h && (d["data-t"] = h && h.t || "z", h.v != null && (d["data-v"] = h.v), h.z != null && (d["data-z"] = h.z), h.l && (h.l.Target || "#").charAt(0) != "#" && (_ = '<a href="' + h.l.Target + '">' + _ + "</a>")), d.id = (a.id || "sjs") + "-" + c, i.push(writextag("td", _, d));
     }
   }
   var m = "<tr>";
@@ -14297,23 +14297,23 @@ function sheet_add_dom(e, r, t) {
     var c = decode_range(e["!ref"]);
     f.s.r = Math.min(f.s.r, c.s.r), f.s.c = Math.min(f.s.c, c.s.c), f.e.r = Math.max(f.e.r, c.e.r), f.e.c = Math.max(f.e.c, c.e.c), n == -1 && (f.e.r = n = c.e.r + 1);
   }
-  var p = [], _ = 0, h = e["!rows"] || (e["!rows"] = []), m = 0, u = 0, d = 0, A = 0, I = 0, k = 0;
+  var h = [], _ = 0, d = e["!rows"] || (e["!rows"] = []), m = 0, u = 0, p = 0, A = 0, I = 0, k = 0;
   for (e["!cols"] || (e["!cols"] = []); m < l.length && u < o; ++m) {
     var O = l[m];
     if (is_dom_element_hidden(O)) {
       if (a.display) continue;
-      h[u] = { hidden: !0 };
+      d[u] = { hidden: !0 };
     }
     var H = O.children;
-    for (d = A = 0; d < H.length; ++d) {
-      var G = H[d];
+    for (p = A = 0; p < H.length; ++p) {
+      var G = H[p];
       if (!(a.display && is_dom_element_hidden(G))) {
         var C = G.hasAttribute("data-v") ? G.getAttribute("data-v") : G.hasAttribute("v") ? G.getAttribute("v") : htmldecode(G.innerHTML), D = G.getAttribute("data-z") || G.getAttribute("z");
-        for (_ = 0; _ < p.length; ++_) {
-          var S = p[_];
+        for (_ = 0; _ < h.length; ++_) {
+          var S = h[_];
           S.s.c == A + i && S.s.r < u + n && u + n <= S.e.r && (A = S.e.c + 1 - i, _ = -1);
         }
-        k = +G.getAttribute("colspan") || 1, ((I = +G.getAttribute("rowspan") || 1) > 1 || k > 1) && p.push({ s: { r: u + n, c: A + i }, e: { r: u + n + (I || 1) - 1, c: A + i + (k || 1) - 1 } });
+        k = +G.getAttribute("colspan") || 1, ((I = +G.getAttribute("rowspan") || 1) > 1 || k > 1) && h.push({ s: { r: u + n, c: A + i }, e: { r: u + n + (I || 1) - 1, c: A + i + (k || 1) - 1 } });
         var F = { t: "s", v: C }, B = G.getAttribute("data-t") || G.getAttribute("t") || "";
         C != null && (C.length == 0 ? F.t = B || "z" : a.raw || C.trim().length == 0 || B == "s" || (C === "TRUE" ? F = { t: "b", v: !0 } : C === "FALSE" ? F = { t: "b", v: !1 } : isNaN(fuzzynum(C)) ? isNaN(fuzzydate(C).getDate()) || (F = { t: "d", v: parseDate(C) }, a.cellDates || (F = { t: "n", v: datenum(F.v) }), F.z = a.dateNF || table_fmt[14]) : F = { t: "n", v: fuzzynum(C) })), F.z === void 0 && D != null && (F.z = D);
         var R = "", j = G.getElementsByTagName("A");
@@ -14323,7 +14323,7 @@ function sheet_add_dom(e, r, t) {
     }
     ++u;
   }
-  return p.length && (e["!merges"] = (e["!merges"] || []).concat(p)), f.e.r = Math.max(f.e.r, u - 1 + n), e["!ref"] = encode_range(f), u >= o && (e["!fullref"] = encode_range((f.e.r = l.length - m + u - 1 + n, f))), e;
+  return h.length && (e["!merges"] = (e["!merges"] || []).concat(h)), f.e.r = Math.max(f.e.r, u - 1 + n), e["!ref"] = encode_range(f), u >= o && (e["!fullref"] = encode_range((f.e.r = l.length - m + u - 1 + n, f))), e;
 }
 function parse_dom_table(e, r) {
   var t = r || {}, a = t.dense ? [] : {};
@@ -14377,22 +14377,22 @@ var write_styles_ods = /* @__PURE__ */ function() {
     var o = [];
     o.push('      <table:table table:name="' + escapexml(s.SheetNames[l]) + `" table:style-name="ta1">
 `);
-    var f = 0, c = 0, p = decode_range(i["!ref"] || "A1"), _ = i["!merges"] || [], h = 0, m = Array.isArray(i);
+    var f = 0, c = 0, h = decode_range(i["!ref"] || "A1"), _ = i["!merges"] || [], d = 0, m = Array.isArray(i);
     if (i["!cols"])
-      for (c = 0; c <= p.e.c; ++c) o.push("        <table:table-column" + (i["!cols"][c] ? ' table:style-name="co' + i["!cols"][c].ods + '"' : "") + `></table:table-column>
+      for (c = 0; c <= h.e.c; ++c) o.push("        <table:table-column" + (i["!cols"][c] ? ' table:style-name="co' + i["!cols"][c].ods + '"' : "") + `></table:table-column>
 `);
-    var u = "", d = i["!rows"] || [];
-    for (f = 0; f < p.s.r; ++f)
-      u = d[f] ? ' table:style-name="ro' + d[f].ods + '"' : "", o.push("        <table:table-row" + u + `></table:table-row>
+    var u = "", p = i["!rows"] || [];
+    for (f = 0; f < h.s.r; ++f)
+      u = p[f] ? ' table:style-name="ro' + p[f].ods + '"' : "", o.push("        <table:table-row" + u + `></table:table-row>
 `);
-    for (; f <= p.e.r; ++f) {
-      for (u = d[f] ? ' table:style-name="ro' + d[f].ods + '"' : "", o.push("        <table:table-row" + u + `>
-`), c = 0; c < p.s.c; ++c) o.push(r);
-      for (; c <= p.e.c; ++c) {
+    for (; f <= h.e.r; ++f) {
+      for (u = p[f] ? ' table:style-name="ro' + p[f].ods + '"' : "", o.push("        <table:table-row" + u + `>
+`), c = 0; c < h.s.c; ++c) o.push(r);
+      for (; c <= h.e.c; ++c) {
         var A = !1, I = {}, k = "";
-        for (h = 0; h != _.length; ++h)
-          if (!(_[h].s.c > c) && !(_[h].s.r > f) && !(_[h].e.c < c) && !(_[h].e.r < f)) {
-            (_[h].s.c != c || _[h].s.r != f) && (A = !0), I["table:number-columns-spanned"] = _[h].e.c - _[h].s.c + 1, I["table:number-rows-spanned"] = _[h].e.r - _[h].s.r + 1;
+        for (d = 0; d != _.length; ++d)
+          if (!(_[d].s.c > c) && !(_[d].s.r > f) && !(_[d].e.c < c) && !(_[d].e.r < f)) {
+            (_[d].s.c != c || _[d].s.r != f) && (A = !0), I["table:number-columns-spanned"] = _[d].e.c - _[d].s.c + 1, I["table:number-rows-spanned"] = _[d].e.r - _[d].s.r + 1;
             break;
           }
         if (A) {
@@ -14455,9 +14455,9 @@ var write_styles_ods = /* @__PURE__ */ function() {
     }).forEach(function(f) {
       if (f && f["!cols"]) {
         for (var c = 0; c < f["!cols"].length; ++c) if (f["!cols"][c]) {
-          var p = f["!cols"][c];
-          if (p.width == null && p.wpx == null && p.wch == null) continue;
-          process_col(p), p.ods = l;
+          var h = f["!cols"][c];
+          if (h.width == null && h.wpx == null && h.wch == null) continue;
+          process_col(h), h.ods = l;
           var _ = f["!cols"][c].wpx + "px";
           i.push('  <style:style style:name="co' + l + `" style:family="table-column">
 `), i.push('   <style:table-column-properties fo:break-before="auto" style:column-width="' + _ + `"/>
@@ -14473,9 +14473,9 @@ var write_styles_ods = /* @__PURE__ */ function() {
       if (f && f["!rows"]) {
         for (var c = 0; c < f["!rows"].length; ++c) if (f["!rows"][c]) {
           f["!rows"][c].ods = o;
-          var p = f["!rows"][c].hpx + "px";
+          var h = f["!rows"][c].hpx + "px";
           i.push('  <style:style style:name="ro' + o + `" style:family="table-row">
-`), i.push('   <style:table-row-properties fo:break-before="auto" style:row-height="' + p + `"/>
+`), i.push('   <style:table-row-properties fo:break-before="auto" style:row-height="' + h + `"/>
 `), i.push(`  </style:style>
 `), ++o;
         }
@@ -14535,7 +14535,7 @@ var write_styles_ods = /* @__PURE__ */ function() {
 `), n(o, s), o.push(`  <office:body>
 `), o.push(`    <office:spreadsheet>
 `);
-    for (var p = 0; p != s.SheetNames.length; ++p) o.push(a(s.Sheets[s.SheetNames[p]], s, p));
+    for (var h = 0; h != s.SheetNames.length; ++h) o.push(a(s.Sheets[s.SheetNames[h]], s, h));
     return o.push(`    </office:spreadsheet>
 `), o.push(`  </office:body>
 `), l.bookType == "fods" ? o.push("</office:document>") : o.push("</office:document-content>"), o.join("");
@@ -14789,31 +14789,31 @@ function write_tile_row(e, r, t) {
   var l = ((s = (i = e[8]) == null ? void 0 : i[0]) == null ? void 0 : s.data) && varint_to_i32(e[8][0].data) > 0 || !1;
   if (l)
     throw "Math only works with normal offsets";
-  for (var o = 0, f = u8_to_dataview(e[7][0].data), c = 0, p = [], _ = u8_to_dataview(e[4][0].data), h = 0, m = [], u = 0; u < r.length; ++u) {
+  for (var o = 0, f = u8_to_dataview(e[7][0].data), c = 0, h = [], _ = u8_to_dataview(e[4][0].data), d = 0, m = [], u = 0; u < r.length; ++u) {
     if (r[u] == null) {
       f.setUint16(u * 2, 65535, !0), _.setUint16(u * 2, 65535);
       continue;
     }
-    f.setUint16(u * 2, c, !0), _.setUint16(u * 2, h, !0);
-    var d, A;
+    f.setUint16(u * 2, c, !0), _.setUint16(u * 2, d, !0);
+    var p, A;
     switch (typeof r[u]) {
       case "string":
-        d = write_new_storage({ t: "s", v: r[u] }, t), A = write_old_storage({ t: "s", v: r[u] }, t);
+        p = write_new_storage({ t: "s", v: r[u] }, t), A = write_old_storage({ t: "s", v: r[u] }, t);
         break;
       case "number":
-        d = write_new_storage({ t: "n", v: r[u] }, t), A = write_old_storage({ t: "n", v: r[u] }, t);
+        p = write_new_storage({ t: "n", v: r[u] }, t), A = write_old_storage({ t: "n", v: r[u] }, t);
         break;
       case "boolean":
-        d = write_new_storage({ t: "b", v: r[u] }, t), A = write_old_storage({ t: "b", v: r[u] }, t);
+        p = write_new_storage({ t: "b", v: r[u] }, t), A = write_old_storage({ t: "b", v: r[u] }, t);
         break;
       default:
         throw new Error("Unsupported value " + r[u]);
     }
-    p.push(d), c += d.length, m.push(A), h += A.length, ++o;
+    h.push(p), c += p.length, m.push(A), d += A.length, ++o;
   }
   for (e[2][0].data = write_varint49(o); u < e[7][0].data.length / 2; ++u)
     f.setUint16(u * 2, 65535, !0), _.setUint16(u * 2, 65535, !0);
-  return e[6][0].data = u8concat(p), e[3][0].data = u8concat(m), o;
+  return e[6][0].data = u8concat(h), e[3][0].data = u8concat(m), o;
 }
 function write_numbers_iwa(e, r) {
   if (!r || !r.numbers)
@@ -14866,18 +14866,18 @@ function write_numbers_iwa(e, r) {
       });
     }
   });
-  for (var p = CFB.find(f, l[1].location), _ = parse_iwa_file(decompress_iwa_file(p.content)), h, m = 0; m < _.length; ++m) {
+  for (var h = CFB.find(f, l[1].location), _ = parse_iwa_file(decompress_iwa_file(h.content)), d, m = 0; m < _.length; ++m) {
     var u = _[m];
-    u.id == 1 && (h = u);
-  }
-  var d = parse_TSP_Reference(parse_shallow(h.messages[0].data)[1][0].data);
-  for (p = CFB.find(f, l[d].location), _ = parse_iwa_file(decompress_iwa_file(p.content)), m = 0; m < _.length; ++m)
-    u = _[m], u.id == d && (h = u);
-  for (d = parse_TSP_Reference(parse_shallow(h.messages[0].data)[2][0].data), p = CFB.find(f, l[d].location), _ = parse_iwa_file(decompress_iwa_file(p.content)), m = 0; m < _.length; ++m)
-    u = _[m], u.id == d && (h = u);
-  for (d = parse_TSP_Reference(parse_shallow(h.messages[0].data)[2][0].data), p = CFB.find(f, l[d].location), _ = parse_iwa_file(decompress_iwa_file(p.content)), m = 0; m < _.length; ++m)
-    u = _[m], u.id == d && (h = u);
-  var A = parse_shallow(h.messages[0].data);
+    u.id == 1 && (d = u);
+  }
+  var p = parse_TSP_Reference(parse_shallow(d.messages[0].data)[1][0].data);
+  for (h = CFB.find(f, l[p].location), _ = parse_iwa_file(decompress_iwa_file(h.content)), m = 0; m < _.length; ++m)
+    u = _[m], u.id == p && (d = u);
+  for (p = parse_TSP_Reference(parse_shallow(d.messages[0].data)[2][0].data), h = CFB.find(f, l[p].location), _ = parse_iwa_file(decompress_iwa_file(h.content)), m = 0; m < _.length; ++m)
+    u = _[m], u.id == p && (d = u);
+  for (p = parse_TSP_Reference(parse_shallow(d.messages[0].data)[2][0].data), h = CFB.find(f, l[p].location), _ = parse_iwa_file(decompress_iwa_file(h.content)), m = 0; m < _.length; ++m)
+    u = _[m], u.id == p && (d = u);
+  var A = parse_shallow(d.messages[0].data);
   {
     A[6][0].data = write_varint49(a.e.r + 1), A[7][0].data = write_varint49(a.e.c + 1);
     var I = parse_TSP_Reference(A[46][0].data), k = CFB.find(f, l[I].location), O = parse_iwa_file(decompress_iwa_file(k.content));
@@ -14939,8 +14939,8 @@ function write_numbers_iwa(e, r) {
           });
         }
         P.messages[0].data = write_shallow(ie);
-        var Z = write_iwa_file(b), he = compress_iwa_file(Z);
-        X.content = he, X.size = X.content.length;
+        var Z = write_iwa_file(b), de = compress_iwa_file(Z);
+        X.content = de, X.size = X.content.length;
       })();
       var ce = parse_shallow(F[3][0].data);
       {
@@ -14959,9 +14959,9 @@ function write_numbers_iwa(e, r) {
               delete ie[6], delete ce[7];
               var re = new Uint8Array(ie[5][0].data);
               ie[5] = [];
-              for (var Z = 0, he = 0; he <= a.e.r; ++he) {
+              for (var Z = 0, de = 0; de <= a.e.r; ++de) {
                 var fe = parse_shallow(re);
-                Z += write_tile_row(fe, i[he], s), fe[1][0].data = write_varint49(he), ie[5].push({ data: write_shallow(fe), type: 2 });
+                Z += write_tile_row(fe, i[de], s), fe[1][0].data = write_varint49(de), ie[5].push({ data: write_shallow(fe), type: 2 });
               }
               ie[1] = [{ type: 0, data: write_varint49(a.e.c + 1) }], ie[2] = [{ type: 0, data: write_varint49(a.e.r + 1) }], ie[3] = [{ type: 0, data: write_varint49(Z) }], ie[4] = [{ type: 0, data: write_varint49(a.e.r + 1) }];
             }
@@ -14976,9 +14976,9 @@ function write_numbers_iwa(e, r) {
     }
     A[4][0].data = write_shallow(F);
   }
-  h.messages[0].data = write_shallow(A);
+  d.messages[0].data = write_shallow(A);
   var xe = write_iwa_file(_), N = compress_iwa_file(xe);
-  return p.content = N, p.size = p.content.length, f;
+  return h.content = N, h.size = h.content.length, f;
 }
 function fix_opts_func(e) {
   return function(t) {
@@ -15018,15 +15018,15 @@ function write_zip_xlsxb(e, r) {
     e.Props.SheetNames = o;
   }
   for (e.Props.Worksheets = e.Props.SheetNames.length, zip_add_file(i, s, write_ext_props(e.Props)), n.extprops.push(s), add_rels(r.rels, 3, s, RELS.EXT_PROPS), e.Custprops !== e.Props && keys(e.Custprops || {}).length > 0 && (s = "docProps/custom.xml", zip_add_file(i, s, write_cust_props(e.Custprops)), n.custprops.push(s), add_rels(r.rels, 4, s, RELS.CUST_PROPS)), l = 1; l <= e.SheetNames.length; ++l) {
-    var c = { "!id": {} }, p = e.Sheets[e.SheetNames[l - 1]], _ = (p || {})["!type"] || "sheet";
+    var c = { "!id": {} }, h = e.Sheets[e.SheetNames[l - 1]], _ = (h || {})["!type"] || "sheet";
     switch (_) {
       case "chart":
       default:
         s = "xl/worksheets/sheet" + l + "." + t, zip_add_file(i, s, write_ws(l - 1, s, r, e, c)), n.sheets.push(s), add_rels(r.wbrels, -1, "worksheets/sheet" + l + "." + t, RELS.WS[0]);
     }
-    if (p) {
-      var h = p["!comments"], m = !1, u = "";
-      h && h.length > 0 && (u = "xl/comments" + l + "." + t, zip_add_file(i, u, write_cmnt(h, u)), n.comments.push(u), add_rels(c, -1, "../comments" + l + "." + t, RELS.CMNT), m = !0), p["!legacy"] && m && zip_add_file(i, "xl/drawings/vmlDrawing" + l + ".vml", write_comments_vml(l, p["!comments"])), delete p["!comments"], delete p["!legacy"];
+    if (h) {
+      var d = h["!comments"], m = !1, u = "";
+      d && d.length > 0 && (u = "xl/comments" + l + "." + t, zip_add_file(i, u, write_cmnt(d, u)), n.comments.push(u), add_rels(c, -1, "../comments" + l + "." + t, RELS.CMNT), m = !0), h["!legacy"] && m && zip_add_file(i, "xl/drawings/vmlDrawing" + l + ".vml", write_comments_vml(l, h["!comments"])), delete h["!comments"], delete h["!legacy"];
     }
     c["!id"].rId1 && zip_add_file(i, get_rels_path(s), write_rels(c));
   }
@@ -15047,25 +15047,25 @@ function write_zip_xlsx(e, r) {
   e.Props.Worksheets = e.Props.SheetNames.length, zip_add_file(i, s, write_ext_props(e.Props)), n.extprops.push(s), add_rels(r.rels, 3, s, RELS.EXT_PROPS), e.Custprops !== e.Props && keys(e.Custprops || {}).length > 0 && (s = "docProps/custom.xml", zip_add_file(i, s, write_cust_props(e.Custprops)), n.custprops.push(s), add_rels(r.rels, 4, s, RELS.CUST_PROPS));
   var c = ["SheetJ5"];
   for (r.tcid = 0, l = 1; l <= e.SheetNames.length; ++l) {
-    var p = { "!id": {} }, _ = e.Sheets[e.SheetNames[l - 1]], h = (_ || {})["!type"] || "sheet";
-    switch (h) {
+    var h = { "!id": {} }, _ = e.Sheets[e.SheetNames[l - 1]], d = (_ || {})["!type"] || "sheet";
+    switch (d) {
       case "chart":
       default:
-        s = "xl/worksheets/sheet" + l + "." + t, zip_add_file(i, s, write_ws_xml(l - 1, r, e, p)), n.sheets.push(s), add_rels(r.wbrels, -1, "worksheets/sheet" + l + "." + t, RELS.WS[0]);
+        s = "xl/worksheets/sheet" + l + "." + t, zip_add_file(i, s, write_ws_xml(l - 1, r, e, h)), n.sheets.push(s), add_rels(r.wbrels, -1, "worksheets/sheet" + l + "." + t, RELS.WS[0]);
     }
     if (_) {
-      var m = _["!comments"], u = !1, d = "";
+      var m = _["!comments"], u = !1, p = "";
       if (m && m.length > 0) {
         var A = !1;
         m.forEach(function(I) {
           I[1].forEach(function(k) {
             k.T == !0 && (A = !0);
           });
-        }), A && (d = "xl/threadedComments/threadedComment" + l + "." + t, zip_add_file(i, d, write_tcmnt_xml(m, c, r)), n.threadedcomments.push(d), add_rels(p, -1, "../threadedComments/threadedComment" + l + "." + t, RELS.TCMNT)), d = "xl/comments" + l + "." + t, zip_add_file(i, d, write_comments_xml(m)), n.comments.push(d), add_rels(p, -1, "../comments" + l + "." + t, RELS.CMNT), u = !0;
+        }), A && (p = "xl/threadedComments/threadedComment" + l + "." + t, zip_add_file(i, p, write_tcmnt_xml(m, c, r)), n.threadedcomments.push(p), add_rels(h, -1, "../threadedComments/threadedComment" + l + "." + t, RELS.TCMNT)), p = "xl/comments" + l + "." + t, zip_add_file(i, p, write_comments_xml(m)), n.comments.push(p), add_rels(h, -1, "../comments" + l + "." + t, RELS.CMNT), u = !0;
       }
       _["!legacy"] && u && zip_add_file(i, "xl/drawings/vmlDrawing" + l + ".vml", write_comments_vml(l, _["!comments"])), delete _["!comments"], delete _["!legacy"];
     }
-    p["!id"].rId1 && zip_add_file(i, get_rels_path(s), write_rels(p));
+    h["!id"].rId1 && zip_add_file(i, get_rels_path(s), write_rels(h));
   }
   return r.Strings != null && r.Strings.length > 0 && (s = "xl/sharedStrings." + t, zip_add_file(i, s, write_sst_xml(r.Strings, r)), n.strs.push(s), add_rels(r.wbrels, -1, "sharedStrings." + t, RELS.SST)), s = "xl/workbook." + t, zip_add_file(i, s, write_wb_xml(e)), n.workbooks.push(s), add_rels(r.rels, 1, s, RELS.WB), s = "xl/theme/theme1.xml", zip_add_file(i, s, write_theme(e.Themes, r)), n.themes.push(s), add_rels(r.wbrels, -1, "theme/theme1.xml", RELS.THEME), s = "xl/styles." + t, zip_add_file(i, s, write_sty_xml(e, r)), n.styles.push(s), add_rels(r.wbrels, -1, "styles." + t, RELS.STY), e.vbaraw && a && (s = "xl/vbaProject.bin", zip_add_file(i, s, e.vbaraw), n.vba.push(s), add_rels(r.wbrels, -1, "vbaProject.bin", RELS.VBA)), s = "xl/metadata." + t, zip_add_file(i, s, write_xlmeta_xml()), n.metadata.push(s), add_rels(r.wbrels, -1, "metadata." + t, RELS.XLMETA), c.length > 1 && (s = "xl/persons/person.xml", zip_add_file(i, s, write_people_xml(c)), n.people.push(s), add_rels(r.wbrels, -1, "persons/person.xml", RELS.PEOPLE)), zip_add_file(i, "[Content_Types].xml", write_ct(n, r)), zip_add_file(i, "_rels/.rels", write_rels(r.rels)), zip_add_file(i, "xl/_rels/workbook." + t + ".rels", write_rels(r.wbrels)), delete r.revssf, delete r.ssf, i;
 }
@@ -15278,7 +15278,7 @@ function writeFileSync(e, r, t) {
   return a.type = "file", a.file = r, resolve_book_type(a), writeSync(e, a);
 }
 function make_json_row(e, r, t, a, n, i, s, l) {
-  var o = encode_row(t), f = l.defval, c = l.raw || !Object.prototype.hasOwnProperty.call(l, "raw"), p = !0, _ = n === 1 ? [] : {};
+  var o = encode_row(t), f = l.defval, c = l.raw || !Object.prototype.hasOwnProperty.call(l, "raw"), h = !0, _ = n === 1 ? [] : {};
   if (n !== 1)
     if (Object.defineProperty) try {
       Object.defineProperty(_, "__rowNum__", { value: t, enumerable: !1 });
@@ -15286,11 +15286,11 @@ function make_json_row(e, r, t, a, n, i, s, l) {
       _.__rowNum__ = t;
     }
     else _.__rowNum__ = t;
-  if (!s || e[t]) for (var h = r.s.c; h <= r.e.c; ++h) {
-    var m = s ? e[t][h] : e[a[h] + o];
+  if (!s || e[t]) for (var d = r.s.c; d <= r.e.c; ++d) {
+    var m = s ? e[t][d] : e[a[d] + o];
     if (m === void 0 || m.t === void 0) {
       if (f === void 0) continue;
-      i[h] != null && (_[i[h]] = f);
+      i[d] != null && (_[i[d]] = f);
       continue;
     }
     var u = m.v;
@@ -15309,18 +15309,18 @@ function make_json_row(e, r, t, a, n, i, s, l) {
       default:
         throw new Error("unrecognized type " + m.t);
     }
-    if (i[h] != null) {
+    if (i[d] != null) {
       if (u == null)
-        if (m.t == "e" && u === null) _[i[h]] = null;
-        else if (f !== void 0) _[i[h]] = f;
-        else if (c && u === null) _[i[h]] = null;
+        if (m.t == "e" && u === null) _[i[d]] = null;
+        else if (f !== void 0) _[i[d]] = f;
+        else if (c && u === null) _[i[d]] = null;
         else continue;
       else
-        _[i[h]] = c && (m.t !== "n" || m.t === "n" && l.rawNumbers !== !1) ? u : format_cell(m, u, l);
-      u != null && (p = !1);
+        _[i[d]] = c && (m.t !== "n" || m.t === "n" && l.rawNumbers !== !1) ? u : format_cell(m, u, l);
+      u != null && (h = !1);
     }
   }
-  return { row: _, isempty: p };
+  return { row: _, isempty: h };
 }
 function sheet_to_json(e, r) {
   if (e == null || e["!ref"] == null) return [];
@@ -15336,12 +15336,12 @@ function sheet_to_json(e, r) {
       o = c;
   }
   a > 0 && (n = 0);
-  var p = encode_row(o.s.r), _ = [], h = [], m = 0, u = 0, d = Array.isArray(e), A = o.s.r, I = 0, k = {};
-  d && !e[A] && (e[A] = []);
+  var h = encode_row(o.s.r), _ = [], d = [], m = 0, u = 0, p = Array.isArray(e), A = o.s.r, I = 0, k = {};
+  p && !e[A] && (e[A] = []);
   var O = f.skipHidden && e["!cols"] || [], H = f.skipHidden && e["!rows"] || [];
   for (I = o.s.c; I <= o.e.c; ++I)
     if (!(O[I] || {}).hidden)
-      switch (_[I] = encode_col(I), t = d ? e[A][I] : e[_[I] + p], a) {
+      switch (_[I] = encode_col(I), t = p ? e[A][I] : e[_[I] + h], a) {
         case 1:
           i[I] = I - o.s.c;
           break;
@@ -15363,25 +15363,25 @@ function sheet_to_json(e, r) {
       }
   for (A = o.s.r + n; A <= o.e.r; ++A)
     if (!(H[A] || {}).hidden) {
-      var G = make_json_row(e, o, A, _, a, i, d, f);
-      (G.isempty === !1 || (a === 1 ? f.blankrows !== !1 : f.blankrows)) && (h[m++] = G.row);
+      var G = make_json_row(e, o, A, _, a, i, p, f);
+      (G.isempty === !1 || (a === 1 ? f.blankrows !== !1 : f.blankrows)) && (d[m++] = G.row);
     }
-  return h.length = m, h;
+  return d.length = m, d;
 }
 var qreg = /"/g;
 function make_csv_row(e, r, t, a, n, i, s, l) {
-  for (var o = !0, f = [], c = "", p = encode_row(t), _ = r.s.c; _ <= r.e.c; ++_)
+  for (var o = !0, f = [], c = "", h = encode_row(t), _ = r.s.c; _ <= r.e.c; ++_)
     if (a[_]) {
-      var h = l.dense ? (e[t] || [])[_] : e[a[_] + p];
-      if (h == null) c = "";
-      else if (h.v != null) {
-        o = !1, c = "" + (l.rawNumbers && h.t == "n" ? h.v : format_cell(h, null, l));
+      var d = l.dense ? (e[t] || [])[_] : e[a[_] + h];
+      if (d == null) c = "";
+      else if (d.v != null) {
+        o = !1, c = "" + (l.rawNumbers && d.t == "n" ? d.v : format_cell(d, null, l));
         for (var m = 0, u = 0; m !== c.length; ++m) if ((u = c.charCodeAt(m)) === n || u === i || u === 34 || l.forceQuotes) {
           c = '"' + c.replace(qreg, '""') + '"';
           break;
         }
         c == "ID" && (c = '"ID"');
-      } else h.f != null && !h.F ? (o = !1, c = "=" + h.f, c.indexOf(",") >= 0 && (c = '"' + c.replace(qreg, '""') + '"')) : c = "";
+      } else d.f != null && !d.F ? (o = !1, c = "=" + d.f, c.indexOf(",") >= 0 && (c = '"' + c.replace(qreg, '""') + '"')) : c = "";
       f.push(c);
     }
   return l.blankrows === !1 && o ? null : f.join(s);
@@ -15390,11 +15390,11 @@ function sheet_to_csv(e, r) {
   var t = [], a = r ?? {};
   if (e == null || e["!ref"] == null) return "";
   var n = safe_decode_range(e["!ref"]), i = a.FS !== void 0 ? a.FS : ",", s = i.charCodeAt(0), l = a.RS !== void 0 ? a.RS : `
-`, o = l.charCodeAt(0), f = new RegExp((i == "|" ? "\\|" : i) + "+$"), c = "", p = [];
+`, o = l.charCodeAt(0), f = new RegExp((i == "|" ? "\\|" : i) + "+$"), c = "", h = [];
   a.dense = Array.isArray(e);
-  for (var _ = a.skipHidden && e["!cols"] || [], h = a.skipHidden && e["!rows"] || [], m = n.s.c; m <= n.e.c; ++m) (_[m] || {}).hidden || (p[m] = encode_col(m));
-  for (var u = 0, d = n.s.r; d <= n.e.r; ++d)
-    (h[d] || {}).hidden || (c = make_csv_row(e, n, d, p, s, o, i, a), c != null && (a.strip && (c = c.replace(f, "")), (c || a.blankrows !== !1) && t.push((u++ ? l : "") + c)));
+  for (var _ = a.skipHidden && e["!cols"] || [], d = a.skipHidden && e["!rows"] || [], m = n.s.c; m <= n.e.c; ++m) (_[m] || {}).hidden || (h[m] = encode_col(m));
+  for (var u = 0, p = n.s.r; p <= n.e.r; ++p)
+    (d[p] || {}).hidden || (c = make_csv_row(e, n, p, h, s, o, i, a), c != null && (a.strip && (c = c.replace(f, "")), (c || a.blankrows !== !1) && t.push((u++ ? l : "") + c)));
   return delete a.dense, t.join("");
 }
 function sheet_to_txt(e, r) {
@@ -15440,20 +15440,20 @@ function sheet_add_json(e, r, t) {
     }
   var f, c = { s: { c: 0, r: 0 }, e: { c: l, r: s + r.length - 1 + n } };
   if (i["!ref"]) {
-    var p = safe_decode_range(i["!ref"]);
-    c.e.c = Math.max(c.e.c, p.e.c), c.e.r = Math.max(c.e.r, p.e.r), s == -1 && (s = p.e.r + 1, c.e.r = s + r.length - 1 + n);
+    var h = safe_decode_range(i["!ref"]);
+    c.e.c = Math.max(c.e.c, h.e.c), c.e.r = Math.max(c.e.r, h.e.r), s == -1 && (s = h.e.r + 1, c.e.r = s + r.length - 1 + n);
   } else
     s == -1 && (s = 0, c.e.r = r.length - 1 + n);
-  var _ = a.header || [], h = 0;
-  r.forEach(function(u, d) {
+  var _ = a.header || [], d = 0;
+  r.forEach(function(u, p) {
     keys(u).forEach(function(A) {
-      (h = _.indexOf(A)) == -1 && (_[h = _.length] = A);
-      var I = u[A], k = "z", O = "", H = encode_cell({ c: l + h, r: s + d + n });
+      (d = _.indexOf(A)) == -1 && (_[d = _.length] = A);
+      var I = u[A], k = "z", O = "", H = encode_cell({ c: l + d, r: s + p + n });
       f = ws_get_cell_stub(i, H), I && typeof I == "object" && !(I instanceof Date) ? i[H] = I : (typeof I == "number" ? k = "n" : typeof I == "boolean" ? k = "b" : typeof I == "string" ? k = "s" : I instanceof Date ? (k = "d", a.cellDates || (k = "n", I = datenum(I)), O = a.dateNF || table_fmt[14]) : I === null && a.nullError && (k = "e", I = 0), f ? (f.t = k, f.v = I, delete f.w, delete f.R, O && (f.z = O)) : i[H] = f = { t: k, v: I }, O && (f.z = O));
     });
   }), c.e.c = Math.max(c.e.c, l + _.length - 1);
   var m = encode_row(s);
-  if (n) for (h = 0; h < _.length; ++h) i[encode_col(h + l) + m] = { t: "s", v: _[h] };
+  if (n) for (d = 0; d < _.length; ++d) i[encode_col(d + l) + m] = { t: "s", v: _[d] };
   return i["!ref"] = encode_range(c), i;
 }
 function json_to_sheet(e, r) {
@@ -15566,7 +15566,7 @@ var utils = {
     SHEET_VERY_HIDDEN: 2
   }
 };
-const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _hoisted_2$a = { style: { display: "inline-block", width: "100px" } }, _hoisted_3$8 = { style: { "text-align": "center", "margin-top": "2vh" } }, _sfc_main$k = {
+const _hoisted_1$g = { style: { display: "inline-block", width: "100px" } }, _hoisted_2$9 = { style: { display: "inline-block", width: "100px" } }, _hoisted_3$7 = { style: { "text-align": "center", "margin-top": "2vh" } }, _sfc_main$m = {
   __name: "byPrintArray",
   props: {
     modelValue: { type: Boolean, default: !1 },
@@ -15590,15 +15590,15 @@ const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _ho
       set: (m) => i("update:modelValue", m)
     }), o = (m, u) => m[u] == null ? "" : m[u], f = () => {
       let m = t.data, u = t.printOption;
-      var d = "", A = "";
-      u.TitleArray && u.TitleArray.length > 0 ? d = u.TitleArray.map((H, G) => `<tr><th colspan='100' style="font-size:${20 - G * 3}px;border:none;">${H}</th></tr>`).join("") : d = `<tr><th colspan='100' style='font-size:20px;border:none'>${t.title}</th></tr>`, u.FootArray && u.FootArray.length > 0 && (A = u.FootArray.map((H) => `<tr><td colspan='100' style="font-size:18ddpx;border:none;text-align:right">${H}</td></tr>`).join(""));
+      var p = "", A = "";
+      u.TitleArray && u.TitleArray.length > 0 ? p = u.TitleArray.map((H, G) => `<tr><th colspan='100' style="font-size:${20 - G * 3}px;border:none;">${H}</th></tr>`).join("") : p = `<tr><th colspan='100' style='font-size:20px;border:none'>${t.title}</th></tr>`, u.FootArray && u.FootArray.length > 0 && (A = u.FootArray.map((H) => `<tr><td colspan='100' style="font-size:18ddpx;border:none;text-align:right">${H}</td></tr>`).join(""));
       let I = t.columnArray, k = m.map(
         (H, G) => `<tr>${I.map((C, D) => {
           let S = c(H, C, D, G);
           return S.colspan == "0" || S.rowspan == "0" ? "" : `<td rowspan="${S.rowspan > 1 ? S.rowspan : ""}" colspan="${S.colspan > 1 ? S.colspan : ""}">${o(H, C.title)}</td>`;
         }).join("")}</tr>`
       ).join(""), O = "";
-      return t.columnArray.filter((H) => H.isSummary).length > 0 && (O = `<tr>${h().map((H) => `<td>${H}</td>`)}</tr>`), `
+      return t.columnArray.filter((H) => H.isSummary).length > 0 && (O = `<tr>${d().map((H) => `<td>${H}</td>`)}</tr>`), `
 		<style type="text/css">
 		    td, th {
 		        border: 1px solid black;
@@ -15614,7 +15614,7 @@ const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _ho
 		</style>
 		<table>
 		    <thead>
-		        ${d}
+		        ${p}
 		        <tr>${I.map((H) => `<th>${H.title}</th>`).join("")}</tr>
 		    </thead>
 		    <tbody>
@@ -15623,7 +15623,7 @@ const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _ho
 		        ${A}
 		    </tbody>
 		</table>`;
-    }, c = (m, u, d, A) => {
+    }, c = (m, u, p, A) => {
       if (u.title == null) return { rowspan: 1, colspan: 1 };
       let I = u.title, k = t.columnArray.FirstOrDefault((G) => G.title == I);
       if (k == null || !k.isHeBing) return { rowspan: 1, colspan: 1 };
@@ -15637,7 +15637,7 @@ const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _ho
         rowspan: H,
         colspan: 1
       };
-    }, p = () => {
+    }, h = () => {
       if (a.value.length == 0) return ElMessageBox.alert(L("未发现打印机"));
       if (s == null)
         return window.open("http://saas.ip239.com/CommonApp/Lodop6.226_Clodop3.083.zip", "newwindow"), ElMessageBox.alert(L("电脑尚未安装打印机插件！请先下载并解压安装"));
@@ -15645,10 +15645,10 @@ const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _ho
       n.PrintName && s.SET_PRINTER_INDEXA(n.PrintName), n.Direction == 1 ? s.SET_PRINT_PAGESIZE(2, 0, 0, "A4") : s.SET_PRINT_PAGESIZE(1, 0, 0, "A4"), s.ADD_PRINT_HTM(0, 0, "100%", "100%", m), s.PRINT(), i("update:modelValue", !1), ElMessage({ message: L("数据打印成功") });
     };
     let _ = /^[+-]?([0-9]+[.][0-9]*|[.][0-9]+)$/;
-    const h = () => {
+    const d = () => {
       let m = !1;
-      return t.columnArray.map((u, d) => {
-        if (d === 0)
+      return t.columnArray.map((u, p) => {
+        if (p === 0)
           return L("合计");
         if (!u.isSummary) return "";
         let A = 0;
@@ -15675,22 +15675,22 @@ const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _ho
             console.log("电脑无打印机");
             return;
           }
-          for (let d = 0; d < u; d++) a.value.push(s.GET_PRINTER_NAME(d));
+          for (let p = 0; p < u; p++) a.value.push(s.GET_PRINTER_NAME(p));
         }
       }
     ), (m, u) => (openBlock(), createBlock(unref(ElDialog), {
       modelValue: l.value,
-      "onUpdate:modelValue": u[2] || (u[2] = (d) => l.value = d),
+      "onUpdate:modelValue": u[2] || (u[2] = (p) => l.value = p),
       title: unref(L)("打印配置"),
       width: "600px"
     }, {
       default: withCtx(() => [
         createVNode(unref(ElRow), null, {
           default: withCtx(() => [
-            createElementVNode("label", _hoisted_1$e, toDisplayString(unref(L)("打印机")), 1),
+            createElementVNode("label", _hoisted_1$g, toDisplayString(unref(L)("打印机")), 1),
             createVNode(unref(ElSelect), {
               modelValue: n.PrintName,
-              "onUpdate:modelValue": u[0] || (u[0] = (d) => n.PrintName = d),
+              "onUpdate:modelValue": u[0] || (u[0] = (p) => n.PrintName = p),
               style: { width: "150px" }
             }, {
               default: withCtx(() => [
@@ -15698,9 +15698,9 @@ const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _ho
                   value: "",
                   label: unref(L)("默认打印机")
                 }, null, 8, ["label"]),
-                (openBlock(!0), createElementBlock(Fragment, null, renderList(a.value, (d) => (openBlock(), createBlock(unref(ElOption), {
-                  value: d,
-                  label: d
+                (openBlock(!0), createElementBlock(Fragment, null, renderList(a.value, (p) => (openBlock(), createBlock(unref(ElOption), {
+                  value: p,
+                  label: p
                 }, null, 8, ["value", "label"]))), 256))
               ]),
               _: 1
@@ -15710,10 +15710,10 @@ const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _ho
         }),
         createVNode(unref(ElRow), { style: { "margin-top": "2vh" } }, {
           default: withCtx(() => [
-            createElementVNode("label", _hoisted_2$a, toDisplayString(unref(L)("打印方向")), 1),
+            createElementVNode("label", _hoisted_2$9, toDisplayString(unref(L)("打印方向")), 1),
             createVNode(unref(ElSelect), {
               modelValue: n.Direction,
-              "onUpdate:modelValue": u[1] || (u[1] = (d) => n.Direction = d),
+              "onUpdate:modelValue": u[1] || (u[1] = (p) => n.Direction = p),
               style: { width: "150px" }
             }, {
               default: withCtx(() => [
@@ -15732,10 +15732,10 @@ const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _ho
           _: 1
         }),
         renderSlot(m.$slots, "PrintDialogConfigDlg"),
-        createElementVNode("div", _hoisted_3$8, [
+        createElementVNode("div", _hoisted_3$7, [
           createVNode(unref(ElButton), {
             type: "primary",
-            onClick: p
+            onClick: h
           }, {
             default: withCtx(() => [
               createTextVNode(toDisplayString(unref(L)("打印")), 1)
@@ -15747,12 +15747,12 @@ const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _ho
       _: 3
     }, 8, ["modelValue", "title"]));
   }
-}, _hoisted_1$d = { style: { height: "100%", width: "100%" } }, _hoisted_2$9 = { style: { position: "absolute", display: "inline-block" } }, _hoisted_3$7 = { style: { top: "2px", position: "relative" } }, _hoisted_4$6 = {
+}, _hoisted_1$f = { style: { height: "100%", width: "100%" } }, _hoisted_2$8 = { style: { position: "absolute", display: "inline-block" } }, _hoisted_3$6 = { style: { top: "2px", position: "relative" } }, _hoisted_4$6 = {
   key: 1,
   class: "myicon",
   "aria-hidden": "true",
   style: { "font-size": "2em" }
-}, _hoisted_5$5 = ["xlink:href"], _sfc_main$j = {
+}, _hoisted_5$5 = ["xlink:href"], _sfc_main$l = {
   __name: "DataList",
   props: {
     showCheck: { type: Boolean, default: !0 },
@@ -15816,7 +15816,7 @@ const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _ho
         }
         return B;
       });
-    }, p = async () => {
+    }, h = async () => {
       let D = await c("导出"), S = 0, F = D.length, B = [];
       for (let ae in D[0])
         S++, B.push(ae);
@@ -15870,7 +15870,7 @@ const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _ho
       utils.book_append_sheet(se, j, "sheet1"), writeFileSync(se, s.tabName + L("导出") + ".xlsx");
     };
     let _ = /^[+-]?([0-9]+[.][0-9]*|[.][0-9]+)$/;
-    const h = ({ columns: D, data: S }) => {
+    const d = ({ columns: D, data: S }) => {
       let F = [];
       return D.forEach((B, R) => {
         if (R === 0) {
@@ -15907,7 +15907,7 @@ const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _ho
       D.srcFilter = D.srcFilter || D.filters, D.filterText == "" ? D.filters = D.srcFilter : D.filters = D.srcFilter.filter((S) => S.text.indexOf(D.filterText) >= 0);
     };
     window.__id || (window.__id = 1);
-    const d = () => __id++, A = computed({
+    const p = () => __id++, A = computed({
       get: () => a.value.some((D) => D.isSummary)
     });
     watch(
@@ -15926,7 +15926,7 @@ const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _ho
         s.columnArray.forEach((B) => {
           let R = {};
           for (let j in B) R[j] = B[j];
-          R.isFilter && (R.filters || (R.filterText = "", R.filterList = [], R.filters = [], R.Id = d())), F.push(R);
+          R.isFilter && (R.filters || (R.filterText = "", R.filterList = [], R.filters = [], R.Id = p())), F.push(R);
         }), a.value = F;
       }
       let S = [];
@@ -15965,11 +15965,11 @@ const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _ho
     };
     return r({
       onUpdateData: k,
-      exportData: p,
+      exportData: h,
       printData: async () => {
         i.dataArray = await c("打印"), i.IsVisible = !0;
       }
-    }), (D, S) => (openBlock(), createElementBlock("div", _hoisted_1$d, [
+    }), (D, S) => (openBlock(), createElementBlock("div", _hoisted_1$f, [
       createVNode(unref(ElTable), {
         data: n.value,
         height: "full",
@@ -15981,7 +15981,7 @@ const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _ho
         class: "qktab",
         "sum-text": unref(L)("合计"),
         "span-method": o,
-        "summary-method": h,
+        "summary-method": d,
         onSelectionChange: G
       }, {
         default: withCtx(() => [
@@ -16014,8 +16014,8 @@ const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _ho
                 "onUpdate:visible": (B) => F.isVisible = B
               }, {
                 reference: withCtx(() => [
-                  createElementVNode("div", _hoisted_2$9, [
-                    createElementVNode("div", _hoisted_3$7, [
+                  createElementVNode("div", _hoisted_2$8, [
+                    createElementVNode("div", _hoisted_3$6, [
                       F.filterList.length > 0 ? (openBlock(), createBlock(unref(ElIcon), {
                         key: 0,
                         class: "havfilter myicon"
@@ -16223,7 +16223,7 @@ const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _ho
         ]),
         _: 1
       }, 8, ["data", "show-summary", "sum-text"]),
-      createVNode(_sfc_main$k, {
+      createVNode(_sfc_main$m, {
         modelValue: i.IsVisible,
         "onUpdate:modelValue": S[0] || (S[0] = (F) => i.IsVisible = F),
         data: i.dataArray,
@@ -16233,7 +16233,7 @@ const _hoisted_1$e = { style: { display: "inline-block", width: "100px" } }, _ho
       }, null, 8, ["modelValue", "data", "title", "columnArray", "printOption"])
     ]));
   }
-}, DataList = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__scopeId", "data-v-bc66a78b"]]), CreateNewPrint = () => {
+}, DataList = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["__scopeId", "data-v-bc66a78b"]]), CreateNewPrint = () => {
   let config = { Pid: "" }, LODOP = getLodop();
   return {
     onMessage: (e, r) => {
@@ -16394,7 +16394,7 @@ const SafeCall$1 = async (e, r) => {
   PrintTick: PrintTick$1,
   UserCardTypeEnum: UserCardTypeEnum$1,
   DebugPrint: DebugPrint$1
-}, _hoisted_1$c = { class: "pagemain" }, _hoisted_2$8 = { style: { "text-align": "center", "margin-top": "20px" } }, _sfc_main$i = {
+}, _hoisted_1$e = { class: "pagemain" }, _hoisted_2$7 = { style: { "text-align": "center", "margin-top": "20px" } }, _sfc_main$k = {
   __name: "index",
   props: {
     columnArray: { type: Array, default: () => [] },
@@ -16430,12 +16430,12 @@ const SafeCall$1 = async (e, r) => {
   },
   emits: ["command", "handData", "saveData", "select"],
   setup(e, { expose: r, emit: t }) {
-    const a = useSlots(), n = ref([]), i = ref(!0), s = ref(!0), l = ref(), o = reactive({ IsVisible: !1, DataModel: {}, Title: "" }), f = ref(null), c = ref(0), p = ref(1), _ = ref(20), h = window.ProjectHost, m = e, u = t, d = ref([]), A = (G) => {
+    const a = useSlots(), n = ref([]), i = ref(!0), s = ref(!0), l = ref(), o = reactive({ IsVisible: !1, DataModel: {}, Title: "" }), f = ref(null), c = ref(0), h = ref(1), _ = ref(20), d = window.ProjectHost, m = e, u = t, p = ref([]), A = (G) => {
       u("select", G);
     }, I = computed({
       get: () => {
         var G = [];
-        return m.commandArray && m.commandArray.length > 0 && m.commandArray.forEach((C) => G.push(C)), d.value.some((C) => C.Name == "编辑") ? G.push("编辑") : d.value.some((C) => C.Name == "查看") && G.push("查看"), d.value.some((C) => C.Name == "删除") && G.push("删除"), G;
+        return m.commandArray && m.commandArray.length > 0 && m.commandArray.forEach((C) => G.push(C)), p.value.some((C) => C.Name == "编辑") ? G.push("编辑") : p.value.some((C) => C.Name == "查看") && G.push("查看"), p.value.some((C) => C.Name == "删除") && G.push("删除"), G;
       }
     }), k = (G, C) => {
       switch (G) {
@@ -16446,7 +16446,7 @@ const SafeCall$1 = async (e, r) => {
         case "查看":
         case "编辑": {
           i.value = G == "编辑", o.Title = `${L(m.tabName)} - ${L(G)}`, SafeCall$1(async () => {
-            o.DataModel = await AjaxCallWeb(`${h}/${m.controller}/GetModel`, {
+            o.DataModel = await AjaxCallWeb(`${d}/${m.controller}/GetModel`, {
               Id: C.Id
             }), u("handData", o.DataModel, !0), o.IsVisible = !0;
           }, L("数据加载中"));
@@ -16454,7 +16454,7 @@ const SafeCall$1 = async (e, r) => {
         }
         case "删除": {
           confirm(L("数据删除后将不能恢复，请确认是否删除")) && SafeCall$1(async () => {
-            await AjaxCallWeb(`${h}/${m.controller}/Delete`, { Id: C.Id }), ElMessage({ message: L("数据删除成功！"), type: "success" });
+            await AjaxCallWeb(`${d}/${m.controller}/Delete`, { Id: C.Id }), ElMessage({ message: L("数据删除成功！"), type: "success" });
             for (let D = 0; D < n.value.length; D++)
               if (n.value[D].Id == C.Id) {
                 n.value.splice(D, 1);
@@ -16472,7 +16472,7 @@ const SafeCall$1 = async (e, r) => {
             SafeCall$1(async () => {
               for (let S = 0; S < D.length; S++) {
                 let F = D[S].Id;
-                await AjaxCallWeb(`${h}/${m.controller}/Delete`, {
+                await AjaxCallWeb(`${d}/${m.controller}/Delete`, {
                   Id: F
                 }), ElMessage({ message: L("删除成功") + `（${S + 1}/${D.length}）` });
               }
@@ -16491,31 +16491,31 @@ const SafeCall$1 = async (e, r) => {
       }
     }, O = () => {
       u("saveData", o.DataModel, !0), SafeCall$1(async () => {
-        let G = await AjaxCallWeb(`${h}/${m.controller}/SaveModel`, o.DataModel);
+        let G = await AjaxCallWeb(`${d}/${m.controller}/SaveModel`, o.DataModel);
         ElMessage({ message: L("数据保存成功！"), type: "success" }), o.IsVisible = !1, H();
       }, L("数据保存中"));
     }, H = (G) => SafeCall$1(async () => {
-      G && G > 0 && (p.value = G);
+      G && G > 0 && (h.value = G);
       var C = {
-        PageIndex: p.value,
+        PageIndex: h.value,
         PageSize: _.value
       };
       if (m.searchParam)
         for (var D in m.searchParam) C[D] = m.searchParam[D];
-      let S = await AjaxCallWeb(`${h}/${m.controller}/GetPage`, C);
+      let S = await AjaxCallWeb(`${d}/${m.controller}/GetPage`, C);
       S.forEach((F) => u("handData", F, !1)), n.value = S, c.value = window.LastResult.totalRows;
     }, L("数据查询中"));
     return onMounted(async () => {
       if (s.value = a.FilterItem, m.powerArray && m.powerArray.length > 0)
-        d.value = m.powerArray, m.loadData && nextTick(() => H());
+        p.value = m.powerArray, m.loadData && nextTick(() => H());
       else {
         let G = m.powerId && m.powerId > 0 ? m.powerId : GetUrlParam("PowerId", "");
         G ? await SafeCall$1(async () => {
-          d.value = await SystemModuleApi("/ModulePowerInfo/Search", {
+          p.value = await SystemModuleApi("/ModulePowerInfo/Search", {
             SearchType: 3,
             ParentId: G
           }), m.loadData && nextTick(() => H());
-        }, L("页面加载中")) : (d.value = [
+        }, L("页面加载中")) : (p.value = [
           { Id: "1", Name: "新增" },
           { Id: "1", Name: "编辑" },
           { Id: "1", Name: "删除" },
@@ -16524,8 +16524,8 @@ const SafeCall$1 = async (e, r) => {
       }
     }), r({
       onSearch: H
-    }), (G, C) => (openBlock(), createElementBlock("div", _hoisted_1$c, [
-      s.value ? (openBlock(), createBlock(_sfc_main$m, {
+    }), (G, C) => (openBlock(), createElementBlock("div", _hoisted_1$e, [
+      s.value ? (openBlock(), createBlock(_sfc_main$o, {
         key: 0,
         class: "filter",
         onSearch: C[0] || (C[0] = (D) => H(1)),
@@ -16540,15 +16540,15 @@ const SafeCall$1 = async (e, r) => {
       }, 8, ["labelWidth"])) : createCommentVNode("", !0),
       createVNode(Tool, {
         total: c.value,
-        pageIndex: p.value,
-        "onUpdate:pageIndex": C[5] || (C[5] = (D) => p.value = D),
+        pageIndex: h.value,
+        "onUpdate:pageIndex": C[5] || (C[5] = (D) => h.value = D),
         pageSize: _.value,
         "onUpdate:pageSize": C[6] || (C[6] = (D) => _.value = D),
         onUpdateData: H,
         class: "tool"
       }, {
         ToolItem: withCtx(() => [
-          d.value.some((D) => D.Name == "新增") ? (openBlock(), createBlock(unref(ElButton), {
+          p.value.some((D) => D.Name == "新增") ? (openBlock(), createBlock(unref(ElButton), {
             key: 0,
             type: "primary",
             onClick: C[1] || (C[1] = (D) => k("新增"))
@@ -16558,7 +16558,7 @@ const SafeCall$1 = async (e, r) => {
             ]),
             _: 1
           })) : createCommentVNode("", !0),
-          d.value.some((D) => D.Name == "删除") ? (openBlock(), createBlock(unref(ElButton), {
+          p.value.some((D) => D.Name == "删除") ? (openBlock(), createBlock(unref(ElButton), {
             key: 1,
             type: "danger",
             onClick: C[2] || (C[2] = (D) => k("批量删除"))
@@ -16586,7 +16586,7 @@ const SafeCall$1 = async (e, r) => {
             ]),
             _: 1
           }),
-          renderSlot(G.$slots, "ToolItem", { powerArray: d.value }, void 0, !0)
+          renderSlot(G.$slots, "ToolItem", { powerArray: p.value }, void 0, !0)
         ]),
         _: 3
       }, 8, ["total", "pageIndex", "pageSize"]),
@@ -16603,7 +16603,7 @@ const SafeCall$1 = async (e, r) => {
         onSelect: A,
         commandArray: I.value,
         key: I.value,
-        powerArray: d.value,
+        powerArray: p.value,
         printOption: m.printOption
       }, null, 8, ["data", "tabName", "columnArray", "toolWidth", "maxCommand", "commandArray", "powerArray", "printOption"])),
       createVNode(unref(ElDialog), {
@@ -16627,9 +16627,9 @@ const SafeCall$1 = async (e, r) => {
             default: withCtx(() => [
               renderSlot(G.$slots, "formItem", {
                 formModel: o.DataModel,
-                powerArray: d.value
+                powerArray: p.value
               }, void 0, !0),
-              createElementVNode("div", _hoisted_2$8, [
+              createElementVNode("div", _hoisted_2$7, [
                 i.value ? (openBlock(), createBlock(unref(ElButton), {
                   key: 0,
                   type: "primary",
@@ -16649,10 +16649,10 @@ const SafeCall$1 = async (e, r) => {
       }, 8, ["modelValue", "title", "width", "top", "style"])
     ]));
   }
-}, PageIndex = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__scopeId", "data-v-0f50dd1b"]]), _hoisted_1$b = { class: "pagemain" }, _hoisted_2$7 = {
+}, PageIndex = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["__scopeId", "data-v-0f50dd1b"]]), _hoisted_1$d = { class: "pagemain" }, _hoisted_2$6 = {
   key: 1,
   class: "total"
-}, _hoisted_3$6 = { class: "total-item" }, _hoisted_4$5 = { style: { color: "dodgerblue", "font-weight": "bold" } }, _sfc_main$h = {
+}, _hoisted_3$5 = { class: "total-item" }, _hoisted_4$5 = { style: { color: "dodgerblue", "font-weight": "bold" } }, _sfc_main$j = {
   __name: "index",
   props: {
     columnArray: { type: Array, default: () => [] },
@@ -16705,7 +16705,7 @@ const SafeCall$1 = async (e, r) => {
         };
         return o.printOption.TitleArray && o.printOption.TitleArray.length > 0 && o.printOption.TitleArray.forEach((k) => I.TitleArray.push(k)), o.printOption.FootArray && o.printOption.FootArray.length > 0 && o.printOption.FootArray.forEach((k) => I.FootArray.push(k)), I;
       }
-    }), p = t, _ = ref([]), h = computed({
+    }), h = t, _ = ref([]), d = computed({
       get: () => {
         var I = [];
         return o.commandArray && o.commandArray.length > 0 && o.commandArray.forEach((k) => I.push(k)), I;
@@ -16713,13 +16713,13 @@ const SafeCall$1 = async (e, r) => {
     }), m = (I, k) => {
       switch (I) {
         default: {
-          p("command", I, k);
+          h("command", I, k);
           break;
         }
       }
     };
     let u = /^[+-]?([0-9]+[.][0-9]*|[.][0-9]+)$/;
-    const d = (I, k, O, H) => {
+    const p = (I, k, O, H) => {
       if (k == I.length) {
         if (O.forEach((G) => H.push(G)), O.length > 1) {
           let G = { IgnoreSummary: !0, Rows: O }, C = !0, D = O[0];
@@ -16746,7 +16746,7 @@ const SafeCall$1 = async (e, r) => {
       } else {
         let G = O.GroupBy((C) => C[I[k].dataKey]);
         for (let C = 0; C < G.length; C++)
-          d(I, k + 1, G[C], H);
+          p(I, k + 1, G[C], H);
       }
     }, A = () => {
       f(async () => {
@@ -16754,12 +16754,12 @@ const SafeCall$1 = async (e, r) => {
         if (o.searchParam)
           for (var k in o.searchParam) I[k] = o.searchParam[k];
         let O = await AjaxCallWeb(o.url, I);
-        if (O = o.handArray(O), O.forEach((H) => p("handData", H, !1)), o.columnArray.length > 0 && o.columnArray[0].isHeBing && o.columnArray.Exists((H) => H.isSummary)) {
+        if (O = o.handArray(O), O.forEach((H) => h("handData", H, !1)), o.columnArray.length > 0 && o.columnArray[0].isHeBing && o.columnArray.Exists((H) => H.isSummary)) {
           let H = [];
           for (let C = 0; C < o.columnArray.length; C++)
             o.columnArray[C].isHeBing && H.push(o.columnArray[C]);
           let G = [];
-          d(H, 0, O, G), O = G;
+          p(H, 0, O, G), O = G;
         }
         n.value = O;
       }, L("数据查询中"));
@@ -16773,8 +16773,8 @@ const SafeCall$1 = async (e, r) => {
       }, L("页面初始化")), o.loadData && await A();
     }), r({
       onSearch: A
-    }), (I, k) => (openBlock(), createElementBlock("div", _hoisted_1$b, [
-      i.value ? (openBlock(), createBlock(_sfc_main$m, {
+    }), (I, k) => (openBlock(), createElementBlock("div", _hoisted_1$d, [
+      i.value ? (openBlock(), createBlock(_sfc_main$o, {
         key: 0,
         class: "filter",
         onSearch: A
@@ -16814,8 +16814,8 @@ const SafeCall$1 = async (e, r) => {
         ]),
         _: 3
       }),
-      l.value.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_2$7, [
-        (openBlock(!0), createElementBlock(Fragment, null, renderList(l.value, (O) => (openBlock(), createElementBlock("div", _hoisted_3$6, [
+      l.value.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_2$6, [
+        (openBlock(!0), createElementBlock(Fragment, null, renderList(l.value, (O) => (openBlock(), createElementBlock("div", _hoisted_3$5, [
           createElementVNode("div", null, toDisplayString(O.title) + "：", 1),
           createElementVNode("div", _hoisted_4$5, toDisplayString(n.value.Where((H) => !H.IgnoreSummary).Sum((H) => O.FnGet ? O.FnGet(H) * 1 : H[O.dataKey] * 1).toFixed(2)), 1)
         ]))), 256))
@@ -16829,13 +16829,13 @@ const SafeCall$1 = async (e, r) => {
         toolWidth: o.toolWidth,
         columnArray: o.columnArray,
         onCommand: m,
-        commandArray: h.value,
-        key: h.value,
+        commandArray: d.value,
+        key: d.value,
         printOption: c.value
       }, null, 8, ["data", "tabName", "toolWidth", "columnArray", "commandArray", "printOption"]))
     ]));
   }
-}, reportIndex = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["__scopeId", "data-v-f7f579b7"]]), _sfc_main$g = {
+}, reportIndex = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__scopeId", "data-v-f7f579b7"]]), _sfc_main$i = {
   __name: "byDatePicker",
   props: {
     BeginTime: { type: [String, void 0], default: "" },
@@ -16859,15 +16859,15 @@ const SafeCall$1 = async (e, r) => {
     const i = computed({
       get: () => {
         if (t.MaxTime) {
-          let c = t.MaxTime.ToDateTime(), p = c.ToString("yyyy-MM-dd 00:00:00").ToDateTime();
-          return p < c ? p.ToString("yyyy-MM-dd 00:00:00").ToDateTime().AddDays(1) : c;
+          let c = t.MaxTime.ToDateTime(), h = c.ToString("yyyy-MM-dd 00:00:00").ToDateTime();
+          return h < c ? h.ToString("yyyy-MM-dd 00:00:00").ToDateTime().AddDays(1) : c;
         } else return null;
       }
     }), s = computed({
       get: () => t.MinTime ? t.MinTime.ToDateTime().ToString("yyyy-MM-dd 00:00:00").ToDateTime() : null
     }), l = (c) => {
-      let p = !0;
-      return i.value && s.value && (p = c >= s.value && c <= i.value), !p;
+      let h = !0;
+      return i.value && s.value && (h = c >= s.value && c <= i.value), !h;
     }, o = () => {
       n.value != null ? (a("update:BeginTime", n.value[0]), a("update:EndTime", n.value[1])) : (a("update:BeginTime", ""), a("update:EndTime", ""), n.value = ["", ""]), a("change");
     }, f = [
@@ -16902,8 +16902,8 @@ const SafeCall$1 = async (e, r) => {
       {
         text: L("上个周"),
         value: () => {
-          let c = /* @__PURE__ */ new Date(), p = c.AddDays(-c.getDay() - 6), _ = c.AddDays(-c.getDay());
-          return [p.ToString("yyyy-MM-dd 00:00:00"), _.ToString("yyyy-MM-dd 23:59:59")];
+          let c = /* @__PURE__ */ new Date(), h = c.AddDays(-c.getDay() - 6), _ = c.AddDays(-c.getDay());
+          return [h.ToString("yyyy-MM-dd 00:00:00"), _.ToString("yyyy-MM-dd 23:59:59")];
         }
       },
       {
@@ -16929,11 +16929,11 @@ const SafeCall$1 = async (e, r) => {
       }
     ];
     return onMounted(() => {
-      let c = /* @__PURE__ */ new Date(), p = !1;
-      t.BeginTime ? n.value[0] = t.BeginTime : (n.value[0] = c.ToString("yyyy-MM-dd 00:00:00"), p = !0), t.EndTime ? n.value[1] = t.EndTime : (n.value[1] = c.ToString("yyyy-MM-dd 23:59:59"), p = !0), p && o();
-    }), (c, p) => (openBlock(), createBlock(unref(ElDatePicker), {
+      let c = /* @__PURE__ */ new Date(), h = !1;
+      t.BeginTime ? n.value[0] = t.BeginTime : (n.value[0] = c.ToString("yyyy-MM-dd 00:00:00"), h = !0), t.EndTime ? n.value[1] = t.EndTime : (n.value[1] = c.ToString("yyyy-MM-dd 23:59:59"), h = !0), h && o();
+    }), (c, h) => (openBlock(), createBlock(unref(ElDatePicker), {
       modelValue: n.value,
-      "onUpdate:modelValue": p[0] || (p[0] = (_) => n.value = _),
+      "onUpdate:modelValue": h[0] || (h[0] = (_) => n.value = _),
       onChange: o,
       type: t.type,
       "value-format": "YYYY-MM-DD HH:mm:ss",
@@ -16945,7 +16945,7 @@ const SafeCall$1 = async (e, r) => {
       "default-time": [/* @__PURE__ */ new Date("2022-1-1 00:00:00"), /* @__PURE__ */ new Date("2022-1-1 23:59:59")]
     }, null, 8, ["modelValue", "type", "range-separator", "start-placeholder", "end-placeholder", "default-time"]));
   }
-}, byDatePicker = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__scopeId", "data-v-70b5d531"]]), { $: $$1, BtnMenu, DropListMenu, PanelMenu, DropList, Panel, Tooltip } = E;
+}, byDatePicker = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__scopeId", "data-v-70b5d531"]]), { $: $$1, BtnMenu, DropListMenu, PanelMenu, DropList, Panel, Tooltip } = E;
 var id = (/* @__PURE__ */ new Date()).getTime();
 class appendix extends BtnMenu {
   constructor(r) {
@@ -16982,8 +16982,8 @@ class appendix extends BtnMenu {
               FileData: this.result.substring(this.result.indexOf(",") + 1),
               FileType: s.name
             };
-            axios.post(a, c, n).then((p) => {
-              let _ = p.data;
+            axios.post(a, c, n).then((h) => {
+              let _ = h.data;
               _.resultcode == "200" && t.editor.txt.append(`<a href="${_.data}" download="${s.name}">${s.name}</a>`);
             });
           };
@@ -16999,7 +16999,7 @@ class appendix extends BtnMenu {
     this.active();
   }
 }
-const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" }, _sfc_main$f = {
+const _hoisted_1$c = { style: "width: 100%;height:100%;border:1px solid #ccc" }, _sfc_main$h = {
   __name: "index",
   props: {
     modelValue: { type: String, default: "" }
@@ -17016,17 +17016,17 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
           "content-type": "application/json"
         }
       };
-      l.forEach((p) => {
-        if ((p.type == "image/jpeg" || p.type == "image/png" || p.type == "image/bmp") && p.size / 1024 > 600)
+      l.forEach((h) => {
+        if ((h.type == "image/jpeg" || h.type == "image/png" || h.type == "image/bmp") && h.size / 1024 > 600)
           return alert(L("图片大小不能超过 600kb!")), !1;
-        const h = new FileReader();
-        h.readAsDataURL(p), h.onload = function() {
+        const d = new FileReader();
+        d.readAsDataURL(h), d.onload = function() {
           let u = {
             FileData: this.result.substring(this.result.indexOf(",") + 1),
-            FileType: p.name
+            FileType: h.name
           };
-          axios.post(f, u, c).then((d) => {
-            let A = d.data;
+          axios.post(f, u, c).then((p) => {
+            let A = p.data;
             A.resultcode == "200" && o(A.data);
           });
         };
@@ -17036,7 +17036,7 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
       t.value == null && (t.value = new E(a.value), t.value.config.uploadImgShowBase64 = !0, t.value.config.showLinkImg = !0, t.value.config.menuTooltipPosition = "down", t.value.config.onchangeTimeout = 1e3, t.value.config.uploadImgAccept = ["jpg", "jpeg", "png", "gif", "bmp", "webp"], t.value.config.customUploadImg = s, t.value.config.customUploadVideo = s, t.value.config.onchange = (l) => {
         l != n.modelValue && i("update:modelValue", l);
       }, t.value.create()), t.value.txt.html(n.modelValue);
-    }), (l, o) => (openBlock(), createElementBlock("div", _hoisted_1$a, [
+    }), (l, o) => (openBlock(), createElementBlock("div", _hoisted_1$c, [
       createElementVNode("div", {
         ref_key: "richText",
         ref: a,
@@ -17044,169 +17044,211 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
       }, null, 512)
     ]));
   }
-}, _hoisted_1$9 = { style: { height: "150px" } }, _hoisted_2$6 = ["src"], _hoisted_3$5 = ["src"], _sfc_main$e = {
-  __name: "byUploadPic",
-  props: {
-    modelValue: { type: [String, Array], default: "" },
-    multiple: { type: Boolean, default: !1 },
+}, _hoisted_1$b = ["src"], _sfc_main$g = {
+  __name: "OnePicUpload",
+  props: /* @__PURE__ */ mergeModels({
     height: { type: String, default: "100px" },
     isImage: { type: Boolean, default: !1 },
     headPic: { type: Boolean, default: !1 }
-  },
-  emits: ["update:modelValue", "change"],
+  }, {
+    modelValue: {},
+    modelModifiers: {}
+  }),
+  emits: /* @__PURE__ */ mergeModels(["change"], ["update:modelValue"]),
   setup(e, { emit: r }) {
-    const t = e, a = r, n = reactive({ IsVisible: !1, PicUrl: "" }), i = ref([]), s = computed({
+    const t = e, a = useModel(e, "modelValue"), n = r, i = computed({
       get: () => t.headPic ? "http://npic.ip239.com/ApiHandler.ashx?Action=UploadHeadPic" : "http://npic.ip239.com/ApiHandler.ashx?Action=UploadFile"
-    });
-    watch(
-      () => t.modelValue,
-      (h) => {
-        typeof h == "object" && (i.value = [], h.forEach((m, u) => {
-          i.value.push({
-            name: `图${u}`,
-            url: m
-          });
-        }));
-      }
-    ), onMounted(() => {
-      typeof t.modelValue == "object" && t.modelValue.forEach((h, m) => {
-        i.value.push({
-          name: `图${m}`,
-          url: h
-        });
-      });
-    });
-    const l = async () => {
+    }), s = async () => {
       try {
-        let h = await AjaxCallWeb("http://localhost:18008/AForge/TakePictures"), m = "http://npic.ip239.com/Api/UploadFileBase64";
-        t.headPic && (m = "http://npic.ip239.com/Api/UploadHeadPicBase64"), SafeCall$1(async () => {
-          let u = await AjaxCallWeb(m, {
-            FileData: h.PicData,
+        let c = await AjaxCallWeb("http://localhost:18008/AForge/TakePictures"), h = "http://npic.ip239.com/Api/UploadFileBase64";
+        t.headPic && (h = "http://npic.ip239.com/Api/UploadHeadPicBase64"), SafeCall$1(async () => {
+          let _ = await AjaxCallWeb(h, {
+            FileData: c.PicData,
             FileName: "头像.jpg",
             FileType: "jpg"
           });
-          a("update:modelValue", u), a("change");
+          n("update:modelValue", _), n("change");
         }, "数据上传中");
-      } catch (h) {
-        let m = h.resultcontent || h.message;
-        if (m == "取消") return;
-        ElMessage.error(m);
+      } catch (c) {
+        let h = c.resultcontent || c.message;
+        if (h == "取消") return;
+        ElMessage.error(h);
       }
-    }, o = (h, m) => {
-      let u = h.url;
-      a(
-        "update:modelValue",
-        t.modelValue.filter((d) => d != u)
-      ), a("change");
-    }, f = () => {
-      a("update:modelValue", ""), a("change");
-    }, c = (h) => h.indexOf(".jpg") >= 0 || h.indexOf(".png") >= 0 || h.indexOf(".bmp") >= 0 || t.isImage, p = (h, m, u) => {
-      if (h.resultcode != "200")
-        return ElMessage.error(L("文件上传失败") + ":" + h.resultcontent);
-      if (t.multiple) {
-        if (t.modelValue.Exists((A) => A == h.data)) return ElMessage.error(L("文件已存在"));
-        let d = typeof t.modelValue == "object" ? [...t.modelValue, h.data] : [h.data];
-        a("update:modelValue", d);
-      } else
-        a("update:modelValue", h.data);
-      a("change");
-    }, _ = (h) => !0;
-    return (h, m) => (openBlock(), createElementBlock("div", _hoisted_1$9, [
-      t.multiple ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-        createVNode(unref(ElUpload), {
-          "file-list": i.value,
-          "onUpdate:fileList": m[0] || (m[0] = (u) => i.value = u),
-          action: s.value,
-          class: "avatar-uploader",
-          "list-type": "picture-card",
-          "on-success": p,
-          "before-upload": _,
-          "on-remove": o
-        }, {
-          default: withCtx(() => [
-            createVNode(unref(ElIcon), { class: "avatar-uploader-icon" }, {
-              default: withCtx(() => [
-                createVNode(unref(Plus))
-              ]),
-              _: 1
-            })
-          ]),
-          _: 1
-        }, 8, ["file-list", "action"]),
-        createVNode(unref(ElDialog), {
-          modelValue: n.IsVisible,
-          "onUpdate:modelValue": m[1] || (m[1] = (u) => n.IsVisible = u),
-          top: "1vh"
+    }, l = () => {
+      n("update:modelValue", ""), n("change");
+    }, o = (c) => c.indexOf(".jpg") >= 0 || c.indexOf(".png") >= 0 || c.indexOf(".bmp") >= 0 || t.isImage, f = (c, h, _) => {
+      if (c.resultcode != "200")
+        return ElMessage.error(L("文件上传失败") + ":" + c.resultcontent);
+      n("update:modelValue", c.data), n("change");
+    };
+    return (c, h) => (openBlock(), createElementBlock("div", null, [
+      createVNode(unref(ElUpload), {
+        class: "avatar-uploader",
+        action: i.value,
+        "show-file-list": !1,
+        "on-success": f
+      }, {
+        default: withCtx(() => [
+          a.value ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+            o(a.value) ? (openBlock(), createElementBlock("img", {
+              key: 0,
+              src: a.value,
+              class: "avatar",
+              style: normalizeStyle("height:" + t.height)
+            }, null, 12, _hoisted_1$b)) : (openBlock(), createElementBlock("img", {
+              key: 1,
+              src: "http://saas.ip239.com/images/File.jpg",
+              style: normalizeStyle("height:" + t.height)
+            }, null, 4))
+          ], 64)) : (openBlock(), createBlock(unref(ElIcon), {
+            key: 1,
+            class: "avatar-uploader-icon"
+          }, {
+            default: withCtx(() => [
+              createVNode(unref(Plus))
+            ]),
+            _: 1
+          }))
+        ]),
+        _: 1
+      }, 8, ["action"]),
+      createElementVNode("div", null, [
+        createVNode(unref(ElButton), {
+          type: "success",
+          onClick: s,
+          style: { "margin-left": "10px" }
         }, {
-          default: withCtx(() => [
-            createElementVNode("img", {
-              "w-full": "",
-              style: { width: "100%" },
-              src: n.PicUrl,
-              alt: "Preview Image"
-            }, null, 8, _hoisted_2$6)
-          ]),
+          default: withCtx(() => h[0] || (h[0] = [
+            createTextVNode("拍照")
+          ])),
           _: 1
-        }, 8, ["modelValue"])
-      ], 64)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-        createVNode(unref(ElUpload), {
-          class: "avatar-uploader",
-          action: s.value,
-          "show-file-list": !1,
-          "on-success": p,
-          "before-upload": _,
-          "on-remove": o
+        }),
+        t.modelValue ? (openBlock(), createBlock(unref(ElButton), {
+          key: 0,
+          type: "danger",
+          onClick: l
         }, {
           default: withCtx(() => [
-            t.modelValue ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-              c(t.modelValue) ? (openBlock(), createElementBlock("img", {
-                key: 0,
-                src: t.modelValue,
-                class: "avatar",
-                style: normalizeStyle("height:" + t.height)
-              }, null, 12, _hoisted_3$5)) : (openBlock(), createElementBlock("img", {
-                key: 1,
-                src: "http://saas.ip239.com/images/File.jpg",
-                style: normalizeStyle("height:" + t.height)
-              }, null, 4))
-            ], 64)) : (openBlock(), createBlock(unref(ElIcon), {
-              key: 1,
-              class: "avatar-uploader-icon"
-            }, {
-              default: withCtx(() => [
-                createVNode(unref(Plus))
-              ]),
-              _: 1
-            }))
+            createTextVNode(toDisplayString(unref(L)("删除")), 1)
           ]),
           _: 1
-        }, 8, ["action"]),
-        createElementVNode("div", null, [
-          createVNode(unref(ElButton), {
-            type: "success",
-            onClick: l,
-            style: { "margin-left": "10px" }
-          }, {
-            default: withCtx(() => m[2] || (m[2] = [
-              createTextVNode("拍照")
-            ])),
-            _: 1
-          }),
-          t.modelValue ? (openBlock(), createBlock(unref(ElButton), {
-            key: 0,
-            type: "danger",
-            onClick: f
-          }, {
+        })) : createCommentVNode("", !0)
+      ])
+    ]));
+  }
+}, OnePicUpload = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__scopeId", "data-v-6adf15ad"]]), _hoisted_1$a = ["src"], _sfc_main$f = {
+  __name: "MultipleUploadPic",
+  props: /* @__PURE__ */ mergeModels({
+    height: { type: String, default: "100px" },
+    isImage: { type: Boolean, default: !1 },
+    headPic: { type: Boolean, default: !1 },
+    splitSymbol: { type: String, default: "|" }
+  }, {
+    modelValue: {},
+    modelModifiers: {}
+  }),
+  emits: /* @__PURE__ */ mergeModels(["change"], ["update:modelValue"]),
+  setup(e, { emit: r }) {
+    const t = useModel(e, "modelValue"), a = e, n = reactive({
+      fileArray: [],
+      uploadPic: "http://npic.ip239.com/ApiHandler.ashx?Action=UploadFile",
+      isVisible: !1,
+      picUrl: ""
+    }), i = r, s = () => {
+      typeof t.value == "string" ? n.fileArray = t.value.split(a.splitSymbol).Select((c, h) => ({ name: `图${h}`, url: c })) : (n.fileArray = [], t.value.forEach((c, h) => n.fileArray.push({ name: `图${h}`, url: c })));
+    };
+    watch(
+      () => t.value,
+      (c) => {
+        s();
+      }
+    ), onMounted(() => {
+      a.headPic && (n.uploadPic = "http://npic.ip239.com/ApiHandler.ashx?Action=UploadHeadPic"), s();
+    });
+    const l = (c) => {
+      n.isVisible = !0, n.picUrl = c.url;
+    }, o = (c, h) => {
+      let _ = c.url, d = n.fileArray.filter((m) => m.url != _);
+      typeof t.value == "string" ? t.value = d.Select((m) => m.url).Join(a.splitSymbol) : t.value = d.Select((m) => m.url), i("change");
+    }, f = (c, h, _) => {
+      if (c.resultcode != "200")
+        return ElMessage.error(L("文件上传失败") + ":" + c.resultcontent);
+      if (n.fileArray.Exists((m) => m.url == c.data))
+        return n.fileArray = n.fileArray.Where((m) => !m.response), ElMessage.error(L("文件已存在"));
+      let d = n.fileArray.Where((m) => !m.response).Select((m) => m.url);
+      d.push(c.data), typeof t.value == "string" ? t.value = d.Join(a.splitSymbol) : t.value = d, i("change");
+    };
+    return (c, h) => (openBlock(), createElementBlock("div", null, [
+      createVNode(unref(ElUpload), {
+        "file-list": n.fileArray,
+        "onUpdate:fileList": h[0] || (h[0] = (_) => n.fileArray = _),
+        action: n.uploadPic,
+        class: "avatar-uploader",
+        "list-type": "picture-card",
+        "on-success": f,
+        "on-remove": o,
+        "on-preview": l
+      }, {
+        default: withCtx(() => [
+          createVNode(unref(ElIcon), { class: "avatar-uploader-icon" }, {
             default: withCtx(() => [
-              createTextVNode(toDisplayString(unref(L)("删除")), 1)
+              createVNode(unref(Plus))
             ]),
             _: 1
-          })) : createCommentVNode("", !0)
-        ])
-      ], 64))
+          })
+        ]),
+        _: 1
+      }, 8, ["file-list", "action"]),
+      createVNode(unref(ElDialog), {
+        modelValue: n.isVisible,
+        "onUpdate:modelValue": h[1] || (h[1] = (_) => n.isVisible = _),
+        top: "1vh"
+      }, {
+        default: withCtx(() => [
+          createElementVNode("img", {
+            "w-full": "",
+            style: { width: "100%" },
+            src: n.picUrl,
+            alt: "Preview Image"
+          }, null, 8, _hoisted_1$a)
+        ]),
+        _: 1
+      }, 8, ["modelValue"])
+    ]));
+  }
+}, MultipleUploadPic = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-b49cc515"]]), _hoisted_1$9 = { style: { height: "150px" } }, _sfc_main$e = {
+  __name: "index",
+  props: /* @__PURE__ */ mergeModels({
+    multiple: { type: Boolean, default: !1 },
+    height: { type: String, default: "100px" },
+    isImage: { type: Boolean, default: !1 },
+    headPic: { type: Boolean, default: !1 }
+  }, {
+    modelValue: {},
+    modelModifiers: {}
+  }),
+  emits: ["update:modelValue"],
+  setup(e) {
+    const r = useModel(e, "modelValue"), t = e;
+    return (a, n) => (openBlock(), createElementBlock("div", _hoisted_1$9, [
+      e.multiple ? (openBlock(), createBlock(MultipleUploadPic, {
+        key: 0,
+        modelValue: r.value,
+        "onUpdate:modelValue": n[0] || (n[0] = (i) => r.value = i),
+        height: t.height,
+        isImage: t.isImage,
+        headPic: t.headPic
+      }, null, 8, ["modelValue", "height", "isImage", "headPic"])) : (openBlock(), createBlock(OnePicUpload, {
+        key: 1,
+        modelValue: r.value,
+        "onUpdate:modelValue": n[1] || (n[1] = (i) => r.value = i),
+        height: t.height,
+        isImage: t.isImage,
+        headPic: t.headPic
+      }, null, 8, ["modelValue", "height", "isImage", "headPic"]))
     ]));
   }
-}, byUploadPic = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["__scopeId", "data-v-6fd0d1f4"]]), _hoisted_1$8 = { style: { height: "680px" } }, _hoisted_2$5 = { style: { "text-align": "center", padding: "20px 0", "font-size": "20px" } }, _hoisted_3$4 = { style: { "text-align": "center" } }, _hoisted_4$4 = {
+}, _hoisted_1$8 = { style: { height: "680px" } }, _hoisted_2$5 = { style: { "text-align": "center", padding: "20px 0", "font-size": "20px" } }, _hoisted_3$4 = { style: { "text-align": "center" } }, _hoisted_4$4 = {
   class: "qrCodeWrap",
   ref: "qrCodeWrap"
 }, _hoisted_5$4 = { class: "qrWrap" }, _hoisted_6$4 = {
@@ -17307,17 +17349,17 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
             f += `&${c}=${i.params[c]}`;
         return f;
       } else {
-        let f = i.params || {}, c = t.resolve({ name: i.name, query: { Token: a.query.Token } }), p = "";
+        let f = i.params || {}, c = t.resolve({ name: i.name, query: { Token: a.query.Token } }), h = "";
         for (let _ in f)
-          p += `&${_}=${encodeURIComponent(f[_])}`;
-        return window.location.origin + window.location.pathname + c.href + p + "&cachetime=";
+          h += `&${_}=${encodeURIComponent(f[_])}`;
+        return window.location.origin + window.location.pathname + c.href + h + "&cachetime=";
       }
     };
     return (f, c) => (openBlock(), createBlock(unref(ElDialog), {
       title: unref(L)(i.name),
       key: s.value,
       modelValue: l.value,
-      "onUpdate:modelValue": c[0] || (c[0] = (p) => l.value = p),
+      "onUpdate:modelValue": c[0] || (c[0] = (h) => l.value = h),
       top: "1vh",
       style: normalizeStyle("width:" + i.width)
     }, {
@@ -17391,7 +17433,7 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
       get: () => t.modelValue,
       set: (u) => o("update:modelValue", u)
     }), c = async () => {
-      await n(), await Sleep(300), a.CardType == "0" ? m() : a.CardType == "9" && h(), o("update:cardType", a.CardType);
+      await n(), await Sleep(300), a.CardType == "0" ? m() : a.CardType == "9" && d(), o("update:cardType", a.CardType);
     };
     watch(
       () => t.modelValue,
@@ -17401,15 +17443,15 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
         }, 1e3), c()) : (l.value != null && (clearInterval(l.value), l.value = null), await n());
       }
     );
-    const p = () => {
+    const h = () => {
       let u = {};
-      for (let d in a)
-        u[d] = a[d];
+      for (let p in a)
+        u[p] = a[p];
       o("update:modelValue", !1), setTimeout(() => o("success", u), 300);
-    }, _ = (u, d) => AjaxCallWeb("http://npic.ip239.com/ApiHandler.ashx?Action=UploadFileBase64", {
+    }, _ = (u, p) => AjaxCallWeb("http://npic.ip239.com/ApiHandler.ashx?Action=UploadFileBase64", {
       FileType: u,
-      FileData: d
-    }), h = async () => {
+      FileData: p
+    }), d = async () => {
       n = () => LocalApi("/PassPort/CancelRead");
       try {
         let u = await LocalApi("/PassPort/ReadInfo", { MaxSecord: s.value * 1e3 });
@@ -17419,29 +17461,29 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
           confirmButtonText: "调整位置继续读取",
           cancelButtonText: "取消"
         }).then(() => {
-          h();
+          d();
         }) : ElMessageBox.alert(u.message);
       }
     }, m = async () => {
       n = () => LocalApi("/CancelReadIidentityCard");
       try {
-        let d = await LocalApi("/ReadIdentityCard", { MaxSecord: s.value * 1e3 });
+        let p = await LocalApi("/ReadIdentityCard", { MaxSecord: s.value * 1e3 });
         try {
-          t.upload ? d.HeadPortrait = await _("bmp", d.HeadPortrait) : d.HeadPortrait = "data:image/png;base64," + d.HeadPortrait;
+          t.upload ? p.HeadPortrait = await _("bmp", p.HeadPortrait) : p.HeadPortrait = "data:image/png;base64," + p.HeadPortrait;
         } catch {
         }
-        for (var u in d)
-          a[u] = d[u];
+        for (var u in p)
+          a[u] = p[u];
         a.EndDate = a.EndDate.replace("T", " ").ToDateTime().ToString("yyyy-MM-dd"), a.Sex = a.Sex == "男" ? "1" : "0";
-      } catch (d) {
-        d.resultcontent ? d.resultcontent != "取消读卡" && ElMessageBox.alert("读取失败：" + d.resultcontent) : ElMessageBox.alert(d.message);
+      } catch (p) {
+        p.resultcontent ? p.resultcontent != "取消读卡" && ElMessageBox.alert("读取失败：" + p.resultcontent) : ElMessageBox.alert(p.message);
       }
     };
-    return (u, d) => (openBlock(), createElementBlock("div", _hoisted_1$6, [
+    return (u, p) => (openBlock(), createElementBlock("div", _hoisted_1$6, [
       createVNode(unref(ElDialog), {
         title: i.value,
         modelValue: f.value,
-        "onUpdate:modelValue": d[6] || (d[6] = (A) => f.value = A),
+        "onUpdate:modelValue": p[6] || (p[6] = (A) => f.value = A),
         width: "600px"
       }, {
         default: withCtx(() => [
@@ -17461,20 +17503,20 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
                     }, null, 8, _hoisted_5$3))
                   ]),
                   createElementVNode("td", _hoisted_6$3, [
-                    d[7] || (d[7] = createElementVNode("span", { style: { width: "80px", display: "inline-block" } }, "姓 名：", -1)),
+                    p[7] || (p[7] = createElementVNode("span", { style: { width: "80px", display: "inline-block" } }, "姓 名：", -1)),
                     createVNode(unref(ElInput), {
                       modelValue: a.Name,
-                      "onUpdate:modelValue": d[0] || (d[0] = (A) => a.Name = A),
+                      "onUpdate:modelValue": p[0] || (p[0] = (A) => a.Name = A),
                       style: { width: "200px" }
                     }, null, 8, ["modelValue"])
                   ])
                 ]),
                 createElementVNode("tr", null, [
                   createElementVNode("td", null, [
-                    d[8] || (d[8] = createElementVNode("span", { style: { width: "80px", display: "inline-block" } }, "性 别：", -1)),
+                    p[8] || (p[8] = createElementVNode("span", { style: { width: "80px", display: "inline-block" } }, "性 别：", -1)),
                     createVNode(unref(ElSelect), {
                       modelValue: a.Sex,
-                      "onUpdate:modelValue": d[1] || (d[1] = (A) => a.Sex = A),
+                      "onUpdate:modelValue": p[1] || (p[1] = (A) => a.Sex = A),
                       style: { width: "100px" }
                     }, {
                       default: withCtx(() => [
@@ -17493,20 +17535,20 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
                 ]),
                 createElementVNode("tr", null, [
                   createElementVNode("td", null, [
-                    d[9] || (d[9] = createElementVNode("span", { style: { width: "80px", display: "inline-block" } }, "手机号：", -1)),
+                    p[9] || (p[9] = createElementVNode("span", { style: { width: "80px", display: "inline-block" } }, "手机号：", -1)),
                     createVNode(unref(ElInput), {
                       modelValue: a.Telephone,
-                      "onUpdate:modelValue": d[2] || (d[2] = (A) => a.Telephone = A),
+                      "onUpdate:modelValue": p[2] || (p[2] = (A) => a.Telephone = A),
                       style: { width: "200px" }
                     }, null, 8, ["modelValue"])
                   ])
                 ]),
                 createElementVNode("tr", null, [
                   createElementVNode("td", null, [
-                    d[10] || (d[10] = createElementVNode("span", { style: { width: "80px", display: "inline-block" } }, "证件类型：", -1)),
+                    p[10] || (p[10] = createElementVNode("span", { style: { width: "80px", display: "inline-block" } }, "证件类型：", -1)),
                     createVNode(unref(ElSelect), {
                       modelValue: a.CardType,
-                      "onUpdate:modelValue": d[3] || (d[3] = (A) => a.CardType = A),
+                      "onUpdate:modelValue": p[3] || (p[3] = (A) => a.CardType = A),
                       onChange: c,
                       style: { width: "200px" }
                     }, {
@@ -17522,20 +17564,20 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
                 ]),
                 createElementVNode("tr", null, [
                   createElementVNode("td", _hoisted_7$3, [
-                    d[11] || (d[11] = createElementVNode("span", { style: { width: "80px", display: "inline-block" } }, "户籍地址：", -1)),
+                    p[11] || (p[11] = createElementVNode("span", { style: { width: "80px", display: "inline-block" } }, "户籍地址：", -1)),
                     createVNode(unref(ElInput), {
                       modelValue: a.Address,
-                      "onUpdate:modelValue": d[4] || (d[4] = (A) => a.Address = A),
+                      "onUpdate:modelValue": p[4] || (p[4] = (A) => a.Address = A),
                       style: { width: "400px" }
                     }, null, 8, ["modelValue"])
                   ])
                 ]),
                 createElementVNode("tr", null, [
                   createElementVNode("td", _hoisted_8$3, [
-                    d[12] || (d[12] = createElementVNode("span", { style: { width: "80px", display: "inline-block" } }, "证件号：", -1)),
+                    p[12] || (p[12] = createElementVNode("span", { style: { width: "80px", display: "inline-block" } }, "证件号：", -1)),
                     createVNode(unref(ElInput), {
                       modelValue: a.Id,
-                      "onUpdate:modelValue": d[5] || (d[5] = (A) => a.Id = A),
+                      "onUpdate:modelValue": p[5] || (p[5] = (A) => a.Id = A),
                       style: { width: "400px" }
                     }, null, 8, ["modelValue"])
                   ])
@@ -17550,9 +17592,9 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
               type: "primary",
               style: { display: "inline-block" },
               size: "large",
-              onClick: p
+              onClick: h
             }, {
-              default: withCtx(() => d[13] || (d[13] = [
+              default: withCtx(() => p[13] || (p[13] = [
                 createTextVNode("确定")
               ])),
               _: 1
@@ -17733,8 +17775,8 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
       if (_.length != 11) return ElMessage({ message: "请输入正确的11位手机号" });
       a.cardArray = [], a.memberInfo = {}, SafeCall$1(async () => {
         try {
-          let h = await MemberApi("/OrganApi/MemberRelCardSearch", { SearchType: 3, Telephone: _ });
-          h = h.Where((m) => m.Status == s.正常 && m.CardTypeClass != CardTypeClassEnum.钱包卡), n.ckTsCardUse == "不支持" && (h = h.Where((m) => m.CardTypeClass == CardTypeClassEnum.储值卡)), a.cardArray = h;
+          let d = await MemberApi("/OrganApi/MemberRelCardSearch", { SearchType: 3, Telephone: _ });
+          d = d.Where((m) => m.Status == s.正常 && m.CardTypeClass != CardTypeClassEnum.钱包卡), n.ckTsCardUse == "不支持" && (d = d.Where((m) => m.CardTypeClass == CardTypeClassEnum.储值卡)), a.cardArray = d;
         } catch {
         }
         try {
@@ -17742,7 +17784,7 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
         } catch {
         }
       }, "会员信息查询中");
-    }, f = (_, h) => {
+    }, f = (_, d) => {
       _.HasPassWord == 1 ? ElMessageBox.prompt("请输入卡密码", "卡密码", {
         cancelButtonText: "取消",
         confirmButtonText: "确定",
@@ -17753,9 +17795,9 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
       }).then(({ value: m }) => {
         SafeCall$1(async () => {
           let u = await MemberApi("/OrganApi/GetMemberCardIdentityCode", { CardId: _.Id, PassWord: m, ValidityMinute: 5 });
-          i("success", u.RCardCode, h);
+          i("success", u.RCardCode, d);
         }, "卡密码验证中");
-      }) : i("success", "MEM" + _.CardNo, h);
+      }) : i("success", "MEM" + _.CardNo, d);
     }, c = (_) => {
       if (_.CardTypeClass == CardTypeClassEnum.计次卡)
         ElMessageBox.prompt("注意：当前使用的是【计次卡】，请根据消费的产品输入需要扣取的次数。默认每张票扣1次！", "计次卡扣费", {
@@ -17766,15 +17808,15 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
           closeOnHashChange: !1,
           inputPlaceholder: "请输入需要扣取的次数",
           inputValue: n.orderInfo.TickCount
-        }).then(({ value: h }) => {
-          f(_, h);
+        }).then(({ value: d }) => {
+          f(_, d);
         });
       else if (_.CardTypeClass == CardTypeClassEnum.周期卡) {
         if (!confirm("注意：当前使用的是【周期卡】，将不会扣除余额，请确认是否继续？", "注意"))
           return;
         f(_);
       } else if (_.CardTypeClass == CardTypeClassEnum.储值卡) return f(_);
-    }, p = () => {
+    }, h = () => {
       a.memberInfo.HasPassWord == 1 ? ElMessageBox.prompt("请输入会员支付密码", "支付密码", {
         cancelButtonText: "取消",
         confirmButtonText: "确定",
@@ -17784,8 +17826,8 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
         inputType: "password"
       }).then(({ value: _ }) => {
         SafeCall$1(async () => {
-          let h = await MemberApi("/OrganApi/GetUserIdentityCode", { UserId: a.memberInfo.Id, PassWord: _, ValidityMinute: 5 });
-          i("success", h.RUIdentityCode);
+          let d = await MemberApi("/OrganApi/GetUserIdentityCode", { UserId: a.memberInfo.Id, PassWord: _, ValidityMinute: 5 });
+          i("success", d.RUIdentityCode);
         }, "支付密码验证中");
       }) : SafeCall$1(async () => {
         let _ = await MemberApi("/OrganApi/GetUserIdentityCode", { UserId: a.memberInfo.Id, PassWord: "", ValidityMinute: 5 });
@@ -17794,7 +17836,7 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
     };
     return r({
       LoadData: o
-    }), (_, h) => (openBlock(), createElementBlock("div", null, [
+    }), (_, d) => (openBlock(), createElementBlock("div", null, [
       createElementVNode("table", _hoisted_1$4, [
         createElementVNode("tr", null, [
           createElementVNode("td", _hoisted_2$2, [
@@ -17820,24 +17862,24 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
               _: 1
             })) : (openBlock(), createElementBlock("span", _hoisted_5$2, "无图片"))
           ]),
-          h[1] || (h[1] = createElementVNode("td", { class: "t" }, "用户：", -1)),
+          d[1] || (d[1] = createElementVNode("td", { class: "t" }, "用户：", -1)),
           createElementVNode("td", null, toDisplayString(a.memberInfo.NickName), 1)
         ]),
         createElementVNode("tr", null, [
-          h[2] || (h[2] = createElementVNode("td", { class: "t" }, "手机号：", -1)),
+          d[2] || (d[2] = createElementVNode("td", { class: "t" }, "手机号：", -1)),
           createElementVNode("td", null, toDisplayString(a.memberInfo.Telephone), 1)
         ]),
         createElementVNode("tr", null, [
-          h[4] || (h[4] = createElementVNode("td", { class: "t" }, "会员余额：", -1)),
+          d[4] || (d[4] = createElementVNode("td", { class: "t" }, "会员余额：", -1)),
           createElementVNode("td", null, [
             createElementVNode("span", _hoisted_6$2, "￥" + toDisplayString((a.memberInfo.Balance / 100).toFixed(2)) + "元", 1),
             a.memberInfo.Id ? (openBlock(), createBlock(unref(ElButton), {
               key: 0,
               type: "primary",
-              onClick: h[0] || (h[0] = (m) => p()),
+              onClick: d[0] || (d[0] = (m) => h()),
               style: { "margin-left": "20px" }
             }, {
-              default: withCtx(() => h[3] || (h[3] = [
+              default: withCtx(() => d[3] || (d[3] = [
                 createTextVNode("使用")
               ])),
               _: 1
@@ -17936,7 +17978,7 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
                     type: "primary",
                     onClick: (u) => c(m)
                   }, {
-                    default: withCtx(() => h[5] || (h[5] = [
+                    default: withCtx(() => d[5] || (d[5] = [
                       createTextVNode("使用")
                     ])),
                     _: 2
@@ -17947,7 +17989,7 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
                     type: "primary",
                     onClick: (u) => c(m)
                   }, {
-                    default: withCtx(() => h[6] || (h[6] = [
+                    default: withCtx(() => d[6] || (d[6] = [
                       createTextVNode("使用")
                     ])),
                     _: 2
@@ -17957,7 +17999,7 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
                   type: "primary",
                   onClick: (u) => c(m)
                 }, {
-                  default: withCtx(() => h[7] || (h[7] = [
+                  default: withCtx(() => d[7] || (d[7] = [
                     createTextVNode("使用")
                   ])),
                   _: 2
@@ -17974,7 +18016,7 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
           type: "danger",
           onClick: l
         }, {
-          default: withCtx(() => h[8] || (h[8] = [
+          default: withCtx(() => d[8] || (d[8] = [
             createTextVNode("取消")
           ])),
           _: 1
@@ -18185,16 +18227,16 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
         }, 100), c(o.GetMethod)) : (o.timerId != null && (clearInterval(o.timerId), o.timerId = null), o.loading != null && (o.loading.close(), o.loading = null));
       }
     );
-    const p = () => {
+    const h = () => {
       ElMessageBox.prompt("请输入订单备注：", {
         confirmButtonText: "	确定",
         cancelButtonText: "取消"
       }).then(({ value: u }) => {
         o.Remarks = u;
       });
-    }, _ = (u, d) => {
-      o.PayCode = u, o.PayType = "512", o.numOfTimes = d, o.isMemberBox = !1, nextTick(() => h());
-    }, h = async () => {
+    }, _ = (u, p) => {
+      o.PayCode = u, o.PayType = "512", o.numOfTimes = p, o.isMemberBox = !1, nextTick(() => d());
+    }, d = async () => {
       if (o.IsConfirming) return;
       o.IsConfirming = !0;
       let u = (/* @__PURE__ */ new Date()).getTime();
@@ -18219,9 +18261,9 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
           WaitOrderPaySuccess: t.waitOrderPaySuccessUrl || "http://saas.ip239.com/OrderInfo/WaitOrderPaySuccess"
         },
         PaySuccess: () => {
-          let d = o.GetMethod;
-          d.endsWith("收款") || (d = d + "收款");
-          let A = `${d} : ${((t.orderInfo.SumPrice - o.RebateAmount) / 100).toFixed(2)}元`;
+          let p = o.GetMethod;
+          p.endsWith("收款") || (p = p + "收款");
+          let A = `${p} : ${((t.orderInfo.SumPrice - o.RebateAmount) / 100).toFixed(2)}元`;
           ElMessage({ message: A, type: "success" }), o.isPlayVoice == "1" && PlayTTS(A), t.orderInfo.Status = 1, a("update:modelValue", !1), setTimeout(() => a("paySuccess", t.orderInfo), 300);
         },
         Cancel: () => {
@@ -18244,7 +18286,7 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
         o.GetMethod = "会员收款";
       }), o.managerInfo = JSON.parse(sessionStorage.getItem("ManagerInfo") || "{}");
       let u = await SystemModuleApi("/DGApi/SearchShopCoustomConfig", { SearchType: 2, Name: "收款渠道" });
-      if (o.GetMethodArray = u.split("|").Where((d) => d != ""), o.isPlayVoice = localStorage.getItem("ConfirmOrder_isPlayVoice") || "1", t.canMember) {
+      if (o.GetMethodArray = u.split("|").Where((p) => p != ""), o.isPlayVoice = localStorage.getItem("ConfirmOrder_isPlayVoice") || "1", t.canMember) {
         try {
           o.ckUserInfoPassword = await SystemModuleApi("/DGApi/SearchShopCoustomConfig", { SearchType: 2, Name: "会员密码" });
         } catch {
@@ -18258,9 +18300,9 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
         } catch {
         }
       }
-    }), (u, d) => (openBlock(), createBlock(byDialog, {
+    }), (u, p) => (openBlock(), createBlock(byDialog, {
       modelValue: s.value,
-      "onUpdate:modelValue": d[10] || (d[10] = (A) => s.value = A),
+      "onUpdate:modelValue": p[10] || (p[10] = (A) => s.value = A),
       title: "确认订单",
       width: "700px",
       height: "550px",
@@ -18287,10 +18329,10 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
               createElementVNode("td", null, toDisplayString(t.orderInfo.TickCount), 1)
             ]),
             t.desc ? (openBlock(), createElementBlock("tr", _hoisted_9$1, [
-              d[11] || (d[11] = createElementVNode("td", { class: "tlab" }, "描述：", -1)),
+              p[11] || (p[11] = createElementVNode("td", { class: "tlab" }, "描述：", -1)),
               createElementVNode("td", null, [
                 withDirectives(createElementVNode("textarea", {
-                  "onUpdate:modelValue": d[0] || (d[0] = (A) => t.desc = A),
+                  "onUpdate:modelValue": p[0] || (p[0] = (A) => t.desc = A),
                   type: "textarea",
                   rows: "4",
                   class: "desc",
@@ -18301,21 +18343,21 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
               ])
             ])) : createCommentVNode("", !0),
             t.rebate ? (openBlock(), createElementBlock("tr", _hoisted_10, [
-              d[12] || (d[12] = createElementVNode("td", { class: "tlab" }, "优惠金额：", -1)),
+              p[12] || (p[12] = createElementVNode("td", { class: "tlab" }, "优惠金额：", -1)),
               createElementVNode("td", null, [
                 createVNode(_sfc_main$8, {
                   modelValue: o.RebateAmount,
-                  "onUpdate:modelValue": d[1] || (d[1] = (A) => o.RebateAmount = A),
+                  "onUpdate:modelValue": p[1] || (p[1] = (A) => o.RebateAmount = A),
                   totalAmount: t.orderInfo.SumPrice
                 }, null, 8, ["modelValue", "totalAmount"])
               ])
             ])) : createCommentVNode("", !0),
             t.makreter ? (openBlock(), createElementBlock("tr", _hoisted_11, [
-              d[13] || (d[13] = createElementVNode("td", { class: "tlab" }, "营销员：", -1)),
+              p[13] || (p[13] = createElementVNode("td", { class: "tlab" }, "营销员：", -1)),
               createElementVNode("td", null, [
                 createVNode(unref(ElInput), {
                   modelValue: o.MakreterTel,
-                  "onUpdate:modelValue": d[2] || (d[2] = (A) => o.MakreterTel = A),
+                  "onUpdate:modelValue": p[2] || (p[2] = (A) => o.MakreterTel = A),
                   style: { width: "200px" },
                   placeholder: "请输入营销员手机号"
                 }, null, 8, ["modelValue"])
@@ -18326,7 +18368,7 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
               createElementVNode("td", null, [
                 createVNode(unref(ElRadioGroup), {
                   modelValue: o.GetMethod,
-                  "onUpdate:modelValue": d[3] || (d[3] = (A) => o.GetMethod = A),
+                  "onUpdate:modelValue": p[3] || (p[3] = (A) => o.GetMethod = A),
                   class: "ml-4"
                 }, {
                   default: withCtx(() => [
@@ -18372,12 +18414,12 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
               createElementVNode("td", null, [
                 createVNode(unref(ElInput), {
                   modelValue: o.PayCode,
-                  "onUpdate:modelValue": d[4] || (d[4] = (A) => o.PayCode = A),
+                  "onUpdate:modelValue": p[4] || (p[4] = (A) => o.PayCode = A),
                   style: { width: "400px" },
                   ref_key: "payCode",
                   ref: n,
                   disabled: o.IsConfirming,
-                  onKeyup: withKeys(h, ["enter", "native"])
+                  onKeyup: withKeys(d, ["enter", "native"])
                 }, null, 8, ["modelValue", "disabled"])
               ])
             ])) : createCommentVNode("", !0),
@@ -18387,7 +18429,7 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
                 createElementVNode("td", null, [
                   createVNode(unref(ElInput), {
                     modelValue: o.Telephone,
-                    "onUpdate:modelValue": d[6] || (d[6] = (A) => o.Telephone = A),
+                    "onUpdate:modelValue": p[6] || (p[6] = (A) => o.Telephone = A),
                     style: { width: "220px" },
                     ref_key: "payCode",
                     ref: n,
@@ -18403,7 +18445,7 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
                       }, {
                         reference: withCtx(() => [
                           createVNode(unref(ElButton), { onClick: f }, {
-                            default: withCtx(() => d[14] || (d[14] = [
+                            default: withCtx(() => p[14] || (p[14] = [
                               createTextVNode("查询")
                             ])),
                             _: 1
@@ -18419,7 +18461,7 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
                             ckUserInfoPassword: o.ckUserInfoPassword,
                             ckCardPassword: o.ckCardPassword,
                             ckTsCardUse: o.ckTsCardUse,
-                            onCancel: d[5] || (d[5] = (A) => o.isMemberBox = !1)
+                            onCancel: p[5] || (p[5] = (A) => o.isMemberBox = !1)
                           }, null, 8, ["payAmount", "orderInfo", "ckUserInfoPassword", "ckCardPassword", "ckTsCardUse"])
                         ]),
                         _: 1
@@ -18434,13 +18476,13 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
                 createElementVNode("td", null, [
                   createVNode(unref(ElInput), {
                     modelValue: o.PayCode,
-                    "onUpdate:modelValue": d[7] || (d[7] = (A) => o.PayCode = A),
+                    "onUpdate:modelValue": p[7] || (p[7] = (A) => o.PayCode = A),
                     style: { width: "400px" },
                     ref_key: "payCode",
                     ref: n,
                     disabled: o.IsConfirming,
                     placeholder: "会员卡号/会员二维码",
-                    onKeyup: withKeys(h, ["enter", "native"])
+                    onKeyup: withKeys(d, ["enter", "native"])
                   }, null, 8, ["modelValue", "disabled"])
                 ])
               ])
@@ -18453,12 +18495,12 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
                     ref_key: "payCode",
                     ref: n,
                     modelValue: o.PayAmount,
-                    "onUpdate:modelValue": d[8] || (d[8] = (A) => o.PayAmount = A),
+                    "onUpdate:modelValue": p[8] || (p[8] = (A) => o.PayAmount = A),
                     style: { width: "200px" },
-                    onKeypress: withKeys(h, ["enter", "native"]),
+                    onKeypress: withKeys(d, ["enter", "native"]),
                     disabled: o.IsConfirming
                   }, {
-                    append: withCtx(() => d[15] || (d[15] = [
+                    append: withCtx(() => p[15] || (p[15] = [
                       createTextVNode("元")
                     ])),
                     _: 1
@@ -18478,7 +18520,7 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
               ])
             ], 64)) : createCommentVNode("", !0),
             o.Remarks != "" ? (openBlock(), createElementBlock("tr", _hoisted_19, [
-              d[16] || (d[16] = createElementVNode("td", { class: "tlab" }, "备注：", -1)),
+              p[16] || (p[16] = createElementVNode("td", { class: "tlab" }, "备注：", -1)),
               createElementVNode("td", null, [
                 createElementVNode("em", _hoisted_20, toDisplayString(o.Remarks), 1)
               ])
@@ -18491,7 +18533,7 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
             style: { "font-size": "2em", padding: "20px 80px" },
             round: "",
             loading: o.IsConfirming,
-            onClick: h
+            onClick: d
           }, {
             default: withCtx(() => [
               createTextVNode(toDisplayString(unref(L)("确认订单")), 1)
@@ -18500,9 +18542,9 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
           }, 8, ["loading"]),
           createVNode(unref(ElLink), {
             style: { "margin-left": "10px", color: "blue" },
-            onClick: p
+            onClick: h
           }, {
-            default: withCtx(() => d[17] || (d[17] = [
+            default: withCtx(() => p[17] || (p[17] = [
               createTextVNode("添加备注")
             ])),
             _: 1
@@ -18510,7 +18552,7 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
           createVNode(unref(ElSwitch), {
             style: { "margin-left": "10px" },
             modelValue: o.isPlayVoice,
-            "onUpdate:modelValue": d[9] || (d[9] = (A) => o.isPlayVoice = A),
+            "onUpdate:modelValue": p[9] || (p[9] = (A) => o.isPlayVoice = A),
             class: "ml-2",
             "inline-prompt": "",
             "active-text": "语音播报开启",
@@ -18586,7 +18628,7 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
           createElementVNode("div", _hoisted_6, [
             (openBlock(!0), createElementBlock(Fragment, null, renderList(t.value, (c) => (openBlock(), createElementBlock("div", {
               class: "icon-item",
-              onClick: (p) => l(c)
+              onClick: (h) => l(c)
             }, [
               (openBlock(), createElementBlock("svg", _hoisted_8, [
                 createElementVNode("use", {
@@ -18613,33 +18655,33 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
       i.value = !0, setTimeout(() => s.value.focus(), 300);
     }, f = () => {
       if (l.value) {
-        if (n.value.Exists((p) => p == l.value)) {
+        if (n.value.Exists((h) => h == l.value)) {
           alert("已存在标签：" + l.value), l.value = "", s.value.focus();
           return;
         }
         n.value.push(l.value), a("update:modelValue", n.value.join("|")), a("change"), l.value = "", i.value = !1;
       }
-    }, c = (p) => {
-      n.value = n.value.filter((_) => _ != p), a("update:modelValue", n.value.join("|")), a("change");
+    }, c = (h) => {
+      n.value = n.value.filter((_) => _ != h), a("update:modelValue", n.value.join("|")), a("change");
     };
     return watch(
       () => t.modelValue,
-      (p) => {
-        p ? n.value = p.split("|") : n.value = [];
+      (h) => {
+        h ? n.value = h.split("|") : n.value = [];
       }
     ), onMounted(() => {
       try {
         t.modelValue != "" ? n.value = t.modelValue.split("|") : n.value = [];
       } catch {
       }
-    }), (p, _) => (openBlock(), createElementBlock(Fragment, null, [
-      (openBlock(!0), createElementBlock(Fragment, null, renderList(n.value, (h) => (openBlock(), createElementBlock("div", _hoisted_1, [
+    }), (h, _) => (openBlock(), createElementBlock(Fragment, null, [
+      (openBlock(!0), createElementBlock(Fragment, null, renderList(n.value, (d) => (openBlock(), createElementBlock("div", _hoisted_1, [
         createVNode(unref(ElTag), {
           closable: "",
-          onClose: (m) => c(h)
+          onClose: (m) => c(d)
         }, {
           default: withCtx(() => [
-            createTextVNode(toDisplayString(h), 1)
+            createTextVNode(toDisplayString(d), 1)
           ]),
           _: 2
         }, 1032, ["onClose"])
@@ -18650,7 +18692,7 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
         ref: s,
         placeholder: t.placeholder,
         modelValue: l.value,
-        "onUpdate:modelValue": _[0] || (_[0] = (h) => l.value = h),
+        "onUpdate:modelValue": _[0] || (_[0] = (d) => l.value = d),
         onBlur: f,
         onKeypress: withKeys(f, ["enter"]),
         style: { width: "200px" }
@@ -18688,31 +18730,31 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
   },
   emits: ["command", "reportChange"],
   setup(e, { emit: r }) {
-    const t = e, a = ref(""), n = ref({}), i = ref([]), s = ref(""), l = ref(!1), o = r, f = (h, m) => {
-      o("command", h, a.value, m);
+    const t = e, a = ref(""), n = ref({}), i = ref([]), s = ref(""), l = ref(!1), o = r, f = (d, m) => {
+      o("command", d, a.value, m);
     }, c = async () => {
       l.value = !1, await Sleep(10);
-      let h = t.reportArray.FirstOrDefault((m) => m.Name == a.value);
-      i.value = h.ColumnArray, s.value = h.Url, l.value = !0, o("reportChange", h);
-    }, p = computed({
+      let d = t.reportArray.FirstOrDefault((m) => m.Name == a.value);
+      i.value = d.ColumnArray, s.value = d.Url, l.value = !0, o("reportChange", d);
+    }, h = computed({
       get: () => `${n.value.OrganName}${a.value}`
     }), _ = computed({
       get: () => {
-        var h = {
+        var d = {
           FootArray: [`${L("制单人")}：${n.value.NickName}`],
           TitleArray: [`${t.searchParam.BeginTime} - ${t.searchParam.EndTime}`]
         };
-        return h;
+        return d;
       }
     });
     return onMounted(() => {
       nextTick(() => {
         t.reportArray.length > 0 && (a.value = t.reportArray[0].Name), c();
       }), n.value = JSON.parse(sessionStorage.getItem("ManagerInfo"));
-    }), (h, m) => l.value ? (openBlock(), createBlock(reportIndex, {
+    }), (d, m) => l.value ? (openBlock(), createBlock(reportIndex, {
       key: 0,
       url: s.value,
-      tabName: p.value,
+      tabName: h.value,
       loadData: !1,
       columnArray: i.value,
       onCommand: f,
@@ -18722,7 +18764,7 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
       toolWidth: t.toolWidth
     }, {
       FilterItem: withCtx(() => [
-        renderSlot(h.$slots, "FilterItem", {}, void 0, !0),
+        renderSlot(d.$slots, "FilterItem", {}, void 0, !0),
         createVNode(unref(ElFormItem), { label: "统计日期范围" }, {
           default: withCtx(() => [
             createVNode(byDatePicker, {
@@ -18783,13 +18825,13 @@ const _hoisted_1$a = { style: "width: 100%;height:100%;border:1px solid #ccc" },
       if (typeof o == "string") return o;
       if (o.Name) return o.Name;
     }, l = (o, f, c) => {
-      let p = t.reportArray.FirstOrDefault((h) => h.Name == f);
-      if (p == null) return;
-      let _ = p.getDetailParam(c);
+      let h = t.reportArray.FirstOrDefault((d) => d.Name == f);
+      if (h == null) return;
+      let _ = h.getDetailParam(c);
       i.value = {};
-      for (let h in _)
-        i.value[h] = _[h];
-      for (let h in t.searchParam) i.value[h] = t.searchParam[h];
+      for (let d in _)
+        i.value[d] = _[d];
+      for (let d in t.searchParam) i.value[d] = t.searchParam[d];
       n.value = o, nextTick(() => {
         a("change", o, f);
       });
@@ -18897,7 +18939,7 @@ function registComponent(e, r) {
   e.component("PageIndex", PageIndex);
 }
 typeof window < "u" && window.Vue && registComponent(window.Vue);
-const ByRichTextEdit = _sfc_main$f, ByPrintArray = _sfc_main$k, ByDatePicker = byDatePicker, ByUploadPic = byUploadPic, ByQrcode = byQrcode, SafeCall = vueHelper.SafeCall, DebugPrint = vueHelper.DebugPrint, PowerButton = _sfc_main$b, BySelectIco = bySelectIco, PowerIFrame = _sfc_main$c, ByInputTags = byInputTags, ReportIndex = reportIndex, PrintTick = vueHelper.PrintTick, ByIdentityInput = _sfc_main$a, ByConfirmOrder = byConfirmOrder, UserCardTypeEnum = vueHelper.UserCardTypeEnum, ByDataList = DataList, ByDialog = byDialog, ByNetworkMonitor = byNetworkMonitor, ByTotalReport = totalReport, ByAreaSelect = _sfc_main, pcui = {
+const ByRichTextEdit = _sfc_main$h, ByPrintArray = _sfc_main$m, ByDatePicker = byDatePicker, ByUploadPic = _sfc_main$e, ByQrcode = byQrcode, SafeCall = vueHelper.SafeCall, DebugPrint = vueHelper.DebugPrint, PowerButton = _sfc_main$b, BySelectIco = bySelectIco, PowerIFrame = _sfc_main$c, ByInputTags = byInputTags, ReportIndex = reportIndex, PrintTick = vueHelper.PrintTick, ByIdentityInput = _sfc_main$a, ByConfirmOrder = byConfirmOrder, UserCardTypeEnum = vueHelper.UserCardTypeEnum, ByDataList = DataList, ByDialog = byDialog, ByNetworkMonitor = byNetworkMonitor, ByTotalReport = totalReport, ByAreaSelect = _sfc_main, pcui = {
   install: registComponent
 };
 export {