hoeditor-web 2.0.92 → 2.0.93

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.
@@ -47452,9 +47452,10 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
47452
47452
  _this._attribute = attribute === undefined ? 0 : attribute;
47453
47453
  _this._connectChar = connectChar === undefined ? ":" : connectChar;
47454
47454
 
47455
- if (type == 3) {
47456
- // 兼容旧的患者签名
47455
+ if (fingerPrintSrc || imgSrc && !fingerPrintSrc && customProperty && !customProperty.abi02) {
47456
+ // 用自定义属性区分并兼容旧的患者签名
47457
47457
  _this._attribute = 1;
47458
+ _this._type = 3;
47458
47459
  } // if(attribute == 1) { // 患者签名修改 type == 3
47459
47460
  // this._type = 3;
47460
47461
  // }
@@ -48100,7 +48101,7 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
48100
48101
  /* 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
48102
  /* 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
48103
  /* 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);
48104
+ /* 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
48105
  /* 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
48106
  /* 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
48107
  /* 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 +48132,24 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
48131
48132
  /* 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
48133
  /* harmony import */ var core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(88386);
48133
48134
  /* 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
-
48135
+ /* harmony import */ var core_js_modules_es_string_match_all_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(76373);
48136
+ /* 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__);
48137
+ /* harmony import */ var core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(56977);
48138
+ /* 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__);
48139
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(26699);
48140
+ /* 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__);
48141
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(32023);
48142
+ /* 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__);
48143
+ /* harmony import */ var core_js_modules_es_string_trim_js__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(73210);
48144
+ /* 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__);
48145
+ /* harmony import */ var _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(86017);
48146
+ /* harmony import */ var _editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(77564);
48147
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(28831);
48148
+ /* harmony import */ var _plugins_util__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(17987);
48149
+ /* harmony import */ var _BaseCombineNode__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(3267);
48150
+ /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(92178);
48151
+ /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(69088);
48152
+ /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(99964);
48155
48153
 
48156
48154
 
48157
48155
 
@@ -48225,7 +48223,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48225
48223
  _this._formulaStr = "";
48226
48224
  _this._hideZero = true; //计算结果为0时是否隐藏
48227
48225
 
48228
- _this._id = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("TFS");
48226
+ _this._id = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("TFS");
48229
48227
  _this._styleIndex = styleIndex;
48230
48228
  _this.isAllowDelete = true;
48231
48229
  _this._cellRange = new Array();
@@ -48248,7 +48246,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48248
48246
  return _this;
48249
48247
  }
48250
48248
 
