hoeditor-web 2.0.73 → 2.0.74

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/hoeditor.common.js +43 -29
  2. package/lib/hoeditor.umd.js +43 -29
  3. package/lib/hoeditor.umd.min.js +2 -2
  4. package/package.json +1 -1
package/lib/hoeditor.common.js CHANGED
@@ -28614,8 +28614,8 @@ var SubDocManger = __webpack_require__(24113);
28614
28614
  /*
28615
28615
  * @Author: your name
28616
28616
  * @Date: 2020-11-11 11:04:19
28617
- * @LastEditTime: 2021-09-28 14:07:58
28618
- * @LastEditors: Please set LastEditors
28617
+ * @LastEditTime: 2022-07-26 10:41:01
28618
+ * @LastEditors: liyanan 2441631434@qq.com
28619
28619
  * @Description: In User Settings Edit
28620
28620
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawImageNode.ts
28621
28621
  */
@@ -28672,6 +28672,9 @@ var DrawImageNode = /*#__PURE__*/function (_DrawCombineNode) {
28672
28672
  this._bitMap.y = this._imageY;
28673
28673
  this._bitMap.x = 0;
28674
28674
  this._bitMap.name = this.node.id;
28675
+
28676
+ this._bitMap.setBounds(0, 0, drawNode.dWidth, drawNode.dHeight);
28677
+
28675
28678
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(drawNode.node.hoEditorFactoryID);
28676
28679
  hoEditorFactory.loadImageCount++;
28677
28680
 
@@ -51468,17 +51471,19 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
51468
51471
  /* harmony export */ "V": function() { return /* binding */ DrawSignNode; }
51469
51472
  /* harmony export */ });
51470
51473
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(35671);
51471
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(22342);
51474
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(22342);
51472
51475
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(99640);
51473
51476
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(28214);
51474
51477
  /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(74916);
51475
51478
  /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3__);
51476
51479
  /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(23123);
51477
51480
  /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_4__);
51478
- /* harmony import */ var _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(34450);
51479
- /* harmony import */ var _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(24113);
51480
- /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(41005);
51481
- /* harmony import */ var _DrawCombineNode__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(72392);
51481
+ /* harmony import */ var _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(15798);
51482
+ /* harmony import */ var _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(34450);
51483
+ /* harmony import */ var _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(24113);
51484
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(41005);
51485
+ /* harmony import */ var _DrawCombineNode__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(72392);
51486
+
51482
51487
 
51483
51488
 
51484
51489
 
