zartui 3.1.20 → 3.1.21

package/lib/zartui.js

@@ -8,20 +8,8 @@
   const isPromise = (val) => isObject(val) && isFunction(val.then) && isFunction(val.catch);
   const isDate = (val) => Object.prototype.toString.call(val) === "[object Date]" && !Number.isNaN(val.getTime());
   const isNumeric = (val) => typeof val === "number" || /^\d+(\.\d+)?$/.test(val);
-  const isString = (val) => typeof val === "string";
-  const isValidString = (val) => typeof val === "string" && val !== "";
-  const isRegExp = (val) => Object.prototype.toString.call(val).replace(/\[object (\w+)\]/, "$1").toLowerCase() === "regexp";
   const isIOS$1 = () => inBrowser$1 ? /ios|iphone|ipad|ipod/.test(navigator.userAgent.toLowerCase()) : false;
-  const isAndroid = () => inBrowser$1 ? /android/.test(navigator.userAgent.toLowerCase()) : false;
   const isWeixin = () => inBrowser$1 ? /micromessenger/.test(navigator.userAgent.toLowerCase()) : false;
-  const getIosVersion = () => {
-    const reg = /CPU iPhone OS (.*?) like Mac OS/i;
-    const verStr = navigator.userAgent.match(reg);
-    if (verStr && verStr[1]) {
-      return verStr[1].replace(/_/g, ".");
-    }
-    return "";
-  };
   function noop() {
   }
   const extend = Object.assign;
@@ -1887,7 +1875,7 @@
           "style": style.value,
           "src": props.src
         }, {
-          error: renderText()
+          error: () => renderText()
         });
       };
     }
@@ -3638,7 +3626,8 @@
       maxWidth: {
         type: String,
         default: "112px"
-      }
+      },
+      setLine: Function
     },
     setup(props, {
       slots
@@ -3698,9 +3687,30 @@
         }
         return Text;
       };
+      const mutationObserver = vue.ref();
+      const dom = vue.ref(null);
+      function mutation() {
+        props.setLine && props.setLine();
+      }
+      vue.onMounted(() => {
+        if (!dom.value) {
+          return;
+        }
+        mutationObserver.value = new MutationObserver(mutation);
+        mutationObserver.value.observe(dom.value, {
+          characterData: true,
+          childList: true,
+          subtree: true
+        });
+      });
+      vue.onBeforeUnmount(() => {
+        var _a, _b;
+        (_b = (_a = mutationObserver.value) == null ? void 0 : _a.unobserve) == null ? void 0 : _b.call(_a, dom.value);
+      });
       return () => vue.createVNode("div", {
         "id": props.id,
         "role": "tab",
+        "ref": dom,
         "class": [bem$18([props.type, {
           grow: props.scrollable && !props.shrink,
           shrink: props.shrink,
@@ -4385,6 +4395,7 @@
         "scrollable": scrollable.value,
         "activeColor": props.titleActiveColor,
         "inactiveColor": props.titleInactiveColor,
+        "setLine": setLine,
         "onClick": (event) => onClickTab(item, index, event)
       }, pick(item, ["dot", "badge", "title", "disabled", "showZeroBadge"])), {
         title: item.$slots.title,
@@ -8520,13 +8531,6 @@
     }
     return result;
   };
-  const parseDecimal = (obj, defaultValue) => {
-    let result = parseFloat(obj);
-    if (isNaN(result)) {
-      result = defaultValue || 0;
-    }
-    return result;
-  };
   const [name$K, bem$K] = createNamespace("tag");
   const tagProps = {
     mark: Boolean,
@@ -13243,9 +13247,6 @@
       }, null)])])]);
     }
   });
-  const MAX_SIDE_LENGTH = 1920;
-  const MIN_SIDE_LENGTH = 480;
-  const PHOTO_FILE_SIZE_LIMIT = 1e3;
   function isImageType(file) {
     return file.type.indexOf("image/") >= 0;
   }
