hoeditor-web 2.0.92 → 2.0.95

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.
@@ -28167,13 +28167,13 @@ var DocController = /*#__PURE__*/function () {
28167
28167
  if (node.keyValue !== "") {
28168
28168
  node.childNodes.splice(1, node.childNodes.length - 2);
28169
28169
  var textNode = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R(this._hoEditorFactoryID, node.rootNodes, node, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntText */ .Jq.ntText, values["text"], hoEditorFactory.docTree.curStyleIndex);
28170
- node.childNodes.splice(1, 0, textNode); //changeEvent.afterChangePath = hoEditorFactory.docTree.getNodeLastPath(textNode);
28170
+ node.childNodes.splice(1, 0, textNode);
28171
+ changeEvent.afterChangePath = hoEditorFactory.docTree.getNodeLastPath(textNode);
28171
28172
  } else {
28172
28173
  node.childNodes.splice(1, node.childNodes.length - 2);
28173
28174
  node.childNodes.splice(1, 0, node.childNodes2[1]);
28175
+ changeEvent.afterChangePath = ePath;
28174
28176
  }
28175
-
28176
- changeEvent.afterChangePath = ePath;
28177
28177
  } else {
28178
28178
  //changeEvent.afterChangePath = hoEditorFactory.docTree.getNodeLastPath(node);
28179
28179
  changeEvent.afterChangePath = ePath;
@@ -47450,15 +47450,13 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
47450
47450
  _this._signTime = signTime;
47451
47451
  _this._imgSrc = imgSrc;
47452
47452
  _this._attribute = attribute === undefined ? 0 : attribute;
47453
- _this._connectChar = connectChar === undefined ? ":" : connectChar;
47454
-
47455
- if (type == 3) {
47456
- // 兼容旧的患者签名
47457
- _this._attribute = 1;
47458
- } // if(attribute == 1) { // 患者签名修改 type == 3
47453
+ _this._connectChar = connectChar === undefined ? ":" : connectChar; // if (fingerPrintSrc || (imgSrc && !fingerPrintSrc && customProperty && !customProperty.created_date)) { // 用自定义属性区分并兼容旧的患者签名
47454
+ // this._attribute = 1;
47455
+ // this._type = 3;
47456
+ // }
47457
+ // if(attribute == 1) { // 患者签名修改 type == 3
47459
47458
  // this._type = 3;
47460
47459
  // }
47461
-
47462
47460
 
47463
47461
  if (fingerPrintSrc) {
47464
47462
  _this._fingerPrintSrc = fingerPrintSrc;
@@ -48100,7 +48098,7 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
48100
48098
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(91347);
48101
48099
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(36768);
48102
48100
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(42015);
48103
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(16296);
48101
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(16296);
48104
48102
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(16862);
48105
48103
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(79123);
48106
48104
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(83964);
@@ -48131,27 +48129,24 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
48131
48129
  /* harmony import */ var core_js_modules_es_regexp_dot_all_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_dot_all_js__WEBPACK_IMPORTED_MODULE_19__);
48132
48130
  /* harmony import */ var core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(88386);
48133
48131
  /* harmony import */ var core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_20__);
48134
- /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(40561);
48135
- /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21__);
48136
- /* harmony import */ var core_js_modules_es_string_match_all_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(76373);
48137
- /* harmony import */ var core_js_modules_es_string_match_all_js__WEBPACK_IMPORTED_MODULE_22___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_match_all_js__WEBPACK_IMPORTED_MODULE_22__);
48138
- /* harmony import */ var core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(56977);
48139
- /* harmony import */ var core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_23___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_23__);
48140
- /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(26699);
48141
- /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_24___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_24__);
48142
- /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(32023);
48143
- /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_25___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_25__);
48144
- /* harmony import */ var core_js_modules_es_string_trim_js__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(73210);
48145
- /* harmony import */ var core_js_modules_es_string_trim_js__WEBPACK_IMPORTED_MODULE_26___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_trim_js__WEBPACK_IMPORTED_MODULE_26__);
48146
- /* harmony import */ var _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(86017);
48147
- /* harmony import */ var _editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(77564);
48148
- /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(28831);
48149
- /* harmony import */ var _plugins_util__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(17987);
48150
- /* harmony import */ var _BaseCombineNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(3267);
48151
- /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(92178);
48152
- /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(69088);
48153
- /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(99964);
48154
-
48132
+ /* harmony import */ var core_js_modules_es_string_match_all_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(76373);
48133
+ /* harmony import */ var core_js_modules_es_string_match_all_js__WEBPACK_IMPORTED_MODULE_21___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_match_all_js__WEBPACK_IMPORTED_MODULE_21__);
48134
+ /* harmony import */ var core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(56977);
48135
+ /* harmony import */ var core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_22___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_22__);
48136
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(26699);
48137
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_23___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_23__);
48138
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(32023);
48139
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_24___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_24__);
48140
+ /* harmony import */ var core_js_modules_es_string_trim_js__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(73210);
48141
+ /* harmony import */ var core_js_modules_es_string_trim_js__WEBPACK_IMPORTED_MODULE_25___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_trim_js__WEBPACK_IMPORTED_MODULE_25__);
48142
+ /* harmony import */ var _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(86017);
48143
+ /* harmony import */ var _editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(77564);
48144
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(28831);
48145
+ /* harmony import */ var _plugins_util__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(17987);
48146
+ /* harmony import */ var _BaseCombineNode__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(3267);
48147
+ /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(92178);
48148
+ /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(69088);
48149
+ /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(99964);
48155
48150
 