@@ -51492,7 +51497,7 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
51492
51497
  /*
51493
51498
  * @Author: your name
51494
51499
  * @Date: 2021-09-01 16:51:49
51495
- * @LastEditTime: 2022-07-19 09:47:55
51500
+ * @LastEditTime: 2022-07-26 12:00:22
51496
51501
  * @LastEditors: liyanan 2441631434@qq.com
51497
51502
  * @Description: In User Settings Edit
51498
51503
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawSignNode.ts
@@ -51527,7 +51532,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51527
51532
  _this._attribute = attribute;
51528
51533
  _this._abi02 = customProperty && customProperty.abi02 ? customProperty.abi02 : ""; //this._textStyle = cbStyle.;
51529
51534
 
51530
- _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight; //this.dHeight = 40;
51535
+ _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight; //this.dHeight = 40;
51531
51536
 
51532
51537
  _this._textStyle = cbStyle.getStyleKey();
51533
51538
 
@@ -51535,7 +51540,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51535
51540
  var signArr = imgSrc.split('\n');
51536
51541
 
51537
51542
  if (signArr.length > 1) {
51538
- _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight * signArr.length; // const textStyle = new TextStyle(hoeditfactoryID);
51543
+ _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight * signArr.length; // const textStyle = new TextStyle(hoeditfactoryID);
51539
51544
  // let curHeight = cbStyle.getFontHeightByFontSize(cbStyle.size) * signArr.length;
51540
51545
  // if (curHeight > this.dHeight) {
51541
51546
  // let fontSize = cbStyle.size;
@@ -51613,7 +51618,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51613
51618
  return _this;
51614
51619
  }
51615
51620
 
51616
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)(DrawSignNode, [{
51621
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)(DrawSignNode, [{
51617
51622
  key: "type",
51618
51623
  get: function get() {
51619
51624
  return this._type;
@@ -51710,7 +51715,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51710
51715
 
51711
51716
  this.clear();
51712
51717
  var drawNode = this;
51713
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
51718
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
51714
51719
 
51715
51720
  var drawSign = function drawSign() {
51716
51721
  if (_this2.type === 1 || _this2.type === 3) {
@@ -51718,7 +51723,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51718
51723
  node.type = 3;
51719
51724
 
51720
51725
  if (_this2.imgSrc == '' && _this2.fingerPrintSrc) {
51721
- var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
51726
+ var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
51722
51727
  var fingerWidth = 256;
51723
51728
  _this2._dWidth = fingerWidth * fingerscale;
51724
51729
  node.imgWidth = _this2._dWidth;
@@ -51782,7 +51787,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51782
51787
  var hitHeight = image.naturalHeight !== 0 ? image.naturalHeight : image.height;
51783
51788
  var scale = hoEditorFactory.signHeight / hitHeight < 0.4 ? 0.4 : hoEditorFactory.signHeight / hitHeight > 0.7 ? 1 : hoEditorFactory.signHeight / hitHeight;
51784
51789
 
51785
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center && hoEditorFactory.signHeight / hitHeight < 0.2) {
51790
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center && hoEditorFactory.signHeight / hitHeight < 0.2) {
51786
51791
  scale = hoEditorFactory.signHeight * 1.5 / hitHeight;
51787
51792
  }
51788
51793
 
@@ -51792,24 +51797,24 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51792
51797
  _fingerImage.onload = function () {
51793
51798
  var fingerWidth = 256;
51794
51799
  var fingerHeight = _fingerImage.naturalHeight !== 0 ? _fingerImage.naturalHeight : _fingerImage.height;
51795
- var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
51800
+ var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
51796
51801
  _fingerBitmap.scaleX = fingerscale;
51797
51802
  _fingerBitmap.scaleY = fingerscale;
51798
51803
  _fingerBitmap.y = -fingerHeight * fingerscale;
51799
51804
  bitmap.y = -hitHeight * scale;
51800
51805
 
51801
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.left */ .d.left) {
51806
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.left */ .d.left) {
51802
51807
  bitmap.x = fingerWidth * fingerscale + 5;
51803
51808
  _fingerBitmap.x = 0;
51804
51809
  _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
51805
51810
  node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
51806
51811
  _this2._dHeight = node.imgHeight;
51807
- } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center) {
51812
+ } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center) {
51808
51813
  _fingerBitmap.x = (hitWidth * scale - fingerWidth * fingerscale) / 2;
51809
51814
  _fingerBitmap.y = -(fingerHeight * fingerscale + currentLineHeight) / 2;
51810
51815
  bitmap.y = -(hitHeight * scale + currentLineHeight) / 2;
51811
51816
  node.imgHeight = hoEditorFactory.signHeight;
51812
- } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.right */ .d.right) {
51817
+ } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.right */ .d.right) {
51813
51818
  _fingerBitmap.x = hitWidth * scale + 5;
51814
51819
  _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
51815
51820
  node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
@@ -51818,7 +51823,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51818
51823
 
51819
51824
  node.imgWidth = _this2._dWidth;
51820
51825
 
51821
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center) {
51826
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center) {
51822
51827
  _this2._dWidth = 0;
51823
51828
  _this2._dHeight = 0;
51824
51829
  }
@@ -51852,10 +51857,10 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51852
51857
  if (dArea) {
51853
51858
  var atype = hoEditorFactory.subDocManger.getHeaderFooterType(drawNode.node.getNodePath());
51854
51859
 
51855
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_6__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
51860
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
51856
51861
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
51857
51862
  } else {
51858
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_6__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
51863
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
51859
51864
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
51860
51865
  }
51861
51866
  } // hoEditorFactory.drawTree.updateDrawTreeFirstLine();
@@ -51914,7 +51919,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51914
51919
  _this3.addChildAt(bitmap, 0);
51915
51920
  }
51916
51921
 
51917
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
51922
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
51918
51923
  hoEditorFactory.loadImageCount++;
51919
51924
 
