hoeditor-web 3.3.5-beta.6 → 3.3.6-beta.0

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

package/lib/{index-BDiUSpJa.mjs → index-BUU_YDdy.mjs}

@@ -5988,7 +5988,33 @@ const appendPrevTextResult = (a, t, r) => {
       }, o = !1;
   }
   return r;
-}, deepCloneWithWhiteList = (a, t) => {
+};
+function safeJsonParse(a) {
+  try {
+    return JSON.parse(a);
+  } catch {
+    return JSON.parse(repairJson(a));
+  }
+}
+function repairJson(a) {
+  let t = "", r = !1, o = !1;
+  for (let n = 0; n < a.length; n++) {
+    const s = a[n];
+    if (!r)
+      t += s, s === '"' && (r = !0, o = !1);
+    else if (o)
+      t += s, o = !1;
+    else if (s === "\\")
+      t += "\\", o = !0;
+    else if (s === '"') {
+      const l = a.slice(n + 1).trimStart();
+      l.length > 0 && (l[0] === ":" || l[0] === "," || l[0] === "}" || l[0] === "]") ? (t += '"', r = !1) : t += '\\"';
+    } else
+      t += s;
+  }
+  return t;
+}
+const deepCloneWithWhiteList = (a, t) => {
   if (a === null || typeof a != "object")
     return a;
   if (Array.isArray(a))
@@ -6740,21 +6766,12 @@ const zo = class zo extends createjs$1.Text {
         let p = 0;
         for (let m = 0, g = f.length; m < g; m++) {
           const y = f[m], w = this.getCharWidth(r, y);
-          isMissingGlyph(y) ? drawCircledNumber(
-            r,
-            p,
-            0,
-            w,
-            getMissingGlyphNumber(y),
-            this.font || "12pt SimSun",
-            l,
-            this.outline
-          ) : this.outline ? r.strokeText(y, p, 0, w || this._maxWidth) : r.fillText(y, p, 0, w || this._maxWidth), p += w + this._letterSpacing;
+          isMissingGlyph(y) ? drawCircledNumber(r, p, 0, w, getMissingGlyphNumber(y), this.font || "12pt SimSun", l, this.outline) : this.outline ? r.strokeText(y, p, 0, w || this._maxWidth) : r.fillText(y, p, 0, w || this._maxWidth), p += w + this._letterSpacing;
         }
       } else
         this.outline ? r.strokeText(f, 0, 0, u || this._maxWidth) : (this.font.indexOf("bold") != -1 && (r.strokeStyle = r.fillStyle, r.strokeText(f, 0, 0, u || this._maxWidth)), r.fillText(f, 0, 0, u || this._maxWidth));
     }
