vg-print-vue2 1.0.509 → 1.0.511

package/dist/vg-print-vue2.es.js

@@ -48768,6 +48768,225 @@ function defaultTypeProvider(hiprint2) {
   };
 }
 ;
+const MIME_ALIASES = {
+  jpg: "image/jpeg",
+  jpeg: "image/jpeg",
+  png: "image/png",
+  gif: "image/gif",
+  webp: "image/webp",
+  bmp: "image/bmp",
+  svg: "image/svg+xml",
+  tif: "image/tiff",
+  tiff: "image/tiff",
+  ico: "image/x-icon",
+  avif: "image/avif",
+  heic: "image/heic",
+  heif: "image/heif"
+};
+function normalizeMime(mime) {
+  if (!mime)
+    return "";
+  const value = String(mime).trim().toLowerCase().replace(/^\./, "").split(";")[0];
+  if (MIME_ALIASES[value])
+    return MIME_ALIASES[value];
+  if (value === "image/jpg" || value === "image/pjpeg")
+    return "image/jpeg";
+  return /^image\/[a-z0-9.+-]+$/.test(value) ? value : "";
+}
+function decodeBase64Prefix(value) {
+  try {
+    const sample = value.slice(0, 512);
+    const padded = sample + "=".repeat((4 - sample.length % 4) % 4);
+    let binary;
+    if (typeof atob === "function") {
+      binary = atob(padded);
+    } else if (typeof Buffer !== "undefined") {
+      binary = Buffer.from(padded, "base64").toString("binary");
+    } else {
+      return null;
+    }
+    const bytes = new Uint8Array(binary.length);
+    for (let i3 = 0; i3 < binary.length; i3++)
+      bytes[i3] = binary.charCodeAt(i3);
+    return bytes;
+  } catch (_2) {
+    return null;
+  }
+}
+function sniffImageMime(base642) {
+  if (/^iVBORw0KGgo/.test(base642))
+    return "image/png";
+  if (/^\/9j\//.test(base642))
+    return "image/jpeg";
+  if (/^R0lGOD/.test(base642))
+    return "image/gif";
+  if (/^UklGR/.test(base642))
+    return "image/webp";
+  if (/^Qk/.test(base642))
+    return "image/bmp";
+  if (/^(?:PHN2Zy|PD94bWwg|PCEtLS)/.test(base642))
+    return "image/svg+xml";
+  const bytes = decodeBase64Prefix(base642);
+  if (!bytes || bytes.length < 12)
+    return "";
+  const ascii = Array.from(bytes, (byte) => String.fromCharCode(byte)).join("");
+  if (bytes[0] === 137 && ascii.slice(1, 4) === "PNG")
+    return "image/png";
+  if (bytes[0] === 255 && bytes[1] === 216 && bytes[2] === 255)
+    return "image/jpeg";
+  if (ascii.slice(0, 6) === "GIF87a" || ascii.slice(0, 6) === "GIF89a")
+    return "image/gif";
+  if (ascii.slice(0, 4) === "RIFF" && ascii.slice(8, 12) === "WEBP")
+    return "image/webp";
+  if (ascii.slice(0, 2) === "BM")
+    return "image/bmp";
+  if (ascii.slice(0, 4) === "II*\0" || ascii.slice(0, 4) === "MM\0*")
+    return "image/tiff";
+  if (bytes[0] === 0 && bytes[1] === 0 && bytes[2] === 1 && bytes[3] === 0)
+    return "image/x-icon";
+  if (ascii.slice(4, 8) === "ftyp") {
+    const brand = ascii.slice(8, 12).toLowerCase();
+    if (brand === "avif" || brand === "avis")
+      return "image/avif";
+    if (/^(heic|heix|hevc|hevx)$/.test(brand))
+      return "image/heic";
+    if (brand === "mif1" || brand === "msf1")
+      return "image/heif";
+  }
+  const svgText = ascii.replace(/^\u00ef\u00bb\u00bf/, "").trimStart();
+  if (/^(?:<\?xml[\s\S]*?\?>\s*)?(?:<!--[^]*?-->\s*)*<svg\b/i.test(svgText))
+    return "image/svg+xml";
+  return "";
+}
+function cleanBase64(value) {
+  const cleaned = String(value).replace(/\\r\\n|\\n|\\r/g, "").replace(/\\\//g, "/").replace(/\s+/g, "").replace(/-/g, "+").replace(/_/g, "/");
+  if (!cleaned || !/^[A-Za-z0-9+/]*={0,2}$/.test(cleaned))
+    return "";
+  const unpadded = cleaned.replace(/=+$/, "");
+  if (unpadded.length % 4 === 1)
+    return "";
+  return unpadded + "=".repeat((4 - unpadded.length % 4) % 4);
+}
+function extractImageMarkupSource(value) {
+  const imgMatch = value.match(/^<img\b[^>]*\bsrc\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s>]+))[^>]*>$/i);
+  if (imgMatch)
+    return imgMatch[1] || imgMatch[2] || imgMatch[3] || value;
+  const cssMatch = value.match(/^url\(\s*(?:"([^"]*)"|'([^']*)'|([^)]*))\s*\)$/i);
+  if (cssMatch)
+    return (cssMatch[1] || cssMatch[2] || cssMatch[3] || "").trim();
+  return value;
+}
+function normalizeImageSrc(input, mimeHint) {
+  if (input == null)
+    return "";
+  let src2 = String(input).trim();
+  if (!src2)
+    return "";
+  if (src2[0] === '"' && src2[src2.length - 1] === '"' || src2[0] === "'" && src2[src2.length - 1] === "'") {
+    src2 = src2.slice(1, -1).trim();
+  }
+  src2 = extractImageMarkupSource(src2);
+  const dataUrlMatch = src2.match(/^data:([^,]*),(.*)$/is);
+  if (dataUrlMatch) {
+    const metadata = dataUrlMatch[1];
+    if (!/;base64(?:;|$)/i.test(metadata))
+      return src2;
+    const payload2 = cleanBase64(dataUrlMatch[2]);
+    if (!payload2)
+      return src2;
+    const parts = metadata.split(";");
+    const declaredMime = normalizeMime(parts[0]);
+    const detectedMime = sniffImageMime(payload2);
+    const mime = !declaredMime || declaredMime === "image/octet-stream" ? detectedMime || normalizeMime(mimeHint) || "image/png" : declaredMime;
+    const suffix2 = parts.slice(1).filter((part) => part.toLowerCase() !== "base64");
+    return "data:" + mime + (suffix2.length ? ";" + suffix2.join(";") : "") + ";base64," + payload2;
+  }
+  if (/^(?:https?:)?\/\//i.test(src2) || /^(?:blob|file):/i.test(src2) || src2.indexOf("./") === 0 || src2.indexOf("../") === 0) {
+    return src2;
+  }
+  let explicitMime = normalizeMime(mimeHint);
+  const prefixedBase64 = src2.match(/^(?:([a-z0-9.+-]+\/[a-z0-9.+-]+);)?base64\s*,/i);
+  if (prefixedBase64) {
+    explicitMime = normalizeMime(prefixedBase64[1]) || explicitMime;
+    src2 = src2.slice(prefixedBase64[0].length);
+  }
+  const payload = cleanBase64(src2);
+  if (payload && payload.length >= 20) {
+    const detectedMime = sniffImageMime(payload);
+    if (detectedMime || explicitMime || src2[0] !== "/") {
+      const mime = detectedMime || explicitMime || "image/png";
+      return "data:" + mime + ";base64," + payload;
+    }
+  }
+  if (src2[0] === "/")
+    return src2;
+  return src2;
+}
+function waitForImage(image2, timeoutMs) {
+  const timeout = Number.isFinite(Number(timeoutMs)) ? Math.max(0, Number(timeoutMs)) : 1e4;
+  return new Promise((resolve2) => {
+    if (!image2) {
+      resolve2(false);
+      return;
+    }
+    let settled = false;
+    let timer;
+    const cleanup = () => {
+      if (timer)
+        clearTimeout(timer);
+      image2.removeEventListener && image2.removeEventListener("load", onLoad);
+      image2.removeEventListener && image2.removeEventListener("error", onError);
+    };
+    const finish = (loaded) => {
+      if (settled)
+        return;
+      settled = true;
+      cleanup();
+      resolve2(!!loaded);
+    };
+    const hasPixels = () => typeof image2.naturalWidth !== "number" || image2.naturalWidth > 0;
+    const onLoad = () => {
+      if (typeof image2.decode === "function") {
+        try {
+          Promise.resolve(image2.decode()).then(() => finish(true)).catch(() => finish(hasPixels()));
+        } catch (_2) {
+          finish(hasPixels());
+        }
+      } else {
+        finish(hasPixels());
+      }
+    };
+    const onError = () => finish(false);
+    if (image2.complete) {
+      finish(hasPixels());
+      return;
+    }
+    image2.addEventListener && image2.addEventListener("load", onLoad);
+    image2.addEventListener && image2.addEventListener("error", onError);
+    timer = setTimeout(() => finish(false), timeout);
+    if (image2.complete)
+      hasPixels() ? onLoad() : onError();
+  });
+}
+function waitForImages(root2, timeoutMs) {
+  const element2 = root2 && root2.jquery ? root2[0] : root2;
+  if (!element2)
+    return Promise.resolve([]);
+  const images = [];
+  if (element2.tagName && String(element2.tagName).toLowerCase() === "img")
+    images.push(element2);
+  if (element2.querySelectorAll)
+    images.push(...Array.from(element2.querySelectorAll("img")));
+  return Promise.all(images.map((image2) => {
+    const rawSrc = image2.getAttribute("src") || "";
+    const normalized = normalizeImageSrc(rawSrc, image2.getAttribute("data-hiprint-mime") || image2.getAttribute("data-mime"));
+    if (normalized && normalized !== rawSrc)
+      image2.setAttribute("src", normalized);
+    if (!normalized || image2.src === window.location.href)
+      return Promise.resolve(false);
+    return waitForImage(image2, timeoutMs);
+  }));
+}
 const printLockCss = `@media print {
   /* App.vue fixes the designer viewport with overflow:hidden. The browser
      print iframe copies that rule, so explicitly restore printable overflow. */
@@ -51206,7 +51425,7 @@ var hiprint$3 = function(t4) {
         designTarget: n3,
         onDrag: function onDrag(t5, i3, o2) {
           var els = n3.panel.printElements.filter(function(t6) {
-            return "block" == t6.designTarget.children().last().css("display") && t6.designTarget.children().last().hasClass("selected") && !t6.printElementType.type.includes("table");
+            return !!(t6 && t6.designTarget && t6.designTarget.length && t6.designTarget.children && t6.printElementType) && ("block" == t6.designTarget.children().last().css("display") && t6.designTarget.children().last().hasClass("selected")) && !(t6.printElementType.type || "").includes("table");
           });
           var isMultiple = els.length > 1;
           var notSelected = !n3.designTarget.children().last().hasClass("selected");
@@ -51246,7 +51465,7 @@ var hiprint$3 = function(t4) {
             hinnn.event.trigger("hiprintTemplateDataChanged_" + n3.templateId, "移动");
           _HiPrintlib__WEBPACK_IMPORTED_MODULE_6__.a.instance.draging = false, _HiPrintlib__WEBPACK_IMPORTED_MODULE_6__.a.instance.changed = false;
           var els = n3.panel.printElements.filter(function(t6) {
-            return "block" == t6.designTarget.children().last().css("display") && !t6.printElementType.type.includes("table");
+            return !!(t6 && t6.designTarget && t6.designTarget.length && t6.designTarget.children && t6.printElementType) && "block" == t6.designTarget.children().last().css("display") && !(t6.printElementType.type || "").includes("table");
           });
           if (els.length > 1) {
             els.forEach(function(t6) {
@@ -51617,7 +51836,7 @@ var hiprint$3 = function(t4) {
         v2 = "";
       var formatter2 = this.getFormatter();
       if (formatter2 && v2 !== "") {
-        v2 = formatter2(v2, this.options, t4, paperNo);
+        v2 = this._callFormatterSafely(formatter2, [v2, this.options, t4, paperNo], v2);
       }
       return v2;
     }, BasePrintElement.prototype.copyFromType = function() {
@@ -51899,6 +52118,21 @@ var hiprint$3 = function(t4) {
           console.log(t4);
         }
       return formatter;
+    }, BasePrintElement.prototype._callFormatterSafely = function(formatter2, args, fallbackValue) {
+      try {
+        return formatter2.apply(null, args || []);
+      } catch (err2) {
+        var message = err2 && err2.message ? err2.message : String(err2);
+        this._formatterErrorsLogged = this._formatterErrorsLogged || {};
+        if (!this._formatterErrorsLogged[message]) {
+          this._formatterErrorsLogged[message] = true;
+          try {
+            console.warn("[vg-print] formatter 执行失败，已回退为原始字段值：", err2);
+          } catch (_2) {
+          }
+        }
+        return fallbackValue;
+      }
     }, BasePrintElement.prototype.getStyler = function() {
       var fnstyler = void 0;
       if (this.printElementType.styler && (fnstyler = this.printElementType.styler), this.options.styler)
@@ -51932,7 +52166,7 @@ var hiprint$3 = function(t4) {
           return;
         }
         var els = n3.panel.printElements.filter(function(t5) {
-          return "block" == t5.designTarget.children().last().css("display") && !t5.printElementType.type.includes("table");
+          return !!(t5 && t5.designTarget && t5.designTarget.length && t5.designTarget.children && t5.printElementType) && "block" == t5.designTarget.children().last().css("display") && !(t5.printElementType.type || "").includes("table");
         });
         var isMultiple = els.length > 1;
         var movingDistance = _HiPrintConfig__WEBPACK_IMPORTED_MODULE_1__.a.instance.movingDistance;
@@ -52677,41 +52911,6 @@ var hiprint$3 = function(t4) {
           if ("image" == t.tableTextType) {
             r.html("");
             if (p) {
-              var normalizeImageSrc = function(src2) {
-                if (src2 == null)
-                  return "";
-                src2 = String(src2).trim();
-                if (!src2)
-                  return "";
-                if (/^data:/i.test(src2))
-                  return src2;
-                if (/^(https?:)?\/\//i.test(src2))
-                  return src2;
-                if (/^blob:/i.test(src2) || /^file:/i.test(src2))
-                  return src2;
-                if (src2[0] === "/" || src2.indexOf("./") === 0 || src2.indexOf("../") === 0)
-                  return src2;
-                if (/^[A-Za-z0-9+/=_-]+$/.test(src2) && src2.length > 80) {
-                  var head = src2.slice(0, 10);
-                  var m2;
-                  if (head.indexOf("iVBORw0") === 0)
-                    m2 = "image/png";
-                  else if (head.indexOf("/9j/") === 0)
-                    m2 = "image/jpeg";
-                  else if (head.indexOf("R0lGOD") === 0)
-                    m2 = "image/gif";
-                  else if (head.indexOf("UklGR") === 0)
-                    m2 = "image/webp";
-                  else if (head.indexOf("Qk") === 0)
-                    m2 = "image/bmp";
-                  else if (head.indexOf("PHN2Zy") === 0)
-                    m2 = "image/svg+xml";
-                  else
-                    m2 = "image/png";
-                  return "data:" + m2 + ";base64," + src2;
-                }
-                return src2;
-              };
               p = normalizeImageSrc(p);
               var imagebox = $$i('<div><img style = "max-width:100%;max-height:100%"/></div>');
               imagebox.find("img").attr("src", p);
@@ -55069,7 +55268,7 @@ var hiprint$3 = function(t4) {
       var it3 = this.list && this.list[idx2] || {};
       var overlay = $$i('<div class="hiprint-dialog-mask" style="position:fixed;left:0;top:0;width:100%;height:100%;background:rgba(0,0,0,.4);z-index:9999;"></div>');
       var dlg = $$i('<div style="position:fixed;left:50%;top:50%;transform:translate(-50%,-50%);background:#fff;padding:12px;min-width:280px;z-index:10000;box-shadow:0 2px 10px rgba(0,0,0,.2)"></div>');
-      dlg.append('<div style="text-align:center;margin-bottom:8px;"><img src="' + (it3.src || it3.url || "") + '" style="max-width:240px;max-height:160px"/></div>');
+      dlg.append('<div style="text-align:center;margin-bottom:8px;"><img src="' + normalizeImageSrc(it3.src || it3.url || "") + '" style="max-width:240px;max-height:160px"/></div>');
       dlg.append('<div style="margin:6px 0;"><input type="text" class="name-input" style="width:100%" readonly="readonly" placeholder="' + i18n.__("名称") + '" value="' + (it3.name || it3.fileName || (it3.src || it3.url || "").split("?")[0].split("/").pop()) + '"/></div>');
       dlg.append('<div style="margin:6px 0;"><textarea class="desc-input" style="width:100%;height:60px" placeholder="' + i18n.__("描述") + '">' + (it3.desc || it3.description || "") + "</textarea></div>");
       var btns = $$i('<div style="text-align:right"><button class="hiprint-option-item-settingBtn save-btn" type="button">' + i18n.__("保存") + '</button><button class="hiprint-option-item-settingBtn cancel-btn" type="button" style="margin-left:6px">' + i18n.__("取消") + "</button></div>");
@@ -62415,7 +62614,7 @@ ${i18n.__("转大小写")}
       if (!(i4.ctrlKey || i4.metaKey) && (i4.data.target.className.startsWith("resize-panel") || "2" == i4.data.target.style.zIndex || i4.data.target.className.startsWith("hiprint-printElement"))) {
         var data2 = i4.data;
         if (t5(".mouseRect").length == 0 && o3.options.designTarget && o3.options.designTarget.panel.printElements.filter(function(el2) {
-          return "block" == el2.designTarget.children().last().css("display") && !el2.printElementType.type.includes("table");
+          return !!(el2 && el2.designTarget && el2.designTarget.length && el2.designTarget.children && el2.printElementType) && "block" == el2.designTarget.children().last().css("display") && !(el2.printElementType.type || "").includes("table");
         }).length <= 1) {
           let left = window.hinnn.px.toPt(data2.left);
           let top = window.hinnn.px.toPt(data2.top);
@@ -63937,7 +64136,7 @@ ${i18n.__("转大小写")}
       if (e3 == null)
         e3 = "";
       var n3 = this.getFormatter();
-      return n3 && (e3 = n3(e3, this.options, this._currenttemplateData)), e3 == null ? "" : e3;
+      return n3 && (e3 = this._callFormatterSafely(n3, [e3, this.options, this._currenttemplateData], e3)), e3 == null ? "" : e3;
     }, e2.prototype.createTarget = function(t5, e3) {
       var n3 = $$i('<div class="hiprint-printElement hiprint-printElement-image" style="position: absolute;display:flex;flex-direction:column;"><div class="hiprint-printElement-image-title" style="text-align:left;flex:0 0 auto;display:none;"></div><div class="hiprint-printElement-image-content" style="flex:1 1 auto;min-height:0;width:100%"></div></div>');
       return this.updateTargetImage(n3, t5, e3), n3;
@@ -63951,44 +64150,7 @@ ${i18n.__("转大小写")}
     }, e2.prototype.updateDesignViewFromOptions = function() {
       this.designTarget && (this.css(this.designTarget, this.getData()), this.updateTargetImage(this.designTarget, this.getTitle(), this.getData()));
     }, e2.prototype.updateTargetImage = function(t5, e3, n3) {
-      var normalizeImageSrc2 = function(src2, mime) {
-        if (src2 == null)
-          return "";
-        src2 = String(src2).trim();
-        if (!src2)
-          return "";
-        if (/^data:/i.test(src2))
-          return src2;
-        if (/^(https?:)?\/\//i.test(src2))
-          return src2;
-        if (/^blob:/i.test(src2) || /^file:/i.test(src2))
-          return src2;
-        if (src2[0] === "/" || src2.indexOf("./") === 0 || src2.indexOf("../") === 0)
-          return src2;
-        if (/^[A-Za-z0-9+/=_-]+$/.test(src2) && src2.length > 80) {
-          var head = src2.slice(0, 10);
-          var m2 = mime;
-          if (!m2) {
-            if (head.indexOf("iVBORw0") === 0)
-              m2 = "image/png";
-            else if (head.indexOf("/9j/") === 0)
-              m2 = "image/jpeg";
-            else if (head.indexOf("R0lGOD") === 0)
-              m2 = "image/gif";
-            else if (head.indexOf("UklGR") === 0)
-              m2 = "image/webp";
-            else if (head.indexOf("Qk") === 0)
-              m2 = "image/bmp";
-            else if (head.indexOf("PHN2Zy") === 0)
-              m2 = "image/svg+xml";
-            else
-              m2 = "image/png";
-          }
-          return "data:" + m2 + ";base64," + src2;
-        }
-        return src2;
-      };
-      n3 = normalizeImageSrc2(n3, this.options && (this.options.imageMime || this.options.mime));
+      n3 = normalizeImageSrc(n3, this.options && (this.options.imageMime || this.options.mime));
       var title = t5.find(".hiprint-printElement-image-title");
       var hideTitle = this.options.hideTitle;
       if (hideTitle === "true")
@@ -64400,10 +64562,10 @@ ${i18n.__("转大小写")}
       if (this.getField()) {
         return {
           title: this.options.getHideTitle() ? "" : t5 ? t5 + "：" : "",
-          body: n3 ? n3(t5, v2, this.options, this._currenttemplateData) : v2
+          body: n3 ? this._callFormatterSafely(n3, [t5, v2, this.options, this._currenttemplateData], v2) : v2
         };
       }
-      return { title: "", body: n3 ? n3(t5, t5, this.options, this._currenttemplateData) : v2 || t5 || "" };
+      return { title: "", body: n3 ? this._callFormatterSafely(n3, [t5, t5, this.options, this._currenttemplateData], t5) : v2 || t5 || "" };
     }, e2.prototype.getStructuredContentParts = function(t5, e3) {
       var parts = this.getContentParts(t5, e3);
       if (this.getContentIndent() === 0 && !this.getField())
@@ -64466,7 +64628,7 @@ ${i18n.__("转大小写")}
     }, e2.prototype.getText = function(t5, e3) {
       var n3 = this.getFormatter();
       e3 && (e3 = 0 != this.options.leftSpaceRemoved ? e3.toString().replace(/^\s*/, "") : e3);
-      return (this.getField() ? (this.options.getHideTitle() ? "" : t5 ? t5 + "：" : "") + (n3 ? n3(t5, e3, this.options, this._currenttemplateData) : e3) : n3 ? n3(t5, t5, this.options, this._currenttemplateData) : t5 || "") || "";
+      return (this.getField() ? (this.options.getHideTitle() ? "" : t5 ? t5 + "：" : "") + (n3 ? this._callFormatterSafely(n3, [t5, e3, this.options, this._currenttemplateData], e3) : e3) : n3 ? this._callFormatterSafely(n3, [t5, t5, this.options, this._currenttemplateData], t5) : t5 || "") || "";
     }, e2.prototype.getHtml = function(t5, e3) {
       this.setCurrenttemplateData(e3), this.createTempContainer();
       var n3 = this.getPaperHtmlResult(t5, e3);
@@ -64714,11 +64876,11 @@ ${i18n.__("转大小写")}
       var bodyText;
       var useSeparateTitle = false;
       if (this.getField()) {
-        bodyText = hinnn.toUpperCase(this.options.upperCase, r2 ? r2(e3, n3, this.options, this._currenttemplateData, t5, i3) : n3);
+        bodyText = hinnn.toUpperCase(this.options.upperCase, r2 ? this._callFormatterSafely(r2, [e3, n3, this.options, this._currenttemplateData, t5, i3], n3) : n3);
         p2 = titleText + bodyText;
         useSeparateTitle = "text" == s3 && this.hasCustomTitleStyle() && !!titleText;
       } else {
-        n3 = hinnn.toUpperCase(this.options.upperCase, r2 ? r2(e3, e3, this.options, this._currenttemplateData, t5, i3) : e3);
+        n3 = hinnn.toUpperCase(this.options.upperCase, r2 ? this._callFormatterSafely(r2, [e3, e3, this.options, this._currenttemplateData, t5, i3], e3) : e3);
         p2 = n3;
       }
       if (!this.getField() && hideTitle && s3 == "text") {
@@ -65012,7 +65174,7 @@ ${i18n.__("转大小写")}
       var html2 = '<div style="display:grid;grid-template-columns:repeat(' + columns2 + ",minmax(0,1fr));gap:" + gap + 'pt;">';
       for (var i3 = 0; i3 < safeList.length; i3++) {
         var item = safeList[i3] || {};
-        var src2 = item.src || item.url || "";
+        var src2 = normalizeImageSrc(item.src || item.url || "");
         var desc = item.desc || item.description || item.name || "";
         html2 += '<div style="display:flex;flex-direction:column;align-items:center;"><div style="width:100%;height:' + itemHeight + 'pt;border:1px dashed #8aa4cc;background:#f4f8ff;display:flex;align-items:center;justify-content:center;">' + (src2 ? '<img src="' + src2 + '" style="width:100%;height:100%;object-fit:contain;display:block;" />' : '<span style="color:#6b7fa3;font-size:10pt;">' + i18n.__("图片占位") + "</span>") + '</div><div style="margin-top:4pt;text-align:center;">' + (desc || "") + "</div></div>";
       }
@@ -72269,46 +72431,9 @@ ${i18n.__("转大小写")}
         const mode = this && this._imgMode ? String(this._imgMode) : "base64";
         const imgs = root2 && root2.querySelectorAll ? root2.querySelectorAll("img") : [];
         const tasks = [];
-        const normalizeImageSrc2 = function(src2, mime) {
-          if (src2 == null)
-            return "";
-          src2 = String(src2).trim();
-          if (!src2)
-            return "";
-          if (/^data:/i.test(src2))
-            return src2;
-          if (/^(https?:)?\/\//i.test(src2))
-            return src2;
-          if (/^blob:/i.test(src2) || /^file:/i.test(src2))
-            return src2;
-          if (src2[0] === "/" || src2.indexOf("./") === 0 || src2.indexOf("../") === 0)
-            return src2;
-          if (/^[A-Za-z0-9+/=_-]+$/.test(src2) && src2.length > 80) {
-            var head = src2.slice(0, 10);
-            var m2 = mime;
-            if (!m2) {
-              if (head.indexOf("iVBORw0") === 0)
-                m2 = "image/png";
-              else if (head.indexOf("/9j/") === 0)
-                m2 = "image/jpeg";
-              else if (head.indexOf("R0lGOD") === 0)
-                m2 = "image/gif";
-              else if (head.indexOf("UklGR") === 0)
-                m2 = "image/webp";
-              else if (head.indexOf("Qk") === 0)
-                m2 = "image/bmp";
-              else if (head.indexOf("PHN2Zy") === 0)
-                m2 = "image/svg+xml";
-              else
-                m2 = "image/png";
-            }
-            return "data:" + m2 + ";base64," + src2;
-          }
-          return src2;
-        };
         imgs.forEach((img) => {
           let src2 = img.getAttribute("src") || "";
-          var normalized = normalizeImageSrc2(src2, img.getAttribute("data-hiprint-mime") || img.getAttribute("data-mime"));
+          var normalized = normalizeImageSrc(src2, img.getAttribute("data-hiprint-mime") || img.getAttribute("data-mime"));
           if (normalized && normalized !== src2) {
             try {
               img.setAttribute("src", normalized);
@@ -72316,8 +72441,12 @@ ${i18n.__("转大小写")}
             }
             src2 = normalized;
           }
-          if (!src2 || src2.indexOf("base64") !== -1 || src2 === window.location.href)
+          if (!src2 || src2 === window.location.href)
+            return;
+          if (/^data:/i.test(src2)) {
+            tasks.push(waitForImage(img, 1e4));
             return;
+          }
           tasks.push(async function() {
             if (mode === "absolute") {
               try {
@@ -72326,6 +72455,7 @@ ${i18n.__("转大小写")}
                 img.setAttribute("src", a2.href);
               } catch (_2) {
               }
+              await waitForImage(img, 1e4);
               return;
             }
             try {
@@ -72366,6 +72496,7 @@ ${i18n.__("转大小写")}
                   });
                 } catch (_2) {
                 }
+                await waitForImage(img, 1e4);
                 return;
               }
             } catch (_2) {
@@ -72399,6 +72530,7 @@ ${i18n.__("转大小写")}
                 };
                 image2.src = src2;
               });
+              await waitForImage(img, 1e4);
               return;
             } catch (_2) {
             }
@@ -73432,16 +73564,12 @@ ${i18n.__("转大小写")}
       return null == e2 && (e2 = 0), this.printPanels[e2].getElementByName(t5);
     }, t4.prototype.getPanel = function(t5) {
       return null == t5 && (t5 = 0), this.printPanels[t5];
-    }, t4.prototype.loadAllImages = function(t5, e2, n3) {
-      var i3 = this;
-      null == n3 && (n3 = 0);
-      for (var o2 = t5[0].getElementsByTagName("img"), r2 = true, a2 = 0; a2 < o2.length; a2++) {
-        var p2 = o2[a2];
-        p2.src && p2.src !== window.location.href && -1 == p2.src.indexOf("base64") && (p2 && void 0 !== p2.naturalWidth && 0 !== p2.naturalWidth && p2.complete || (r2 = false));
-      }
-      n3++, !r2 && n3 < 10 ? setTimeout(function() {
-        i3.loadAllImages(t5, e2, n3);
-      }, 500) : e2();
+    }, t4.prototype.loadAllImages = function(t5, e2) {
+      waitForImages(t5 && t5[0], 1e4).then(function() {
+        e2();
+      }, function() {
+        e2();
+      });
     }, t4.prototype.setFontList = function(t5) {
       this.fontList = t5;
     }, t4.prototype.getFontList = function() {
@@ -77759,7 +77887,7 @@ async function ensureHttpClient() {
 }
 const name = "vg-print-vue2";
 const description = "vg-print supports visual drag and drop design templates, with functions such as previewing and exporting PDFs/images. Silent printing can be achieved in conjunction with a dedicated client";
-const version = "1.0.509";
+const version = "1.0.511";
 const author = "gmcSimple";
 const license = "MIT";
 const main = "dist/vg-print-vue2.cjs.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vg-print-vue2",
   "description": "vg-print supports visual drag and drop design templates, with functions such as previewing and exporting PDFs/images. Silent printing can be achieved in conjunction with a dedicated client",
-  "version": "1.0.509",
+  "version": "1.0.511",
   "author": "gmcSimple",
   "license": "MIT",
   "main": "dist/vg-print-vue2.cjs.js",