48156
48151
 
48157
48152
 
@@ -48225,7 +48220,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48225
48220
  _this._formulaStr = "";
48226
48221
  _this._hideZero = true; //计算结果为0时是否隐藏
48227
48222
 
48228
- _this._id = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("TFS");
48223
+ _this._id = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("TFS");
48229
48224
  _this._styleIndex = styleIndex;
48230
48225
  _this.isAllowDelete = true;
48231
48226
  _this._cellRange = new Array();
@@ -48248,7 +48243,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48248
48243
  return _this;
48249
48244
  }
48250
48245
 
48251
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_35__/* ["default"] */ .Z)(TableFormula, [{
48246
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_34__/* ["default"] */ .Z)(TableFormula, [{
48252
48247
  key: "setCustomProperty",
48253
48248
  value: function setCustomProperty(customProperty) {
48254
48249
  var assignvalue = function assignvalue(target, source) {
@@ -48344,7 +48339,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48344
48339
  }, {
48345
48340
  key: "refreshDrawStyle",
48346
48341
  value: function refreshDrawStyle() {
48347
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48342
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48348
48343
  var textStyle = hoEditorFactory.docTree.styles[this._styleIndex];
48349
48344
  var cbStyle;
48350
48345
 
@@ -48365,7 +48360,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48365
48360
  value: function node2DrawNodeRange(startIndex, endIndex) {
48366
48361
  this.refreshDrawStyle(); //const text = this._hideZero && (this._text == "0" || this._text === "0.00") ? " " : this._text;
48367
48362
 
48368
- var dNode = new _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_27__/* .DrawTableFormular */ .A(this._rootPath, this, this._text);
48363
+ var dNode = new _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_26__/* .DrawTableFormular */ .A(this._rootPath, this, this._text);
48369
48364
 
48370
48365
  this._drawNodes.push(dNode);
48371
48366
  }
@@ -48395,7 +48390,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48395
48390
 
48396
48391
  dline.addChild(this._drawNodes[0]);
48397
48392
  dline.drawItems.push(this._drawNodes[0]);
48398
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.formularNodes.set(this.id, this);
48393
+ _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.formularNodes.set(this.id, this);
48399
48394
  dline.fitLines();
48400
48395
  return dline.paragraphNode.getLastDrawline();
48401
48396
  }
@@ -48408,7 +48403,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48408
48403
  key: "node2Json",
48409
48404
  value: function node2Json(range, isCopy) {
48410
48405
  var retObj = {
48411
- nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType */ .Jq[this.nodeType],
48406
+ nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_31__/* .NodeType */ .Jq[this.nodeType],
48412
48407
  text: this._formulaStr,
48413
48408
  styleIndex: this.styleIndex,
48414
48409
  hideZero: this._hideZero,
@@ -48430,7 +48425,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48430
48425
  var pNode = this.parentNode;
48431
48426
 
48432
48427
  while (pNode) {
48433
- if (pNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_33__/* .CellNode */ .D) {
48428
+ if (pNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_32__/* .CellNode */ .D) {
48434
48429
  return pNode;
48435
48430
  }
48436
48431
 
@@ -48561,7 +48556,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48561
48556
  //const strValue = cell.getCellText().replaceAll('\n', '').replaceAll(' ', '').replaceAll('\b', '').replaceAll('\r', '');
48562
48557
 
48563
48558
 
48564
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48559
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48565
48560
  var strValue = hoEditorFactory.unitConvert.replaceAll(cell.getCellText(), '\n', '');
48566
48561
  strValue = hoEditorFactory.unitConvert.replaceAll(strValue, ' ', '');
48567
48562
  strValue = hoEditorFactory.unitConvert.replaceAll(strValue, '\b', '');
@@ -48610,17 +48605,15 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48610
48605
 
48611
48606
  var arr = new Array();
48612
48607
  arr.length = 0;
48613
- var value = new Array();
48614
-
48615
- var insertToArr = function insertToArr(str) {
48616
- var bInserted = false;
48617
-
48618
- for (var i = 0, ilen = arr.length; i < ilen; i++) {
48619
- if (str.length > arr[i].length) continue;else arr.splice(i, 0, str);
48620
- }
48621
-
48622
- if (!bInserted) arr.push(str);
48623
- };
48608
+ var value = new Array(); //const insertToArr = (str: string) => {
48609
+ // let bInserted = false;
48610
+ // for (let i = 0, ilen = arr.length; i < ilen; i++) {
48611
+ // if (str.length > arr[i].length) continue
48612
+ // else arr.splice(i, 0, str);
48613
+ // }
48614
+ //if (!bInserted)
48615
+ //arr.push(str);
48616
+ //}
48624
48617
 
48625
48618
  var cellArddressRe = new RegExp(/[a-z]+\d+/, 'g');
48626
48619
  var strRets = strFormula.matchAll(cellArddressRe);
@@ -48629,7 +48622,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48629
48622
  var aRet = strRets.next();
48630
48623
 
48631
48624
  while (!aRet.done) {
48632
- insertToArr(aRet.value[0]);
48625
+ //insertToArr(aRet.value[0]);
48626
+ arr.push(aRet.value[0]);
48633
48627
  aRet = strRets.next();
48634
48628
  }
48635
48629
  }
@@ -48678,7 +48672,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48678
48672
  }
48679
48673
 
48680
48674
  if (totalOk) {
48681
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48675
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48682
48676
  var isRet = true;
48683
48677
 
48684
48678
  for (var m = 0; m < value.length; m++) {
@@ -48696,10 +48690,10 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48696
48690
  }
48697
48691
 
48698
48692
  for (var k = arr.length - 1; k >= 0; k--) {
48699
- strFormula = hoEditorFactory.unitConvert.replaceAll(strFormula, arr[k], value[k]); //strFormula.replaceAll(arr[k], value[k]);
48693
+ strFormula = hoEditorFactory.unitConvert.replaceAll(strFormula, arr[k], value[k] == "" ? "0" : value[k]); //strFormula.replaceAll(arr[k], value[k]);
48700
48694
  }
48701
48695
 
48702
- var result = (0,_editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_28__/* .expressionCalculator */ .C)(strFormula);
48696
+ var result = (0,_editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_27__/* .expressionCalculator */ .C)(strFormula);
48703
48697
  strRet = result.toString() == "NaN" ? " " : result.toString();
48704
48698
  }
48705
48699
 
@@ -48804,7 +48798,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48804
48798
  var eDateStr = eCell.getCellText();
48805
48799
 
48806
48800
  if (arrStr.length === 2) {
48807
- if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(sDateStr) && (0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(eDateStr)) {
48801
+ if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(sDateStr) && (0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(eDateStr)) {
48808
48802
  var sDate = new Date(sDateStr);
48809
48803
  var eDate = new Date(eDateStr);
48810
48804
  var sTime = sDate.getTime();
@@ -48971,7 +48965,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48971
48965
  if (cell) {
48972
48966
  var lastMenstryDate = cell.getCellText();
48973
48967
 
48974
- if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(lastMenstryDate)) {
48968
+ if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(lastMenstryDate)) {
48975
48969
  var date = new Date(lastMenstryDate); // const year = date.getFullYear();
48976
48970
  // const month = date.getMonth()+1;
48977
48971
  // const day = date.getDate();
@@ -49016,7 +49010,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49016
49010
  if (cell) {
49017
49011
  var lastMenstryDate = cell.getCellText();
49018
49012
 
49019
- if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(lastMenstryDate)) {
49013
+ if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(lastMenstryDate)) {
49020
49014
  var date = new Date(lastMenstryDate);
49021
49015
  var sTime = date.getTime();
49022
49016
  var eTime = Date.now();
@@ -49071,7 +49065,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49071
49065
  break;
49072
49066
  }
49073
49067
 
49074
- if (node instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_31__/* .BaseCombineNode */ .V) {
49068
+ if (node instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_30__/* .BaseCombineNode */ .V) {
49075
49069
  loopNodes(node.childNodes);
49076
49070
  }
49077
49071
  }
@@ -49162,7 +49156,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49162
49156
  }, {
49163
49157
  key: "delete",
49164
49158
  value: function _delete(operType) {
49165
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.formularNodes.delete(this._id);
49159
+ _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.formularNodes.delete(this._id);
49166
49160
 
49167
49161
  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)((0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(TableFormula.prototype), "delete", this).call(this, operType);
49168
49162
 
@@ -49210,13 +49204,13 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49210
49204
  formularType = json.text.indexOf(':') > 0 ? FormularType.ftSum : FormularType.ftFormular;
49211
49205
  }
49212
49206
 
49213
- var ret = new TableFormula(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType.ntTableFormula */ .Jq.ntTableFormula, json.text, styleIndex, hideZero, formularType, json.customProperty);
49207
+ var ret = new TableFormula(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_31__/* .NodeType.ntTableFormula */ .Jq.ntTableFormula, json.text, styleIndex, hideZero, formularType, json.customProperty);
49214
49208
  return ret;
49215
49209
  }
49216
49210
  }]);
49217
49211
 
49218
49212
  return TableFormula;
49219
- }(_ControlNode__WEBPACK_IMPORTED_MODULE_34__/* .ControlNode */ .w);
49213
+ }(_ControlNode__WEBPACK_IMPORTED_MODULE_33__/* .ControlNode */ .w);
49220
49214
 
49221
49215
  /***/ }),
49222
49216
 
@@ -58467,10 +58461,10 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
58467
58461
  commentTextShape.alpha = 1; //背景
58468
58462
 
58469
58463
  var backShape = new createjs.Shape();
58470
- backShape.graphics.setStrokeDash([4, 1], 0).setStrokeStyle(1).beginStroke("rgba(255, 0, 0, 1)").beginFill("#ffe5e5").drawRoundRect(0, 0, commentWidth - 20, comment.lineHeight, 5);
58464
+ backShape.graphics.setStrokeDash([4, 1], 0).setStrokeStyle(1).beginStroke("rgba(255, 0, 0, 1)").beginFill("#ffe5e5") //.drawRoundRect(0, 0, commentWidth - 20, comment.lineHeigh,5);
58465
+ .drawRect(0, 0, commentWidth - 20, comment.lineHeight);
58471
58466
  backShape.name = "back";
58472
- backShape.alpha = 0.5; //backShape.cache(0, 0, commentWidth - 20, comment.lineHeight, 5);
58473
- //横线
58467
+ backShape.alpha = 0.5; //横线
58474
58468
 
58475
58469
  var horizontalLine = new createjs.Shape();
58476
58470
  horizontalLine.graphics.setStrokeDash([4, 1], 0).setStrokeStyle(1).beginStroke("rgba(255, 0, 0, 1)").moveTo(nodeX, nodeY).lineTo(docWidth, nodeY);
@@ -65724,18 +65718,24 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
65724
65718
  /* harmony export */ "V": function() { return /* binding */ DrawSignNode; }
65725
65719
  /* harmony export */ });
65726
65720
  /* 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);
65727
- /* 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);
65721
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(16296);
65728
65722
  /* 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);
65729
65723
  /* 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);
65730
- /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(74916);
65731
- /* 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__);
65732
- /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(23123);
65733
- /* 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__);
65734
- /* harmony import */ var _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(69088);
65735
- /* harmony import */ var _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(78975);
65736
- /* harmony import */ var _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(93777);
65737
- /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(28831);
65738
- /* harmony import */ var _DrawCombineNode__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(46139);
65724
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(26699);
65725
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3__);
65726
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(32023);
65727
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4__);
65728
+ /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(74916);
65729
+ /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_5__);
65730
+ /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(23123);
65731
+ /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_6__);
65732
+ /* harmony import */ var _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(69088);
65733
+ /* harmony import */ var _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(78975);
65734
+ /* harmony import */ var _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(93777);
65735
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(28831);
65736
+ /* harmony import */ var _DrawCombineNode__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(46139);
65737
+
65738
+
65739
65739
 
