@indfnd/common 1.0.117 → 1.0.118

package/dist/ind-common.es.js

@@ -1,5 +1,5 @@
 import { Button as Button$1, ButtonGroup as ButtonGroup$1, Input, Drawer as Drawer$1, Dropdown as Dropdown$1, Modal as Modal$1, Form, FormItem, Select as Select$1, Option, Row, Col, Menu, MenuItem, Submenu, Badge, DropdownMenu, DropdownItem, Tag, Header, Layout, Content, Spin, Poptip as Poptip$1, CheckboxGroup, Checkbox, RadioGroup, Radio, Card, Message, LoadingBar } from "view-design";
-import { isNil, putOssFileApi, formatDate as formatDate$1, useConfig, getQuarterNum, formatQuarter, str2Date, isDate, isArray, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, axios, getPreviewUrlApi, isFunction, isString, uuid, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, on, off, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, getPermissionCache, getLocalStorage, getSessionStorage, listItemTreeApi, getPriceInfo, MIME_TYPE, base64ToBlob, isEqual, getCaptchaURL, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getToken, putOssFileUrl, getOssFileUrl, responseInterceptors, listComTreeApi, listUserTreeApi, UC_ENUM, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, setSessionStorage, getAppListApi, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi, getIndexDescCache, listIndexDescApi, setIndexDescCache } from "@indfnd/utils";
+import { isNil, getSessionStorage, putOssFileApi, formatDate as formatDate$1, useConfig, getQuarterNum, formatQuarter, str2Date, isDate, isArray, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, axios, getPreviewUrlApi, isFunction, isString, uuid, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, on, off, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, getPermissionCache, getLocalStorage, listItemTreeApi, getPriceInfo, MIME_TYPE, base64ToBlob, isEqual, getCaptchaURL, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getToken, putOssFileUrl, getOssFileUrl, responseInterceptors, listComTreeApi, listUserTreeApi, UC_ENUM, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, setSessionStorage, getAppListApi, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi, getIndexDescCache, listIndexDescApi, setIndexDescCache } from "@indfnd/utils";
 import Vue$1 from "vue";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 function getAugmentedNamespace(n) {
@@ -5460,7 +5460,7 @@ var lodash = { exports: {} };
 })(lodash, lodash.exports);
 var _ = lodash.exports;
 const name$1 = "@indfnd/common";
-const version = "1.0.116";
+const version = "1.0.117";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -42989,6 +42989,369 @@ function recursive_children(paramData, result) {
     }
   }
 }