51920
51925
  image.onload = function () {
@@ -51932,6 +51937,15 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51932
51937
 
51933
51938
  var width = hitWidth * hoEditorFactory.signHeight / image.naturalHeight; //+ this._drawText.getMeasuredWidth();
51934
51939
 
51940
+ if (node.parentNode instanceof _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_5__/* .CellNode */ .D) {
51941
+ var cellWidth = node.parentNode.drawCell.dWidth;
51942
+
51943
+ if (width > cellWidth - 5) {
51944
+ drawNode.dHeight = (cellWidth - 5) * hoEditorFactory.signHeight / width;
51945
+ width = cellWidth - 5;
51946
+ }
51947
+ }
51948
+
51935
51949
  drawNode.dWidth = width;
51936
51950
 
51937
51951
  if (drawNode.attribute === 2 && drawNode.abi02 !== "") {
@@ -51943,9 +51957,9 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51943
51957
  }
51944
51958
 
51945
51959
  if (drawNode.attribute === 2 && drawNode.abi02 !== "") {
51946
- bitmap.setTransform(drawNode._drawAbi02.getMeasuredWidth(), -hoEditorFactory.signHeight + 2, width / hitWidth, drawNode.dHeight / hitHeight);
51960
+ bitmap.setTransform(drawNode._drawAbi02.getMeasuredWidth(), -drawNode.dHeight + 2, width / hitWidth, drawNode.dHeight / hitHeight);
51947
51961
  } else {
51948
- bitmap.setTransform(0, -hoEditorFactory.signHeight, width / hitWidth, drawNode.dHeight / hitHeight);
51962
+ bitmap.setTransform(0, -drawNode.dHeight, width / hitWidth, drawNode.dHeight / hitHeight);
51949
51963
  }
51950
51964
 
51951
51965
  var hitArea = new createjs.Shape();
@@ -51970,10 +51984,10 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51970
51984
  if (dArea) {
51971
51985
  var atype = hoEditorFactory.subDocManger.getHeaderFooterType(_this3.node.getNodePath());
51972
51986
 
51973
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_6__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
51987
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
51974
51988
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
51975
51989
  } else {
51976
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_6__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
51990
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
51977
51991
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
51978
51992
  }
51979
51993
  }
@@ -52112,7 +52126,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
52112
52126
  }]);
52113
52127
 
52114
52128
  return DrawSignNode;
52115
- }(_DrawCombineNode__WEBPACK_IMPORTED_MODULE_8__/* .DrawCombineNode */ .o);
52129
+ }(_DrawCombineNode__WEBPACK_IMPORTED_MODULE_9__/* .DrawCombineNode */ .o);
52116
52130
 
52117
52131
  /***/ }),
52118
52132
 
@@ -207523,7 +207537,7 @@ var SignNode = __webpack_require__(34450);
207523
207537
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
207524
207538
  var ParagraphNode = __webpack_require__(14208);
207525
207539
  ;// CONCATENATED MODULE: ./src/components/version.ts
207526
- /* harmony default export */ var version = ('2.0.73');
207540
+ /* harmony default export */ var version = ('2.0.74');
207527
207541
  ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperTipText/PoperTipText.vue?vue&type=template&id=3fa4e4d3&scoped=true&
207528
207542
  var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.isShow),expression:"isShow"},{name:"click-outside",rawName:"v-click-outside",value:(_vm.handleClose),expression:"handleClose"}],ref:"poperTextNode",staticClass:"poper-text-modal animation-in",style:(_vm.posStyle),on:{"mouseenter":_vm.mouseEnter,"mouseleave":_vm.mouseLeave}},_vm._l((_vm.poperText),function(text){return _c('div',{key:text + Math.random(0, 1),staticClass:"poper-text"},[_vm._v(" "+_vm._s(text)+" ")])}),0)}
207529
207543
  var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_staticRenderFns = []
@@ -221463,7 +221477,7 @@ var VueController = /*#__PURE__*/function () {
221463
221477
  getAllNodes(node.childNodes);
221464
221478
  }
221465
221479
 