-    return this._docWidth = u, this._dWidth = d > 0 ? d - this._letterSpacing : 0, o && (o.width = this._dWidth, o.height = this._node.dHeight), s || r.restore(), o;
+    return this._docWidth = u, this._dWidth = d > 0 ? d - this._letterSpacing : 0, o && (o.width = this._dWidth, o.height = this._node.dHeight), s || r.restore(), r.hasOwnProperty("letterSpacing") && (r.letterSpacing = 0), o;
   }
   static getWorkingContext() {
     if (!zo._workingContext) {
@@ -10159,7 +10176,7 @@ class RadioAndCheckBoxNode extends ControlNode {
       const p = d._event;
       p && p.alpha === 0 && (p.alpha = 0.01), o.addChild(d), o.drawItems.push(d);
     }
-    return o.fitLines(), c.docTree.radioAndCheckBoxsMap.set(this.dataId, this), o.paragraphNode.getLastDrawline();
+    return o.fitLines(), o.updateLineStyle(), c.docTree.radioAndCheckBoxsMap.set(this.dataId, this), o.paragraphNode.getLastDrawline();
   }
   clear() {
     var o, n, s;
@@ -10168,9 +10185,7 @@ class RadioAndCheckBoxNode extends ControlNode {
     const r = (n = (o = t.drawTree.activePage) == null ? void 0 : o.drawSelectLevel) == null ? void 0 : n.shapesColor;
     if (r) {
       const l = r.get(this.id);
-      r.delete(this.id), l && ((s = t.drawTree.activePage) == null || s.selectContainer.removeChild(
-        l
-      ));
+      r.delete(this.id), l && ((s = t.drawTree.activePage) == null || s.selectContainer.removeChild(l));
     }
   }
   hasChildPath() {
@@ -10244,14 +10259,7 @@ class RadioAndCheckBoxNode extends ControlNode {
     }
     r.isAllowDelete = r.isAllowDelete ? r.isAllowDelete : !1, r.isSelected = r.isSelected ? r.isSelected.text != null ? r.isSelected.text : r.isSelected : !1, r.boxAlign = r.boxAlign === void 0 ? !0 : r.boxAlign, r.isEditText = r.isEditText ? r.isEditText : !1, r.isTransToText = r.isTransToText ? r.isTransToText : !1, r.groupHasOptions = r.groupHasOptions ? r.groupHasOptions : !1, r.numericValue = r.numericValue === void 0 ? "0" : Number(r.numericValue);
     const l = Number(r.styleIndex);
-    return r.type = parseInt(ControlType[r.type]), r.readType = r.readType ? Number(r.readType) : -1, r.isMutualExclusion = r.isMutualExclusion ? r.isMutualExclusion : !1, r.text = r.text || "", n instanceof CellNode && r.groupName != "" && (r.groupName = r.groupName + "_" + n.table.tableProperty.id), new RadioAndCheckBoxNode(
-      t,
-      o,
-      n || null,
-      NodeType$1.ntControl,
-      JSON.stringify(r),
-      l
-    );
+    return r.type = parseInt(ControlType[r.type]), r.readType = r.readType ? Number(r.readType) : -1, r.isMutualExclusion = r.isMutualExclusion ? r.isMutualExclusion : !1, r.text = r.text || "", n instanceof CellNode && r.groupName != "" && (r.groupName = r.groupName + "_" + n.table.tableProperty.id), new RadioAndCheckBoxNode(t, o, n || null, NodeType$1.ntControl, JSON.stringify(r), l);
   }
   toString() {
     return this.text;
@@ -10512,8 +10520,8 @@ let TableFormula$1 = class _TableFormula extends ControlNode {
                   y !== "" && (s = new Decimal(Number(s) || 0).add(new Decimal(Number(y) || 0)).toString());
                 else {
                   const v = m.getCellText();
-                  let C = JSON.parse(w.listItems);
-                  C.length === void 0 && (C = Array(JSON.parse(w.listItems)));
+                  let C = safeJsonParse(w.listItems);
+                  C.length === void 0 && (C = Array(safeJsonParse(w.listItems)));
                   for (let _ = 0; _ < C.length; _++) {
                     const D = C[_];
                     if (D.text === v)
@@ -10825,7 +10833,7 @@ let TableFormula$1 = class _TableFormula extends ControlNode {
               if (isNaN(v)) {
                 const C = m.cellProperty.downListProperty;
                 let _ = [];
-                C && C.listItems && (_ = Array(JSON.parse(C.listItems)));
+                C && C.listItems && (_ = Array(safeJsonParse(C.listItems)));
                 for (let D = 0; D < _.length; D++) {
                   const E = _[D];
                   if (E.text === w) {
@@ -15304,7 +15312,7 @@ class DrawSignNode extends DrawCombineNode {
     }
   }
 }
-const version = "3.3.5-beta.6";
+const version = "3.3.6-beta.0";
 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) {
@@ -20915,7 +20923,7 @@ class DrawTextNode extends DrawCombineNode {
         const d = c.downListProperty;
         if (o.isSameColorWithEmptyVlaue && d.listItems) {
           let u = !1;
-          const f = JSON.parse(d.listItems);
+          const f = safeJsonParse(d.listItems);
           if (d.allowMultiSelected) {
             let p = "";
             for (let g = 0; g < f.length; g++) {
@@ -27593,7 +27601,7 @@ class PrintStatus {
         let l = s.length - 1;
         for (; ; ) {
           const c = s[l];
-          if (c instanceof DrawLine)
+          if (c instanceof DrawLine || c instanceof DrawPageTable)
             if (c.isEmpty())
               l -= 1;
             else
@@ -27605,7 +27613,7 @@ class PrintStatus {
           const c = n.y;
           this._printRecord.push([o.pageIndex, c]);
         } else {
-          const c = n.getBottomDline(), d = c.y + c.dHeight + n.y;
+          const c = s[l], d = c.y + c.dHeight + n.y;
           this._printRecord.push([o.pageIndex, d]);
         }
       }
@@ -37397,7 +37405,7 @@ const PoperMark = __component__$1f.exports, getCellNode = (a) => {
             this.poperNode.includes(s) && (n = s);
           }), o = this.poperNode.split(n);
         }
-        this.poperList = a.downListProperty.listItems ? [...JSON.parse(a.downListProperty.listItems)] : [], (r = this.poperList) == null || r.forEach((n) => {
+        this.poperList = a.downListProperty.listItems ? [...safeJsonParse(a.downListProperty.listItems)] : [], (r = this.poperList) == null || r.forEach((n) => {
           n.default = !1, o.filter((s) => n.text.split("<元素>")[0] == s).length === 1 && (n.default = !0);
         }), this.currentList = [...this.poperList], this.poperList.length > 20 && (this.isCanSearch = !0), this.poperList.length * 36 + 72, this.isCanSearch;
       }
@@ -38972,7 +38980,7 @@ const scaleXY = DrawConfig.instance().scale, defaultWidth = Math.floor(793 * sca
       a.drawTree.paintStatus;
       const t = a.vueController.getNodeByDataID("main", this.selectMarkStyle.dataid);
       if (t) {
-        let n = (r = t.downListProperty) != null && r.listItems ? JSON.parse((o = t.downListProperty) == null ? void 0 : o.listItems) : [];
+        let n = (r = t.downListProperty) != null && r.listItems ? safeJsonParse((o = t.downListProperty) == null ? void 0 : o.listItems) : [];
         this.computedPoperPosition(t.childNodes[t.childNodes.length - 1], this.selectMarkStyle.pageIndex), this.poperSelectList = n.filter((s) => s.value || s.text), this.selectMarkStyle.open = !0, this.poperType = "selectPoper";
       }
     },
@@ -39000,12 +39008,12 @@ const scaleXY = DrawConfig.instance().scale, defaultWidth = Math.floor(793 * sca
       let n = [];
       if (t) {
         const p = a.text.replace(/ /g, "");
-        n = (l = t.downListProperty) != null && l.listItems ? JSON.parse((c = t.downListProperty) == null ? void 0 : c.listItems) : [];
+        n = (l = t.downListProperty) != null && l.listItems ? safeJsonParse((c = t.downListProperty) == null ? void 0 : c.listItems) : [];
         const m = ((d = t.downListProperty) == null ? void 0 : d.allowMultiSelected) || !1, g = t.childNodes.filter((y) => y.nodeType != 5 && y.nodeType != 2);
         if (n.filter((y) => y.text.includes("<元素>")).length > 0 && a.nodeType != 2 && g.length > 0 && p != t.name && p !== "" && !m)
           return;
       } else
-        n = (u = a.downListProperty) != null && u.listItems ? JSON.parse((f = a.downListProperty) == null ? void 0 : f.listItems) : [];
+        n = (u = a.downListProperty) != null && u.listItems ? safeJsonParse((f = a.downListProperty) == null ? void 0 : f.listItems) : [];
       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";
       };
@@ -39055,8 +39063,8 @@ const scaleXY = DrawConfig.instance().scale, defaultWidth = Math.floor(793 * sca
       const n = t.table.colInfos[t.row.indexOf(t)].colProperty, s = t.cellProperty;
       let l = !0;
       if (n !== null && n.editorProperty === 0 && s !== null && s.editorProperty !== 0) {
-        if (s.editorProperty === 1 && JSON.parse((c = s.downListProperty) == null ? void 0 : c.listItems).length === 1) {
-          const u = JSON.parse((d = s.downListProperty) == null ? void 0 : d.listItems);
+        if (s.editorProperty === 1 && safeJsonParse((c = s.downListProperty) == null ? void 0 : c.listItems).length === 1) {
+          const u = safeJsonParse((d = s.downListProperty) == null ? void 0 : d.listItems);
           let f = "";
           u.map((p, m) => {
             let g = p.num ? p.num : p.text ? p.text : "";
@@ -49621,7 +49629,7 @@ class VueController {
         if (f instanceof TextInputFieldNode && f.inputFieldType == 1 && f.insCheckSyncUpdateList) {
           const p = f.downListProperty;
           if (p.allowMultiSelected) {
-            let m = p.listItems ? JSON.parse(p.listItems) : [];
+            let m = p.listItems ? safeJsonParse(p.listItems) : [];
             if (s) {
               f.value = "", f.text = "", f.keyValue = "", m = [];
               const g = f.StartMarkNode.getNodePath(), y = l.docTree.getNodeLastPath(f.childNodes[f.childNodes.length - 2]), w = new DomRange(this.hoEditorFactoryID, g, y), v = f.canModifyContent;
@@ -65272,7 +65280,7 @@ WebPDecoder.prototype.getData = function() {
 (function(a) {
   function t() {
     return function() {
-      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-DKTycBch.mjs");
+      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-0kYmUUky.mjs");
     }().catch(function(r) {
       return Promise.reject(new Error("Could not load canvg: " + r));
     }).then(function(r) {
@@ -75355,7 +75363,7 @@ const VerifyTip$1 = __component__$13.exports, _sfc_main$12 = {
             this.textParam.valueArea = n ? JSON.parse(n) : [];
           } else o === "hideDuringPrint" ? this.textParam.hideDuringPrint = t.hideDuringPrint == "undefined" || t.hideDuringPrint == null ? !1 : t.hideDuringPrint : o === "notReplaceElement" ? this.textParam.notReplaceElement = t.notReplaceElement == "undefined" || t.notReplaceElement == null ? !1 : t.notReplaceElement : this.textParam[o] = t[o];
       }), this.textParam.inputFieldType === 1) {
-        let r = this.textParam.downListProperty.listItems, o = r ? JSON.parse(r) : [];
+        let r = this.textParam.downListProperty.listItems, o = r ? safeJsonParse(r) : [];
         this.hoEditorProvider.setListStyle(o, this.textParam.downListProperty.source);
       } else
         this.textParam.inputFieldType = 0;
@@ -76911,7 +76919,7 @@ const TableRowProperty = __component__$X.exports, _sfc_main$W = {
       const r = HOEditorFactorys.instance().getFactory(this.hoEditorFactoryId), o = t.colProperty;
       if (this.editorProperty = o.editorProperty ? o.editorProperty : 0, this.colWidth = (r.unitConvert.pxConversionMm(t.colWidth, !1) / 10).toFixed(2), this.align = o.align ? o.align : 0, this.width = o.width ? o.width : 0, this.isSpecifyWidth = !!o.isSpecifyWidth, this.isSignLock = !!o.isSignLock, this.addWithDefaultValue = !!o.addWithDefaultValue, o.downListProperty) {
         const s = [{ value: "", text: "", id: this.getKeyId(0) }];
-        this.listItems = JSON.parse(o.downListProperty.listItems) ? [...JSON.parse(o.downListProperty.listItems), ...s] : [...s], this.canModifyContent = o.downListProperty.canModifyContent, this.isAllowDel = o.downListProperty.isAllowDel, this.allowMultiSelected = o.downListProperty.allowMultiSelected, this.splitCharacter = o.downListProperty.splitCharacter;
+        this.listItems = safeJsonParse(o.downListProperty.listItems) ? [...safeJsonParse(o.downListProperty.listItems), ...s] : [...s], this.canModifyContent = o.downListProperty.canModifyContent, this.isAllowDel = o.downListProperty.isAllowDel, this.allowMultiSelected = o.downListProperty.allowMultiSelected, this.splitCharacter = o.downListProperty.splitCharacter;
       } else o.dateTimeProperty ? (this.inputStyle = o.dateTimeProperty.inputStyle || "yyyy-MM-dd", this.isAutoInputCurDate = o.dateTimeProperty.isAutoInputCurDate) : o.numberProperty && (this.maxNumVal = o.numberProperty.maxNumVal, this.minNumVal = o.numberProperty.minNumVal);
     }
   },
@@ -77431,7 +77439,7 @@ const HoColorPicker = __component__$U.exports, columns = [
     if (r !== null) {
       this.lightCellBorders = r.cellProperty.lightCellBorders, this.title = r.cellProperty.title ? r.cellProperty.title : "", this.align = r.cellProperty.align, this.isDrawGridlines = r.cellProperty.isDrawGridlines, Array.isArray(r.cellProperty.gridLinesColor) ? this.gridLinesColor = [...r.cellProperty.gridLinesColor] : this.gridLinesColor = ["#000000", "#000000", "#000000", "#000000"], Array.isArray(r.cellProperty.gridLineDisplay) ? this.gridLineDisplay = [...r.cellProperty.gridLineDisplay].map((c) => c == !0 || c == "true") : this.gridLineDisplay = [!0, !0, !0, !0], this.formula = r.cellProperty.formula, this.backColor = r.cellProperty.backColor ? r.cellProperty.backColor : "#ffffff", this.gridLinesStyle = r.cellProperty.gridLinesStyle, this.span = r.cellProperty.span, this.alignTextToGridline = r.cellProperty.alignTextToGridline, this.printGridLines = r.cellProperty.printGridLines, this.isSignLock = r.cellProperty.isSignLock ? r.cellProperty.isSignLock : !1, this.notAllowEdit = r.cellProperty.notAllowEdit ? r.cellProperty.notAllowEdit : !1, this.isTruncated = r.cellProperty.isTruncated ? r.cellProperty.isTruncated : !1, [this.cellTop, this.cellBottom, this.cellLeft, this.cellRight] = r.cellProperty.cellInnerMargin ? r.cellProperty.cellInnerMargin : [0, 0, 0, 0], this.editorProperty = r.cellProperty.editorProperty;
       const n = [{ value: "", text: "", id: this.getKeyId(0) }], s = r.cellProperty.downListProperty;
-      s ? (this.listItems = JSON.parse(s.listItems) ? [...JSON.parse(s.listItems), ...n] : [...n], this.source = s.source ? s.source : "", this.canModifyContent = s.canModifyContent !== void 0 ? s.canModifyContent : !0, this.isAllowDel = s.isAllowDel !== void 0 ? s.isAllowDel : !0, this.allowMultiSelected = s.allowMultiSelected !== void 0 ? s.allowMultiSelected : !1, this.splitCharacter = s.splitCharacter ? s.splitCharacter : ",") : this.listItems = [...n];
+      s ? (this.listItems = safeJsonParse(s.listItems) ? [...safeJsonParse(s.listItems), ...n] : [...n], this.source = s.source ? s.source : "", this.canModifyContent = s.canModifyContent !== void 0 ? s.canModifyContent : !0, this.isAllowDel = s.isAllowDel !== void 0 ? s.isAllowDel : !0, this.allowMultiSelected = s.allowMultiSelected !== void 0 ? s.allowMultiSelected : !1, this.splitCharacter = s.splitCharacter ? s.splitCharacter : ",") : this.listItems = [...n];
       const l = r.cellProperty.dateTimeProperty;
       l && (this.inputStyle = l.inputStyle ? l.inputStyle : "yyyy-MM-dd", this.isAutoInputCurDate = l.isAutoInputCurDate !== void 0 ? l.isAutoInputCurDate : !1, this.daysInterval = l.daysInterval ? l.daysInterval : 0, this.isUpdateNextDays = l.isUpdateNextDays ? l.isUpdateNextDays : !1), this.obliqueSplitLine = r.cellProperty.obliqueSplitLine;
     }
@@ -78066,7 +78074,7 @@ const TableFormTree = __component__$R.exports, _sfc_main$Q = {
               editorProperty: y.editorProperty,
               cellIndex: g
             };
-            y.dateTimeProperty && (w.inputStyle = y.dateTimeProperty.inputStyle), y.downListProperty && (w.allowMultiSelected = y.downListProperty.allowMultiSelected, w.splitCharacter = y.downListProperty.splitCharacter, w.listItems = JSON.parse(y.downListProperty.listItems)), y.numberProperty && (w.maxNumVal = y.numberProperty.maxNumVal, w.minNumVal = y.numberProperty.minNumVal || 0), w.value = "", this.hoEditorProvider.controlStatus === "update" && (w.value = m.getCellText()), s.push(w);
+            y.dateTimeProperty && (w.inputStyle = y.dateTimeProperty.inputStyle), y.downListProperty && (w.allowMultiSelected = y.downListProperty.allowMultiSelected, w.splitCharacter = y.downListProperty.splitCharacter, w.listItems = safeJsonParse(y.downListProperty.listItems)), y.numberProperty && (w.maxNumVal = y.numberProperty.maxNumVal, w.minNumVal = y.numberProperty.minNumVal || 0), w.value = "", this.hoEditorProvider.controlStatus === "update" && (w.value = m.getCellText()), s.push(w);
           }
         });
       }), l.map((f, p) => (n.includes(p) ? f = void 0 : o.forEach((m, g) => {

package/lib/{index.es-DKTycBch.mjs → index.es-0kYmUUky.mjs}

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