48251
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_35__/* ["default"] */ .Z)(TableFormula, [{
48249
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_34__/* ["default"] */ .Z)(TableFormula, [{
48252
48250
  key: "setCustomProperty",
48253
48251
  value: function setCustomProperty(customProperty) {
48254
48252
  var assignvalue = function assignvalue(target, source) {
@@ -48344,7 +48342,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48344
48342
  }, {
48345
48343
  key: "refreshDrawStyle",
48346
48344
  value: function refreshDrawStyle() {
48347
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48345
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48348
48346
  var textStyle = hoEditorFactory.docTree.styles[this._styleIndex];
48349
48347
  var cbStyle;
48350
48348
 
@@ -48365,7 +48363,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48365
48363
  value: function node2DrawNodeRange(startIndex, endIndex) {
48366
48364
  this.refreshDrawStyle(); //const text = this._hideZero && (this._text == "0" || this._text === "0.00") ? " " : this._text;
48367
48365
 
48368
- var dNode = new _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_27__/* .DrawTableFormular */ .A(this._rootPath, this, this._text);
48366
+ var dNode = new _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_26__/* .DrawTableFormular */ .A(this._rootPath, this, this._text);
48369
48367
 
48370
48368
  this._drawNodes.push(dNode);
48371
48369
  }
@@ -48395,7 +48393,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48395
48393
 
48396
48394
  dline.addChild(this._drawNodes[0]);
48397
48395
  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);
48396
+ _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.formularNodes.set(this.id, this);
48399
48397
  dline.fitLines();
48400
48398
  return dline.paragraphNode.getLastDrawline();
48401
48399
  }
@@ -48408,7 +48406,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48408
48406
  key: "node2Json",
48409
48407
  value: function node2Json(range, isCopy) {
48410
48408
  var retObj = {
48411
- nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType */ .Jq[this.nodeType],
48409
+ nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_31__/* .NodeType */ .Jq[this.nodeType],
48412
48410
  text: this._formulaStr,
48413
48411
  styleIndex: this.styleIndex,
48414
48412
  hideZero: this._hideZero,
@@ -48430,7 +48428,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48430
48428
  var pNode = this.parentNode;
48431
48429
 
48432
48430
  while (pNode) {
48433
- if (pNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_33__/* .CellNode */ .D) {
48431
+ if (pNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_32__/* .CellNode */ .D) {
48434
48432
  return pNode;
48435
48433
  }
48436
48434
 
@@ -48561,7 +48559,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48561
48559
  //const strValue = cell.getCellText().replaceAll('\n', '').replaceAll(' ', '').replaceAll('\b', '').replaceAll('\r', '');
48562
48560
 
48563
48561
 
48564
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48562
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48565
48563
  var strValue = hoEditorFactory.unitConvert.replaceAll(cell.getCellText(), '\n', '');
48566
48564
  strValue = hoEditorFactory.unitConvert.replaceAll(strValue, ' ', '');
48567
48565
  strValue = hoEditorFactory.unitConvert.replaceAll(strValue, '\b', '');
@@ -48610,17 +48608,15 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48610
48608
 
48611
48609
  var arr = new Array();
48612
48610
  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
- };
48611
+ var value = new Array(); //const insertToArr = (str: string) => {
48612
+ // let bInserted = false;
48613
+ // for (let i = 0, ilen = arr.length; i < ilen; i++) {
48614
+ // if (str.length > arr[i].length) continue
48615
+ // else arr.splice(i, 0, str);
48616
+ // }
48617
+ //if (!bInserted)
48618
+ //arr.push(str);
48619
+ //}
48624
48620
 
48625
48621
  var cellArddressRe = new RegExp(/[a-z]+\d+/, 'g');
48626
48622
  var strRets = strFormula.matchAll(cellArddressRe);
@@ -48629,7 +48625,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48629
48625
  var aRet = strRets.next();
48630
48626
 
48631
48627
  while (!aRet.done) {
48632
- insertToArr(aRet.value[0]);
48628
+ //insertToArr(aRet.value[0]);
48629
+ arr.push(aRet.value[0]);
48633
48630
  aRet = strRets.next();
48634
48631
  }
48635
48632
  }
@@ -48678,7 +48675,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48678
48675
  }
48679
48676
 
48680
48677
  if (totalOk) {
48681
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48678
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48682
48679
  var isRet = true;
48683
48680
 
48684
48681
  for (var m = 0; m < value.length; m++) {
@@ -48696,10 +48693,10 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48696
48693
  }
48697
48694
 
48698
48695
  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]);
48696
+ strFormula = hoEditorFactory.unitConvert.replaceAll(strFormula, arr[k], value[k] == "" ? "0" : value[k]); //strFormula.replaceAll(arr[k], value[k]);
48700
48697
  }
48701
48698
 
48702
- var result = (0,_editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_28__/* .expressionCalculator */ .C)(strFormula);
48699
+ var result = (0,_editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_27__/* .expressionCalculator */ .C)(strFormula);
48703
48700
  strRet = result.toString() == "NaN" ? " " : result.toString();
48704
48701
  }
48705
48702
 
@@ -48804,7 +48801,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48804
48801
  var eDateStr = eCell.getCellText();
48805
48802
 
48806
48803
  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)) {
48804
+ if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(sDateStr) && (0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(eDateStr)) {
48808
48805
  var sDate = new Date(sDateStr);
48809
48806
  var eDate = new Date(eDateStr);
48810
48807
  var sTime = sDate.getTime();
@@ -48971,7 +48968,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48971
48968
  if (cell) {
48972
48969
  var lastMenstryDate = cell.getCellText();
48973
48970
 
48974
- if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(lastMenstryDate)) {
48971
+ if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(lastMenstryDate)) {
48975
48972
  var date = new Date(lastMenstryDate); // const year = date.getFullYear();
48976
48973
  // const month = date.getMonth()+1;
48977
48974
  // const day = date.getDate();
@@ -49016,7 +49013,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49016
49013
  if (cell) {
49017
49014
  var lastMenstryDate = cell.getCellText();
49018
49015
 
49019
- if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(lastMenstryDate)) {
49016
+ if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(lastMenstryDate)) {
49020
49017
  var date = new Date(lastMenstryDate);
49021
49018
  var sTime = date.getTime();
49022
49019
  var eTime = Date.now();
@@ -49071,7 +49068,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49071
49068
  break;
49072
49069
  }
49073
49070
 
49074
- if (node instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_31__/* .BaseCombineNode */ .V) {
49071
+ if (node instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_30__/* .BaseCombineNode */ .V) {
49075
49072
  loopNodes(node.childNodes);
49076
49073
  }
49077
49074
  }
@@ -49162,7 +49159,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49162
49159
  }, {
49163
49160
  key: "delete",
49164
49161
  value: function _delete(operType) {
49165
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.formularNodes.delete(this._id);
49162
+ _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.formularNodes.delete(this._id);
49166
49163
 
49167
49164
  (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
49165
 
@@ -49210,13 +49207,13 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49210
49207
  formularType = json.text.indexOf(':') > 0 ? FormularType.ftSum : FormularType.ftFormular;
49211
49208
  }
49212
49209
 
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);
49210
+ 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
49211
  return ret;
49215
49212
  }
49216
49213
  }]);
49217
49214
 
49218
49215
  return TableFormula;
49219
- }(_ControlNode__WEBPACK_IMPORTED_MODULE_34__/* .ControlNode */ .w);
49216
+ }(_ControlNode__WEBPACK_IMPORTED_MODULE_33__/* .ControlNode */ .w);
49220
49217
 
