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.
@@ -28157,13 +28157,13 @@ var DocController = /*#__PURE__*/function () {
28157
28157
  if (node.keyValue !== "") {
28158
28158
  node.childNodes.splice(1, node.childNodes.length - 2);
28159
28159
  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);
28160
- node.childNodes.splice(1, 0, textNode); //changeEvent.afterChangePath = hoEditorFactory.docTree.getNodeLastPath(textNode);
28160
+ node.childNodes.splice(1, 0, textNode);
28161
+ changeEvent.afterChangePath = hoEditorFactory.docTree.getNodeLastPath(textNode);
28161
28162
  } else {
28162
28163
  node.childNodes.splice(1, node.childNodes.length - 2);
28163
28164
  node.childNodes.splice(1, 0, node.childNodes2[1]);
28165
+ changeEvent.afterChangePath = ePath;
28164
28166
  }
28165
-
28166
- changeEvent.afterChangePath = ePath;
28167
28167
  } else {
28168
28168
  //changeEvent.afterChangePath = hoEditorFactory.docTree.getNodeLastPath(node);
28169
28169
  changeEvent.afterChangePath = ePath;
@@ -47440,15 +47440,13 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
47440
47440
  _this._signTime = signTime;
47441
47441
  _this._imgSrc = imgSrc;
47442
47442
  _this._attribute = attribute === undefined ? 0 : attribute;
47443
- _this._connectChar = connectChar === undefined ? ":" : connectChar;
47444
-
47445
- if (type == 3) {
47446
- // 兼容旧的患者签名
47447
- _this._attribute = 1;
47448
- } // if(attribute == 1) { // 患者签名修改 type == 3
47443
+ _this._connectChar = connectChar === undefined ? ":" : connectChar; // if (fingerPrintSrc || (imgSrc && !fingerPrintSrc && customProperty && !customProperty.created_date)) { // 用自定义属性区分并兼容旧的患者签名
47444
+ // this._attribute = 1;
47445
+ // this._type = 3;
47446
+ // }
47447
+ // if(attribute == 1) { // 患者签名修改 type == 3
47449
47448
  // this._type = 3;
47450
47449
  // }
47451
-
47452
47450
 
47453
47451
  if (fingerPrintSrc) {
47454
47452
  _this._fingerPrintSrc = fingerPrintSrc;
@@ -48090,7 +48088,7 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
48090
48088
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(37174);
48091
48089
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(58913);
48092
48090
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(35671);
48093
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(22342);
48091
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(22342);
48094
48092
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(61670);
48095
48093
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(24084);
48096
48094
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(99640);
@@ -48121,27 +48119,24 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
48121
48119
  /* 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__);
48122
48120
  /* harmony import */ var core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(88386);
48123
48121
  /* 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__);
48124
- /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(40561);
48125
- /* 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__);
48126
- /* harmony import */ var core_js_modules_es_string_match_all_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(76373);
48127
- /* 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__);
48128
- /* harmony import */ var core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(56977);
48129
- /* 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__);
48130
- /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(26699);
48131
- /* 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__);
48132
- /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(32023);
48133
- /* 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__);
48134
- /* harmony import */ var core_js_modules_es_string_trim_js__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(73210);
48135
- /* 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__);
48136
- /* harmony import */ var _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(46675);
48137
- /* harmony import */ var _editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(28284);
48138
- /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(41005);
48139
- /* harmony import */ var _plugins_util__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(33913);
48140
- /* harmony import */ var _BaseCombineNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(8);
48141
- /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(50369);
48142
- /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(15798);
48143
- /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(8395);
48144
-
48122
+ /* harmony import */ var core_js_modules_es_string_match_all_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(76373);
48123
+ /* 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__);
48124
+ /* harmony import */ var core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(56977);
48125
+ /* 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__);
48126
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(26699);
48127
+ /* 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__);
48128
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(32023);
48129
+ /* 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__);
48130
+ /* harmony import */ var core_js_modules_es_string_trim_js__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(73210);
48131
+ /* 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__);
48132
+ /* harmony import */ var _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(46675);
48133
+ /* harmony import */ var _editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(28284);
48134
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(41005);
48135
+ /* harmony import */ var _plugins_util__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(33913);
48136
+ /* harmony import */ var _BaseCombineNode__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(8);
48137
+ /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(50369);
48138
+ /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(15798);
48139
+ /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(8395);
48145
48140
 
48146
48141
 
48147
48142
 
@@ -48215,7 +48210,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48215
48210
  _this._formulaStr = "";
48216
48211
  _this._hideZero = true; //计算结果为0时是否隐藏
48217
48212
 
48218
- _this._id = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("TFS");
48213
+ _this._id = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("TFS");
48219
48214
  _this._styleIndex = styleIndex;
48220
48215
  _this.isAllowDelete = true;
48221
48216
  _this._cellRange = new Array();
@@ -48238,7 +48233,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48238
48233
  return _this;
48239
48234
  }
48240
48235
 
48241
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_35__/* ["default"] */ .Z)(TableFormula, [{
48236
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_34__/* ["default"] */ .Z)(TableFormula, [{
48242
48237
  key: "setCustomProperty",
48243
48238
  value: function setCustomProperty(customProperty) {
48244
48239
  var assignvalue = function assignvalue(target, source) {
@@ -48334,7 +48329,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48334
48329
  }, {
48335
48330
  key: "refreshDrawStyle",
48336
48331
  value: function refreshDrawStyle() {
48337
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48332
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48338
48333
  var textStyle = hoEditorFactory.docTree.styles[this._styleIndex];
48339
48334
  var cbStyle;
48340
48335
 
@@ -48355,7 +48350,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48355
48350
  value: function node2DrawNodeRange(startIndex, endIndex) {
48356
48351
  this.refreshDrawStyle(); //const text = this._hideZero && (this._text == "0" || this._text === "0.00") ? " " : this._text;
48357
48352
 
48358
- var dNode = new _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_27__/* .DrawTableFormular */ .A(this._rootPath, this, this._text);
48353
+ var dNode = new _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_26__/* .DrawTableFormular */ .A(this._rootPath, this, this._text);
48359
48354
 
48360
48355
  this._drawNodes.push(dNode);
48361
48356
  }
@@ -48385,7 +48380,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48385
48380
 
48386
48381
  dline.addChild(this._drawNodes[0]);
48387
48382
  dline.drawItems.push(this._drawNodes[0]);
48388
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.formularNodes.set(this.id, this);
48383
+ _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.formularNodes.set(this.id, this);
48389
48384
  dline.fitLines();
48390
48385
  return dline.paragraphNode.getLastDrawline();
48391
48386
  }
@@ -48398,7 +48393,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48398
48393
  key: "node2Json",
48399
48394
  value: function node2Json(range, isCopy) {
48400
48395
  var retObj = {
48401
- nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType */ .Jq[this.nodeType],
48396
+ nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_31__/* .NodeType */ .Jq[this.nodeType],
48402
48397
  text: this._formulaStr,
48403
48398
  styleIndex: this.styleIndex,
48404
48399
  hideZero: this._hideZero,
@@ -48420,7 +48415,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48420
48415
  var pNode = this.parentNode;
48421
48416
 
48422
48417
  while (pNode) {
48423
- if (pNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_33__/* .CellNode */ .D) {
48418
+ if (pNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_32__/* .CellNode */ .D) {
48424
48419
  return pNode;
48425
48420
  }
48426
48421
 
@@ -48551,7 +48546,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48551
48546
  //const strValue = cell.getCellText().replaceAll('\n', '').replaceAll(' ', '').replaceAll('\b', '').replaceAll('\r', '');
48552
48547
 
48553
48548
 
48554
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48549
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48555
48550
  var strValue = hoEditorFactory.unitConvert.replaceAll(cell.getCellText(), '\n', '');
48556
48551
  strValue = hoEditorFactory.unitConvert.replaceAll(strValue, ' ', '');
48557
48552
  strValue = hoEditorFactory.unitConvert.replaceAll(strValue, '\b', '');
@@ -48600,17 +48595,15 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48600
48595
 
48601
48596
  var arr = new Array();
48602
48597
  arr.length = 0;
48603
- var value = new Array();
48604
-
48605
- var insertToArr = function insertToArr(str) {
48606
- var bInserted = false;
48607
-
48608
- for (var i = 0, ilen = arr.length; i < ilen; i++) {
48609
- if (str.length > arr[i].length) continue;else arr.splice(i, 0, str);
48610
- }
48611
-
48612
- if (!bInserted) arr.push(str);
48613
- };
48598
+ var value = new Array(); //const insertToArr = (str: string) => {
48599
+ // let bInserted = false;
48600
+ // for (let i = 0, ilen = arr.length; i < ilen; i++) {
48601
+ // if (str.length > arr[i].length) continue
48602
+ // else arr.splice(i, 0, str);
48603
+ // }
48604
+ //if (!bInserted)
48605
+ //arr.push(str);
48606
+ //}
48614
48607
 
48615
48608
  var cellArddressRe = new RegExp(/[a-z]+\d+/, 'g');
48616
48609
  var strRets = strFormula.matchAll(cellArddressRe);
@@ -48619,7 +48612,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48619
48612
  var aRet = strRets.next();
48620
48613
 
48621
48614
  while (!aRet.done) {
48622
- insertToArr(aRet.value[0]);
48615
+ //insertToArr(aRet.value[0]);
48616
+ arr.push(aRet.value[0]);
48623
48617
  aRet = strRets.next();
48624
48618
  }
48625
48619
  }
@@ -48668,7 +48662,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48668
48662
  }
48669
48663
 
48670
48664
  if (totalOk) {
48671
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48665
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48672
48666
  var isRet = true;
48673
48667
 
48674
48668
  for (var m = 0; m < value.length; m++) {
@@ -48686,10 +48680,10 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48686
48680
  }
48687
48681
 
48688
48682
  for (var k = arr.length - 1; k >= 0; k--) {
48689
- strFormula = hoEditorFactory.unitConvert.replaceAll(strFormula, arr[k], value[k]); //strFormula.replaceAll(arr[k], value[k]);
48683
+ strFormula = hoEditorFactory.unitConvert.replaceAll(strFormula, arr[k], value[k] == "" ? "0" : value[k]); //strFormula.replaceAll(arr[k], value[k]);
48690
48684
  }
48691
48685
 
48692
- var result = (0,_editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_28__/* .expressionCalculator */ .C)(strFormula);
48686
+ var result = (0,_editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_27__/* .expressionCalculator */ .C)(strFormula);
48693
48687
  strRet = result.toString() == "NaN" ? " " : result.toString();
48694
48688
  }
48695
48689
 
@@ -48794,7 +48788,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48794
48788
  var eDateStr = eCell.getCellText();
48795
48789
 
48796
48790
  if (arrStr.length === 2) {
48797
- if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(sDateStr) && (0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(eDateStr)) {
48791
+ if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(sDateStr) && (0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(eDateStr)) {
48798
48792
  var sDate = new Date(sDateStr);
48799
48793
  var eDate = new Date(eDateStr);
48800
48794
  var sTime = sDate.getTime();
@@ -48961,7 +48955,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48961
48955
  if (cell) {
48962
48956
  var lastMenstryDate = cell.getCellText();
48963
48957
 
48964
- if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(lastMenstryDate)) {
48958
+ if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(lastMenstryDate)) {
48965
48959
  var date = new Date(lastMenstryDate); // const year = date.getFullYear();
48966
48960
  // const month = date.getMonth()+1;
48967
48961
  // const day = date.getDate();
@@ -49006,7 +49000,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49006
49000
  if (cell) {
49007
49001
  var lastMenstryDate = cell.getCellText();
49008
49002
 
49009
- if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(lastMenstryDate)) {
49003
+ if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(lastMenstryDate)) {
49010
49004
  var date = new Date(lastMenstryDate);
49011
49005
  var sTime = date.getTime();
49012
49006
  var eTime = Date.now();
@@ -49061,7 +49055,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49061
49055
  break;
49062
49056
  }
49063
49057
 
49064
- if (node instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_31__/* .BaseCombineNode */ .V) {
49058
+ if (node instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_30__/* .BaseCombineNode */ .V) {
49065
49059
  loopNodes(node.childNodes);
49066
49060
  }
49067
49061
  }
@@ -49152,7 +49146,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49152
49146
  }, {
49153
49147
  key: "delete",
49154
49148
  value: function _delete(operType) {
49155
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.formularNodes.delete(this._id);
49149
+ _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.formularNodes.delete(this._id);
49156
49150
 
49157
49151
  (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);
49158
49152
 
@@ -49200,13 +49194,13 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49200
49194
  formularType = json.text.indexOf(':') > 0 ? FormularType.ftSum : FormularType.ftFormular;
49201
49195
  }
49202
49196
 
49203
- 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);
49197
+ 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);
49204
49198
  return ret;
49205
49199
  }
49206
49200
  }]);
49207
49201
 
49208
49202
  return TableFormula;
49209
- }(_ControlNode__WEBPACK_IMPORTED_MODULE_34__/* .ControlNode */ .w);
49203
+ }(_ControlNode__WEBPACK_IMPORTED_MODULE_33__/* .ControlNode */ .w);
49210
49204
 
49211
49205
  /***/ }),
49212
49206
 
@@ -58457,10 +58451,10 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
58457
58451
  commentTextShape.alpha = 1; //背景
58458
58452
 
58459
58453
  var backShape = new createjs.Shape();
58460
- backShape.graphics.setStrokeDash([4, 1], 0).setStrokeStyle(1).beginStroke("rgba(255, 0, 0, 1)").beginFill("#ffe5e5").drawRoundRect(0, 0, commentWidth - 20, comment.lineHeight, 5);
58454
+ backShape.graphics.setStrokeDash([4, 1], 0).setStrokeStyle(1).beginStroke("rgba(255, 0, 0, 1)").beginFill("#ffe5e5") //.drawRoundRect(0, 0, commentWidth - 20, comment.lineHeigh,5);
58455
+ .drawRect(0, 0, commentWidth - 20, comment.lineHeight);
58461
58456
  backShape.name = "back";
58462
- backShape.alpha = 0.5; //backShape.cache(0, 0, commentWidth - 20, comment.lineHeight, 5);
58463
- //横线
58457
+ backShape.alpha = 0.5; //横线
58464
58458
 
58465
58459
  var horizontalLine = new createjs.Shape();
58466
58460
  horizontalLine.graphics.setStrokeDash([4, 1], 0).setStrokeStyle(1).beginStroke("rgba(255, 0, 0, 1)").moveTo(nodeX, nodeY).lineTo(docWidth, nodeY);
@@ -65714,18 +65708,24 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
65714
65708
  /* harmony export */ "V": function() { return /* binding */ DrawSignNode; }
65715
65709
  /* harmony export */ });
65716
65710
  /* 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);
65717
- /* 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);
65711
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(22342);
65718
65712
  /* 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);
65719
65713
  /* 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);
65720
- /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(74916);
65721
- /* 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__);
65722
- /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(23123);
65723
- /* 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__);
65724
- /* harmony import */ var _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(15798);
65725
- /* harmony import */ var _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(34450);
65726
- /* harmony import */ var _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(24113);
65727
- /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(41005);
65728
- /* harmony import */ var _DrawCombineNode__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(72392);
65714
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(26699);
65715
+ /* 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__);
65716
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(32023);
65717
+ /* 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__);
65718
+ /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(74916);
65719
+ /* 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__);
65720
+ /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(23123);
65721
+ /* 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__);
65722
+ /* harmony import */ var _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(15798);
65723
+ /* harmony import */ var _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(34450);
65724
+ /* harmony import */ var _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(24113);
65725
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(41005);
65726
+ /* harmony import */ var _DrawCombineNode__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(72392);
65727
+
65728
+
65729
65729
 
65730
65730
 
65731
65731
 
@@ -65740,7 +65740,7 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
65740
65740
  /*
65741
65741
  * @Author: your name
65742
65742
  * @Date: 2021-09-01 16:51:49
65743
- * @LastEditTime: 2022-08-18 14:08:29
65743
+ * @LastEditTime: 2022-08-29 10:17:11
65744
65744
  * @LastEditors: liyanan 2441631434@qq.com
65745
65745
  * @Description: In User Settings Edit
65746
65746
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawSignNode.ts
@@ -65777,15 +65777,28 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65777
65777
  _this._connectChar = connectChar;
65778
65778
  _this._abi02 = customProperty && customProperty.abi02 ? customProperty.abi02 : ""; //this._textStyle = cbStyle.;
65779
65779
 
65780
- _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight; //this.dHeight = 40;
65780
+ _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight; //this.dHeight = 40;
65781
+
65782
+ _this._textStyle = cbStyle.getStyleKey(); // 处理混乱的类型
65781
65783
 
65782
- _this._textStyle = cbStyle.getStyleKey();
65784
+ if (node.customProperty && node.customProperty.created_date) {
65785
+ // 区分图片签名和普通文本签名 并更新对应的值
65786
+ if ((imgSrc.includes('data:image/') || imgSrc.split("/").length > 1) && type == 3) {
65787
+ node.type = 1;
65788
+ _this.type = 1;
65789
+ } else if (!imgSrc.includes('data:image/') && !imgSrc.includes("/") && type == 3) {
65790
+ node.type = 2;
65791
+ _this.type = 2;
65792
+ }
65793
+
65794
+ console.warn('医生签名');
65795
+ }
65783
65796
 
65784
- if (_this.number > 0 && type === 2) {
65797
+ if (_this.number > 0 && _this.type === 2) {
65785
65798
  var signArr = imgSrc.split('\n');
65786
65799
 
65787
65800
  if (signArr.length > 1) {
65788
- _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight * signArr.length; // const textStyle = new TextStyle(hoeditfactoryID);
65801
+ _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight * signArr.length; // const textStyle = new TextStyle(hoeditfactoryID);
65789
65802
  // let curHeight = cbStyle.getFontHeightByFontSize(cbStyle.size) * signArr.length;
65790
65803
  // if (curHeight > this.dHeight) {
65791
65804
  // let fontSize = cbStyle.size;
@@ -65807,7 +65820,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65807
65820
  var dText = new createjs.Text(_this.signName, _this._textStyle, '#000000');
65808
65821
  _this.dWidth = dText.getMeasuredWidth();
65809
65822
  } else {
65810
- if (type === 1) {
65823
+ if (_this.type === 1) {
65811
65824
  var scale = _this.dHeight / imgHeight;
65812
65825
 
65813
65826
  if (number === 1) {
@@ -65822,7 +65835,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65822
65835
  }
65823
65836
  }
65824
65837
 
65825
- if (type === 2) {
65838
+ if (_this.type === 2) {
65826
65839
  var _signArr = imgSrc.split('\n');
65827
65840
 
65828
65841
  var aText = new createjs.Text(_signArr[0], _this._textStyle, '#000000');
@@ -65852,18 +65865,23 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65852
65865
  }
65853
65866
  }
65854
65867
  }
65855
- }
65868
+ } // if ((((imgSrc || fingerPrintSrc) && this.type == 1) || this.type == 3) && node.customProperty && !node.customProperty.created_date) {
65869
+
65870
+
65871
+ if (fingerPrintSrc || imgSrc && !fingerPrintSrc && node.customProperty && !node.customProperty.created_date) {
65872
+ console.warn('患者签名');
65856
65873
 
65857
- if ((imgSrc || fingerPrintSrc) && type == 1 || type == 3) {
65858
65874
  _this.drawWriteSignNode(node);
65859
65875
  } else {
65876
+ console.warn('医生签名');
65877
+
65860
65878
  _this.drawSignNode();
65861
65879
  }
65862
65880
 
65863
65881
  return _this;
65864
65882
  }
65865
65883
 
65866
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)(DrawSignNode, [{
65884
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z)(DrawSignNode, [{
65867
65885
  key: "type",
65868
65886
  get: function get() {
65869
65887
  return this._type;
@@ -65960,7 +65978,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65960
65978
 
65961
65979
  this.clear();
65962
65980
  var drawNode = this;
65963
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
65981
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
65964
65982
 
65965
65983
  var drawSign = function drawSign() {
65966
65984
  if (_this2.type === 1 || _this2.type === 3) {
@@ -65968,7 +65986,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65968
65986
  node.type = 3;
65969
65987
 
65970
65988
  if (_this2.imgSrc == '' && _this2.fingerPrintSrc) {
65971
- var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
65989
+ var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
65972
65990
  var fingerWidth = 256;
65973
65991
  _this2._dWidth = fingerWidth * fingerscale;
65974
65992
  node.imgWidth = _this2._dWidth;
@@ -66039,7 +66057,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66039
66057
  var hitHeight = image.naturalHeight !== 0 ? image.naturalHeight : image.height;
66040
66058
  var scale = hoEditorFactory.signHeight / hitHeight < 0.4 ? 0.4 : hoEditorFactory.signHeight / hitHeight > 0.7 ? 1 : hoEditorFactory.signHeight / hitHeight;
66041
66059
 
66042
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center && hoEditorFactory.signHeight / hitHeight < 0.2) {
66060
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center && hoEditorFactory.signHeight / hitHeight < 0.2) {
66043
66061
  scale = hoEditorFactory.signHeight * 1.5 / hitHeight;
66044
66062
  } // 存在自定义签字图片高度时
66045
66063
 
@@ -66054,7 +66072,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66054
66072
  _fingerImage.onload = function () {
66055
66073
  var fingerWidth = _fingerImage.naturalWidth;
66056
66074
  var fingerHeight = _fingerImage.naturalHeight !== 0 ? _fingerImage.naturalHeight : _fingerImage.height;
66057
- var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15; // 指纹图片尺寸固定 宽:256 高:360 宽度不等于256表示已经缩放过 不需要再次缩放
66075
+ var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15; // 指纹图片尺寸固定 宽:256 高:360 宽度不等于256表示已经缩放过 不需要再次缩放
66058
66076
 
66059
66077
  if (fingerWidth !== 256) {
66060
66078
  fingerscale = 1;
@@ -66070,18 +66088,18 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66070
66088
  _fingerBitmap.y = -fingerHeight * fingerscale;
66071
66089
  bitmap.y = -hitHeight * scale;
66072
66090
 
66073
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.left */ .d.left) {
66091
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.left */ .d.left) {
66074
66092
  bitmap.x = fingerWidth * fingerscale + 5;
66075
66093
  _fingerBitmap.x = 0;
66076
66094
  _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
66077
66095
  node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
66078
66096
  _this2._dHeight = node.imgHeight;
66079
- } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center) {
66097
+ } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center) {
66080
66098
  _fingerBitmap.x = (hitWidth * scale - fingerWidth * fingerscale) / 2;
66081
66099
  _fingerBitmap.y = -(fingerHeight * fingerscale + currentLineHeight) / 2;
66082
66100
  bitmap.y = -(hitHeight * scale + currentLineHeight) / 2;
66083
66101
  node.imgHeight = hoEditorFactory.signHeight;
66084
- } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.right */ .d.right) {
66102
+ } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.right */ .d.right) {
66085
66103
  _fingerBitmap.x = hitWidth * scale + 5;
66086
66104
  _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
66087
66105
  node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
@@ -66090,7 +66108,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66090
66108
 
66091
66109
  node.imgWidth = _this2._dWidth;
66092
66110
 
66093
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center) {
66111
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center) {
66094
66112
  _this2._dWidth = 0;
66095
66113
  _this2._dHeight = 0;
66096
66114
  }
