hoeditor-web 3.2.40 → 3.2.42

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

package/lib/{index-DWjyZZ0B.mjs → index-UViDQi3j.mjs}

@@ -13543,7 +13543,7 @@ class DateTimeNode extends ControlNode {
       const l = HOEditorFactorys.instance().getFactory(t);
       l.vueController.getNodeByDataID("all", r.dataId) && (r.dataId = l.gernerateCode.generateID("DateTime"));
     }
-    if (r.readType = r.readType ? Number(r.readType) : -1, r.isSynchro = r.isSynchro ? r.isSynchro : !1, r.isAllowDelete = r.isAllowDelete ? r.isAllowDelete : !1, r.isReadOnly = r.isReadOnly ? r.isReadOnly : !1, r.notReplaceElement = r.notReplaceElement ? r.notReplaceElement : !1, r.notSelectTime = r.notSelectTime ? r.notSelectTime : !1, r.canWrapLine = r.canWrapLine ? r.canWrapLine : !1, r.type = parseInt(ControlType[r.type]), r.controlStyle = r.controlStyle.replace("hh", "HH"), r.controlStyle !== "yyyy-MM-dd HH:mm:ss" && r.controlStyle !== "" && r.text.replace(" ", "").length > 0 && r.text !== r.labelText) {
+    if (r.readType = r.readType ? Number(r.readType) : -1, r.isSynchro = r.isSynchro ? r.isSynchro : !1, r.isAllowDelete = r.isAllowDelete ? r.isAllowDelete : !1, r.isReadOnly = r.isReadOnly ? r.isReadOnly : !1, r.notReplaceElement = r.notReplaceElement ? r.notReplaceElement : !1, r.notSelectTime = r.notSelectTime ? r.notSelectTime : !1, r.canWrapLine = r.canWrapLine ? r.canWrapLine : !1, r.type = parseInt(ControlType[r.type]), r.controlStyle = r.controlStyle.replace("hh", "HH"), r.text = r.text || "", r.controlStyle !== "yyyy-MM-dd HH:mm:ss" && r.controlStyle !== "" && r.text.replace(" ", "").length > 0 && r.text !== r.labelText) {
       const l = dateFormat(r.text.toString(), r.controlStyle);
       r.text = l;
     }
@@ -14904,7 +14904,7 @@ class DrawSignNode extends DrawCombineNode {
     }
   }
 }
-const version = "3.2.40";
+const version = "3.2.42";
 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) {
@@ -14962,7 +14962,7 @@ 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 ? 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.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 ? 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];
@@ -15240,7 +15240,7 @@ class SignNode extends BaseNode {
       s ? void 0 : r.customProperty,
       m,
       r.styleIndex ? Number(r.styleIndex) : void 0,
-      r.connectMode,
+      r.connectMode || "",
       w,
       v,
       s ? "" : r.fingerPrintSrc,
@@ -20360,7 +20360,7 @@ class TextBorderNode extends ControlNode {
       o,
       n || null,
       NodeType$1.ntTextBorder,
-      r.text,
+      r.text || "",
       s
     );
   }
@@ -23014,7 +23014,9 @@ const appendPrevTextResult = (a, t, r) => {
       }, o = !1;
   }
   return r;
