hoeditor-web 3.2.48 → 3.2.50

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

package/lib/{index-BZDmGwAu.mjs → index-D0Gk9boR.mjs}

@@ -3743,6 +3743,10 @@ class BaseNode {
   getParentNodes() {
     return this._parentNode ? this._parentNode.childNodes : this.rootNodes;
   }
+  //非查看痕迹模式且已经审阅删除 
+  editModeAndSoftDelete() {
+    return !1;
+  }
   // /**
   // *@author xyl
   // *@returns 返回当前节点的层级
@@ -3826,12 +3830,21 @@ class BaseNode {
     for (; ; )
       if (t) {
         const o = t.childNodes, n = o.indexOf(r);
-        return n === 0 && (t == null ? void 0 : t.nodeType) === 7 && r._nodeType !== 5 && HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).isThrowError ? (message.warn("经检测，病历元素“" + t.name + "”的模板格式有问题，可能会导致死循环，请联系工程师进行处理。"), null) : n === o.length - 1 ? null : o[n + 1];
+        if (n === 0 && (t == null ? void 0 : t.nodeType) === 7 && r._nodeType !== 5 && HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).isThrowError)
+          return message.warn("经检测，病历元素“" + t.name + "”的模板格式有问题，可能会导致死循环，请联系工程师进行处理。"), null;
+        if (n === o.length - 1)
+          return null;
+        {
+          const s = o[n + 1];
+          return s && s.editModeAndSoftDelete() ? s.nextSibling() : s;
+        }
       } else if (r) {
-        const o = this.rootNodes.indexOf(r);
-        if (o < this.rootNodes.length - 1)
-          return this.rootNodes[o + 1];
-        break;
+        let o = this.rootNodes.indexOf(r);
+        if (o < this.rootNodes.length - 1) {
+          const n = this.rootNodes[o + 1];
+          return n && n.editModeAndSoftDelete() ? n.nextSibling() : n;
+        } else
+          break;
       } else
         break;
     return null;
@@ -3845,12 +3858,19 @@ class BaseNode {
     for (; ; )
       if (t) {
         const o = t.childNodes, n = o.indexOf(r);
-        return n === 0 ? null : o[n - 1];
+        if (n === 0)
+          return null;
+        {
+          const s = o[n - 1];
+          return s && s.editModeAndSoftDelete() ? s.prevSibling() : s;
+        }
       } else if (r) {
         const o = this.rootNodes.indexOf(r);
-        if (o > 0)
-          return this.rootNodes[o - 1];
-        break;
+        if (o > 0) {
+          const n = this.rootNodes[o - 1];
+          return n && n.editModeAndSoftDelete() ? n.prevSibling() : n;
+        } else
+          break;
       } else
         break;
     return null;
@@ -3884,20 +3904,20 @@ class BaseNode {
               if (!c)
                 break;
               if (l = c, !l.isCombineNode())
-                return l;
+                return l.editModeAndSoftDelete() ? l.nextLeaf() : l;
             }
-            return l;
+            return l && l.editModeAndSoftDelete() ? l.nextLeaf() : l;
           } else
-            return l;
+            return l && l.editModeAndSoftDelete() ? l.nextLeaf() : l;
       } else if (o) {
         const n = this.rootNodes.indexOf(o);
         if (n < this.rootNodes.length - 1) {
           if (this.rootNodes[n + 1].isCombineNode()) {
             const s = t.docTree.getNodeFirstPath(this.rootNodes[n + 1]), l = t.docTree.findNodePositionByPath(s);
             if (l && l.node)
-              return l.node;
+              return l.node.editModeAndSoftDelete() ? l.node.nextLeaf() : l.node;
           }
-          return this.rootNodes[n + 1];
+          return this.rootNodes[n + 1] && this.rootNodes[n + 1].editModeAndSoftDelete() ? this.rootNodes[n + 1].nextLeaf() : this.rootNodes[n + 1];
         } else
           break;
       } else
@@ -3929,19 +3949,20 @@ class BaseNode {
               if (!c)
                 break;
               if (l = c, !l.isCombineNode())
-                return l;
+                return l.editModeAndSoftDelete() ? l.previousLeaf() : l;
             }
-            return l;
+            return l && l.editModeAndSoftDelete() ? l.previousLeaf() : l;
           } else
