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.
@@ -47442,9 +47442,10 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
47442
47442
  _this._attribute = attribute === undefined ? 0 : attribute;
47443
47443
  _this._connectChar = connectChar === undefined ? ":" : connectChar;
47444
47444
 
47445
- if (type == 3) {
47446
- // 兼容旧的患者签名
47445
+ if (fingerPrintSrc || imgSrc && !fingerPrintSrc && customProperty && !customProperty.abi02) {
47446
+ // 用自定义属性区分并兼容旧的患者签名
47447
47447
  _this._attribute = 1;
47448
+ _this._type = 3;
47448
47449
  } // if(attribute == 1) { // 患者签名修改 type == 3
47449
47450
  // this._type = 3;
47450
47451
  // }
@@ -48090,7 +48091,7 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
48090
48091
  /* 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
48092
  /* 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
48093
  /* 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);
48094
+ /* 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
48095
  /* 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
48096
  /* 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
48097
  /* 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 +48122,24 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
48121
48122
  /* 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
48123
  /* harmony import */ var core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(88386);
48123
48124
  /* 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
-
48125
+ /* harmony import */ var core_js_modules_es_string_match_all_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(76373);
48126
+ /* 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__);
48127
+ /* harmony import */ var core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(56977);
48128
+ /* 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__);
48129
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(26699);
48130
+ /* 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__);
48131
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(32023);
48132
+ /* 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__);
48133
+ /* harmony import */ var core_js_modules_es_string_trim_js__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(73210);
48134
+ /* 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__);
48135
+ /* harmony import */ var _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(46675);
48136
+ /* harmony import */ var _editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(28284);
48137
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(41005);
48138
+ /* harmony import */ var _plugins_util__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(33913);
48139
+ /* harmony import */ var _BaseCombineNode__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(8);
48140
+ /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(50369);
48141
+ /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(15798);
48142
+ /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(8395);
48145
48143
 
48146
48144
 
48147
48145
 
@@ -48215,7 +48213,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48215
48213
  _this._formulaStr = "";
48216
48214
  _this._hideZero = true; //计算结果为0时是否隐藏
48217
48215
 
48218
- _this._id = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("TFS");
48216
+ _this._id = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("TFS");
48219
48217
  _this._styleIndex = styleIndex;
48220
48218
  _this.isAllowDelete = true;
48221
48219
  _this._cellRange = new Array();
@@ -48238,7 +48236,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48238
48236
  return _this;
48239
48237
  }
48240
48238
 
