hoeditor-web 3.3.2-beta.8 → 3.3.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-Bew_SzT0.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-ByPK7_PH.mjs";
 export {
   i as HoDocs,
   r as HoEditorProvide,

package/lib/{index-Bew_SzT0.mjs → index-ByPK7_PH.mjs}

@@ -9598,6 +9598,7 @@ class RadioAndCheckBoxInstance {
   // 选项互斥加类型区分组 参考下拉列表和下拉框的选项互斥
   constructor() {
     b(this, "id");
+    b(this, "mId");
     b(this, "dataId");
     b(this, "type");
     //private name!: string;
@@ -9648,6 +9649,12 @@ class RadioAndCheckBoxInstance {
   set Id(t) {
     this.id !== t && (this.id = t);
   }
+  get MId() {
+    return this.mId;
+  }
+  set MId(t) {
+    this.mId !== t && (this.mId = t);
+  }
   get DataId() {
     return this.dataId;
   }
@@ -9809,7 +9816,7 @@ class RadioAndCheckBoxInstance {
     this.isTransToText !== t && (this.isTransToText = t);
   }
   static makeDefaultValue(t) {
-    return t.id = "", t.dataId = "", t.type = ControlType.ctRadioAndCheckBox, t.text = "", t.controlStyle = "CheckBox", t.groupName = "", t.groupType = "0", t.isSelected = !1, t.isAllowDelete = !0, t.boxAlign = !0, t.numericValue = "", t.AdditionalData = "", t.tipText = "", t.readType = -1, t.isEditText = !1, t.appendText = "", t.isTransToText = !1, t.groupHasOptions = !1, t.associatedElement = "", t.associatedShowElement = "", t.associatedId = "", t.isMutualExclusion = !1, t.innerIdentifier = "", t.customProperty = new Object(), t;
+    return t.id = "", t.dataId = "", t.type = ControlType.ctRadioAndCheckBox, t.text = "", t.controlStyle = "CheckBox", t.groupName = "", t.groupType = "0", t.isSelected = !1, t.isAllowDelete = !0, t.boxAlign = !0, t.numericValue = "", t.AdditionalData = "", t.tipText = "", t.readType = -1, t.isEditText = !1, t.appendText = "", t.isTransToText = !1, t.groupHasOptions = !1, t.associatedElement = "", t.associatedShowElement = "", t.associatedId = "", t.isMutualExclusion = !1, t.innerIdentifier = "", t.mId = "", t.customProperty = new Object(), t;
   }
 }
 class RadioAndCheckBoxNode extends ControlNode {
@@ -9997,7 +10004,7 @@ class RadioAndCheckBoxNode extends ControlNode {
   }
   get radioAndCheckBoxInstance() {
     const t = new RadioAndCheckBoxInstance();
-    return RadioAndCheckBoxInstance.makeDefaultValue(t), t.DataId = this.dataId !== void 0 ? this.dataId : t.DataId, t.ControlStyle = this.controlStyle !== void 0 ? this.controlStyle : t.ControlStyle, t.GroupName = this.groupName !== void 0 ? this.groupName : t.GroupName, t.groupType = this.groupType !== void 0 ? this.groupType : t.groupType, t.AdditionalData = this.additionalData !== void 0 ? this.additionalData : t.AdditionalData, t.TipText = this.tipText !== void 0 ? this.tipText : t.TipText, t.BoxAlign = this.boxAlign !== void 0 ? this.boxAlign : t.BoxAlign, t.IsAllowDelete = this.isAllowDelete !== void 0 ? this.isAllowDelete : t.IsAllowDelete, t.IsSelected = this.isSelected !== void 0 ? this.isSelected : t.IsSelected, t.NumericValue = this.numericValue !== void 0 ? this.numericValue : t.NumericValue, t.Id = this.id !== void 0 ? this.id : t.Id, t.Type = this.type !== void 0 ? this.type : t.Type, t.Text = this.text !== void 0 ? this.text : t.Text, t.innerIdentifier = this.innerIdentifier, t.customProperty = this.customProperty, t.ReadType = this.readType !== void 0 ? this.readType : t.ReadType, t.IsEditText = this.isEditText !== void 0 ? this.isEditText : t.IsEditText, t.AppendText = this.appendText !== void 0 ? this.appendText : t.AppendText, t.IsTransToText = this.isTransToText != null ? this.isTransToText : t.IsTransToText, t.GroupHasOptions = this.groupHasOptions != null ? this.groupHasOptions : t.GroupHasOptions, t.AssociatedElement = this.associatedElement != null ? this.associatedElement : t.AssociatedElement, t.AssociatedId = this.associatedId != null ? this.associatedId : t.AssociatedId, t.IsMutualExclusion = this.isMutualExclusion != null ? this.isMutualExclusion : t.IsMutualExclusion, t.AssociatedShowElement = this.associatedShowElement != null ? this.associatedShowElement : t.AssociatedShowElement, t;
+    return RadioAndCheckBoxInstance.makeDefaultValue(t), t.DataId = this.dataId !== void 0 ? this.dataId : t.DataId, t.ControlStyle = this.controlStyle !== void 0 ? this.controlStyle : t.ControlStyle, t.GroupName = this.groupName !== void 0 ? this.groupName : t.GroupName, t.groupType = this.groupType !== void 0 ? this.groupType : t.groupType, t.AdditionalData = this.additionalData !== void 0 ? this.additionalData : t.AdditionalData, t.TipText = this.tipText !== void 0 ? this.tipText : t.TipText, t.BoxAlign = this.boxAlign !== void 0 ? this.boxAlign : t.BoxAlign, t.IsAllowDelete = this.isAllowDelete !== void 0 ? this.isAllowDelete : t.IsAllowDelete, t.IsSelected = this.isSelected !== void 0 ? this.isSelected : t.IsSelected, t.NumericValue = this.numericValue !== void 0 ? this.numericValue : t.NumericValue, t.Id = this.id !== void 0 ? this.id : t.Id, t.MId = this.mId !== void 0 ? this.mId : t.MId, t.Type = this.type !== void 0 ? this.type : t.Type, t.Text = this.text !== void 0 ? this.text : t.Text, t.innerIdentifier = this.innerIdentifier, t.customProperty = this.customProperty, t.ReadType = this.readType !== void 0 ? this.readType : t.ReadType, t.IsEditText = this.isEditText !== void 0 ? this.isEditText : t.IsEditText, t.AppendText = this.appendText !== void 0 ? this.appendText : t.AppendText, t.IsTransToText = this.isTransToText != null ? this.isTransToText : t.IsTransToText, t.GroupHasOptions = this.groupHasOptions != null ? this.groupHasOptions : t.GroupHasOptions, t.AssociatedElement = this.associatedElement != null ? this.associatedElement : t.AssociatedElement, t.AssociatedId = this.associatedId != null ? this.associatedId : t.AssociatedId, t.IsMutualExclusion = this.isMutualExclusion != null ? this.isMutualExclusion : t.IsMutualExclusion, t.AssociatedShowElement = this.associatedShowElement != null ? this.associatedShowElement : t.AssociatedShowElement, t;
   }
   /**
    *
@@ -13322,7 +13329,7 @@ class ParagraphNode extends BaseNode {
     let r = 0;
     const { firstIndent: o, leftMarginPixes: n, rightMarginPixes: s } = this.combineParagraph, [l, c] = this.getParagraphLeftWidth();
     this._drawLines.forEach((d, u) => {
-      u === 0 && (d.dWidth = c - n - s, d.dLeft = l, d.x = n + l), u === 0 && o && (d.dWidth -= 10, d.dLeft += 10, d.x += 10), d.dTop = this.dTop + r, r += d.dHeight;
+      u === 0 && (d.dWidth = c - n - s, d.dLeft = l, d.x = n + l), u === 0 && o && (d.dWidth -= 10, d.dLeft += 10, d.x += 10), d.dTop = this.dTop + r, r += d.dHeight + this.combineParagraph.lineSpace;
     }), this._dHeight = r;
   }
   range() {
@@ -13622,7 +13629,7 @@ class DrawDateTime extends DrawCombineNode {
   }
 }
 class DateTimeNode extends ControlNode {
-  // 元素内存id
+  // 打印时是否隐藏
   constructor(t, r, o, n, s, l, c) {
     super(t, r, o, n);
     b(this, "_isReadOnly", !1);
@@ -13633,6 +13640,8 @@ class DateTimeNode extends ControlNode {
     //样式
     b(this, "_canWrapLine", !1);
     b(this, "_mId", "");
+    // 元素内存id
+    b(this, "_hideDuringPrint", !1);
     this._styleIndex = l, this.remark = "", this._type = ControlType.ctDateTime, this.customProperty = new Object(), this.setValuesObject(s), this.dataId || (this.dataId = HOEditorFactorys.instance().getFactory(t).gernerateCode.generateID("DateTime")), this._labelText === "" && (this.labelText = this._name !== "" ? this.name : this._controlStyle), this._text === "" && (this._text = this._labelText !== "" && this._labelText !== void 0 && this._labelText != null ? this._labelText : " "), this.isTrace = c === void 0 ? !1 : c, this.node2DrawNodeRange(0, 0);
   }
   setValuesObject(valuesObject) {
@@ -13658,6 +13667,12 @@ class DateTimeNode extends ControlNode {
   set isReadOnly(t) {
     this._isReadOnly !== t && (this._isReadOnly = t);
   }
+  get hideDuringPrint() {
+    return this._hideDuringPrint;
+  }
+  set hideDuringPrint(t) {
+    this._hideDuringPrint !== t && (this._hideDuringPrint = t);
+  }
   get canWrapLine() {
     return this._canWrapLine;
   }
@@ -13741,7 +13756,7 @@ class DateTimeNode extends ControlNode {
     else
       for (let f = u.children.length - 1; f >= 0; f--)
         u.children[f].name === "backColor" && u.children.splice(f, 1);
-    return o.addChild(u), o.drawItems.push(u), o.fitLines(), o.updateLineStyle(), o.paragraphNode.getLastDrawline();
+    return this.hideDuringPrint && (c.drawTree.paintStatus == PaintState.psPreview || c.drawTree.paintStatus == PaintState.psPrint) && (u.alpha = 0), o.addChild(u), o.drawItems.push(u), o.fitLines(), o.updateLineStyle(), o.paragraphNode.getLastDrawline();
   }
   hasChildPath() {
     return !1;
@@ -13771,7 +13786,8 @@ class DateTimeNode extends ControlNode {
         customProperty: this.customProperty,
         notReplaceElement: this.notReplaceElement,
         notSelectTime: this.notSelectTime,
-        remark: this.remark
+        remark: this.remark,
+        hideDuringPrint: this.hideDuringPrint
       };
     let s = "";
     this.parentNode && this.parentNode instanceof TextInputFieldNode && (s = this.parentNode.id);
@@ -13801,7 +13817,7 @@ class DateTimeNode extends ControlNode {
       //notSelectTime: this.notSelectTime,
       //remark: this.remark,
     };
-    return this.isSynchro && (l.isSynchro = this.isSynchro), this.tipText && (l.tipText = this.tipText), this.isAllowDelete && (l.isAllowDelete = this.isAllowDelete), this.isReadOnly && (l.isReadOnly = this.isReadOnly), this.notReplaceElement && (l.notReplaceElement = this.notReplaceElement), this.notSelectTime && (l.notSelectTime = this.notSelectTime), this.remark && (l.remark = this.remark), this.canWrapLine && (l.canWrapLine = this.canWrapLine), {
+    return this.isSynchro && (l.isSynchro = this.isSynchro), this.tipText && (l.tipText = this.tipText), this.isAllowDelete && (l.isAllowDelete = this.isAllowDelete), this.isReadOnly && (l.isReadOnly = this.isReadOnly), this.notReplaceElement && (l.notReplaceElement = this.notReplaceElement), this.notSelectTime && (l.notSelectTime = this.notSelectTime), this.remark && (l.remark = this.remark), this.canWrapLine && (l.canWrapLine = this.canWrapLine), this.hideDuringPrint && (l.hideDuringPrint = this.hideDuringPrint), {
       DateTimeNode: l
     };
   }
@@ -13810,7 +13826,7 @@ class DateTimeNode extends ControlNode {
       const l = HOEditorFactorys.instance().getFactory(t);
       l.vueController.getNodeByDataID("all", r.dataId) && (r.dataId = l.gernerateCode.generateID("DateTime"));
     }
-    if (r.readType = r.readType ? Number(r.readType) : -1, r.isSynchro = r.isSynchro ? r.isSynchro : !1, r.isAllowDelete = r.isAllowDelete ? r.isAllowDelete : !1, r.isReadOnly = r.isReadOnly ? r.isReadOnly : !1, r.notReplaceElement = r.notReplaceElement ? r.notReplaceElement : !1, r.notSelectTime = r.notSelectTime ? r.notSelectTime : !1, r.canWrapLine = r.canWrapLine ? r.canWrapLine : !1, r.type = parseInt(ControlType[r.type]), r.controlStyle = r.controlStyle.replace("hh", "HH"), r.text = r.text || "", r.controlStyle !== "yyyy-MM-dd HH:mm:ss" && r.controlStyle !== "" && r.text.replace(" ", "").length > 0 && r.text !== r.labelText) {
+    if (r.readType = r.readType ? Number(r.readType) : -1, r.isSynchro = r.isSynchro ? r.isSynchro : !1, r.isAllowDelete = r.isAllowDelete ? r.isAllowDelete : !1, r.isReadOnly = r.isReadOnly ? r.isReadOnly : !1, r.notReplaceElement = r.notReplaceElement ? r.notReplaceElement : !1, r.notSelectTime = r.notSelectTime ? r.notSelectTime : !1, r.canWrapLine = r.canWrapLine ? r.canWrapLine : !1, r.type = parseInt(ControlType[r.type]), r.controlStyle = r.controlStyle.replace("hh", "HH"), r.hideDuringPrint = r.hideDuringPrint ? r.hideDuringPrint : !1, r.text = r.text || "", r.controlStyle !== "yyyy-MM-dd HH:mm:ss" && r.controlStyle !== "" && r.text.replace(" ", "").length > 0 && r.text !== r.labelText) {
       const l = dateFormat(r.text.toString(), r.controlStyle);
       r.text = l;
     }
@@ -15244,7 +15260,7 @@ class DrawSignNode extends DrawCombineNode {
     }
   }
 }
-const version = "3.3.2-beta.8";
+const version = "3.3.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) {
@@ -38212,7 +38228,7 @@ class DrawImageNode extends DrawCombineNode {
     const r = this;
     this._imageManager.addImageQueue(this, () => new Promise((o) => {
       const n = new Image();
-      process.env.NODE_ENV !== "production" && !this.imagePath.startsWith("http") ? n.src = "http://192.168.1.211:8088" + this.imagePath : n.src = this.imagePath, this._bitMap = new createjs$1.Bitmap(n);
+      process.env.NODE_ENV !== "production" && !this.imagePath.startsWith("http") && !this.imagePath.startsWith("data:image") ? n.src = "http://192.168.1.211:8088" + this.imagePath : n.src = this.imagePath, this._bitMap = new createjs$1.Bitmap(n);
       const s = HOEditorFactorys.instance().getFactory(r.node.hoEditorFactoryID);
       this._bitMap.y = this._imageY, this._bitMap.x = 0, this._bitMap.name = this.node.id;
       const l = new createjs$1.Shape();
@@ -50244,7 +50260,9 @@ class VueController {
           "",
           0,
           0,
-          {},
+          {
+            elementDataId: t.customProperty.elementDataId || ""
+          },
           !0,
           t.styleIndex,
           t.connectMode,
@@ -65232,7 +65250,7 @@ WebPDecoder.prototype.getData = function() {
 (function(a) {
   function t() {
     return function() {
-      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-CjLUd2eH.mjs");
+      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-BwX_pFTi.mjs");
     }().catch(function(r) {
       return Promise.reject(new Error("Could not load canvg: " + r));
     }).then(function(r) {
@@ -75677,6 +75695,7 @@ const TextBorderDialog = __component__$10.exports, _sfc_main$$ = defineComponent
       title: i18nHelper("04-001-009-EMR.3.3.117", null, "日期时间"),
       tipText: "",
       isAllowDelete: !1,
+      hideDuringPrint: !1,
       notReplaceElement: !1,
       notSelectTime: !1,
       canWrapLine: !1,
@@ -75699,6 +75718,7 @@ const TextBorderDialog = __component__$10.exports, _sfc_main$$ = defineComponent
         "notSelectTime",
         "canWrapLine",
         "isAllowDelete",
+        "hideDuringPrint",
         "innerIdentifier",
         "identifierFormat",
         "notReplaceElement",
@@ -75724,7 +75744,7 @@ const TextBorderDialog = __component__$10.exports, _sfc_main$$ = defineComponent
   created() {
     if (this.controlStatus === "update") {
       const a = this.getDateNode();
-      this.id = a.id, this.name = a.name, this.text = a.text && a.text !== a.controlStyle && a.text !== a.name ? a.text : null, this.title = a.title, this.tipText = a.tipText, this.isAllowDelete = a.isAllowDelete, this.notReplaceElement = a.notReplaceElement == "undefined" || a.notReplaceElement == null ? !1 : a.notReplaceElement, this.notSelectTime = a.notSelectTime == "undefined" || a.notSelectTime == null ? !1 : a.notSelectTime, this.canWrapLine = a.canWrapLine == "undefined" || a.canWrapLine == null ? !1 : a.canWrapLine, this.isReadOnly = a.isReadOnly, this.controlStyle = a.controlStyle, this.innerIdentifier = a.innerIdentifier, this.dataMetaIdentifier = a.dataMetaIdentifier, this.identifierFormat = a.identifierFormat, this.dataId = a.dataId, this.readType = a.readType === 1, isObject(a.customProperty) ? this.customPropertys = a.customProperty : this.customPropertys = new Object();
+      this.id = a.id, this.name = a.name, this.text = a.text && a.text !== a.controlStyle && a.text !== a.name ? a.text : null, this.title = a.title, this.tipText = a.tipText, this.isAllowDelete = a.isAllowDelete, this.hideDuringPrint = a.hideDuringPrint, this.notReplaceElement = a.notReplaceElement == "undefined" || a.notReplaceElement == null ? !1 : a.notReplaceElement, this.notSelectTime = a.notSelectTime == "undefined" || a.notSelectTime == null ? !1 : a.notSelectTime, this.canWrapLine = a.canWrapLine == "undefined" || a.canWrapLine == null ? !1 : a.canWrapLine, this.isReadOnly = a.isReadOnly, this.controlStyle = a.controlStyle, this.innerIdentifier = a.innerIdentifier, this.dataMetaIdentifier = a.dataMetaIdentifier, this.identifierFormat = a.identifierFormat, this.dataId = a.dataId, this.readType = a.readType === 1, isObject(a.customProperty) ? this.customPropertys = a.customProperty : this.customPropertys = new Object();
       let t = new Object();
       Object.keys(this.customPropertys).forEach((r) => {
         t[r] = this.customPropertys[r];
@@ -75773,6 +75793,7 @@ const TextBorderDialog = __component__$10.exports, _sfc_main$$ = defineComponent
         title: i18nHelper("04-001-009-EMR.3.3.117", null, "日期时间"),
         tipText: this.tipText,
         isAllowDelete: this.isAllowDelete,
+        hideDuringPrint: this.hideDuringPrint,
         isReadOnly: this.isReadOnly,
         controlStyle: this.controlStyle,
         innerIdentifier: this.innerIdentifier,
@@ -75820,7 +75841,9 @@ var _sfc_render$$ = function a() {
     t.isAllowDelete = o;
   }, expression: "isAllowDelete" } }, [t._v(i18nHelper("04-001-009-EMR.3.3.185", null, "允许删除"))]), r("a-checkbox", { attrs: { size: "small" }, model: { value: t.readType, callback: function(o) {
     t.readType = o;
-  }, expression: "readType" } }, [t._v(i18nHelper("04-001-009-EMR.3.3.222", null, "自动回填"))]), r("a-checkbox", { attrs: { size: "small" }, model: { value: t.notReplaceElement, callback: function(o) {
+  }, expression: "readType" } }, [t._v(i18nHelper("04-001-009-EMR.3.3.222", null, "自动回填"))]), r("a-checkbox", { attrs: { size: "small" }, model: { value: t.hideDuringPrint, callback: function(o) {
+    t.hideDuringPrint = o;
+  }, expression: "hideDuringPrint" } }, [t._v(i18nHelper("04-001-009-EMR.3.3.164", null, "打印时隐藏"))]), r("a-checkbox", { attrs: { size: "small" }, model: { value: t.notReplaceElement, callback: function(o) {
     t.notReplaceElement = o;
   }, expression: "notReplaceElement" } }, [t._v(i18nHelper("04-001-009-EMR.3.3.163", null, "不启用元素引用"))]), r("a-checkbox", { attrs: { size: "small" }, model: { value: t.notSelectTime, callback: function(o) {
     t.notSelectTime = o;
@@ -83746,7 +83769,11 @@ const ControlModal = __component__$u.exports, _sfc_main$t = {
   },
   mounted() {
     this.findModal = this.$refs.findModal, this.$nextTick(() => {
-      this.$refs.findInput && this.$refs.findInput.focus();
+      if (this.$refs.findInput) {
+        this.$refs.findInput.focus();
+        const a = HOEditorFactorys.instance().getFactory(this.hoEditorFactoryId);
+        this.findContent = a.vueController.getSelectText() || "", this.toFind();
+      }
     });
   },
   methods: {

package/lib/{index.es-CjLUd2eH.mjs → index.es-BwX_pFTi.mjs}

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