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

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

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

@@ -23012,7 +23012,7 @@ WebPDecoder.prototype.getData = function() {
 (function(a) {
   function t() {
     return function() {
-      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-Dv0NcP4S.mjs");
+      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-D-_c3pZ0.mjs");
     }().catch(function(r) {
       return Promise.reject(new Error("Could not load canvg: " + r));
     }).then(function(r) {
@@ -24602,10 +24602,10 @@ class DrawSignNode extends DrawCombineNode {
     }
   }
 }
-const version = "3.3.6-beta.7";
+const version = "3.3.6-beta.8";
 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) {
+  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) {
     super(hoEditorFactoryID, rootNodes, pNode, nodeType);
     b(this, "_dataId", "");
     //dataId
@@ -24655,12 +24655,14 @@ class SignNode extends BaseNode {
     //其它属性{"isDisplayTitle":true,"title":"职称","isDisplayTime":true,"time":"签名日期","timePosition":"1"}
     b(this, "_associatedElement", "");
     //关联元素的dataid
+    b(this, "_associatedPatientElement", "");
+    //关联患者关系元素的dataid
     b(this, "oldNodePath", "");
     //删除前的路径
     b(this, "isTemp", !1);
     b(this, "innerIdentifier", "");
     const hoEditorFactory = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
-    this.number = number, this._type = type, this._signor = signor, this._signTime = signTime, this._attribute = attribute === void 0 ? 0 : attribute, this._connectChar = connectChar === void 0 ? ":" : connectChar, dataId ? this.dataId = dataId : this.dataId = HOEditorFactorys.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("Sign"), fingerPrintSrc && (this._fingerPrintSrc = fingerPrintSrc), this._fingerPosition = fingerPosition || 0, this._name = name, this._imgWidth = imgWidth, this._imgHeight = imgHeight, this._isTemplate = isTemplate, this.isTemp = isTemp || isTemplate, this._signType = signType, this._signFormat = signFormat, this._signTimeFormat = signTimeFormat, styleIndex || styleIndex == 0 ? this._styleIndex = styleIndex : this._styleIndex = hoEditorFactory.docTree.curStyleIndex, this._connectMode = connectMode, signType === 1 && type !== 1 && (this._isFront = isFront, this._allowEditSignTime = allowEditSignTime), this._otherProperties = new Object(), this._associatedElement = associatedElement || "", this._customProperty = new Object();
+    this.number = number, this._type = type, this._signor = signor, this._signTime = signTime, this._attribute = attribute === void 0 ? 0 : attribute, this._connectChar = connectChar === void 0 ? ":" : connectChar, dataId ? this.dataId = dataId : this.dataId = HOEditorFactorys.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("Sign"), fingerPrintSrc && (this._fingerPrintSrc = fingerPrintSrc), this._fingerPosition = fingerPosition || 0, this._name = name, this._imgWidth = imgWidth, this._imgHeight = imgHeight, this._isTemplate = isTemplate, this.isTemp = isTemp || isTemplate, this._signType = signType, this._signFormat = signFormat, this._signTimeFormat = signTimeFormat, styleIndex || styleIndex == 0 ? this._styleIndex = styleIndex : this._styleIndex = hoEditorFactory.docTree.curStyleIndex, this._connectMode = connectMode, signType === 1 && type !== 1 && (this._isFront = isFront, this._allowEditSignTime = allowEditSignTime), this._otherProperties = new Object(), this._associatedElement = associatedElement || "", this._associatedPatientElement = associatedPatientElement || "", this._customProperty = new Object();
     const assignvalue = (target, source) => {
       Object.keys(source).forEach((value) => {
         typeof target[value] == "object" ? Object.prototype.toString.call(source[value]) === "[object Object]" ? assignvalue(target[value], source[value]) : source[value] !== "" && source[value] !== null && assignvalue(target[value], eval("(" + source[value] + ")")) : target[value] = source[value];
@@ -24820,6 +24822,12 @@ class SignNode extends BaseNode {
   set associatedElement(t) {
     this._associatedElement !== t && (this._associatedElement = t);
   }
+  get associatedPatientElement() {
+    return this._associatedPatientElement;
+  }
+  set associatedPatientElement(t) {
+    this._associatedPatientElement !== t && (this._associatedPatientElement = t);
+  }
   /**
    *
    * @param drawTree 绘制树
@@ -24912,7 +24920,7 @@ class SignNode extends BaseNode {
       otherProperties: this.otherProperties,
       innerIdentifier: this.innerIdentifier
     };
-    return l.imgSrc.substring(0, 4) == "http" && (l.imgSrc = l.imgSrc.replace(`?_=${version}`, "")), this.associatedElement && (l.associatedElement = this.associatedElement), r ? l : {
+    return l.imgSrc.substring(0, 4) == "http" && (l.imgSrc = l.imgSrc.replace(`?_=${version}`, "")), this.associatedElement && (l.associatedElement = this.associatedElement), this.associatedPatientElement && (l.associatedPatientElement = this.associatedPatientElement), r ? l : {
       SignNode: l
     };
   }
@@ -24950,6 +24958,7 @@ class SignNode extends BaseNode {
       r.otherProperties,
       r.dataId,
       r.associatedElement,
+      r.associatedPatientElement,
       g,
       r.innerIdentifier
     );
@@ -62233,10 +62242,10 @@ class VueController {
    * @param isFront 新插入的签名是否前置 true：前置  false：后置
    * @param allowEditSignTime 允许修改签名时间 true：允许  false：不允许
    */
-  insertEmptySignNode(t, r, o, n, s, l, c, d, u, f, p, m, g) {
-    const y = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID), w = y.docTree.curDomRange.normalize(), v = w.normalize().startPath, C = w.normalize().endPath, _ = new NodeChangingEvent(DocAction.daInsert, v, C, OperType.insertSign);
-    y.docTree.changing(_) && y.docController.insertEmptySignNode(
-      w,
+  insertEmptySignNode(t, r, o, n, s, l, c, d, u, f, p, m, g, y) {
+    const w = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID), v = w.docTree.curDomRange.normalize(), C = v.normalize().startPath, _ = v.normalize().endPath, D = new NodeChangingEvent(DocAction.daInsert, C, _, OperType.insertSign);
+    w.docTree.changing(D) && w.docController.insertEmptySignNode(
+      v,
       t,
       r,
       o,
@@ -62249,7 +62258,8 @@ class VueController {
       f,
       p,
       m,
-      g
+      g,
+      y
     );
   }
   /**
@@ -62299,7 +62309,7 @@ class VueController {
    * @param otherProperties
    * @param isFront 是否前置
    */
-  updateEmptySignNode(t, r, o, n, s, l, c, d, u, f, p, m, g) {
+  updateEmptySignNode(t, r, o, n, s, l, c, d, u, f, p, m, g, y) {
     if (t.type !== 0)
       return;
     HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docController.updateEmptySignNode(
@@ -62315,7 +62325,8 @@ class VueController {
       f,
       p,
       m,
-      g
+      g,
+      y
     );
   }
   /**
@@ -72608,11 +72619,11 @@ class DocController {
    * @param isFront 新插入的签名是否前置 true：前置  false：后置
    * @param allowEditSignTime 允许修改签名时间 true：允许  false：不允许
    */
-  insertEmptySignNode(a, t, r, o, n, s, l, c, d, u, f, p, m, g) {
-    const y = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID), w = a.startPath, v = y.docTree.getParentNode(w), C = new SignNode(
+  insertEmptySignNode(a, t, r, o, n, s, l, c, d, u, f, p, m, g, y) {
+    const w = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID), v = a.startPath, C = w.docTree.getParentNode(v), _ = new SignNode(
       this._hoEditorFactoryID,
       a.npStart.roots,
-      v,
+      C,
       NodeType$1.ntSign,
       0,
       0,
@@ -72627,7 +72638,7 @@ class DocController {
       0,
       s,
       !0,
-      y.docTree.curStyleIndex,
+      w.docTree.curStyleIndex,
       l,
       c,
       d,
@@ -72638,10 +72649,11 @@ class DocController {
       p,
       void 0,
       m,
+      g,
       void 0,
-      g
+      y
     );
-    y.undoService.begin(), y.undoService.add(new NodeInsertUndoUnit(this._hoEditorFactoryID, w, C)), y.undoService.commit();
+    w.undoService.begin(), w.undoService.add(new NodeInsertUndoUnit(this._hoEditorFactoryID, v, _)), w.undoService.commit();
   }
   /**
    * 插入签名
@@ -72774,9 +72786,9 @@ class DocController {
    * @param otherProperties
    * @param isFront 是否前置
    */
-  updateEmptySignNode(a, t, r, o, n, s, l, c, d, u, f, p, m) {
-    const g = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID), y = g.docTree.getNodeLastPath(a.previousLeaf()), w = g.docTree.getNodeLastPath(a), v = new NodeChangeEvent(this._hoEditorFactoryID, DocAction.daModifyStyle, y, w);
-    v.oldEndPath = w, v.afterChangePath = w, v.oldDrawLines = new SelectRange(this._hoEditorFactoryID).getRangeDrawLines(y, w, !0, !0), a.name = t, a.connectChar = o, a.signType = n, a.signFormat = s, a.signor = l, a.signTime = c, a.signTimeFormat = d, a.attribute = r, a.isFront = p, a.associatedElement = m || "", a.connectMode = u, a.otherProperties = f, g.docTree.change(v);
+  updateEmptySignNode(a, t, r, o, n, s, l, c, d, u, f, p, m, g) {
+    const y = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID), w = y.docTree.getNodeLastPath(a.previousLeaf()), v = y.docTree.getNodeLastPath(a), C = new NodeChangeEvent(this._hoEditorFactoryID, DocAction.daModifyStyle, w, v);
+    C.oldEndPath = v, C.afterChangePath = v, C.oldDrawLines = new SelectRange(this._hoEditorFactoryID).getRangeDrawLines(w, v, !0, !0), a.name = t, a.connectChar = o, a.signType = n, a.signFormat = s, a.signor = l, a.signTime = c, a.signTimeFormat = d, a.attribute = r, a.isFront = p, a.associatedElement = m || "", a.associatedPatientElement = g || "", a.connectMode = u, a.otherProperties = f, y.docTree.change(C);
   }
   /**
    * 更新签名时间
@@ -74876,6 +74888,8 @@ const ExpressionForm = __component__$15.exports, _sfc_main$14 = {
       lockContentBeforeSign: !1,
       dateTimeList: [],
       associatedElement: "",
+      patientElementList: [],
+      associatedPatientElement: "",
       modifyProps: {},
       unwatchProps: [],
       innerIdentifier: "",
@@ -74892,6 +74906,7 @@ const ExpressionForm = __component__$15.exports, _sfc_main$14 = {
         "isDisplayTime",
         "timePosition",
         "associatedElement",
+        "associatedPatientElement",
         "isHigher",
         "additionsEditor",
         "lockContentBeforeSign",
@@ -74900,21 +74915,21 @@ const ExpressionForm = __component__$15.exports, _sfc_main$14 = {
     };
   },
   mounted() {
-    var n, s, l, c, d, u, f, p, m, g, y, w, v;
+    var s, l, c, d, u, f, p, m, g, y, w, v, C;
     const a = this.vueController.getAllSignNodeList(), t = [...a.sign, ...a.patientSign];
-    let r = [];
-    t.forEach((C) => {
-      C.associatedElement && !r.includes(C.associatedElement) && r.push(C.associatedElement);
+    let r = [], o = [];
+    t.forEach((_) => {
+      _.associatedElement && !r.includes(_.associatedElement) && r.push(_.associatedElement), _.associatedPatientElement && !o.includes(_.associatedPatientElement) && o.push(_.associatedPatientElement);
     });
-    const o = this.vueController.getAllElements();
+    const n = this.vueController.getAllElements();
     if (this.dateTimeList = [], this.controlStatus === "update") {
-      const C = this.getCurrentSelectNode();
-      C && (this.name = C.name, C.attribute == 2 ? this.signType = 2 : C.attribute == 3 ? this.signType = 3 : C.attribute == 4 ? this.signType = 4 : C.attribute == 1 ? (this.signType = 1, this.innerIdentifier = C.innerIdentifier || "") : C.signType == 0 ? this.signType = 0 : this.signType = 9, this.signFormat = C.signFormat, this.connectMode = C.connectMode, this.connectChar = C.connectChar, this.isFront = C.isFront === !0 || C.isFront === "true", this.signTimeFormat = C.signTimeFormat, this.customFormatContent = C.customFormatContent ? C.customFormatContent : "", this.isDisplayTitle = !!(((n = C.otherProperties) == null ? void 0 : n.isDisplayTitle) === "true" | ((s = C.otherProperties) == null ? void 0 : s.isDisplayTitle) === !0), this.isHigher = !!(((l = C.otherProperties) == null ? void 0 : l.isHigher) === "true" | ((c = C.otherProperties) == null ? void 0 : c.isHigher) === !0), this.additionsEditor = !!(((d = C.otherProperties) == null ? void 0 : d.additionsEditor) === "true" | ((u = C.otherProperties) == null ? void 0 : u.additionsEditor) === !0), this.isDisplayTime = !!(((f = C.otherProperties) == null ? void 0 : f.isDisplayTime) === "true" | ((p = C.otherProperties) == null ? void 0 : p.isDisplayTime) === !0), this.timePosition = ((m = C.otherProperties) == null ? void 0 : m.timePosition) == "1" ? "1" : "0", this.associatedElement = C.associatedElement ? C.associatedElement : "", this.validatePriorSignatures = !!(((g = C.otherProperties) == null ? void 0 : g.validatePriorSignatures) === "true" | ((y = C.otherProperties) == null ? void 0 : y.validatePriorSignatures) === !0), this.lockContentBeforeSign = !!(((w = C.otherProperties) == null ? void 0 : w.lockContentBeforeSign) === "true" | ((v = C.otherProperties) == null ? void 0 : v.lockContentBeforeSign) === !0), o.forEach((_) => {
-        _.nodeType == 8 && (!r.includes(_.dataId) || C.associatedElement == _.dataId) && this.dateTimeList.push(_);
+      const _ = this.getCurrentSelectNode();
+      _ && (this.name = _.name, _.attribute == 2 ? this.signType = 2 : _.attribute == 3 ? this.signType = 3 : _.attribute == 4 ? this.signType = 4 : _.attribute == 1 ? (this.signType = 1, this.innerIdentifier = _.innerIdentifier || "") : _.signType == 0 ? this.signType = 0 : this.signType = 9, this.signFormat = _.signFormat, this.connectMode = _.connectMode, this.connectChar = _.connectChar, this.isFront = _.isFront === !0 || _.isFront === "true", this.signTimeFormat = _.signTimeFormat, this.customFormatContent = _.customFormatContent ? _.customFormatContent : "", this.isDisplayTitle = !!(((s = _.otherProperties) == null ? void 0 : s.isDisplayTitle) === "true" | ((l = _.otherProperties) == null ? void 0 : l.isDisplayTitle) === !0), this.isHigher = !!(((c = _.otherProperties) == null ? void 0 : c.isHigher) === "true" | ((d = _.otherProperties) == null ? void 0 : d.isHigher) === !0), this.additionsEditor = !!(((u = _.otherProperties) == null ? void 0 : u.additionsEditor) === "true" | ((f = _.otherProperties) == null ? void 0 : f.additionsEditor) === !0), this.isDisplayTime = !!(((p = _.otherProperties) == null ? void 0 : p.isDisplayTime) === "true" | ((m = _.otherProperties) == null ? void 0 : m.isDisplayTime) === !0), this.timePosition = ((g = _.otherProperties) == null ? void 0 : g.timePosition) == "1" ? "1" : "0", this.associatedElement = _.associatedElement ? _.associatedElement : "", this.associatedPatientElement = _.associatedPatientElement ? _.associatedPatientElement : "", this.validatePriorSignatures = !!(((y = _.otherProperties) == null ? void 0 : y.validatePriorSignatures) === "true" | ((w = _.otherProperties) == null ? void 0 : w.validatePriorSignatures) === !0), this.lockContentBeforeSign = !!(((v = _.otherProperties) == null ? void 0 : v.lockContentBeforeSign) === "true" | ((C = _.otherProperties) == null ? void 0 : C.lockContentBeforeSign) === !0), n.forEach((D) => {
+        D.nodeType == 8 && (!r.includes(D.dataId) || _.associatedElement == D.dataId) && this.dateTimeList.push(D), D.nodeType == 7 && (!o.includes(D.dataId) || _.associatedPatientElement == D.dataId) && this.patientElementList.push(D);
       }), this.setWatchProps());
     } else
-      o.forEach((C) => {
-        C.nodeType == 8 && !r.includes(C.dataId) && this.dateTimeList.push(C);
+      n.forEach((_) => {
+        _.nodeType == 8 && !r.includes(_.dataId) && this.dateTimeList.push(_), _.nodeType == 7 && !o.includes(_.dataId) && this.patientElementList.push(_);
       });
   },
   methods: {
@@ -74997,7 +75012,8 @@ const ExpressionForm = __component__$15.exports, _sfc_main$14 = {
               additionsEditor: this.additionsEditor,
               ...r
             },
-            this.associatedElement
+            this.associatedElement,
+            this.associatedPatientElement
           );
         else if (this.signType === 2)
           this.vueController.insertEmptySignNode(
@@ -75012,7 +75028,8 @@ const ExpressionForm = __component__$15.exports, _sfc_main$14 = {
             this.signType,
             this.connectChar,
             { isHigher: this.isHigher, additionsEditor: this.additionsEditor, ...r },
-            this.associatedElement
+            this.associatedElement,
+            this.associatedPatientElement
           );
         else if (this.signType === 3)
           this.vueController.insertEmptySignNode(
@@ -75027,7 +75044,8 @@ const ExpressionForm = __component__$15.exports, _sfc_main$14 = {
             this.signType,
             this.connectChar,
             { isHigher: this.isHigher, additionsEditor: this.additionsEditor, ...r },
-            this.associatedElement
+            this.associatedElement,
+            this.associatedPatientElement
           );
         else if (this.signType === 4)
           this.vueController.insertEmptySignNode(
@@ -75042,14 +75060,15 @@ const ExpressionForm = __component__$15.exports, _sfc_main$14 = {
             this.signType,
             this.connectChar,
             { isDisplayTitle: this.isDisplayTitle, additionsEditor: this.additionsEditor, isHigher: this.isHigher, ...t, ...r },
-            this.associatedElement
+            this.associatedElement,
+            this.associatedPatientElement
           );
         else {
           const o = this.name ? this.name : this.signType == 1 ? i18nHelper("04-001-009-EMR.3.3.129", null, "患者签名") : i18nHelper("04-001-009-EMR.3.3.128", null, "医生签名");
           let n = { isHigher: this.isHigher, additionsEditor: this.additionsEditor, ...r };
           this.signType == 1 && (n = {});
           const s = this.signType === 1 && this.innerIdentifier ? this.innerIdentifier : "";
-          this.vueController.insertEmptySignNode(o, 0, "", "", a, "", void 0, void 0, this.signType, "", n, this.associatedElement, s);
+          this.vueController.insertEmptySignNode(o, 0, "", "", a, "", void 0, void 0, this.signType, "", n, this.associatedElement, this.associatedPatientElement, s);
         }
       else if (this.controlStatus === "update") {
         this.clearWatchProps();
@@ -75078,7 +75097,8 @@ const ExpressionForm = __component__$15.exports, _sfc_main$14 = {
           this.connectMode,
           c,
           this.isFront,
-          this.associatedElement
+          this.associatedElement,
+          this.associatedPatientElement
         );
       }
       this.handleClose();
@@ -75125,7 +75145,11 @@ var _sfc_render$14 = function a() {
     t.associatedElement = o;
   }, expression: "associatedElement" } }, t._l(t.dateTimeList, function(o) {
     return r("a-select-option", { key: o.dataId, attrs: { value: o.dataId } }, [t._v(t._s(`${o.name}(${o.dataId})`))]);
-  }), 1)], 1), t.signType === 1 ? r("li", { staticClass: "control-item" }, [r("span", { staticClass: "label" }, [t._v("内联标识符")]), r("a-input", { attrs: { placeholder: "请输入内联标识符" }, model: { value: t.innerIdentifier, callback: function(o) {
+  }), 1)], 1), t.signType === 1 ? r("li", { staticClass: "control-item" }, [r("span", { staticClass: "label" }, [t._v("关联患者关系元素")]), r("a-select", { attrs: { showSearch: "", allowClear: "", placeholder: "请选择关联患者关系元素", "filter-option": t.filterOption, getPopupContainer: (o) => o.parentNode }, model: { value: t.associatedPatientElement, callback: function(o) {
+    t.associatedPatientElement = o;
+  }, expression: "associatedPatientElement" } }, t._l(t.patientElementList, function(o) {
+    return r("a-select-option", { key: o.dataId, attrs: { value: o.dataId } }, [t._v(t._s(`${o.name}(${o.dataId})`))]);
+  }), 1)], 1) : t._e(), t.signType === 1 ? r("li", { staticClass: "control-item" }, [r("span", { staticClass: "label" }, [t._v("内联标识符")]), r("a-input", { attrs: { placeholder: "请输入内联标识符" }, model: { value: t.innerIdentifier, callback: function(o) {
     t.innerIdentifier = o;
   }, expression: "innerIdentifier" } })], 1) : t._e(), t.signType !== 1 ? r("li", { staticClass: "control-item" }, [r("div", { staticClass: "col-checkbox-group" }, [r("a-checkbox", { model: { value: t.isHigher, callback: function(o) {
     t.isHigher = o;

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

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