221466
- if (node instanceof BaseCombineNode/* BaseCombineNode */.V && attribute != 0 && !hasEmptyDoctorSign) {
221480
+ if (node instanceof BaseCombineNode/* BaseCombineNode */.V && attribute != 1 && !hasEmptyDoctorSign) {
221467
221481
  // 医生签名不存在的情况不在深层调用深层遍历
221468
221482
  getAllNodes(node.childNodes);
221469
221483
  }
package/lib/hoeditor.umd.js CHANGED
@@ -28624,8 +28624,8 @@ var SubDocManger = __webpack_require__(93777);
28624
28624
  /*
28625
28625
  * @Author: your name
28626
28626
  * @Date: 2020-11-11 11:04:19
28627
- * @LastEditTime: 2021-09-28 14:07:58
28628
- * @LastEditors: Please set LastEditors
28627
+ * @LastEditTime: 2022-07-26 10:41:01
28628
+ * @LastEditors: liyanan 2441631434@qq.com
28629
28629
  * @Description: In User Settings Edit
28630
28630
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawImageNode.ts
28631
28631
  */
@@ -28682,6 +28682,9 @@ var DrawImageNode = /*#__PURE__*/function (_DrawCombineNode) {
28682
28682
  this._bitMap.y = this._imageY;
28683
28683
  this._bitMap.x = 0;
28684
28684
  this._bitMap.name = this.node.id;
28685
+
28686
+ this._bitMap.setBounds(0, 0, drawNode.dWidth, drawNode.dHeight);
28687
+
28685
28688
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(drawNode.node.hoEditorFactoryID);
28686
28689
  hoEditorFactory.loadImageCount++;
28687
28690
 
@@ -51478,17 +51481,19 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
51478
51481
  /* harmony export */ "V": function() { return /* binding */ DrawSignNode; }
51479
51482
  /* harmony export */ });
51480
51483
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(42015);
51481
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(16296);
51484
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(16296);
51482
51485
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(83964);
51483
51486
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(46455);
51484
51487
  /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(74916);
51485
51488
  /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3__);
51486
51489
  /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(23123);
51487
51490
  /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_4__);
51488
- /* harmony import */ var _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(78975);
51489
- /* harmony import */ var _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(93777);
51490
- /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(28831);
51491
- /* harmony import */ var _DrawCombineNode__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(46139);
51491
+ /* harmony import */ var _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(69088);
51492
+ /* harmony import */ var _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(78975);
51493
+ /* harmony import */ var _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(93777);
51494
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(28831);
51495
+ /* harmony import */ var _DrawCombineNode__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(46139);
51496
+
51492
51497
 
51493
51498
 
51494
51499
 