+var FileSaver_min = { exports: {} };
+(function(module2, exports2) {
+  (function(a, b) {
+    b();
+  })(commonjsGlobal, function() {
+    function b(a2, b2) {
+      return "undefined" == typeof b2 ? b2 = { autoBom: false } : "object" != typeof b2 && (console.warn("Deprecated: Expected third argument to be a object"), b2 = { autoBom: !b2 }), b2.autoBom && /^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(a2.type) ? new Blob(["\uFEFF", a2], { type: a2.type }) : a2;
+    }
+    function c(a2, b2, c2) {
+      var d2 = new XMLHttpRequest();
+      d2.open("GET", a2), d2.responseType = "blob", d2.onload = function() {
+        g(d2.response, b2, c2);
+      }, d2.onerror = function() {
+        console.error("could not download file");
+      }, d2.send();
+    }
+    function d(a2) {
+      var b2 = new XMLHttpRequest();
+      b2.open("HEAD", a2, false);
+      try {
+        b2.send();
+      } catch (a3) {
+      }
+      return 200 <= b2.status && 299 >= b2.status;
+    }
+    function e(a2) {
+      try {
+        a2.dispatchEvent(new MouseEvent("click"));
+      } catch (c2) {
+        var b2 = document.createEvent("MouseEvents");
+        b2.initMouseEvent("click", true, true, window, 0, 0, 0, 80, 20, false, false, false, false, 0, null), a2.dispatchEvent(b2);
+      }
+    }
+    var f = "object" == typeof window && window.window === window ? window : "object" == typeof self && self.self === self ? self : "object" == typeof commonjsGlobal && commonjsGlobal.global === commonjsGlobal ? commonjsGlobal : void 0, a = f.navigator && /Macintosh/.test(navigator.userAgent) && /AppleWebKit/.test(navigator.userAgent) && !/Safari/.test(navigator.userAgent), g = f.saveAs || ("object" != typeof window || window !== f ? function() {
+    } : "download" in HTMLAnchorElement.prototype && !a ? function(b2, g2, h) {
+      var i = f.URL || f.webkitURL, j = document.createElement("a");
+      g2 = g2 || b2.name || "download", j.download = g2, j.rel = "noopener", "string" == typeof b2 ? (j.href = b2, j.origin === location.origin ? e(j) : d(j.href) ? c(b2, g2, h) : e(j, j.target = "_blank")) : (j.href = i.createObjectURL(b2), setTimeout(function() {
+        i.revokeObjectURL(j.href);
+      }, 4e4), setTimeout(function() {
+        e(j);
+      }, 0));
+    } : "msSaveOrOpenBlob" in navigator ? function(f2, g2, h) {
+      if (g2 = g2 || f2.name || "download", "string" != typeof f2)
+        navigator.msSaveOrOpenBlob(b(f2, h), g2);
+      else if (d(f2))
+        c(f2, g2, h);
+      else {
+        var i = document.createElement("a");
+        i.href = f2, i.target = "_blank", setTimeout(function() {
+          e(i);
+        });
+      }
+    } : function(b2, d2, e2, g2) {
+      if (g2 = g2 || open("", "_blank"), g2 && (g2.document.title = g2.document.body.innerText = "downloading..."), "string" == typeof b2)
+        return c(b2, d2, e2);
+      var h = "application/octet-stream" === b2.type, i = /constructor/i.test(f.HTMLElement) || f.safari, j = /CriOS\/[\d]+/.test(navigator.userAgent);
+      if ((j || h && i || a) && "undefined" != typeof FileReader) {
+        var k = new FileReader();
+        k.onloadend = function() {
+          var a2 = k.result;
+          a2 = j ? a2 : a2.replace(/^data:[^;]*;/, "data:attachment/file;"), g2 ? g2.location.href = a2 : location = a2, g2 = null;
+        }, k.readAsDataURL(b2);
+      } else {
+        var l = f.URL || f.webkitURL, m = l.createObjectURL(b2);
+        g2 ? g2.location = m : location.href = m, g2 = null, setTimeout(function() {
+          l.revokeObjectURL(m);
+        }, 4e4);
+      }
+    });
+    f.saveAs = g.saveAs = g, module2.exports = g;
+  });
+})(FileSaver_min);
+var dayjs_min = { exports: {} };
+(function(module2, exports2) {
+  !function(t2, e) {
+    module2.exports = e();
+  }(commonjsGlobal, function() {
+    var t2 = 1e3, e = 6e4, n = 36e5, r = "millisecond", i = "second", s = "minute", u = "hour", a = "day", o = "week", c = "month", f = "quarter", h = "year", d = "date", l = "Invalid Date", $2 = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/, y = /\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g, M = { name: "en", weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), ordinal: function(t3) {
+      var e2 = ["th", "st", "nd", "rd"], n2 = t3 % 100;
+      return "[" + t3 + (e2[(n2 - 20) % 10] || e2[n2] || e2[0]) + "]";
+    } }, m = function(t3, e2, n2) {
+      var r2 = String(t3);
+      return !r2 || r2.length >= e2 ? t3 : "" + Array(e2 + 1 - r2.length).join(n2) + t3;
+    }, v = { s: m, z: function(t3) {
+      var e2 = -t3.utcOffset(), n2 = Math.abs(e2), r2 = Math.floor(n2 / 60), i2 = n2 % 60;
+      return (e2 <= 0 ? "+" : "-") + m(r2, 2, "0") + ":" + m(i2, 2, "0");
+    }, m: function t3(e2, n2) {
+      if (e2.date() < n2.date())
+        return -t3(n2, e2);
+      var r2 = 12 * (n2.year() - e2.year()) + (n2.month() - e2.month()), i2 = e2.clone().add(r2, c), s2 = n2 - i2 < 0, u2 = e2.clone().add(r2 + (s2 ? -1 : 1), c);
+      return +(-(r2 + (n2 - i2) / (s2 ? i2 - u2 : u2 - i2)) || 0);
+    }, a: function(t3) {
+      return t3 < 0 ? Math.ceil(t3) || 0 : Math.floor(t3);
+    }, p: function(t3) {
+      return { M: c, y: h, w: o, d: a, D: d, h: u, m: s, s: i, ms: r, Q: f }[t3] || String(t3 || "").toLowerCase().replace(/s$/, "");
+    }, u: function(t3) {
+      return void 0 === t3;
+    } }, g = "en", D = {};
+    D[g] = M;
+    var p = "$isDayjsObject", S = function(t3) {
+      return t3 instanceof _2 || !(!t3 || !t3[p]);
+    }, w = function t3(e2, n2, r2) {
+      var i2;
+      if (!e2)
+        return g;
+      if ("string" == typeof e2) {
+        var s2 = e2.toLowerCase();
+        D[s2] && (i2 = s2), n2 && (D[s2] = n2, i2 = s2);
+        var u2 = e2.split("-");
+        if (!i2 && u2.length > 1)
+          return t3(u2[0]);
+      } else {
+        var a2 = e2.name;
+        D[a2] = e2, i2 = a2;
+      }
+      return !r2 && i2 && (g = i2), i2 || !r2 && g;
+    }, O = function(t3, e2) {
+      if (S(t3))
+        return t3.clone();
+      var n2 = "object" == typeof e2 ? e2 : {};
+      return n2.date = t3, n2.args = arguments, new _2(n2);
+    }, b = v;
+    b.l = w, b.i = S, b.w = function(t3, e2) {
+      return O(t3, { locale: e2.$L, utc: e2.$u, x: e2.$x, $offset: e2.$offset });
+    };
+    var _2 = function() {
+      function M2(t3) {
+        this.$L = w(t3.locale, null, true), this.parse(t3), this.$x = this.$x || t3.x || {}, this[p] = true;
+      }
+      var m2 = M2.prototype;
+      return m2.parse = function(t3) {
+        this.$d = function(t4) {
+          var e2 = t4.date, n2 = t4.utc;
+          if (null === e2)
+            return new Date(NaN);
+          if (b.u(e2))
+            return new Date();
+          if (e2 instanceof Date)
+            return new Date(e2);
+          if ("string" == typeof e2 && !/Z$/i.test(e2)) {
+            var r2 = e2.match($2);
+            if (r2) {
+              var i2 = r2[2] - 1 || 0, s2 = (r2[7] || "0").substring(0, 3);
+              return n2 ? new Date(Date.UTC(r2[1], i2, r2[3] || 1, r2[4] || 0, r2[5] || 0, r2[6] || 0, s2)) : new Date(r2[1], i2, r2[3] || 1, r2[4] || 0, r2[5] || 0, r2[6] || 0, s2);
+            }
+          }
+          return new Date(e2);
+        }(t3), this.init();
+      }, m2.init = function() {
+        var t3 = this.$d;
+        this.$y = t3.getFullYear(), this.$M = t3.getMonth(), this.$D = t3.getDate(), this.$W = t3.getDay(), this.$H = t3.getHours(), this.$m = t3.getMinutes(), this.$s = t3.getSeconds(), this.$ms = t3.getMilliseconds();
+      }, m2.$utils = function() {
+        return b;
+      }, m2.isValid = function() {
+        return !(this.$d.toString() === l);
+      }, m2.isSame = function(t3, e2) {
+        var n2 = O(t3);
+        return this.startOf(e2) <= n2 && n2 <= this.endOf(e2);
+      }, m2.isAfter = function(t3, e2) {
+        return O(t3) < this.startOf(e2);
+      }, m2.isBefore = function(t3, e2) {
+        return this.endOf(e2) < O(t3);
+      }, m2.$g = function(t3, e2, n2) {
+        return b.u(t3) ? this[e2] : this.set(n2, t3);
+      }, m2.unix = function() {
+        return Math.floor(this.valueOf() / 1e3);
+      }, m2.valueOf = function() {
+        return this.$d.getTime();
+      }, m2.startOf = function(t3, e2) {
+        var n2 = this, r2 = !!b.u(e2) || e2, f2 = b.p(t3), l2 = function(t4, e3) {
+          var i2 = b.w(n2.$u ? Date.UTC(n2.$y, e3, t4) : new Date(n2.$y, e3, t4), n2);
+          return r2 ? i2 : i2.endOf(a);
+        }, $3 = function(t4, e3) {
+          return b.w(n2.toDate()[t4].apply(n2.toDate("s"), (r2 ? [0, 0, 0, 0] : [23, 59, 59, 999]).slice(e3)), n2);
+        }, y2 = this.$W, M3 = this.$M, m3 = this.$D, v2 = "set" + (this.$u ? "UTC" : "");
+        switch (f2) {
+          case h:
+            return r2 ? l2(1, 0) : l2(31, 11);
+          case c:
+            return r2 ? l2(1, M3) : l2(0, M3 + 1);
+          case o:
+            var g2 = this.$locale().weekStart || 0, D2 = (y2 < g2 ? y2 + 7 : y2) - g2;
+            return l2(r2 ? m3 - D2 : m3 + (6 - D2), M3);
+          case a:
+          case d:
+            return $3(v2 + "Hours", 0);
+          case u:
+            return $3(v2 + "Minutes", 1);
+          case s:
+            return $3(v2 + "Seconds", 2);
+          case i:
+            return $3(v2 + "Milliseconds", 3);
+          default:
+            return this.clone();
+        }
+      }, m2.endOf = function(t3) {
+        return this.startOf(t3, false);
+      }, m2.$set = function(t3, e2) {
+        var n2, o2 = b.p(t3), f2 = "set" + (this.$u ? "UTC" : ""), l2 = (n2 = {}, n2[a] = f2 + "Date", n2[d] = f2 + "Date", n2[c] = f2 + "Month", n2[h] = f2 + "FullYear", n2[u] = f2 + "Hours", n2[s] = f2 + "Minutes", n2[i] = f2 + "Seconds", n2[r] = f2 + "Milliseconds", n2)[o2], $3 = o2 === a ? this.$D + (e2 - this.$W) : e2;
+        if (o2 === c || o2 === h) {
+          var y2 = this.clone().set(d, 1);
+          y2.$d[l2]($3), y2.init(), this.$d = y2.set(d, Math.min(this.$D, y2.daysInMonth())).$d;
+        } else
+          l2 && this.$d[l2]($3);
+        return this.init(), this;
+      }, m2.set = function(t3, e2) {
+        return this.clone().$set(t3, e2);
+      }, m2.get = function(t3) {
+        return this[b.p(t3)]();
+      }, m2.add = function(r2, f2) {
+        var d2, l2 = this;
+        r2 = Number(r2);
+        var $3 = b.p(f2), y2 = function(t3) {
+          var e2 = O(l2);
+          return b.w(e2.date(e2.date() + Math.round(t3 * r2)), l2);
+        };
+        if ($3 === c)
+          return this.set(c, this.$M + r2);
+        if ($3 === h)
+          return this.set(h, this.$y + r2);
+        if ($3 === a)
+          return y2(1);
+        if ($3 === o)
+          return y2(7);
+        var M3 = (d2 = {}, d2[s] = e, d2[u] = n, d2[i] = t2, d2)[$3] || 1, m3 = this.$d.getTime() + r2 * M3;
+        return b.w(m3, this);
+      }, m2.subtract = function(t3, e2) {
+        return this.add(-1 * t3, e2);
+      }, m2.format = function(t3) {
+        var e2 = this, n2 = this.$locale();
+        if (!this.isValid())
+          return n2.invalidDate || l;
+        var r2 = t3 || "YYYY-MM-DDTHH:mm:ssZ", i2 = b.z(this), s2 = this.$H, u2 = this.$m, a2 = this.$M, o2 = n2.weekdays, c2 = n2.months, f2 = n2.meridiem, h2 = function(t4, n3, i3, s3) {
+          return t4 && (t4[n3] || t4(e2, r2)) || i3[n3].slice(0, s3);
+        }, d2 = function(t4) {
+          return b.s(s2 % 12 || 12, t4, "0");
+        }, $3 = f2 || function(t4, e3, n3) {
+          var r3 = t4 < 12 ? "AM" : "PM";
+          return n3 ? r3.toLowerCase() : r3;
+        };
+        return r2.replace(y, function(t4, r3) {
+          return r3 || function(t5) {
+            switch (t5) {
+              case "YY":
+                return String(e2.$y).slice(-2);
+              case "YYYY":
+                return b.s(e2.$y, 4, "0");
+              case "M":
+                return a2 + 1;
+              case "MM":
+                return b.s(a2 + 1, 2, "0");
+              case "MMM":
+                return h2(n2.monthsShort, a2, c2, 3);
+              case "MMMM":
+                return h2(c2, a2);
+              case "D":
+                return e2.$D;
+              case "DD":
+                return b.s(e2.$D, 2, "0");
+              case "d":
+                return String(e2.$W);
+              case "dd":
+                return h2(n2.weekdaysMin, e2.$W, o2, 2);
+              case "ddd":
+                return h2(n2.weekdaysShort, e2.$W, o2, 3);
+              case "dddd":
+                return o2[e2.$W];
+              case "H":
+                return String(s2);
+              case "HH":
+                return b.s(s2, 2, "0");
+              case "h":
+                return d2(1);
+              case "hh":
+                return d2(2);
+              case "a":
+                return $3(s2, u2, true);
+              case "A":
+                return $3(s2, u2, false);
+              case "m":
+                return String(u2);
+              case "mm":
+                return b.s(u2, 2, "0");
+              case "s":
+                return String(e2.$s);
+              case "ss":
+                return b.s(e2.$s, 2, "0");
+              case "SSS":
+                return b.s(e2.$ms, 3, "0");
+              case "Z":
+                return i2;
+            }
+            return null;
+          }(t4) || i2.replace(":", "");
+        });
+      }, m2.utcOffset = function() {
+        return 15 * -Math.round(this.$d.getTimezoneOffset() / 15);
+      }, m2.diff = function(r2, d2, l2) {
+        var $3, y2 = this, M3 = b.p(d2), m3 = O(r2), v2 = (m3.utcOffset() - this.utcOffset()) * e, g2 = this - m3, D2 = function() {
+          return b.m(y2, m3);
+        };
+        switch (M3) {
+          case h:
+            $3 = D2() / 12;
+            break;
+          case c:
+            $3 = D2();
+            break;
+          case f:
+            $3 = D2() / 3;
+            break;
+          case o:
+            $3 = (g2 - v2) / 6048e5;
+            break;
+          case a:
+            $3 = (g2 - v2) / 864e5;
+            break;
+          case u:
+            $3 = g2 / n;
+            break;
+          case s:
+            $3 = g2 / e;
+            break;
+          case i:
+            $3 = g2 / t2;
+            break;
+          default:
+            $3 = g2;
+        }
+        return l2 ? $3 : b.a($3);
+      }, m2.daysInMonth = function() {
+        return this.endOf(c).$D;
+      }, m2.$locale = function() {
+        return D[this.$L];
+      }, m2.locale = function(t3, e2) {
+        if (!t3)
+          return this.$L;
+        var n2 = this.clone(), r2 = w(t3, e2, true);
+        return r2 && (n2.$L = r2), n2;
+      }, m2.clone = function() {
+        return b.w(this.$d, this);
+      }, m2.toDate = function() {
+        return new Date(this.valueOf());
+      }, m2.toJSON = function() {
+        return this.isValid() ? this.toISOString() : null;
+      }, m2.toISOString = function() {
+        return this.$d.toISOString();
+      }, m2.toString = function() {
+        return this.$d.toUTCString();
+      }, M2;
+    }(), k = _2.prototype;
+    return O.prototype = k, [["$ms", r], ["$s", i], ["$m", s], ["$H", u], ["$W", a], ["$M", c], ["$y", h], ["$D", d]].forEach(function(t3) {
+      k[t3[1]] = function(e2) {
+        return this.$g(e2, t3[0], t3[1]);
+      };
+    }), O.extend = function(t3, e2) {
+      return t3.$i || (t3(e2, _2, O), t3.$i = true), O;
+    }, O.locale = w, O.isDayjs = S, O.unix = function(t3) {
+      return O(1e3 * t3);
+    }, O.en = D[g], O.Ls = D, O.p = {}, O;
+  });
+})(dayjs_min);
+var dayjs = dayjs_min.exports;
 const titleStyle = {
   bold: true,
   fontSize: "14",
@@ -43346,127 +43709,339 @@ function initRowSpanInfosNew(options) {
   }
 }
 function exportJsonToExcel(excelData) {
-  var calcExportDatas = getAgColumnTitleAndData(excelData);
-  console.log("calcExportDatas", calcExportDatas);
-  var title = excelData.title;
-  var titleDeepth = calcExportDatas.deepth;
-  var columnAlign = excelData.columnAlign || calcExportDatas.columnAlign;
-  var columnType = excelData.columnType || calcExportDatas.columnType;
-  var columnTitle = calcExportDatas.columnTitle;
-  var columnWidth = excelData.columnWidth || calcExportDatas.columnWidth;
-  var columnCount = columnAlign.length;
-  var paramLeft = excelData.paramLeft;
-  var paramRight = excelData.paramRight;
-  var jsonData = calcExportDatas.exportData;
-  var numberFormat = excelData.numberFormat || calcExportDatas.numberFormat;
-  XlsxPopulate.fromBlankAsync().then((workbook) => {
-    var sheet = workbook.sheet("Sheet1");
+  try {
+    if (!excelData || !excelData.title) {
+      throw new Error("\u5BFC\u51FAExcel\u5931\u8D25: \u7F3A\u5C11\u5FC5\u8981\u7684\u5BFC\u51FA\u6570\u636E");
+    }
+    var calcExportDatas = getAgColumnTitleAndData(excelData);
+    var title = excelData.title;
+    var titleDeepth = calcExportDatas.deepth;
+    var columnAlign = excelData.columnAlign || calcExportDatas.columnAlign;
+    var columnType = excelData.columnType || calcExportDatas.columnType;
+    var columnTitle = calcExportDatas.columnTitle;
+    var columnWidth = excelData.columnWidth || calcExportDatas.columnWidth;
+    var columnCount = columnAlign.length;
+    var paramLeft = excelData.paramLeft;
+    var paramRight = excelData.paramRight;
+    var jsonData = calcExportDatas.exportData;
+    var numberFormat = excelData.numberFormat || calcExportDatas.numberFormat;
+    const workbook = new ExcelJS.Workbook();
+    const worksheet = workbook.addWorksheet("Sheet1");
     for (var i = 0; i < columnCount; i++) {
-      sheet.column(i + 1).width(columnWidth[i] == 0 ? 10 : columnWidth[i]);
+      worksheet.getColumn(i + 1).width = columnWidth[i] == 0 ? 10 : columnWidth[i];
     }
-    var titleRange = sheet.range(1, 1, 1, columnCount);
-    titleRange.merged(true);
-    titleRange.style(titleStyle);
-    titleRange.cell(0, 0).value(title);
-    sheet.row(1).height(titleHeight);
+    const titleStyle2 = {
+      font: { name: "\u5B8B\u4F53", size: 16, bold: true },
+      alignment: { vertical: "middle", horizontal: "center" }
+    };
+    const paramLeftStyle2 = {
+      font: { name: "\u5B8B\u4F53", size: 10 },
+      alignment: { vertical: "middle", horizontal: "left" }
+    };
+    const paramRightStyle2 = {
+      font: { name: "\u5B8B\u4F53", size: 10 },
+      alignment: { vertical: "middle", horizontal: "right" }
+    };
+    const columnTitleStyle2 = {
+      font: { name: "\u5B8B\u4F53", size: 10, bold: true },
+      alignment: { vertical: "middle", horizontal: "center" },
+      border: {
+        top: { style: "thin" },
+        left: { style: "thin" },
+        bottom: { style: "thin" },
+        right: { style: "thin" }
+      },
+      fill: {
+        type: "pattern",
+        pattern: "solid",
+        fgColor: { argb: "bdc3c7" }
+      }
+    };
+    const dataCellStyle2 = {
+      font: { name: "\u5B8B\u4F53", size: 10 },
+      alignment: { vertical: "middle" },
+      border: {
+        top: { style: "thin" },
+        left: { style: "thin" },
+        bottom: { style: "thin" },
+        right: { style: "thin" }
+      }
+    };
+    var titleHeight2 = 30;
+    var paramHeight2 = 25;
+    var columnTitleHeight2 = 25;
+    var dataRowHeight2 = 22;
+    const titleRow = worksheet.getRow(1);
+    titleRow.height = titleHeight2;
+    titleRow.getCell(1).value = title;
+    titleRow.getCell(1).style = titleStyle2;
+    worksheet.mergeCells(1, 1, 1, columnCount);
     var rowsNow = 2;
     if (!!excelData.paramLeft || !!excelData.paramRight) {
-      var paramLeftRange = sheet.range(2, 1, 2, Math.round(columnCount / 2));
-      paramLeftRange.cell(0, 0).value(paramLeft || "");
-      paramLeftRange.merged(true);
-      paramLeftRange.style(paramLeftStyle);
-      var paramRightRange = sheet.range(2, Math.round(columnCount / 2) + 1, 2, columnCount);
-      paramRightRange.cell(0, 0).value(paramRight || "");
-      paramRightRange.merged(true);
-      paramRightRange.style(paramRightStyle);
-      sheet.row(2).height(paramHeight);
+      const paramRow = worksheet.getRow(2);
+      paramRow.height = paramHeight2;
+      paramRow.getCell(1).value = paramLeft || "";
+      paramRow.getCell(1).style = paramLeftStyle2;
+      worksheet.mergeCells(2, 1, 2, Math.round(columnCount / 2));
+      paramRow.getCell(Math.round(columnCount / 2) + 1).value = paramRight || "";
+      paramRow.getCell(Math.round(columnCount / 2) + 1).style = paramRightStyle2;
+      worksheet.mergeCells(2, Math.round(columnCount / 2) + 1, 2, columnCount);
       rowsNow += 1;
     }
     columnTitle.forEach((d) => {
-      var _a;
-      var columnTitleRange = sheet.range(
-        d.srow + rowsNow - 1,
-        d.scol,
-        d.erow + rowsNow - 1,
-        d.ecol
-      );
-      columnTitleRange.merged(true);
-      columnTitleRange.style(columnTitleStyle);
-      columnTitleRange.cell(0, 0).value((_a = d.text) == null ? void 0 : _a.replace(/<br\/>/g, ""));
+      const srow = d.srow + rowsNow - 1;
+      const scol = d.scol;
+      const erow = d.erow + rowsNow - 1;
+      const ecol = d.ecol;
+      worksheet.mergeCells(srow, scol, erow, ecol);
+      const cell = worksheet.getCell(srow, scol);
+      cell.value = d.text && d.text.replace(/<br\/>/g, "");
+      cell.style = columnTitleStyle2;
+      applyBorderToMergedCell(worksheet, srow, scol, erow, ecol, columnTitleStyle2.border);
     });
     for (let i2 = 0; i2 < titleDeepth; i2++) {
-      sheet.row(rowsNow + i2).height(columnTitleHeight);
+      worksheet.getRow(rowsNow + i2).height = columnTitleHeight2;
     }
     rowsNow += titleDeepth;
+    const mergedCells = /* @__PURE__ */ new Set();
+    const columnsCalc = calcExportDatas.columnsCalc;
     for (var i = 0; i < jsonData.length; i++) {
       var lineData = jsonData[i];
+      const tableData = excelData.datas[i];
       for (var j = 0; j < lineData.length; j++) {
-        if (columnType[j] === "p" && lineData[j]) {
-          sheet.cell(rowsNow + i, j + 1).value(parseFloat(lineData[j] / 100));
-          dataCellStyle.numberFormat = numberFormat[j];
-        } else if (columnType[j] === "n" && lineData[j]) {
-          sheet.cell(rowsNow + i, j + 1).value(parseFloat(lineData[j]));
-          dataCellStyle.numberFormat = numberFormat[j];
-        } else if (columnType[j] === "s" && lineData[j]) {
-          sheet.cell(rowsNow + i, j + 1).value(lineData[j]);
-          dataCellStyle.numberFormat = "";
-        } else {
-          if (columnType[j] === "p" || columnType[j] === "n") {
-            dataCellStyle.numberFormat = numberFormat[j];
-          } else {
-            sheet.cell(rowsNow + i, j + 1).value("");
+        try {
+          const rowSpan = tableData.rowSpan || 1;
+          const colSpan = tableData.colSpan || 1;
+          const cellKey = `${rowsNow + i}-${j + 1}`;
+          if (!mergedCells.has(cellKey) && (rowSpan > 1 || colSpan > 1) && columnsCalc[j].rowSpan) {
+            const mergeEndRow = rowsNow + i + rowSpan - 1;
+            const mergeEndCol = j + 1 + colSpan - 1;
+            if (mergeEndRow < rowsNow + jsonData.length && mergeEndCol <= columnCount) {
+              worksheet.mergeCells(rowsNow + i, j + 1, mergeEndRow, mergeEndCol);
+              if (columnType[j] === "s") {
+                if (lineData[j] === "0") {
+                  worksheet.getCell(rowsNow + i, j + 1).value = 0;
+                } else if (lineData[j] !== void 0 && lineData[j] !== null) {
+                  const safeValue = typeof lineData[j].value === "string" ? lineData[j].value.replace(/[\u2028\u2029]/g, " ") : lineData[j].value;
+                  worksheet.getCell(rowsNow + i, j + 1).value = safeValue;
+                } else {
+                  worksheet.getCell(rowsNow + i, j + 1).value = "";
+                }
+                dataCellStyle2.numFmt = "";
+              } else if (columnType[j] === "n" && lineData[j]) {
+                const numericValue = typeof lineData[j].value === "string" ? parseFloat(lineData[j].value.replace(/,/g, "")) : lineData[j].value;
+                worksheet.getCell(rowsNow + i, j + 1).value = isNaN(numericValue) ? 0 : numericValue;
+                dataCellStyle2.numFmt = numberFormat[j];
+              } else {
+                worksheet.getCell(rowsNow + i, j + 1).value = "";
+              }
+              if (lineData[j] && lineData[j].formula) {
+                try {
+                  if (/^[A-Za-z]+\(.*\)$/.test(lineData[j].formula)) {
+                    worksheet.getCell(rowsNow + i, j + 1).value = { formula: lineData[j].formula };
+                  } else {
+                    console.warn(
+                      `\u65E0\u6548\u516C\u5F0F: ${lineData[j].formula}\uFF0C\u4F4D\u4E8E\u7B2C ${i + 1} \u884C\uFF0C\u7B2C ${j + 1} \u5217`
+                    );
+                    worksheet.getCell(rowsNow + i, j + 1).value = "#FORMULA_ERROR";
+                  }
+                } catch (e) {
+                  console.error(`\u8BBE\u7F6E\u516C\u5F0F\u65F6\u51FA\u9519: ${e.message}\uFF0C\u516C\u5F0F\u5185\u5BB9: ${lineData[j].formula}`);
+                  worksheet.getCell(rowsNow + i, j + 1).value = "#ERROR!";
+                }
+              }
+              dataCellStyle2.alignment.horizontal = columnAlign[j];
+              worksheet.getCell(rowsNow + i, j + 1).style = dataCellStyle2;
+              for (let r = 0; r < rowSpan; r++) {
+                for (let c = 0; c < colSpan; c++) {
+                  mergedCells.add(`${rowsNow + i + r}-${j + 1 + c}`);
+                }
+              }
+              applyBorderToMergedCell(
+                worksheet,
+                rowsNow + i,
+                j + 1,
+                mergeEndRow,
+                mergeEndCol,
+                dataCellStyle2.border
+              );
+            }
           }
+          if (!mergedCells.has(cellKey)) {
+            if (columnType[j] === "s") {
+              if (lineData[j] === "0") {
+                worksheet.getCell(rowsNow + i, j + 1).value = 0;
+              } else if (lineData[j] !== void 0 && lineData[j] !== null) {
+                const safeValue = typeof lineData[j].value === "string" ? lineData[j].value.replace(/[\u2028\u2029]/g, " ") : lineData[j].value;
+                worksheet.getCell(rowsNow + i, j + 1).value = safeValue;
+              } else {
+                worksheet.getCell(rowsNow + i, j + 1).value = "";
+              }
+              dataCellStyle2.numFmt = "";
+            } else if (columnType[j] === "n" && lineData[j]) {
+              const numericValue = typeof lineData[j].value === "string" ? parseFloat(lineData[j].value.replace(/,/g, "")) : lineData[j].value;
+              worksheet.getCell(rowsNow + i, j + 1).value = isNaN(numericValue) ? 0 : numericValue;
+              dataCellStyle2.numFmt = numberFormat[j];
+            } else {
+              worksheet.getCell(rowsNow + i, j + 1).value = "";
+            }
+            if (lineData[j] && lineData[j].formula) {
+              try {
+                if (/^[A-Za-z]+\(.*\)$/.test(lineData[j].formula)) {
+                  worksheet.getCell(rowsNow + i, j + 1).value = { formula: lineData[j].formula };
+                } else {
+                  console.warn(
+                    `\u65E0\u6548\u516C\u5F0F: ${lineData[j].formula}\uFF0C\u4F4D\u4E8E\u7B2C ${i + 1} \u884C\uFF0C\u7B2C ${j + 1} \u5217`
+                  );
+                  worksheet.getCell(rowsNow + i, j + 1).value = "#FORMULA_ERROR";
+                }
+              } catch (e) {
+                console.error(`\u8BBE\u7F6E\u516C\u5F0F\u65F6\u51FA\u9519: ${e.message}\uFF0C\u516C\u5F0F\u5185\u5BB9: ${lineData[j].formula}`);
+                worksheet.getCell(rowsNow + i, j + 1).value = "#ERROR!";
+              }
+            }
+            worksheet.getCell(rowsNow + i, j + 1).border = dataCellStyle2.border;
+          }
+        } catch (cellError) {
+          console.error(`\u5904\u7406\u5355\u5143\u683C\u6570\u636E\u65F6\u51FA\u9519 (\u884C: ${i + 1}, \u5217: ${j + 1}):`, cellError);
+          worksheet.getCell(rowsNow + i, j + 1).value = "#CELL_ERROR";
         }
-        dataCellStyle.horizontalAlignment = columnAlign[j];
-        sheet.cell(rowsNow + i, j + 1).style(dataCellStyle);
       }
       if (excelData.rowColor && i % 2 != 0) {
-        var row = sheet.range(rowsNow + i, 1, rowsNow + i, columnCount);
-        row.style({ fill: "f8f8f9" });
+        for (let j2 = 1; j2 <= columnCount; j2++) {
+          worksheet.getCell(rowsNow + i, j2).style.fill = {
+            type: "pattern",
+            pattern: "solid",
+            fgColor: { argb: "F8F8F9" }
+          };
+        }
       }
-      sheet.row(rowsNow + i).height(dataRowHeight);
+      worksheet.getRow(rowsNow + i).height = dataRowHeight2;
     }
     if (!!excelData.rowSpanDefs) {
-      initRowSpanInfosNew({ ...excelData, columns: calcExportDatas.columnsCalc });
-      _.forEach(rowSpanExcelInfos, function(rowSpanInfo) {
-        var columnTitleRange = sheet.range(
-          rowSpanInfo.mergeRowS + rowsNow,
-          rowSpanInfo.megerColS + 1,
-          rowSpanInfo.mergeRowE + rowsNow,
-          rowSpanInfo.megerColE + 1
-        );
-        columnTitleRange.merged(true);
-      });
+      try {
+        initRowSpanInfosNew({ ...excelData, columns: calcExportDatas.columnsCalc });
+        _.forEach(rowSpanExcelInfos, function(rowSpanInfo) {
+          const srow = rowSpanInfo.mergeRowS + rowsNow;
+          const scol = rowSpanInfo.megerColS + 1;
+          const erow = rowSpanInfo.mergeRowE + rowsNow;
+          const ecol = rowSpanInfo.megerColE + 1;
+          worksheet.mergeCells(srow, scol, erow, ecol);
+          applyBorderToMergedCell(worksheet, srow, scol, erow, ecol, dataCellStyle2.border);
+        });
+      } catch (spanError) {
+        console.error("\u5408\u5E76\u5355\u5143\u683C\u65F6\u51FA\u9519:", spanError);
+      }
     } else if (!!excelData.rowSpanColumns) {
-      initRowSpanInfos({ ...excelData, columns: calcExportDatas.columnsCalc });
-      _.forEach(rowSpanExcelInfos, function(rowSpanInfo) {
-        var columnTitleRange = sheet.range(
-          rowSpanInfo.mergeRowS + rowsNow,
-          rowSpanInfo.megerColS + 1,
-          rowSpanInfo.mergeRowE + rowsNow,
-          rowSpanInfo.megerColE + 1
-        );
-        columnTitleRange.merged(true);
-      });
+      try {
+        initRowSpanInfos({ ...excelData, columns: calcExportDatas.columnsCalc });
+        _.forEach(rowSpanExcelInfos, function(rowSpanInfo) {
+          const srow = rowSpanInfo.mergeRowS + rowsNow;
+          const scol = rowSpanInfo.megerColS + 1;
+          const erow = rowSpanInfo.mergeRowE + rowsNow;
+          const ecol = rowSpanInfo.megerColE + 1;
+          worksheet.mergeCells(srow, scol, erow, ecol);
+          applyBorderToMergedCell(worksheet, srow, scol, erow, ecol, dataCellStyle2.border);
+        });
+      } catch (spanError) {
+        console.error("\u5408\u5E76\u5355\u5143\u683C\u65F6\u51FA\u9519:", spanError);
+      }
     }
     if (excelData.leftColumns || excelData.topRows) {
-      sheet.freezePanes(excelData.leftColumns || 0, (excelData.topRows || 0) + rowsNow - 1);
-    }
-    workbook.outputAsync().then(function(blob) {
-      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-        window.navigator.msSaveOrOpenBlob(blob, title + ".xlsx");
-      } else {
-        var url = window.URL.createObjectURL(blob);
-        var a = document.createElement("a");
-        document.body.appendChild(a);
-        a.href = url;
-        a.download = title + ".xlsx";
-        a.click();
-        window.URL.revokeObjectURL(url);
-        document.body.removeChild(a);
+      try {
+        worksheet.views = [
+          {
+            xSplit: excelData.leftColumns || 0,
+            ySplit: (excelData.topRows || 0) + rowsNow - 1,
+            state: "frozen"
+          }
+        ];
+      } catch (viewError) {
+        console.error("\u8BBE\u7F6E\u51BB\u7ED3\u7A97\u683C\u65F6\u51FA\u9519:", viewError);
       }
+    }
+    return createWatermarkImage(excelData.watermark).then((imageBase64) => {
+      const imageId = workbook.addImage({
+        base64: imageBase64,
+        extension: "png"
+      });
+      worksheet.addBackgroundImage(imageId);
+      return workbook.xlsx.writeBuffer().then((buffer) => {
+        FileSaver_min.exports.saveAs(
+          new Blob([buffer], {
+            type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+          }),
+          sanitizeFilename(title) + ".xlsx"
+        );
+        return true;
+      }).catch((err) => {
+        console.error("\u5199\u5165Excel\u6587\u4EF6\u65F6\u51FA\u9519:", err);
+        throw new Error("\u5BFC\u51FAExcel\u5931\u8D25: " + err.message);
+      });
     });
-  }).catch((err) => console.log(err));
+  } catch (error) {
+    console.error("\u5BFC\u51FAExcel\u8FC7\u7A0B\u4E2D\u53D1\u751F\u610F\u5916\u9519\u8BEF:", error);
+    throw error;
+  }
+}
+function sanitizeFilename(filename) {
+  return filename.replace(/[\\/:*?"<>|]/g, "_");
+}
+function createWatermarkImage(watermark) {
+  return new Promise((resolve, reject) => {
+    try {
+      const canvas = document.createElement("canvas");
+      const ctx = canvas.getContext("2d");
+      const scale = 2;
+      canvas.width = 1600 * scale;
+      canvas.height = 1200 * scale;
+      ctx.scale(scale, scale);
+      ctx.fillStyle = "rgba(180, 180, 180, 0.3)";
+      ctx.font = "20px Arial";
+      ctx.rotate(-30 * Math.PI / 180);
+      for (let x = -200; x < canvas.width; x += 300) {
+        for (let y = 0; y < canvas.height; y += 200) {
+          const text = watermark ? watermark : (getSessionStorage("userInfo").userName || "") + " " + dayjs().format("YYYYMMDD");
+          ctx.fillText(text, x, y);
+        }
+      }
+      canvas.toBlob((blob) => {
+        const reader = new FileReader();
+        reader.onload = () => {
+          const base64Data = reader.result.split(",")[1];
+          resolve(base64Data);
+        };
+        reader.onerror = () => reject(new Error("Failed to read watermark image"));
+        reader.readAsDataURL(blob);
+      }, "image/png");
+    } catch (error) {
+      console.error("Error creating watermark image:", error);
+      reject(error);
+    }
+  });
+}
+function applyBorderToMergedCell(worksheet, srow, scol, erow, ecol, borderStyle) {
+  for (let row = srow; row <= erow; row++) {
+    for (let col = scol; col <= ecol; col++) {
+      const cell = worksheet.getCell(row, col);
+      if (!cell.border) {
+        cell.border = {
+          top: null,
+          left: null,
+          bottom: null,
+          right: null
+        };
+      }
+      if (row === srow)
+        cell.border.top = borderStyle.top;
+      if (row === erow)
+        cell.border.bottom = borderStyle.bottom;
+      if (col === scol)
+        cell.border.left = borderStyle.left;
+      if (col === ecol)
+        cell.border.right = borderStyle.right;
+    }
+  }
 }
 function previewJsonToExcel(excelData) {
   return new Promise((resolve, reject) => {
@@ -43591,297 +44166,6 @@ function previewJsonToExcel(excelData) {
     });
   });
 }
-var dayjs_min = { exports: {} };
-(function(module2, exports2) {
-  !function(t2, e) {
-    module2.exports = e();
-  }(commonjsGlobal, function() {
-    var t2 = 1e3, e = 6e4, n = 36e5, r = "millisecond", i = "second", s = "minute", u = "hour", a = "day", o = "week", c = "month", f = "quarter", h = "year", d = "date", l = "Invalid Date", $2 = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/, y = /\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g, M = { name: "en", weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), ordinal: function(t3) {
-      var e2 = ["th", "st", "nd", "rd"], n2 = t3 % 100;
-      return "[" + t3 + (e2[(n2 - 20) % 10] || e2[n2] || e2[0]) + "]";
-    } }, m = function(t3, e2, n2) {
-      var r2 = String(t3);
-      return !r2 || r2.length >= e2 ? t3 : "" + Array(e2 + 1 - r2.length).join(n2) + t3;
-    }, v = { s: m, z: function(t3) {
-      var e2 = -t3.utcOffset(), n2 = Math.abs(e2), r2 = Math.floor(n2 / 60), i2 = n2 % 60;
-      return (e2 <= 0 ? "+" : "-") + m(r2, 2, "0") + ":" + m(i2, 2, "0");
-    }, m: function t3(e2, n2) {
-      if (e2.date() < n2.date())
-        return -t3(n2, e2);
-      var r2 = 12 * (n2.year() - e2.year()) + (n2.month() - e2.month()), i2 = e2.clone().add(r2, c), s2 = n2 - i2 < 0, u2 = e2.clone().add(r2 + (s2 ? -1 : 1), c);
-      return +(-(r2 + (n2 - i2) / (s2 ? i2 - u2 : u2 - i2)) || 0);
-    }, a: function(t3) {
-      return t3 < 0 ? Math.ceil(t3) || 0 : Math.floor(t3);
-    }, p: function(t3) {
-      return { M: c, y: h, w: o, d: a, D: d, h: u, m: s, s: i, ms: r, Q: f }[t3] || String(t3 || "").toLowerCase().replace(/s$/, "");
-    }, u: function(t3) {
-      return void 0 === t3;
-    } }, g = "en", D = {};
-    D[g] = M;
-    var p = "$isDayjsObject", S = function(t3) {
-      return t3 instanceof _2 || !(!t3 || !t3[p]);
-    }, w = function t3(e2, n2, r2) {
-      var i2;
-      if (!e2)
-        return g;
-      if ("string" == typeof e2) {
-        var s2 = e2.toLowerCase();
-        D[s2] && (i2 = s2), n2 && (D[s2] = n2, i2 = s2);
-        var u2 = e2.split("-");
-        if (!i2 && u2.length > 1)
-          return t3(u2[0]);
-      } else {
-        var a2 = e2.name;
-        D[a2] = e2, i2 = a2;
-      }
-      return !r2 && i2 && (g = i2), i2 || !r2 && g;
-    }, O = function(t3, e2) {
-      if (S(t3))
-        return t3.clone();
-      var n2 = "object" == typeof e2 ? e2 : {};
-      return n2.date = t3, n2.args = arguments, new _2(n2);
-    }, b = v;
-    b.l = w, b.i = S, b.w = function(t3, e2) {
-      return O(t3, { locale: e2.$L, utc: e2.$u, x: e2.$x, $offset: e2.$offset });
-    };
-    var _2 = function() {
-      function M2(t3) {
-        this.$L = w(t3.locale, null, true), this.parse(t3), this.$x = this.$x || t3.x || {}, this[p] = true;
-      }
-      var m2 = M2.prototype;
-      return m2.parse = function(t3) {
-        this.$d = function(t4) {
-          var e2 = t4.date, n2 = t4.utc;
-          if (null === e2)
-            return new Date(NaN);
-          if (b.u(e2))
-            return new Date();
-          if (e2 instanceof Date)
-            return new Date(e2);
-          if ("string" == typeof e2 && !/Z$/i.test(e2)) {
-            var r2 = e2.match($2);
-            if (r2) {
-              var i2 = r2[2] - 1 || 0, s2 = (r2[7] || "0").substring(0, 3);
-              return n2 ? new Date(Date.UTC(r2[1], i2, r2[3] || 1, r2[4] || 0, r2[5] || 0, r2[6] || 0, s2)) : new Date(r2[1], i2, r2[3] || 1, r2[4] || 0, r2[5] || 0, r2[6] || 0, s2);
-            }
-          }
-          return new Date(e2);
-        }(t3), this.init();
-      }, m2.init = function() {
-        var t3 = this.$d;
-        this.$y = t3.getFullYear(), this.$M = t3.getMonth(), this.$D = t3.getDate(), this.$W = t3.getDay(), this.$H = t3.getHours(), this.$m = t3.getMinutes(), this.$s = t3.getSeconds(), this.$ms = t3.getMilliseconds();
-      }, m2.$utils = function() {
-        return b;
-      }, m2.isValid = function() {
-        return !(this.$d.toString() === l);
-      }, m2.isSame = function(t3, e2) {
-        var n2 = O(t3);
-        return this.startOf(e2) <= n2 && n2 <= this.endOf(e2);
-      }, m2.isAfter = function(t3, e2) {
-        return O(t3) < this.startOf(e2);
-      }, m2.isBefore = function(t3, e2) {
-        return this.endOf(e2) < O(t3);
-      }, m2.$g = function(t3, e2, n2) {
-        return b.u(t3) ? this[e2] : this.set(n2, t3);
-      }, m2.unix = function() {
-        return Math.floor(this.valueOf() / 1e3);
-      }, m2.valueOf = function() {
-        return this.$d.getTime();
-      }, m2.startOf = function(t3, e2) {
-        var n2 = this, r2 = !!b.u(e2) || e2, f2 = b.p(t3), l2 = function(t4, e3) {
-          var i2 = b.w(n2.$u ? Date.UTC(n2.$y, e3, t4) : new Date(n2.$y, e3, t4), n2);
-          return r2 ? i2 : i2.endOf(a);
-        }, $3 = function(t4, e3) {
-          return b.w(n2.toDate()[t4].apply(n2.toDate("s"), (r2 ? [0, 0, 0, 0] : [23, 59, 59, 999]).slice(e3)), n2);
-        }, y2 = this.$W, M3 = this.$M, m3 = this.$D, v2 = "set" + (this.$u ? "UTC" : "");
-        switch (f2) {
-          case h:
-            return r2 ? l2(1, 0) : l2(31, 11);
-          case c:
-            return r2 ? l2(1, M3) : l2(0, M3 + 1);
-          case o:
-            var g2 = this.$locale().weekStart || 0, D2 = (y2 < g2 ? y2 + 7 : y2) - g2;
-            return l2(r2 ? m3 - D2 : m3 + (6 - D2), M3);
-          case a:
-          case d:
-            return $3(v2 + "Hours", 0);
-          case u:
-            return $3(v2 + "Minutes", 1);
-          case s:
-            return $3(v2 + "Seconds", 2);
-          case i:
-            return $3(v2 + "Milliseconds", 3);
-          default:
-            return this.clone();
-        }
-      }, m2.endOf = function(t3) {
-        return this.startOf(t3, false);
-      }, m2.$set = function(t3, e2) {
-        var n2, o2 = b.p(t3), f2 = "set" + (this.$u ? "UTC" : ""), l2 = (n2 = {}, n2[a] = f2 + "Date", n2[d] = f2 + "Date", n2[c] = f2 + "Month", n2[h] = f2 + "FullYear", n2[u] = f2 + "Hours", n2[s] = f2 + "Minutes", n2[i] = f2 + "Seconds", n2[r] = f2 + "Milliseconds", n2)[o2], $3 = o2 === a ? this.$D + (e2 - this.$W) : e2;
-        if (o2 === c || o2 === h) {
-          var y2 = this.clone().set(d, 1);
-          y2.$d[l2]($3), y2.init(), this.$d = y2.set(d, Math.min(this.$D, y2.daysInMonth())).$d;
-        } else
-          l2 && this.$d[l2]($3);
-        return this.init(), this;
-      }, m2.set = function(t3, e2) {
-        return this.clone().$set(t3, e2);
-      }, m2.get = function(t3) {
-        return this[b.p(t3)]();
-      }, m2.add = function(r2, f2) {
-        var d2, l2 = this;
-        r2 = Number(r2);
-        var $3 = b.p(f2), y2 = function(t3) {
-          var e2 = O(l2);
-          return b.w(e2.date(e2.date() + Math.round(t3 * r2)), l2);
-        };
-        if ($3 === c)
-          return this.set(c, this.$M + r2);
-        if ($3 === h)
-          return this.set(h, this.$y + r2);
-        if ($3 === a)
-          return y2(1);
-        if ($3 === o)
-          return y2(7);
-        var M3 = (d2 = {}, d2[s] = e, d2[u] = n, d2[i] = t2, d2)[$3] || 1, m3 = this.$d.getTime() + r2 * M3;
-        return b.w(m3, this);
-      }, m2.subtract = function(t3, e2) {
-        return this.add(-1 * t3, e2);
-      }, m2.format = function(t3) {
-        var e2 = this, n2 = this.$locale();
-        if (!this.isValid())
-          return n2.invalidDate || l;
-        var r2 = t3 || "YYYY-MM-DDTHH:mm:ssZ", i2 = b.z(this), s2 = this.$H, u2 = this.$m, a2 = this.$M, o2 = n2.weekdays, c2 = n2.months, f2 = n2.meridiem, h2 = function(t4, n3, i3, s3) {
-          return t4 && (t4[n3] || t4(e2, r2)) || i3[n3].slice(0, s3);
-        }, d2 = function(t4) {
-          return b.s(s2 % 12 || 12, t4, "0");
-        }, $3 = f2 || function(t4, e3, n3) {
-          var r3 = t4 < 12 ? "AM" : "PM";
-          return n3 ? r3.toLowerCase() : r3;
-        };
-        return r2.replace(y, function(t4, r3) {
-          return r3 || function(t5) {
-            switch (t5) {
-              case "YY":
-                return String(e2.$y).slice(-2);
-              case "YYYY":
-                return b.s(e2.$y, 4, "0");
-              case "M":
-                return a2 + 1;
-              case "MM":
-                return b.s(a2 + 1, 2, "0");
-              case "MMM":
-                return h2(n2.monthsShort, a2, c2, 3);
-              case "MMMM":
-                return h2(c2, a2);
-              case "D":
-                return e2.$D;
-              case "DD":
-                return b.s(e2.$D, 2, "0");
-              case "d":
-                return String(e2.$W);
-              case "dd":
-                return h2(n2.weekdaysMin, e2.$W, o2, 2);
-              case "ddd":
-                return h2(n2.weekdaysShort, e2.$W, o2, 3);
-              case "dddd":
-                return o2[e2.$W];
-              case "H":
-                return String(s2);
-              case "HH":
-                return b.s(s2, 2, "0");
-              case "h":
-                return d2(1);
-              case "hh":
-                return d2(2);
-              case "a":
-                return $3(s2, u2, true);
-              case "A":
-                return $3(s2, u2, false);
-              case "m":
-                return String(u2);
-              case "mm":
-                return b.s(u2, 2, "0");
-              case "s":
-                return String(e2.$s);
-              case "ss":
-                return b.s(e2.$s, 2, "0");
-              case "SSS":
-                return b.s(e2.$ms, 3, "0");
-              case "Z":
-                return i2;
-            }
-            return null;
-          }(t4) || i2.replace(":", "");
-        });
-      }, m2.utcOffset = function() {
-        return 15 * -Math.round(this.$d.getTimezoneOffset() / 15);
-      }, m2.diff = function(r2, d2, l2) {
-        var $3, y2 = this, M3 = b.p(d2), m3 = O(r2), v2 = (m3.utcOffset() - this.utcOffset()) * e, g2 = this - m3, D2 = function() {
-          return b.m(y2, m3);
-        };
-        switch (M3) {
-          case h:
-            $3 = D2() / 12;
-            break;
-          case c:
-            $3 = D2();
-            break;
-          case f:
-            $3 = D2() / 3;
-            break;
-          case o:
-            $3 = (g2 - v2) / 6048e5;
-            break;
-          case a:
-            $3 = (g2 - v2) / 864e5;
-            break;
-          case u:
-            $3 = g2 / n;
-            break;
-          case s:
-            $3 = g2 / e;
-            break;
-          case i:
-            $3 = g2 / t2;
-            break;
-          default:
-            $3 = g2;
-        }
-        return l2 ? $3 : b.a($3);
-      }, m2.daysInMonth = function() {
-        return this.endOf(c).$D;
-      }, m2.$locale = function() {
-        return D[this.$L];
-      }, m2.locale = function(t3, e2) {
-        if (!t3)
-          return this.$L;
-        var n2 = this.clone(), r2 = w(t3, e2, true);
-        return r2 && (n2.$L = r2), n2;
-      }, m2.clone = function() {
-        return b.w(this.$d, this);
-      }, m2.toDate = function() {
-        return new Date(this.valueOf());
-      }, m2.toJSON = function() {
-        return this.isValid() ? this.toISOString() : null;
-      }, m2.toISOString = function() {
-        return this.$d.toISOString();
-      }, m2.toString = function() {
-        return this.$d.toUTCString();
-      }, M2;
-    }(), k = _2.prototype;
-    return O.prototype = k, [["$ms", r], ["$s", i], ["$m", s], ["$H", u], ["$W", a], ["$M", c], ["$y", h], ["$D", d]].forEach(function(t3) {
-      k[t3[1]] = function(e2) {
-        return this.$g(e2, t3[0], t3[1]);
-      };
-    }), O.extend = function(t3, e2) {
-      return t3.$i || (t3(e2, _2, O), t3.$i = true), O;
-    }, O.locale = w, O.isDayjs = S, O.unix = function(t3) {
-      return O(1e3 * t3);
-    }, O.en = D[g], O.Ls = D, O.p = {}, O;
-  });
-})(dayjs_min);
-var dayjs = dayjs_min.exports;
 const isDev = false;
 var config = useConfig(isDev);
 _.isObject;
@@ -47041,11 +47325,11 @@ var Mixin = {
     handleConfirm(visible, type) {
       this.$emit("on-pick", this.dates, visible, type || this.type);
     },
-    onToggleVisibility(open) {
+    onToggleVisibility(open2) {
       const { timeSpinner, timeSpinnerEnd } = this.$refs;
-      if (open && timeSpinner)
+      if (open2 && timeSpinner)
         timeSpinner.updateScroll();
-      if (open && timeSpinnerEnd)
+      if (open2 && timeSpinnerEnd)
         timeSpinnerEnd.updateScroll();
     }
   }
@@ -50464,7 +50748,7 @@ var render$18 = function() {
   var _c = _vm._self._c || _h;
   return _c("div", { staticClass: "export-data" }, [_c("Row", [_c("Form", { attrs: { "label-width": 80, "label-colon": "" } }, [_c("FormItem", { attrs: { "label": "\u5BFC\u51FA\u683C\u5F0F" } }, [_vm._v("xlsx")]), _c("FormItem", { attrs: { "label": "\u6587\u4EF6\u540D" } }, [_c("Input", { staticStyle: { "width": "270px" }, attrs: { "maxlength": "30", "icon": "document", "placeholder": "\u8868\u683C\u6570\u636E" }, model: { value: _vm.fileName, callback: function($$v) {
     _vm.fileName = typeof $$v === "string" ? $$v.trim() : $$v;
-  }, expression: "fileName" } })], 1), _c("FormItem", [_c("Button", { staticStyle: { "margin-bottom": "var(--search-margin-bottom)" }, attrs: { "type": "default", "loading": _vm.exportCurrentLoading }, on: { "click": _vm.exportCurrentPage } }, [_vm._v("\u5BFC\u51FA\u5F53\u524D\u9875")]), _vm._v(" \xA0 "), _c("Button", { staticStyle: { "margin-bottom": "var(--search-margin-bottom)" }, attrs: { "type": "default", "loading": _vm.exportAllLoading }, on: { "click": _vm.exportAllData } }, [_vm._v("\u5BFC\u51FA\u5168\u90E8")]), _vm._v(" \xA0 "), _c("Button", { staticStyle: { "margin-bottom": "var(--search-margin-bottom)" }, attrs: { "type": "default", "loading": _vm.exportCurrentLoading }, on: { "click": _vm.previewCurrentPage } }, [_vm._v("\u9884\u89C8\u5F53\u524D\u9875")]), _vm._v(" \xA0 "), _c("Button", { staticStyle: { "margin-bottom": "var(--search-margin-bottom)" }, attrs: { "type": "default", "loading": _vm.exportAllLoading }, on: { "click": _vm.previewAllData } }, [_vm._v("\u9884\u89C8\u5168\u90E8")])], 1)], 1)], 1), _c("Modal", { staticClass: "ind-file-preview-modal", attrs: { "width": "80" }, on: { "on-cancel": _vm.onCancel }, model: { value: _vm.boxShow, callback: function($$v) {
+  }, expression: "fileName" } })], 1), _c("FormItem", [!_vm.disablePage ? _c("Button", { staticStyle: { "margin-bottom": "var(--search-margin-bottom)" }, attrs: { "type": "default", "loading": _vm.exportCurrentLoading }, on: { "click": _vm.exportCurrentPage } }, [_vm._v("\u5BFC\u51FA\u5F53\u524D\u9875")]) : _vm._e(), _vm._v(" \xA0 "), _c("Button", { staticStyle: { "margin-bottom": "var(--search-margin-bottom)" }, attrs: { "type": "default", "loading": _vm.exportAllLoading }, on: { "click": _vm.exportAllData } }, [_vm._v("\u5BFC\u51FA\u5168\u90E8")]), _vm._v(" \xA0 "), !_vm.disablePage ? _c("Button", { staticStyle: { "margin-bottom": "var(--search-margin-bottom)" }, attrs: { "type": "default", "loading": _vm.exportCurrentLoading }, on: { "click": _vm.previewCurrentPage } }, [_vm._v("\u9884\u89C8\u5F53\u524D\u9875")]) : _vm._e(), _vm._v(" \xA0 "), _c("Button", { staticStyle: { "margin-bottom": "var(--search-margin-bottom)" }, attrs: { "type": "default", "loading": _vm.exportAllLoading }, on: { "click": _vm.previewAllData } }, [_vm._v("\u9884\u89C8\u5168\u90E8")])], 1)], 1)], 1), _c("Modal", { staticClass: "ind-file-preview-modal", attrs: { "width": "80" }, on: { "on-cancel": _vm.onCancel }, model: { value: _vm.boxShow, callback: function($$v) {
     _vm.boxShow = $$v;
   }, expression: "boxShow" } }, [_c("div", { staticStyle: { "width": "100%", "height": "100%", "display": "flex", "justify-content": "center" } }, [_vm.boxShow ? _c("div", { staticClass: "ind-file-preview-content", attrs: { "id": _vm.id } }) : _vm._e()]), _c("div", { attrs: { "slot": "footer" }, slot: "footer" })])], 1);
 };