48241
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_35__/* ["default"] */ .Z)(TableFormula, [{
48239
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_34__/* ["default"] */ .Z)(TableFormula, [{
48242
48240
  key: "setCustomProperty",
48243
48241
  value: function setCustomProperty(customProperty) {
48244
48242
  var assignvalue = function assignvalue(target, source) {
@@ -48334,7 +48332,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48334
48332
  }, {
48335
48333
  key: "refreshDrawStyle",
48336
48334
  value: function refreshDrawStyle() {
48337
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48335
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48338
48336
  var textStyle = hoEditorFactory.docTree.styles[this._styleIndex];
48339
48337
  var cbStyle;
48340
48338
 
@@ -48355,7 +48353,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48355
48353
  value: function node2DrawNodeRange(startIndex, endIndex) {
48356
48354
  this.refreshDrawStyle(); //const text = this._hideZero && (this._text == "0" || this._text === "0.00") ? " " : this._text;
48357
48355
 
48358
- var dNode = new _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_27__/* .DrawTableFormular */ .A(this._rootPath, this, this._text);
48356
+ var dNode = new _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_26__/* .DrawTableFormular */ .A(this._rootPath, this, this._text);
48359
48357
 
48360
48358
  this._drawNodes.push(dNode);
48361
48359
  }
@@ -48385,7 +48383,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48385
48383
 
48386
48384
  dline.addChild(this._drawNodes[0]);
48387
48385
  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);
48386
+ _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.formularNodes.set(this.id, this);
48389
48387
  dline.fitLines();
48390
48388
  return dline.paragraphNode.getLastDrawline();
48391
48389
  }
@@ -48398,7 +48396,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48398
48396
  key: "node2Json",
48399
48397
  value: function node2Json(range, isCopy) {
48400
48398
  var retObj = {
48401
- nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType */ .Jq[this.nodeType],
48399
+ nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_31__/* .NodeType */ .Jq[this.nodeType],
48402
48400
  text: this._formulaStr,
48403
48401
  styleIndex: this.styleIndex,
48404
48402
  hideZero: this._hideZero,
@@ -48420,7 +48418,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48420
48418
  var pNode = this.parentNode;
48421
48419
 
48422
48420
  while (pNode) {
48423
- if (pNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_33__/* .CellNode */ .D) {
48421
+ if (pNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_32__/* .CellNode */ .D) {
48424
48422
  return pNode;
48425
48423
  }
48426
48424
 
@@ -48551,7 +48549,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48551
48549
  //const strValue = cell.getCellText().replaceAll('\n', '').replaceAll(' ', '').replaceAll('\b', '').replaceAll('\r', '');
48552
48550
 
48553
48551
 
48554
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48552
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48555
48553
  var strValue = hoEditorFactory.unitConvert.replaceAll(cell.getCellText(), '\n', '');
48556
48554
  strValue = hoEditorFactory.unitConvert.replaceAll(strValue, ' ', '');
48557
48555
  strValue = hoEditorFactory.unitConvert.replaceAll(strValue, '\b', '');
@@ -48600,17 +48598,15 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48600
48598
 
48601
48599
  var arr = new Array();
48602
48600
  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
- };
48601
+ var value = new Array(); //const insertToArr = (str: string) => {
48602
+ // let bInserted = false;
48603
+ // for (let i = 0, ilen = arr.length; i < ilen; i++) {
48604
+ // if (str.length > arr[i].length) continue
48605
+ // else arr.splice(i, 0, str);
48606
+ // }
48607
+ //if (!bInserted)
48608
+ //arr.push(str);
48609
+ //}
48614
48610
 
48615
48611
  var cellArddressRe = new RegExp(/[a-z]+\d+/, 'g');
48616
48612
  var strRets = strFormula.matchAll(cellArddressRe);
@@ -48619,7 +48615,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48619
48615
  var aRet = strRets.next();
48620
48616
 
48621
48617
  while (!aRet.done) {
48622
- insertToArr(aRet.value[0]);
48618
+ //insertToArr(aRet.value[0]);
48619
+ arr.push(aRet.value[0]);
48623
48620
  aRet = strRets.next();
48624
48621
  }
48625
48622
  }
@@ -48668,7 +48665,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48668
48665
  }
48669
48666
 
48670
48667
  if (totalOk) {
48671
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48668
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48672
48669
  var isRet = true;
48673
48670
 
48674
48671
  for (var m = 0; m < value.length; m++) {
@@ -48686,10 +48683,10 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48686
48683
  }
48687
48684
 
48688
48685
  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]);
48686
+ strFormula = hoEditorFactory.unitConvert.replaceAll(strFormula, arr[k], value[k] == "" ? "0" : value[k]); //strFormula.replaceAll(arr[k], value[k]);
48690
48687
  }
48691
48688
 
48692
- var result = (0,_editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_28__/* .expressionCalculator */ .C)(strFormula);
48689
+ var result = (0,_editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_27__/* .expressionCalculator */ .C)(strFormula);
48693
48690
  strRet = result.toString() == "NaN" ? " " : result.toString();
48694
48691
  }
48695
48692
 
@@ -48794,7 +48791,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48794
48791
  var eDateStr = eCell.getCellText();
48795
48792
 
48796
48793
  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)) {
48794
+ if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(sDateStr) && (0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(eDateStr)) {
48798
48795
  var sDate = new Date(sDateStr);
48799
48796
  var eDate = new Date(eDateStr);
48800
48797
  var sTime = sDate.getTime();
@@ -48961,7 +48958,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48961
48958
  if (cell) {
48962
48959
  var lastMenstryDate = cell.getCellText();
48963
48960
 
48964
- if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(lastMenstryDate)) {
48961
+ if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(lastMenstryDate)) {
48965
48962
  var date = new Date(lastMenstryDate); // const year = date.getFullYear();
48966
48963
  // const month = date.getMonth()+1;
48967
48964
  // const day = date.getDate();
@@ -49006,7 +49003,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49006
49003
  if (cell) {
49007
49004
  var lastMenstryDate = cell.getCellText();
49008
49005
 
49009
- if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(lastMenstryDate)) {
49006
+ if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(lastMenstryDate)) {
49010
49007
  var date = new Date(lastMenstryDate);
49011
49008
  var sTime = date.getTime();
49012
49009
  var eTime = Date.now();
@@ -49061,7 +49058,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49061
49058
  break;
49062
49059
  }
49063
49060
 
49064
- if (node instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_31__/* .BaseCombineNode */ .V) {
49061
+ if (node instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_30__/* .BaseCombineNode */ .V) {
49065
49062
  loopNodes(node.childNodes);
49066
49063
  }
49067
49064
  }
@@ -49152,7 +49149,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49152
49149
  }, {
49153
49150
  key: "delete",
49154
49151
  value: function _delete(operType) {
49155
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.formularNodes.delete(this._id);
49152
+ _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.formularNodes.delete(this._id);
49156
49153
 
49157
49154
  (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
49155
 
@@ -49200,13 +49197,13 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49200
49197
  formularType = json.text.indexOf(':') > 0 ? FormularType.ftSum : FormularType.ftFormular;
49201
49198
  }
49202
49199
 
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);
49200
+ 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
49201
  return ret;
49205
49202
  }
49206
49203
  }]);
49207
49204
 
49208
49205
  return TableFormula;
49209
- }(_ControlNode__WEBPACK_IMPORTED_MODULE_34__/* .ControlNode */ .w);
49206
+ }(_ControlNode__WEBPACK_IMPORTED_MODULE_33__/* .ControlNode */ .w);
49210
49207
 
