hoeditor-web 3.0.70 → 3.0.71

package/lib/hoeditor.umd.js

@@ -41492,18 +41492,19 @@ var DocController = /*#__PURE__*/function () {
         node.imgHeight = imgHeight;
         node.fingerPrintSrc = fingerPrintSrc ? fingerPrintSrc : "";
         node.fingerPosition = fingerPosition ? fingerPosition : 0;
-        node.otherProperties = otherProperties ? otherProperties : new Object();
+        node.otherProperties = otherProperties ? otherProperties : node.otherProperties;
         node.imgSrc = imgSrc;
-        if (type == 1 && node.signType == 1) {
-          node.isFront = true;
-          node.connectMode = "/";
-        }
+        // if (type == 1 && node.signType == 1) {
+        //   node.isFront = true;
+        // }
+        //node.connectMode = "/";
         hoEditorFactory.docTree.change(changeEvent);
       } else {
         //第二次更新签名
         if (node.connectMode === "换行") {
           sPath = hoEditorFactory.docTree.getNodeLastPath(node);
-          var curParaNode = hoEditorFactory.drawTree.getDlineByPath(sPath).paragraphNode;
+          var dline = hoEditorFactory.drawTree.getDrawLineByDNode(node.drawNodes[0]);
+          var curParaNode = dline.paragraphNode;
           var newPara = new _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_29__/* .ParagraphNode */ .C(this._hoEditorFactoryID, node.rootNodes, node.parentNode, curParaNode.paraNo);
           hoEditorFactory.undoService.begin();
           hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_24__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, sPath, newPara));
@@ -41514,7 +41515,7 @@ var DocController = /*#__PURE__*/function () {
             sPath = hoEditorFactory.docTree.getNodeLastPath(node);
           }
         }
-        var newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntSign */ .Jq.ntSign, 2, type, name, node.signType, node.signFormat, signor, signTime, node.signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, node.styleIndex, node.connectMode, type == 1 && node.signType == 1 ? true : node.isFront, node.allowEditSignTime, fingerPrintSrc, fingerPosition, node.attribute, node.connectChar, otherProperties);
+        var newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntSign */ .Jq.ntSign, 2, type, name, node.signType, node.signFormat, signor, signTime, node.signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, node.styleIndex, node.connectMode, type == 1 && node.signType == 1 ? true : node.isFront, node.allowEditSignTime, fingerPrintSrc, fingerPosition, node.attribute, node.connectChar, otherProperties ? otherProperties : node.otherProperties);
         //插入该表达式节点
         hoEditorFactory.undoService.begin();
         hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_24__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, sPath, newSignNode));
@@ -58942,7 +58943,6 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
   //指纹
   //指纹
   //样式
-  // 当前签名图片是否已转成jpg  0代表未转换 1代表已转换
   //签名属性 0:医生签名  1:患者签名 2:ca签名(职称+签名图片) 3:ca签名（职称+签名+日期）4.ca签名(职称、连接符可选)
   //自定义CA签名连接符
   //其它属性{"isDisplayTitle":true,"title":"职称","time":"签名日期"}
