hoeditor-web 3.2.24 → 3.2.27

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

package/lib/{index-CvB8n_xM.mjs → index-BSSaXGu2.mjs}

@@ -10694,11 +10694,11 @@ let TableFormula$1 = class _TableFormula extends ControlNode {
             let S = Math.floor(_ / (1e3 * 60 * 60 * 24));
             return S == 0 && (S = 1), S.toString() + /* @__PURE__ */ i18nHelper("04-001-009-EMR.3.3.35", null, "天");
           } else {
-            const v = m.getTime(), _ = (g.getTime() - v) / (1e3 * 3600 * 24), S = Math.floor(_);
-            let E = Math.floor((_ - S) * 24), T = Math.floor(((_ - S) * 24 - E) * 60);
-            S > 0 && (E += S * 24);
+            const v = g.getTime() - m.getTime();
+            if (v < 0) return "";
+            const C = Math.floor(v / (1e3 * 60)), _ = Math.floor(C / 60), S = C % 60, E = _ % 24, T = Math.floor(_ / 24);
             let I = "";
-            return E > 0 && (I += E.toString() + "小时"), T > 0 && (I += T.toString() + "分钟"), E == 0 && T == 0 && (I = "0"), I;
+            return T > 0 && (I += `${T}天`), E > 0 && (I += `${E}小时`), (S > 0 || I === "") && (I += `${S}分钟`), I || "0";
           }
         }
       }
@@ -13041,7 +13041,7 @@ class ParagraphNode extends BaseNode {
     const n = this.getNextDline(r);
     for (let s = o; s < r.drawItems.length; s++)
       n.addChildAt(s - o, r.drawItems[s]);
-    n.fitLines();
+    n.updateLineStyle(), n.fitLines();
   }
   getParagraphLastNodePath() {
     return HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.getParaNodeLastPath(this);
@@ -14897,7 +14897,7 @@ class DrawSignNode extends DrawCombineNode {
     }
   }
 }
-const version = "3.2.24";
+const version = "3.2.27";
 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) {
@@ -29386,7 +29386,7 @@ class TextNode extends BaseNode {
       for (; u <= this.text.length - 1; ) {
         y = n.calcRestWidth();
         const v = new DrawSimpleText(this._text[0], this._dStyleKey, this._dColor);
-        y < v.getMeasuredWidth() && (u == 0 && w || (n.fitLines(), n = n.paragraphNode.getNextDline(n), this.adjustRectAlignLine(n), y = n.calcRestWidth()));
+        y < v.getMeasuredWidth() && (u == 0 && w || (n.updateLineStyle(), n.fitLines(), n = n.paragraphNode.getNextDline(n), this.adjustRectAlignLine(n), y = n.calcRestWidth()));
         const C = new DrawTextNode(
           this._hoEditorFactoryID,
           this._rootPath,
@@ -29398,11 +29398,11 @@ class TextNode extends BaseNode {
           n
         );
         if (C.endIndex < 0) {
-          g < this.text.length - 1 && (n.fitLines(), n = n.paragraphNode.getNextDline(n), this.adjustRectAlignLine(n));
+          g < this.text.length - 1 && (n.updateLineStyle(), n.fitLines(), n = n.paragraphNode.getNextDline(n), this.adjustRectAlignLine(n));
           continue;
         }
         if (C.dWidth = C.dText.dWidth, n.addChild(C), n.drawItems.push(C), this._drawNodes.push(C), g = C.endIndex, g < this.text.length - 1) {
-          n.fitLines();
+          n.updateLineStyle(), n.fitLines();
           const _ = n;
           if (n = n.paragraphNode.getNextDline(n), _.updateLineStyle(), n.paragraphNode.parentNode instanceof TextInputFieldNode) {
             const S = n.paragraphNode.drawlines.indexOf(n), E = n.paragraphNode.drawlines[S - 1];
@@ -53069,13 +53069,19 @@ class ElementController {
     return s.map((u) => {
       var f;
       if (u instanceof TextInputFieldNode) {
-        if (u.childNodes.filter((p) => p.nodeType != 5 && p.nodeType != 2 && p.nodeType != 0).length)
+        if (((u == null ? void 0 : u.customProperty) || {}).diagType) {
+          d.push(u);
           return;
-        if (u.hidden || (f = u == null ? void 0 : u.customProperty) != null && f.hidden)
-          return;
-        if (u.parentNode instanceof TextInputFieldNode && (u.groupName = u.parentNode.name), u.inputFieldType == InputFieldType.dropDownList) {
-          let p = u.downListProperty;
-          p.listItems && p.listItems.includes("<元素>") && (u.linkage = !0);
+        } else {
+          if (u.childNodes.filter((m) => m.nodeType != 5 && m.nodeType != 2 && m.nodeType != 0).length)
+            return;
+          if (u.hidden || (f = u == null ? void 0 : u.customProperty) != null && f.hidden)
+            return;
+          u.parentNode instanceof TextInputFieldNode && (u.groupName = u.parentNode.name);
+        }
+        if (u.inputFieldType == InputFieldType.dropDownList) {
+          let m = u.downListProperty;
+          m.listItems && m.listItems.includes("<元素>") && (u.linkage = !0);
         }
         d.push(u);
       } else
@@ -64155,7 +64161,7 @@ WebPDecoder.prototype.getData = function() {
 (function(a) {
   function t() {
     return function() {
-      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-DU1rLzgX.mjs");
+      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-CWpmopb1.mjs");
     }().catch(function(r) {
       return Promise.reject(new Error("Could not load canvg: " + r));
     }).then(function(r) {

package/lib/{index.es-DU1rLzgX.mjs → index.es-CWpmopb1.mjs}

@@ -1,4 +1,4 @@
-import { c as Ma, _ as qa, g as Zu } from "./index-CvB8n_xM.mjs";
+import { c as Ma, _ as qa, g as Zu } from "./index-BSSaXGu2.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.24",
+    "version": "3.2.27",
     "private": false,
     "main": "lib/hoeditor.mjs",
     "typings": "types/index.d.ts",