hoeditor-web 3.1.28 → 3.1.29

package/lib/hoeditor.umd.js

@@ -43625,6 +43625,24 @@ var DocController = /*#__PURE__*/function () {
       node.imgSrc = imgSrc;
       hoEditorFactory.docTree.change(changeEvent);
     }
+    /**
+       * 更新签名自定义属性
+       * @param node 签名节点
+       * @param customProperty 自定义属性
+       */
+  }, {
+    key: "updateSignCustomProp",
+    value: function updateSignCustomProp(node, customProperty) {
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_78__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var sPath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
+      var ePath = hoEditorFactory.docTree.getNodeLastPath(node);
+      var changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_76__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _DocTree__WEBPACK_IMPORTED_MODULE_27__/* .DocAction */ .gk.daModifyStyle, sPath, ePath);
+      changeEvent.oldEndPath = ePath;
+      changeEvent.afterChangePath = ePath;
+      changeEvent.oldDrawLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_77__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawLines(sPath, ePath, true);
+      node.customProperty = customProperty;
+      hoEditorFactory.docTree.change(changeEvent);
+    }
     /**
      *
      * @returns 返回病历文件变更日志
@@ -106035,7 +106053,7 @@ Context2D.prototype.arcTo=function(x1,y1,x2,y2,radius){throw new Error("arcTo no
 var scale=this.ctx.transform.scaleX;var acharSpace=this.letterSpacing?parseFloat(this.letterSpacing):0.0;//自定义修改  以处理宋体粗体
 if(this.font.indexOf("SimSun")>=0&&this.font.indexOf("bold")>=0){//renderingMode: "stroke",
 putText.call(this,{text:text,x:x,y:y,scale:scale,angle:degs,align:this.textAlign,maxWidth:maxWidth,// renderingMode: "fillThenStroke",
-charSpace:acharSpace});}else{putText.call(this,{text:text,x:x,y:y,scale:scale,angle:degs,align:this.textAlign,maxWidth:maxWidth,charSpace:acharSpace});}};/**
+charSpace:acharSpace+1});}else{putText.call(this,{text:text,x:x,y:y,scale:scale,angle:degs,align:this.textAlign,maxWidth:maxWidth,charSpace:acharSpace});}};/**
    * Draws text on the canvas (no fill)
    *
    * @name strokeText
@@ -106046,7 +106064,7 @@ charSpace:acharSpace});}else{putText.call(this,{text:text,x:x,y:y,scale:scale,an
    * @param maxWidth {Number} Optional. The maximum allowed width of the text, in pixels
    * @description The strokeText() method draws text (with no fill) on the canvas. The default color of the text is black.
    */Context2D.prototype.strokeText=function(text,x,y,maxWidth){if(isNaN(x)||isNaN(y)||typeof text!=="string"){console.error("jsPDF.context2d.strokeText: Invalid arguments",arguments);throw new Error("Invalid arguments passed to jsPDF.context2d.strokeText");}if(isStrokeTransparent.call(this)){return;}maxWidth=isNaN(maxWidth)?undefined:maxWidth;var degs=rad2deg(this.ctx.transform.rotation);var scale=this.ctx.transform.scaleX;var acharSpace=this.letterSpacing?this.letterSpacing:0;// 自定义修改
-putText.call(this,{text:text,x:x,y:y,scale:scale,renderingMode:"stroke",angle:degs,align:this.textAlign,maxWidth:maxWidth,charSpace:acharSpace// 自定义修改
+putText.call(this,{text:text,x:x,y:y,scale:scale,renderingMode:"stroke",angle:degs,align:this.textAlign,maxWidth:maxWidth,charSpace:acharSpace+1// 自定义修改
 });};/**
    * Returns an object that contains the width of the specified text
    *
@@ -214878,8 +214896,8 @@ var es_string_match = __webpack_require__(4723);
 var es_number_constructor = __webpack_require__(9653);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
 var es_json_stringify = __webpack_require__(38862);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=5c4a2104&
-var HoDocvue_type_template_id_5c4a2104_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=388ed640&
+var HoDocvue_type_template_id_388ed640_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -215035,7 +215053,7 @@ var HoDocvue_type_template_id_5c4a2104_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_5c4a2104_staticRenderFns = [];
+var HoDocvue_type_template_id_388ed640_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -218040,7 +218058,7 @@ var TextNode = __webpack_require__(27198);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(67945);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.1.28');
+/* harmony default export */ var version = ('3.1.29');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -218713,10 +218731,11 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
       var nodePos = node.drawNodes[0];
       var drawLine = hoEditorFactory.drawTree.getDrawLineByDNode(nodePos);
       var docPos = drawLine.localToGlobal(nodePos.x, nodePos.y === 0 ? drawLine.dHeight : nodePos.y);
+      var scaleXY = Math.max(DrawConfig/* DrawConfig */.f.instance().scaleXY, DrawConfig/* DrawConfig */.f.instance().transformScale);
       this.poperPos = {
-        x: docPos.x / DrawConfig/* DrawConfig */.f.instance().scaleXY,
+        x: docPos.x / scaleXY,
         // 目标元素所在行的 x
-        y: docPos.y / DrawConfig/* DrawConfig */.f.instance().scaleXY + 5,
+        y: docPos.y / scaleXY + 5,
         // 目标元素所在行的 y
         width: nodePos.dWidth ? nodePos.dWidth : 0,
         height: drawLine.dHeight,
@@ -218810,10 +218829,10 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
 });
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocvue_type_script_lang_js_ = (HoDocvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=style&index=0&id=5c4a2104&prod&lang=less&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=style&index=0&id=388ed640&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=5c4a2104&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=388ed640&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -218826,8 +218845,8 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
 
 var HoDoc_component = (0,componentNormalizer/* default */.Z)(
   components_HoDocvue_type_script_lang_js_,
-  HoDocvue_type_template_id_5c4a2104_render,
-  HoDocvue_type_template_id_5c4a2104_staticRenderFns,
+  HoDocvue_type_template_id_388ed640_render,
+  HoDocvue_type_template_id_388ed640_staticRenderFns,
   false,
   null,
   null,
@@ -229662,6 +229681,17 @@ var VueController = /*#__PURE__*/function () {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       hoEditorFactory.docController.updateSignType(node, type, imgSrc, imgWidth, imgHeight);
     }
+    /**
+     * 更新签名自定义属性
+     * @param node 签名节点
+     * @param customProperty 自定义属性
+     */
+  }, {
+    key: "updateSignCustomProp",
+    value: function updateSignCustomProp(node, customProperty) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      hoEditorFactory.docController.updateSignCustomProp(node, customProperty);
+    }
     /**
      * 强制删除
      */
@@ -230552,19 +230582,43 @@ var VueController = /*#__PURE__*/function () {
     }()
   }, {
     key: "isSetFontFamily",
-    value: function isSetFontFamily(callback) {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
-      if (!hoEditorFactory.printController.isSetFont) {
-        hoEditorFactory.vueController.hoLocalStorage().loadFontString().then(function (font) {
-          if (font) {
-            hoEditorFactory.printController.setjsPDFFonts(font);
-            callback();
+    value: function () {
+      var _isSetFontFamily = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee10(callback) {
+        var hoEditorFactory, font;
+        return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee10$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
+            case 0:
+              hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+              if (hoEditorFactory.printController.isSetFont) {
+                _context11.next = 8;
+                break;
+              }
+              _context11.next = 4;
+              return hoEditorFactory.vueController.hoLocalStorage().loadFontString();
+            case 4:
+              font = _context11.sent;
+              if (font) {
+                hoEditorFactory.printController.setjsPDFFonts(font);
+                callback && callback();
+                setTimeout(function () {
+                  font = '';
+                }, 0);
+              }
+              _context11.next = 9;
+              break;
+            case 8:
+              callback && callback();
+            case 9:
+            case "end":
+              return _context11.stop();
           }
-        });
-      } else {
-        callback();
+        }, _callee10, this);
+      }));
+      function isSetFontFamily(_x25) {
+        return _isSetFontFamily.apply(this, arguments);
       }
-    }
+      return isSetFontFamily;
+    }()
     /**
      *  患者签名插入和更新
      */
