hoeditor-web 3.3.5-beta.0 → 3.3.5-beta.2

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

package/lib/{index-BFSa6MR8.mjs → index-CK9irHre.mjs}

@@ -12647,21 +12647,22 @@ class DrawPageCell extends DrawArea {
   }
   // 绘制html触碰区
   updateHtmlTouchArea(r) {
-    var c, d, u, f;
-    const n = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.heightPixes, s = this.localToGlobal(0, 0), l = document.querySelector(".x-editor-table-table-tool__border");
-    if (l) {
-      const p = r.table.rows.indexOf(r.row) <= 0 ? 0 : r.table.rows.indexOf(r.row) - 1, m = r.row.indexOf(r) <= 0 ? 0 : r.row.indexOf(r) - 1, y = (((d = (c = this.parent) == null ? void 0 : c.parent) == null ? void 0 : d.pageIndex) || ((f = (u = this.parent) == null ? void 0 : u.parent) == null ? void 0 : f.index) || 0) * (n + 20) + s.y, w = (_, D = !1) => {
-        const E = D ? p + 1 : p, T = D ? m + 1 : m, I = document.createElement("div");
+    var d, u, f, p;
+    HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.heightPixes;
+    const n = this.localToGlobal(0, 0), s = ((u = (d = this.parent) == null ? void 0 : d.parent) == null ? void 0 : u.pageIndex) || ((p = (f = this.parent) == null ? void 0 : f.parent) == null ? void 0 : p.index) || 0, c = document.querySelectorAll(".x-editor-table-table-tool__border")[s];
+    if (c) {
+      const m = r.table.rows.indexOf(r.row) <= 0 ? 0 : r.table.rows.indexOf(r.row) - 1, g = r.row.indexOf(r) <= 0 ? 0 : r.row.indexOf(r) - 1, y = n.y, w = (_, D = !1) => {
+        const E = D ? m + 1 : m, T = D ? g + 1 : g, I = document.createElement("div");
         I.classList.add(`x-editor-table-table-tool__border__${_ === "row" ? "row" : "col"}`);
         const M = {
           width: this._dWidth,
           height: 4,
           top: y - 2,
-          left: s.x
+          left: n.x
         };
-        _ === "col" && (M.width = 4, M.height = this._dHeight, M.top = y, M.left = s.x - 2), D && _ === "row" && (M.top += this._dHeight), D && _ === "col" && (M.left += this._dWidth), I.style.width = `${M.width}px`, I.style.height = `${M.height}px`, I.style.top = `${M.top}px`, I.style.left = `${M.left}px`, I.onmousedown = (k) => {
+        _ === "col" && (M.width = 4, M.height = this._dHeight, M.top = y, M.left = n.x - 2), D && _ === "row" && (M.top += this._dHeight), D && _ === "col" && (M.left += this._dWidth), I.style.width = `${M.width}px`, I.style.height = `${M.height}px`, I.style.top = `${M.top}px`, I.style.left = `${M.left}px`, I.onmousedown = (k) => {
           this._mousedown({
-            borderTableContainer: l,
+            borderTableContainer: c,
             left: M.left,
             top: M.top,
             evt: k,
@@ -12671,7 +12672,7 @@ class DrawPageCell extends DrawArea {
             order: _,
             end: D
           });
-        }, l == null || l.appendChild(I);
+        }, c == null || c.appendChild(I);
       };
       w(
         "row"
@@ -12710,10 +12711,15 @@ class DrawPageCell extends DrawArea {
       }
       (M = this._anchorLine) == null || M.remove(), document.removeEventListener("mousemove", E), setTimeout(() => {
         var L, H;
-        const k = document.querySelector(".x-editor-table-table-tool__border");
-        k && (k.innerHTML = ""), (H = (L = d.table) == null ? void 0 : L.childNodes) == null || H.forEach((z) => {
-          var Z, j;
-          (j = (Z = z == null ? void 0 : z.drawCell) == null ? void 0 : Z.drawPageCells[0]) == null || j.updateHtmlTouchArea(z);
+        document.querySelectorAll(".x-editor-table-table-tool__border").forEach((z) => {
+          z.innerHTML = "";
+        });
+        const k = (H = (L = d.table) == null ? void 0 : L.drawTable) == null ? void 0 : H.drawPageTables;
+        k && k.forEach((z) => {
+          for (let Z = 0; Z < z.getNumChildren(); Z++) {
+            const j = z.getChildAt(Z);
+            j instanceof DrawPageCell && j.updateHtmlTouchArea(j.cell);
+          }
         });
       }, 10);
     };
@@ -15210,7 +15216,7 @@ class DrawSignNode extends DrawCombineNode {
     }
   }
 }
-const version = "3.3.5-beta.0";
+const version = "3.3.5-beta.2";
 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) {
@@ -32584,7 +32590,7 @@ const AiModels = __component__$1j.exports, _sfc_main$1i = defineComponent({
 });
 var _sfc_render$1i = function a() {
   var t = this, r = t._self._c;
-  return t._self._setupProxy, r("div", { ref: "hoPage", class: t.pageClassNames, style: { height: t.normalHeight + "px", width: t.normalWidth + t.commentWidth + "px" } }, [r("div", { staticClass: "x-editor-table-table-tool__border" }), t.historyPosition == 0 ? r("div", { class: t.commentCanvasName, style: { height: t.normalHeight + "px", width: t.commentWidth + "px" }, attrs: { id: "ho-comment-box-" + t.index } }) : t._e(), r("canvas", { ref: "domcanvas", class: t.domCanvasName, style: { height: t.normalHeight + "px", width: t.normalWidth + "px" }, attrs: { width: t.scaleWidth, height: t.scaleHeight } }), r("canvas", { ref: "selectcanvas", staticClass: "selectcanvas", style: { height: t.normalHeight + "px", width: t.normalWidth + "px", left: t.historyPosition == 0 ? t.commentWidth + "px" : "0px" }, attrs: { width: t.scaleWidth, height: t.scaleHeight }, on: { contextmenu: function(o) {
+  return t._self._setupProxy, r("div", { ref: "hoPage", class: t.pageClassNames, style: { height: t.normalHeight + "px", width: t.normalWidth + t.commentWidth + "px" } }, [r("div", { staticClass: "x-editor-table-table-tool__border", staticStyle: { position: "relative" } }), t.historyPosition == 0 ? r("div", { class: t.commentCanvasName, style: { height: t.normalHeight + "px", width: t.commentWidth + "px" }, attrs: { id: "ho-comment-box-" + t.index } }) : t._e(), r("canvas", { ref: "domcanvas", class: t.domCanvasName, style: { height: t.normalHeight + "px", width: t.normalWidth + "px" }, attrs: { width: t.scaleWidth, height: t.scaleHeight } }), r("canvas", { ref: "selectcanvas", staticClass: "selectcanvas", style: { height: t.normalHeight + "px", width: t.normalWidth + "px", left: t.historyPosition == 0 ? t.commentWidth + "px" : "0px" }, attrs: { width: t.scaleWidth, height: t.scaleHeight }, on: { contextmenu: function(o) {
     return t.canvasRightClick.apply(null, arguments);
   } } }), t.historyPosition == 1 ? r("div", { class: t.commentCanvasName, style: { height: t.normalHeight + "px", width: t.commentWidth + "px" }, attrs: { id: "ho-comment-box-" + t.index } }) : t._e(), [t._t("hoAddCellButton")], [t._t("hoAddSelectMark")], [t._t("hoAddNextCellButton")], t.index === t.aiInfo.pageIndex && t.aiInfo.aiText ? r("AiModel", { attrs: { textStyles: t.textStyles, scaleWidth: t.canvasWidth, hoEditorFactoryId: t.hoEditorId, aiInfo: t.aiInfo } }) : t._e(), t.isHeadFoot === "header" || t.isHeadFoot === "footer" ? r("ho-head-foot", { attrs: { headerFooterPosition: t.canvasHeadFootPos, isHeadFoot: t.isHeadFoot }, scopedSlots: t._u([{ key: "head", fn: function() {
     return [t._t("hoPageHead")];
@@ -39447,39 +39453,39 @@ class DrawPageTree {
         this._oldPageCount === 0 && (this._oldPageCount = c.drawTree.drawPages.length);
         let d = n, u = !1, f = 0;
         if (d === s && r[d] instanceof DrawTable && (u = !0, d < r.length - 1)) {
-          const w = r[d + 1];
-          let v;
-          w instanceof DrawTable ? v = w.drawPageTables[0] : v = w, f = v.y;
+          const y = r[d + 1];
+          let w;
+          y instanceof DrawTable ? w = y.drawPageTables[0] : w = y, f = w.y;
         }
         const p = r.length - 1;
         let m = 1 / 0;
         t.allowAcrossPage && (m = t.maxHeight - o);
         let g = null;
         if (t instanceof DrawPageMainDoc) {
-          const w = this._drawMainDocs.indexOf(t);
-          w > 0 && (g = this._drawMainDocs[w - 1]);
+          const y = this._drawMainDocs.indexOf(t);
+          y > 0 && (g = this._drawMainDocs[y - 1]);
         }
         do {
           if (!t)
             return;
           if (t.update(g, r, d, o, m), this.afterAreaFinishPaint(t), this._startNeedUpdatePage = Math.min(t.index, this._startNeedUpdatePage === -1 ? 99999 : this._startNeedUpdatePage), this._endNeedUpdatePage = Math.max(t.index, this._endNeedUpdatePage), d = t.endDline, u && d > s + 1) {
-            const w = r[s + 1];
-            let v;
-            if (w instanceof DrawTable ? v = w.drawPageTables[0] : v = w, v.y === f)
+            const y = r[s + 1];
+            let w;
+            if (y instanceof DrawTable ? w = y.drawPageTables[0] : w = y, w.y === f)
               return;
           }
           if (t.isEndLineFinished() && (d += 1), t instanceof DrawPageMainDoc && (d <= p && (g = t, t = this.getNextDrawArea(t)[0], o = 0, t.allowAcrossPage && (m = t.maxHeight)), d === r.length - 1)) {
-            const w = this._drawMainDocs.indexOf(t);
-            c.drawTree.drawPages.splice(w + 1, this._drawMainDocs.length), this._drawMainDocs.splice(w + 1, this._drawMainDocs.length), c.drawTree.drawPageCount.count = c.drawTree.drawPages.length;
+            const y = this._drawMainDocs.indexOf(t);
+            c.drawTree.drawPages.splice(y + 1, this._drawMainDocs.length), this._drawMainDocs.splice(y + 1, this._drawMainDocs.length), c.drawTree.drawPageCount.count = c.drawTree.drawPages.length;
           }
         } while (d <= p);
         if (t instanceof DrawPageMainDoc && p === r.length - 1) {
-          const w = this._drawMainDocs.indexOf(t);
-          c.drawTree.drawPages.splice(w + 1, this._drawMainDocs.length), this._drawMainDocs.splice(w + 1, this._drawMainDocs.length);
+          const y = this._drawMainDocs.indexOf(t);
+          c.drawTree.drawPages.splice(y + 1, this._drawMainDocs.length), this._drawMainDocs.splice(y + 1, this._drawMainDocs.length);
         }
-        c.drawTree.drawPageCount.count = c.drawTree.drawPages.length, this.afterAreaFinishPaint(t), this._startNeedUpdatePage = Math.min(t.index, this._startNeedUpdatePage === -1 ? 99999 : this._startNeedUpdatePage), this._endNeedUpdatePage = Math.max(t.index, this._endNeedUpdatePage);
-        const y = document.querySelector(".x-editor-table-table-tool__border");
-        y && (y.innerHTML = "");
+        c.drawTree.drawPageCount.count = c.drawTree.drawPages.length, this.afterAreaFinishPaint(t), this._startNeedUpdatePage = Math.min(t.index, this._startNeedUpdatePage === -1 ? 99999 : this._startNeedUpdatePage), this._endNeedUpdatePage = Math.max(t.index, this._endNeedUpdatePage), document.querySelectorAll(".x-editor-table-table-tool__border").forEach((y) => {
+          y.innerHTML = "";
+        });
       } finally {
         this._oldPageCount !== c.drawTree.drawPages.length && c.drawTree.updatePageCountNodes(), l || c.drawTree.inViewPages.forEach((d) => {
           this.updateDrawPage(d);
@@ -51273,7 +51279,7 @@ class VueController {
     const s = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
     t.length == 1 && o && (o = !0);
     let l = [], c = [];
-    t.map((g) => (g.name = g.name || "", g.id = g.id || "", g.dataId = g.dataId || "", g.innerIdentifier = g.innerIdentifier || "", g.text ? c.push(g.text) : l.push(g), g));
+    t.map((g) => (g.name = g.name || "", g.id = g.id || "", g.dataId = g.dataId || "", g.innerIdentifier = g.innerIdentifier || "", g.priorityText || g.text ? c.push(g) : l.push(g), g));
     let d = null;
     const u = (g) => {
       for (let y = 0; y < g.length; y++) {
@@ -51296,9 +51302,18 @@ class VueController {
     const m = s.subDocManger.footerDocTree;
     for (let g = 0; g < m.length; g++)
       u(m[g].subDocNodes);
-    if (c.length && c.forEach((g) => {
-      const y = this.searchText(g);
-      y.length > 0 && (n = n.concat(y));
+    if (c.forEach((g) => {
+      if (g.priorityText) {
+        const y = this.searchText(g.priorityText);
+        if (y.length > 0) {
+          n = n.concat(y);
+          return;
+        }
+      }
+      if (g.text) {
+        const y = this.searchText(g.text);
+        y.length > 0 && (n = n.concat(y));
+      }
     }), n.length > 0 && (s.drawTree.drawMultiCustomRange(n, r, !0), o)) {
       let g = n[n.length - 1].spEnd.path;
       d && (g = s.docTree.getNodeFirstPath(d)), this.moveCaret(g);
@@ -51351,46 +51366,58 @@ class VueController {
     return n = this.getSelectRanges(s, r, l), n;
   }
   searchText(t) {
-    const r = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID), s = r.docTree.curDomRange.normalize().npStart.node;
-    let l = s;
-    s && (l = s.rootNodes[0]);
-    const c = r.docTree.findNodes(l, t, 0, !1);
-    let d = [];
-    for (const u of c.obj2.values())
-      d.push(this.getSelectRanges2(u, t, c.obj1));
-    return d;
+    try {
+      const r = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID), s = r.docTree.curDomRange.normalize().npStart.node;
+      let l = s;
+      s && (l = s.rootNodes[0]);
+      const c = r.docTree.findNodes(l, t, 0, !1);
+      let d = [];
+      for (const u of c.obj2.values()) {
+        const f = this.getSelectRanges2(u, t, c.obj1);
+        f && d.push(f);
+      }
+      return d;
+    } catch {
+      return [];
+    }
   }
   getSelectRanges2(t, r, o) {
     const n = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID), s = t.split("|")[0], l = t.split("|")[1], c = parseInt(t.split("|")[2]);
     let d = -1, u = -1;
-    for (const _ of o.keys()) {
-      const D = parseInt(_.split("|")[2]);
-      _.split("|")[0] === s && _.split("|")[1] === l && (c >= D && D > d && (d = D), c + r.length >= D && D > u && (u = D));
+    for (const v of o.keys()) {
+      const C = parseInt(v.split("|")[2]);
+      v.split("|")[0] === s && v.split("|")[1] === l && (c >= C && C > d && (d = C), c + r.length >= C && C > u && (u = C));
     }
     const f = o.get(s + "|" + l + "|" + d.toString()), p = o.get(s + "|" + l + "|" + u.toString()), m = n.docTree.findNodePositionByPath(f);
     m && m.node && (m.node instanceof TextNode || m.node instanceof DateTimeNode || m.node instanceof DownListNode) && m.node.styleIndex;
     let g = "", y = "";
     if (c - d - 1 >= 0) {
-      const _ = f.split("/");
-      _[_.length - 1] = (c - d - 1).toString(), g = _.join("/");
+      const v = f.split("/");
+      v[v.length - 1] = (c - d - 1).toString(), g = v.join("/");
     } else if (m && m.node) {
-      const _ = m.node.previousLeaf();
-      _ && (g = n.docTree.getNodeLastPath(_));
+      const v = m.node.previousLeaf();
+      v && (g = n.docTree.getNodeLastPath(v));
     }
     if (m && (m.node instanceof DateTimeNode || m.node instanceof DownListNode))
       y = n.docTree.getNodeLastPath(m.node);
     else if (c + r.length - u - 1 >= 0) {
-      const _ = p.split("/");
-      _[_.length - 1] = (c + r.length - u - 1).toString(), y = _.join("/");
+      const v = p.split("/");
+      v[v.length - 1] = (c + r.length - u - 1).toString(), y = v.join("/");
     } else {
-      const _ = n.docTree.findNodePositionByPath(p);
-      if (_ && _.node) {
-        const D = _.node.previousLeaf();
-        D && (y = n.docTree.getNodeLastPath(D));
+      const v = n.docTree.findNodePositionByPath(p);
+      if (v && v.node) {
+        const C = v.node.previousLeaf();
+        C && (y = n.docTree.getNodeLastPath(C));
       }
     }
-    const w = new SelectRange(this.hoEditorFactoryID), v = StagePosition.getStagePosByPath(this._hoEditorFactoryID, g), C = StagePosition.getStagePosByPath(this._hoEditorFactoryID, y);
-    return w.spStart = v, w.spEnd = C, w;
+    const w = new SelectRange(this.hoEditorFactoryID);
+    try {
+      const v = StagePosition.getStagePosByPath(this._hoEditorFactoryID, g), C = StagePosition.getStagePosByPath(this._hoEditorFactoryID, y);
+      w.spStart = v, w.spEnd = C;
+    } catch {
+      return null;
+    }
+    return w;
   }
   getSelectRanges(t, r, o) {
     const n = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID), s = [], l = /* @__PURE__ */ new Map();
@@ -53147,22 +53174,30 @@ class VueController {
   }
   // 绑定表格拖拽辅助线
   bindTableLineDrag(t) {
-    var u, f, p, m;
+    var d, u, f, p;
     if (!t) return;
-    const r = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID), o = (u = r.vueController.findNodebyPath(t)) == null ? void 0 : u.node, n = (g) => {
-      if (!g) return { isTable: !1, tableNode: null };
-      let y = g;
-      for (; y; ) {
-        if (y instanceof TableNode)
-          return { isTable: !0, tableNode: y };
-        y = y.parentNode;
+    const r = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID), o = (d = r.vueController.findNodebyPath(t)) == null ? void 0 : d.node, n = (m) => {
+      if (!m) return { isTable: !1, tableNode: null };
+      let g = m;
+      for (; g; ) {
+        if (g instanceof TableNode)
+          return { isTable: !0, tableNode: g };
+        g = g.parentNode;
       }
       return { isTable: !1, tableNode: null };
-    }, { isTable: s, tableNode: l } = n(o), c = r.drawTree.paintStatus === PaintState.psEdit && ((f = l == null ? void 0 : l.tableProperty) == null ? void 0 : f.canAdjustRowHeight) || ((p = l == null ? void 0 : l.tableProperty) == null ? void 0 : p.canAdjustRowWidth) || r.drawTree.paintStatus === PaintState.psDesign, d = document.querySelector(".x-editor-table-table-tool__border");
-    d && (d.innerHTML = ""), s && c && ((m = l == null ? void 0 : l.childNodes) == null || m.forEach((g, y) => {
-      var w, v;
-      (v = (w = g == null ? void 0 : g.drawCell) == null ? void 0 : w.drawPageCells[0]) == null || v.updateHtmlTouchArea(g);
-    }));
+    }, { isTable: s, tableNode: l } = n(o), c = r.drawTree.paintStatus === PaintState.psEdit && ((u = l == null ? void 0 : l.tableProperty) == null ? void 0 : u.canAdjustRowHeight) || ((f = l == null ? void 0 : l.tableProperty) == null ? void 0 : f.canAdjustRowWidth) || r.drawTree.paintStatus === PaintState.psDesign;
+    if (document.querySelectorAll(".x-editor-table-table-tool__border").forEach((m) => {
+      m.innerHTML = "";
+    }), s && c) {
+      const m = (p = l == null ? void 0 : l.drawTable) == null ? void 0 : p.drawPageTables;
+      m && m.forEach((g) => {
+        const y = g.getNumChildren();
+        for (let w = 0; w < y; w++) {
+          const v = g.getChildAt(w);
+          v instanceof DrawPageCell && v.updateHtmlTouchArea(v.cell);
+        }
+      });
+    }
   }
   getCurrentDocId(t) {
     const r = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
@@ -65135,7 +65170,7 @@ WebPDecoder.prototype.getData = function() {
 (function(a) {
   function t() {
     return function() {
-      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-DNV87B__.mjs");
+      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-Z_zuMJTf.mjs");
     }().catch(function(r) {
       return Promise.reject(new Error("Could not load canvg: " + r));
     }).then(function(r) {

package/lib/{index.es-DNV87B__.mjs → index.es-Z_zuMJTf.mjs}

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