hoeditor-web 3.3.1 → 3.3.2-beta.1

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

package/lib/{index-D1DObY2H.mjs → index-ChMSD6GV.mjs}

@@ -15240,7 +15240,7 @@ class DrawSignNode extends DrawCombineNode {
     }
   }
 }
-const version = "3.3.1";
+const version = "3.3.2-beta.1";
 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) {
@@ -27566,7 +27566,7 @@ class Print {
   static openDataUriInWindow(t, r, o, n, s, l) {
     var d, u;
     if (window.emrPrintHandler) {
-      window.emrPrintHandler(t.output("bloburl"));
+      window.emrPrintHandler({ code: 200, data: t.output("bloburl") });
       return;
     }
     if (navigator && navigator.userAgent.toLowerCase().indexOf("electron") !== -1) {
@@ -27733,8 +27733,9 @@ class Print {
     }
     if (u.printStatus.printRange !== 1 && u.printStatus.recordLastPosByPageIndex(w), u.printStatus.DrawPrintRange().PrintOver(), l || u.startPageNum !== 0 && l !== void 0) {
       const G = u.printStatus.printRecord.last();
-      if (G && u.startPageNum == G[0] && l === G[1]) {
-        message.info(i18nHelper("04-001-009-EMR.3.3.483", null, "无新增内容无法续打，如果要打印最后一份病历，请打开打印记录，删除最近一次打印记录")), s && s("printend");
+      if (G && u.startPageNum == G[0] && (l === G[1] || l && G[1] && l > G[1])) {
+        const J = /* @__PURE__ */ i18nHelper("04-001-009-EMR.3.3.483", null, "无新增内容无法续打，如果要打印最后一份病历，请打开打印记录，删除最近一次打印记录");
+        message.info(J), window.emrPrintHandler && window.emrPrintHandler({ code: 500, msg: J }), s && s("printend");
         return;
       }
     }
@@ -50502,19 +50503,32 @@ class VueController {
     const t = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID), r = t.subDocManger.headerDocTree[0].subDocNodes, o = t.docTree.mainNodes, n = t.subDocManger.footerDocTree[0].subDocNodes;
     let s = "";
     const l = (c) => {
-      var d;
-      for (let u = 0; u < c.length; u++) {
-        const f = c[u];
-        if (!(f.hidden || (d = f == null ? void 0 : f.customProperty) != null && d.hidden)) if (f instanceof TextNode)
-          if (f.combination) {
-            let p = f.text;
-            f.combination.forEach((m) => {
-              p = p + m;
-            }), s += p;
-          } else
-            s += f.text;
-        else f instanceof ControlNode && !(f instanceof PageNumNode) && !(f instanceof PageCountNode) ? f instanceof DateTimeNode && f.name == f.text || (s += f.text) : f instanceof BaseCombineNode ? l(f.childNodes) : f instanceof ParagraphNode ? s += `
-` : f instanceof SignNode && f.customProperty && f.customProperty.bce03 && (s += f.customProperty.bce03);
+      var d, u;
+      for (let f = 0; f < c.length; f++) {
+        const p = c[f];
+        if (!(p.hidden || (d = p == null ? void 0 : p.customProperty) != null && d.hidden)) {
+          if (p instanceof TextNode)
+            if (p.combination) {
+              let m = p.text;
+              p.combination.forEach((g) => {
+                m = m + g;
+              }), s += m;
+            } else
+              s += p.text;
+          else if (p instanceof ControlNode && !(p instanceof PageNumNode) && !(p instanceof PageCountNode))
+            p instanceof DateTimeNode && p.name == p.text || (s += p.text);
+          else if (p instanceof BaseCombineNode)
+            l(p.childNodes);
+          else if (p instanceof ParagraphNode)
+            s += `
+`;
+          else if (p instanceof SignNode && p.customProperty && p.customProperty.bce03) {
+            let m = [];
+            p.customProperty.abi02 && m.push(p.customProperty.abi02), m.push(p.customProperty.bce03);
+            const g = ((u = p.otherProperties) == null ? void 0 : u.time) || p.signTime;
+            g && m.push(g), s += m.join("_");
+          }
+        }
       }
     };
     return l(r), l(o), l(n), s = s.replace(/&/g, "&amp;"), s = s.replace(/</g, "&lt;"), s = s.replace(/>/g, "&gt;"), s = s.replace(/\'/g, "&#39;"), s = s.replace(/\"/g, "&quot;"), s;
@@ -65149,7 +65163,7 @@ WebPDecoder.prototype.getData = function() {
 (function(a) {
   function t() {
     return function() {
-      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-Bv7pzhOR.mjs");
+      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-B3cYwQ4K.mjs");
     }().catch(function(r) {
       return Promise.reject(new Error("Could not load canvg: " + r));
     }).then(function(r) {

package/lib/{index.es-Bv7pzhOR.mjs → index.es-B3cYwQ4K.mjs}

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