49211
49208
  /***/ }),
49212
49209
 
@@ -65714,18 +65711,24 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
65714
65711
  /* harmony export */ "V": function() { return /* binding */ DrawSignNode; }
65715
65712
  /* harmony export */ });
65716
65713
  /* 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);
65714
+ /* 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
65715
  /* 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
65716
  /* 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
65717
  /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(74916);
65721
65718
  /* 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
65719
  /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(23123);
65723
65720
  /* 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);
65721
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(26699);
65722
+ /* 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__);
65723
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(32023);
65724
+ /* 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__);
65725
+ /* harmony import */ var _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(15798);
65726
+ /* harmony import */ var _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(34450);
65727
+ /* harmony import */ var _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(24113);
65728
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(41005);
65729
+ /* harmony import */ var _DrawCombineNode__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(72392);
65730
+
65731
+
65729
65732
 
65730
65733
 
65731
65734
 
@@ -65777,7 +65780,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65777
65780
  _this._connectChar = connectChar;
65778
65781
  _this._abi02 = customProperty && customProperty.abi02 ? customProperty.abi02 : ""; //this._textStyle = cbStyle.;
65779
65782
 
65780
- _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight; //this.dHeight = 40;
65783
+ _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight; //this.dHeight = 40;
65781
65784
 
65782
65785
  _this._textStyle = cbStyle.getStyleKey();
65783
65786
 
@@ -65785,7 +65788,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65785
65788
  var signArr = imgSrc.split('\n');
65786
65789
 
65787
65790
  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);
65791
+ _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight * signArr.length; // const textStyle = new TextStyle(hoeditfactoryID);
65789
65792
  // let curHeight = cbStyle.getFontHeightByFontSize(cbStyle.size) * signArr.length;
65790
65793
  // if (curHeight > this.dHeight) {
65791
65794
  // let fontSize = cbStyle.size;
@@ -65855,15 +65858,35 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65855
65858
  }
65856
65859
 
65857
65860
  if ((imgSrc || fingerPrintSrc) && type == 1 || type == 3) {
65858
- _this.drawWriteSignNode(node);
65861
+ // 处理混乱的
65862
+ if (node.customProperty && node.customProperty.abi02) {
65863
+ // 区分图片签名和普通文本签名 并更新对应的值
65864
+ if ((imgSrc.includes('data:image/') || imgSrc.split("/").length > 1) && type == 3) {
65865
+ node.type = 1;
65866
+ _this.type = 1;
65867
+ } else if (!imgSrc.includes('data:image/') && !imgSrc.includes("/") && type == 3) {
65868
+ node.type = 2;
65869
+ _this.type = 2;
65870
+ }
65871
+
65872
+ console.warn('医生签名');
65873
+
65874
+ _this.drawSignNode();
65875
+ } else {
65876
+ console.warn('患者签名');
65877
+
65878
+ _this.drawWriteSignNode(node);
65879
+ }
65859
65880
  } else {
65881
+ console.warn('医生签名');
65882
+
65860
65883
  _this.drawSignNode();
65861
65884
  }