49221
49218
  /***/ }),
49222
49219
 
@@ -65724,18 +65721,24 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
65724
65721
  /* harmony export */ "V": function() { return /* binding */ DrawSignNode; }
65725
65722
  /* harmony export */ });
65726
65723
  /* 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);
65724
+ /* 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
65725
  /* 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
65726
  /* 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
65727
  /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(74916);
65731
65728
  /* 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
65729
  /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(23123);
65733
65730
  /* 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);
65731
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(26699);
65732
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_5__);
65733
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(32023);
65734
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_6__);
65735
+ /* harmony import */ var _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(69088);
65736
+ /* harmony import */ var _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(78975);
65737
+ /* harmony import */ var _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(93777);
65738
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(28831);
65739
+ /* harmony import */ var _DrawCombineNode__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(46139);
65740
+
65741
+
65739
65742
 
65740
65743
 
65741
65744
 
@@ -65787,7 +65790,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65787
65790
  _this._connectChar = connectChar;
65788
65791
  _this._abi02 = customProperty && customProperty.abi02 ? customProperty.abi02 : ""; //this._textStyle = cbStyle.;
65789
65792
 
65790
- _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight; //this.dHeight = 40;
65793
+ _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight; //this.dHeight = 40;
65791
65794
 
65792
65795
  _this._textStyle = cbStyle.getStyleKey();
65793
65796
 
@@ -65795,7 +65798,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65795
65798
  var signArr = imgSrc.split('\n');
65796
65799
 
65797
65800
  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);
65801
+ _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight * signArr.length; // const textStyle = new TextStyle(hoeditfactoryID);
65799
65802
  // let curHeight = cbStyle.getFontHeightByFontSize(cbStyle.size) * signArr.length;
65800
65803
  // if (curHeight > this.dHeight) {
65801
65804
  // let fontSize = cbStyle.size;
@@ -65865,15 +65868,35 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65865
65868
  }
65866
65869
 
65867
65870
  if ((imgSrc || fingerPrintSrc) && type == 1 || type == 3) {
65868
- _this.drawWriteSignNode(node);
65871
+ // 处理混乱的
65872
+ if (node.customProperty && node.customProperty.abi02) {
65873
+ // 区分图片签名和普通文本签名 并更新对应的值
65874
+ if ((imgSrc.includes('data:image/') || imgSrc.split("/").length > 1) && type == 3) {
65875
+ node.type = 1;
65876
+ _this.type = 1;
65877
+ } else if (!imgSrc.includes('data:image/') && !imgSrc.includes("/") && type == 3) {
65878
+ node.type = 2;
65879
+ _this.type = 2;
65880
+ }
65881
+
65882
+ console.warn('医生签名');
65883
+
65884
+ _this.drawSignNode();
65885
+ } else {
65886
+ console.warn('患者签名');
65887
+
65888
+ _this.drawWriteSignNode(node);
65889
+ }
65869
65890
  } else {
65891
+ console.warn('医生签名');
65892
+
65870
65893
  _this.drawSignNode();
65871
65894
  }
