hoeditor-web 3.2.33 → 3.2.34

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

package/lib/{index-CMlZDMbc.mjs → index-QhzdhumN.mjs}

@@ -5833,7 +5833,7 @@ class DrawMarkNode extends DrawCombineNode {
    */
   drawBackColor() {
     const o = this.MarkColor(), n = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
-    n.drawTree.paintStatus !== PaintState.psPreview && n.drawTree.paintStatus !== PaintState.psPrint ? this.docNode.MarkNodeType !== MarkNodeType.mtContent && this.node.parentNode instanceof TextInputFieldNode && (this._nstyle.backColor = n.option.getColorByLevel(10)) : this._nstyle.backColor = "transparent", o && (this._flag || (this._flag = new createjs$1.Shape()), this._flag.graphics.clear(), this._flag.graphics.beginFill(o).drawRect(
+    n.drawTree.paintStatus !== PaintState.psPreview && n.drawTree.paintStatus !== PaintState.psPrint ? this.docNode.MarkNodeType !== MarkNodeType.mtContent && this.node.parentNode instanceof TextInputFieldNode && !this.node.parentNode.enableGlobalColor && (this._nstyle.backColor = n.option.getColorByLevel(10)) : this._nstyle.backColor = "transparent", o && (this._flag || (this._flag = new createjs$1.Shape()), this._flag.graphics.clear(), this._flag.graphics.beginFill(o).drawRect(
       0,
       //x
       //-(Math.max(this.dHeight, this._lineheight) + hspaceing), //y
@@ -12202,7 +12202,7 @@ class TableResizeRowUndoUnit {
     return !1;
   }
   undo() {
-    this._table.rowInfos[this._row].rowHeight = this._oldHeight, this._table.rowInfos[this._row].rowProperty.rowHeight = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).unitConvert.pxConversionMm(this._oldSpecifyHeight, !1) / 10, this._table.rowInfos[this._row].rowProperty.isSpecifyHeight = this._oldIsSpecifyHeight, this._table.resizeRowHeights([this._row]), this._table.update();
+    this._table.rowInfos[this._row].rowHeight = this._oldHeight, this._table.rowInfos[this._row].rowProperty.rowHeight = this._oldSpecifyHeight, this._table.rowInfos[this._row].rowProperty.isSpecifyHeight = this._oldIsSpecifyHeight, this._table.resizeRowHeights([this._row]), this._table.update();
   }
   redo() {
     this._table.rowInfos[this._row].rowHeight = this._newHeight, this._table.rowInfos[this._row].rowProperty.isSpecifyHeight = !0, this._table.rowInfos[this._row].rowProperty.rowHeight = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).unitConvert.pxConversionMm(this._newHeight, !1) / 10, this._table.resizeRowHeights([this._row]), this._table.update();
@@ -14904,7 +14904,7 @@ class DrawSignNode extends DrawCombineNode {
     }
   }
 }
-const version = "3.2.33";
+const version = "3.2.34";
 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) {
@@ -20489,7 +20489,7 @@ class DrawTextNode extends DrawCombineNode {
     if (o.drawTree.paintStatus !== PaintState.psPreview && o.drawTree.paintStatus !== PaintState.psPrint && this.node.parentNode instanceof TextInputFieldNode) {
       const c = this.node.parentNode;
       if (c.inputFieldType === 0)
-        (r === o.pageProperty.backColor || r == "#FFFFFF" && !c.enableGlobalColor) && (r = o.option.getColorByLevel(10));
+        (!c.enableGlobalColor && r === o.pageProperty.backColor || r == "#FFFFFF") && (r = o.option.getColorByLevel(10));
       else if (c.keyValue == "")
         c.text == "" ? r = o.option.getColorByLevel(120) : r = o.option.getColorByLevel(12);
       else {
@@ -20850,12 +20850,13 @@ class DrawMedicalExpression extends DrawCombineNode {
     const f = this.node.remark;
     f == "teeth" && (r == "" && (r = "右上牙位", l = "#9B9E9E"), o == "" && (o = "左上牙位", c = "#9B9E9E"), n == "" && (n = "右下牙位", d = "#9B9E9E"), s == "" && (s = "左下牙位", u = "#9B9E9E"));
     const p = new createjs$1.Text(r, this._textStyle.getStyleKey(), l), g = new createjs$1.Text(o, this._textStyle.getStyleKey(), c), m = new createjs$1.Text(n, this._textStyle.getStyleKey(), d), y = new createjs$1.Text(s, this._textStyle.getStyleKey(), u), w = new createjs$1.Shape(), v = new createjs$1.Shape(), C = Math.max(p.getMeasuredWidth(), g.getMeasuredWidth()) + Math.max(m.getMeasuredWidth(), y.getMeasuredWidth()) + 15, _ = Math.max(p.getMeasuredWidth() + g.getMeasuredWidth(), m.getMeasuredWidth() + y.getMeasuredWidth()) + 15, D = Math.max(C, _), E = Math.max(p.getMeasuredHeight(), m.getMeasuredHeight()) + Math.max(g.getMeasuredHeight(), y.getMeasuredHeight()) + 15, T = Math.max(p.getMeasuredWidth(), m.getMeasuredWidth());
-    if (this.dWidth = D, this.dHeight < E && (this.dHeight = E), w.graphics.beginStroke(this._textStyle.color).moveTo(0, -this._dHeight / 2).lineTo(this.dWidth, -this._dHeight / 2).endStroke(), v.graphics.beginStroke(this._textStyle.color).moveTo(T + 6 - 0.5, -this._dHeight).lineTo(T + 6 - 0.5, 0).endStroke(), f == "teeth") {
-      const M = T / 2, I = (D - (T + 6 + 2)) / 2;
-      p.y = -this.dHeight / 2 - p.getMeasuredHeight() / 2, p.x = M, p.textAlign = "center", p.textBaseline = "alphabetic", g.y = p.y, g.x = T + 6 + 2 + I, g.textAlign = "center", g.textBaseline = "alphabetic", m.y = -3, m.x = M, m.textAlign = "center", m.textBaseline = "alphabetic", y.y = m.y, y.x = g.x, y.textAlign = "center", y.textBaseline = "alphabetic";
-    } else {
-      const M = "center";
-      p.y = -this.dHeight / 2 - p.getMeasuredHeight() / 2, p.x = 4, p.textAlign = M, p.textBaseline = "alphabetic", g.y = p.y, g.x = T + 6 + 2, g.textAlign = M, g.textBaseline = "alphabetic", m.y = -3, m.x = 4, m.textAlign = M, m.textBaseline = "alphabetic", y.y = m.y, y.x = g.x, y.textAlign = M, y.textBaseline = "alphabetic";
+    this.dWidth = D, this.dHeight < E && (this.dHeight = E);
+    const M = T + 6 - 0.5;
+    if (w.graphics.beginStroke(this._textStyle.color).moveTo(0, -this._dHeight / 2).lineTo(this.dWidth, -this._dHeight / 2).endStroke(), v.graphics.beginStroke(this._textStyle.color).moveTo(M, -this._dHeight).lineTo(M, 0).endStroke(), f == "teeth")
+      p.y = -this.dHeight / 2 - p.getMeasuredHeight() / 2, p.x = M - p.getMeasuredWidth() / 2 - 2 - 0.5, p.textAlign = "center", p.textBaseline = "alphabetic", g.y = p.y, g.x = M + g.getMeasuredWidth() / 2 + 2, g.textAlign = "center", g.textBaseline = "alphabetic", m.y = -3, m.x = M - m.getMeasuredWidth() / 2 - 2 - 0.5, m.textAlign = "center", m.textBaseline = "alphabetic", y.y = m.y, y.x = M + y.getMeasuredWidth() / 2 + 2, y.textAlign = "center", y.textBaseline = "alphabetic";
+    else {
+      const I = "center";
+      p.y = -this.dHeight / 2 - p.getMeasuredHeight() / 2, p.x = 4, p.textAlign = I, p.textBaseline = "alphabetic", g.y = p.y, g.x = T + 6 + 2, g.textAlign = I, g.textBaseline = "alphabetic", m.y = -3, m.x = 4, m.textAlign = I, m.textBaseline = "alphabetic", y.y = m.y, y.x = g.x, y.textAlign = I, y.textBaseline = "alphabetic";
     }
     this.addChild(p), this.addChild(g), this.addChild(w), this.addChild(m), this.addChild(y), this.addChild(v);
   }
@@ -64257,7 +64258,7 @@ WebPDecoder.prototype.getData = function() {
 (function(a) {
   function t() {
     return function() {
-      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-BOHDqAeY.mjs");
+      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-DA22crzR.mjs");
     }().catch(function(r) {
       return Promise.reject(new Error("Could not load canvg: " + r));
     }).then(function(r) {

package/lib/{index.es-BOHDqAeY.mjs → index.es-DA22crzR.mjs}

@@ -1,4 +1,4 @@
-import { c as Ma, _ as qa, g as Zu } from "./index-CMlZDMbc.mjs";
+import { c as Ma, _ as qa, g as Zu } from "./index-QhzdhumN.mjs";
 var un = {}, ln = {}, lr, hn;
 function Z() {
   if (hn) return lr;

package/package.json

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