@@ -58969,7 +58969,6 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
     (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)((0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_fingerPrintSrc", "");
     (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)((0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_fingerPosition", FingerPosition.center);
     (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)((0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_styleIndex", 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)((0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_PNGToJPG", 0);
     (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)((0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_attribute", 0);
     (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)((0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_connectChar", ":");
     (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)((0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_otherProperties", void 0);
@@ -59196,16 +59195,6 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
         this._customProperty = value;
       }
     }
-  }, {
-    key: "PNGToJPG",
-    get: function get() {
-      return this._PNGToJPG;
-    },
-    set: function set(value) {
-      if (this._PNGToJPG !== value) {
-        this._PNGToJPG = value;
-      }
-    }
   }, {
     key: "isTemplate",
     get: function get() {
@@ -59392,7 +59381,6 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
         imgWidth: clearSign ? 0 : this.imgWidth,
         imgHeight: clearSign ? 0 : this.imgHeight,
         customProperty: clearSign ? new Object() : this.customProperty,
-        PNGToJPG: this.PNGToJPG,
         isTemplate: this.isTemplate,
         styleIndex: this.styleIndex,
         connectMode: this.connectMode,
@@ -59434,7 +59422,6 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
         json.fingerPrintSrc = '';
       }
       var signNode = new SignNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_15__/* .NodeType.ntSign */ .Jq.ntSign, number, type, json.name, json.signType ? Number(json.signType) : 0, json.signFormat ? json.signFormat : "签名医师", isClearSign ? "" : json.signor, isClearSign ? "" : json.signTime, json.signTimeFormat ? json.signTimeFormat : "yyyy-MM-dd HH:mm", isClearSign ? "" : json.imgSrc, imgWidth, imgHeight, isClearSign ? undefined : json.customProperty, isTemplate, json.styleIndex ? Number(json.styleIndex) : undefined, json.connectMode, json.isFront, json.allowEditSignTime, isClearSign ? "" : json.fingerPrintSrc, isClearSign ? 0 : json.fingerPosition, attribute, json.connectChar, json.otherProperties);
-      signNode.PNGToJPG = json.PNGToJPG == 1 ? 1 : 0;
       // if (json.id != "") {
       //     signNode.id = json.id;
       // }
@@ -76147,7 +76134,7 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
 /*
  * @Author: your name
  * @Date: 2021-09-01 16:51:49
- * @LastEditTime: 2023-06-15 16:59:56
+ * @LastEditTime: 2023-06-15 19:32:06
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawSignNode.ts
@@ -76193,8 +76180,15 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
     _this._textStyle = cbStyle.getStyleKey();
     _this._abi02 = customProperty && customProperty.abi02 ? customProperty.abi02 : "";
     _this._title = otherProperties && otherProperties.title ? otherProperties.title : "";
-    if (_this.attribute === 4 && _this._title == "") {
-      _this._title = _this._abi02;
+    var isDisplayTitle = otherProperties && otherProperties.isDisplayTitle == "true" ? true : false;
+    if (_this.attribute === 4) {
+      if (isDisplayTitle) {
+        if (_this._title == "") {
+          _this._title = _this._abi02;
+        }
+      } else {
+        _this._title = "";
+      }
     }
     _this._signTime = otherProperties && otherProperties.time ? otherProperties.time : "";
     if (_this._title != "") {
@@ -76699,31 +76693,32 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
               drawNode.dWidth += drawNode._drawTitle.getMeasuredWidth();
             }
             if (_this3.number === 2) {
-              drawNode.dWidth += _this3._drawText.getMeasuredWidth();
+              drawNode.dWidth += _this3._drawText ? _this3._drawText.getMeasuredWidth() : 0;
             }
             if (drawNode.attribute === 2 && drawNode.abi02 !== "") {
               bitmap.setTransform(drawNode._drawAbi02.getMeasuredWidth(), -drawNode.dHeight + 2, width / hitWidth, drawNode.dHeight / hitHeight);
             } else if (drawNode.attribute === 3 && drawNode.title !== "") {
               bitmap.setTransform(drawNode._drawTitle.getMeasuredWidth(), -drawNode.dHeight - 4, width / hitWidth, (drawNode.dHeight - drawNode._drawDate.getMeasuredHeight() - 2) / hitHeight);
             } else if (drawNode.attribute === 4 && drawNode.title !== "") {
-              bitmap.setTransform(drawNode._drawTitle.getMeasuredWidth(), -drawNode.dHeight - 4, width / hitWidth, (drawNode.dHeight - drawNode._drawDate.getMeasuredHeight() - 2) / hitHeight);
+              bitmap.setTransform(drawNode._drawTitle.getMeasuredWidth(), -drawNode.dHeight + 5, width / hitWidth, drawNode.dHeight / hitHeight);
             } else {
               bitmap.setTransform(0, -drawNode.dHeight, width / hitWidth, drawNode.dHeight / hitHeight);
             }
             var hitArea = new createjs.Shape();
             hitArea.graphics.beginFill('#000').drawRect(0, 0, drawNode.dWidth, drawNode.dHeight); //这里是图片大小
             bitmap.hitArea = hitArea;
-            if (_this3.imgSrc.indexOf('data:image/') != -1 && _this3.imgSrc.indexOf('data:image/png') == -1) {
-              var canvas = document.createElement('canvas');
-              canvas.width = image.naturalWidth;
-              canvas.height = image.naturalHeight;
-              var ctx = canvas.getContext('2d');
-              ctx.fillStyle = '#FFFFFF';
-              ctx.fillRect(0, 0, image.naturalWidth, image.naturalHeight);
-              ctx.drawImage(image, 0, 0, image.naturalWidth, image.naturalHeight);
-              _this3.node.imgSrc = canvas.toDataURL('image/png');
-              _this3.node.PNGToJPG = 1;
-            }
+            // if (this.attribute !== 4) {
+            //     if (this.imgSrc.indexOf('data:image/') != -1 && this.imgSrc.indexOf('data:image/png') == -1) {
+            //         const canvas = document.createElement('canvas');
+            //         canvas.width = image.naturalWidth;
+            //         canvas.height = image.naturalHeight;
+            //         const ctx = canvas.getContext('2d') as CanvasRenderingContext2D;
+            //         ctx.fillStyle = '#FFFFFF';
+            //         ctx.fillRect(0, 0, image.naturalWidth, image.naturalHeight);
+            //         ctx.drawImage(image, 0, 0, image.naturalWidth, image.naturalHeight);
+            //         (this.node as SignNode).imgSrc = canvas.toDataURL('image/png');
+            //     }
+            // }
             var dArea = hoEditorFactory.drawPageTree.getMainRootArea(drawNode);
             if (dArea) {
               var atype = hoEditorFactory.subDocManger.getHeaderFooterType(_this3.node.getNodePath());
@@ -236233,7 +236228,7 @@ var ParagraphNode = __webpack_require__(67945);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/MarkNode.ts
 var MarkNode = __webpack_require__(57727);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.0.70');
+/* harmony default export */ var version = ('3.0.71');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(36081);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -250878,6 +250873,20 @@ var VueController = /*#__PURE__*/function () {
         _hoEditorFactory2.drawTree.moveCaretToPath(toPath);
       }
     }
+  }, {
+    key: "updateCustomProperty",
+    value: function updateCustomProperty(objs) {
+      for (var i = 0; i < objs.length; i++) {
+        var obj = objs[i];
+        var elements = this.getNodesById("all", true, obj.id);
+        for (var e = 0; e < elements.length; e++) {
+          var element = elements[e];
+          if (element instanceof TextInputFieldNode/* TextInputFieldNode */.re || element instanceof DateTimeNode/* DateTimeNode */.Z || element instanceof DownListNode/* DownListNode */.yF) {
+            element.customProperty = (0,objectSpread2/* default */.Z)((0,objectSpread2/* default */.Z)({}, element.customProperty), obj.customProperty);
+          }
+        }
+      }
+    }
   }]);
   return VueController;
 }();