65872
65895
 
65873
65896
  return _this;
65874
65897
  }
65875
65898
 
65876
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)(DrawSignNode, [{
65899
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z)(DrawSignNode, [{
65877
65900
  key: "type",
65878
65901
  get: function get() {
65879
65902
  return this._type;
@@ -65970,7 +65993,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65970
65993
 
65971
65994
  this.clear();
65972
65995
  var drawNode = this;
65973
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
65996
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
65974
65997
 
65975
65998
  var drawSign = function drawSign() {
65976
65999
  if (_this2.type === 1 || _this2.type === 3) {
@@ -65978,7 +66001,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65978
66001
  node.type = 3;
65979
66002
 
65980
66003
  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;
66004
+ var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
65982
66005
  var fingerWidth = 256;
65983
66006
  _this2._dWidth = fingerWidth * fingerscale;
65984
66007
  node.imgWidth = _this2._dWidth;
@@ -66049,7 +66072,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66049
66072
  var hitHeight = image.naturalHeight !== 0 ? image.naturalHeight : image.height;
66050
66073
  var scale = hoEditorFactory.signHeight / hitHeight < 0.4 ? 0.4 : hoEditorFactory.signHeight / hitHeight > 0.7 ? 1 : hoEditorFactory.signHeight / hitHeight;
66051
66074
 
66052
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center && hoEditorFactory.signHeight / hitHeight < 0.2) {
66075
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center && hoEditorFactory.signHeight / hitHeight < 0.2) {
66053
66076
  scale = hoEditorFactory.signHeight * 1.5 / hitHeight;
66054
66077
  } // 存在自定义签字图片高度时
66055
66078
 
@@ -66064,7 +66087,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66064
66087
  _fingerImage.onload = function () {
66065
66088
  var fingerWidth = _fingerImage.naturalWidth;
66066
66089
  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表示已经缩放过 不需要再次缩放
66090
+ var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15; // 指纹图片尺寸固定 宽:256 高:360 宽度不等于256表示已经缩放过 不需要再次缩放
66068
66091
 
66069
66092
  if (fingerWidth !== 256) {
66070
66093
  fingerscale = 1;
@@ -66080,18 +66103,18 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66080
66103
  _fingerBitmap.y = -fingerHeight * fingerscale;
66081
66104
  bitmap.y = -hitHeight * scale;
66082
66105
 
66083
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.left */ .d.left) {
66106
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.left */ .d.left) {
66084
66107
  bitmap.x = fingerWidth * fingerscale + 5;
66085
66108
  _fingerBitmap.x = 0;
66086
66109
  _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
66087
66110
  node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
66088
66111
  _this2._dHeight = node.imgHeight;
66089
- } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center) {
66112
+ } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center) {
66090
66113
  _fingerBitmap.x = (hitWidth * scale - fingerWidth * fingerscale) / 2;
66091
66114
  _fingerBitmap.y = -(fingerHeight * fingerscale + currentLineHeight) / 2;
66092
66115
  bitmap.y = -(hitHeight * scale + currentLineHeight) / 2;
66093
66116
  node.imgHeight = hoEditorFactory.signHeight;
66094
- } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.right */ .d.right) {
66117
+ } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.right */ .d.right) {
66095
66118
  _fingerBitmap.x = hitWidth * scale + 5;
66096
66119
  _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
66097
66120
  node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
@@ -66100,7 +66123,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66100
66123
 
66101
66124
  node.imgWidth = _this2._dWidth;
66102
66125
 
66103
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center) {
66126
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center) {
66104
66127
  _this2._dWidth = 0;
66105
66128
  _this2._dHeight = 0;
66106
66129
  }
@@ -66134,10 +66157,10 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66134
66157
  if (dArea) {
66135
66158
  var atype = hoEditorFactory.subDocManger.getHeaderFooterType(drawNode.node.getNodePath());
66136
66159
 
66137
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66160
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66138
66161
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66139
66162
  } else {
66140
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66163
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66141
66164
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66142
66165
  }
66143
66166
  } // hoEditorFactory.drawPageTree.updateDrawPage(dArea.index);
@@ -66196,7 +66219,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66196
66219
  _this3.addChildAt(bitmap, 0);
66197
66220
  }
66198
66221
 
66199
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
66222
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
66200
66223
  hoEditorFactory.loadImageCount++;
66201
66224
 
66202
66225
  image.onload = function () {
@@ -66214,7 +66237,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66214
66237
 
66215
66238
  var width = hitWidth * hoEditorFactory.signHeight / image.naturalHeight; //+ this._drawText.getMeasuredWidth();
66216
66239
 
66217
- if (node.parentNode instanceof _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_5__/* .CellNode */ .D) {
66240
+ if (node.parentNode instanceof _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_7__/* .CellNode */ .D) {
66218
66241
  var cellWidth = node.parentNode.drawCell.dWidth;
66219
66242
 
66220
66243
  if (width > cellWidth - 5) {
@@ -66261,10 +66284,10 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66261
66284
  if (dArea) {
66262
66285
  var atype = hoEditorFactory.subDocManger.getHeaderFooterType(_this3.node.getNodePath());
66263
66286
 
66264
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66287
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66265
66288
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66266
66289
  } else {
66267
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66290
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66268
66291
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66269
66292
  }
66270
66293
  }
@@ -66403,7 +66426,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66403
66426
  }]);
66404
66427
 
66405
66428
  return DrawSignNode;
66406
- }(_DrawCombineNode__WEBPACK_IMPORTED_MODULE_9__/* .DrawCombineNode */ .o);
66429
+ }(_DrawCombineNode__WEBPACK_IMPORTED_MODULE_11__/* .DrawCombineNode */ .o);
66407
66430
 