65740
65740
 
65741
65741
 
@@ -65750,7 +65750,7 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
65750
65750
  /*
65751
65751
  * @Author: your name
65752
65752
  * @Date: 2021-09-01 16:51:49
65753
- * @LastEditTime: 2022-08-18 14:08:29
65753
+ * @LastEditTime: 2022-08-29 10:17:11
65754
65754
  * @LastEditors: liyanan 2441631434@qq.com
65755
65755
  * @Description: In User Settings Edit
65756
65756
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawSignNode.ts
@@ -65787,15 +65787,28 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65787
65787
  _this._connectChar = connectChar;
65788
65788
  _this._abi02 = customProperty && customProperty.abi02 ? customProperty.abi02 : ""; //this._textStyle = cbStyle.;
65789
65789
 
65790
- _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight; //this.dHeight = 40;
65790
+ _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight; //this.dHeight = 40;
65791
+
65792
+ _this._textStyle = cbStyle.getStyleKey(); // 处理混乱的类型
65791
65793
 
65792
- _this._textStyle = cbStyle.getStyleKey();
65794
+ if (node.customProperty && node.customProperty.created_date) {
65795
+ // 区分图片签名和普通文本签名 并更新对应的值
65796
+ if ((imgSrc.includes('data:image/') || imgSrc.split("/").length > 1) && type == 3) {
65797
+ node.type = 1;
65798
+ _this.type = 1;
65799
+ } else if (!imgSrc.includes('data:image/') && !imgSrc.includes("/") && type == 3) {
65800
+ node.type = 2;
65801
+ _this.type = 2;
65802
+ }
65803
+
65804
+ console.warn('医生签名');
65805
+ }
65793
65806
 
65794
- if (_this.number > 0 && type === 2) {
65807
+ if (_this.number > 0 && _this.type === 2) {
65795
65808
  var signArr = imgSrc.split('\n');
65796
65809
 
65797
65810
  if (signArr.length > 1) {
65798
- _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight * signArr.length; // const textStyle = new TextStyle(hoeditfactoryID);
65811
+ _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight * signArr.length; // const textStyle = new TextStyle(hoeditfactoryID);
65799
65812
  // let curHeight = cbStyle.getFontHeightByFontSize(cbStyle.size) * signArr.length;
65800
65813
  // if (curHeight > this.dHeight) {
65801
65814
  // let fontSize = cbStyle.size;
@@ -65817,7 +65830,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65817
65830
  var dText = new createjs.Text(_this.signName, _this._textStyle, '#000000');
65818
65831
  _this.dWidth = dText.getMeasuredWidth();
65819
65832
  } else {
65820
- if (type === 1) {
65833
+ if (_this.type === 1) {
65821
65834
  var scale = _this.dHeight / imgHeight;
65822
65835
 
65823
65836
  if (number === 1) {
@@ -65832,7 +65845,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65832
65845
  }
65833
65846
  }
65834
65847
 
65835
- if (type === 2) {
65848
+ if (_this.type === 2) {
65836
65849
  var _signArr = imgSrc.split('\n');
65837
65850
 
65838
65851
  var aText = new createjs.Text(_signArr[0], _this._textStyle, '#000000');
@@ -65862,18 +65875,23 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65862
65875
  }
65863
65876
  }
65864
65877
  }
65865
- }
65878
+ } // if ((((imgSrc || fingerPrintSrc) && this.type == 1) || this.type == 3) && node.customProperty && !node.customProperty.created_date) {
65879
+
65880
+
65881
+ if (fingerPrintSrc || imgSrc && !fingerPrintSrc && node.customProperty && !node.customProperty.created_date) {
65882
+ console.warn('患者签名');
65866
65883
 
65867
- if ((imgSrc || fingerPrintSrc) && type == 1 || type == 3) {
65868
65884
  _this.drawWriteSignNode(node);
65869
65885
  } else {
65886
+ console.warn('医生签名');
65887
+
65870
65888
  _this.drawSignNode();
65871
65889
  }
65872
65890
 
65873
65891
  return _this;
65874
65892
  }
65875
65893
 
65876
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)(DrawSignNode, [{
65894
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z)(DrawSignNode, [{
65877
65895
  key: "type",
65878
65896
  get: function get() {
65879
65897
  return this._type;
@@ -65970,7 +65988,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65970
65988
 
65971
65989
  this.clear();
65972
65990
  var drawNode = this;
65973
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
65991
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
65974
65992
 
65975
65993
  var drawSign = function drawSign() {
65976
65994
  if (_this2.type === 1 || _this2.type === 3) {
@@ -65978,7 +65996,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65978
65996
  node.type = 3;
65979
65997
 
65980
65998
  if (_this2.imgSrc == '' && _this2.fingerPrintSrc) {
65981
- var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
65999
+ var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
65982
66000
  var fingerWidth = 256;
65983
66001
  _this2._dWidth = fingerWidth * fingerscale;
65984
66002
  node.imgWidth = _this2._dWidth;
@@ -66049,7 +66067,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66049
66067
  var hitHeight = image.naturalHeight !== 0 ? image.naturalHeight : image.height;
66050
66068
  var scale = hoEditorFactory.signHeight / hitHeight < 0.4 ? 0.4 : hoEditorFactory.signHeight / hitHeight > 0.7 ? 1 : hoEditorFactory.signHeight / hitHeight;
66051
66069
 
66052
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center && hoEditorFactory.signHeight / hitHeight < 0.2) {
66070
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center && hoEditorFactory.signHeight / hitHeight < 0.2) {
66053
66071
  scale = hoEditorFactory.signHeight * 1.5 / hitHeight;
66054
66072
  } // 存在自定义签字图片高度时
66055
66073
 
@@ -66064,7 +66082,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66064
66082
  _fingerImage.onload = function () {
66065
66083
  var fingerWidth = _fingerImage.naturalWidth;
66066
66084
  var fingerHeight = _fingerImage.naturalHeight !== 0 ? _fingerImage.naturalHeight : _fingerImage.height;
66067
- var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15; // 指纹图片尺寸固定 宽:256 高:360 宽度不等于256表示已经缩放过 不需要再次缩放
66085
+ var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15; // 指纹图片尺寸固定 宽:256 高:360 宽度不等于256表示已经缩放过 不需要再次缩放
66068
66086
 
66069
66087
  if (fingerWidth !== 256) {
66070
66088
  fingerscale = 1;
@@ -66080,18 +66098,18 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66080
66098
  _fingerBitmap.y = -fingerHeight * fingerscale;
66081
66099
  bitmap.y = -hitHeight * scale;
66082
66100
 
66083
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.left */ .d.left) {
66101
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.left */ .d.left) {
66084
66102
  bitmap.x = fingerWidth * fingerscale + 5;
66085
66103
  _fingerBitmap.x = 0;
66086
66104
  _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
66087
66105
  node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
66088
66106
  _this2._dHeight = node.imgHeight;
66089
- } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center) {
66107
+ } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center) {
66090
66108
  _fingerBitmap.x = (hitWidth * scale - fingerWidth * fingerscale) / 2;
66091
66109
  _fingerBitmap.y = -(fingerHeight * fingerscale + currentLineHeight) / 2;
66092
66110
  bitmap.y = -(hitHeight * scale + currentLineHeight) / 2;
66093
66111
  node.imgHeight = hoEditorFactory.signHeight;
66094
- } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.right */ .d.right) {
66112
+ } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.right */ .d.right) {
66095
66113
  _fingerBitmap.x = hitWidth * scale + 5;
66096
66114
  _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
66097
66115
  node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
@@ -66100,7 +66118,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66100
66118
 
66101
66119
  node.imgWidth = _this2._dWidth;
66102
66120
 
66103
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center) {
66121
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center) {
66104
66122
  _this2._dWidth = 0;
66105
66123
  _this2._dHeight = 0;
66106
66124
  }