-            return l;
+            return l && l.editModeAndSoftDelete() ? l.previousLeaf() : l;
       } else if (o) {
         const n = this.rootNodes.indexOf(o);
         if (n > 0)
           if (this.rootNodes[n - 1].isCombineNode()) {
             const s = r.docTree.getNodeLastPath(this.rootNodes[n - 1]), l = r.docTree.findNodePositionByPath(s);
             if (l && l.node)
-              return l.node;
-          } else return this.rootNodes[n - 1];
+              return l.node.editModeAndSoftDelete() ? l.node.previousLeaf() : l.node;
+          } else
+            return this.rootNodes[n - 1] && this.rootNodes[n - 1].editModeAndSoftDelete() ? this.rootNodes[n - 1].previousLeaf() : this.rootNodes[n - 1];
         else
           break;
       } else
@@ -10318,7 +10339,7 @@ let TableFormula$1 = class _TableFormula extends ControlNode {
                   }
                 }
               else {
-                if (!m) {
+                if (!m && this.formularType !== 0) {
                   n = !1;
                   break;
                 }
@@ -12351,6 +12372,10 @@ class DrawPageCell extends DrawArea {
     //实现接口部分
     b(this, "_node");
     b(this, "_discriminator");
+    b(this, "setStrokeStyle2", (r, ...o) => {
+      const n = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
+      n.drawTree.paintStatus == PaintState.psPreview && !n.isUseImagePrint ? r.setStrokeStyle(o[0]) : r.setStrokeStyle(...o);
+    });
     this._drawPageTable = o, this._backImg = new createjs$1.Shape(), this._backImg.name = "backImg", this.backColor = new createjs$1.Shape(), this.backColor.name = "backColor", this._topLine = new createjs$1.Shape(), this._bottomLine = new createjs$1.Shape(), this._leftLine = new createjs$1.Shape(), this._rightLine = new createjs$1.Shape(), this._touchArea = new createjs$1.Shape(), this._node = n, this._cell = n, this._startDline = f, this._endDline = f, this._dWidth = c, this._maxHeight = p, this._dHeight = d, this._discriminator = gDrawIntfID;
     let m = 0;
     const y = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
@@ -12540,7 +12565,7 @@ class DrawPageCell extends DrawArea {
       if (f || !f && y !== PaintState.psPreview && y !== PaintState.psPrint) {
         if (p[0]) {
           let v = null;
-          o > 0 && (v = this._cell.table.getMainCell(o - 1, n)[0]), (o == 0 || this.dTop == 0 || o > 0 && v && !v.cellProperty.gridLineDisplay[1]) && (this._topLine.name = "topLine", this._topLine.graphics.beginStroke(g[0]), w ? this._topLine.graphics.setStrokeDash([2, 2]) : this._topLine.graphics.setStrokeStyle(1, 0, 0, void 0, !0), this._topLine.graphics.moveTo(l, c).lineTo(l + d, c), this._topLine.graphics.endStroke(), this.children.includes(this._topLine) || this.addChildAt(this._topLine, this.children.length - 1));
+          o > 0 && (v = this._cell.table.getMainCell(o - 1, n)[0]), (o == 0 || this.dTop == 0 || o > 0 && v && !v.cellProperty.gridLineDisplay[1]) && (this._topLine.name = "topLine", this._topLine.graphics.beginStroke(g[0]), w ? this._topLine.graphics.setStrokeDash([2, 2]) : this.setStrokeStyle2(this._topLine.graphics, 1, 0, 0, void 0, !0), this._topLine.graphics.moveTo(l, c).lineTo(l + d, c), this._topLine.graphics.endStroke(), this.children.includes(this._topLine) || this.addChildAt(this._topLine, this.children.length - 1));
         } else if (o > 0) {
           const v = (C, _) => {
             const E = this._cell.table.getMainCell(C, _)[0].drawCell.drawPageCells;
@@ -12553,7 +12578,7 @@ class DrawPageCell extends DrawArea {
               v(o - 1, n + C);
         }
         if (p[1])
-          this._bottomLine.name = "bottomLine", this._bottomLine.graphics.beginStroke(g[1]), w ? this._bottomLine.graphics.setStrokeDash([2, 2]) : this._bottomLine.graphics.setStrokeStyle(1, 0, 0, void 0, !0), this._bottomLine.graphics.moveTo(l, c + u).lineTo(l + d, c + u), this._bottomLine.graphics.endStroke(), this.children.includes(this._bottomLine) || this.addChildAt(this._bottomLine, this.children.length - 1);
+          this._bottomLine.name = "bottomLine", this._bottomLine.graphics.beginStroke(g[1]), w ? this._bottomLine.graphics.setStrokeDash([2, 2]) : this.setStrokeStyle2(this._bottomLine.graphics, 1, 0, 0, void 0, !0), this._bottomLine.graphics.moveTo(l, c + u).lineTo(l + d, c + u), this._bottomLine.graphics.endStroke(), this.children.includes(this._bottomLine) || this.addChildAt(this._bottomLine, this.children.length - 1);
         else if (o < this.cell.table.rowCount - 1) {
           const v = (C, _) => {
             const E = this._cell.table.getMainCell(C, _)[0].drawCell.drawPageCells;
@@ -12567,7 +12592,7 @@ class DrawPageCell extends DrawArea {
         }
         if (p[2]) {
           let v = null;
-          n > 0 && (v = this._cell.table.getMainCell(o, n - 1)[0]), (n == 0 || n > 0 && v && !v.cellProperty.gridLineDisplay[3]) && (this._leftLine.name = "leftLine", this._leftLine.graphics.beginStroke(g[2]), w ? this._leftLine.graphics.setStrokeDash([2, 2]) : this._leftLine.graphics.setStrokeStyle(1, 0, 0, void 0, !0), this._leftLine.graphics.moveTo(l, c).lineTo(l, c + u), this._leftLine.graphics.endStroke(), this.children.includes(this._leftLine) || this.addChildAt(this._leftLine, this.children.length - 1));
+          n > 0 && (v = this._cell.table.getMainCell(o, n - 1)[0]), (n == 0 || n > 0 && v && !v.cellProperty.gridLineDisplay[3]) && (this._leftLine.name = "leftLine", this._leftLine.graphics.beginStroke(g[2]), w ? this._leftLine.graphics.setStrokeDash([2, 2]) : this.setStrokeStyle2(this._leftLine.graphics, 1, 0, 0, void 0, !0), this._leftLine.graphics.moveTo(l, c).lineTo(l, c + u), this._leftLine.graphics.endStroke(), this.children.includes(this._leftLine) || this.addChildAt(this._leftLine, this.children.length - 1));
         } else if (n > 0) {
           const v = (C, _) => {
             const E = this._cell.table.getMainCell(C, _)[0].drawCell.drawPageCells;
@@ -12583,7 +12608,7 @@ class DrawPageCell extends DrawArea {
               v(o + C, n - 1);
         }
         if (p[3])
-          this._rightLine.name = "rightLine", this._rightLine.graphics.beginStroke(g[3]), w ? this._rightLine.graphics.setStrokeDash([2, 2]) : this._rightLine.graphics.setStrokeStyle(1, 0, 0, void 0, !0), this._rightLine.graphics.moveTo(l + d, c).lineTo(l + d, c + u), this._rightLine.graphics.endStroke(), this.children.includes(this._rightLine) || this.addChildAt(this._rightLine, this.children.length - 1);
+          this._rightLine.name = "rightLine", this._rightLine.graphics.beginStroke(g[3]), w ? this._rightLine.graphics.setStrokeDash([2, 2]) : this.setStrokeStyle2(this._rightLine.graphics, 1, 0, 0, void 0, !0), this._rightLine.graphics.moveTo(l + d, c).lineTo(l + d, c + u), this._rightLine.graphics.endStroke(), this.children.includes(this._rightLine) || this.addChildAt(this._rightLine, this.children.length - 1);
         else if (n < this.cell.table.colCount - 1 && n > 0) {
           const v = (C, _) => {
             const E = this._cell.table.getMainCell(C, _)[0].drawCell.drawPageCells;
@@ -14898,7 +14923,7 @@ class DrawSignNode extends DrawCombineNode {
     }
   }
 }
-const version = "3.2.48";
+const version = "3.2.50";
 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) {
@@ -25360,6 +25385,8 @@ class PageProperty {
     //显示第一页的页脚
     b(this, "_pageNumber", 0);
     //页数 从第几页开始
+    b(this, "_startPageNumber", 0);
+    //页数 从第几页开始 new
     b(this, "_isHaveBgImage", !1);
     //是否设置了背景图片(打印的时候需要判断)
     b(this, "_commentWidthMm", 0);
@@ -25428,6 +25455,7 @@ class PageProperty {
       "showFirstPageHead",
       "showFirstPageFoot",
       "pageNumber",
+      "startPageNumber",
       "isHaveBgImage",
       "commentWidthMm",
       "fontFormat",
@@ -25602,6 +25630,12 @@ class PageProperty {
   set pageNumber(a) {
     a !== this._pageNumber && (this._pageNumber = a);
   }
+  get startPageNumber() {
+    return this._startPageNumber;
+  }
+  set startPageNumber(a) {
+    a !== this._startPageNumber && (this._startPageNumber = a);
+  }
   get isHaveBgImage() {
     return this._isHaveBgImage;
   }
@@ -29312,6 +29346,12 @@ class TextNode extends BaseNode {
   }
   updateDrawNodes(r) {
   }
+  editModeAndSoftDelete() {
+    const r = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
+    let o = r.docTree.styles[this._styleIndex];
+    const n = !(o.deleterIndex === void 0 || o.deleterIndex === -1), s = r.drawTree.paintStatus === PaintState.psReview || r.drawTree.paintStatus === PaintState.psTrace;
+    return n && !s && r.isHideComments;
+  }
   deleteByIndex(r, o) {
     this._text = this._text.substr(0, r) + this._text.substr(o + 1, this._text.length);
     for (let n = 0; n < this.drawNodes.length; n++) {
@@ -44226,7 +44266,9 @@ class DrawPageMarkNode extends DrawCombineNode {
     this._dHeight = o.dHeight, this._dWidth = o.dWidth, this.y = o.baseY;
   }
   static getPageMarkText(t, r, o, n) {
-    const s = HOEditorFactorys.instance().getFactory(t), l = Math.max(s.drawTree.drawPages.length.toString().length, 2);
+    const s = HOEditorFactorys.instance().getFactory(t);
+    o += s.pageProperty.startPageNumber || 0;
+    const l = Math.max(s.drawTree.drawPages.length.toString().length, 2);
     if (r === 0)
       return n ? " ".repeat(l) : o.toString();
     {
@@ -45116,7 +45158,7 @@ class StructureConvert {
       const T = o.pageProperty;
       T.borderColor = s.borderColor, T.isPaintBorder = s.isPaintBorder == "true", T.paintRowLine = Number(s.paintRowLine);
       const M = Number(s.widthMm), A = Number(s.heightMm);
-      o.vueController.isA5(M, A) ? (T.pageSize = "A5", M > A ? (T.widthMm = 210, T.heightMm = 148, T.printDirection = 1) : (T.widthMm = 148, T.heightMm = 210, T.printDirection = 0)) : (T.widthMm = M, T.heightMm = A, T.printDirection = Number(s.printDirection), T.pageSize = s.pageSize), T.source = s.source, T.topMarginMm = Number(s.topMarginMm), T.bottomMarginMm = Number(s.bottomMarginMm), T.leftMarginMm = Number(s.leftMarginMm), T.rightMarginMm = Number(s.rightMarginMm), T.headerYMm = Number(s.headerYMm) >= 3 ? Number(s.headerYMm) : 3, T.footerYMm = Number(s.footerYMm) >= 3 ? Number(s.footerYMm) : 3, T.showFirstPageFoot = s.showFirstPageFoot === "true", T.showFirstPageHead = s.showFirstPageHead === "true", T.pageNumber = Number(s.pageNumber), T.isHaveBgImage = s.isHaveBgImage === "true", T.fontFormat = s.fontFormat ? s.fontFormat : i18nHelper("04-001-009-EMR.3.3.548", null, "宋体"), T.fontSize = s.fontSize ? Number(s.fontSize) : 14, T.fontColor = s.fontColor ? s.fontColor : "#000000", T.backColor = "transparent", T.paraAlign = s.paraAlign ? Number(s.paraAlign) : 3, T.charSpace = s.charSpace ? Number(s.charSpace) : 0, T.lineHeight = s.lineHeight ? Number(s.lineHeight) : 1.25, T.drawLineUnderline = s.drawLineUnderline === "true", T.lineUnderlineColor = s.lineUnderlineColor || "#000000", T.lineUnderlineStyle = s.lineUnderlineStyle == 1 ? 1 : 0;
+      o.vueController.isA5(M, A) ? (T.pageSize = "A5", M > A ? (T.widthMm = 210, T.heightMm = 148, T.printDirection = 1) : (T.widthMm = 148, T.heightMm = 210, T.printDirection = 0)) : (T.widthMm = M, T.heightMm = A, T.printDirection = Number(s.printDirection), T.pageSize = s.pageSize), T.source = s.source, T.topMarginMm = Number(s.topMarginMm), T.bottomMarginMm = Number(s.bottomMarginMm), T.leftMarginMm = Number(s.leftMarginMm), T.rightMarginMm = Number(s.rightMarginMm), T.headerYMm = Number(s.headerYMm) >= 3 ? Number(s.headerYMm) : 3, T.footerYMm = Number(s.footerYMm) >= 3 ? Number(s.footerYMm) : 3, T.showFirstPageFoot = s.showFirstPageFoot === "true", T.showFirstPageHead = s.showFirstPageHead === "true", T.pageNumber = Number(s.pageNumber), T.startPageNumber = Number(s.startPageNumber), T.isHaveBgImage = s.isHaveBgImage === "true", T.fontFormat = s.fontFormat ? s.fontFormat : i18nHelper("04-001-009-EMR.3.3.548", null, "宋体"), T.fontSize = s.fontSize ? Number(s.fontSize) : 14, T.fontColor = s.fontColor ? s.fontColor : "#000000", T.backColor = "transparent", T.paraAlign = s.paraAlign ? Number(s.paraAlign) : 3, T.charSpace = s.charSpace ? Number(s.charSpace) : 0, T.lineHeight = s.lineHeight ? Number(s.lineHeight) : 1.25, T.drawLineUnderline = s.drawLineUnderline === "true", T.lineUnderlineColor = s.lineUnderlineColor || "#000000", T.lineUnderlineStyle = s.lineUnderlineStyle == 1 ? 1 : 0;
     }
     for (let T = 0; T < o.drawTree.drawPages.length; T++)
       o.drawTree.drawPages[T].reFreshBounds();
@@ -47700,6 +47742,15 @@ class VueController {
       r.drawTree.drawPages[o].reFreshBounds();
     r.drawTree.drawPages.length > 1 || r.drawTree.mainDNodes.length > 1 || r.drawTree.mainDNodes[0] instanceof DrawTable || r.drawTree.mainDNodes[0] instanceof DrawLine && r.drawTree.mainDNodes[0].drawItems.length > 0 || r.drawTree.headerDNodes.length >= 1 && r.drawTree.headerDNodes[0].length > 1 || r.drawTree.footerDNodes.length >= 1 && r.drawTree.footerDNodes[0].length > 1 ? this.rebuildAll(!0) : r.drawTree.updateDrawTreeFirstLine();
   }
+  /**
+   * 更新页面属性
+   * @param key 属性key
+   * @param value 更新值
+   */
+  setPagePropertyField(t, r) {
+    const o = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
+    o.docController.setPageProperty(JSON.stringify({ [t]: r })), t == "startPageNumber" && o.drawTree.rebuildArea("footer", !1);
+  }
   /**
    * 添加批注
    * @param text 批注内容
@@ -64194,7 +64245,7 @@ WebPDecoder.prototype.getData = function() {
 (function(a) {
   function t() {
     return function() {
-      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-C-NRuy_k.mjs");
+      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-D8Jb9Hjp.mjs");
     }().catch(function(r) {
       return Promise.reject(new Error("Could not load canvg: " + r));
     }).then(function(r) {
@@ -66357,6 +66408,8 @@ class NodeStyleUndoUnit {
   doChangeStyle(t) {
     const r = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
     if (t instanceof TextNode || t instanceof ControlNode || t instanceof MarkNode || t instanceof ParagraphNode || t instanceof SignNode) {
+      if (t instanceof ParagraphNode && t.parentNode && t.parentNode instanceof CellNode && t.parentNode.childNodes[0] == t)
+        return;
       let o = r.docTree.styles[t.styleIndex];
       o || (o = r.docTree.styles[0]);
       let n;
@@ -71796,7 +71849,7 @@ class HOEditorFactory {
     // 错误图片地址
     b(this, "historyPosition", HistoryComponentPosition.right);
     // 历史痕迹展示位置 默认右侧 单行工具栏启用时候需要调整位置避免被业务弹窗挡住
-    b(this, "enableChangeTracking", !1);
+    b(this, "enableChangeTracking", !0);
     b(this, "compressXml", !1);
     // 压缩xml
     b(this, "compressJSONData", {});

package/lib/{index.es-C-NRuy_k.mjs → index.es-D8Jb9Hjp.mjs}

@@ -1,4 +1,4 @@
-import { c as Qe, _ as za, g as Io } from "./index-BZDmGwAu.mjs";
+import { c as Qe, _ as za, g as Io } from "./index-D0Gk9boR.mjs";
 var ht = function(a) {
   return a && a.Math === Math && a;
 }, _ = (

package/package.json

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