hoeditor-web 3.2.78 → 3.2.79

package/lib/hoeditor.mjs

@@ -1,5 +1,5 @@
 import "vue";
-import { H as i, d as r, b as e, a as l, e as t, T as H, f as d, i as f } from "./index-CBXVRb8b.mjs";
+import { H as i, d as r, b as e, a as l, e as t, T as H, f as d, i as f } from "./index-RSacoGIm.mjs";
 export {
   i as HoDocs,
   r as HoEditorProvide,

package/lib/{index-CBXVRb8b.mjs → index-RSacoGIm.mjs}

@@ -14966,7 +14966,7 @@ class DrawSignNode extends DrawCombineNode {
     }
   }
 }
-const version = "3.2.78";
+const version = "3.2.79";
 var FingerPosition = /* @__PURE__ */ ((a) => (a[a.left = 0] = "left", a[a.center = 1] = "center", a[a.right = 2] = "right", a))(FingerPosition || {});
 class SignNode extends BaseNode {
   constructor(hoEditorFactoryID, rootNodes, pNode, nodeType, number, type, name, signType, signFormat, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, isTemplate, styleIndex, connectMode, isFront, allowEditSignTime, fingerPrintSrc, fingerPosition, attribute, connectChar, otherProperties, dataId, associatedElement, isTemp, innerIdentifier) {
@@ -37869,7 +37869,7 @@ class DrawImageNode extends DrawCombineNode {
       }
       this.updateSign(), n.loadImageCount--;
     }, this.markImagePath != "" && this.insertMarkImage(), o.onerror = () => {
-      if (n.loadImageCount--, !r.node.isBackFill) {
+      if (n.loadImageCount--, n.loadImageErrorCount++, !r.node.isBackFill) {
         const l = this.node.previousLeaf().getNodePath();
         n.docTree.deleteNode(this.node);
         const c = new NodeChangeEvent(this._hoEditorFactoryID, DocAction.daModifyStyle, l, l);
@@ -48191,7 +48191,7 @@ class VueController {
   }
   /**
    * 浏览 编辑 审阅 状态切换
-   * @status number 0:设计模式 1: 编辑模式  2:打印预览  4: 审阅模式  5: 浏览(只读)模式 6 留痕预览
+   * @status number 0:设计模式 1: 编辑模式  2:打印预览  4: 审阅模式  5: 浏览(只读)模式 6 留痕 7留痕预览
    * @printStatus 0：打印鼠标点击位置 1：打印鼠标选中 2：打印全部 3：续打
    */
   setEditorStatus(t, r) {
@@ -52651,7 +52651,7 @@ class VueController {
           text: d.text,
           nodeType: "ntText",
           path: this.getPathByNode(d)
-        }) : d instanceof TextInputFieldNode && s(d.childNodes);
+        }) : d.childNodes && d.childNodes.length && s(d.childNodes);
       }
     };
     return s(r.docTree.mainNodes), t;