@@ -66134,10 +66152,10 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66134
66152
  if (dArea) {
66135
66153
  var atype = hoEditorFactory.subDocManger.getHeaderFooterType(drawNode.node.getNodePath());
66136
66154
 
66137
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66155
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66138
66156
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66139
66157
  } else {
66140
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66158
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66141
66159
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66142
66160
  }
66143
66161
  } // hoEditorFactory.drawPageTree.updateDrawPage(dArea.index);
@@ -66171,6 +66189,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66171
66189
  image.src = _this3.imgSrc;
66172
66190
  var bitmap = new createjs.Bitmap(image);
66173
66191
  bitmap.y = -_this3.dHeight;
66192
+ bitmap.setBounds(0, 0, drawNode.dWidth, drawNode.dHeight);
66174
66193
 
66175
66194
  if (_this3.number === 1) {
66176
66195
  bitmap.x = 0;
@@ -66196,7 +66215,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66196
66215
  _this3.addChildAt(bitmap, 0);
66197
66216
  }
66198
66217
 
66199
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
66218
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
66200
66219
  hoEditorFactory.loadImageCount++;
66201
66220
 
66202
66221
  image.onload = function () {
@@ -66214,7 +66233,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66214
66233
 
66215
66234
  var width = hitWidth * hoEditorFactory.signHeight / image.naturalHeight; //+ this._drawText.getMeasuredWidth();
66216
66235
 
66217
- if (node.parentNode instanceof _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_5__/* .CellNode */ .D) {
66236
+ if (node.parentNode instanceof _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_7__/* .CellNode */ .D) {
66218
66237
  var cellWidth = node.parentNode.drawCell.dWidth;
66219
66238
 
66220
66239
  if (width > cellWidth - 5) {
@@ -66261,10 +66280,10 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66261
66280
  if (dArea) {
66262
66281
  var atype = hoEditorFactory.subDocManger.getHeaderFooterType(_this3.node.getNodePath());
66263
66282
 
66264
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66283
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66265
66284
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66266
66285
  } else {
66267
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66286
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66268
66287
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66269
66288
  }
66270
66289
  }
@@ -66403,7 +66422,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66403
66422
  }]);