@@ -66124,10 +66142,10 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66124
66142
  if (dArea) {
66125
66143
  var atype = hoEditorFactory.subDocManger.getHeaderFooterType(drawNode.node.getNodePath());
66126
66144
 
66127
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66145
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66128
66146
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66129
66147
  } else {
66130
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66148
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66131
66149
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66132
66150
  }
66133
66151
  } // hoEditorFactory.drawPageTree.updateDrawPage(dArea.index);
@@ -66161,6 +66179,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66161
66179
  image.src = _this3.imgSrc;
66162
66180
  var bitmap = new createjs.Bitmap(image);
66163
66181
  bitmap.y = -_this3.dHeight;
66182
+ bitmap.setBounds(0, 0, drawNode.dWidth, drawNode.dHeight);
66164
66183
 
66165
66184
  if (_this3.number === 1) {
66166
66185
  bitmap.x = 0;
@@ -66186,7 +66205,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66186
66205
  _this3.addChildAt(bitmap, 0);
66187
66206
  }
66188
66207
 
66189
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
66208
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
66190
66209
  hoEditorFactory.loadImageCount++;
66191
66210
 
66192
66211
  image.onload = function () {
@@ -66204,7 +66223,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66204
66223
 
66205
66224
  var width = hitWidth * hoEditorFactory.signHeight / image.naturalHeight; //+ this._drawText.getMeasuredWidth();
66206
66225
 
66207
- if (node.parentNode instanceof _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_5__/* .CellNode */ .D) {
66226
+ if (node.parentNode instanceof _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_7__/* .CellNode */ .D) {
66208
66227
  var cellWidth = node.parentNode.drawCell.dWidth;
66209
66228
 
66210
66229
  if (width > cellWidth - 5) {
@@ -66251,10 +66270,10 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66251
66270
  if (dArea) {
66252
66271
  var atype = hoEditorFactory.subDocManger.getHeaderFooterType(_this3.node.getNodePath());
66253
66272
 
66254
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66273
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66255
66274
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66256
66275
  } else {
66257
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66276
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66258
66277
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66259
66278
  }
66260
66279
  }
@@ -66393,7 +66412,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66393
66412
  }]);