@@ -64619,7 +64619,7 @@ WebPDecoder.prototype.getData = function() {
 (function(a) {
   function t() {
     return function() {
-      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-B0Oke-34.mjs");
+      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-CyxgRuIp.mjs");
     }().catch(function(r) {
       return Promise.reject(new Error("Could not load canvg: " + r));
     }).then(function(r) {
@@ -65897,7 +65897,9 @@ class PrintController {
   async createBase64(t, r) {
     if (!this._isSetFont)
       return;
-    const o = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID), n = o.docTree.curDomRange.normalize().endPath, s = o.drawTree.paintStatus, l = o.vueController.getDocXml(!1), c = o.pageProperty.widthMm > o.pageProperty.heightMm ? "l" : "p", d = [o.pageProperty.widthPixes, o.pageProperty.heightPixes], u = {
+    const o = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
+    o.loadImageErrorCount = 0;
+    const n = o.docTree.curDomRange.normalize().endPath, s = o.drawTree.paintStatus, l = o.vueController.getDocXml(!1), c = o.pageProperty.widthMm > o.pageProperty.heightMm ? "l" : "p", d = [o.pageProperty.widthPixes, o.pageProperty.heightPixes], u = {
       orientation: c,
       unit: "px",
       format: d,
@@ -65906,31 +65908,42 @@ class PrintController {
     };
     this.clearJsPDF(), this.PDF = new jsPDF(u);
     let f = Promise.resolve();
-    f = f.then(() => new Promise((m) => {
-      o.printStatus.printMode = 0, o.drawTree.paintStatus = PaintState.psPreview, o.drawTree.rebuildAllDrawLine(!1, m, !1);
-    })), f = f.then(() => new Promise((m) => {
-      Print.createPDFBase64(this._hoEditorFactoryID, m, this.PDF);
+    const p = (g) => {
+      o.vueController.waitLoadImageCount(() => g());
+    };
+    f = f.then(() => new Promise((g) => {
+      o.printStatus.printMode = 0, o.drawTree.paintStatus = PaintState.psPreview, o.drawTree.rebuildAllDrawLine(!1, p(g), !1);
+    })), f = f.then(() => new Promise((g) => {
+      o.loadImageErrorCount > 0 ? g() : Print.createPDFBase64(this._hoEditorFactoryID, g, this.PDF);
     }));
-    const p = await f.then((m) => (o.drawTree.paintStatus = s, new Promise((g) => {
+    const m = await f.then((g) => (o.drawTree.paintStatus = s, new Promise((y) => {
       o.vueController.openXml(l).then(() => {
-        var v, C;
-        const y = this.PDF.internal.getNumberOfPages() - m;
-        if (y >= 2)
-          for (let _ = 0; _ < y; _++)
-            (v = this.PDF) == null || v.deletePage(1);
-        else y <= 1 && ((C = this.PDF) == null || C.deletePage(1));
-        let w = "";
-        r == "url" ? w = this.PDF.output("bloburl") : w = this.PDF.output("datauristring"), t && o.vueController.waitLoadImageCount(() => {
-          t({
-            page: m,
-            pdf: w.replace(/^data:application\/pdf;filename=generated.pdf;base64,/, "")
-          });
-        }), g(w);
+        var w, v;
+        if (o.loadImageErrorCount === 0) {
+          const C = this.PDF.internal.getNumberOfPages() - g;
+          if (C >= 2)
+            for (let D = 0; D < C; D++)
+              (w = this.PDF) == null || w.deletePage(1);
+          else C <= 1 && ((v = this.PDF) == null || v.deletePage(1));
+          let _ = "";
+          r == "url" ? _ = this.PDF.output("bloburl") : _ = this.PDF.output("datauristring"), t && o.vueController.waitLoadImageCount(() => {
+            t({
+              page: g,
+              pdf: _.replace(/^data:application\/pdf;filename=generated.pdf;base64,/, "")
+            });
+          }), y(_);
+        } else
+          t && o.vueController.waitLoadImageCount(() => {
+            t({
+              page: g,
+              pdf: ""
+            });
+          }), y("");
       });
     })));
-    return p ? (setTimeout(() => {
+    return m ? (setTimeout(() => {
       (o.drawTree.drawPages || []).length && o.vueController.moveCaretToPath(n), this.clearJsPDF();
-    }, 0), r == "url" ? p : p.replace(/^data:application\/pdf;filename=generated.pdf;base64,/, "")) : null;
+    }, 0), r == "url" ? m : m.replace(/^data:application\/pdf;filename=generated.pdf;base64,/, "")) : null;
   }
   /**
    * 加载字体
@@ -72206,6 +72219,8 @@ class HOEditorFactory {
     // 元素是否默认可以被删除
     b(this, "_loadImageCount", 0);
     // 待加载的图片数量
+    b(this, "_loadImageErrorCount", 0);
+    // 加载错误数量
     b(this, "_loadImageCallback", null);
     // 图片加载完成回调
     b(this, "_aiTextFunc", null);
@@ -72634,6 +72649,12 @@ class HOEditorFactory {
   set loadImageCount(t) {
     this._loadImageCount !== t && (this._loadImageCount = t), this._loadImageCount <= 0 && this._loadImageCallback && (this._loadImageCallback(), this._loadImageCallback = null);
   }
+  get loadImageErrorCount() {
+    return this._loadImageErrorCount;
+  }
+  set loadImageErrorCount(t) {
+    this._loadImageErrorCount !== t && (this._loadImageErrorCount = t);
+  }
   set loadImageCallback(t) {
     this._loadImageCallback = t;
   }

package/lib/{index.es-B0Oke-34.mjs → index.es-CyxgRuIp.mjs}

@@ -1,4 +1,4 @@
-import { c as Da, _ as Va, g as il } from "./index-CBXVRb8b.mjs";
+import { c as Da, _ as Va, g as il } from "./index-RSacoGIm.mjs";
 var fn = {}, cn = {}, cr, vn;
 function Q() {
   if (vn) return cr;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hoeditor-web",
-    "version": "3.2.78",
+    "version": "3.2.79",
     "private": false,
     "main": "lib/hoeditor.mjs",
     "typings": "types/index.d.ts",