hoeditor-web 3.2.27 → 3.2.28

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

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

@@ -10072,31 +10072,32 @@ class DrawTableFormularChart extends DrawCombineNode {
     this.dNode = n, this.hoEditfactoryId = r, n.formularType == FormularType$1.ftCurveChart && (this.dWidth = Number((s = n.formularProperty) == null ? void 0 : s.width) || 100, this.formularProperty = n.formularProperty, this.drawCurveChart());
   }
   getCell(r, o) {
-    var f, p, m;
+    var p, m, g;
     const [n, s] = this.dNode.getRowColByCellAdress(o[0]), [l, c] = this.dNode.getRowColByCellAdress(o[1]);
-    let d = !1;
-    const u = [];
+    let d = !1, u = !1;
+    const f = [];
     if (this.formularProperty) {
-      let g = [];
+      let y = [];
       if (n >= 0 && s >= 0 && l >= 0 && c >= 0 && (n === l || s === c))
-        for (let y = n; y <= l; y++)
-          for (let w = s; w <= c; w++) {
-            const v = r.rows[y][w];
-            if (v) {
-              d = v.cellProperty.notAllowEdit || !1;
-              let C = v.getCellText();
-              d || (C = C.replace(/\+|-/g, ""), C && (C > this.formularProperty.max ? (C = "", (f = v.drawCell.drawPageCells[0]) == null || f.paintBackColor(!0), g.push(`【${y}行 ${w} 列】`)) : C < this.formularProperty.min ? (C = "", g.push(`【${y}行 ${w} 列】`), (p = v.drawCell.drawPageCells[0]) == null || p.paintBackColor(!0)) : (m = v.drawCell.drawPageCells[0]) == null || m.paintBackColor(!1))), u.push(C);
+        for (let w = n; w <= l; w++)
+          for (let v = s; v <= c; v++) {
+            const C = r.rows[w][v];
+            if (C) {
+              d = C.cellProperty.notAllowEdit || !1, u = C.cellProperty.isDisabled || !1;
+              let _ = C.getCellText();
+              d || u || (_ = _.replace(/\+|-/g, ""), _ && (_ > this.formularProperty.max ? (_ = "", (p = C.drawCell.drawPageCells[0]) == null || p.paintBackColor(!0), y.push(`【${w}行 ${v} 列】`)) : _ < this.formularProperty.min ? (_ = "", y.push(`【${w}行 ${v} 列】`), (m = C.drawCell.drawPageCells[0]) == null || m.paintBackColor(!0)) : (g = C.drawCell.drawPageCells[0]) == null || g.paintBackColor(!1))), f.push(_);
             }
           }
-      g.length > 0 && (message.destroy(), message.error(`以下单元格的值超出曲线图设置的范围【${this.formularProperty.min}~${this.formularProperty.max}】：${g.join("、")}`));
+      y.length > 0 && (message.destroy(), message.error(`以下单元格的值超出曲线图设置的范围【${this.formularProperty.min}~${this.formularProperty.max}】：${y.join("、")}`));
     }
     return {
+      isDisabled: u,
       notAllowEdit: d,
       startRow: n,
       startCol: s,
       endRow: l,
       endCol: c,
-      list: u
+      list: f
     };
   }
   drawCurveChart() {
@@ -14897,7 +14898,7 @@ class DrawSignNode extends DrawCombineNode {
     }
   }
 }
-const version = "3.2.27";
+const version = "3.2.28";
 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) {
@@ -17204,7 +17205,8 @@ class CellNode extends RectNode {
       diagonalType: this.cellProperty.diagonalType,
       formula: this.cellProperty.formula,
       isSignLock: this.cellProperty.isSignLock,
-      notAllowEdit: this.cellProperty.notAllowEdit
+      notAllowEdit: this.cellProperty.notAllowEdit,
+      isDisabled: this.cellProperty.isDisabled
     }, u = JSON.parse(JSON.stringify(d)), f = Object.keys(s);
     for (let v = 0; v < f.length; v++)
       f[v] === "customProperties" ? this.cellProperty.customProperties ? this.cellProperty.customProperties.length === 0 && delete u.customProperties : delete u.customProperties : f[v] === "cellInnerMargin" ? u.cellInnerMargin === "0,0,0.1,0.1" && delete u.cellInnerMargin : f[v] === "gridLinesColor" ? u.gridLinesColor === "#000000,#000000,#000000,#000000" && delete u.gridLinesColor : f[v] === "gridLineDisplay" ? u.gridLineDisplay === "true,true,true,true" && delete u.gridLineDisplay : f[v] === "backColor" ? u.backColor.toString().toLowerCase() === s.backColor.toString().toLowerCase() && delete u.backColor : u[f[v]] === s[f[v]] && delete u[f[v]];
@@ -19285,7 +19287,7 @@ class ColProperty {
 }
 var GridLinesStyle = /* @__PURE__ */ ((a) => (a[a.solid = 0] = "solid", a[a.dash = 1] = "dash", a[a.dashdot = 2] = "dashdot", a[a.dashdotdo = 3] = "dashdotdo", a[a.dot = 4] = "dot", a))(GridLinesStyle || {}), ObliqueSplitLine = /* @__PURE__ */ ((a) => (a[a.None = 0] = "None", a[a.TopLeftOneLine = 1] = "TopLeftOneLine", a[a.TopLeftTwoLine = 2] = "TopLeftTwoLine", a[a.TopRightOneLine = 3] = "TopRightOneLine", a[a.TopRightTwoLine = 4] = "TopRightTwoLine", a[a.BottomLeftOneLine = 5] = "BottomLeftOneLine", a[a.BottomLeftTwoLine = 6] = "BottomLeftTwoLine", a[a.BottomRightOneLine = 7] = "BottomRightOneLine", a[a.BottomRightTwoLine = 8] = "BottomRightTwoLine", a[a.TwoDiagonal = 9] = "TwoDiagonal", a))(ObliqueSplitLine || {}), DiagonalType = /* @__PURE__ */ ((a) => (a[a.None = 0] = "None", a[a.Left = 1] = "Left", a[a.Right = 2] = "Right", a))(DiagonalType || {});
 class CellProperty {
-  //是否禁止编辑
+  //是否禁用
   constructor(objectValues) {
     //private _lightCellBorders = false;//突出显示单元格边框
     b(this, "_customProperties", []);
@@ -19323,6 +19325,8 @@ class CellProperty {
     b(this, "signed", /* @__PURE__ */ new Map());
     //是否已签名 运行时属性
     b(this, "notAllowEdit", !1);
+    //是否禁止编辑
+    b(this, "isDisabled", !1);
     if (objectValues !== "") {
       const valuesObj = eval("(" + objectValues + ")"), assignvalue = (target, source) => {
         Object.keys(source).forEach((value) => {
@@ -38106,73 +38110,75 @@ const scaleXY = DrawConfig.instance().scale, defaultWidth = Math.floor(793 * sca
      * 鼠标click事件
      */
     mouseClickEvent(a) {
-      var s;
+      var l, c, d;
       const t = HOEditorFactorys.instance().getFactory(this.hoEditorId);
       if (!a.clickType || a.clickType === "move") return !1;
       const r = document.querySelector("#ho_paragrapgh_tip");
-      r && ((s = r.parentNode) == null || s.removeChild(r));
+      r && ((l = r.parentNode) == null || l.removeChild(r));
       const o = a.node, n = t.drawTree.paintStatus;
-      if (this.selectMarkStyle.display = "none", this.poperClose(), !((n == PaintState.psEdit || n == PaintState.psTrace) && this.isCanEdit())) {
-        if (o && o !== null) {
-          const l = a.pageIndex;
-          if (a.clickType === "dblclick")
-            o instanceof BaseNode && setTimeout(() => {
-              this.dblclickModal(o, "dblclick", l);
-            }, 150);
-          else if (a.clickType === "leftclick" && o instanceof BaseNode) {
-            if (this.selectMarkStyle = { display: "none" }, n === PaintState.psReadOnly)
-              return !1;
-            this.textStyles.changeCount++, this.$emit("setFontStyles", {});
-            const c = t.vueController.getDomRange(), [d, u] = c.inSameTable();
-            if (this.nextCellButton = !1, d && (n == PaintState.psDesign || n == PaintState.psEdit || n == PaintState.psTrace) ? (this.cellButton || this.createAddCellButton(o, l), this.createAddNextCellButton(o, l)) : this.cellButton = !1, (n == PaintState.psEdit || n == PaintState.psTrace) && (o.nodeType == 18 ? this.$emit("leftclick", {
-              name: o.name,
-              linkId: o.fileId,
-              nodeType: o.nodeType,
-              type: "link"
-            }) : (o instanceof TextNode || o instanceof MarkNode && o.MarkNodeType !== 2) && o.parentNode && o.parentNode instanceof TextInputFieldNode && (this.$emit("leftclick", {
-              name: o.parentNode.name,
-              nodeType: o.parentNode.nodeType,
-              type: "TextInputFieldNode"
-            }), this.$nextTick(() => {
-              this.createSelectMark(o, t.drawTree.paintStatus, l);
-            }))), n == PaintState.psEdit && t.emitClickEvent) {
-              const f = o.parentNode;
-              if (f && f instanceof TextInputFieldNode && f.canModifyContent) {
-                let p = `${f.id}-${f.name}-${f.dataId}-${f.innerIdentifier}`;
-                this.currentElement != p && (this.currentElement = p, this.$emit("clickEvents", {
-                  id: f.id,
-                  name: f.name,
-                  dataId: f.dataId,
-                  innerIdentifier: f.innerIdentifier,
-                  pageIndex: l,
-                  x: t.drawTree.caret.X,
-                  y: t.drawTree.caret.Y,
-                  height: t.drawTree.caret.height,
-                  caretId: "ho_caret",
-                  parentName: "edit-container",
-                  isInElement: !0
-                }));
-              } else {
-                let p = "";
-                this.currentElement != p && (this.currentElement = p, this.$emit("clickEvents", {
-                  id: "",
-                  name: "",
-                  dataId: "",
-                  innerIdentifier: "",
-                  pageIndex: l,
-                  x: t.drawTree.caret.X,
-                  y: t.drawTree.caret.Y,
-                  height: t.drawTree.caret.height,
-                  caretId: "ho_caret",
-                  parentName: "edit-container",
-                  isInElement: !1
-                }));
-              }
+      if (this.selectMarkStyle.display = "none", this.poperClose(), (n == PaintState.psEdit || n == PaintState.psTrace) && this.isCanEdit())
+        return;
+      if (((d = (c = o == null ? void 0 : o._parentNode) == null ? void 0 : c.cellProperty) == null ? void 0 : d.isDisabled) || !1)
+        return this.$message.error("当前单元格已禁止编辑！"), !0;
+      if (o && o !== null) {
+        const u = a.pageIndex;
+        if (a.clickType === "dblclick")
+          o instanceof BaseNode && setTimeout(() => {
+            this.dblclickModal(o, "dblclick", u);
+          }, 150);
+        else if (a.clickType === "leftclick" && o instanceof BaseNode) {
+          if (this.selectMarkStyle = { display: "none" }, n === PaintState.psReadOnly)
+            return !1;
+          this.textStyles.changeCount++, this.$emit("setFontStyles", {});
+          const f = t.vueController.getDomRange(), [p, m] = f.inSameTable();
+          if (this.nextCellButton = !1, p && (n == PaintState.psDesign || n == PaintState.psEdit || n == PaintState.psTrace) ? (this.cellButton || this.createAddCellButton(o, u), this.createAddNextCellButton(o, u)) : this.cellButton = !1, (n == PaintState.psEdit || n == PaintState.psTrace) && (o.nodeType == 18 ? this.$emit("leftclick", {
+            name: o.name,
+            linkId: o.fileId,
+            nodeType: o.nodeType,
+            type: "link"
+          }) : (o instanceof TextNode || o instanceof MarkNode && o.MarkNodeType !== 2) && o.parentNode && o.parentNode instanceof TextInputFieldNode && (this.$emit("leftclick", {
+            name: o.parentNode.name,
+            nodeType: o.parentNode.nodeType,
+            type: "TextInputFieldNode"
+          }), this.$nextTick(() => {
+            this.createSelectMark(o, t.drawTree.paintStatus, u);
+          }))), n == PaintState.psEdit && t.emitClickEvent) {
+            const g = o.parentNode;
+            if (g && g instanceof TextInputFieldNode && g.canModifyContent) {
+              let y = `${g.id}-${g.name}-${g.dataId}-${g.innerIdentifier}`;
+              this.currentElement != y && (this.currentElement = y, this.$emit("clickEvents", {
+                id: g.id,
+                name: g.name,
+                dataId: g.dataId,
+                innerIdentifier: g.innerIdentifier,
+                pageIndex: u,
+                x: t.drawTree.caret.X,
+                y: t.drawTree.caret.Y,
+                height: t.drawTree.caret.height,
+                caretId: "ho_caret",
+                parentName: "edit-container",
+                isInElement: !0
+              }));
+            } else {
+              let y = "";
+              this.currentElement != y && (this.currentElement = y, this.$emit("clickEvents", {
+                id: "",
+                name: "",
+                dataId: "",
+                innerIdentifier: "",
+                pageIndex: u,
+                x: t.drawTree.caret.X,
+                y: t.drawTree.caret.Y,
+                height: t.drawTree.caret.height,
+                caretId: "ho_caret",
+                parentName: "edit-container",
+                isInElement: !1
+              }));
             }
-          } else a.clickType;
-        }
-        return !0;
+          }
+        } else a.clickType;
       }
+      return !0;
     },
     getCurrentSelectNode() {
       var o;
@@ -38334,7 +38340,7 @@ const scaleXY = DrawConfig.instance().scale, defaultWidth = Math.floor(793 * sca
       const s = (p) => {
         this.computedPoperPosition(a, o), Array.isArray(p) && p.length > 0 ? this.poperSelectList = Object.freeze(p) : this.poperSelectList = n.filter((m) => m.value || m.text), this.poperType = "selectPoper";
       };
-      t.customProperty && t.customProperty.hasThirdData == !0 ? this.$emit("dblNodeClick", { setActiveDoc: this.setActiveDocIndex, node: this.getCurrentSelectNode, type: "textlist", callback: s, paintStatus: r }) : s(void 0);
+      t.customProperty && t.customProperty.hasThirdData == !0 ? this.$emit("dblNodeClick", { setActiveDoc: this.setActiveDocIndex, node: this.getCurrentSelectNode, type: "textlist", callback: s, paintStatus: r }) : (this.$emit("dblNodeClick", { setActiveDoc: this.setActiveDocIndex, node: this.getCurrentSelectNode, type: "edit_text_list", paintStatus: r }), s(void 0));
     },
     createAddCellButton(a, t) {
       let r = null;
@@ -49268,6 +49274,9 @@ class VueController {
     const l = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID), c = l.docTree.curDomRange, d = c.normalize().startPath, u = c.normalize().endPath, f = new NodeChangingEvent(DocAction.daInsert, d, u, OperType.openXml);
     l.openXmled = !0, l.docTree.changing(f) && (await l.docController.initBlankDoc(), l.drawTree.inViewPages = [0], t || (t = this.emptyXml), t && t.includes("<?xml version") ? await l.structureConvert.openXml(t, r, o, s) : t && await l.structureConvert.openXml(Base64.decode(t), r, o, s));
   }
+  useFixedOpenXml(t) {
+    this.setHoEditorFactoryParams({ useFixTableMerge: !0 }, void 0), this.openXml(t);
+  }
   getSubDocImg(t, r) {
     const o = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
     let n = o.subDocManger.getSubDocCopyDrawArea(t, r);
@@ -52921,6 +52930,8 @@ class EditController {
       message.destroy();
       const d = t.docTree.getFinalParentNode(n.startPath);
       if (d && d instanceof CellNode) {
+        if (d.cellProperty.isDisabled)
+          return message.error("当前单元格已禁止编辑！"), !1;
         if (d.cellProperty.notAllowEdit)
           return message.error("当前单元格已设置不允许编辑！"), !1;
         if (d.table.tableProperty.isSignLock) {
@@ -64161,7 +64172,7 @@ WebPDecoder.prototype.getData = function() {
 (function(a) {
   function t() {
     return function() {
-      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-CWpmopb1.mjs");
+      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-DJ05PGDj.mjs");
     }().catch(function(r) {
       return Promise.reject(new Error("Could not load canvg: " + r));
     }).then(function(r) {
@@ -85578,7 +85589,7 @@ var _sfc_render$3 = function a() {
   var t = this, r = t._self._c;
   return t._self._setupProxy, r("div", { ref: "hoEmrToolBarBox", staticClass: "ho-emr-toolbar-box ho-toolbar-box" }, [r("div", { ref: "hoEmrToolLeft", staticClass: "ho-emr-tool-left" }, [t._t("HoToolLeft")], 2), r("div", { staticClass: "ho-emr-tool-list ho-emr-tool-center" }, [t._l(t.toolList, function(o, n) {
     return [r("HoToolItem", { key: n, attrs: { tool: o, fontInfo: t.fontInfo, vueController: t.vueController } })];
-  }), r("div", { staticClass: "ho-emr-tool-item" }, [r("a-dropdown", { ref: "hoEmrToolMore", attrs: { trigger: ["hover"], overlayClassName: "ho-emr-tool-more-dropdown", placement: "bottomRight", arrow: "" }, model: { value: t.moreVisible, callback: function(o) {
+  }), r("div", { staticClass: "ho-emr-tool-item" }, [r("a-dropdown", { ref: "hoEmrToolMore", attrs: { trigger: ["hover"], overlayClassName: "ho-emr-tool-more-dropdown", placement: "bottomCenter", arrow: "" }, model: { value: t.moreVisible, callback: function(o) {
     t.moreVisible = o;
   }, expression: "moreVisible" } }, [r("a", { staticClass: "ant-dropdown-link", on: { click: (o) => o.preventDefault() } }, [r("a-icon", { attrs: { type: "ellipsis" } })], 1), r("div", { staticClass: "ho-emr-tool-more", attrs: { slot: "overlay" }, slot: "overlay" }, [r("div", { staticClass: "ho-emr-tool-list", on: { click: t.hoEmrToolMoreItemClick } }, [t._l(t.moreList, function(o) {
     return [r("HoToolItem", { key: o.name, attrs: { tool: o, fontInfo: t.fontInfo, vueController: t.vueController } })];

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

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