66404
66423
 
66405
66424
  return DrawSignNode;
66406
- }(_DrawCombineNode__WEBPACK_IMPORTED_MODULE_9__/* .DrawCombineNode */ .o);
66425
+ }(_DrawCombineNode__WEBPACK_IMPORTED_MODULE_11__/* .DrawCombineNode */ .o);
66407
66426
 
66408
66427
  /***/ }),
66409
66428
 
@@ -71461,9 +71480,14 @@ var DrawTree = /*#__PURE__*/function () {
71461
71480
  paragraphNode = this.clearDrawParagraphAfterDline(dline.paragraphNode, dline, inLineIndex, e.beforeChangePath);
71462
71481
  dendDrawLine = this.drawDocInsert(paragraphNode, lineIndex, // inLineIndex,
71463
71482
  node, startChildIndex + 1, e.afterChangePath);
71464
- var endIndex = alines.length - 1; // if (paragraphNode.parentNode === null) {
71483
+ var endIndex = alines.indexOf(dendDrawLine);
71484
+
71485
+ if (hoEditorFactory.isUseDrawingOptimization) {
71486
+ endIndex = alines.length - 1;
71487
+ } // if (paragraphNode.parentNode === null) {
71465
71488
  // const darea = this.getDrawA(dline);
71466
71489
 
71490
+
71467
71491
  if (e.repaintImmediate) {
71468
71492
  if (!dArea) {
71469
71493
  return false;
@@ -214323,9 +214347,9 @@ var es_string_match = __webpack_require__(4723);
214323
214347
  var es_number_constructor = __webpack_require__(9653);
214324
214348
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
214325
214349
  var es_json_stringify = __webpack_require__(38862);
214326
- ;// 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/HoDoc.vue?vue&type=template&id=700d6cbc&
214327
- var HoDocvue_type_template_id_700d6cbc_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.docClassNames},[_c('div',{ref:"editorArea",staticClass:"editors"},[(_vm.drawPageLength > 0)?_c('div',{staticClass:"editor",on:{"click":function($event){return _vm.setActiveDocIndex(_vm.hoEditorId)}}},[_vm._l((_vm.drawPageCount.count),function(pgIndex){return [_c('HoPage',{key:pgIndex - 1,attrs:{"data-id":pgIndex - 1,"index":pgIndex - 1,"docIndex":_vm.docIndex,"canvasWidth":_vm.canvasParams.width,"canvasHeight":_vm.canvasParams.height,"currentActivePages":_vm.activePageIndex.index,"hoEditorId":_vm.hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"mouseMoveNodes":_vm.mouseMoveNodes,"viewableAreaObserver":_vm.viewableAreaObserver,"inViewPages":_vm.inViewPages,"canvasHeadFootPos":_vm.canvasHeadFootPos,"poperTipPos":_vm.poperTipPos,"textStyle":_vm.textStyle,"aiInfo":_vm.aiInfo},on:{"pageReady":_vm.pageReady,"canvasRightClick":_vm.mouseRightClickEvent},scopedSlots:_vm._u([{key:"hoPageHead",fn:function(){return [_vm._t("hoDocHead")]},proxy:true},{key:"hoPageFoot",fn:function(){return [_vm._t("hoDocFoot")]},proxy:true}],null,true)})]})],2):_vm._e()]),(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper')?_c('PoperSelectModal',{attrs:{"poperType":_vm.poperType,"poperSelectList":_vm.poperSelectList,"poperPos":_vm.poperPos,"hoEditorId":_vm.hoEditorId},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('PoperMark',{directives:[{name:"show",rawName:"v-show",value:(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper' || _vm.poperType === 'table-cell-poper'),expression:"poperType === 'datePoper' || poperType === 'selectPoper' || poperType === 'table-cell-poper'"}]}),(_vm.poperType === 'table-cell-poper')?_c('TableCellPoper',{attrs:{"poperNode":_vm.nodeValue,"poperPos":_vm.poperPos},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('HoToPage',{attrs:{"hoEditorId":_vm.hoEditorId,"inViewPages":_vm.inViewPages}}),_c('PoperTipText',{attrs:{"isPoperText":_vm.isPoperText,"poperText":_vm.poperText,"poperPos":_vm.poperTextPos},on:{"poperTextClose":_vm.poperTextClose}}),_c('ul',{directives:[{name:"click-outside",rawName:"v-click-outside",value:(function () { return (_vm.isCreateRightMenuModal = false); }),expression:"() => (isCreateRightMenuModal = false)"},{name:"show",rawName:"v-show",value:(_vm.isCreateRightMenuModal),expression:"isCreateRightMenuModal"}],ref:"rightMenuModal",staticClass:"create-right-menu"},[(_vm.showCommentsBtn)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.hideComments}},[_vm._v(_vm._s(_vm.isHideComments ? '显示' : '隐藏')+"批注")]):_vm._e(),(_vm.showDeleteSignMenu)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.deleteSignNode}},[_vm._v("删除签名")]):_vm._e(),_c('li',{staticClass:"mouse-menu-item"},[_vm._v(" 编辑器内核版本:   "),_c('span',{staticStyle:{"font-size":"14px","color":"#0a77e3"}},[_vm._v("v "+_vm._s(_vm.version))])])])],1)}
214328
- var HoDocvue_type_template_id_700d6cbc_staticRenderFns = []
214350
+ ;// 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/HoDoc.vue?vue&type=template&id=5f466836&
214351
+ var HoDocvue_type_template_id_5f466836_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.docClassNames},[_c('div',{ref:"editorArea",staticClass:"editors"},[(_vm.drawPageLength > 0)?_c('div',{staticClass:"editor",on:{"click":function($event){return _vm.setActiveDocIndex(_vm.hoEditorId)}}},[_vm._l((_vm.drawPageCount.count),function(pgIndex){return [_c('HoPage',{key:pgIndex - 1,attrs:{"data-id":pgIndex - 1,"index":pgIndex - 1,"docIndex":_vm.docIndex,"canvasWidth":_vm.canvasParams.width,"canvasHeight":_vm.canvasParams.height,"currentActivePages":_vm.activePageIndex.index,"hoEditorId":_vm.hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"mouseMoveNodes":_vm.mouseMoveNodes,"viewableAreaObserver":_vm.viewableAreaObserver,"inViewPages":_vm.inViewPages,"canvasHeadFootPos":_vm.canvasHeadFootPos,"poperTipPos":_vm.poperTipPos,"textStyle":_vm.textStyle,"aiInfo":_vm.aiInfo},on:{"pageReady":_vm.pageReady,"canvasRightClick":_vm.mouseRightClickEvent},scopedSlots:_vm._u([{key:"hoPageHead",fn:function(){return [_vm._t("hoDocHead")]},proxy:true},{key:"hoPageFoot",fn:function(){return [_vm._t("hoDocFoot")]},proxy:true}],null,true)})]})],2):_vm._e()]),(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper')?_c('PoperSelectModal',{attrs:{"poperType":_vm.poperType,"poperSelectList":_vm.poperSelectList,"poperPos":_vm.poperPos,"hoEditorId":_vm.hoEditorId},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('PoperMark',{directives:[{name:"show",rawName:"v-show",value:(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper' || _vm.poperType === 'table-cell-poper'),expression:"poperType === 'datePoper' || poperType === 'selectPoper' || poperType === 'table-cell-poper'"}]}),(_vm.poperType === 'table-cell-poper')?_c('TableCellPoper',{attrs:{"poperNode":_vm.nodeValue,"poperPos":_vm.poperPos},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('HoToPage',{attrs:{"hoEditorId":_vm.hoEditorId,"inViewPages":_vm.inViewPages}}),_c('PoperTipText',{attrs:{"isPoperText":_vm.isPoperText,"poperText":_vm.poperText,"poperPos":_vm.poperTextPos},on:{"poperTextClose":_vm.poperTextClose}}),_c('ul',{directives:[{name:"click-outside",rawName:"v-click-outside",value:(function () { return (_vm.isCreateRightMenuModal = false); }),expression:"() => (isCreateRightMenuModal = false)"},{name:"show",rawName:"v-show",value:(_vm.isCreateRightMenuModal),expression:"isCreateRightMenuModal"}],ref:"rightMenuModal",staticClass:"create-right-menu"},[(_vm.showCommentsBtn)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.hideComments}},[_vm._v(_vm._s(_vm.isHideComments ? '显示' : '隐藏')+"批注")]):_vm._e(),(_vm.showDeleteSignMenu)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.deleteSignNode}},[_vm._v("删除签名")]):_vm._e(),_c('li',{staticClass:"mouse-menu-item"},[_vm._v(" 编辑器内核版本:   "),_c('span',{staticStyle:{"font-size":"14px","color":"#0a77e3"}},[_vm._v("v "+_vm._s(_vm.version))])])])],1)}
214352
+ var HoDocvue_type_template_id_5f466836_staticRenderFns = []
214329
214353
 