-};
+}, removeEmptyValues = (a) => typeof a != "object" || a === null ? a : Array.isArray(a) ? a.filter((r) => !isEmptyValue(r)).map((r) => removeEmptyValues(r)) : Object.fromEntries(
+  Object.entries(a).filter(([r, o]) => r === "tetx" || !isEmptyValue(o)).map(([r, o]) => [r, removeEmptyValues(o)])
+), isEmptyValue = (a) => a === "" || a === !1 || a === null || a === void 0;
 var ReadOnlyStatus = /* @__PURE__ */ ((a) => (a[a.true = 0] = "true", a[a.false = 1] = "false", a[a.InheritParentElement = 2] = "InheritParentElement", a))(ReadOnlyStatus || {}), InputFieldType = /* @__PURE__ */ ((a) => (a[a.text = 0] = "text", a[a.dropDownList = 1] = "dropDownList", a))(InputFieldType || {});
 class DownListProperty {
   //列表项目
@@ -28710,9 +28712,7 @@ class DrawTree {
       if (o.childIndex >= 0) {
         if (o.node instanceof TextNode) {
           const n = o.node.getDrawNodeByIndex(o.childIndex);
-          if (n)
-            return n;
-          throw new Error();
+          return n || null;
         }
         return o.node.drawNodes[o.childIndex];
       } else {
@@ -39756,7 +39756,7 @@ class HTMLconverter2 {
     } else if (n == "sub") {
       const s = o.vertical_align || "";
       s.indexOf("sub") == -1 && (o.vertical_align = (s == "" || s == null ? "" : s + " ") + "sub");
-    } else if (n == "u" || n == "#text") {
+    } else if (n == "u") {
       const s = o.text_decoration || "";
       s.indexOf("underline") == -1 && (o.text_decoration = (s == "" ? "" : s + " ") + "underline");
     } else if (n == "s") {
@@ -45197,7 +45197,7 @@ class StructureConvert {
       for (let g = 0; g < f.length; g++) {
         const y = f[g];
         let w;
-        p === "json" && (y instanceof TableNode || y instanceof TextInputFieldNode) ? w = this.delStyle(y.node2Json(void 0, void 0, "json")) : p === "json" ? w = this.delStyle(y.node2Json()) : y instanceof TableNode || y instanceof TextInputFieldNode ? (w = y.node2Json(void 0, void 0, void 0, n), w = d(t, w, y instanceof TableNode ? "TableNode" : "TextInputFieldNode")) : y instanceof SignNode ? (n ? y.isTemplate && (w = y.node2Json(void 0, void 0, void 0, n)) : w = y.node2Json(), w = d(t, w, "SignNode")) : y instanceof DateTimeNode && n || y instanceof QrcodeNode && n ? w = y.node2Json(void 0, void 0, void 0, n) : y instanceof DateTimeNode ? w = d(t, y.node2Json(), "DateTimeNode") : w = y.node2Json(), p === "xml" ? o += l.js2xml(w) : m.push(w);
+        p === "json" && (y instanceof TableNode || y instanceof TextInputFieldNode) ? w = this.delStyle(y.node2Json(void 0, void 0, "json")) : p === "json" ? w = this.delStyle(y.node2Json()) : (y instanceof TableNode || y instanceof TextInputFieldNode ? (w = y.node2Json(void 0, void 0, void 0, n), w = d(t, w, y instanceof TableNode ? "TableNode" : "TextInputFieldNode")) : y instanceof SignNode ? (n ? y.isTemplate && (w = y.node2Json(void 0, void 0, void 0, n)) : w = y.node2Json(), w = d(t, w, "SignNode")) : y instanceof DateTimeNode && n || y instanceof QrcodeNode && n ? w = y.node2Json(void 0, void 0, void 0, n) : y instanceof DateTimeNode ? w = d(t, y.node2Json(), "DateTimeNode") : w = y.node2Json(), w = removeEmptyValues(w)), p === "xml" ? o += l.js2xml(w) : m.push(w);
       }
       if (r === "json")
         return m;
@@ -47977,7 +47977,7 @@ class VueController {
     let n = 0;
     t === 4 ? (n = 80, o.isHideComments = !1, o.commentParams.review = !0, o.commentParams.hideComment = !1) : (o.isHideComments = !0, o.commentParams.review = !1, o.commentParams.hideComment = !0, hoCreateComment.close()), n !== o.pageProperty.commentWidthMm && o.vueController.setPageProperty(JSON.stringify({ commentWidthMm: n }));
     const s = o.structureConvert._superiorSign;
-    s.length > 0 && s[0].imgSrc != "" && (t === 1 || t === 4 ? this.hiddenMask(!1) : this.hiddenMask(!0));
+    s.length > 0 && s[0].imgSrc != "" && (t === 1 || t === 4 ? this.hiddenMask(!1) : this.hiddenMask(!0)), o.drawTree.rebuildAllDrawLine(!0);
   }
   async hiddenMask(t) {
     const r = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
@@ -50910,7 +50910,7 @@ class VueController {
     let t = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
     t.docTree.docProperty.type = EmrType.etCaseHistory;
     const r = t.docTree.curDomRange, o = r.normalize().startPath, n = r.normalize().endPath, s = new NodeChangingEvent(DocAction.daUnkown, o, n, OperType.newFile);
-    t.docTree.changing(s) && await t.docController.initBlankDoc(), t._docTree && (t._docTree.clearDocTree(), delete t._docTree), t.hoLocalStorage && t.hoLocalStorage.removeEvent(), delete t._subDocManger, delete t._drawPageTree, delete t._vueController, delete t._docController, delete t._pageProperty, delete t._undoService, delete t._printStatus, delete t._timeStamp, delete t._gernerateCode, delete t._htmlConverter, delete t._structureConvert, delete t._structureNode, delete t._toHtmlConverter, delete t._unitConvert, delete t._nodeMouseMove, delete t._testDataSet, delete t._userInfo, delete t._option, delete t._baseController, delete t._domController, delete t._editController, delete t._elementController, delete t._nodeController, delete t._printController, delete t._reviewController, delete t._selectController, delete t._tableController, delete t._formatPainter, delete t._hoLocalStorage, t._drawTree && t._drawTree.drawPages[0] && (t._drawTree.drawPages[0].destory(), t._drawTree.drawPageCount.count = 0, t._drawTree.drawPages.splice(0, t._drawTree.drawPages.length)), delete t._drawTree, t = null;
+    t.hoLocalStorage && t.hoLocalStorage.removeEvent(), t.docTree.changing(s) && await t.docController.initBlankDoc(), t._docTree && (t._docTree.clearDocTree(), delete t._docTree), delete t._subDocManger, delete t._drawPageTree, delete t._vueController, delete t._docController, delete t._pageProperty, delete t._undoService, delete t._printStatus, delete t._timeStamp, delete t._gernerateCode, delete t._htmlConverter, delete t._structureConvert, delete t._structureNode, delete t._toHtmlConverter, delete t._unitConvert, delete t._nodeMouseMove, delete t._testDataSet, delete t._userInfo, delete t._option, delete t._baseController, delete t._domController, delete t._editController, delete t._elementController, delete t._nodeController, delete t._printController, delete t._reviewController, delete t._selectController, delete t._tableController, delete t._formatPainter, delete t._hoLocalStorage, t._drawTree && t._drawTree.drawPages[0] && (t._drawTree.drawPages[0].destory(), t._drawTree.drawPageCount.count = 0, t._drawTree.drawPages.splice(0, t._drawTree.drawPages.length)), delete t._drawTree, t = null;
   }
   /**
    * 获取签名元素清理后的病历xml内容
@@ -64330,7 +64330,7 @@ WebPDecoder.prototype.getData = function() {
 (function(a) {
   function t() {
     return function() {
-      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-Bfk--3Bj.mjs");
+      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-CB1adP1a.mjs");
     }().catch(function(r) {
       return Promise.reject(new Error("Could not load canvg: " + r));
     }).then(function(r) {

package/lib/{index.es-Bfk--3Bj.mjs → index.es-CB1adP1a.mjs}

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