66394
66413
 
66395
66414
  return DrawSignNode;
66396
- }(_DrawCombineNode__WEBPACK_IMPORTED_MODULE_9__/* .DrawCombineNode */ .o);
66415
+ }(_DrawCombineNode__WEBPACK_IMPORTED_MODULE_11__/* .DrawCombineNode */ .o);
66397
66416
 
66398
66417
  /***/ }),
66399
66418
 
@@ -71451,9 +71470,14 @@ var DrawTree = /*#__PURE__*/function () {
71451
71470
  paragraphNode = this.clearDrawParagraphAfterDline(dline.paragraphNode, dline, inLineIndex, e.beforeChangePath);
71452
71471
  dendDrawLine = this.drawDocInsert(paragraphNode, lineIndex, // inLineIndex,
71453
71472
  node, startChildIndex + 1, e.afterChangePath);
71454
- var endIndex = alines.length - 1; // if (paragraphNode.parentNode === null) {
71473
+ var endIndex = alines.indexOf(dendDrawLine);
71474
+
71475
+ if (hoEditorFactory.isUseDrawingOptimization) {
71476
+ endIndex = alines.length - 1;
71477
+ } // if (paragraphNode.parentNode === null) {
71455
71478
  // const darea = this.getDrawA(dline);
71456
71479
 
71480
+
71457
71481
  if (e.repaintImmediate) {
71458
71482
  if (!dArea) {
71459
71483
  return false;
@@ -214313,9 +214337,9 @@ var es_string_match = __webpack_require__(4723);
214313
214337
  var es_number_constructor = __webpack_require__(9653);
214314
214338
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
214315
214339
  var es_json_stringify = __webpack_require__(38862);
214316
- ;// 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&
214317
- 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)}
214318
- var HoDocvue_type_template_id_700d6cbc_staticRenderFns = []
214340
+ ;// 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&
214341
+ 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)}
214342
+ var HoDocvue_type_template_id_5f466836_staticRenderFns = []
214319
214343
 