66408
66431
  /***/ }),
66409
66432
 
@@ -214323,9 +214346,9 @@ var es_string_match = __webpack_require__(4723);
214323
214346
  var es_number_constructor = __webpack_require__(9653);
214324
214347
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
214325
214348
  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 = []
214349
+ ;// 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=22896312&
214350
+ var HoDocvue_type_template_id_22896312_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)}
214351
+ var HoDocvue_type_template_id_22896312_staticRenderFns = []
214329
214352
 
214330
214353
 
214331
214354
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
@@ -217966,7 +217989,7 @@ var SignNode = __webpack_require__(78975);
217966
217989
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
217967
217990
  var ParagraphNode = __webpack_require__(13880);
217968
217991
  ;// CONCATENATED MODULE: ./src/components/version.ts
217969
- /* harmony default export */ var version = ('2.0.92');
217992
+ /* harmony default export */ var version = ('2.0.93');
217970
217993
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
217971
217994
  var PoperTipText = __webpack_require__(97824);
217972
217995
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -218451,7 +218474,8 @@ var ImageNode = __webpack_require__(23778);
218451
218474
  };
218452
218475
 
218453
218476
  if (node instanceof SignNode/* SignNode */.N) {
218454
- if (node.attribute === 1) return false;
218477
+ // 通过自定义属性内部字段判断是否属于患者签名 指纹签名只有患者签名才会有 同时患者签名不存在自定义属性可以用是否存在某个属性确定是否是患者签名(需要确定的是imgsrc要存在 imgsrc不存在是指空签名元素)
218478
+ if (node.fingerPrintSrc || node.imgSrc && !node.fingerPrintSrc && node.customProperty && !node.customProperty.abi02) return false;
218455
218479
  this.$emit('dblNodeClick', {
218456
218480
  node: this.getCurrentSelectNode,
218457
218481
  type: 'sign'
@@ -218744,8 +218768,8 @@ var ImageNode = __webpack_require__(23778);
218744
218768
 
218745
218769
  var HoDoc_component = (0,componentNormalizer/* default */.Z)(
218746
218770
  components_HoDocvue_type_script_lang_js_,
218747
- HoDocvue_type_template_id_700d6cbc_render,
218748
- HoDocvue_type_template_id_700d6cbc_staticRenderFns,
218771
+ HoDocvue_type_template_id_22896312_render,
218772
+ HoDocvue_type_template_id_22896312_staticRenderFns,
218749
218773
  false,
218750
218774
  null,
218751
218775
  null,
@@ -230769,7 +230793,7 @@ var VueController = /*#__PURE__*/function () {
230769
230793
  var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction.daInsert */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType.insertSign */.y.insertSign);
230770
230794
 
230771
230795
  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 () {
230796
+ Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 1, '患者签名', node.signor, node.signTime, node.signTimeFormat, imgSrc, node.imgWidth, node.imgHeight, {}, fingerPrintSrc, fingerPosition)]).then(function () {
230773
230797
  setTimeout(function () {
230774
230798
  callback && callback();
230775
230799
  }, 0);