hoeditor-web 3.2.79 → 3.2.81

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-RSacoGIm.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-cxRdLTBd.mjs";
 export {
   i as HoDocs,
   r as HoEditorProvide,

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

@@ -10510,21 +10510,20 @@ let TableFormula$1 = class _TableFormula extends ControlNode {
           const y = r.rows[d][u];
           if (y) {
             const w = y.getCellText(), v = (C) => {
-              const _ = [0, 0, 0], D = (T) => {
-                T.includes("秒") && (_[2] = Number(T.split("秒")[0]));
-              }, E = (T) => {
-                if (T.includes("分")) {
-                  const I = T.split("分");
-                  _[1] = Number(I[0]), I.length > 1 && D(I[1]);
-                } else
-                  D(T);
-              };
-              if (C.includes("小时")) {
-                const T = C.split("小时");
-                _[0] = Number(T[0]), T.length > 1 && E(T[1]);
-              } else
-                E(C);
-              return _;
+              if (C.includes("/") && (C.includes(":") || C.includes("："))) {
+                const E = new Date(C);
+                if (!isNaN(E.getTime()))
+                  return [E.getHours(), E.getMinutes(), E.getSeconds()];
+              }
+              const _ = [
+                { regex: /(\\d+)小时/, index: 0 },
+                { regex: /(\\d+)分/, index: 1 },
+                { regex: /(\\d+)秒/, index: 2 }
+              ], D = [0, 0, 0];
+              return _.forEach(({ regex: E, index: T }) => {
+                const I = C.match(E);
+                I && (D[T] = parseInt(I[1], 10));
+              }), D;
             };
             if (m.length > 0 && g.length > 0 && w.length > 0) {
               const [C, _, D] = v(m), [E, T, I] = v(g), [M, R, A] = v(w);
@@ -14685,6 +14684,46 @@ var module = { exports: {} }, exports = module.exports;
 }).call(void 0);
 const __CJS__export_default__ = (module.exports == null ? {} : module.exports).default || module.exports;
 (module.exports == null ? {} : module.exports).EXIF;
+class ImageManager {
+  // 毫秒
+  constructor(t) {
+    b(this, "hoEditorFactoryID");
+    b(this, "_imageQueue", []);
+    b(this, "_isProcessing", !1);
+    b(this, "THROTTLE_DELAY", 100);
+    this.hoEditorFactoryID = t;
+  }
+  updateSign(t) {
+    const r = t instanceof DrawSignNode, o = HOEditorFactorys.instance().getFactory(this.hoEditorFactoryID), n = o.drawPageTree.getMainRootArea(t);
+    if (n && o.drawTree.drawPages[n.index]) {
+      const s = o.subDocManger.getHeaderFooterType(t.node.getNodePath());
+      (s === HeaderFooterType.hftHead && n != o.drawTree.drawPages[n.index].drawHeader || s === HeaderFooterType.hftFoot && n != o.drawTree.drawPages[n.index].drawFooter) && (r ? o.subDocManger.copySubDocToPages(n, n.index, s) : o.subDocManger.updateAllSameSubDoc(n.index, s, !1, !1));
+    }
+    o.loadSignImageCount == 0 && o.loadImageCount == 0 && o.drawTree.rebuildArea("main", !1);
+  }
+  processImageQueue() {
+    this._imageQueue.length > 0 ? this._imageQueue.shift().then((r) => {
+      setTimeout(() => this.processImageQueue(), this.THROTTLE_DELAY), this.processImageQueue();
+    }) : this._isProcessing = !1;
+  }
+  addImageQueue(t) {
+    const r = HOEditorFactorys.instance().getFactory(this.hoEditorFactoryID);
+    r.drawTree.paintStatus === PaintState$1.psPreview && r.isFixPrint ? (this._imageQueue.push(t), this._isProcessing || (this._isProcessing = !0, this.processImageQueue())) : t.then((o) => {
+    });
+  }
+  loadImage(t) {
+    const r = HOEditorFactorys.instance().getFactory(this.hoEditorFactoryID);
+    r.loadImageCount++, t instanceof DrawSignNode && r.loadSignImageCount++;
+  }
+  onSuccessCallBack(t) {
+    const r = HOEditorFactorys.instance().getFactory(this.hoEditorFactoryID);
+    r.loadImageCount--, t instanceof DrawSignNode && r.loadSignImageCount--, this.updateSign(t);
+  }
+  onErrorCallBack(t) {
+    const r = HOEditorFactorys.instance().getFactory(this.hoEditorFactoryID);
+    r.loadImageCount--, r.loadImageErrorCount++, t instanceof DrawSignNode && r.loadSignImageCount--;
+  }
+}
 class DrawSignNode extends DrawCombineNode {
   constructor(r, o, n, s, l, c, d, u, f, p, m, g, y, w, v, C) {
     super(r, o, n, 0);
@@ -14710,7 +14749,8 @@ class DrawSignNode extends DrawCombineNode {
     b(this, "_timePosition", "0");
     //日期位置  1放签名右侧  其它：放签名下面
     b(this, "_exif", null);
-    this._number = s, this._imgSrc = d, this._type = l, this._signName = c, this._fingerPrintSrc = m, this._fingerPosition = g, this._attribute = y, this._connectChar = v, this._textStyle = p.getStyleKey(), this._signTime = C && C.time ? C.time : "", this._abi02 = w && w.abi02 ? w.abi02 : "", this._title = C && C.title ? C.title : "";
+    b(this, "_imageManager");
+    this._imageManager = new ImageManager(r), this._number = s, this._imgSrc = d, this._type = l, this._signName = c, this._fingerPrintSrc = m, this._fingerPosition = g, this._attribute = y, this._connectChar = v, this._textStyle = p.getStyleKey(), this._signTime = C && C.time ? C.time : "", this._abi02 = w && w.abi02 ? w.abi02 : "", this._title = C && C.title ? C.title : "";
     const _ = !!(C && (C.isDisplayTitle == "true" || C.isDisplayTitle == !0)), D = !!(C && (C.isDisplayTime == "true" || C.isDisplayTime == !0));
     this.attribute === 4 && (_ ? this._title == "" && (this._title = this._abi02) : this._title = "", D ? this._timePosition = C && C.timePosition ? C.timePosition : "" : this._signTime = ""), this._title != "" && (this._drawTitle = new createjs$1.Text(this.title + this._connectChar, this._textStyle, "#000000")), this._signTime != "" && (this.attribute === 4 ? this._drawDate = new createjs$1.Text(this.signTime, this._textStyle, "#000000") : this._drawDate = new createjs$1.Text(this.signTime.substring(0, 16), this._textStyle, "#000000"));
     const E = HOEditorFactorys.instance().getFactory(r);
@@ -14814,118 +14854,129 @@ class DrawSignNode extends DrawCombineNode {
   set timePosition(r) {
     this._timePosition !== r && (this._timePosition = r);
   }
+  drawSignNodeAfter() {
+    const r = this, o = HOEditorFactorys.instance().getFactory(r.node.hoEditorFactoryID), n = o.drawPageTree.getMainRootArea(r);
+    if (n) {
+      const s = o.subDocManger.getHeaderFooterType(r.node.getNodePath());
+      (s === HeaderFooterType.hftHead && n != o.drawTree.drawPages[n.index].drawHeader || s === HeaderFooterType.hftFoot && n != o.drawTree.drawPages[n.index].drawFooter) && o.subDocManger.copySubDocToPages(n, n.index, s);
+    }
+    r.imgSrc && (o.loadImageCount--, o.loadSignImageCount--), r.fingerPrintSrc && (o.loadImageCount--, o.loadSignImageCount--), o.loadSignImageCount == 0 && o.drawTree.rebuildArea("main", !1);
+  }
   drawWriteSignNode(r) {
     this.clear();
-    const o = this, n = HOEditorFactorys.instance().getFactory(o.node.hoEditorFactoryID), s = () => {
+    const o = this, n = HOEditorFactorys.instance().getFactory(o.node.hoEditorFactoryID);
+    (() => {
       if (this.type === 1 || this.type === 3) {
-        const c = n.drawTree.caret.height;
+        const l = n.drawTree.caret.height;
         if (r.type = 3, this.imgSrc == "" && this.fingerPrintSrc) {
-          let d = o.fingerPosition == FingerPosition.center ? 0.3 : 0.15;
-          const u = 256;
-          this._dWidth = u * d, r.imgWidth = this._dWidth;
-          const f = new Image();
-          let p;
-          f.src = this.fingerPrintSrc, p = new createjs$1.Bitmap(f), p.setBounds(0, 0, r.imgWidth, r.imgHeight), o.addChildAt(p, 0), n.loadImageCount++, f.onerror = () => n.loadImageCount--, f.onload = () => {
-            const m = f.naturalHeight !== 0 ? f.naturalHeight : f.height, g = f.naturalWidth !== 0 ? f.naturalWidth : f.width;
-            n.patientFingerHeight != 0 && (d = n.patientFingerHeight / m), p.y = -m * d, p.x = 0, r.imgHeight = m * d, r.imgWidth = g * d, this._dWidth = r.imgWidth, this._dHeight = r.imgHeight, r.type = 3, p.setTransform(p.x, p.y, d, d), l();
+          let c = o.fingerPosition == FingerPosition.center ? 0.3 : 0.15;
+          const d = 256;
+          this._dWidth = d * c, r.imgWidth = this._dWidth;
+          const u = new Image();
+          let f;
+          u.src = this.fingerPrintSrc, f = new createjs$1.Bitmap(u), f.setBounds(0, 0, r.imgWidth, r.imgHeight), o.addChildAt(f, 0), this._imageManager.loadImage(this), u.onerror = () => {
+            this._imageManager.onErrorCallBack(this);
+          }, u.onload = () => {
+            const p = u.naturalHeight !== 0 ? u.naturalHeight : u.height, m = u.naturalWidth !== 0 ? u.naturalWidth : u.width;
+            n.patientFingerHeight != 0 && (c = n.patientFingerHeight / p), f.y = -p * c, f.x = 0, r.imgHeight = p * c, r.imgWidth = m * c, this._dWidth = r.imgWidth, this._dHeight = r.imgHeight, r.type = 3, f.setTransform(f.x, f.y, c, c), this._imageManager.onSuccessCallBack(this);
           };
-        } else {
-          const d = new Image();
-          d.src = this.imgSrc;
-          const u = new createjs$1.Bitmap(d);
-          u.y = 0, u.x = 0, u.setBounds(0, 0, o.dWidth, o.dHeight), r.imgWidth && (this._dWidth = r.imgWidth), o.addChildAt(u, 0);
-          const f = new Image();
-          let p;
-          o.fingerPrintSrc !== "" && (f.src = this.fingerPrintSrc, p = new createjs$1.Bitmap(f), p.setBounds(0, 0, r.imgWidth, r.imgHeight), o.addChildAt(p, 1), n.loadImageCount++, f.onerror = () => n.loadImageCount--), n.loadImageCount++, d.onerror = () => n.loadImageCount--, d.onload = () => {
-            const m = d.naturalWidth !== 0 ? d.naturalWidth : d.width, g = d.naturalHeight !== 0 ? d.naturalHeight : d.height;
-            let y = n.signHeight / g < 0.4 ? 0.4 : n.signHeight / g > 0.7 ? 1 : n.signHeight / g;
-            if (o.fingerPosition == FingerPosition.center && n.signHeight / g < 0.2 && (y = n.signHeight * 1.5 / g), n.patientSignHeight != 0 && (y = n.patientSignHeight / g), this._dWidth = m * y, o.fingerPrintSrc !== "")
-              f.onload = () => {
-                let w = f.naturalWidth;
-                const v = f.naturalHeight !== 0 ? f.naturalHeight : f.height;
-                let C = o.fingerPosition == FingerPosition.center ? 0.3 : 0.15;
-                w !== 256 && (C = 1), n.patientFingerHeight != 0 && (C = n.patientFingerHeight / v), p.scaleX = C, p.scaleY = C, p.y = -v * C, u.y = -g * y, o.fingerPosition == FingerPosition.left ? (u.x = w * C + 5, p.x = 0, this._dWidth = m * y + 5 + w * C, r.imgHeight = Math.floor(Math.max(v * C, g * y)), this._dHeight = r.imgHeight) : o.fingerPosition == FingerPosition.center ? (p.x = (m * y - w * C) / 2, p.y = -(v * C + c) / 2, u.y = -(g * y + c) / 2, r.imgHeight = n.signHeight) : o.fingerPosition == FingerPosition.right && (p.x = m * y + 5, this._dWidth = m * y + 5 + w * C, r.imgHeight = Math.floor(Math.max(v * C, g * y)), this._dHeight = r.imgHeight), r.imgWidth = this._dWidth, o.fingerPosition == FingerPosition.center && (this._dWidth = 0, this._dHeight = 0), u.setTransform(u.x, u.y, y, y), p.setTransform(p.x, p.y, C, C);
-                const _ = new createjs$1.Shape();
-                _.graphics.beginFill("#000000").drawRect(p.x, 0, w * C, v * C), u.hitArea = _, p.hitArea = _, l();
+        } else
+          this._imageManager.addImageQueue(new Promise((c) => {
+            const d = new Image();
+            d.src = this.imgSrc;
+            const u = new createjs$1.Bitmap(d);
+            u.y = 0, u.x = 0, u.setBounds(0, 0, o.dWidth, o.dHeight), r.imgWidth && (this._dWidth = r.imgWidth), o.addChildAt(u, 0), this._imageManager.loadImage(this), d.onerror = () => {
+              this._imageManager.onErrorCallBack(this);
+            }, d.onload = () => {
+              const f = () => {
+                const p = d.naturalWidth !== 0 ? d.naturalWidth : d.width, m = d.naturalHeight !== 0 ? d.naturalHeight : d.height;
+                let g = n.signHeight / m < 0.4 ? 0.4 : n.signHeight / m > 0.7 ? 1 : n.signHeight / m;
+                if (o.fingerPosition == FingerPosition.center && n.signHeight / m < 0.2 && (g = n.signHeight * 1.5 / m), n.patientSignHeight != 0 && (g = n.patientSignHeight / m), this._dWidth = p * g, o.fingerPrintSrc !== "")
+                  this._imageManager.addImageQueue(new Promise((y) => {
+                    const w = new Image();
+                    let v;
+                    w.src = this.fingerPrintSrc, v = new createjs$1.Bitmap(w), v.setBounds(0, 0, r.imgWidth, r.imgHeight), o.addChildAt(v, 1), this._imageManager.loadImage(this), w.onerror = () => {
+                      this._imageManager.onErrorCallBack(this), y(o);
+                    }, w.onload = () => {
+                      let C = w.naturalWidth;
+                      const _ = w.naturalHeight !== 0 ? w.naturalHeight : w.height;
+                      let D = o.fingerPosition == FingerPosition.center ? 0.3 : 0.15;
+                      C !== 256 && (D = 1), n.patientFingerHeight != 0 && (D = n.patientFingerHeight / _), v.scaleX = D, v.scaleY = D, v.y = -_ * D, u.y = -m * g, o.fingerPosition == FingerPosition.left ? (u.x = C * D + 5, v.x = 0, this._dWidth = p * g + 5 + C * D, r.imgHeight = Math.floor(Math.max(_ * D, m * g)), this._dHeight = r.imgHeight) : o.fingerPosition == FingerPosition.center ? (v.x = (p * g - C * D) / 2, v.y = -(_ * D + l) / 2, u.y = -(m * g + l) / 2, r.imgHeight = n.signHeight) : o.fingerPosition == FingerPosition.right && (v.x = p * g + 5, this._dWidth = p * g + 5 + C * D, r.imgHeight = Math.floor(Math.max(_ * D, m * g)), this._dHeight = r.imgHeight), r.imgWidth = this._dWidth, o.fingerPosition == FingerPosition.center && (this._dWidth = 0, this._dHeight = 0), u.setTransform(u.x, u.y, g, g), v.setTransform(v.x, v.y, D, D);
+                      const E = new createjs$1.Shape();
+                      E.graphics.beginFill("#000000").drawRect(v.x, 0, C * D, _ * D), u.hitArea = E, v.hitArea = E, this._imageManager.onSuccessCallBack(this), y(o);
+                    };
+                  }));
+                else {
+                  this._dWidth = p * g;
+                  let y = this._dWidth;
+                  if (r.parentNode instanceof CellNode) {
+                    const w = r.parentNode.drawCell.dWidth;
+                    y > w - 5 && (o.dHeight = (w - 5) * o.dHeight / y - 2, g = (w - 5) / y * g, y = w - 5), o.dWidth = y, r.imgWidth = o.dWidth, r.imgHeight = o.dHeight, u.setTransform(0, -(m * g + l) / 2, g, g);
+                  } else
+                    r.imgWidth = this.dWidth, r.imgHeight = n.signHeight, u.setTransform(0, -(m * g + l) / 2, g, g);
+                  this._imageManager.onSuccessCallBack(this);
+                }
+                c(o);
               };
-            else {
-              this._dWidth = m * y;
-              let w = this._dWidth;
-              if (r.parentNode instanceof CellNode) {
-                const v = r.parentNode.drawCell.dWidth;
-                w > v - 5 && (o.dHeight = (v - 5) * o.dHeight / w - 2, y = (v - 5) / w * y, w = v - 5), o.dWidth = w, r.imgWidth = o.dWidth, r.imgHeight = o.dHeight, u.setTransform(0, -(g * y + c) / 2, y, y);
-              } else
-                r.imgWidth = this.dWidth, r.imgHeight = n.signHeight, u.setTransform(0, -(g * y + c) / 2, y, y);
-              l();
-            }
-          };
-        }
-      }
-    }, l = () => {
-      const c = n.drawPageTree.getMainRootArea(o);
-      if (c) {
-        const d = n.subDocManger.getHeaderFooterType(o.node.getNodePath());
-        (d === HeaderFooterType.hftHead && c != n.drawTree.drawPages[c.index].drawHeader || d === HeaderFooterType.hftFoot && c != n.drawTree.drawPages[c.index].drawFooter) && n.subDocManger.copySubDocToPages(c, c.index, d), n.drawTree.rebuildArea("main", !1);
+              n.drawTree.paintStatus === PaintState$1.psPreview && n.isFixPrint ? setTimeout(() => f(), 200) : f();
+            };
+          }));
       }
-      o.imgSrc && n.loadImageCount--, o.fingerPrintSrc && n.loadImageCount--;
-    };
-    s();
+    })();
   }
   drawSignNode() {
     this.clear();
     const r = this, o = (n) => {
-      if (this.type === 1) {
-        const s = new Image();
-        s.src = this.imgSrc;
-        const l = new createjs$1.Bitmap(s), c = new createjs$1.Shape();
-        if (c.graphics.beginFill("#000").drawRect(0, 0, r.dWidth, r.dHeight), l.hitArea = c, l.y = -this.dHeight, l.setBounds(0, 0, r.dWidth, r.dHeight), this.number === 1 || n ? l.x = 0 : l.x = this._drawText.getMeasuredWidth(), this.attribute === 2 && this.abi02 !== "") {
-          const u = new createjs$1.Text(this.abi02 + this._connectChar, this.textStyle, "#000000");
-          u.textBaseline = "alphabetic", u.textAlign = "left", this.addChildAt(u, 0), l.x = u.getMeasuredWidth(), this.addChild(l);
-        } else
-          this.attribute === 3 && this.title !== "" ? this.signTime != "" ? (this._drawTitle.textBaseline = "alphabetic", this._drawTitle.textAlign = "left", this._drawTitle.x = 0, this._drawTitle.y = -(this.dHeight - this._drawDate.getMeasuredHeight()) + 2, l.x = this._drawTitle.getMeasuredWidth(), this.addChildAt(this._drawTitle, 0), l.y = this._drawTitle.y, this.addChild(l), this._drawDate.x = 0, this._drawDate.y = 0, this._drawDate.textBaseline = "alphabetic", this._drawDate.textAlign = "left", this.addChild(this._drawDate)) : (this._drawTitle.textBaseline = "alphabetic", this._drawTitle.textAlign = "left", this.addChildAt(this._drawTitle, 0), l.x = this._drawTitle.getMeasuredWidth(), this.addChild(l)) : this.attribute === 4 ? (this.title !== "" ? (this._drawTitle.textBaseline = "alphabetic", this._drawTitle.textAlign = "left", this.addChildAt(this._drawTitle, 0), l.x = this._drawTitle.getMeasuredWidth()) : l.x = 0, this.addChild(l), this.signTime !== "" && (this.timePosition === "1" ? (l.y = -this.dHeight, this._drawDate.x = this.dWidth - this._drawDate.getMeasuredWidth(), this._drawDate.y = -this.dHeight + this._drawDate.getMeasuredHeight()) : (this.title !== "" && (this._drawTitle.y = -this._drawDate.getMeasuredHeight() - 10), l.y = -this.dHeight, this._drawDate.x = 0, this._drawDate.y = -3, this._drawDate.textBaseline = "alphabetic", this._drawDate.textAlign = "left"), this.addChild(this._drawDate))) : l.x === 0 ? this.addChildAt(l, 0) : this.addChild(l);
-        const d = HOEditorFactorys.instance().getFactory(r.node.hoEditorFactoryID);
-        d.loadImageCount++, s.onload = async () => {
-          const u = () => {
-            const f = s.naturalWidth !== 0 ? s.naturalWidth : s.width, p = s.naturalHeight !== 0 ? s.naturalHeight : s.height, m = this.node, g = m.imgWidth, y = m.imgHeight;
-            (s.naturalWidth > s.naturalHeight && g < y || s.naturalWidth < s.naturalHeight && m.imgWidth > m.imgHeight) && (m.imgWidth = y, m.imgHeight = g);
-            let w = f * d.signHeight / s.naturalHeight;
-            if (d.convertSignImage && p > d.signHeight * 2) {
-              const _ = document.createElement("canvas"), D = _.getContext("2d");
-              _.width = w * 2, _.height = d.signHeight * 2, _.style.width = this.dWidth + "px", _.style.height = d.signHeight + "px", D.clearRect(0, 0, _.width, _.height), D.fillStyle = "#FFFFFF", D.fillRect(0, 0, _.width, _.height), D.drawImage(s, 0, 0, _.width, _.height);
-              const E = _.toDataURL("image/png", 1);
-              r.node.imgSrc = E;
-            }
-            if (m.parentNode instanceof CellNode) {
-              const _ = m.parentNode.drawCell.dWidth;
-              w > _ - 5 && (r.dHeight = (_ - 5) * d.signHeight / w, w = _ - 5);
-            }
-            if (r.dWidth = w, r.attribute === 2 && r.abi02 !== "" && (r.dWidth += r._drawAbi02.getMeasuredWidth()), r.attribute == 3 && r.title != "" && (r.dWidth += r._drawTitle.getMeasuredWidth(), this._drawDate.getMeasuredWidth() > r.dWidth && (r.dWidth = this._drawDate.getMeasuredWidth())), r.attribute === 4 && (r.title != "" && (r.dWidth += r._drawTitle.getMeasuredWidth()), this.signTime !== "" && (this.timePosition === "1" ? r.dWidth = r.dWidth + r._drawDate.getMeasuredWidth() : r.dWidth = Math.max(r.dWidth, r._drawDate.getMeasuredWidth()))), this.number === 2 && (r.dWidth += this._drawText ? this._drawText.getMeasuredWidth() : 0), r.attribute === 2 && r.abi02 !== "")
-              l.setTransform(r._drawAbi02.getMeasuredWidth(), -r.dHeight + 2, w / f, r.dHeight / p);
-            else if (r.attribute === 3 && r.title !== "")
-              l.setTransform(r._drawTitle.getMeasuredWidth(), -r.dHeight - 4, w / f, (r.dHeight - r._drawDate.getMeasuredHeight() - 2) / p);
-            else if (r.attribute === 4) {
-              let _ = 0, D = 0, E = r.dHeight / p;
-              r.title !== "" ? _ = r._drawTitle.getMeasuredWidth() : _ = 0, this.signTime === "" || this.timePosition === "1" ? (D = -r.dHeight + 5, E = r.dHeight / p) : (D = -r.dHeight - 4, E = (r.dHeight - r._drawDate.getMeasuredHeight() - 2) / p), l.setTransform(_, D, w / f, E);
-            } else
-              l.setTransform(l.x, -r.dHeight, w / f, r.dHeight / p);
-            const v = new createjs$1.Shape();
-            v.graphics.beginFill("#000").drawRect(0, 0, r.dWidth, r.dHeight), l.hitArea = v;
-            const C = d.drawPageTree.getMainRootArea(r);
-            if (C) {
-              const _ = d.subDocManger.getHeaderFooterType(this.node.getNodePath());
-              (_ === HeaderFooterType.hftHead && C != d.drawTree.drawPages[C.index].drawHeader || _ === HeaderFooterType.hftFoot && C != d.drawTree.drawPages[C.index].drawFooter) && d.subDocManger.copySubDocToPages(C, C.index, _), d.drawPageTree.updateDrawPage(C.index);
+      if (this.type === 1)
+        this._imageManager.addImageQueue(new Promise((s) => {
+          const l = new Image();
+          l.src = this.imgSrc;
+          const c = new createjs$1.Bitmap(l), d = new createjs$1.Shape();
+          if (d.graphics.beginFill("#000").drawRect(0, 0, r.dWidth, r.dHeight), c.hitArea = d, c.y = -this.dHeight, c.setBounds(0, 0, r.dWidth, r.dHeight), this.number === 1 || n ? c.x = 0 : c.x = this._drawText.getMeasuredWidth(), this.attribute === 2 && this.abi02 !== "") {
+            const f = new createjs$1.Text(this.abi02 + this._connectChar, this.textStyle, "#000000");
+            f.textBaseline = "alphabetic", f.textAlign = "left", this.addChildAt(f, 0), c.x = f.getMeasuredWidth(), this.addChild(c);
+          } else
+            this.attribute === 3 && this.title !== "" ? this.signTime != "" ? (this._drawTitle.textBaseline = "alphabetic", this._drawTitle.textAlign = "left", this._drawTitle.x = 0, this._drawTitle.y = -(this.dHeight - this._drawDate.getMeasuredHeight()) + 2, c.x = this._drawTitle.getMeasuredWidth(), this.addChildAt(this._drawTitle, 0), c.y = this._drawTitle.y, this.addChild(c), this._drawDate.x = 0, this._drawDate.y = 0, this._drawDate.textBaseline = "alphabetic", this._drawDate.textAlign = "left", this.addChild(this._drawDate)) : (this._drawTitle.textBaseline = "alphabetic", this._drawTitle.textAlign = "left", this.addChildAt(this._drawTitle, 0), c.x = this._drawTitle.getMeasuredWidth(), this.addChild(c)) : this.attribute === 4 ? (this.title !== "" ? (this._drawTitle.textBaseline = "alphabetic", this._drawTitle.textAlign = "left", this.addChildAt(this._drawTitle, 0), c.x = this._drawTitle.getMeasuredWidth()) : c.x = 0, this.addChild(c), this.signTime !== "" && (this.timePosition === "1" ? (c.y = -this.dHeight, this._drawDate.x = this.dWidth - this._drawDate.getMeasuredWidth(), this._drawDate.y = -this.dHeight + this._drawDate.getMeasuredHeight()) : (this.title !== "" && (this._drawTitle.y = -this._drawDate.getMeasuredHeight() - 10), c.y = -this.dHeight, this._drawDate.x = 0, this._drawDate.y = -3, this._drawDate.textBaseline = "alphabetic", this._drawDate.textAlign = "left"), this.addChild(this._drawDate))) : c.x === 0 ? this.addChildAt(c, 0) : this.addChild(c);
+          const u = HOEditorFactorys.instance().getFactory(r.node.hoEditorFactoryID);
+          this._imageManager.loadImage(this), l.onload = async () => {
+            const f = () => {
+              const m = l.naturalWidth !== 0 ? l.naturalWidth : l.width, g = l.naturalHeight !== 0 ? l.naturalHeight : l.height, y = this.node, w = y.imgWidth, v = y.imgHeight;
+              (l.naturalWidth > l.naturalHeight && w < v || l.naturalWidth < l.naturalHeight && y.imgWidth > y.imgHeight) && (y.imgWidth = v, y.imgHeight = w);
+              let C = m * u.signHeight / l.naturalHeight;
+              if (u.convertSignImage && g > u.signHeight * 2) {
+                const E = document.createElement("canvas"), T = E.getContext("2d");
+                E.width = C * 2, E.height = u.signHeight * 2, E.style.width = this.dWidth + "px", E.style.height = u.signHeight + "px", T.clearRect(0, 0, E.width, E.height), T.fillStyle = "#FFFFFF", T.fillRect(0, 0, E.width, E.height), T.drawImage(l, 0, 0, E.width, E.height);
+                const I = E.toDataURL("image/png", 1);
+                r.node.imgSrc = I;
+              }
+              if (y.parentNode instanceof CellNode) {
+                const E = y.parentNode.drawCell.dWidth;
+                C > E - 5 && (r.dHeight = (E - 5) * u.signHeight / C, C = E - 5);
+              }
+              if (r.dWidth = C, r.attribute === 2 && r.abi02 !== "" && (r.dWidth += r._drawAbi02.getMeasuredWidth()), r.attribute == 3 && r.title != "" && (r.dWidth += r._drawTitle.getMeasuredWidth(), this._drawDate.getMeasuredWidth() > r.dWidth && (r.dWidth = this._drawDate.getMeasuredWidth())), r.attribute === 4 && (r.title != "" && (r.dWidth += r._drawTitle.getMeasuredWidth()), this.signTime !== "" && (this.timePosition === "1" ? r.dWidth = r.dWidth + r._drawDate.getMeasuredWidth() : r.dWidth = Math.max(r.dWidth, r._drawDate.getMeasuredWidth()))), this.number === 2 && (r.dWidth += this._drawText ? this._drawText.getMeasuredWidth() : 0), r.attribute === 2 && r.abi02 !== "")
+                c.setTransform(r._drawAbi02.getMeasuredWidth(), -r.dHeight + 2, C / m, r.dHeight / g);
+              else if (r.attribute === 3 && r.title !== "")
+                c.setTransform(r._drawTitle.getMeasuredWidth(), -r.dHeight - 4, C / m, (r.dHeight - r._drawDate.getMeasuredHeight() - 2) / g);
+              else if (r.attribute === 4) {
+                let E = 0, T = 0, I = r.dHeight / g;
+                r.title !== "" ? E = r._drawTitle.getMeasuredWidth() : E = 0, this.signTime === "" || this.timePosition === "1" ? (T = -r.dHeight + 5, I = r.dHeight / g) : (T = -r.dHeight - 4, I = (r.dHeight - r._drawDate.getMeasuredHeight() - 2) / g), c.setTransform(E, T, C / m, I);
+              } else
+                c.setTransform(c.x, -r.dHeight, C / m, r.dHeight / g);
+              const _ = new createjs$1.Shape();
+              _.graphics.beginFill("#000").drawRect(0, 0, r.dWidth, r.dHeight), c.hitArea = _;
               const D = r.node.parentNode;
-              D instanceof CellNode && (D.drawCell.needUpdate = !0, D.table.update());
-            }
-            d.loadImageCount--;
+              D instanceof CellNode && (D.drawCell.needUpdate = !0, D.table.update()), this._imageManager.onSuccessCallBack(this), s(r);
+            }, p = () => {
+              u.drawTree.paintStatus === PaintState$1.psPreview && u.isFixPrint ? setTimeout(() => f(), 200) : f();
+            };
+            this.imgSrc.includes("data:image/jpeg") || this.imgSrc.includes("data:image/jpg") || this.imgSrc.includes(".jpg") || this.imgSrc.includes(".jpeg") ? __CJS__export_default__.getData(l, (m) => {
+              l.exifdata = m, p();
+            }) : p();
+          }, l.onerror = () => {
+            this._imageManager.onErrorCallBack(this), s(r);
           };
-          this.imgSrc.includes("data:image/jpeg") || this.imgSrc.includes("data:image/jpg") || this.imgSrc.includes(".jpg") || this.imgSrc.includes(".jpeg") ? __CJS__export_default__.getData(s, (f) => {
-            s.exifdata = f, u();
-          }) : u();
-        }, s.onerror = () => {
-          d.loadImageCount--;
-        };
-      } else {
+        }));
+      else {
         const s = this.imgSrc.split(`
 `);
         if (s.length === 1) {
@@ -14966,7 +15017,7 @@ class DrawSignNode extends DrawCombineNode {
     }
   }
 }
-const version = "3.2.79";
+const version = "3.2.81";
 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) {
@@ -15024,13 +15075,13 @@ class SignNode extends BaseNode {
     b(this, "isTemp", !1);
     b(this, "innerIdentifier", "");
     const hoEditorFactory = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
-    this.number = number, this._type = type, this._signor = signor, this._signTime = signTime, this.imgSrc = imgSrc || "", this._attribute = attribute === void 0 ? 0 : attribute, this._connectChar = connectChar === void 0 ? ":" : connectChar, dataId ? this.dataId = dataId : this.dataId = HOEditorFactorys.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("Sign"), fingerPrintSrc && (this._fingerPrintSrc = fingerPrintSrc), this._fingerPosition = fingerPosition || 0, this._name = name, this._imgWidth = imgWidth, this._imgHeight = imgHeight, this._isTemplate = isTemplate, this.isTemp = isTemp || isTemplate, this._signType = signType, this._signFormat = signFormat, this._signTimeFormat = signTimeFormat, styleIndex || styleIndex == 0 ? this._styleIndex = styleIndex : this._styleIndex = hoEditorFactory.docTree.curStyleIndex, this._connectMode = connectMode, signType === 1 && type !== 1 && (this._isFront = isFront, this._allowEditSignTime = allowEditSignTime), this._otherProperties = new Object(), this._associatedElement = associatedElement || "", this._customProperty = new Object();
+    this.number = number, this._type = type, this._signor = signor, this._signTime = signTime, this._attribute = attribute === void 0 ? 0 : attribute, this._connectChar = connectChar === void 0 ? ":" : connectChar, dataId ? this.dataId = dataId : this.dataId = HOEditorFactorys.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("Sign"), fingerPrintSrc && (this._fingerPrintSrc = fingerPrintSrc), this._fingerPosition = fingerPosition || 0, this._name = name, this._imgWidth = imgWidth, this._imgHeight = imgHeight, this._isTemplate = isTemplate, this.isTemp = isTemp || isTemplate, this._signType = signType, this._signFormat = signFormat, this._signTimeFormat = signTimeFormat, styleIndex || styleIndex == 0 ? this._styleIndex = styleIndex : this._styleIndex = hoEditorFactory.docTree.curStyleIndex, this._connectMode = connectMode, signType === 1 && type !== 1 && (this._isFront = isFront, this._allowEditSignTime = allowEditSignTime), this._otherProperties = new Object(), this._associatedElement = associatedElement || "", this._customProperty = new Object();
     const assignvalue = (target, source) => {
       Object.keys(source).forEach((value) => {
         typeof target[value] == "object" ? Object.prototype.toString.call(source[value]) === "[object Object]" ? assignvalue(target[value], source[value]) : source[value] !== "" && source[value] !== null && assignvalue(target[value], eval("(" + source[value] + ")")) : target[value] = source[value];
       });
     };
-    customProperty && assignvalue(this._customProperty, customProperty), otherProperties && assignvalue(this._otherProperties, otherProperties), innerIdentifier ? this.innerIdentifier = innerIdentifier : this.innerIdentifier || (this.attribute == 1 ? this.innerIdentifier = "sign_doctor_" + Math.random().toString(36).substring(2) : this.innerIdentifier = "sign_patient_" + Math.random().toString(36).substring(2)), this.node2DrawNodeRange(0, 0);
+    customProperty && assignvalue(this._customProperty, customProperty), otherProperties && assignvalue(this._otherProperties, otherProperties), innerIdentifier ? this.innerIdentifier = innerIdentifier : this.innerIdentifier || (this.attribute == 1 ? this.innerIdentifier = "sign_doctor_" + Math.random().toString(36).substring(2) : this.innerIdentifier = "sign_patient_" + Math.random().toString(36).substring(2)), this.imgSrc === (imgSrc || "") && this.node2DrawNodeRange(0, 0), this.imgSrc = imgSrc || "";
   }
   // get id(): string {
   //     return this._id;
@@ -37839,7 +37890,10 @@ class DrawImageNode extends DrawCombineNode {
     b(this, "_drawResize");
     b(this, "_id");
     b(this, "_bitMap");
-    const p = HOEditorFactorys.instance().getFactory(r).vueController.getMainBounds(c, d);
+    b(this, "_imageManager");
+    const f = HOEditorFactorys.instance().getFactory(r);
+    this._imageManager = new ImageManager(r);
+    const p = f.vueController.getMainBounds(c, d);
     this.dWidth = Number(p.imageWidth), this.dHeight = Number(p.imageHeight), this._imagePath = l, this._markImagePath = u, this._imageY = -this.dHeight, this.insertImage(), this._drawResize = new DrawResize(r, this.node, this, this._imageY);
   }
   get markImagePath() {
@@ -37852,46 +37906,59 @@ class DrawImageNode extends DrawCombineNode {
     return this._drawResize;
   }
   insertImage() {
-    const r = this, o = new Image();
-    process.env.NODE_ENV === "production" ? o.src = this.imagePath : o.src = "http://192.168.1.211:8088" + this.imagePath, this._bitMap = new createjs$1.Bitmap(o);
-    const n = HOEditorFactorys.instance().getFactory(r.node.hoEditorFactoryID);
-    this._bitMap.y = this._imageY, this._bitMap.x = 0, this._bitMap.name = this.node.id;
-    const s = new createjs$1.Shape();
-    s.graphics.beginFill("#000").drawRect(0, 0, r.dWidth, r.dHeight), this._bitMap.hitArea = s, this._bitMap.setBounds(0, 0, r.dWidth, r.dHeight), n.loadImageCount++, this.addChild(this._bitMap), o.onload = () => {
-      const l = o.naturalWidth !== 0 ? o.naturalWidth : o.width, c = o.naturalHeight !== 0 ? o.naturalHeight : o.height;
-      this._bitMap.setTransform(0, r._imageY, r.dWidth / l, r.dHeight / c), this._bitMap.setBounds(0, 0, o.naturalWidth, o.naturalHeight);
-      const d = new createjs$1.Shape();
-      if (d.graphics.beginFill("#000").drawRect(0, 0, l, c), this._bitMap.hitArea = d, this.node.rootPath.includes("header") || this.node.rootPath.includes("footer")) {
-        const u = document.createElement("canvas"), f = u.getContext("2d");
-        u.width = this.dWidth * 2, u.height = this.dHeight * 2, u.style.width = this.dWidth + "px", u.style.height = this.dHeight + "px", f.clearRect(0, 0, u.width, u.height), f.fillStyle = "#FFFFFF", f.fillRect(0, 0, u.width, u.height), f.drawImage(o, 0, 0, u.width, u.height);
-        const p = u.toDataURL("image/jpeg", 0.92);
-        p < this.node.imageDataBase64String && (this.node.imageDataBase64String = p);
-      }
-      this.updateSign(), n.loadImageCount--;
-    }, this.markImagePath != "" && this.insertMarkImage(), o.onerror = () => {
-      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);
-        c.oldEndPath = l, c.afterChangePath = l, c.oldDrawLines = new SelectRange(this._hoEditorFactoryID).getRangeDrawLines(l, l, !0, !0), n.docTree.change(c);
-      }
-    };
+    const r = this;
+    this._imageManager.addImageQueue(new Promise((o) => {
+      const n = new Image();
+      process.env.NODE_ENV === "production" || !this.imagePath.startsWith("http") ? n.src = this.imagePath : n.src = "http://192.168.1.211:8088" + this.imagePath, this._bitMap = new createjs$1.Bitmap(n);
+      const s = HOEditorFactorys.instance().getFactory(r.node.hoEditorFactoryID);
+      this._bitMap.y = this._imageY, this._bitMap.x = 0, this._bitMap.name = this.node.id;
+      const l = new createjs$1.Shape();
+      l.graphics.beginFill("#000").drawRect(0, 0, r.dWidth, r.dHeight), this._bitMap.hitArea = l, this._bitMap.setBounds(0, 0, r.dWidth, r.dHeight), this._imageManager.loadImage(this), this.addChild(this._bitMap), n.onload = () => {
+        const c = () => {
+          const d = n.naturalWidth !== 0 ? n.naturalWidth : n.width, u = n.naturalHeight !== 0 ? n.naturalHeight : n.height;
+          this._bitMap.setTransform(0, r._imageY, r.dWidth / d, r.dHeight / u), this._bitMap.setBounds(0, 0, n.naturalWidth, n.naturalHeight);
+          const f = new createjs$1.Shape();
+          if (f.graphics.beginFill("#000").drawRect(0, 0, d, u), this._bitMap.hitArea = f, this.node.rootPath.includes("header") || this.node.rootPath.includes("footer")) {
+            const p = document.createElement("canvas"), m = p.getContext("2d");
+            p.width = this.dWidth * 2, p.height = this.dHeight * 2, p.style.width = this.dWidth + "px", p.style.height = this.dHeight + "px", m.clearRect(0, 0, p.width, p.height), m.fillStyle = "#FFFFFF", m.fillRect(0, 0, p.width, p.height), m.drawImage(n, 0, 0, p.width, p.height);
+            const g = p.toDataURL("image/jpeg", 0.92);
+            g < this.node.imageDataBase64String && (this.node.imageDataBase64String = g);
+          }
+          this._imageManager.onSuccessCallBack(this), o(r);
+        };
+        s.drawTree.paintStatus === PaintState$1.psPreview && s.isFixPrint ? setTimeout(() => c(), 200) : c();
+      }, this.markImagePath != "" && this.insertMarkImage(), n.onerror = () => {
+        if (this._imageManager.onErrorCallBack(this), o(r), !r.node.isBackFill) {
+          const c = this.node.previousLeaf().getNodePath();
+          s.docTree.deleteNode(this.node);
+          const d = new NodeChangeEvent(this._hoEditorFactoryID, DocAction.daModifyStyle, c, c);
+          d.oldEndPath = c, d.afterChangePath = c, d.oldDrawLines = new SelectRange(this._hoEditorFactoryID).getRangeDrawLines(c, c, !0, !0), s.docTree.change(d);
+        }
+      };
+    }));
   }
   insertMarkImage() {
-    const r = this, o = HOEditorFactorys.instance().getFactory(r.node.hoEditorFactoryID), n = new Image();
-    let s;
-    n.src = this.markImagePath, o.loadImageCount++, s = new createjs$1.Bitmap(n), s.name = this.node.id, s.setBounds(0, 0, r.dWidth, r.dHeight), r.addChild(s), n.onload = () => {
-      s.x = 0, s.y = 0;
-      const l = n.naturalWidth !== 0 ? n.naturalWidth : n.width, c = n.naturalHeight !== 0 ? n.naturalHeight : n.height;
-      s.setTransform(0, r._imageY, r.dWidth / l, r.dHeight / c), new createjs$1.Shape().graphics.beginFill("#000000").drawRect(0, 0, l, c), this.updateSign(), o.loadImageCount--;
-    }, n.onerror = () => {
-      o.loadImageCount--;
-      const l = this.node.previousLeaf().getNodePath();
-      o.docTree.deleteNode(this.node);
-      const c = new NodeChangeEvent(this._hoEditorFactoryID, DocAction.daModifyStyle, l, l);
-      c.oldEndPath = l, c.afterChangePath = l, c.oldDrawLines = new SelectRange(this._hoEditorFactoryID).getRangeDrawLines(l, l, !0, !0), o.docTree.change(c);
-    };
+    const r = this, o = HOEditorFactorys.instance().getFactory(r.node.hoEditorFactoryID);
+    this._imageManager.addImageQueue(new Promise((n) => {
+      const s = new Image();
+      let l;
+      s.src = this.markImagePath, this._imageManager.loadImage(this), l = new createjs$1.Bitmap(s), l.name = this.node.id, l.setBounds(0, 0, r.dWidth, r.dHeight), r.addChild(l), s.onload = () => {
+        const c = () => {
+          l.x = 0, l.y = 0;
+          const d = s.naturalWidth !== 0 ? s.naturalWidth : s.width, u = s.naturalHeight !== 0 ? s.naturalHeight : s.height;
+          l.setTransform(0, r._imageY, r.dWidth / d, r.dHeight / u), new createjs$1.Shape().graphics.beginFill("#000000").drawRect(0, 0, d, u), this._imageManager.onSuccessCallBack(this), n(r);
+        };
+        o.drawTree.paintStatus === PaintState$1.psPreview && o.isFixPrint ? setTimeout(() => c(), 200) : c();
+      }, s.onerror = () => {
+        this._imageManager.onErrorCallBack(this), n(r);
+        const c = this.node.previousLeaf().getNodePath();
+        o.docTree.deleteNode(this.node);
+        const d = new NodeChangeEvent(this._hoEditorFactoryID, DocAction.daModifyStyle, c, c);
+        d.oldEndPath = c, d.afterChangePath = c, d.oldDrawLines = new SelectRange(this._hoEditorFactoryID).getRangeDrawLines(c, c, !0, !0), o.docTree.change(d);
+      };
+    }));
   }
+  // --内部不在调用
   updateSign() {
     const r = HOEditorFactorys.instance().getFactory(this.node.hoEditorFactoryID), o = r.drawPageTree.getMainRootArea(this);
     if (o && r.drawTree.drawPages[o.index]) {
@@ -50815,32 +50882,36 @@ class VueController {
     const s = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
     t.length == 1 && o && (o = !0);
     let l = [], c = [];
-    t.map((m) => (m.name = m.name || "", m.id = m.id || "", m.dataId = m.dataId || "", m.innerIdentifier = m.innerIdentifier || "", m.text ? c.push(m.text) : l.push(m), m));
-    const d = (m) => {
-      for (let g = 0; g < m.length; g++) {
-        const y = m[g];
-        if (y instanceof ControlNode && y.nodeType !== 10 && y.nodeType !== 11 || y instanceof TextInputFieldNode)
-          for (let w = 0, v = l.length - 1; w <= v; w++) {
-            const C = l[w];
-            if (C.name && C.name === y.name || C.id && C.id === y.id || C.dataId && C.dataId === y.dataId || C.innerIdentifier && C.innerIdentifier === y.innerIdentifier) {
-              const D = s.docTree.getNodeLastPath(y.previousLeaf()), E = s.docTree.getNodeLastPath(y), T = StagePosition.getStagePosByPath(this._hoEditorFactoryID, D), I = StagePosition.getStagePosByPath(this._hoEditorFactoryID, E), M = new SelectRange(this.hoEditorFactoryID);
-              M.spStart = T, M.spEnd = I, n.push(M);
+    t.map((g) => (g.name = g.name || "", g.id = g.id || "", g.dataId = g.dataId || "", g.innerIdentifier = g.innerIdentifier || "", g.text ? c.push(g.text) : l.push(g), g));
+    let d = null;
+    const u = (g) => {
+      for (let y = 0; y < g.length; y++) {
+        const w = g[y];
+        if (w instanceof ControlNode && w.nodeType !== 10 && w.nodeType !== 11 || w instanceof TextInputFieldNode)
+          for (let v = 0, C = l.length - 1; v <= C; v++) {
+            const _ = l[v];
+            if (_.name && _.name === w.name || _.id && _.id === w.id || _.dataId && _.dataId === w.dataId || _.innerIdentifier && _.innerIdentifier === w.innerIdentifier) {
+              const E = s.docTree.getNodeLastPath(w.previousLeaf()), T = s.docTree.getNodeLastPath(w), I = StagePosition.getStagePosByPath(this._hoEditorFactoryID, E), M = StagePosition.getStagePosByPath(this._hoEditorFactoryID, T), R = new SelectRange(this.hoEditorFactoryID);
+              R.spStart = I, R.spEnd = M, n.push(R), w instanceof TextInputFieldNode && (d = w);
             }
           }
-        y instanceof BaseCombineNode && d(y.childNodes);
-      }
-    }, u = s.subDocManger.headerDocTree;
-    for (let m = 0; m < u.length; m++)
-      d(u[m].subDocNodes);
-    const f = s.docTree.mainNodes;
-    d(f);
-    const p = s.subDocManger.footerDocTree;
-    for (let m = 0; m < p.length; m++)
-      d(p[m].subDocNodes);
-    c.length && c.forEach((m) => {
-      const g = this.searchText(m);
-      g.length > 0 && (n = n.concat(g));
-    }), n.length > 0 && (s.drawTree.drawMultiCustomRange(n, r, !0), o && this.moveCaret(n[n.length - 1].spEnd.path));
+        w instanceof BaseCombineNode && u(w.childNodes);
+      }
+    }, f = s.subDocManger.headerDocTree;
+    for (let g = 0; g < f.length; g++)
+      u(f[g].subDocNodes);
+    const p = s.docTree.mainNodes;
+    u(p);
+    const m = s.subDocManger.footerDocTree;
+    for (let g = 0; g < m.length; g++)
+      u(m[g].subDocNodes);
+    if (c.length && c.forEach((g) => {
+      const y = this.searchText(g);
+      y.length > 0 && (n = n.concat(y));
+    }), n.length > 0 && (s.drawTree.drawMultiCustomRange(n, r, !0), o)) {
+      let g = n[n.length - 1].spEnd.path;
+      d && (g = s.docTree.getNodeFirstPath(d)), this.moveCaret(g);
+    }
   }
   moveCaret(t) {
     const r = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
@@ -64619,7 +64690,7 @@ WebPDecoder.prototype.getData = function() {
 (function(a) {
   function t() {
     return function() {
-      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-CyxgRuIp.mjs");
+      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-Cues8l5x.mjs");
     }().catch(function(r) {
       return Promise.reject(new Error("Could not load canvg: " + r));
     }).then(function(r) {
@@ -72217,6 +72288,8 @@ class HOEditorFactory {
     // 是否启用绘制优化 默认不启用
     b(this, "_defaultIsAllowDelete", !1);
     // 元素是否默认可以被删除
+    b(this, "_loadSignImageCount", 0);
+    // 待加载签名图片数量
     b(this, "_loadImageCount", 0);
     // 待加载的图片数量
     b(this, "_loadImageErrorCount", 0);
@@ -72307,9 +72380,11 @@ class HOEditorFactory {
     b(this, "shiftKeyPress", !1);
     // 是否按下shift 
     b(this, "watermarkText", "");
+    // 水印内容
+    b(this, "isFixPrint", !1);
     this._hoEditorFactoryId = t;
   }
-  // 水印内容
+  //开启打印优化
   /**
    * Getter hoLocalStorage
    * @return {HoLocalStorage}
@@ -72655,6 +72730,12 @@ class HOEditorFactory {
   set loadImageErrorCount(t) {
     this._loadImageErrorCount !== t && (this._loadImageErrorCount = t);
   }
+  get loadSignImageCount() {
+    return this._loadSignImageCount;
+  }
+  set loadSignImageCount(t) {
+    this._loadSignImageCount !== t && (this._loadSignImageCount = t);
+  }
   set loadImageCallback(t) {
     this._loadImageCallback = t;
   }
@@ -77112,7 +77193,7 @@ const TableCellProperty = __component__$T.exports, _sfc_main$S = {
             this.weight = a.formulaStr.split(",")[0], this.height = a.formulaStr.split(",")[1];
           else if (this.formula === "labor") {
             const t = a.formulaStr.split(",");
-            this.labor1 = t[0], this.labor2 = t[1], this.laborType = 1, t.legnth === 3 && (this.laborType = 0, this.labor3 = t[2]);
+            this.labor1 = t[0], this.labor2 = t[1], this.laborType = 1, t.length === 3 && (this.laborType = 0, this.labor3 = t[2]);
           } else if (this.formula === "ftScoreMapping") {
             if (a.formulaStr)
               try {
@@ -77181,7 +77262,7 @@ var _sfc_render$S = function a() {
   var t = this, r = t._self._c;
   return r("div", { staticClass: "control-modal-contents table-formula-modal animation-in" }, [r("header", { staticClass: "modal-title" }, [r("span", [t._v(t._s(t.dialogFormTitle))]), r("a-icon", { staticClass: "modal-title-close", attrs: { type: "close" }, on: { click: t.handleClose } })], 1), r("section", { staticClass: "modal-content", staticStyle: { "flex-direction": "column" } }, [r("p", { staticStyle: { padding: "10px 0" } }, [t._v(i18nHelper("04-001-009-EMR.3.3.299", null, "请输入表单项对应的单元格编号，从左到右依次为ABCD...，从上到下依次为1234..."))]), r("div", { staticStyle: { padding: "0 0 0 0" } }, [Array.isArray(t.formulaText[t.formula]) ? t._l(t.formulaText[t.formula], function(o, n) {
     return r("p", { key: n }, [t._v(t._s(o))]);
-  }) : r("p", [t._v(t._s(t.formulaText[t.formula]))])], 2), t.formula === "sum" || t.formula === "formula" ? r("section", [r("div", { staticStyle: { height: "26px", "line-height": "36px", "font-size": "16px" } }, [t._v(" " + t._s(t.dialogFormTitle) + " ")]), r("div", { staticStyle: { height: "36px", "line-height": "36px" } }, [t._v(`${i18nHelper("04-001-009-EMR.3.3.298", null, "示例：")} ` + t._s(t.dialogFormTitle === i18nHelper("04-001-009-EMR.3.3.300", null, "表格行列求和公式") ? "a1: a2" : "(a1 + a2) * 2"))]), r("a-checkbox", { model: { value: t.isHideZero, callback: function(o) {
+  }) : r("p", [t._v(t._s(t.formulaText[t.formula]))])], 2), t.formula === "sum" || t.formula === "formula" ? r("section", [r("div", { staticStyle: { height: "26px", "line-height": "36px", "font-size": "16px" } }, [t._v(" " + t._s(t.dialogFormTitle) + " ")]), r("div", { staticStyle: { height: "36px", "line-height": "36px" } }, [t._v(`${i18nHelper("04-001-009-EMR.3.3.298", null, "示例：")} ` + t._s(t.dialogFormTitle === i18nHelper("04-001-009-EMR.3.3.300", null, "表格行列求和公式") ? "a1: a2" : "(a1 + a2) * 2") + " ")]), r("a-checkbox", { model: { value: t.isHideZero, callback: function(o) {
     t.isHideZero = o;
   }, expression: "isHideZero" } }, [t._v(i18nHelper("04-001-009-EMR.3.3.297", null, "结果为 0 不显示"))]), r("p", { staticStyle: { height: "10px" } }), r("a-input", { attrs: { autocomplete: "off" }, model: { value: t.simpleFormula, callback: function(o) {
     t.simpleFormula = o;
@@ -77219,7 +77300,7 @@ var _sfc_render$S = function a() {
     t.bodySurfaceAreaWeight = o;
   }, expression: "bodySurfaceAreaWeight" } })], 1), t.bodySurfaceAreaType == "1" || t.bodySurfaceAreaType == "2" ? r("div", { staticClass: "ho-table-features-list" }, [r("p", [t._v(i18nHelper("04-001-009-EMR.3.3.293", null, "身高"))]), r("a-input", { attrs: { autocomplete: "off", "addon-after": "cm" }, model: { value: t.bodySurfaceAreaHeight, callback: function(o) {
     t.bodySurfaceAreaHeight = o;
-  }, expression: "bodySurfaceAreaHeight" } })], 1) : t._e()], 1) : t.formula === "idealWeight" ? r("section", [r("div", { staticStyle: { height: "36px", "line-height": "36px" } }, [t._v("示例：理想体重 = (身高cm)-105")]), r("div", { staticStyle: { height: "36px", "line-height": "36px" } }, [t._v("范围 = (0.9 * (身高(cm) - 105)) ~ (1.1 * (身高(cm) - 105)), 计算结果小于0时, 显示“?”")]), r("div", { staticClass: "ho-table-features-list" }, [r("span", { staticStyle: { "margin-right": "34px" } }, [t._v(i18nHelper("04-001-009-EMR.3.3.293", null, "身高"))]), r("a-input", { attrs: { autocomplete: "off", "addon-after": "cm" }, model: { value: t.idealWeightHeight, callback: function(o) {
+  }, expression: "bodySurfaceAreaHeight" } })], 1) : t._e()], 1) : t.formula === "idealWeight" ? r("section", [r("div", { staticStyle: { height: "36px", "line-height": "36px" } }, [t._v("示例：理想体重 = (身高cm)-105")]), r("div", { staticStyle: { height: "36px", "line-height": "36px" } }, [t._v("范围 = (0.9 * (身高(cm) - 105)) ~ (1.1 * (身高(cm) - 105)), 计算结果小于0时, 显示“?” ")]), r("div", { staticClass: "ho-table-features-list" }, [r("span", { staticStyle: { "margin-right": "34px" } }, [t._v(i18nHelper("04-001-009-EMR.3.3.293", null, "身高"))]), r("a-input", { attrs: { autocomplete: "off", "addon-after": "cm" }, model: { value: t.idealWeightHeight, callback: function(o) {
     t.idealWeightHeight = o;
   }, expression: "idealWeightHeight" } })], 1), r("div", [r("span", { staticStyle: { "margin-right": "10px" } }, [t._v(i18nHelper("04-001-009-EMR.3.3.258", null, "显示范围"))]), r("a-checkbox", { model: { value: t.displayRange, callback: function(o) {
     t.displayRange = o;

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

@@ -1,4 +1,4 @@
-import { c as Da, _ as Va, g as il } from "./index-RSacoGIm.mjs";
+import { c as Da, _ as Va, g as il } from "./index-cxRdLTBd.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.79",
+    "version": "3.2.81",
     "private": false,
     "main": "lib/hoeditor.mjs",
     "typings": "types/index.d.ts",