@@ -51502,7 +51507,7 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
51502
51507
  /*
51503
51508
  * @Author: your name
51504
51509
  * @Date: 2021-09-01 16:51:49
51505
- * @LastEditTime: 2022-07-19 09:47:55
51510
+ * @LastEditTime: 2022-07-26 12:00:22
51506
51511
  * @LastEditors: liyanan 2441631434@qq.com
51507
51512
  * @Description: In User Settings Edit
51508
51513
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawSignNode.ts
@@ -51537,7 +51542,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51537
51542
  _this._attribute = attribute;
51538
51543
  _this._abi02 = customProperty && customProperty.abi02 ? customProperty.abi02 : ""; //this._textStyle = cbStyle.;
51539
51544
 
51540
- _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight; //this.dHeight = 40;
51545
+ _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight; //this.dHeight = 40;
51541
51546
 
51542
51547
  _this._textStyle = cbStyle.getStyleKey();
51543
51548
 
@@ -51545,7 +51550,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51545
51550
  var signArr = imgSrc.split('\n');
51546
51551
 
51547
51552
  if (signArr.length > 1) {
51548
- _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight * signArr.length; // const textStyle = new TextStyle(hoeditfactoryID);
51553
+ _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight * signArr.length; // const textStyle = new TextStyle(hoeditfactoryID);
51549
51554
  // let curHeight = cbStyle.getFontHeightByFontSize(cbStyle.size) * signArr.length;
51550
51555
  // if (curHeight > this.dHeight) {
51551
51556
  // let fontSize = cbStyle.size;
@@ -51623,7 +51628,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51623
51628
  return _this;
51624
51629
  }
51625
51630
 
51626
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)(DrawSignNode, [{
51631
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)(DrawSignNode, [{
51627
51632
  key: "type",
51628
51633
  get: function get() {
51629
51634
  return this._type;
@@ -51720,7 +51725,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51720
51725
 
51721
51726
  this.clear();
51722
51727
  var drawNode = this;
51723
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
51728
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
51724
51729
 
51725
51730
  var drawSign = function drawSign() {
51726
51731
  if (_this2.type === 1 || _this2.type === 3) {
@@ -51728,7 +51733,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51728
51733
  node.type = 3;
51729
51734
 
51730
51735
  if (_this2.imgSrc == '' && _this2.fingerPrintSrc) {
51731
- var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
51736
+ var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
51732
51737
  var fingerWidth = 256;
51733
51738
  _this2._dWidth = fingerWidth * fingerscale;
51734
51739
  node.imgWidth = _this2._dWidth;
@@ -51792,7 +51797,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51792
51797
  var hitHeight = image.naturalHeight !== 0 ? image.naturalHeight : image.height;
51793
51798
  var scale = hoEditorFactory.signHeight / hitHeight < 0.4 ? 0.4 : hoEditorFactory.signHeight / hitHeight > 0.7 ? 1 : hoEditorFactory.signHeight / hitHeight;
51794
51799
 
51795
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center && hoEditorFactory.signHeight / hitHeight < 0.2) {
51800
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center && hoEditorFactory.signHeight / hitHeight < 0.2) {
51796
51801
  scale = hoEditorFactory.signHeight * 1.5 / hitHeight;
51797
51802
  }
51798
51803
 
@@ -51802,24 +51807,24 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51802
51807
  _fingerImage.onload = function () {
51803
51808
  var fingerWidth = 256;
51804
51809
  var fingerHeight = _fingerImage.naturalHeight !== 0 ? _fingerImage.naturalHeight : _fingerImage.height;
51805
- var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
51810
+ var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
51806
51811
  _fingerBitmap.scaleX = fingerscale;
51807
51812
  _fingerBitmap.scaleY = fingerscale;
51808
51813
  _fingerBitmap.y = -fingerHeight * fingerscale;
51809
51814
  bitmap.y = -hitHeight * scale;
51810
51815
 
51811
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.left */ .d.left) {
51816
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.left */ .d.left) {
51812
51817
  bitmap.x = fingerWidth * fingerscale + 5;
51813
51818
  _fingerBitmap.x = 0;
51814
51819
  _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
51815
51820
  node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
51816
51821
  _this2._dHeight = node.imgHeight;
51817
- } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center) {
51822
+ } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center) {
51818
51823
  _fingerBitmap.x = (hitWidth * scale - fingerWidth * fingerscale) / 2;
51819
51824
  _fingerBitmap.y = -(fingerHeight * fingerscale + currentLineHeight) / 2;
51820
51825
  bitmap.y = -(hitHeight * scale + currentLineHeight) / 2;
51821
51826
  node.imgHeight = hoEditorFactory.signHeight;
51822
- } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.right */ .d.right) {
51827
+ } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.right */ .d.right) {
51823
51828
  _fingerBitmap.x = hitWidth * scale + 5;
51824
51829
  _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
51825
51830
  node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
@@ -51828,7 +51833,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51828
51833
 
51829
51834
  node.imgWidth = _this2._dWidth;
51830
51835
 
51831
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center) {
51836
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center) {
51832
51837
  _this2._dWidth = 0;
51833
51838
  _this2._dHeight = 0;
51834
51839
  }
@@ -51862,10 +51867,10 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51862
51867
  if (dArea) {
51863
51868
  var atype = hoEditorFactory.subDocManger.getHeaderFooterType(drawNode.node.getNodePath());
51864
51869
 
51865
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_6__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
51870
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
51866
51871
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
51867
51872
  } else {
51868
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_6__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
51873
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
51869
51874
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
51870
51875
  }
51871
51876
  } // hoEditorFactory.drawTree.updateDrawTreeFirstLine();
@@ -51924,7 +51929,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51924
51929
  _this3.addChildAt(bitmap, 0);
51925
51930
  }
51926
51931
 
51927
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
51932
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
51928
51933
  hoEditorFactory.loadImageCount++;
51929
51934
 