65862
65885
 
65863
65886
  return _this;
65864
65887
  }
65865
65888
 
65866
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)(DrawSignNode, [{
65889
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z)(DrawSignNode, [{
65867
65890
  key: "type",
65868
65891
  get: function get() {
65869
65892
  return this._type;
@@ -65960,7 +65983,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65960
65983
 
65961
65984
  this.clear();
65962
65985
  var drawNode = this;
65963
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
65986
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
65964
65987
 
65965
65988
  var drawSign = function drawSign() {
65966
65989
  if (_this2.type === 1 || _this2.type === 3) {
@@ -65968,7 +65991,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65968
65991
  node.type = 3;
65969
65992
 
65970
65993
  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;
65994
+ var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
65972
65995
  var fingerWidth = 256;
65973
65996
  _this2._dWidth = fingerWidth * fingerscale;
65974
65997
  node.imgWidth = _this2._dWidth;
@@ -66039,7 +66062,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66039
66062
  var hitHeight = image.naturalHeight !== 0 ? image.naturalHeight : image.height;
66040
66063
  var scale = hoEditorFactory.signHeight / hitHeight < 0.4 ? 0.4 : hoEditorFactory.signHeight / hitHeight > 0.7 ? 1 : hoEditorFactory.signHeight / hitHeight;
66041
66064
 
66042
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center && hoEditorFactory.signHeight / hitHeight < 0.2) {
66065
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center && hoEditorFactory.signHeight / hitHeight < 0.2) {
66043
66066
  scale = hoEditorFactory.signHeight * 1.5 / hitHeight;
66044
66067
  } // 存在自定义签字图片高度时
66045
66068
 
@@ -66054,7 +66077,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66054
66077
  _fingerImage.onload = function () {
66055
66078
  var fingerWidth = _fingerImage.naturalWidth;
66056
66079
  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表示已经缩放过 不需要再次缩放
66080
+ var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15; // 指纹图片尺寸固定 宽:256 高:360 宽度不等于256表示已经缩放过 不需要再次缩放
66058
66081
 
66059
66082
  if (fingerWidth !== 256) {
66060
66083
  fingerscale = 1;
@@ -66070,18 +66093,18 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66070
66093
  _fingerBitmap.y = -fingerHeight * fingerscale;
66071
66094
  bitmap.y = -hitHeight * scale;
66072
66095
 
66073
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.left */ .d.left) {
66096
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.left */ .d.left) {
66074
66097
  bitmap.x = fingerWidth * fingerscale + 5;
66075
66098
  _fingerBitmap.x = 0;
66076
66099
  _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
66077
66100
  node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
66078
66101
  _this2._dHeight = node.imgHeight;
66079
- } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center) {
66102
+ } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center) {
66080
66103
  _fingerBitmap.x = (hitWidth * scale - fingerWidth * fingerscale) / 2;
66081
66104
  _fingerBitmap.y = -(fingerHeight * fingerscale + currentLineHeight) / 2;
66082
66105
  bitmap.y = -(hitHeight * scale + currentLineHeight) / 2;
66083
66106
  node.imgHeight = hoEditorFactory.signHeight;
66084
- } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.right */ .d.right) {
66107
+ } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.right */ .d.right) {
66085
66108
  _fingerBitmap.x = hitWidth * scale + 5;
66086
66109
  _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
66087
66110
  node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
@@ -66090,7 +66113,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66090
66113
 
66091
66114
  node.imgWidth = _this2._dWidth;
66092
66115
 
66093
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center) {
66116
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center) {
66094
66117
  _this2._dWidth = 0;
66095
66118
  _this2._dHeight = 0;
66096
66119
  }
@@ -66124,10 +66147,10 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66124
66147
  if (dArea) {
66125
66148
  var atype = hoEditorFactory.subDocManger.getHeaderFooterType(drawNode.node.getNodePath());
66126
66149
 
66127
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66150
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66128
66151
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66129
66152
  } else {
66130
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66153
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66131
66154
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66132
66155
  }
66133
66156
  } // hoEditorFactory.drawPageTree.updateDrawPage(dArea.index);
@@ -66186,7 +66209,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66186
66209
  _this3.addChildAt(bitmap, 0);
66187
66210
  }
66188
66211
 
66189
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
66212
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
66190
66213
  hoEditorFactory.loadImageCount++;
66191
66214
 
66192
66215
  image.onload = function () {
@@ -66204,7 +66227,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66204
66227
 
66205
66228
  var width = hitWidth * hoEditorFactory.signHeight / image.naturalHeight; //+ this._drawText.getMeasuredWidth();
66206
66229
 
66207
- if (node.parentNode instanceof _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_5__/* .CellNode */ .D) {
66230
+ if (node.parentNode instanceof _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_7__/* .CellNode */ .D) {
66208
66231
  var cellWidth = node.parentNode.drawCell.dWidth;
66209
66232
 
66210
66233
  if (width > cellWidth - 5) {
@@ -66251,10 +66274,10 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66251
66274
  if (dArea) {
66252
66275
  var atype = hoEditorFactory.subDocManger.getHeaderFooterType(_this3.node.getNodePath());
66253
66276
 
66254
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66277
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66255
66278
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66256
66279
  } else {
66257
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66280
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66258
66281
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66259
66282
  }
66260
66283
  }
@@ -66393,7 +66416,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66393
66416
  }]);
66394
66417
 
66395
66418
  return DrawSignNode;
66396
- }(_DrawCombineNode__WEBPACK_IMPORTED_MODULE_9__/* .DrawCombineNode */ .o);
66419
+ }(_DrawCombineNode__WEBPACK_IMPORTED_MODULE_11__/* .DrawCombineNode */ .o);
66397
66420
 