@@ -231702,7 +231756,7 @@ var VueController = /*#__PURE__*/function () {
                 isTemplate: node.isTemplate,
                 number: node.number,
                 isVerify: node.otherProperties && node.otherProperties.isVerify ? true : false,
-                customProperty: {},
+                customProperty: node.customProperty,
                 previousText: '',
                 dataId: node.dataId,
                 name: node.name
@@ -232946,10 +233000,10 @@ var VueController = /*#__PURE__*/function () {
   }, {
     key: "importWordFile",
     value: function () {
-      var _importWordFile = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee10(fileStr) {
+      var _importWordFile = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee11(fileStr) {
         var hoEditorFactory, _curDomRange, startPath, endPath, changingEvent, nodes;
-        return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee10$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee11$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
               hoEditorFactory.isThrowError = false;
@@ -232958,10 +233012,10 @@ var VueController = /*#__PURE__*/function () {
               endPath = _curDomRange.normalize().endPath;
               changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType */.y.openLocalFiles);
               if (!hoEditorFactory.docTree.changing(changingEvent)) {
-                _context11.next = 14;
+                _context12.next = 14;
                 break;
               }
-              _context11.next = 9;
+              _context12.next = 9;
               return hoEditorFactory.docController.initBlankDoc();
             case 9:
               hoEditorFactory.drawTree.inViewPages = [0];
@@ -232973,11 +233027,11 @@ var VueController = /*#__PURE__*/function () {
               hoEditorFactory.undoService.stack = [];
             case 15:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee10, this);
+        }, _callee11, this);
       }));
-      function importWordFile(_x25) {
+      function importWordFile(_x26) {
         return _importWordFile.apply(this, arguments);
       }
       return importWordFile;