@@ -50540,7 +50824,12 @@ const __vue2_script$1l = {
     },
     defaultUnitType: String,
     unitType: String,
-    switchCols: Array
+    switchCols: Array,
+    watermark: String,
+    disablePage: {
+      type: Boolean,
+      default: false
+    }
   },
   data() {
     return {
@@ -50770,7 +51059,8 @@ const __vue2_script$1l = {
           rowSpanIndexCol: this.rowSpanIndexCol,
           topRows: 0,
           leftColumns: 0,
-          rowSpanDefs: this.rowSpanDefs
+          rowSpanDefs: this.rowSpanDefs,
+          watermark: this.watermark
         };
         exportJsonToExcel(params);
       } else {
@@ -52763,11 +53053,11 @@ var render$13 = function() {
     _vm.showZero = $$v;
   }, expression: "showZero" } }) : _vm._e(), _vm.showUnitSwitch && _vm.isShowUnitSwitch ? _c("IndUnitRadio", { staticStyle: { "margin-bottom": "var(--ind-unit-switch-bottom)", "line-height": "1" }, attrs: { "isShowWX": _vm.isShowWX, "isShowJ": _vm.isShowJ }, model: { value: _vm.unitType, callback: function($$v) {
     _vm.unitType = $$v;
-  }, expression: "unitType" } }) : _vm._e(), _c("Dropdown", { directives: [{ name: "show", rawName: "v-show", value: _vm.showTableOption, expression: "showTableOption" }], staticClass: "table-option-dropdown", staticStyle: { "float": "right", "margin-bottom": "var(--ind-table-button-padding)" }, attrs: { "trigger": "custom", "visible": _vm.optionDropdownVisible, "placement": "bottom-end" }, on: { "on-click": _vm.resetTableSize } }, [_c("IndButtonGroup", { staticStyle: { "display": "flex" }, attrs: { "split": false, "mb": "" } }, [_c("IndButton", { attrs: { "bizType": "reset" }, on: { "click": _vm.toggleFullScreen } }, [_vm._v(" " + _vm._s(_vm.fullSreen ? "\u53D6\u6D88\u5168\u5C4F" : "\u5168\u5C4F") + " ")]), _vm.revertBtn ? _c("IndButton", { attrs: { "bizType": "reset" }, on: { "click": function($event) {
+  }, expression: "unitType" } }) : _vm._e(), _c("Dropdown", { directives: [{ name: "show", rawName: "v-show", value: _vm.showTableOption, expression: "showTableOption" }], staticClass: "table-option-dropdown", staticStyle: { "float": "right", "margin-bottom": "var(--ind-table-button-padding)" }, attrs: { "trigger": "custom", "visible": _vm.optionDropdownVisible, "placement": "bottom-end" }, on: { "on-click": _vm.resetTableSize } }, [_c("IndButtonGroup", { staticStyle: { "display": "flex" }, attrs: { "split": false, "mb": "" } }, [_c("IndButton", { attrs: { "bizType": "reset" }, on: { "click": _vm.toggleFullScreen } }, [_vm._v(" " + _vm._s(_vm.shareFullSreen ? "\u53D6\u6D88\u5168\u5C4F" : "\u5168\u5C4F") + " ")]), _vm.revertBtn ? _c("IndButton", { attrs: { "bizType": "reset" }, on: { "click": function($event) {
     return _vm.$emit("revertColumnRow");
   } } }, [_vm._v(" \u8F6C\u7F6E ")]) : _vm._e(), !_vm.isIndexManageTable && _vm.$config.indexManage ? _c("IndexManage", { attrs: { "tableRef": _vm.tableRef, "funId": (_vm.funId || "") + "-" + _vm.$route.meta.permissionId }, on: { "resetColumns": _vm.resetColumns } }) : _vm._e(), _c("IndButton", { attrs: { "bizType": "reset" }, on: { "click": function($event) {
     return _vm.tableSettingToggle("3");
-  } } }, [_vm._v(" \u5BFC\u51FA ")])], 1), _c("DropdownMenu", { style: { width: _vm.btnSel != "1" ? "400px" : "200px", padding: "5px 10px" }, attrs: { "slot": "list" }, slot: "list" }, [_c("ExportData", { directives: [{ name: "show", rawName: "v-show", value: _vm.btnSel == "3", expression: "btnSel == '3'" }], ref: "exportData", attrs: { "rowSpanDefs": _vm.rowSpanDefs, "exportFileName": _vm.exportFileName, "paramLeft": _vm.paramLeft, "paramRight": _vm.paramRight || _vm.paramRightUnit, "rowSpanColumns": _vm.rowSpanColumns || _vm.mergeColumns, "rowSpanIndexCol": _vm.rowSpanIndexCol || _vm.mergeIndexCol, "pinnedTopRowData": _vm.topRows, "tableColumns": _vm.tableColumns, "data": _vm.tableData, "dataApi": _vm.dataApi, "searchParams": _vm.searchParams, "sortParams": _vm.sortParams, "paginationParams": _vm.paginationParams, "show-summary": _vm.tableShowSummary, "summary-method": _vm.tableSummaryMethod, "parsedColumns": _vm.parsedColumns, "exportEnum": _vm.exportEnum, "data-children": _vm.dataChildren, "defaultUnitType": _vm.defaultUnitType, "unitType": _vm.unitType, "switchCols": _vm.switchCols }, on: { "doExport": function($event) {
+  } } }, [_vm._v(" \u5BFC\u51FA ")])], 1), _c("DropdownMenu", { style: { width: _vm.btnSel != "1" ? "400px" : "200px", padding: "5px 10px" }, attrs: { "slot": "list" }, slot: "list" }, [_c("ExportData", { directives: [{ name: "show", rawName: "v-show", value: _vm.btnSel == "3", expression: "btnSel == '3'" }], ref: "exportData", attrs: { "rowSpanDefs": _vm.rowSpanDefs, "exportFileName": _vm.exportFileName, "paramLeft": _vm.paramLeft, "paramRight": _vm.paramRight || _vm.paramRightUnit, "rowSpanColumns": _vm.rowSpanColumns || _vm.mergeColumns, "rowSpanIndexCol": _vm.rowSpanIndexCol || _vm.mergeIndexCol, "pinnedTopRowData": _vm.topRows, "tableColumns": _vm.tableColumns, "data": _vm.tableData, "dataApi": _vm.dataApi, "searchParams": _vm.searchParams, "sortParams": _vm.sortParams, "paginationParams": _vm.paginationParams, "show-summary": _vm.tableShowSummary, "summary-method": _vm.tableSummaryMethod, "parsedColumns": _vm.parsedColumns, "exportEnum": _vm.exportEnum, "data-children": _vm.dataChildren, "defaultUnitType": _vm.defaultUnitType, "unitType": _vm.unitType, "switchCols": _vm.switchCols, "watermark": _vm.watermark, "disablePage": _vm.disablePage }, on: { "doExport": function($event) {
     _vm.optionDropdownVisible = false;
   }, "doPreview": function($event) {
     _vm.optionDropdownVisible = false;
@@ -53042,7 +53332,8 @@ const __vue2_script$14 = {
       type: String,
       default: "Y"
     },
-    noRowsTemplate: String
+    noRowsTemplate: String,
+    watermark: String
   },
   data() {
     function isPC() {
@@ -53251,6 +53542,9 @@ const __vue2_script$14 = {
       } else {
         return this.tableData;
       }
+    },
+    shareFullSreen() {
+      return this.$store.state.app.isFullSreen;
     }
   },
   watch: {
@@ -53660,7 +53954,13 @@ const __vue2_script$14 = {
     toggleFullScreen() {
       if (top !== self) {
         top.toggleFullScreen();
+        if (!this.shareFullSreen) {
+          this.$nextTick(() => {
+            top.document.getElementsByClassName("fullscreen-fixed")[0].style.zIndex = 1e5;
+          });
+        }
       }
+      this.$store.dispatch("updateIsFullSreen", !this.shareFullSreen);
       this.fullSreen = !this.fullSreen;
     },
     getRowHeight() {
@@ -53757,6 +54057,7 @@ const __vue2_script$14 = {
           minWidth: column.minWidth ? parseInt(column.minWidth) - (this.getTheme == "ind-small-theme" ? 10 : 0) : column.minWidth,
           maxWidth: column.maxWidth ? parseInt(column.maxWidth) - (this.getTheme == "ind-small-theme" ? 10 : 0) : column.maxWidth,
           pinned: column.fixed || column.pinned,
+          align: column.align || "left",
           cellDataType: column.cellDataType || "text",
           headerTooltip: (_c = (_b = (_a = this.$store) == null ? void 0 : _a.getters) == null ? void 0 : _b.getIndexDesc) == null ? void 0 : _c[column.standardField || column.key || column.field],
           suppressStickyLabel: true,
@@ -61996,8 +62297,8 @@ const __vue2_script$v = {
         this.$refs.dropdown.$el.scrollTop += topOverflowDistance;
       }
     },
-    dropVisible(open) {
-      this.broadcast("IndDrop", open ? "on-update-popper" : "on-destroy-popper");
+    dropVisible(open2) {
+      this.broadcast("IndDrop", open2 ? "on-update-popper" : "on-destroy-popper");
     },
     selectOptions() {
       if (this.hasExpectedValue && this.selectOptions.length > 0) {
@@ -71629,7 +71930,8 @@ var app = {
     collectMenuList: [],
     maxTabNum: 5,
     theme: getDefaultTheme(),
-    indexDesc: {}
+    indexDesc: {},
+    isFullSreen: false
   },
   getters: {
     getAppInfo(state) {
@@ -71775,6 +72077,9 @@ var app = {
     },
     setIndexDesc(state, indexDesc) {
       state.indexDesc = indexDesc;
+    },
+    setIsFullSreen(state, value) {
+      state.isFullSreen = value;
     }
   },
   actions: {
@@ -71898,6 +72203,9 @@ var app = {
         )
       );
       return data;
+    },
+    updateIsFullSreen({ commit: commit2 }, value) {
+      commit2("setIsFullSreen", value);
     }
   }
 };