66398
66421
  /***/ }),
66399
66422
 
@@ -214313,9 +214336,9 @@ var es_string_match = __webpack_require__(4723);
214313
214336
  var es_number_constructor = __webpack_require__(9653);
214314
214337
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
214315
214338
  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 = []
214339
+ ;// 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&
214340
+ 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)}
214341
+ var HoDocvue_type_template_id_22896312_staticRenderFns = []
214319
214342
 
214320
214343
 
214321
214344
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
@@ -217956,7 +217979,7 @@ var SignNode = __webpack_require__(34450);
217956
217979
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
217957
217980
  var ParagraphNode = __webpack_require__(14208);
217958
217981
  ;// CONCATENATED MODULE: ./src/components/version.ts
217959
- /* harmony default export */ var version = ('2.0.92');
217982
+ /* harmony default export */ var version = ('2.0.93');
217960
217983
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
217961
217984
  var PoperTipText = __webpack_require__(91831);
217962
217985
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -218441,7 +218464,8 @@ var ImageNode = __webpack_require__(88389);
218441
218464
  };
218442
218465
 
218443
218466
  if (node instanceof SignNode/* SignNode */.N) {
218444
- if (node.attribute === 1) return false;
218467
+ // 通过自定义属性内部字段判断是否属于患者签名 指纹签名只有患者签名才会有 同时患者签名不存在自定义属性可以用是否存在某个属性确定是否是患者签名(需要确定的是imgsrc要存在 imgsrc不存在是指空签名元素)
218468
+ if (node.fingerPrintSrc || node.imgSrc && !node.fingerPrintSrc && node.customProperty && !node.customProperty.abi02) return false;
218445
218469
  this.$emit('dblNodeClick', {
218446
218470
  node: this.getCurrentSelectNode,
218447
218471
  type: 'sign'
@@ -218734,8 +218758,8 @@ var ImageNode = __webpack_require__(88389);
218734
218758
 
218735
218759
  var HoDoc_component = (0,componentNormalizer/* default */.Z)(
218736
218760
  components_HoDocvue_type_script_lang_js_,
218737
- HoDocvue_type_template_id_700d6cbc_render,
218738
- HoDocvue_type_template_id_700d6cbc_staticRenderFns,
218761
+ HoDocvue_type_template_id_22896312_render,
218762
+ HoDocvue_type_template_id_22896312_staticRenderFns,
218739
218763
  false,
218740
218764
  null,
218741
218765
  null,
@@ -230759,7 +230783,7 @@ var VueController = /*#__PURE__*/function () {
230759
230783
  var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction.daInsert */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType.insertSign */.y.insertSign);
230760
230784
 
230761
230785
  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 () {
230786
+ Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 1, '患者签名', node.signor, node.signTime, node.signTimeFormat, imgSrc, node.imgWidth, node.imgHeight, {}, fingerPrintSrc, fingerPosition)]).then(function () {
230763
230787
  setTimeout(function () {
230764
230788
  callback && callback();
230765
230789
  }, 0);