hoeditor-web 3.3.6-beta.8 → 3.3.6-beta.9

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

package/lib/{index-CJWk6KWR.mjs → index-BdYBlxkt.mjs}

@@ -9396,6 +9396,8 @@ class DrawPageCell extends DrawArea {
     b(this, "_rightLine");
     b(this, "backColor");
     b(this, "_anchorLine");
+    // 空单元格占位短横线
+    b(this, "_emptyPlaceholder", null);
     //实现接口部分
     b(this, "_node");
     b(this, "_discriminator");
@@ -9763,7 +9765,37 @@ class DrawPageCell extends DrawArea {
     this.backColor.graphics.clear(), this.backColor.alpha = 0.5, r && o.drawTree.paintStatus != PaintState.psPrint && o.drawTree.paintStatus != PaintState.psPreview && (this.backColor.graphics.beginFill("#f00").drawRect(0, 0, this._dWidth, this._dHeight), this.children.includes(this.backColor) ? this.setChildIndex(this.backColor, 0) : this.addChildAt(this.backColor, 0));
   }
   paintCellBackground(r, o, n) {
-    this._backImg.x = 0, this._backImg.y = 0, this._backImg.graphics.beginFill(this._cell.cellProperty.backColor === "#FFFFFF" ? "transparent" : this._cell.cellProperty.backColor), this._backImg.graphics.rect(1, 1, this.dWidth - 1, this.dHeight - 1), this._backImg.graphics.endFill(), this.children.includes(this._backImg) ? this.setChildIndex(this._backImg, 0) : this.addChildAt(this._backImg, 0), this.paintCellBorders(r, o, n), this._cell.needPaintLineGrid() && this.paintLineGrid(), this.setBounds(0, 0, this._dWidth, r);
+    this._backImg.x = 0, this._backImg.y = 0, this._backImg.graphics.beginFill(this._cell.cellProperty.backColor === "#FFFFFF" ? "transparent" : this._cell.cellProperty.backColor), this._backImg.graphics.rect(1, 1, this.dWidth - 1, this.dHeight - 1), this._backImg.graphics.endFill(), this.children.includes(this._backImg) ? this.setChildIndex(this._backImg, 0) : this.addChildAt(this._backImg, 0), this.paintCellBorders(r, o, n), this._cell.needPaintLineGrid() && this.paintLineGrid(), this.paintEmptyPlaceholder(), this.setBounds(0, 0, this._dWidth, r);
+  }
+  /**
+   * 打印/预览态下，若单元格无任何内容（无 DrawLine/DrawPageTable 子节点），
+   * 在单元格内绘制一条从左上角到右下角的对角线作为占位。
+   */
+  paintEmptyPlaceholder() {
+    const o = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.paintStatus;
+    if (o !== PaintState.psPreview && o !== PaintState.psPrint || !this.isCellContentEmpty() || !this._cell.cellProperty.emptyPlaceholderLine) {
+      this.clearEmptyPlaceholder();
+      return;
+    }
+    this._emptyPlaceholder || (this._emptyPlaceholder = new createjs$1.Shape(), this._emptyPlaceholder.name = "emptyPlaceholder"), this._emptyPlaceholder.graphics.clear().beginStroke("#999999").setStrokeStyle(1).moveTo(this.dWidth, 0).lineTo(0, this.dHeight).endStroke(), this._emptyPlaceholder.x = 0, this._emptyPlaceholder.y = 0, this._emptyPlaceholder.rotation = 0, this.contains(this._emptyPlaceholder) ? this.setChildIndex(this._emptyPlaceholder, this.numChildren - 1) : this.addChild(this._emptyPlaceholder);
+  }
+  /**
+   * 判断单元格是否无任何内容。
+   * 注意：空单元格（无文字）仍会存在一个空的段落 DrawLine（drawItems 为空），
+   * 因此不能用 isEmpty()（其要求完全无 DrawLine/DrawPageTable 子节点），
+   * 而需按“所有行都无 drawItems”来判断。
+   */
+  isCellContentEmpty() {
+    const r = this._cell.drawCell.drawLines;
+    if (r.length === 0)
+      return !0;
+    for (const o of r)
+      if (o instanceof DrawTable || o.drawItems.length > 0)
+        return !1;
+    return !0;
+  }
+  clearEmptyPlaceholder() {
+    this._emptyPlaceholder && this.contains(this._emptyPlaceholder) && this.removeChild(this._emptyPlaceholder);
   }
   paintLineGrid() {
     const r = this._cell.drawCell.drawLines;
@@ -23012,7 +23044,7 @@ WebPDecoder.prototype.getData = function() {
 (function(a) {
   function t() {
     return function() {
-      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-D-_c3pZ0.mjs");
+      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-B4h1UsCg.mjs");
     }().catch(function(r) {
       return Promise.reject(new Error("Could not load canvg: " + r));
     }).then(function(r) {
@@ -24602,7 +24634,7 @@ class DrawSignNode extends DrawCombineNode {
     }
   }
 }
-const version = "3.3.6-beta.8";
+const version = "3.3.6-beta.9";
 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, associatedPatientElement, isTemp, innerIdentifier) {
@@ -27704,7 +27736,8 @@ class CellNode extends RectNode {
       isSignLock: this.cellProperty.isSignLock,
       notAllowEdit: this.cellProperty.notAllowEdit,
       isTruncated: this.cellProperty.isTruncated,
-      isDisabled: this.cellProperty.isDisabled
+      isDisabled: this.cellProperty.isDisabled,
+      emptyPlaceholderLine: this.cellProperty.emptyPlaceholderLine
     }, 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]];
@@ -28747,6 +28780,7 @@ class TableNode extends RectNode {
       isSignLock: !1,
       notAllowEdit: !1,
       isTruncated: !1,
+      emptyPlaceholderLine: !1,
       formula: ""
     }, E = JSON.parse(JSON.stringify(D)), T = new Array(), I = new Array();
     for (let V = u.row; V <= y; V++) {
@@ -29786,7 +29820,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", []);
@@ -29828,6 +29862,8 @@ class CellProperty {
     b(this, "isTruncated", !1);
     //超出内容隐藏
     b(this, "isDisabled", !1);
+    //是否禁用
+    b(this, "emptyPlaceholderLine", !1);
     if (objectValues !== "") {
       const valuesObj = eval("(" + objectValues + ")"), assignvalue = (target, source) => {
         Object.keys(source).forEach((value) => {
@@ -62072,7 +62108,8 @@ class VueController {
           t.otherProperties,
           t.dataId || "",
           t.associatedElement,
-          void 0,
+          t.associatedPatientElement,
+          t.isTemp,
           t.innerIdentifier
         );
         r.undoService.begin();
@@ -70851,8 +70888,11 @@ class DocController {
                   l.attribute,
                   l.connectChar,
                   l.otherProperties,
-                  void 0,
-                  l.associatedElement
+                  l.dataId || "",
+                  l.associatedElement,
+                  l.associatedPatientElement,
+                  l.isTemplate,
+                  l.innerIdentifier
                 );
                 if (t.undoService.begin(), t.undoService.add(new NodeDeleteUndoUnit(this._hoEditorFactoryID, l, a)), t.undoService.add(new NodeInsertUndoUnit(this._hoEditorFactoryID, p, m)), t.undoService.commit(), l.parentNode instanceof CellNode) {
                   const g = l.parentNode.table;
@@ -72752,8 +72792,10 @@ class DocController {
         p || a.otherProperties,
         a.dataId || "",
         a.associatedElement,
-        a.isTemplate
+        a.associatedPatientElement,
+        a.isTemplate,
         // 更新签名时带上第一次签名的isTemplate属性 后续只用来判断是否为模板 不涉及绘制处理
+        a.innerIdentifier
       );
       m.undoService.begin(), m.undoService.add(new NodeInsertUndoUnit(this._hoEditorFactoryID, y, v)), m.undoService.commit(), m.useSignLockTable && m.vueController.updateTableSignLocked(v), this.operateElementAfter(HistoryEditType.hetModify, v);
     }
@@ -77551,6 +77593,8 @@ const HoColorPicker = __component__$U.exports, columns = [
       // 是否允许编辑
       isTruncated: !1,
       // 超出内容分隐藏
+      emptyPlaceholderLine: !1,
+      // 空单元格占位斜线
       cellTop: 0,
       cellBottom: 0,
       cellLeft: 0,
@@ -77594,7 +77638,7 @@ const HoColorPicker = __component__$U.exports, columns = [
     this.endPath = t.docTree.curDomRange.normalize().endPath;
     const r = this.getCellNodes();
     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;
+      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.emptyPlaceholderLine = r.cellProperty.emptyPlaceholderLine ? r.cellProperty.emptyPlaceholderLine : !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 = 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;
@@ -77680,6 +77724,7 @@ const HoColorPicker = __component__$U.exports, columns = [
         isSignLock: this.isSignLock,
         notAllowEdit: this.notAllowEdit,
         isTruncated: this.isTruncated,
+        emptyPlaceholderLine: this.emptyPlaceholderLine,
         obliqueSplitLine: this.obliqueSplitLine,
         editorProperty: this.editorProperty
       };
@@ -77750,7 +77795,9 @@ var _sfc_render$T = function a() {
     t.notAllowEdit = o;
   }, expression: "notAllowEdit" } }, [t._v("不允许编辑单元格")])], 1), r("li", { staticClass: "control-item" }, [r("a-checkbox", { model: { value: t.isTruncated, callback: function(o) {
     t.isTruncated = o;
-  }, expression: "isTruncated" } }, [t._v("超出内容隐藏")])], 1)], 1)])])]), r("a-tab-pane", { key: "1", attrs: { tab: i18nHelper("04-001-009-EMR.3.3.41", null, "双击属性") } }, [r("ul", { staticClass: "control-list" }, [r("li", { staticClass: "control-item" }, [r("span", { staticClass: "label" }, [t._v(i18nHelper("04-001-009-EMR.3.3.71", null, "编辑器属性"))]), r("a-select", { staticStyle: { "text-align": "left" }, attrs: { getPopupContainer: (o) => o.parentNode, placeholder: i18nHelper("04-001-009-EMR.3.3.71", null, "编辑器属性"), size: "small" }, model: { value: t.editorProperty, callback: function(o) {
+  }, expression: "isTruncated" } }, [t._v("超出内容隐藏")])], 1), r("li", { staticClass: "control-item" }, [r("a-checkbox", { model: { value: t.emptyPlaceholderLine, callback: function(o) {
+    t.emptyPlaceholderLine = o;
+  }, expression: "emptyPlaceholderLine" } }, [t._v("空单元格占位斜线（打印）")])], 1)], 1)])])]), r("a-tab-pane", { key: "1", attrs: { tab: i18nHelper("04-001-009-EMR.3.3.41", null, "双击属性") } }, [r("ul", { staticClass: "control-list" }, [r("li", { staticClass: "control-item" }, [r("span", { staticClass: "label" }, [t._v(i18nHelper("04-001-009-EMR.3.3.71", null, "编辑器属性"))]), r("a-select", { staticStyle: { "text-align": "left" }, attrs: { getPopupContainer: (o) => o.parentNode, placeholder: i18nHelper("04-001-009-EMR.3.3.71", null, "编辑器属性"), size: "small" }, model: { value: t.editorProperty, callback: function(o) {
     t.editorProperty = o;
   }, expression: "editorProperty" } }, [r("a-select-option", { attrs: { value: 0 } }, [t._v(i18nHelper("04-001-009-EMR.3.3.70", null, "无"))]), r("a-select-option", { attrs: { value: 1 } }, [t._v(i18nHelper("04-001-009-EMR.3.3.161", null, "下拉列表"))]), r("a-select-option", { attrs: { value: 2 } }, [t._v(i18nHelper("04-001-009-EMR.3.3.69", null, "日期"))]), r("a-select-option", { attrs: { value: 7 } }, [t._v(i18nHelper("04-001-009-EMR.3.3.510", null, "计算公式"))])], 1)], 1), t.editorProperty === 1 ? [r("li", { staticClass: "control-item" }, [r("div", { staticClass: "control-item" }, [r("span", { staticClass: "label" }, [t._v(i18nHelper("04-001-009-EMR.3.3.345", null, "分隔符"))]), r("a-select", { staticStyle: { "text-align": "left", "font-size": "20px" }, attrs: { getPopupContainer: (o) => o.parentNode, placeholder: i18nHelper("04-001-009-EMR.3.3.345", null, "分隔符"), size: "small" }, model: { value: t.splitCharacter, callback: function(o) {
     t.splitCharacter = o;
@@ -87247,7 +87294,7 @@ var _sfc_render$6 = function a() {
     return [r("a-menu", t._l(t.paragraph, function(o) {
       return r("a-menu-item", { key: "line-height-" + o.svg, class: o.align === t.aligned ? "selected" : "", nativeOn: { click: function(n) {
         return t.setAlign(o);
-      } } }, [r("Poper", { attrs: { title: o.title, svg: o.svg, selected: t.aligned === o.align } })], 1);
+      } } }, [r("Poper", { style: o.eventName === "alignedRight" ? { transform: "scaleX(-1)" } : {}, attrs: { title: o.title, svg: o.svg, selected: t.aligned === o.align } })], 1);
     }), 1)];
   }, proxy: !0 }]) }, [r("p", { staticClass: "ant-dropdown-link ant-dropdown-link-text", on: { click: function(o) {
     o.preventDefault();

package/lib/{index.es-D-_c3pZ0.mjs → index.es-B4h1UsCg.mjs}

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