hoeditor-web 3.3.6-beta.11 → 3.3.6-beta.12

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

package/lib/{index-CiWuavNG.mjs → index-aSg440zH.mjs}

@@ -10525,10 +10525,7 @@ class DrawCell extends DrawRect {
       return;
     const [o, n] = this._cell.table.getCellInfos(this._cell);
     if (this._cell.table.rowInfos[o].rowProperty.repeatAsTitleAtPageTop)
-      this.drawPageCells.splice(
-        r.table.drawTable.drawPageTables.length,
-        this.drawPageCells.length
-      );
+      this.drawPageCells.splice(r.table.drawTable.drawPageTables.length, this.drawPageCells.length);
     else {
       const s = this.getDrawPageCell(r);
       if (s) {
@@ -10585,18 +10582,7 @@ class DrawCell extends DrawRect {
       const m = this._cell.drawCell.calcCellHeight(), g = Math.min(s, m);
       this._cell.cellProperty.align === VAlign.vatop ? u = 0 : this._cell.cellProperty.align === VAlign.vacenter && g > this._cell.drawCell.docHeight ? u = (g - this._cell.drawCell.docHeight) / 2 : this._cell.cellProperty.align === VAlign.vabottom && m > this._cell.drawCell.docHeight && (u = m - this._cell.drawCell.docHeight);
     }
-    const f = r, p = new DrawPageCell(
-      this._hoEditorFactoryID,
-      f,
-      this._cell,
-      c,
-      o,
-      d,
-      n,
-      this._drawPageCells.length,
-      l,
-      s
-    );
+    const f = r, p = new DrawPageCell(this._hoEditorFactoryID, f, this._cell, c, o, d, n, this._drawPageCells.length, l, s);
     p.x = c, p.y = o, r.drawItems.push(p), r.addChild(p), this.drawPageCells.push(p), p.paintArea(this._drawLines, l, u), p.valignTop = u;
   }
   clear() {
@@ -10615,6 +10601,7 @@ class DrawCell extends DrawRect {
   }
   updateHeight() {
     let r = !0;
+    if (!this.drawLines.length) return;
     const o = this.drawLines[this.drawLines.length - 1].paragraphNode, n = this.drawLines[0].paragraphNode;
     this.docHeight = o.dTop + o.dHeight - n.dTop + n.combineParagraph.topMarginPixes;
     const [s, l] = this._cell.table.getCellInfos(this._cell);
@@ -23044,7 +23031,7 @@ WebPDecoder.prototype.getData = function() {
 (function(a) {
   function t() {
     return function() {
-      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-D-DaXvBQ.mjs");
+      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-BoBJasEJ.mjs");
     }().catch(function(r) {
       return Promise.reject(new Error("Could not load canvg: " + r));
     }).then(function(r) {
@@ -24344,7 +24331,7 @@ class DrawSignNode extends DrawCombineNode {
     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);
-    if (this.dHeight = E.signHeight, f == 0 && (f = E.signHeight), this.isSignOpinion() && f > 0 && (this.dHeight = f), n.customProperty && n.customProperty.vaq01 && ((d.includes("data:image/") || d.split("/").length > 1) && l == 3 ? (n.type = 1, this.type = 1) : !d.includes("data:image/") && !d.includes("/") && l == 3 && (n.type = 2, this.type = 2)), this.number > 0 && this.type === 2) {
+    if (this.dHeight = E.signHeight, f == 0 && (f = E.signHeight), this.isSignOpinion() && f > 0 && (this.dHeight = f, E.patientSignOpinionWidth != 0 && u > 0 && (this.dHeight = E.patientSignOpinionWidth * (f / u))), n.customProperty && n.customProperty.vaq01 && ((d.includes("data:image/") || d.split("/").length > 1) && l == 3 ? (n.type = 1, this.type = 1) : !d.includes("data:image/") && !d.includes("/") && l == 3 && (n.type = 2, this.type = 2)), this.number > 0 && this.type === 2) {
       const T = d.split(`
 `);
       T.length > 1 && (this.dHeight = HOEditorFactorys.instance().getFactory(r).signHeight * T.length);
@@ -24464,6 +24451,11 @@ class DrawSignNode extends DrawCombineNode {
     let l = 1;
     return r > n && (l = n / r), o * l > s && (l = Math.min(l, s / o)), l;
   }
+  /** 签名意见图片异步加载完成后，刷新所在行高度并让后续内容下移，避免图片高度超出这一行或与后续内容重叠 */
+  refreshParentLineHeight() {
+    const o = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.getDrawLineByDNode(this);
+    o instanceof DrawLine && (o.fitLines(), o.updateLineStyle());
+  }
   drawSignNodeAfter() {
     const r = this, o = HOEditorFactorys.instance().getFactory(r.node.hoEditorFactoryID), n = o.drawPageTree.getMainRootArea(r);
     if (n) {
@@ -24504,7 +24496,7 @@ class DrawSignNode extends DrawCombineNode {
             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.isSignOpinion() && (g = 1, r.parentNode instanceof CellNode || (g = this.fitToPageScale(p, m)), n.patientSignOpinionHeight != 0 && (g = n.patientSignOpinionHeight / m), this._dHeight = m * g), this._dWidth = p * g, o.fingerPrintSrc !== "")
+              if (o.fingerPosition == FingerPosition.center && n.signHeight / m < 0.2 && (g = n.signHeight * 1.5 / m), n.patientSignHeight != 0 && (g = n.patientSignHeight / m), this.isSignOpinion() && (g = 1, r.parentNode instanceof CellNode || (g = this.fitToPageScale(p, m)), n.patientSignOpinionWidth != 0 && (g = n.patientSignOpinionWidth / p), this._dHeight = m * g), this._dWidth = p * g, o.fingerPrintSrc !== "")
                 this._imageManager.addImageQueue(this, () => new Promise(async (y) => {
                   const w = new Image();
                   let v;
@@ -24528,7 +24520,7 @@ class DrawSignNode extends DrawCombineNode {
                 } else
                   r.imgWidth = this.dWidth, this.isSignOpinion() ? r.imgHeight = m * g : r.imgHeight = n.signHeight, this.isSignOpinion() ? u.setTransform(0, -m * g, g, g) : u.setTransform(0, -(m * g + l) / 2, g, g);
               }
-              c(o);
+              this.isSignOpinion() && this.refreshParentLineHeight(), c(o);
             };
             n.drawTree.paintStatus === PaintState$1.psPreview && n.isFixPrint ? setTimeout(() => f(), this._imageManager.THROTTLE_DELAY) : f();
           };
@@ -24634,7 +24626,7 @@ class DrawSignNode extends DrawCombineNode {
     }
   }
 }
-const version = "3.3.6-beta.11";
+const version = "3.3.6-beta.12";
 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, associatedPatientElement, isTemp, innerIdentifier) {
@@ -73038,8 +73030,8 @@ class HOEditorFactory {
     // 患者签名签字图片高度
     b(this, "_patientFingerHeight", 0);
     // 患者指纹签名高度
-    b(this, "_patientSignOpinionHeight", 0);
-    // 患者签名意见高度
+    b(this, "_patientSignOpinionWidth", 0);
+    // 患者签名意见宽度
     b(this, "_superiorSigns", []);
     //上级医生签名之前的内容不允许编辑修改（云his）
     b(this, "_forbidEditBeforeSign", !1);
@@ -73419,11 +73411,11 @@ class HOEditorFactory {
   set patientFingerHeight(t) {
     this._patientFingerHeight !== t && (this._patientFingerHeight = t);
   }
-  get patientSignOpinionHeight() {
-    return this._patientSignOpinionHeight;
+  get patientSignOpinionWidth() {
+    return this._patientSignOpinionWidth;
   }
-  set patientSignOpinionHeight(t) {
-    this._patientSignOpinionHeight !== t && (this._patientSignOpinionHeight = t);
+  set patientSignOpinionWidth(t) {
+    this._patientSignOpinionWidth !== t && (this._patientSignOpinionWidth = t);
   }
   get pasteBase() {
     return this._pasteBase;

package/lib/{index.es-D-DaXvBQ.mjs → index.es-BoBJasEJ.mjs}

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

package/package.json

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