214320
214344
 
214321
214345
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
@@ -217956,7 +217980,7 @@ var SignNode = __webpack_require__(34450);
217956
217980
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
217957
217981
  var ParagraphNode = __webpack_require__(14208);
217958
217982
  ;// CONCATENATED MODULE: ./src/components/version.ts
217959
- /* harmony default export */ var version = ('2.0.92');
217983
+ /* harmony default export */ var version = ('2.0.95');
217960
217984
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
217961
217985
  var PoperTipText = __webpack_require__(91831);
217962
217986
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -218441,7 +218465,8 @@ var ImageNode = __webpack_require__(88389);
218441
218465
  };
218442
218466
 
218443
218467
  if (node instanceof SignNode/* SignNode */.N) {
218444
- if (node.attribute === 1) return false;
218468
+ // 通过自定义属性内部字段判断是否属于患者签名 指纹签名只有患者签名才会有 同时患者签名不存在自定义属性可以用是否存在某个属性确定是否是患者签名(需要确定的是imgsrc要存在 imgsrc不存在是指空签名元素)
218469
+ if (node.fingerPrintSrc || node.imgSrc && !node.fingerPrintSrc && node.customProperty && !node.customProperty.created_date) return false;
218445
218470
  this.$emit('dblNodeClick', {
218446
218471
  node: this.getCurrentSelectNode,
218447
218472
  type: 'sign'
@@ -218734,8 +218759,8 @@ var ImageNode = __webpack_require__(88389);
218734
218759
 
218735
218760
  var HoDoc_component = (0,componentNormalizer/* default */.Z)(
218736
218761
  components_HoDocvue_type_script_lang_js_,
218737
- HoDocvue_type_template_id_700d6cbc_render,
218738
- HoDocvue_type_template_id_700d6cbc_staticRenderFns,
218762
+ HoDocvue_type_template_id_5f466836_render,
218763
+ HoDocvue_type_template_id_5f466836_staticRenderFns,
218739
218764
  false,
218740
218765
  null,
218741
218766
  null,
@@ -219074,7 +219099,10 @@ var DrawPageTree = /*#__PURE__*/function () {
219074
219099
  return;
219075
219100
  }
219076
219101
 
219077
- this.clearAfterDTop(mainArea, dTop);
219102
+ if (hoEditorFactory.isUseDrawingOptimization) {
219103
+ this.clearAfterDTop(mainArea, dTop);
219104
+ }
219105
+
219078
219106
  var nextLine = startLine;
219079
219107
  var pageIsFull = new Map();
219080
219108
 
@@ -219130,7 +219158,7 @@ var DrawPageTree = /*#__PURE__*/function () {
219130
219158
  restHeight = drawArea.maxHeight - dTop;
219131
219159
  }
219132
219160
 
219133
- if (!isNew) {
219161
+ if (!isNew && hoEditorFactory.isUseDrawingOptimization) {
219134
219162
  break;
219135
219163
  }
219136
219164
  }
@@ -219650,7 +219678,6 @@ var DrawPageTree = /*#__PURE__*/function () {
219650
219678
  }
219651
219679
  }
219652
219680
 
219653
- this.clearAfterDTop(drawArea, dTop);
219654
219681
  drawArea.update(prevArea, dRoots, startIndex, dTop, restHeight);
219655
219682
  this.afterAreaFinishPaint(drawArea);
219656
219683
  this._startNeedUpdatePage = Math.min(drawArea.index, this._startNeedUpdatePage === -1 ? 99999 : this._startNeedUpdatePage);
@@ -230759,7 +230786,7 @@ var VueController = /*#__PURE__*/function () {
230759
230786
  var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction.daInsert */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType.insertSign */.y.insertSign);
230760
230787
 
230761
230788
  if (hoEditorFactory.docTree.changing(changingEvent)) {
230762
- Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 1, '患者签名', node.signor, node.signTime, node.signTimeFormat, imgSrc, node.imgWidth, node.imgHeight, node.customProperty, fingerPrintSrc, fingerPosition)]).then(function () {
230789
+ Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 1, '患者签名', node.signor, node.signTime, node.signTimeFormat, imgSrc, node.imgWidth, node.imgHeight, {}, fingerPrintSrc, fingerPosition)]).then(function () {
230763
230790
  setTimeout(function () {
230764
230791
  callback && callback();
230765
230792
  }, 0);
@@ -233370,13 +233397,14 @@ var jspdf = __webpack_require__(53672);
233370
233397
 
233371
233398
 
233372
233399
 
233400
+
233373
233401
 
233374
233402
 
233375
233403
  /*
233376
233404
  * @Author: your name
233377
233405
  * @Date: 2021-07-31 09:25:57
233378
- * @LastEditTime: 2021-07-31 13:59:29
233379
- * @LastEditors: Please set LastEditors
233406
+ * @LastEditTime: 2022-08-26 13:53:54
233407
+ * @LastEditors: liyanan 2441631434@qq.com
233380
233408
  * @Description: In User Settings Edit
233381
233409
  * @FilePath: \hoeditor-web\src\editor\externalCall\PrintController.ts
233382
233410
  */
@@ -233685,10 +233713,21 @@ var PrintController = /*#__PURE__*/function () {
233685
233713
  });
233686
233714
 
233687
233715
  return;
233688
- }
233716
+ } // if (hoEditorFactory.isHideComments) {
233717
+ // hoEditorFactory.vueController.hideComments(true);
233718
+ // }
233689
233719
 
233690
- if (!hoEditorFactory.isHideComments) {
233691
- hoEditorFactory.vueController.hideComments(true);
233720
+
233721
+ var drawMainDocs = hoEditorFactory.drawPageTree.drawMainDocs;
233722
+
233723
+ for (var k = 0; k < drawMainDocs.length; k++) {
233724
+ for (var s = drawMainDocs[k].children.length - 1; s >= 0; s--) {
233725
+ var child = drawMainDocs[k].children[s];
233726
+
233727
+ if (child.name && child.name.substring(0, 1) === "C" && child.name.length > 15) {
233728
+ drawMainDocs[k].removeChildAt(s);
233729
+ }
233730
+ }
233692
233731
  }
233693
233732
 
233694
233733
  if (printMode && printAppoint) {
@@ -235136,7 +235175,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
235136
235175
 
235137
235176
  this._isCanUseTableProperty = false; //非设计模式下是否可以使用表格、单元格、行、列属性设置
235138
235177
 
235139
- this._isUseDrawingOptimization = true; // 是否启用绘制优化 默认启用
235178
+ this._isUseDrawingOptimization = false; // 是否启用绘制优化 默认启用
235140
235179
 
235141
235180
  this._loadImageCount = 0; // 待加载的图片数量
235142
235181