@@ -13269,48 +13270,7 @@
     )}`;
     return suffix ? name2 + "." + suffix : name2;
   }
-  function adjustImgOrientation(ctx, img, orientation, width2, height2) {
-    switch (orientation) {
-      case 3:
-        ctx.rotate(180 * Math.PI / 180);
-        ctx.drawImage(img, -width2, -height2, width2, height2);
-        break;
-      case 6:
-        ctx.rotate(90 * Math.PI / 180);
-        ctx.drawImage(img, 0, -width2, height2, width2);
-        break;
-      case 8:
-        ctx.rotate(270 * Math.PI / 180);
-        ctx.drawImage(img, -height2, 0, height2, width2);
-        break;
-      case 2:
-        ctx.translate(width2, 0);
-        ctx.scale(-1, 1);
-        ctx.drawImage(img, 0, 0, width2, height2);
-        break;
-      case 4:
-        ctx.translate(width2, 0);
-        ctx.scale(-1, 1);
-        ctx.rotate(180 * Math.PI / 180);
-        ctx.drawImage(img, -width2, -height2, width2, height2);
-        break;
-      case 5:
-        ctx.translate(width2, 0);
-        ctx.scale(-1, 1);
-        ctx.rotate(90 * Math.PI / 180);
-        ctx.drawImage(img, 0, -width2, height2, width2);
-        break;
-      case 7:
-        ctx.translate(width2, 0);
-        ctx.scale(-1, 1);
-        ctx.rotate(270 * Math.PI / 180);
-        ctx.drawImage(img, -height2, 0, height2, width2);
-        break;
-      default:
-        ctx.drawImage(img, 0, 0, width2, height2);
-    }
-  }
-  function file2DataURL(file) {
+  function file2DataURL$1(file) {
     return new Promise((resolve, reject) => {
       const a2 = new FileReader();
       a2.onload = function(res) {
@@ -13323,40 +13283,7 @@
       a2.readAsDataURL(file);
     });
   }
-  function file2Image(file) {
-    return new Promise((resolve, reject) => {
-      file2DataURL(file).then((url) => {
-        const img = new Image();
-        img.src = url;
-        img.onload = function() {
-          if (img.complete) {
-            resolve(img);
-          } else {
-            reject(new Error("文件加载失败"));
-          }
-        };
-      }).catch(reject);
-    });
-  }
-  function image2Canvas(img, type, orientation, width2, height2) {
-    const canvas = document.createElement("canvas");
-    const _width = width2 || img.width;
-    const _height = height2 || img.height;
-    canvas.width = _width;
-    canvas.height = _height;
-    const ctx = canvas.getContext("2d");
-    if (ctx) {
-      ctx.fillStyle = "transparent";
-      if (type === "image/jpeg") {
-        ctx.fillStyle = "#fff";
-      }
-      ctx.fillRect(0, 0, _width, _height);
-      adjustImgOrientation(ctx, img, orientation, _width, _height);
-      return Promise.resolve(canvas);
-    }
-    return Promise.reject(new Error("canvas getContext return null"));
-  }
-  function canvas2File(canvas, fileName, lastModified, type = "image/jpeg", quality = 0.8) {
+  function canvas2File$1(canvas, fileName, lastModified, type = "image/jpeg", quality = 0.8) {
     return new Promise((resolve, reject) => {
       canvas.toBlob(
         (blob) => {
@@ -13372,247 +13299,467 @@
       );
     });
   }
-  function canvas2Image(canvas, type = "image/jpeg", quality = 0.8) {
-    const image = new Image();
-    image.src = canvas.toDataURL(type, quality);
-    return Promise.resolve(image);
-  }
-  function getStringFromCharCode(dataView, start2, length) {
-    let str = "";
-    let i2;
-    length += start2;
-    for (i2 = start2; i2 < length; i2 += 1) {
-      str += String.fromCharCode(dataView.getUint8(i2));
+  var __create = Object.create;
+  var __defProp = Object.defineProperty;
+  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+  var __getOwnPropNames = Object.getOwnPropertyNames;
+  var __getProtoOf = Object.getPrototypeOf;
+  var __hasOwnProp = Object.prototype.hasOwnProperty;
+  var __commonJS = (cb, mod) => function __require() {
+    return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  };
+  var __copyProps = (to, from, except, desc) => {
+    if (from && typeof from === "object" || typeof from === "function") {
+      for (let key of __getOwnPropNames(from))
+        if (!__hasOwnProp.call(to, key) && key !== except)
+          __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
     }
-    return str;
-  }
-  function getOrientation(arrayBuffer) {
-    const dataView = new DataView(arrayBuffer);
-    let orientation;
-    try {
-      let littleEndian;
-      let app1Start;
-      let ifdStart;
-      if (dataView.getUint8(0) === 255 && dataView.getUint8(1) === 216) {
-        const length = dataView.byteLength;
-        let offset2 = 2;
-        while (offset2 + 1 < length) {
-          if (dataView.getUint8(offset2) === 255 && dataView.getUint8(offset2 + 1) === 225) {
-            app1Start = offset2;
-            break;
-          }
-          offset2 += 1;
+    return to;
+  };
+  var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+    // If the importer is in node compatibility mode or this is not an ESM
+    // file that has been converted to a CommonJS file using a Babel-
+    // compatible transform (i.e. "__esModule" has not been set), then set
+    // "default" to the CommonJS "module.exports" for node compatibility.
+    isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+    mod
+  ));
+  var __async$1 = (__this, __arguments, generator) => {
+    return new Promise((resolve, reject) => {
+      var fulfilled = (value) => {
+        try {
+          step(generator.next(value));
+        } catch (e2) {
+          reject(e2);
         }
-      }
-      if (app1Start) {
-        const exifIDCode = app1Start + 4;
-        const tiffOffset = app1Start + 10;
-        if (getStringFromCharCode(dataView, exifIDCode, 4) === "Exif") {
-          const endianness = dataView.getUint16(tiffOffset);
-          littleEndian = endianness === 18761;
-          if (littleEndian || endianness === 19789) {
-            if (dataView.getUint16(tiffOffset + 2, littleEndian) === 42) {
-              const firstIFDOffset = dataView.getUint32(
-                tiffOffset + 4,
-                littleEndian
-              );
-              if (firstIFDOffset >= 8) {
-                ifdStart = tiffOffset + firstIFDOffset;
+      };
+      var rejected = (value) => {
+        try {
+          step(generator.throw(value));
+        } catch (e2) {
+          reject(e2);
+        }
+      };
+      var step = (x2) => x2.done ? resolve(x2.value) : Promise.resolve(x2.value).then(fulfilled, rejected);
+      step((generator = generator.apply(__this, __arguments)).next());
+    });
+  };
+  var require_dayjs_min = __commonJS({
+    "../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/dayjs.min.js"(exports3, module2) {
+      !function(t2, e2) {
+        "object" == typeof exports3 && "undefined" != typeof module2 ? module2.exports = e2() : "function" == typeof define && define.amd ? define(e2) : (t2 = "undefined" != typeof globalThis ? globalThis : t2 || self).dayjs = e2();
+      }(exports3, function() {
+        var t2 = 1e3, e2 = 6e4, n2 = 36e5, r2 = "millisecond", i2 = "second", s2 = "minute", u2 = "hour", a2 = "day", o2 = "week", c2 = "month", f2 = "quarter", h2 = "year", d2 = "date", l2 = "Invalid Date", $ = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/, y2 = /\[([^\]]+)]|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, M2 = { 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(t22) {
+          var e22 = ["th", "st", "nd", "rd"], n22 = t22 % 100;
+          return "[" + t22 + (e22[(n22 - 20) % 10] || e22[n22] || e22[0]) + "]";
+        } }, m2 = function(t22, e22, n22) {
+          var r22 = String(t22);
+          return !r22 || r22.length >= e22 ? t22 : "" + Array(e22 + 1 - r22.length).join(n22) + t22;
+        }, v2 = { s: m2, z: function(t22) {
+          var e22 = -t22.utcOffset(), n22 = Math.abs(e22), r22 = Math.floor(n22 / 60), i22 = n22 % 60;
+          return (e22 <= 0 ? "+" : "-") + m2(r22, 2, "0") + ":" + m2(i22, 2, "0");
+        }, m: function t22(e22, n22) {
+          if (e22.date() < n22.date())
+            return -t22(n22, e22);
+          var r22 = 12 * (n22.year() - e22.year()) + (n22.month() - e22.month()), i22 = e22.clone().add(r22, c2), s22 = n22 - i22 < 0, u22 = e22.clone().add(r22 + (s22 ? -1 : 1), c2);
+          return +(-(r22 + (n22 - i22) / (s22 ? i22 - u22 : u22 - i22)) || 0);
+        }, a: function(t22) {
+          return t22 < 0 ? Math.ceil(t22) || 0 : Math.floor(t22);
+        }, p: function(t22) {
+          return { M: c2, y: h2, w: o2, d: a2, D: d2, h: u2, m: s2, s: i2, ms: r2, Q: f2 }[t22] || String(t22 || "").toLowerCase().replace(/s$/, "");
+        }, u: function(t22) {
+          return void 0 === t22;
+        } }, g2 = "en", D2 = {};
+        D2[g2] = M2;
+        var p2 = "$isDayjsObject", S2 = function(t22) {
+          return t22 instanceof _ || !(!t22 || !t22[p2]);
+        }, w2 = function t22(e22, n22, r22) {
+          var i22;
+          if (!e22)
+            return g2;
+          if ("string" == typeof e22) {
+            var s22 = e22.toLowerCase();
+            D2[s22] && (i22 = s22), n22 && (D2[s22] = n22, i22 = s22);
+            var u22 = e22.split("-");
+            if (!i22 && u22.length > 1)
+              return t22(u22[0]);
+          } else {
+            var a22 = e22.name;
+            D2[a22] = e22, i22 = a22;
+          }
+          return !r22 && i22 && (g2 = i22), i22 || !r22 && g2;
+        }, O2 = function(t22, e22) {
+          if (S2(t22))
+            return t22.clone();
+          var n22 = "object" == typeof e22 ? e22 : {};
+          return n22.date = t22, n22.args = arguments, new _(n22);
+        }, b2 = v2;
+        b2.l = w2, b2.i = S2, b2.w = function(t22, e22) {
+          return O2(t22, { locale: e22.$L, utc: e22.$u, x: e22.$x, $offset: e22.$offset });
+        };
+        var _ = function() {
+          function M22(t22) {
+            this.$L = w2(t22.locale, null, true), this.parse(t22), this.$x = this.$x || t22.x || {}, this[p2] = true;
+          }
+          var m22 = M22.prototype;
+          return m22.parse = function(t22) {
+            this.$d = function(t3) {
+              var e22 = t3.date, n22 = t3.utc;
+              if (null === e22)
+                return /* @__PURE__ */ new Date(NaN);
+              if (b2.u(e22))
+                return /* @__PURE__ */ new Date();
+              if (e22 instanceof Date)
+                return new Date(e22);
+              if ("string" == typeof e22 && !/Z$/i.test(e22)) {
+                var r22 = e22.match($);
+                if (r22) {
+                  var i22 = r22[2] - 1 || 0, s22 = (r22[7] || "0").substring(0, 3);
+                  return n22 ? new Date(Date.UTC(r22[1], i22, r22[3] || 1, r22[4] || 0, r22[5] || 0, r22[6] || 0, s22)) : new Date(r22[1], i22, r22[3] || 1, r22[4] || 0, r22[5] || 0, r22[6] || 0, s22);
+                }
               }
+              return new Date(e22);
+            }(t22), this.init();
+          }, m22.init = function() {
+            var t22 = this.$d;
+            this.$y = t22.getFullYear(), this.$M = t22.getMonth(), this.$D = t22.getDate(), this.$W = t22.getDay(), this.$H = t22.getHours(), this.$m = t22.getMinutes(), this.$s = t22.getSeconds(), this.$ms = t22.getMilliseconds();
+          }, m22.$utils = function() {
+            return b2;
+          }, m22.isValid = function() {
+            return !(this.$d.toString() === l2);
+          }, m22.isSame = function(t22, e22) {
+            var n22 = O2(t22);
+            return this.startOf(e22) <= n22 && n22 <= this.endOf(e22);
+          }, m22.isAfter = function(t22, e22) {
+            return O2(t22) < this.startOf(e22);
+          }, m22.isBefore = function(t22, e22) {
+            return this.endOf(e22) < O2(t22);
+          }, m22.$g = function(t22, e22, n22) {
+            return b2.u(t22) ? this[e22] : this.set(n22, t22);
+          }, m22.unix = function() {
+            return Math.floor(this.valueOf() / 1e3);
+          }, m22.valueOf = function() {
+            return this.$d.getTime();
+          }, m22.startOf = function(t22, e22) {
+            var n22 = this, r22 = !!b2.u(e22) || e22, f22 = b2.p(t22), l22 = function(t3, e3) {
+              var i22 = b2.w(n22.$u ? Date.UTC(n22.$y, e3, t3) : new Date(n22.$y, e3, t3), n22);
+              return r22 ? i22 : i22.endOf(a2);
+            }, $2 = function(t3, e3) {
+              return b2.w(n22.toDate()[t3].apply(n22.toDate("s"), (r22 ? [0, 0, 0, 0] : [23, 59, 59, 999]).slice(e3)), n22);
+            }, y22 = this.$W, M3 = this.$M, m3 = this.$D, v22 = "set" + (this.$u ? "UTC" : "");
+            switch (f22) {
+              case h2:
+                return r22 ? l22(1, 0) : l22(31, 11);
+              case c2:
+                return r22 ? l22(1, M3) : l22(0, M3 + 1);
+              case o2:
+                var g22 = this.$locale().weekStart || 0, D22 = (y22 < g22 ? y22 + 7 : y22) - g22;
+                return l22(r22 ? m3 - D22 : m3 + (6 - D22), M3);
+              case a2:
+              case d2:
+                return $2(v22 + "Hours", 0);
+              case u2:
+                return $2(v22 + "Minutes", 1);
+              case s2:
+                return $2(v22 + "Seconds", 2);
+              case i2:
+                return $2(v22 + "Milliseconds", 3);
+              default:
+                return this.clone();
             }
-          }
-        }
-      }
-      if (ifdStart) {
-        const _length = dataView.getUint16(ifdStart, littleEndian);
-        let _offset;
-        let i2;
-        for (i2 = 0; i2 < _length; i2 += 1) {
-          _offset = ifdStart + i2 * 12 + 2;
-          if (dataView.getUint16(_offset, littleEndian) === 274) {
-            _offset += 8;
-            orientation = dataView.getUint16(_offset, littleEndian);
-            dataView.setUint16(_offset, 1, littleEndian);
-            break;
-          }
-        }
-      }
-    } catch (e2) {
-      orientation = 1;
+          }, m22.endOf = function(t22) {
+            return this.startOf(t22, false);
+          }, m22.$set = function(t22, e22) {
+            var n22, o22 = b2.p(t22), f22 = "set" + (this.$u ? "UTC" : ""), l22 = (n22 = {}, n22[a2] = f22 + "Date", n22[d2] = f22 + "Date", n22[c2] = f22 + "Month", n22[h2] = f22 + "FullYear", n22[u2] = f22 + "Hours", n22[s2] = f22 + "Minutes", n22[i2] = f22 + "Seconds", n22[r2] = f22 + "Milliseconds", n22)[o22], $2 = o22 === a2 ? this.$D + (e22 - this.$W) : e22;
+            if (o22 === c2 || o22 === h2) {
+              var y22 = this.clone().set(d2, 1);
+              y22.$d[l22]($2), y22.init(), this.$d = y22.set(d2, Math.min(this.$D, y22.daysInMonth())).$d;
+            } else
+              l22 && this.$d[l22]($2);
+            return this.init(), this;
+          }, m22.set = function(t22, e22) {
+            return this.clone().$set(t22, e22);
+          }, m22.get = function(t22) {
+            return this[b2.p(t22)]();
+          }, m22.add = function(r22, f22) {
+            var d22, l22 = this;
+            r22 = Number(r22);
+            var $2 = b2.p(f22), y22 = function(t22) {
+              var e22 = O2(l22);
+              return b2.w(e22.date(e22.date() + Math.round(t22 * r22)), l22);
+            };
+            if ($2 === c2)
+              return this.set(c2, this.$M + r22);
+            if ($2 === h2)
+              return this.set(h2, this.$y + r22);
+            if ($2 === a2)
+              return y22(1);
+            if ($2 === o2)
+              return y22(7);
+            var M3 = (d22 = {}, d22[s2] = e2, d22[u2] = n2, d22[i2] = t2, d22)[$2] || 1, m3 = this.$d.getTime() + r22 * M3;
+            return b2.w(m3, this);
+          }, m22.subtract = function(t22, e22) {
+            return this.add(-1 * t22, e22);
+          }, m22.format = function(t22) {
+            var e22 = this, n22 = this.$locale();
+            if (!this.isValid())
+              return n22.invalidDate || l2;
+            var r22 = t22 || "YYYY-MM-DDTHH:mm:ssZ", i22 = b2.z(this), s22 = this.$H, u22 = this.$m, a22 = this.$M, o22 = n22.weekdays, c22 = n22.months, f22 = n22.meridiem, h22 = function(t3, n3, i3, s3) {
+              return t3 && (t3[n3] || t3(e22, r22)) || i3[n3].slice(0, s3);
+            }, d22 = function(t3) {
+              return b2.s(s22 % 12 || 12, t3, "0");
+            }, $2 = f22 || function(t3, e3, n3) {
+              var r3 = t3 < 12 ? "AM" : "PM";
+              return n3 ? r3.toLowerCase() : r3;
+            };
+            return r22.replace(y2, function(t3, r3) {
+              return r3 || function(t4) {
+                switch (t4) {
+                  case "YY":
+                    return String(e22.$y).slice(-2);
+                  case "YYYY":
+                    return b2.s(e22.$y, 4, "0");
+                  case "M":
+                    return a22 + 1;
+                  case "MM":
+                    return b2.s(a22 + 1, 2, "0");
+                  case "MMM":
+                    return h22(n22.monthsShort, a22, c22, 3);
+                  case "MMMM":
+                    return h22(c22, a22);
+                  case "D":
+                    return e22.$D;
+                  case "DD":
+                    return b2.s(e22.$D, 2, "0");
+                  case "d":
+                    return String(e22.$W);
+                  case "dd":
+                    return h22(n22.weekdaysMin, e22.$W, o22, 2);
+                  case "ddd":
+                    return h22(n22.weekdaysShort, e22.$W, o22, 3);
+                  case "dddd":
+                    return o22[e22.$W];
+                  case "H":
+                    return String(s22);
+                  case "HH":
+                    return b2.s(s22, 2, "0");
+                  case "h":
+                    return d22(1);
+                  case "hh":
+                    return d22(2);
+                  case "a":
+                    return $2(s22, u22, true);
+                  case "A":
+                    return $2(s22, u22, false);
+                  case "m":
+                    return String(u22);
+                  case "mm":
+                    return b2.s(u22, 2, "0");
+                  case "s":
+                    return String(e22.$s);
+                  case "ss":
+                    return b2.s(e22.$s, 2, "0");
+                  case "SSS":
+                    return b2.s(e22.$ms, 3, "0");
+                  case "Z":
+                    return i22;
+                }
+                return null;
+              }(t3) || i22.replace(":", "");
+            });
+          }, m22.utcOffset = function() {
+            return 15 * -Math.round(this.$d.getTimezoneOffset() / 15);
+          }, m22.diff = function(r22, d22, l22) {
+            var $2, y22 = this, M3 = b2.p(d22), m3 = O2(r22), v22 = (m3.utcOffset() - this.utcOffset()) * e2, g22 = this - m3, D22 = function() {
+              return b2.m(y22, m3);
+            };
+            switch (M3) {
+              case h2:
+                $2 = D22() / 12;
+                break;
+              case c2:
+                $2 = D22();
+                break;
+              case f2:
+                $2 = D22() / 3;
+                break;
+              case o2:
+                $2 = (g22 - v22) / 6048e5;
+                break;
+              case a2:
+                $2 = (g22 - v22) / 864e5;
+                break;
+              case u2:
+                $2 = g22 / n2;
+                break;
+              case s2:
+                $2 = g22 / e2;
+                break;
+              case i2:
+                $2 = g22 / t2;
+                break;
+              default:
+                $2 = g22;
+            }
+            return l22 ? $2 : b2.a($2);
+          }, m22.daysInMonth = function() {
+            return this.endOf(c2).$D;
+          }, m22.$locale = function() {
+            return D2[this.$L];
+          }, m22.locale = function(t22, e22) {
+            if (!t22)
+              return this.$L;
+            var n22 = this.clone(), r22 = w2(t22, e22, true);
+            return r22 && (n22.$L = r22), n22;
+          }, m22.clone = function() {
+            return b2.w(this.$d, this);
+          }, m22.toDate = function() {
+            return new Date(this.valueOf());
+          }, m22.toJSON = function() {
+            return this.isValid() ? this.toISOString() : null;
+          }, m22.toISOString = function() {
+            return this.$d.toISOString();
+          }, m22.toString = function() {
+            return this.$d.toUTCString();
+          }, M22;
+        }(), k2 = _.prototype;
+        return O2.prototype = k2, [["$ms", r2], ["$s", i2], ["$m", s2], ["$H", u2], ["$W", a2], ["$M", c2], ["$y", h2], ["$D", d2]].forEach(function(t22) {
+          k2[t22[1]] = function(e22) {
+            return this.$g(e22, t22[0], t22[1]);
+          };
+        }), O2.extend = function(t22, e22) {
+          return t22.$i || (t22(e22, _, O2), t22.$i = true), O2;
+        }, O2.locale = w2, O2.isDayjs = S2, O2.unix = function(t22) {
+          return O2(1e3 * t22);
+        }, O2.en = D2[g2], O2.Ls = D2, O2.p = {}, O2;
+      });
     }
-    return orientation;
+  });
+  var require_zh_cn = __commonJS({
+    "../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/locale/zh-cn.js"(exports3, module2) {
+      !function(e2, _) {
+        "object" == typeof exports3 && "undefined" != typeof module2 ? module2.exports = _(require_dayjs_min()) : "function" == typeof define && define.amd ? define(["dayjs"], _) : (e2 = "undefined" != typeof globalThis ? globalThis : e2 || self).dayjs_locale_zh_cn = _(e2.dayjs);
+      }(exports3, function(e2) {
+        function _(e22) {
+          return e22 && "object" == typeof e22 && "default" in e22 ? e22 : { default: e22 };
+        }
+        var t2 = _(e2), d2 = { name: "zh-cn", weekdays: "星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"), weekdaysShort: "周日_周一_周二_周三_周四_周五_周六".split("_"), weekdaysMin: "日_一_二_三_四_五_六".split("_"), months: "一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"), monthsShort: "1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"), ordinal: function(e22, _2) {
+          return "W" === _2 ? e22 + "周" : e22 + "日";
+        }, weekStart: 1, yearStart: 4, formats: { LT: "HH:mm", LTS: "HH:mm:ss", L: "YYYY/MM/DD", LL: "YYYY年M月D日", LLL: "YYYY年M月D日Ah点mm分", LLLL: "YYYY年M月D日ddddAh点mm分", l: "YYYY/M/D", ll: "YYYY年M月D日", lll: "YYYY年M月D日 HH:mm", llll: "YYYY年M月D日dddd HH:mm" }, relativeTime: { future: "%s内", past: "%s前", s: "几秒", m: "1 分钟", mm: "%d 分钟", h: "1 小时", hh: "%d 小时", d: "1 天", dd: "%d 天", M: "1 个月", MM: "%d 个月", y: "1 年", yy: "%d 年" }, meridiem: function(e22, _2) {
+          var t22 = 100 * e22 + _2;
+          return t22 < 600 ? "凌晨" : t22 < 900 ? "早上" : t22 < 1100 ? "上午" : t22 < 1300 ? "中午" : t22 < 1800 ? "下午" : "晚上";
+        } };
+        return t2.default.locale(d2, null, true), d2;
+      });
+    }
+  });
+  function checkDataType(tgt, type) {
+    const dataType = Object.prototype.toString.call(tgt).replace(/\[object (\w+)\]/, "$1").toLowerCase();
+    return type ? dataType === type : dataType;
   }
-  function resize(img, {
-    inputType = "image/jpeg",
-    orientation = 1,
-    // 图片的方向
-    imageWidth = -1,
-    imageHeight = -1,
-    // equalProportion = true, // 等比例拉伸
-    sideLengthLimit = 640,
-    baseOnShortSide = true,
-    // 是否以短边为基准缩放
-    resultType = "image"
-  }) {
-    let scale = 1;
-    const scaleBaseFunc = baseOnShortSide ? Math.min : Math.max;
-    if (imageWidth > 0 && imageHeight > 0) {
-      scale = sideLengthLimit / scaleBaseFunc(imageWidth, imageHeight);
-    } else if (img.width > 0 && img.height > 0) {
-      scale = sideLengthLimit / scaleBaseFunc(img.width, img.height);
-      imageWidth = img.width;
-      imageHeight = img.height;
+  function checkIsUndefined(tgt) {
+    return checkDataType(tgt, "undefined");
+  }
+  function checkIsNull(tgt) {
+    return checkDataType(tgt, "null");
+  }
+  function checkIsUndefinedOrNull(tgt) {
+    return checkIsUndefined(tgt) || checkIsNull(tgt);
+  }
+  function checkIsString(tgt) {
+    return checkDataType(tgt, "string");
+  }
+  function checkIsStringValid(tgt) {
+    if (checkDataType(tgt, "string")) {
+      return tgt !== "";
     } else {
-      return Promise.reject(new Error("image width/height 无效"));
-    }
-    const targetWidth = scale > 1 ? imageWidth : imageWidth * scale;
-    const targetHeight = scale > 1 ? imageHeight : imageHeight * scale;
-    if (resultType === "image") {
-      return image2Canvas(
-        img,
-        inputType,
-        orientation,
-        targetWidth,
-        targetHeight
-      ).then((canvas) => canvas2Image(canvas));
-    }
-    return image2Canvas(img, inputType, orientation, targetWidth, targetHeight);
-  }
-  var __defProp$3 = Object.defineProperty;
-  var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$3 = (obj, key, value) => {
-    __defNormalProp$3(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
-  };
-  class ResizeOptions {
-    // 最大边长
-    constructor(maxSideLength) {
-      __publicField$3(this, "maxSideLength");
-      if (!isDef(maxSideLength)) {
-        this.maxSideLength = MAX_SIDE_LENGTH;
-      } else {
-        this.maxSideLength = maxSideLength;
-        if (this.maxSideLength > MAX_SIDE_LENGTH) {
-          this.maxSideLength = MAX_SIDE_LENGTH;
-        } else if (this.maxSideLength < MIN_SIDE_LENGTH) {
-          this.maxSideLength = MIN_SIDE_LENGTH;
-        }
-      }
+      return false;
     }
   }
-  var __defProp$2 = Object.defineProperty;
-  var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$2 = (obj, key, value) => {
-    __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
-  };
-  class CompressOptions {
-    constructor(photoFileSizeLimit) {
-      __publicField$2(this, "photoFileSizeLimit");
-      __publicField$2(this, "checkOrientation", true);
-      if (!isDef(photoFileSizeLimit)) {
-        this.photoFileSizeLimit = PHOTO_FILE_SIZE_LIMIT;
-      } else {
-        this.photoFileSizeLimit = photoFileSizeLimit;
-      }
+  function checkIsRegExp(tgt) {
+    return checkDataType(tgt, "regexp");
+  }
+  function parseInteger(obj, defaultValue) {
+    let result = parseInt(obj, 10);
+    if (isNaN(result)) {
+      result = defaultValue || 0;
     }
+    return result;
   }
-  var __formatNumber__ = function(number) {
-    if (number < 10) {
-      return "0" + number;
+  function parseDecimal(obj, defaultValue) {
+    let result = parseFloat(obj);
+    if (isNaN(result)) {
+      result = defaultValue || 0;
     }
-    return number + "";
-  };
-  var DATE_FORMAT = {
-    // 英文简写如：12:01
+    return result;
+  }
+  var FORMAT = {
+    //英文简写如：12:01
     FORMAT_HM: "HH:mm",
-    // 英文简写如：1-12 12:01
+    //英文简写如：1-12 12:01
     FORMAT_MDHM: "MM-dd HH:mm",
-    // 中文简写如：1月12日
+    //中文简写如：1月12日
     FORMAT_MD_CN: "MM月dd日",
-    // 中文简写如：1月12日
+    //中文简写如：1月12日
     FORMAT_MD: "MM-dd",
-    // 英文简写（默认）如：2010-12-01
+    //英文简写（默认）如：2010-12-01
     FORMAT_YMD: "yyyy-MM-dd",
     FORMAT_YMD_SLASH: "yyyy/MM/dd",
-    // 英文简写（默认）如：2010-12
+    //英文简写（默认）如：2010-12
     FORMAT_YM: "yyyy-MM",
-    // 英文全称  如：2010-12-01 23:15
+    //英文全称  如：2010-12-01 23:15
     FORMAT_YMDHM: "yyyy-MM-dd HH:mm",
-    // 英文全称  如：2010-12-01 23:15:06
+    //英文全称  如：2010-12-01 23:15:06
     FORMAT_YMDHMS: "yyyy-MM-dd HH:mm:ss",
-    // 英文全称  如：2010-12-01 23:15:06
+    //英文全称  如：2010-12-01 23:15:06
     FORMAT_YMDHMSMS: "yyyy-MM-dd HH:mm:ss msms",
-    // 中文简写  如：2010年12月
+    //中文简写  如：2010年12月
     FORMAT_YM_CN: "yyyy年MM月",
-    // 中文简写  如：2010年12月01日
+    //中文简写  如：2010年12月01日
     FORMAT_YMD_CN: "yyyy年MM月dd日",
-    // 中文简写  如：2010年12月01日  12时
+    //中文简写  如：2010年12月01日  12时
     FORMAT_YMDH_CN: "yyyy年MM月dd日 HH时",
-    // 中文简写  如：12月01日  12时
+    //中文简写  如：12月01日  12时
     FORMAT_MDH_CN: "MM月dd日 HH时",
-    // 中文简写  如：2010年12月01日  12时12分
+    //中文简写  如：2010年12月01日  12时12分
     FORMAT_YMDHM_CN: "yyyy年MM月dd日 HH时mm分",
-    // 中文全称  如：2010年12月01日  23时15分06秒
+    //中文全称  如：2010年12月01日  23时15分06秒
     FORMAT_YMDHMS_CN: "yyyy年MM月dd日  HH时mm分ss秒"
   };
-  function createDate(dateObj) {
-    if (typeof dateObj === "number") {
-      return new Date(dateObj);
-    }
-    if (typeof dateObj === "string") {
-      dateObj = dateObj.replace(/-/g, "/");
-      if (dateObj.length === 7) {
-        dateObj += "/01";
-      }
-      return new Date(dateObj);
-    }
-    return dateObj;
+  function checkIsAndroid() {
+    return /android/.test(navigator.userAgent.toLowerCase());
   }
-  function formatDate(dateObj, formatType = DATE_FORMAT.FORMAT_YMDHMS) {
-    const date = createDate(dateObj);
-    let formatResult = formatType.replace(
-      "yyyy",
-      __formatNumber__(date.getFullYear())
-    );
-    formatResult = formatResult.replace(
-      "yy",
-      String(date.getFullYear()).substring(2)
-    );
-    formatResult = formatResult.replace(
-      "MM",
-      __formatNumber__(date.getMonth() + 1)
-    );
-    formatResult = formatResult.replace("dd", __formatNumber__(date.getDate()));
-    formatResult = formatResult.replace("HH", __formatNumber__(date.getHours()));
-    formatResult = formatResult.replace(
-      "mm",
-      __formatNumber__(date.getMinutes())
-    );
-    formatResult = formatResult.replace(
-      "ss",
-      __formatNumber__(date.getSeconds())
-    );
-    formatResult = formatResult.replace(
-      "msms",
-      __formatNumber__(date.getMilliseconds())
-    );
-    return formatResult;
+  function checkIsIOS() {
+    return /ios|iphone|ipad|ipod/.test(navigator.userAgent.toLowerCase());
   }
-  var __defProp$1 = Object.defineProperty;
-  var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$1 = (obj, key, value) => {
-    __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
+  function checkIsWindows() {
+    return navigator.platform.indexOf("Win") > -1;
+  }
+  var import_dayjs = __toESM(require_dayjs_min());
+  __toESM(require_zh_cn());
+  import_dayjs.default.locale("zh-cn");
+  var Point = class {
+    constructor(x2, y2) {
+      this.x = x2;
+      this.y = y2;
+    }
+  };
+  var Size = class {
+    constructor(width2, height2) {
+      this.width = width2;
+      this.height = height2;
+    }
   };
-  const clamp = (value, min, max) => Math.min(Math.max(value, min), max);
-  const subString = (str, startIndex, length) => {
-    if (!isDef(length)) {
+  var clamp = (value, min, max) => Math.min(Math.max(value, min), max);
+  var subString = (str, startIndex, length) => {
+    if (checkIsUndefinedOrNull(length)) {
       return str.substring(startIndex);
+    } else {
+      return str.substring(startIndex, startIndex + length);
     }
-    return str.substring(startIndex, startIndex + length);
   };
-  const ColorMap = {
+  var DEFAULT_ADDRESS_ICON = "data:image/png;base64,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";
+  var ColorMap = {
     transparent: "#00000000",
     white: "#FFFFFF",
     black: "#000000",
@@ -13647,21 +13794,83 @@
     }
     return null;
   }
-  const CONTENT_PADDING = 10;
-  const DEFAULT_PADDING = 2;
-  const DEFAULT_FONT_SIZE = 25;
-  const DEFAULT_CANVAS_SIZE = 480;
-  const DEFAULT_BACKGROUND_OPACITY = 128;
-  function getHeitiFontFamily() {
-    if (isAndroid()) {
-      return "'Roboto Black', 'Droid Sans'";
-    } else if (isIOS$1()) {
-      return "'PingFang SC Medium'";
+  var CONTENT_PADDING = 10;
+  var DEFAULT_PADDING = 2;
+  var DEFAULT_FONT_SIZE = 25;
+  var DEFAULT_CANVAS_SIZE = 480;
+  var DEFAULT_BACKGROUND_OPACITY = 128;
+  var LOGO_DEFAULT_PADDING = 4;
+  var WatermarkStyle = class {
+    //是否是简化配置
+    /**
+     * Watermark Style
+     * @param fontName
+     * @param fontWeight
+     * @param fontColor
+     * @param fontSize
+     * @param backgroundColor
+     * @param backgroundOpacity
+     * @param paddingTop
+     * @param paddingBottom
+     * @param position
+     * @param scale
+     * @param simplified
+     */
+    constructor(fontName, fontWeight, fontColor, fontSize, backgroundColor, backgroundOpacity, paddingTop, paddingBottom, position, scale, simplified) {
+      this.fontName = fontName;
+      this.fontWeight = fontWeight;
+      this.fontColor = fontColor;
+      this.fontSize = fontSize;
+      this.backgroundColor = backgroundColor;
+      this.backgroundOpacity = backgroundOpacity;
+      this.paddingTop = paddingTop;
+      this.paddingBottom = paddingBottom;
+      this.position = position;
+      this.scale = scale;
+      this.simplified = simplified;
+    }
+  };
+  var WatermarkImage = class {
+    constructor(image = "", width2 = 20, height2 = 20, position = 0) {
+      this.image = image;
+      this.width = width2;
+      this.height = height2;
+      this.position = position;
     }
-    return '"PingFang SC Medium", "Hiragino Sans GB", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif';
+  };
+  var Watermark = class {
+    /**
+     * 水印对象，包含需要渲染的文本、图像，以及相应的style
+     * @param content
+     * @param watermarkStyle
+     */
+    constructor(content, watermarkStyle, watermarkImage) {
+      this.content = content;
+      this.style = watermarkStyle;
+      this.watermarkImage = watermarkImage;
+    }
+  };
+  function getHeitiFontFamily(fontFamily = "") {
+    let defaultFontFamily;
+    if (checkIsWindows()) {
+      if (fontFamily.includes("黑体")) {
+        fontFamily = "";
+      }
+      defaultFontFamily = "'Roboto Black', 'Droid Sans'";
+    } else if (checkIsIOS()) {
+      if (fontFamily.includes("黑体")) {
+        fontFamily = "";
+      }
+      defaultFontFamily = "'PingFang SC Medium'";
+    } else if (checkIsAndroid()) {
+      defaultFontFamily = "'Roboto Black', 'Droid Sans'";
+    } else {
+      defaultFontFamily = '"PingFang SC Medium", "Hiragino Sans GB", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif';
+    }
+    return fontFamily ? `${fontFamily}, ${defaultFontFamily}` : defaultFontFamily;
   }
   function parseWatermarkStyle(styleString, canvasSize) {
-    if (!isValidString(styleString)) {
+    if (!checkIsStringValid(styleString)) {
       return null;
     }
     const styleParts = styleString.split("$");
@@ -13669,121 +13878,120 @@
       return null;
     }
     const scale = Math.min(canvasSize.width, canvasSize.height) / DEFAULT_CANVAS_SIZE;
-    if (parseNumber(styleParts[0], -1) !== -1) {
-      const fontSize2 = Math.round(
+    if (parseInteger(styleParts[0], -1) !== -1) {
+      const fontSize = Math.round(
         parseDecimal(styleParts[0], DEFAULT_FONT_SIZE) * scale
       );
-      let position2 = "lefttop";
+      let position = "lefttop";
       if (styleParts[1]) {
-        position2 = styleParts[1];
+        position = styleParts[1];
       }
-      let paddingTop2 = DEFAULT_PADDING * scale;
-      let paddingBottom2 = DEFAULT_PADDING * scale;
+      let paddingTop = DEFAULT_PADDING * scale;
+      let paddingBottom = DEFAULT_PADDING * scale;
       if (styleParts[2]) {
         const paddingParts = styleParts[2].split("_");
-        paddingTop2 = parseNumber(paddingParts[0], DEFAULT_PADDING) * scale;
+        paddingTop = parseInteger(paddingParts[0], DEFAULT_PADDING) * scale;
         if (paddingParts[1]) {
-          paddingBottom2 = parseNumber(paddingParts[1], DEFAULT_PADDING) * scale;
+          paddingBottom = parseInteger(paddingParts[1], DEFAULT_PADDING) * scale;
         }
       }
-      const fontName2 = getHeitiFontFamily();
-      const fontWeight2 = "normal";
-      const fontColor2 = ColorMap.transparent;
-      const backgroundColor2 = ColorMap.transparent;
-      const backgroundOpacity2 = 128;
-      return {
-        fontName: fontName2,
-        fontWeight: fontWeight2,
-        fontColor: fontColor2,
-        fontSize: fontSize2,
-        backgroundColor: backgroundColor2,
-        backgroundOpacity: backgroundOpacity2,
-        paddingTop: paddingTop2,
-        paddingBottom: paddingBottom2,
-        position: position2,
+      const fontName = getHeitiFontFamily();
+      const fontWeight = "normal";
+      const fontColor = ColorMap.transparent;
+      const backgroundColor = ColorMap.transparent;
+      const backgroundOpacity = 128;
+      return new WatermarkStyle(
+        fontName,
+        fontWeight,
+        fontColor,
+        fontSize,
+        backgroundColor,
+        backgroundOpacity,
+        paddingTop,
+        paddingBottom,
+        position,
         scale,
-        simplified: true
-      };
-    }
-    const fontName = styleParts[0] + ", " + getHeitiFontFamily();
-    let fontWeight = "normal";
-    if (styleParts[1]) {
-      fontWeight = styleParts[1];
-    }
-    let fontColor = ColorMap.white;
-    if (styleParts[2]) {
-      const color = getColorValue(styleParts[2]);
-      if (color) {
-        fontColor = color;
-      }
-    }
-    let fontSize = Math.round(DEFAULT_FONT_SIZE * scale);
-    if (styleParts[3]) {
-      fontSize = Math.round(
-        parseDecimal(styleParts[3], DEFAULT_FONT_SIZE) * scale
+        true
       );
-    }
-    let backgroundColor = ColorMap.blue;
-    if (styleParts[4]) {
-      const color = getColorValue(styleParts[4]);
-      if (color) {
-        backgroundColor = color;
+    } else {
+      const fontName = getHeitiFontFamily(styleParts[0]);
+      let fontWeight = "normal";
+      if (styleParts[1]) {
+        fontWeight = styleParts[1];
       }
-    }
-    let position = "lefttop";
-    if (styleParts[5]) {
-      position = styleParts[5];
-    }
-    let backgroundOpacity = 255;
-    if (styleParts[6]) {
-      let opacity = parseNumber(styleParts[6], DEFAULT_BACKGROUND_OPACITY);
-      opacity = clamp(opacity, 0, 255);
-      backgroundOpacity = opacity;
-    }
-    let paddingTop = DEFAULT_PADDING * scale;
-    let paddingBottom = DEFAULT_PADDING * scale;
-    if (styleParts[7]) {
-      const paddingParts = styleParts[7].split("_");
-      paddingTop = parseNumber(paddingParts[0], DEFAULT_PADDING) * scale;
-      if (paddingParts[1]) {
-        paddingBottom = parseNumber(paddingParts[1], DEFAULT_PADDING) * scale;
+      let fontColor = ColorMap.white;
+      if (styleParts[2]) {
+        const color = getColorValue(styleParts[2]);
+        if (color) {
+          fontColor = color;
+        }
       }
+      let fontSize = Math.round(DEFAULT_FONT_SIZE * scale);
+      if (styleParts[3]) {
+        fontSize = Math.round(
+          parseDecimal(styleParts[3], DEFAULT_FONT_SIZE) * scale
+        );
+      }
+      let backgroundColor = ColorMap.blue;
+      if (styleParts[4]) {
+        const color = getColorValue(styleParts[4]);
+        if (color) {
+          backgroundColor = color;
+        }
+      }
+      let position = "lefttop";
+      if (styleParts[5]) {
+        position = styleParts[5];
+      }
+      let backgroundOpacity = 255;
+      if (styleParts[6]) {
+        let opacity = parseInteger(styleParts[6], DEFAULT_BACKGROUND_OPACITY);
+        opacity = clamp(opacity, 0, 255);
+        backgroundOpacity = opacity;
+      }
+      let paddingTop = DEFAULT_PADDING * scale;
+      let paddingBottom = DEFAULT_PADDING * scale;
+      if (styleParts[7]) {
+        const paddingParts = styleParts[7].split("_");
+        paddingTop = parseInteger(paddingParts[0], DEFAULT_PADDING) * scale;
+        if (paddingParts[1]) {
+          paddingBottom = parseInteger(paddingParts[1], DEFAULT_PADDING) * scale;
+        }
+      }
+      return new WatermarkStyle(
+        fontName,
+        fontWeight,
+        fontColor,
+        fontSize,
+        backgroundColor,
+        backgroundOpacity,
+        paddingTop,
+        paddingBottom,
+        position,
+        scale,
+        false
+      );
     }
-    return {
-      fontName,
-      fontWeight,
-      fontColor,
-      fontSize,
-      backgroundColor,
-      backgroundOpacity,
-      paddingTop,
-      paddingBottom,
-      position,
-      scale,
-      simplified: false
-    };
   }
-  class TextScanner {
+  var TextScanner = class {
     /**
      * The content to scan
      * @param text
      */
     constructor(text) {
-      __publicField$1(this, "text");
-      __publicField$1(this, "cursor");
       this.text = text;
       this.cursor = 0;
     }
     hasNext(obj) {
-      if (!isDef(obj)) {
+      if (checkIsUndefinedOrNull(obj)) {
         return this.cursor < this.text.length;
-      } else if (isString(obj)) {
+      } else if (checkIsString(obj)) {
         const str = obj;
         const current2 = subString(this.text, this.cursor, str.length);
         if (current2 === str) {
           return true;
         }
-      } else if (isRegExp(obj)) {
+      } else if (checkIsRegExp(obj)) {
         const regex = obj;
         const subText = subString(this.text, this.cursor);
         const matchResults = subText.match(regex);
@@ -13796,14 +14004,14 @@
       return false;
     }
     next(obj) {
-      if (!isDef(obj)) {
+      if (checkIsUndefinedOrNull(obj)) {
         return subString(this.text, this.cursor, 1);
-      } else if (isString(obj)) {
+      } else if (checkIsString(obj)) {
         const str = obj;
         if (subString(this.text, this.cursor, str.length) === str) {
           return str;
         }
-      } else if (isRegExp(obj)) {
+      } else if (checkIsRegExp(obj)) {
         const regex = obj;
         const subText = subString(this.text, this.cursor);
         const matchResults = subText.match(regex);
@@ -13816,20 +14024,57 @@
       return null;
     }
     skip(obj) {
-      if (!isDef(obj)) {
+      if (checkIsUndefinedOrNull(obj)) {
         this.cursor += 1;
-      } else if (isValidString(obj)) {
+      } else if (checkIsStringValid(obj)) {
         const str = obj;
         this.cursor += str.length;
       }
       return this;
     }
+  };
+  function transformFormatString(format) {
+    let transformString = format;
+    if (format.includes("d")) {
+      transformString = transformString.replace(/d/g, "D");
+    }
+    if (format.includes("y")) {
+      transformString = transformString.replace(/y/g, "Y");
+    }
+    if (format.includes("E")) {
+      transformString = transformString.replace(/E/g, "d");
+    }
+    return transformString;
   }
-  function buildContent(contentConfigString, watermarkContext) {
+  function buildContent(contentConfigString, watermarkContext, style, canvasSize) {
     let content = "";
+    const watermarkImage = new WatermarkImage();
+    if (contentConfigString.includes("{logo")) {
+      const start2 = contentConfigString.indexOf("{logo");
+      const end2 = contentConfigString.indexOf("}", start2);
+      if (end2 != -1) {
+        const logoConfigWithBrace = contentConfigString.substring(start2, end2 + 1);
+        if (contentConfigString.startsWith(logoConfigWithBrace) || contentConfigString.endsWith(logoConfigWithBrace)) {
+          if (contentConfigString.startsWith(logoConfigWithBrace)) {
+            watermarkImage.position = 0;
+          } else {
+            watermarkImage.position = 1;
+          }
+          const imgWidthHeight = (style == null ? void 0 : style.fontSize) || 20;
+          watermarkImage.image = watermarkContext.logo;
+          watermarkImage.height = imgWidthHeight;
+          watermarkImage.width = imgWidthHeight;
+        }
+        contentConfigString = contentConfigString.replace(
+          logoConfigWithBrace,
+          ""
+        );
+      }
+    }
     const scanner = new TextScanner(contentConfigString);
     let steps = 0;
-    while (scanner.hasNext() && steps < contentConfigString.length) {
+    while (scanner.hasNext() && /* 防止scanner代码错误产生无限循环，设置一个最大scan步数*/
+    steps < contentConfigString.length) {
       const dateRegex = new RegExp(
         "date{(.*?)}|date"
         /* Date */
@@ -13838,28 +14083,25 @@
         const regexResult = scanner.next(dateRegex);
         if (regexResult) {
           const matchResults = regexResult;
-          let format = DATE_FORMAT.FORMAT_YMD;
+          let format = FORMAT.FORMAT_YMD;
           if (matchResults && matchResults.length >= 2) {
-            if (isValidString(matchResults[1])) {
+            if (checkIsStringValid(matchResults[1])) {
               format = matchResults[1];
             }
           }
-          if (watermarkContext) {
-            content += formatDate(watermarkContext.watermarkTime, format);
-          }
+          content += (0, import_dayjs.default)(watermarkContext.watermarkTime).format(
+            transformFormatString(format)
+          );
           scanner.skip(matchResults.input);
         }
       } else if (scanner.hasNext(
         "time"
         /* Time */
       )) {
-        if (watermarkContext) {
-          const value = formatDate(
-            watermarkContext.watermarkTime,
-            DATE_FORMAT.FORMAT_HM
-          );
-          content += value;
-        }
+        const value = (0, import_dayjs.default)(watermarkContext.watermarkTime).format(
+          FORMAT.FORMAT_HM
+        );
+        content += value;
         scanner.skip(
           "time"
           /* Time */
@@ -13868,8 +14110,12 @@
         "address"
         /* Address */
       )) {
-        if (watermarkContext) {
-          content += watermarkContext.address;
+        content += watermarkContext.address;
+        if (!watermarkImage.image) {
+          const imgWidthHeight = (style == null ? void 0 : style.fontSize) || 20;
+          watermarkImage.image = DEFAULT_ADDRESS_ICON;
+          watermarkImage.height = imgWidthHeight;
+          watermarkImage.width = imgWidthHeight;
         }
         scanner.skip(
           "address"
@@ -13879,9 +14125,7 @@
         "humanname"
         /* HumanName */
       )) {
-        if (watermarkContext) {
-          content += watermarkContext.humanName;
-        }
+        content += watermarkContext.humanName;
         scanner.skip(
           "humanname"
           /* HumanName */
@@ -13890,32 +14134,57 @@
         "projectName"
         /* ProjectName */
       )) {
-        if (watermarkContext) {
-          content += watermarkContext.projectName;
-        }
+        content += watermarkContext.projectName;
         scanner.skip(
           "projectName"
           /* ProjectName */
         );
       } else if (scanner.hasNext(
-        "{logo}"
-        /* Logo */
+        "applicationName"
+        /* ApplicationName */
       )) {
-        console.error("watermark logo ignored");
+        content += watermarkContext.applicationName;
         scanner.skip(
-          "{logo}"
-          /* Logo */
+          "applicationName"
+          /* ApplicationName */
+        );
+      } else if (scanner.hasNext(
+        "pixel"
+        /* Pixel */
+      )) {
+        content += `${canvasSize.width} * ${canvasSize.height}`;
+        scanner.skip(
+          "pixel"
+          /* Pixel */
+        );
+      } else if (scanner.hasNext(
+        "width"
+        /* Width */
+      )) {
+        content += canvasSize.width;
+        scanner.skip(
+          "width"
+          /* Width */
+        );
+      } else if (scanner.hasNext(
+        "height"
+        /* Height */
+      )) {
+        content += canvasSize.height;
+        scanner.skip(
+          "height"
+          /* Height */
         );
       } else {
         const nextChar = scanner.next();
-        if (isString(nextChar)) {
+        if (checkIsString(nextChar)) {
           content += nextChar;
         }
         scanner.skip();
       }
       steps++;
     }
-    return content;
+    return { content, watermarkImage };
   }
   function parseWatermarks(watermarkConfigString, canvasSize, watermarkContext) {
     const watermarks = [];
@@ -13927,39 +14196,55 @@
         const styleString = configParts[0];
         const contentString = configParts[1];
         const style = parseWatermarkStyle(styleString, canvasSize);
-        const content = buildContent(contentString, watermarkContext);
-        if (style && content) {
-          const watermark = {
-            content,
-            style
-          };
+        const data = buildContent(
+          contentString,
+          watermarkContext,
+          style,
+          canvasSize
+        );
+        if (style && (data.content || data.watermarkImage.image)) {
+          const watermark = new Watermark(
+            data.content,
+            style,
+            data.watermarkImage
+          );
           watermarks.push(watermark);
         }
       }
     }
     return watermarks;
   }
+  var Tile = class {
+    constructor(origin, size, lineHeight, lineWidths, lines, style, watermarkImage) {
+      this.origin = origin;
+      this.size = size;
+      this.lineHeight = lineHeight;
+      this.lineWidths = lineWidths;
+      this.lines = lines;
+      this.style = style;
+      this.watermarkImage = watermarkImage;
+    }
+  };
   function getCanvasScale(canvas, len) {
     const min = Math.min(canvas.width, canvas.height);
     return min / DEFAULT_CANVAS_SIZE * len;
   }
-  function buildTile(canvas, content, style) {
-    const origin = {
-      x: 0,
-      y: 0
-    };
-    const size = {
-      width: 0,
-      height: 0
-    };
+  function buildTile(canvas, watermark) {
+    const { content, style, watermarkImage } = watermark;
+    const origin = new Point(0, 0);
+    const size = new Size(0, 0);
     const lines = [];
     const ctx = canvas.getContext("2d");
     if (!ctx) {
       return null;
     }
+    let imageWidth = 0;
+    if (watermarkImage.image) {
+      imageWidth = watermarkImage.width + LOGO_DEFAULT_PADDING * style.scale;
+    }
     ctx.font = `${style.fontWeight} ${style.fontSize}px ${style.fontName}`;
     const contentPadding = getCanvasScale(canvas, CONTENT_PADDING);
-    const contentWidth = canvas.width - contentPadding * 2;
+    const contentWidth = canvas.width - contentPadding * 2 - imageWidth;
     const lineHeight = ctx.measureText("M").width;
     const lineWidths = [];
     let temp = "";
@@ -13967,9 +14252,11 @@
     for (let i2 = 0; i2 < content.length; i2++) {
       const lineWidth = ctx.measureText(temp).width;
       if (lineWidth >= contentWidth) {
-        lines.push(temp);
-        lineWidths.push(lineWidth);
-        temp = "";
+        const line = temp.substring(0, temp.length - 1);
+        const preLineWidth = ctx.measureText(line).width;
+        lines.push(line);
+        lineWidths.push(preLineWidth);
+        temp = temp.substring(temp.length - 1);
       }
       lastWidth = lineWidth;
       temp += content[i2];
@@ -13978,17 +14265,64 @@
     lineWidths.push(lastWidth);
     size.width = contentWidth;
     size.height = lines.length * lineHeight;
-    return { origin, size, lineHeight, lineWidths, lines, style };
+    return new Tile(
+      origin,
+      size,
+      lineHeight,
+      lineWidths,
+      lines,
+      style,
+      watermarkImage
+    );
   }
-  function getAxisPoint(canvasWidth, origin, style) {
+  function getAxisPoint(canvasWidth, width2, tile, origin, line) {
+    const { style, watermarkImage, lines, lineHeight } = tile;
     const padding = (CONTENT_PADDING + DEFAULT_PADDING) * style.scale;
-    let axisPoint = { x: padding, y: origin.y };
+    let axisPoint = new Point(padding, origin.y);
     if (style.position.startsWith("center")) {
-      axisPoint = { x: canvasWidth / 2, y: origin.y };
+      axisPoint = new Point(canvasWidth / 2, origin.y);
     } else if (style.position.startsWith("right")) {
-      axisPoint = { x: canvasWidth - padding, y: origin.y };
+      axisPoint = new Point(canvasWidth - padding, origin.y);
+    }
+    const imagePoint = new Point(axisPoint.x, axisPoint.y);
+    if (watermarkImage.image) {
+      const maxWidth = Math.max(...tile.lineWidths);
+      if (watermarkImage.position === 0) {
+        if (style.position.startsWith("left")) {
+          axisPoint.x = axisPoint.x + watermarkImage.width + LOGO_DEFAULT_PADDING * style.scale;
+        } else if (style.position.startsWith("center")) {
+          if (line) {
+            axisPoint.x = axisPoint.x + watermarkImage.width / 2 + LOGO_DEFAULT_PADDING / 2 * style.scale;
+            imagePoint.x = lines.length === 1 ? imagePoint.x - width2 / 2 - watermarkImage.width - LOGO_DEFAULT_PADDING / 2 * style.scale : imagePoint.x - maxWidth / 2 - watermarkImage.width / 2 - LOGO_DEFAULT_PADDING / 2 * style.scale;
+          } else {
+            imagePoint.x = imagePoint.x - watermarkImage.width / 2;
+          }
+        } else {
+          if (line) {
+            imagePoint.x = lines.length === 1 ? imagePoint.x - width2 - 2 * watermarkImage.width - LOGO_DEFAULT_PADDING / 2 * style.scale : imagePoint.x - maxWidth - watermarkImage.width - LOGO_DEFAULT_PADDING / 2 * style.scale;
+          } else {
+            imagePoint.x = imagePoint.x - watermarkImage.width;
+          }
+        }
+      } else {
+        if (style.position.startsWith("left")) {
+          imagePoint.x = lines.length === 1 ? axisPoint.x + width2 + watermarkImage.width + LOGO_DEFAULT_PADDING * style.scale : axisPoint.x + maxWidth + LOGO_DEFAULT_PADDING * style.scale;
+        } else if (style.position.startsWith("center")) {
+          axisPoint.x = axisPoint.x - watermarkImage.width / 2;
+          imagePoint.x = lines.length === 1 ? imagePoint.x + width2 / 2 + LOGO_DEFAULT_PADDING * style.scale : imagePoint.x + maxWidth / 2 - watermarkImage.width / 2 + LOGO_DEFAULT_PADDING * style.scale;
+        } else {
+          axisPoint.x = axisPoint.x - watermarkImage.width;
+          imagePoint.x = imagePoint.x - watermarkImage.width + LOGO_DEFAULT_PADDING / 2 * style.scale;
+        }
+      }
+      if (lines.length > 1) {
+        imagePoint.y = imagePoint.y + lines.length * lineHeight / 2 - watermarkImage.height / 2;
+      }
     }
-    return axisPoint;
+    return {
+      text: axisPoint,
+      image: imagePoint
+    };
   }
   function getTextAlign(style) {
     let align = "left";
@@ -13999,35 +14333,62 @@
     }
     return align;
   }
-  function drawLine(canvas, line, origin, style) {
-    const ctx = canvas.getContext("2d");
-    if (!ctx) {
-      return;
-    }
-    ctx.textBaseline = "top";
-    ctx.font = `${style.fontWeight} ${style.fontSize}px ${style.fontName}`;
-    const axisPoint = getAxisPoint(canvas.width, origin, style);
-    ctx.textAlign = getTextAlign(style);
-    if (style.simplified) {
-      ctx.shadowBlur = 4;
-      ctx.shadowColor = "rgba(0, 0, 0, 0.5)";
-      const offset2 = clamp(style.fontSize / 40, 2, 4);
-      ctx.shadowOffsetY = offset2;
-      ctx.shadowOffsetX = offset2;
-      ctx.fillStyle = "rgba(255,255,255, 0.5)";
-    } else {
-      ctx.fillStyle = style.fontColor;
-    }
-    ctx.fillText(line, Math.round(axisPoint.x), Math.round(axisPoint.y));
+  function loadImage(url) {
+    return new Promise((resolve, reject) => {
+      const img = new Image();
+      img.src = url;
+      img.crossOrigin = "anonymous";
+      img.onload = function(e2) {
+        if (img.complete) {
+          resolve(img);
+        } else {
+          console.error(e2);
+          reject(new Error("文件加载失败"));
+        }
+      };
+    });
+  }
+  function drawLine(canvas, line, width2, origin, tile, drawImage) {
+    return __async$1(this, null, function* () {
+      const ctx = canvas.getContext("2d");
+      if (!ctx) {
+        return;
+      }
+      const { style, watermarkImage } = tile;
+      ctx.textBaseline = "top";
+      ctx.font = `${style.fontWeight} ${style.fontSize}px ${style.fontName}`;
+      const point = getAxisPoint(canvas.width, width2, tile, origin, line);
+      ctx.textAlign = getTextAlign(style);
+      if (watermarkImage.image && drawImage) {
+        const image = yield loadImage(watermarkImage.image);
+        ctx.drawImage(
+          image,
+          Math.round(point.image.x),
+          Math.round(point.image.y),
+          watermarkImage.width,
+          watermarkImage.height
+        );
+      }
+      if (style.simplified) {
+        ctx.shadowBlur = 4;
+        ctx.shadowColor = "rgba(0, 0, 0, 0.5)";
+        const offset2 = clamp(style.fontSize / 40, 2, 4);
+        ctx.shadowOffsetY = offset2;
+        ctx.shadowOffsetX = offset2;
+        ctx.fillStyle = "rgba(255,255,255, 0.5)";
+      } else {
+        ctx.fillStyle = style.fontColor;
+      }
+      ctx.fillText(line, Math.round(point.text.x), Math.round(point.text.y));
+    });
   }
   function hexToRGB(hex, alpha) {
-    const r2 = parseInt(hex.slice(1, 3), 16);
-    const g2 = parseInt(hex.slice(3, 5), 16);
-    const b2 = parseInt(hex.slice(5, 7), 16);
+    const r2 = parseInt(hex.slice(1, 3), 16), g2 = parseInt(hex.slice(3, 5), 16), b2 = parseInt(hex.slice(5, 7), 16);
     if (alpha) {
       return "rgba(" + r2 + ", " + g2 + ", " + b2 + ", " + alpha + ")";
+    } else {
+      return "rgb(" + r2 + ", " + g2 + ", " + b2 + ")";
     }
-    return "rgb(" + r2 + ", " + g2 + ", " + b2 + ")";
   }
   function drawBackground(canvas, tile) {
     const ctx = canvas.getContext("2d");
@@ -14042,14 +14403,13 @@
     if (backgroundOpacity > 255) {
       backgroundOpacity = 255;
     }
-    const paddingTop = 2;
-    const paddingBottom = 10;
+    const { style } = tile;
+    const { paddingTop, paddingBottom } = style;
     if (backgroundColor !== "transparent") {
       if (backgroundColor.startsWith("#") && backgroundOpacity >= 0) {
         backgroundColor = hexToRGB(backgroundColor, backgroundOpacity / 255);
       }
       ctx.fillStyle = backgroundColor;
-      const { style } = tile;
       const padding = (CONTENT_PADDING + DEFAULT_PADDING) * style.scale;
       const paddingScale = tile.style.fontSize / DEFAULT_FONT_SIZE;
       for (let j = 0; j < tile.lineWidths.length; j++) {
@@ -14057,31 +14417,29 @@
         const lineWidth = tile.lineWidths[j];
         let paddingRight = 30 * paddingScale;
         let paddingLeft = 10 * paddingScale;
-        let axisPoint = {
-          x: padding - paddingLeft,
-          y: tile.origin.y
-        };
+        let axisPoint = new Point(padding - paddingLeft, tile.origin.y);
         if (style.position.startsWith("center")) {
           paddingLeft = 20 * paddingScale;
           paddingRight = 20 * paddingScale;
-          axisPoint = {
-            x: (canvas.width - lineWidth) / 2 - paddingLeft,
-            y: tile.origin.y
-          };
+          axisPoint = new Point(
+            (canvas.width - lineWidth) / 2 - paddingLeft,
+            tile.origin.y
+          );
         } else if (style.position.startsWith("right")) {
           paddingLeft = 30 * paddingScale;
           paddingRight = 10 * paddingScale;
-          axisPoint = {
-            x: canvas.width - lineWidth - padding - paddingLeft,
-            y: tile.origin.y
-          };
+          axisPoint = new Point(
+            canvas.width - lineWidth - padding - paddingLeft,
+            tile.origin.y
+          );
         }
         if (j === 0) {
+          const top2 = checkIsWindows() ? paddingTop + 6 * style.scale : paddingTop;
           ctx.fillRect(
             axisPoint.x,
-            axisPoint.y - paddingTop > 0 ? axisPoint.y - paddingTop : 0,
+            axisPoint.y - paddingTop > 0 ? axisPoint.y - top2 : 0,
             paddingLeft + lineWidth + paddingRight,
-            paddingTop
+            top2
           );
         }
         ctx.fillRect(
@@ -14091,77 +14449,89 @@
           lineHeight
         );
         if (j === tile.lineWidths.length - 1) {
+          const bottom2 = checkIsIOS() ? paddingBottom + 4 * style.scale : paddingBottom;
           ctx.fillRect(
             axisPoint.x,
             axisPoint.y + (j + 1) * lineHeight,
             paddingLeft + lineWidth + paddingRight,
-            paddingBottom
+            bottom2
           );
         }
       }
     }
   }
   function drawTile(canvas, tile) {
-    if (!tile.style.simplified) {
-      drawBackground(canvas, tile);
-    }
-    for (let i2 = 0; i2 < tile.lines.length; i2++) {
-      const origin = {
-        x: tile.origin.x,
-        y: i2 * tile.lineHeight + tile.origin.y
-      };
-      drawLine(canvas, tile.lines[i2], origin, tile.style);
-    }
+    return __async$1(this, null, function* () {
+      if (!tile.style.simplified) {
+        drawBackground(canvas, tile);
+      }
+      for (let i2 = 0; i2 < tile.lines.length; i2++) {
+        const origin = new Point(
+          tile.origin.x,
+          i2 * tile.lineHeight + tile.origin.y
+        );
+        yield drawLine(
+          canvas,
+          tile.lines[i2],
+          tile.lineWidths[i2],
+          origin,
+          tile,
+          i2 === 0
+        );
+      }
+    });
   }
   function drawGroupedWatermarks(canvas, watermarks, groupPosition) {
-    if (!watermarks || watermarks.length === 0) {
-      return;
-    }
-    const tiles = [];
-    let totalHeight = 0;
-    for (let i2 = 0; i2 < watermarks.length; i2++) {
-      const watermark = watermarks[i2];
-      const tile = buildTile(canvas, watermark.content, watermark.style);
-      if (tile) {
-        tiles.push(tile);
-        totalHeight += tile.size.height;
+    return __async$1(this, null, function* () {
+      if (!watermarks || watermarks.length === 0) {
+        return;
       }
-    }
-    if (totalHeight <= 0) {
-      console.error("watermarks height " + totalHeight);
-      console.error(JSON.stringify(watermarks));
-      return;
-    }
-    const contentPadding = getCanvasScale(canvas, CONTENT_PADDING);
-    let baseOrigin = { x: contentPadding, y: contentPadding };
-    if (groupPosition === "center") {
-      baseOrigin = {
-        x: contentPadding,
-        y: Math.round((canvas.height - totalHeight) / 2)
-      };
-    } else if (groupPosition === "bottom") {
-      baseOrigin = {
-        x: contentPadding,
-        y: canvas.height - totalHeight - contentPadding
-      };
-    } else if (groupPosition === "top") {
-      baseOrigin = { x: contentPadding, y: contentPadding };
-    }
-    let lastMarginTop = 0;
-    for (let i2 = 0; i2 < tiles.length; i2++) {
-      const tile = tiles[i2];
-      lastMarginTop += tile.style.paddingTop;
-      tile.origin = {
-        x: tile.origin.x + baseOrigin.x,
-        y: lastMarginTop + baseOrigin.y
-      };
-      lastMarginTop += tile.size.height;
-      lastMarginTop += tile.style.paddingBottom;
-    }
-    for (let i2 = 0; i2 < tiles.length; i2++) {
-      const tile = tiles[i2];
-      drawTile(canvas, tile);
-    }
+      const tiles = [];
+      let totalHeight = 0;
+      for (let i2 = 0; i2 < watermarks.length; i2++) {
+        const watermark = watermarks[i2];
+        const tile = buildTile(canvas, watermark);
+        if (tile) {
+          tiles.push(tile);
+          totalHeight += tile.size.height + CONTENT_PADDING;
+        }
+      }
+      if (totalHeight <= 0) {
+        console.error("watermarks height " + totalHeight);
+        console.error(JSON.stringify(watermarks));
+        return;
+      }
+      const contentPadding = getCanvasScale(canvas, CONTENT_PADDING);
+      let baseOrigin = new Point(contentPadding, contentPadding);
+      if (groupPosition === "center") {
+        baseOrigin = new Point(
+          contentPadding,
+          Math.round((canvas.height - totalHeight) / 2)
+        );
+      } else if (groupPosition === "bottom") {
+        baseOrigin = new Point(
+          contentPadding,
+          canvas.height - totalHeight - contentPadding
+        );
+      } else if (groupPosition === "top") {
+        baseOrigin = new Point(contentPadding, contentPadding);
+      }
+      let lastMarginTop = 0;
+      for (let i2 = 0; i2 < tiles.length; i2++) {
+        const tile = tiles[i2];
+        lastMarginTop += tile.style.paddingTop;
+        tile.origin = new Point(
+          tile.origin.x + baseOrigin.x,
+          lastMarginTop + baseOrigin.y
+        );
+        lastMarginTop += tile.size.height;
+        lastMarginTop += tile.style.paddingBottom;
+      }
+      for (let i2 = 0; i2 < tiles.length; i2++) {
+        const tile = tiles[i2];
+        yield drawTile(canvas, tile);
+      }
+    });
   }
   function groupingWatermarks(watermarks) {
     const topList = [];
@@ -14193,56 +14563,51 @@
     };
   }
   function renderWatermark(canvas, options) {
-    if (!options.enabled || options.watermarkConfigString === "no") {
-      return Promise.resolve(canvas);
-    }
-    let { watermarkConfigString } = options;
-    if (!isDef(watermarkConfigString) || watermarkConfigString === "default") {
-      watermarkConfigString = "50$lefttop$50*#*time###25$lefttop*#*date";
-    }
-    const watermarks = parseWatermarks(
-      watermarkConfigString,
-      {
-        width: canvas.width,
-        height: canvas.height
-      },
-      options.context
-    );
-    const groupedWatermarks = groupingWatermarks(watermarks);
-    drawGroupedWatermarks(
-      canvas,
-      groupedWatermarks[
+    return __async$1(this, null, function* () {
+      if (!options.enabled || options.watermarkConfigString === "no") {
+        return Promise.resolve(canvas);
+      }
+      let { watermarkConfigString = "" } = options;
+      if (watermarkConfigString === "default") {
+        watermarkConfigString = "50$lefttop$50*#*time###25$lefttop*#*date";
+      }
+      const watermarks = parseWatermarks(
+        watermarkConfigString,
+        new Size(canvas.width, canvas.height),
+        options.context
+      );
+      const groupedWatermarks = groupingWatermarks(watermarks);
+      yield drawGroupedWatermarks(
+        canvas,
+        groupedWatermarks[
+          "top"
+          /* Top */
+        ],
         "top"
         /* Top */
-      ],
-      "top"
-      /* Top */
-    );
-    drawGroupedWatermarks(
-      canvas,
-      groupedWatermarks[
+      );
+      yield drawGroupedWatermarks(
+        canvas,
+        groupedWatermarks[
+          "center"
+          /* Center */
+        ],
         "center"
         /* Center */
-      ],
-      "center"
-      /* Center */
-    );
-    drawGroupedWatermarks(
-      canvas,
-      groupedWatermarks[
+      );
+      yield drawGroupedWatermarks(
+        canvas,
+        groupedWatermarks[
+          "bottom"
+          /* Bottom */
+        ],
         "bottom"
         /* Bottom */
-      ],
-      "bottom"
-      /* Bottom */
-    );
-    return Promise.resolve(canvas);
+      );
+      return Promise.resolve(canvas);
+    });
   }
   function checkWatermarkConfigSupported(watermarkConfigString) {
-    if (watermarkConfigString.indexOf("{logo}") > -1) {
-      console.error("水印不支持logo");
-      return false;
-    }
     const configStringArray = watermarkConfigString.split("###");
     for (let i2 = 0; i2 < configStringArray.length; i2++) {
       const configString = configStringArray[i2];
@@ -14258,22 +14623,139 @@
     }
     return true;
   }
-  var __defProp = Object.defineProperty;
-  var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField = (obj, key, value) => {
-    __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
+  function file2DataURL(file) {
+    return new Promise((resolve, reject) => {
+      const a2 = new FileReader();
+      a2.onload = function(res) {
+        if (res && res.target) {
+          resolve(res.target.result);
+        } else {
+          reject(new Error("读取文件url失败"));
+        }
+      };
+      a2.readAsDataURL(file);
+    });
+  }
+  function file2Image(file) {
+    return new Promise((resolve, reject) => {
+      file2DataURL(file).then((url) => {
+        const img = new Image();
+        img.src = url;
+        img.onload = function() {
+          if (img.complete) {
+            resolve(img);
+          } else {
+            reject(new Error("文件加载失败"));
+          }
+        };
+      }).catch(reject);
+    });
+  }
+  function image2Canvas(img, type, width2, height2) {
+    const canvas = document.createElement("canvas");
+    const _width = width2 || img.width;
+    const _height = height2 || img.height;
+    canvas.width = _width;
+    canvas.height = _height;
+    const ctx = canvas.getContext("2d");
+    if (ctx) {
+      ctx.fillStyle = "transparent";
+      if (type === "image/jpeg") {
+        ctx.fillStyle = "#fff";
+      }
+      ctx.drawImage(img, 0, 0, _width, _height);
+      return Promise.resolve(canvas);
+    } else {
+      return Promise.reject(null);
+    }
+  }
+  function canvas2Image(canvas, type = "image/jpeg", quality = 0.8) {
+    const image = new Image();
+    image.src = canvas.toDataURL(type, quality);
+    return Promise.resolve(image);
+  }
+  function canvas2File(canvas, fileName, lastModified, type = "image/jpeg", quality = 0.8) {
+    return new Promise((resolve, reject) => {
+      canvas.toBlob(
+        (blob) => {
+          if (!blob) {
+            reject(new Error("canvas文件导出失败"));
+          } else {
+            const file = new File([blob], fileName, { lastModified, type });
+            resolve(file);
+          }
+        },
+        type,
+        quality
+      );
+    });
+  }
+  function resize(img, {
+    inputType = "image/jpeg",
+    imageWidth = -1,
+    imageHeight = -1,
+    sideLengthLimit = 640,
+    baseOnShortSide = true,
+    // 是否以短边为基准缩放
+    resultType = "image"
+  }) {
+    let scale = 1;
+    const scaleBaseFunc = baseOnShortSide ? Math.min : Math.max;
+    if (imageWidth > 0 && imageHeight > 0) {
+      scale = sideLengthLimit / scaleBaseFunc(imageWidth, imageHeight);
+    } else if (img.width > 0 && img.height > 0) {
+      scale = sideLengthLimit / scaleBaseFunc(img.width, img.height);
+      imageWidth = img.width;
+      imageHeight = img.height;
+    } else {
+      return Promise.reject(new Error("image width/height 无效"));
+    }
+    const targetWidth = scale > 1 ? imageWidth : imageWidth * scale;
+    const targetHeight = scale > 1 ? imageHeight : imageHeight * scale;
+    if (resultType === "image") {
+      return image2Canvas(img, inputType, targetWidth, targetHeight).then(
+        (canvas) => {
+          return canvas2Image(canvas);
+        }
+      );
+    } else {
+      return image2Canvas(img, inputType, targetWidth, targetHeight);
+    }
+  }
+  var MAX_SIDE_LENGTH = 1920;
+  var MIN_SIDE_LENGTH = 480;
+  var PHOTO_FILE_SIZE_LIMIT = 1e3;
+  var DEFAULT_JPEG_QUALITY = 0.8;
+  var MIN_JPEG_QUALITY = 0.1;
+  var JPEG_QUALITY_STEP = 0.05;
+  var ResizeOptions = class {
+    // 最大边长
+    constructor(maxSideLength) {
+      if (checkIsUndefinedOrNull(maxSideLength)) {
+        this.maxSideLength = MAX_SIDE_LENGTH;
+      } else {
+        this.maxSideLength = maxSideLength;
+        if (this.maxSideLength > MAX_SIDE_LENGTH) {
+          this.maxSideLength = MAX_SIDE_LENGTH;
+        } else if (this.maxSideLength < MIN_SIDE_LENGTH) {
+          this.maxSideLength = MIN_SIDE_LENGTH;
+        }
+      }
+    }
+  };
+  var CompressOptions = class {
+    // 图片大小限制，单位kb
+    constructor(photoFileSizeLimit) {
+      if (checkIsUndefinedOrNull(photoFileSizeLimit)) {
+        this.photoFileSizeLimit = PHOTO_FILE_SIZE_LIMIT;
+      } else {
+        this.photoFileSizeLimit = photoFileSizeLimit;
+      }
+    }
   };
-  const DEFAULT_JPEG_QUALITY = 0.8;
-  const MIN_JPEG_QUALITY = 0.1;
-  const JPEG_QUALITY_STEP = 0.05;
-  class ImageProcessor {
+  var ImageProcessor = class {
     // 压缩图片的配置
     constructor(file, resizeOptions, watermarkOptions, compressOptions) {
-      __publicField(this, "file");
-      __publicField(this, "resizeOptions");
-      __publicField(this, "watermarkOptions");
-      __publicField(this, "compressOptions");
       this.file = file;
       this.resizeOptions = resizeOptions;
       this.watermarkOptions = watermarkOptions;
@@ -14281,39 +14763,24 @@
     }
     process() {
       const filename = this.file.name;
-      let fileType = this.file.type;
       const { lastModified } = this.file;
-      let orientation = 1;
+      let fileType = this.file.type;
       if (this.file.size > this.compressOptions.photoFileSizeLimit * 1024) {
         fileType = "image/jpeg";
       }
-      if (isIOS$1() && fileType === "image/jpeg" && getIosVersion() < "13.4") {
-        const reader = new FileReader();
-        reader.readAsArrayBuffer(this.file);
-        reader.onload = function(_ref) {
-          const { target } = _ref;
-          if (target == null ? void 0 : target.result) {
-            orientation = getOrientation(target == null ? void 0 : target.result);
-          }
-        };
-      }
       if (fileType === "image/gif") {
         fileType = "image/png";
       }
-      return file2Image(this.file).then(
-        (img) => (
-          // 第一步 resize image
-          resize(img, {
-            inputType: fileType,
-            orientation,
-            sideLengthLimit: this.resizeOptions.maxSideLength,
-            resultType: "canvas"
-          })
-        )
-      ).then((result) => {
+      return file2Image(this.file).then((img) => {
+        return resize(img, {
+          inputType: fileType,
+          sideLengthLimit: this.resizeOptions.maxSideLength,
+          resultType: "canvas"
+        });
+      }).then((result) => __async$1(this, null, function* () {
         const canvas = result;
-        return renderWatermark(canvas, this.watermarkOptions);
-      }).then((canvas) => {
+        return yield renderWatermark(canvas, this.watermarkOptions);
+      })).then((canvas) => {
         const exportFilename = filename.replace(/\./g, "-") + ".jpg";
         return this.compress(
           canvas,
@@ -14335,12 +14802,13 @@
               type,
               quality - JPEG_QUALITY_STEP
             );
+          } else {
+            return Promise.resolve(file);
           }
-          return Promise.resolve(file);
         }
       );
     }
-  }
+  };
   const chooseImage = (type) => {
     return new Promise((resolve, reject) => {
       window.wx.chooseImage({
@@ -14665,7 +15133,7 @@
       };
       const transformImageFilesWithoutCompress = (files) => {
         const mediaList = files.map((file) => {
-          return file2DataURL(file).then((base64) => {
+          return file2DataURL$1(file).then((base64) => {
             const media = {
               showSrc: base64,
               type: "photo",
@@ -14732,7 +15200,7 @@
             if (!f2) {
               return Promise.resolve(null);
             }
-            return file2DataURL(f2).then((base64) => {
+            return file2DataURL$1(f2).then((base64) => {
               const uniqueFileName = getUniqueFileName(f2, "jpg");
               const media = {
                 showSrc: base64,
@@ -19099,10 +19567,10 @@
             const timestamp = (/* @__PURE__ */ new Date()).getTime();
             if (props.imageType === "png") {
               const exportFilename2 = timestamp + ".png";
-              return canvas2File(canvas, exportFilename2, timestamp, "image/png");
+              return canvas2File$1(canvas, exportFilename2, timestamp, "image/png");
             }
             const exportFilename = timestamp + ".jpg";
-            return canvas2File(canvas, exportFilename, timestamp);
+            return canvas2File$1(canvas, exportFilename, timestamp);
           }
           return Promise.resolve(null);
         })).then((results) => {
@@ -22427,7 +22895,7 @@
       });
     }
   };
-  const version = "3.1.20";
+  const version = "3.1.21";
   function install(app) {
     const components = [
       ActionSheet,