214330
214354
 
214331
214355
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
@@ -217966,7 +217990,7 @@ var SignNode = __webpack_require__(78975);
217966
217990
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
217967
217991
  var ParagraphNode = __webpack_require__(13880);
217968
217992
  ;// CONCATENATED MODULE: ./src/components/version.ts
217969
- /* harmony default export */ var version = ('2.0.92');
217993
+ /* harmony default export */ var version = ('2.0.95');
217970
217994
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
217971
217995
  var PoperTipText = __webpack_require__(97824);
217972
217996
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -218451,7 +218475,8 @@ var ImageNode = __webpack_require__(23778);
218451
218475
  };
218452
218476
 
218453
218477
  if (node instanceof SignNode/* SignNode */.N) {
218454
- if (node.attribute === 1) return false;
218478
+ // 通过自定义属性内部字段判断是否属于患者签名 指纹签名只有患者签名才会有 同时患者签名不存在自定义属性可以用是否存在某个属性确定是否是患者签名(需要确定的是imgsrc要存在 imgsrc不存在是指空签名元素)
218479
+ if (node.fingerPrintSrc || node.imgSrc && !node.fingerPrintSrc && node.customProperty && !node.customProperty.created_date) return false;
218455
218480
  this.$emit('dblNodeClick', {
218456
218481
  node: this.getCurrentSelectNode,
218457
218482
  type: 'sign'
@@ -218744,8 +218769,8 @@ var ImageNode = __webpack_require__(23778);
218744
218769
 
218745
218770
  var HoDoc_component = (0,componentNormalizer/* default */.Z)(
218746
218771
  components_HoDocvue_type_script_lang_js_,
218747
- HoDocvue_type_template_id_700d6cbc_render,
218748
- HoDocvue_type_template_id_700d6cbc_staticRenderFns,
218772
+ HoDocvue_type_template_id_5f466836_render,
218773
+ HoDocvue_type_template_id_5f466836_staticRenderFns,
218749
218774
  false,
218750
218775
  null,
218751
218776
  null,
@@ -219084,7 +219109,10 @@ var DrawPageTree = /*#__PURE__*/function () {
219084
219109
  return;
219085
219110
  }
219086
219111
 
219087
- this.clearAfterDTop(mainArea, dTop);
219112
+ if (hoEditorFactory.isUseDrawingOptimization) {
219113
+ this.clearAfterDTop(mainArea, dTop);
219114
+ }
219115
+
219088
219116
  var nextLine = startLine;
219089
219117
  var pageIsFull = new Map();
219090
219118
 
@@ -219140,7 +219168,7 @@ var DrawPageTree = /*#__PURE__*/function () {
219140
219168
  restHeight = drawArea.maxHeight - dTop;
219141
219169
  }
219142
219170
 
219143
- if (!isNew) {
219171
+ if (!isNew && hoEditorFactory.isUseDrawingOptimization) {
219144
219172
  break;
219145
219173
  }
219146
219174
  }
@@ -219660,7 +219688,6 @@ var DrawPageTree = /*#__PURE__*/function () {
219660
219688
  }
219661
219689
  }
219662
219690
 
219663
- this.clearAfterDTop(drawArea, dTop);
219664
219691
  drawArea.update(prevArea, dRoots, startIndex, dTop, restHeight);
219665
219692
  this.afterAreaFinishPaint(drawArea);
219666
219693
  this._startNeedUpdatePage = Math.min(drawArea.index, this._startNeedUpdatePage === -1 ? 99999 : this._startNeedUpdatePage);
@@ -230769,7 +230796,7 @@ var VueController = /*#__PURE__*/function () {
230769
230796
  var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction.daInsert */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType.insertSign */.y.insertSign);
230770
230797
 
230771
230798
  if (hoEditorFactory.docTree.changing(changingEvent)) {
230772
- Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 1, '患者签名', node.signor, node.signTime, node.signTimeFormat, imgSrc, node.imgWidth, node.imgHeight, node.customProperty, fingerPrintSrc, fingerPosition)]).then(function () {
230799
+ Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 1, '患者签名', node.signor, node.signTime, node.signTimeFormat, imgSrc, node.imgWidth, node.imgHeight, {}, fingerPrintSrc, fingerPosition)]).then(function () {
230773
230800
  setTimeout(function () {
230774
230801
  callback && callback();
230775
230802
  }, 0);
@@ -233380,13 +233407,14 @@ var jspdf = __webpack_require__(7147);
233380
233407
 
233381
233408
 
233382
233409
 
233410
+
233383
233411
 
233384
233412
 
233385
233413
  /*
233386
233414
  * @Author: your name
233387
233415
  * @Date: 2021-07-31 09:25:57
233388
- * @LastEditTime: 2021-07-31 13:59:29
233389
- * @LastEditors: Please set LastEditors
233416
+ * @LastEditTime: 2022-08-26 13:53:54
233417
+ * @LastEditors: liyanan 2441631434@qq.com
233390
233418
  * @Description: In User Settings Edit
233391
233419
  * @FilePath: \hoeditor-web\src\editor\externalCall\PrintController.ts
233392
233420
  */
@@ -233695,10 +233723,21 @@ var PrintController = /*#__PURE__*/function () {
233695
233723
  });
233696
233724
 
233697
233725
  return;
233698
- }
233726
+ } // if (hoEditorFactory.isHideComments) {
233727
+ // hoEditorFactory.vueController.hideComments(true);
233728
+ // }
233699
233729
 
233700
- if (!hoEditorFactory.isHideComments) {
233701
- hoEditorFactory.vueController.hideComments(true);
233730
+
233731
+ var drawMainDocs = hoEditorFactory.drawPageTree.drawMainDocs;
233732
+
233733
+ for (var k = 0; k < drawMainDocs.length; k++) {
233734
+ for (var s = drawMainDocs[k].children.length - 1; s >= 0; s--) {
233735
+ var child = drawMainDocs[k].children[s];
233736
+
233737
+ if (child.name && child.name.substring(0, 1) === "C" && child.name.length > 15) {
233738
+ drawMainDocs[k].removeChildAt(s);
233739
+ }
233740
+ }
233702
233741
  }
233703
233742
 
233704
233743
  if (printMode && printAppoint) {
@@ -235146,7 +235185,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
235146
235185
 
235147
235186
  this._isCanUseTableProperty = false; //非设计模式下是否可以使用表格、单元格、行、列属性设置
235148
235187
 
235149
- this._isUseDrawingOptimization = true; // 是否启用绘制优化 默认启用
235188
+ this._isUseDrawingOptimization = false; // 是否启用绘制优化 默认启用
235150
235189
 
235151
235190
  this._loadImageCount = 0; // 待加载的图片数量
235152
235191