51930
51935
  image.onload = function () {
@@ -51942,6 +51947,15 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51942
51947
 
51943
51948
  var width = hitWidth * hoEditorFactory.signHeight / image.naturalHeight; //+ this._drawText.getMeasuredWidth();
51944
51949
 
51950
+ if (node.parentNode instanceof _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_5__/* .CellNode */ .D) {
51951
+ var cellWidth = node.parentNode.drawCell.dWidth;
51952
+
51953
+ if (width > cellWidth - 5) {
51954
+ drawNode.dHeight = (cellWidth - 5) * hoEditorFactory.signHeight / width;
51955
+ width = cellWidth - 5;
51956
+ }
51957
+ }
51958
+
51945
51959
  drawNode.dWidth = width;
51946
51960
 
51947
51961
  if (drawNode.attribute === 2 && drawNode.abi02 !== "") {
@@ -51953,9 +51967,9 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51953
51967
  }
51954
51968
 
51955
51969
  if (drawNode.attribute === 2 && drawNode.abi02 !== "") {
51956
- bitmap.setTransform(drawNode._drawAbi02.getMeasuredWidth(), -hoEditorFactory.signHeight + 2, width / hitWidth, drawNode.dHeight / hitHeight);
51970
+ bitmap.setTransform(drawNode._drawAbi02.getMeasuredWidth(), -drawNode.dHeight + 2, width / hitWidth, drawNode.dHeight / hitHeight);
51957
51971
  } else {
51958
- bitmap.setTransform(0, -hoEditorFactory.signHeight, width / hitWidth, drawNode.dHeight / hitHeight);
51972
+ bitmap.setTransform(0, -drawNode.dHeight, width / hitWidth, drawNode.dHeight / hitHeight);
51959
51973
  }
51960
51974
 
51961
51975
  var hitArea = new createjs.Shape();
@@ -51980,10 +51994,10 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51980
51994
  if (dArea) {
51981
51995
  var atype = hoEditorFactory.subDocManger.getHeaderFooterType(_this3.node.getNodePath());
51982
51996
 
51983
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_6__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
51997
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
51984
51998
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
51985
51999
  } else {
51986
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_6__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
52000
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
51987
52001
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
51988
52002
  }
51989
52003
  }
@@ -52122,7 +52136,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
52122
52136
  }]);
52123
52137
 
52124
52138
  return DrawSignNode;
52125
- }(_DrawCombineNode__WEBPACK_IMPORTED_MODULE_8__/* .DrawCombineNode */ .o);
52139
+ }(_DrawCombineNode__WEBPACK_IMPORTED_MODULE_9__/* .DrawCombineNode */ .o);
52126
52140
 
52127
52141
  /***/ }),
52128
52142
 
@@ -207533,7 +207547,7 @@ var SignNode = __webpack_require__(78975);
207533
207547
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
207534
207548
  var ParagraphNode = __webpack_require__(13880);
207535
207549
  ;// CONCATENATED MODULE: ./src/components/version.ts
207536
- /* harmony default export */ var version = ('2.0.73');
207550
+ /* harmony default export */ var version = ('2.0.74');
207537
207551
  ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperTipText/PoperTipText.vue?vue&type=template&id=3fa4e4d3&scoped=true&
207538
207552
  var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.isShow),expression:"isShow"},{name:"click-outside",rawName:"v-click-outside",value:(_vm.handleClose),expression:"handleClose"}],ref:"poperTextNode",staticClass:"poper-text-modal animation-in",style:(_vm.posStyle),on:{"mouseenter":_vm.mouseEnter,"mouseleave":_vm.mouseLeave}},_vm._l((_vm.poperText),function(text){return _c('div',{key:text + Math.random(0, 1),staticClass:"poper-text"},[_vm._v(" "+_vm._s(text)+" ")])}),0)}
207539
207553
  var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_staticRenderFns = []
@@ -221473,7 +221487,7 @@ var VueController = /*#__PURE__*/function () {
221473
221487
  getAllNodes(node.childNodes);
221474
221488
  }
221475
221489
 
221476
- if (node instanceof BaseCombineNode/* BaseCombineNode */.V && attribute != 0 && !hasEmptyDoctorSign) {
221490
+ if (node instanceof BaseCombineNode/* BaseCombineNode */.V && attribute != 1 && !hasEmptyDoctorSign) {
221477
221491
  // 医生签名不存在的情况不在深层调用深层遍历
221478
221492
  getAllNodes(node.childNodes);
221479
221493
  }