hoeditor-web 2.0.94 → 2.0.97

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.
@@ -9053,7 +9053,7 @@ var component = (0,componentNormalizer/* default */.Z)(
9053
9053
 
9054
9054
  /***/ }),
9055
9055
 
9056
- /***/ 96012:
9056
+ /***/ 25425:
9057
9057
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
9058
9058
 
9059
9059
  "use strict";
@@ -9065,8 +9065,8 @@ __webpack_require__.d(__webpack_exports__, {
9065
9065
  "default": function() { return /* binding */ Poper; }
9066
9066
  });
9067
9067
 
9068
- ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/popers/Poper.vue?vue&type=template&id=3d052018&
9069
- var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.classSelected,style:(_vm.poperStyle),on:{"mouseenter":_vm.mouseenter,"mouseleave":_vm.mouseleave}},[_vm._t("default",function(){return [_c('span',{class:_vm.classNames})]}),(_vm.title && _vm.show)?_c('Title',{attrs:{"title":_vm.title,"styles":_vm.styles}}):_vm._e()],2)}
9068
+ ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/popers/Poper.vue?vue&type=template&id=c961989a&
9069
+ var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.classSelected,style:(_vm.poperStyle),on:{"mouseenter":_vm.mouseenter,"mouseleave":_vm.mouseleave}},[(_vm.svg)?_c('span',{class:_vm.classNames}):_vm._t("default"),(_vm.title && _vm.show)?_c('Title',{attrs:{"title":_vm.title,"styles":_vm.styles}}):_vm._e()],2)}
9070
9070
  var staticRenderFns = []
9071
9071
 
9072
9072
 
@@ -9084,7 +9084,6 @@ var Title = __webpack_require__(40168);
9084
9084
  //
9085
9085
  //
9086
9086
  //
9087
- //
9088
9087
 
9089
9088
  /* harmony default export */ var Popervue_type_script_lang_js_ = ({
9090
9089
  name: 'Poper',
@@ -14288,7 +14287,7 @@ var component = (0,componentNormalizer/* default */.Z)(
14288
14287
 
14289
14288
  /***/ }),
14290
14289
 
14291
- /***/ 44584:
14290
+ /***/ 97599:
14292
14291
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
14293
14292
 
14294
14293
  "use strict";
@@ -14300,7 +14299,7 @@ __webpack_require__.d(__webpack_exports__, {
14300
14299
  "default": function() { return /* binding */ UploadImageDialog; }
14301
14300
  });
14302
14301
 
14303
- ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/upload/UploadImageDialog.vue?vue&type=template&id=2365d481&scoped=true&
14302
+ ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/upload/UploadImageDialog.vue?vue&type=template&id=7ab93c5e&scoped=true&
14304
14303
  var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.animationClassNames},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("上传图片")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content"},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("上传图片")]),_c('el-upload',{ref:"upload",staticClass:"upload-image",attrs:{"action":"","file-list":_vm.fileList,"show-file-list":false,"auto-upload":false,"on-change":_vm.uploadImage,"accept":"image/*"}},[_c('el-button',{attrs:{"size":"small"}},[_vm._v("选择图片")])],1)],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("修改")]),_c('el-radio',{attrs:{"label":"w"},model:{value:(_vm.radio),callback:function ($$v) {_vm.radio=$$v},expression:"radio"}},[_vm._v("宽度")]),_c('el-radio',{attrs:{"label":"h"},model:{value:(_vm.radio),callback:function ($$v) {_vm.radio=$$v},expression:"radio"}},[_vm._v("高度")])],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("图片宽度")]),_c('el-input',{attrs:{"disabled":_vm.radio == 'h',"size":"mini","placeholder":"设置插入后的图片宽度","maxlength":"20"},model:{value:(_vm.width),callback:function ($$v) {_vm.width=$$v},expression:"width"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("图片高度")]),_c('el-input',{attrs:{"disabled":_vm.radio == 'w',"size":"mini","placeholder":"设置插入后的图片高度","maxlength":"20"},model:{value:(_vm.height),callback:function ($$v) {_vm.height=$$v},expression:"height"}})],1),(_vm.uploadImageParams && _vm.uploadImageParams.uploadUrl)?[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("图片格式")]),_c('el-radio',{attrs:{"label":false},model:{value:(_vm.upload),callback:function ($$v) {_vm.upload=$$v},expression:"upload"}},[_vm._v("生成base64")]),_c('el-radio',{attrs:{"label":true},model:{value:(_vm.upload),callback:function ($$v) {_vm.upload=$$v},expression:"upload"}},[_vm._v("上传到服务器")])],1)]:_vm._e(),(!_vm.upload)?[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"}),_c('el-checkbox',{model:{value:(_vm.compress),callback:function ($$v) {_vm.compress=$$v},expression:"compress"}},[_vm._v("是否按缩放后尺寸压缩图片")])],1),_c('li',{staticStyle:{"text-align":"left","padding":"0 0 0 10px","line-height":"20px"}},[_vm._v("图片初始大小:"+_vm._s((_vm.uploadImageUrl.length / 1024).toFixed(2))+" kb")]),_c('li',{staticStyle:{"text-align":"left","padding":"0 0 0 10px","line-height":"20px"}},[_vm._v("压缩后图片大小:"+_vm._s((_vm.imageUrl.length / 1024).toFixed(2))+" kb")]),_c('li',{staticStyle:{"text-align":"left","padding":"0 0 0 10px","line-height":"20px"}},[_vm._v("图片默认压缩为 jpeg 格式")])]:_vm._e(),_c('fieldset',{staticClass:"fieldset"},[_c('legend',[_vm._v("预 览")]),_c('div',{staticClass:"view-image"},[(_vm.imageUrl)?_c('img',{ref:"image",attrs:{"width":this.width,"src":_vm.imageUrl}}):_vm._e()])])],2)]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","loading":_vm.uploadLoading,"type":"primary"},on:{"click":_vm.sure}},[_vm._v(_vm._s(_vm.uploadLoading ? '正在上传。。。' : '上传'))]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
14305
14304
  var staticRenderFns = []
14306
14305
 
@@ -14312,8 +14311,6 @@ var message_default = /*#__PURE__*/__webpack_require__.n(message);
14312
14311
  var es_number_to_fixed = __webpack_require__(56977);
14313
14312
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
14314
14313
  var es_number_constructor = __webpack_require__(9653);
14315
- // EXTERNAL MODULE: ./node_modules/vue-property-decorator/lib/vue-property-decorator.js + 1 modules
14316
- var vue_property_decorator = __webpack_require__(14391);
14317
14314
  // EXTERNAL MODULE: ./src/plugins/ajax.ts
14318
14315
  var ajax = __webpack_require__(6255);
14319
14316
  // EXTERNAL MODULE: ./src/plugins/util.ts
@@ -14396,7 +14393,6 @@ var util = __webpack_require__(33913);
14396
14393
  //
14397
14394
 
14398
14395
 
14399
-
14400
14396
  /* harmony default export */ var UploadImageDialogvue_type_script_lang_js_ = ({
14401
14397
  name: 'UploadImageDialog',
14402
14398
  props: {
@@ -14616,10 +14612,10 @@ var util = __webpack_require__(33913);
14616
14612
  });
14617
14613
  ;// CONCATENATED MODULE: ./src/components/controls/upload/UploadImageDialog.vue?vue&type=script&lang=js&
14618
14614
  /* harmony default export */ var upload_UploadImageDialogvue_type_script_lang_js_ = (UploadImageDialogvue_type_script_lang_js_);
14619
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/upload/UploadImageDialog.vue?vue&type=style&index=0&id=2365d481&lang=scss&scoped=true&
14615
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/upload/UploadImageDialog.vue?vue&type=style&index=0&id=7ab93c5e&lang=scss&scoped=true&
14620
14616
  // extracted by mini-css-extract-plugin
14621
14617
 
14622
- ;// CONCATENATED MODULE: ./src/components/controls/upload/UploadImageDialog.vue?vue&type=style&index=0&id=2365d481&lang=scss&scoped=true&
14618
+ ;// CONCATENATED MODULE: ./src/components/controls/upload/UploadImageDialog.vue?vue&type=style&index=0&id=7ab93c5e&lang=scss&scoped=true&
14623
14619
 
14624
14620
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
14625
14621
  var componentNormalizer = __webpack_require__(1001);
@@ -14638,7 +14634,7 @@ var component = (0,componentNormalizer/* default */.Z)(
14638
14634
  staticRenderFns,
14639
14635
  false,
14640
14636
  null,
14641
- "2365d481",
14637
+ "7ab93c5e",
14642
14638
  null
14643
14639
 
14644
14640
  )
@@ -16360,7 +16356,7 @@ var commonParamList = new Map();
16360
16356
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
16361
16357
 
16362
16358
  "use strict";
16363
- /* harmony import */ var _Poper_vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(96012);
16359
+ /* harmony import */ var _Poper_vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(25425);
16364
16360
 
16365
16361
  /* harmony default export */ __webpack_exports__["Z"] = (_Poper_vue__WEBPACK_IMPORTED_MODULE_0__["default"]);
16366
16362
 
@@ -24813,7 +24809,7 @@ var Print = /*#__PURE__*/function () {
24813
24809
  key: "printToPDF",
24814
24810
  value: function () {
24815
24811
  var _printToPDF = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee2(hoEditorFactoryID, PDF, type, fileName, reslove, positionY, format) {
24816
- var hoEditorFactory, dPage, docHeight, dHeight, startPageNum, svgBox, orientation, width, height, last, _iterator, _step, _cpage$drawDomLevel3, index, cpage, dShape, posIndex, posY, _dShape, svg2pdfOptions, _cpage$drawDomLevel, _cpage$drawDomLevel$s, ctx, _cpage$drawDomLevel2, _cpage$drawDomLevel2$, _ctx, _ctx2, _svgBox2, svgData, _ctx3, _last, printStyle, _svgBox, exportHtml, url, link, name;
24812
+ var hoEditorFactory, dPage, docHeight, dHeight, startPageNum, svgBox, orientation, width, height, last, _iterator, _step, _cpage$drawDomLevel3, index, cpage, dShape, posIndex, posY, _dShape, svg2pdfOptions, _cpage$drawDomLevel, _cpage$drawDomLevel$s, ctx, _cpage$drawDomLevel2, _cpage$drawDomLevel2$, _ctx, _ctx2, _svgBox2, svgData, _ctx3, _last, printStyle, _svgBox, exportHtml, url, link, otherPageNumber, i, name;
24817
24813
 
24818
24814
  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee2$(_context3) {
24819
24815
  while (1) {
@@ -25108,11 +25104,15 @@ var Print = /*#__PURE__*/function () {
25108
25104
  return link.remove();
25109
25105
  }, 100);
25110
25106
  } else {
25111
- if (height <= 560 && hoEditorFactory.isFixedPrintToA4 === '') {
25112
- PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
25107
+ otherPageNumber = PDF.internal.getNumberOfPages() - hoEditorFactory.drawTree.drawPages.length;
25108
+
25109
+ if (otherPageNumber >= 1) {
25110
+ for (i = 0; i < otherPageNumber; i++) {
25111
+ PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
25112
+ }
25113
25113
  }
25114
25114
 
25115
- PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
25115
+ console.warn("\u4ECE\u5F00\u59CB\u5220\u6389".concat(otherPageNumber, "\u9875\u7A7A\u767D\u9875"));
25116
25116
  name = hoEditorFactory.vueController.getDocTitle() ? hoEditorFactory.vueController.getDocTitle() : '电子病历文档';
25117
25117
  PDF && this.openDataUriInWindow(PDF, name, hoEditorFactory.pageProperty.widthPixes);
25118
25118
  }
@@ -26541,14 +26541,14 @@ var SubDocManger = /*#__PURE__*/function () {
26541
26541
  /* harmony export */ __webpack_require__.d(__webpack_exports__, {
26542
26542
  /* harmony export */ "P": function() { return /* binding */ DocController; }
26543
26543
  /* harmony export */ });
26544
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86160);
26545
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(39873);
26546
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createForOfIteratorHelper_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(19934);
26547
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(37174);
26544
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createForOfIteratorHelper_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(19934);
26545
+ /* 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);
26546
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(86160);
26547
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(39873);
26548
26548
  /* harmony import */ var element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(86769);
26549
26549
  /* harmony import */ var element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4__);
26550
26550
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(35671);
26551
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(22342);
26551
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(22342);
26552
26552
  /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(41539);
26553
26553
  /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_6__);
26554
26554
  /* harmony import */ var core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(88674);
@@ -26640,12 +26640,14 @@ var SubDocManger = /*#__PURE__*/function () {
26640
26640
  /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__(41005);
26641
26641
  /* harmony import */ var _undoRedo_ParseUndoUnit__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__(94020);
26642
26642
  /* harmony import */ var _undoRedo_TableUndos_TableInsertParagraphUndoUnit__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__(24242);
26643
- /* harmony import */ var _treeNode_SeparateCharNode__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(9935);
26644
- /* harmony import */ var _treeNode_LabelNode__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(89790);
26645
- /* harmony import */ var _NodePosition__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(2242);
26646
- /* harmony import */ var _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(34450);
26647
- /* harmony import */ var _events_NodeNeedModifyEvent__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(49482);
26648
- /* harmony import */ var _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(74873);
26643
+ /* harmony import */ var _draw_DrawLine__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(94407);
26644
+ /* harmony import */ var _treeNode_SeparateCharNode__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(9935);
26645
+ /* harmony import */ var _treeNode_LabelNode__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(89790);
26646
+ /* harmony import */ var _NodePosition__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(2242);
26647
+ /* harmony import */ var _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(34450);
26648
+ /* harmony import */ var _events_NodeNeedModifyEvent__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(49482);
26649
+ /* harmony import */ var _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(74873);
26650
+
26649
26651
 
26650
26652
 
26651
26653
 
@@ -26752,7 +26754,7 @@ var DocController = /*#__PURE__*/function () {
26752
26754
  // }
26753
26755
 
26754
26756
 
26755
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_86__/* ["default"] */ .Z)(DocController, [{
26757
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_87__/* ["default"] */ .Z)(DocController, [{
26756
26758
  key: "onInsertNodeByID",
26757
26759
  get: function get() {
26758
26760
  return this._onInsertNodeByID;
@@ -27263,7 +27265,7 @@ var DocController = /*#__PURE__*/function () {
27263
27265
 
27264
27266
  if (!domRange.isEmpty) {
27265
27267
  domRange = domRange.normalize();
27266
- } else if (hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && !(domRange.npStart.node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N)) {
27268
+ } else if (hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && !(domRange.npStart.node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
27267
27269
  element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("审阅模式下,只能选中文档内容进行删除");
27268
27270
 
27269
27271
  return;
@@ -27290,183 +27292,336 @@ var DocController = /*#__PURE__*/function () {
27290
27292
 
27291
27293
  }, {
27292
27294
  key: "deleteTextBeforePath",
27293
- value: function deleteTextBeforePath(startPath) {
27294
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
27295
- var domRange = hoEditorFactory.docTree.curDomRange.normalize();
27295
+ value: function () {
27296
+ var _deleteTextBeforePath = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().mark(function _callee(startPath) {
27297
+ var hoEditorFactory, domRange, nodePosition, childIndex, node, ret, topath, arr, tmp, aRange, endPath, _topath, _aRange, prevNode, cellNode, tableNode, tIndex, cIndex, preParaNode, newpath, signUserId, preNode, nextNode, path, signNode, spath, epath, newSignNode, pNode;
27296
27298
 
27297
- if (!domRange.isEmpty) {
27298
- this.deleteRange(domRange, true); // hoEditorFactory.undoService.begin();
27299
- // hoEditorFactory.undoService.add(
27300
- // new NodesDeleteUndoUnit(
27301
- // this._hoEditorFactoryID,
27302
- // domRange.startPath,
27303
- // domRange.endPath,
27304
- // true
27305
- // )
27306
- // );
27307
- // hoEditorFactory.undoService.commit();
27308
- } else {
27309
- var nodePosition = hoEditorFactory.docTree.findNodePositionByPath(startPath);
27310
- var childIndex = nodePosition.childIndex;
27311
- var node = nodePosition.node;
27299
+ return (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().wrap(function _callee$(_context) {
27300
+ while (1) {
27301
+ switch (_context.prev = _context.next) {
27302
+ case 0:
27303
+ hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
27304
+ domRange = hoEditorFactory.docTree.curDomRange.normalize();
27312
27305
 
27313
- if (node) {
27314
- if (domRange.isEmpty) {
27315
- //未选中任何区域
27316
- if (node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R) {
27317
- //if (hoEditorFactory.docTree.docProperty.type === EmrType.etForm) {
27318
- if (node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
27319
- var ret = node.parentNode.delCellNodeText();
27320
- if (!ret) return;
27321
- } //}
27306
+ if (domRange.isEmpty) {
27307
+ _context.next = 6;
27308
+ break;
27309
+ }
27322
27310
 
27311
+ this.deleteRange(domRange, true); // hoEditorFactory.undoService.begin();
27312
+ // hoEditorFactory.undoService.add(
27313
+ // new NodesDeleteUndoUnit(
27314
+ // this._hoEditorFactoryID,
27315
+ // domRange.startPath,
27316
+ // domRange.endPath,
27317
+ // true
27318
+ // )
27319
+ // );
27320
+ // hoEditorFactory.undoService.commit();
27321
+
27322
+ _context.next = 124;
27323
+ break;
27323
27324
 
27324
- var topath = "";
27325
+ case 6:
27326
+ nodePosition = hoEditorFactory.docTree.findNodePositionByPath(startPath);
27327
+ childIndex = nodePosition.childIndex;
27328
+ node = nodePosition.node;
27329
+
27330
+ if (!node) {
27331
+ _context.next = 124;
27332
+ break;
27333
+ }
27325
27334
 
27326
- if (childIndex > 0) {
27327
- var arr = startPath.split("/");
27335
+ if (!domRange.isEmpty) {
27336
+ _context.next = 124;
27337
+ break;
27338
+ }
27339
+
27340
+ if (!(node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R)) {
27341
+ _context.next = 36;
27342
+ break;
27343
+ }
27344
+
27345
+ if (!(node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D)) {
27346
+ _context.next = 16;
27347
+ break;
27348
+ }
27349
+
27350
+ ret = node.parentNode.delCellNodeText();
27351
+
27352
+ if (ret) {
27353
+ _context.next = 16;
27354
+ break;
27355
+ }
27356
+
27357
+ return _context.abrupt("return");
27358
+
27359
+ case 16:
27360
+ //}
27361
+ topath = "";
27362
+
27363
+ if (!(childIndex > 0)) {
27364
+ _context.next = 23;
27365
+ break;
27366
+ }
27367
+
27368
+ arr = startPath.split("/");
27328
27369
  arr[arr.length - 1] = parseInt(arr[arr.length - 1]) - 1 + "";
27329
27370
  topath = arr.join("/");
27330
- } else {
27331
- var tmp = node.previousLeaf();
27371
+ _context.next = 30;
27372
+ break;
27332
27373
 
27333
- if (tmp) {
27334
- topath = hoEditorFactory.docTree.getNodeLastPath(tmp);
27335
- } else {
27336
- console.error("这里应该不会出现这种情况 2020.10.28");
27337
- return;
27374
+ case 23:
27375
+ tmp = node.previousLeaf();
27376
+
27377
+ if (!tmp) {
27378
+ _context.next = 28;
27379
+ break;
27338
27380
  }
27339
- }
27340
27381
 
27341
- hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, topath, startPath); // hoEditorFactory.undoService.begin();
27342
- // hoEditorFactory.undoService.add(
27343
- // new NodesDeleteUndoUnit(
27344
- // this._hoEditorFactoryID,
27345
- // topath,
27346
- // startPath,
27347
- // false
27348
- // )
27349
- // );
27350
- // hoEditorFactory.undoService.commit();
27351
-
27352
- var aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, topath).normalize();
27353
- this.deleteRange(aRange, true);
27354
- hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, topath, topath);
27355
- } else if (node instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j) {
27356
- var endPath = hoEditorFactory.docTree.getNodeLastPath(node);
27357
-
27358
- if (node.parentNode && node.parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_46__/* .TextInputFieldNode */ .re) {
27359
- if (node.parentNode.childNodes[1] instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j) {
27360
- startPath = hoEditorFactory.docTree.getNodeLastPath(node.parentNode.previousLeaf());
27361
- endPath = hoEditorFactory.docTree.getNodeLastPath(node.parentNode);
27362
- } else {
27363
- if (node === node.parentNode.last()) {
27364
- var _topath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
27382
+ topath = hoEditorFactory.docTree.getNodeLastPath(tmp);
27383
+ _context.next = 30;
27384
+ break;
27365
27385
 
27366
- hoEditorFactory.drawTree.moveCaretToPath(_topath);
27367
- hoEditorFactory.docTree.curDomRange.setSamePath(_topath);
27368
- return;
27369
- }
27386
+ case 28:
27387
+ console.error("这里应该不会出现这种情况 2020.10.28");
27388
+ return _context.abrupt("return");
27370
27389
 
27371
- if (node === node.parentNode.first()) {
27372
- return;
27373
- }
27390
+ case 30:
27391
+ hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, topath, startPath); // hoEditorFactory.undoService.begin();
27392
+ // hoEditorFactory.undoService.add(
27393
+ // new NodesDeleteUndoUnit(
27394
+ // this._hoEditorFactoryID,
27395
+ // topath,
27396
+ // startPath,
27397
+ // false
27398
+ // )
27399
+ // );
27400
+ // hoEditorFactory.undoService.commit();
27401
+
27402
+ aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, topath).normalize();
27403
+ this.deleteRange(aRange, true);
27404
+ hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, topath, topath);
27405
+ _context.next = 124;
27406
+ break;
27407
+
27408
+ case 36:
27409
+ if (!(node instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j)) {
27410
+ _context.next = 55;
27411
+ break;
27374
27412
  }
27375
- }
27376
27413
 
27377
- var _aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath //hoEditorFactory.docTree.getNodeLastPath(node)
27378
- ).normalize();
27379
-
27380
- this.deleteRange(_aRange, true); // hoEditorFactory.undoService.begin();
27381
- // hoEditorFactory.undoService.add(
27382
- // new NodesDeleteUndoUnit(
27383
- // this._hoEditorFactoryID,
27384
- // hoEditorFactory.docTree.getNodeLastPath(node),
27385
- // startPath,
27386
- // false
27387
- // )
27388
- // );
27389
- // hoEditorFactory.undoService.commit();
27390
- } else {
27391
- if (node instanceof _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_30__/* .ParagraphNode */ .C) {
27392
- var prevNode = node.prevSibling();
27414
+ endPath = hoEditorFactory.docTree.getNodeLastPath(node);
27393
27415
 
27394
- if (prevNode instanceof _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_51__/* .TableNode */ .Fh) {
27395
- return;
27416
+ if (!(node.parentNode && node.parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_46__/* .TextInputFieldNode */ .re)) {
27417
+ _context.next = 51;
27418
+ break;
27396
27419
  }
27397
27420
 
27398
- if (prevNode == null) {
27399
- return;
27421
+ if (!(node.parentNode.childNodes[1] instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j)) {
27422
+ _context.next = 44;
27423
+ break;
27424
+ }
27425
+
27426
+ startPath = hoEditorFactory.docTree.getNodeLastPath(node.parentNode.previousLeaf());
27427
+ endPath = hoEditorFactory.docTree.getNodeLastPath(node.parentNode);
27428
+ _context.next = 51;
27429
+ break;
27430
+
27431
+ case 44:
27432
+ if (!(node === node.parentNode.last())) {
27433
+ _context.next = 49;
27434
+ break;
27435
+ }
27436
+
27437
+ _topath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
27438
+ hoEditorFactory.drawTree.moveCaretToPath(_topath);
27439
+ hoEditorFactory.docTree.curDomRange.setSamePath(_topath);
27440
+ return _context.abrupt("return");
27441
+
27442
+ case 49:
27443
+ if (!(node === node.parentNode.first())) {
27444
+ _context.next = 51;
27445
+ break;
27446
+ }
27447
+
27448
+ return _context.abrupt("return");
27449
+
27450
+ case 51:
27451
+ _aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath //hoEditorFactory.docTree.getNodeLastPath(node)
27452
+ ).normalize();
27453
+ this.deleteRange(_aRange, true); // hoEditorFactory.undoService.begin();
27454
+ // hoEditorFactory.undoService.add(
27455
+ // new NodesDeleteUndoUnit(
27456
+ // this._hoEditorFactoryID,
27457
+ // hoEditorFactory.docTree.getNodeLastPath(node),
27458
+ // startPath,
27459
+ // false
27460
+ // )
27461
+ // );
27462
+ // hoEditorFactory.undoService.commit();
27463
+
27464
+ _context.next = 124;
27465
+ break;
27466
+
27467
+ case 55:
27468
+ if (!(node instanceof _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_30__/* .ParagraphNode */ .C)) {
27469
+ _context.next = 82;
27470
+ break;
27471
+ }
27472
+
27473
+ prevNode = node.prevSibling();
27474
+
27475
+ if (!(prevNode instanceof _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_51__/* .TableNode */ .Fh)) {
27476
+ _context.next = 59;
27477
+ break;
27478
+ }
27479
+
27480
+ return _context.abrupt("return");
27481
+
27482
+ case 59:
27483
+ if (!(prevNode == null)) {
27484
+ _context.next = 82;
27485
+ break;
27486
+ }
27487
+
27488
+ if (!(node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D)) {
27489
+ _context.next = 81;
27490
+ break;
27491
+ }
27492
+
27493
+ cellNode = node.parentNode;
27494
+ tableNode = cellNode.parentNode;
27495
+ tIndex = tableNode.childNodes.indexOf(cellNode);
27496
+ cIndex = cellNode.childNodes.indexOf(node);
27497
+ preParaNode = hoEditorFactory.docTree.getSameRectPrevParanode(tableNode.paragraphNode);
27498
+
27499
+ if (!(preParaNode && tIndex == 0 && cIndex == 0 && preParaNode.drawlines.length == 1 && preParaNode.drawlines[0] instanceof _draw_DrawLine__WEBPACK_IMPORTED_MODULE_80__/* .DrawLine */ .a && preParaNode.drawlines[0].isEmpty())) {
27500
+ _context.next = 78;
27501
+ break;
27502
+ }
27503
+
27504
+ hoEditorFactory.undoService.begin();
27505
+ hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, tableNode.paragraphNode, tableNode.paragraphNode.getNodePath()));
27506
+ tableNode.paragraphNode = preParaNode;
27507
+ _context.next = 72;
27508
+ return hoEditorFactory.undoService.commit();
27509
+
27510
+ case 72:
27511
+ newpath = cellNode.childNodes[0].getNodePath();
27512
+ hoEditorFactory.docTree.curDomRange.setSamePath(newpath);
27513
+ hoEditorFactory.drawTree.moveCaretToPath(newpath);
27514
+ return _context.abrupt("return");
27515
+
27516
+ case 78:
27517
+ return _context.abrupt("return");
27518
+
27519
+ case 79:
27520
+ _context.next = 82;
27521
+ break;
27522
+
27523
+ case 81:
27524
+ return _context.abrupt("return");
27525
+
27526
+ case 82:
27527
+ if (!(hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && !(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N))) {
27528
+ _context.next = 87;
27529
+ break;
27400
27530
  }
27401
- }
27402
27531
 
27403
- if (hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && !(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N)) {
27404
27532
  element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("审阅模式下,只能对文本内容进行删除");
27405
27533
 
27406
- return;
27407
- } else {
27408
- if (hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) {
27409
- var signUserId = node.customProperty.bce01;
27534
+ return _context.abrupt("return");
27410
27535
 
27411
- if (hoEditorFactory.userInfo.id != signUserId) {
27412
- element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("不是本人签名,不允许删除!");
27536
+ case 87:
27537
+ if (!(hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
27538
+ _context.next = 92;
27539
+ break;
27540
+ }
27413
27541
 
27414
- return;
27415
- }
27542
+ signUserId = node.customProperty.bce01;
27543
+
27544
+ if (!(hoEditorFactory.userInfo.id != signUserId)) {
27545
+ _context.next = 92;
27546
+ break;
27416
27547
  }
27417
27548
 
27418
- if (hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psDesign */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) {
27419
- element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("不允许使用删除键删除签名,请右键删除元素", "系统提示");
27549
+ element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("不是本人签名,不允许删除!");
27420
27550
 
27421
- return;
27551
+ return _context.abrupt("return");
27552
+
27553
+ case 92:
27554
+ if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psDesign */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
27555
+ _context.next = 95;
27556
+ break;
27422
27557
  }
27423
27558
 
27424
- if (hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psDesign */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N && node.isTemplate && node.number === 0) {
27425
- element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("该签名元素不允许删除!", "系统提示");
27559
+ element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("不允许使用删除键删除签名,请右键删除元素", "系统提示");
27426
27560
 
27427
- return;
27561
+ return _context.abrupt("return");
27562
+
27563
+ case 95:
27564
+ if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psDesign */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
27565
+ _context.next = 98;
27566
+ break;
27428
27567
  }
27429
27568
 
27430
- if (node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) {
27431
- var preNode = node.previousLeaf();
27432
- var nextNode = node.nextLeaf();
27433
-
27434
- if ((node.imgSrc !== "" || node.fingerPrintSrc !== "") && node.isTemplate && !(preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) && !(nextNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N)) {
27435
- var path = hoEditorFactory.docTree.getNodeLastPath(preNode);
27436
- var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 0, 0, node.name === "" ? "医师签名" : node.name, node.signType, node.signFormat, "", "", node.signTimeFormat, "", 0, 0, {}, true, node.styleIndex, node.connectMode, node.isFront, node.allowEditSignTime);
27437
- hoEditorFactory.undoService.begin();
27438
- hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
27439
- hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, path, signNode));
27440
- hoEditorFactory.undoService.commit();
27441
- return;
27442
- }
27569
+ element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("该签名元素不允许删除!", "系统提示");
27443
27570
 
27444
- if (preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) {
27445
- var spath = "";
27571
+ return _context.abrupt("return");
27446
27572
 
27447
- if (node.number === 2 || node.number === 1 && node.isTemplate) {
27448
- spath = hoEditorFactory.docTree.getNodeLastPath(preNode.previousLeaf());
27449
- } else {
27450
- spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
27451
- } //const spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
27573
+ case 98:
27574
+ if (!(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
27575
+ _context.next = 119;
27576
+ break;
27577
+ }
27452
27578
 
27579
+ preNode = node.previousLeaf();
27580
+ nextNode = node.nextLeaf();
27453
27581
 
27454
- var epath = hoEditorFactory.docTree.getNodeLastPath(node);
27455
- var newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, preNode.rootNodes, preNode.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 1, preNode.type, preNode.name === "" ? "签名" : preNode.name, preNode.signType, preNode.signFormat, preNode.signor, preNode.signTime, preNode.signTimeFormat, preNode.imgSrc, preNode.imgWidth, preNode.imgHeight, preNode.customProperty, preNode.isTemplate ? preNode.isTemplate : node.isTemplate, //node.isTemplate,
27456
- node.styleIndex, preNode.connectMode, preNode.isFront, preNode.allowEditSignTime);
27457
- hoEditorFactory.undoService.begin();
27458
- hoEditorFactory.undoService.add(new _undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_36__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, spath, epath));
27582
+ if (!((node.imgSrc !== "" || node.fingerPrintSrc !== "") && node.isTemplate && !(preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N) && !(nextNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N))) {
27583
+ _context.next = 109;
27584
+ break;
27585
+ }
27459
27586
 
27460
- if (node.number === 2 || node.number === 1 && node.isTemplate) {
27461
- hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, spath, newSignNode));
27462
- }
27587
+ path = hoEditorFactory.docTree.getNodeLastPath(preNode);
27588
+ signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 0, 0, node.name === "" ? "医师签名" : node.name, node.signType, node.signFormat, "", "", node.signTimeFormat, "", 0, 0, {}, true, node.styleIndex, node.connectMode, node.isFront, node.allowEditSignTime);
27589
+ hoEditorFactory.undoService.begin();
27590
+ hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
27591
+ hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, path, signNode));
27592
+ hoEditorFactory.undoService.commit();
27593
+ return _context.abrupt("return");
27463
27594
 
27464
- hoEditorFactory.undoService.commit();
27465
- return;
27466
- }
27595
+ case 109:
27596
+ if (!(preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
27597
+ _context.next = 119;
27598
+ break;
27467
27599
  }
27468
27600
 
27469
- var pNode = node.parentNode;
27601
+ spath = "";
27602
+
27603
+ if (node.number === 2 || node.number === 1 && node.isTemplate) {
27604
+ spath = hoEditorFactory.docTree.getNodeLastPath(preNode.previousLeaf());
27605
+ } else {
27606
+ spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
27607
+ } //const spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
27608
+
27609
+
27610
+ epath = hoEditorFactory.docTree.getNodeLastPath(node);
27611
+ newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N(this._hoEditorFactoryID, preNode.rootNodes, preNode.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 1, preNode.type, preNode.name === "" ? "签名" : preNode.name, preNode.signType, preNode.signFormat, preNode.signor, preNode.signTime, preNode.signTimeFormat, preNode.imgSrc, preNode.imgWidth, preNode.imgHeight, preNode.customProperty, preNode.isTemplate ? preNode.isTemplate : node.isTemplate, //node.isTemplate,
27612
+ node.styleIndex, preNode.connectMode, preNode.isFront, preNode.allowEditSignTime);
27613
+ hoEditorFactory.undoService.begin();
27614
+ hoEditorFactory.undoService.add(new _undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_36__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, spath, epath));
27615
+
27616
+ if (node.number === 2 || node.number === 1 && node.isTemplate) {
27617
+ hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, spath, newSignNode));
27618
+ }
27619
+
27620
+ hoEditorFactory.undoService.commit();
27621
+ return _context.abrupt("return");
27622
+
27623
+ case 119:
27624
+ pNode = node.parentNode;
27470
27625
  hoEditorFactory.undoService.begin();
27471
27626
  hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
27472
27627
  hoEditorFactory.undoService.commit();
@@ -27474,12 +27629,21 @@ var DocController = /*#__PURE__*/function () {
27474
27629
  if (pNode && pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_46__/* .TextInputFieldNode */ .re && pNode.childNodes.length === 2) {
27475
27630
  this.resetEmptyInputFieldNode(hoEditorFactory, pNode);
27476
27631
  }
27477
- }
27632
+
27633
+ case 124:
27634
+ case "end":
27635
+ return _context.stop();
27478
27636
  }
27479
27637
  }
27480
- }
27638
+ }, _callee, this);
27639
+ }));
27640
+
27641
+ function deleteTextBeforePath(_x) {
27642
+ return _deleteTextBeforePath.apply(this, arguments);
27481
27643
  }
27482
- }
27644
+
27645
+ return deleteTextBeforePath;
27646
+ }()
27483
27647
  }, {
27484
27648
  key: "resetEmptyInputFieldNode",
27485
27649
  value: function resetEmptyInputFieldNode(hoEditorFactory, node) {
@@ -27591,7 +27755,7 @@ var DocController = /*#__PURE__*/function () {
27591
27755
  var drawArea = hoEditorFactory.drawPageTree.getMainRootArea(drawNode);
27592
27756
 
27593
27757
  if (drawArea) {
27594
- var nodeNeedModifyEvent = new _events_NodeNeedModifyEvent__WEBPACK_IMPORTED_MODULE_84__/* .NodeNeedModifyEvent */ .x(arange.npEnd.node, "dblclick", drawArea.index);
27758
+ var nodeNeedModifyEvent = new _events_NodeNeedModifyEvent__WEBPACK_IMPORTED_MODULE_85__/* .NodeNeedModifyEvent */ .x(arange.npEnd.node, "dblclick", drawArea.index);
27595
27759
  hoEditorFactory.docTree.nodeNeedModify(nodeNeedModifyEvent);
27596
27760
  return;
27597
27761
  } else {
@@ -28416,7 +28580,7 @@ var DocController = /*#__PURE__*/function () {
28416
28580
  if (cell && cell instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
28417
28581
  if (cell.table.tableProperty.canAddRow) {
28418
28582
  var _cell$table$getCellIn = cell.table.getCellInfos(cell),
28419
- _cell$table$getCellIn2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell$table$getCellIn, 2),
28583
+ _cell$table$getCellIn2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell$table$getCellIn, 2),
28420
28584
  r = _cell$table$getCellIn2[0],
28421
28585
  c = _cell$table$getCellIn2[1];
28422
28586
 
@@ -28464,7 +28628,7 @@ var DocController = /*#__PURE__*/function () {
28464
28628
  if (cell && cell instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
28465
28629
  if (cell.table.tableProperty.canAddRow) {
28466
28630
  var _cell$table$getCellIn3 = cell.table.getCellInfos(cell),
28467
- _cell$table$getCellIn4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell$table$getCellIn3, 2),
28631
+ _cell$table$getCellIn4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell$table$getCellIn3, 2),
28468
28632
  r = _cell$table$getCellIn4[0],
28469
28633
  c = _cell$table$getCellIn4[1];
28470
28634
 
@@ -28511,7 +28675,7 @@ var DocController = /*#__PURE__*/function () {
28511
28675
 
28512
28676
  if (cell && cell instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
28513
28677
  var _cell$table$getCellIn5 = cell.table.getCellInfos(cell),
28514
- _cell$table$getCellIn6 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell$table$getCellIn5, 2),
28678
+ _cell$table$getCellIn6 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell$table$getCellIn5, 2),
28515
28679
  r = _cell$table$getCellIn6[0],
28516
28680
  c = _cell$table$getCellIn6[1];
28517
28681
 
@@ -28559,7 +28723,7 @@ var DocController = /*#__PURE__*/function () {
28559
28723
 
28560
28724
  if (cell && cell instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
28561
28725
  var _cell$table$getCellIn7 = cell.table.getCellInfos(cell),
28562
- _cell$table$getCellIn8 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell$table$getCellIn7, 2),
28726
+ _cell$table$getCellIn8 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell$table$getCellIn7, 2),
28563
28727
  r = _cell$table$getCellIn8[0],
28564
28728
  c = _cell$table$getCellIn8[1];
28565
28729
 
@@ -28598,7 +28762,7 @@ var DocController = /*#__PURE__*/function () {
28598
28762
  key: "tableDeleteRows",
28599
28763
  value: function tableDeleteRows(aRange) {
28600
28764
  var _TableNode$getSelectT = _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_51__/* .TableNode.getSelectTableRowColInfos */ .Fh.getSelectTableRowColInfos(this._hoEditorFactoryID, aRange),
28601
- _TableNode$getSelectT2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_TableNode$getSelectT, 5),
28765
+ _TableNode$getSelectT2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_TableNode$getSelectT, 5),
28602
28766
  table = _TableNode$getSelectT2[0],
28603
28767
  r1 = _TableNode$getSelectT2[1],
28604
28768
  c1 = _TableNode$getSelectT2[2],
@@ -28653,7 +28817,7 @@ var DocController = /*#__PURE__*/function () {
28653
28817
  key: "tableDeleteCols",
28654
28818
  value: function tableDeleteCols(aRange) {
28655
28819
  var _TableNode$getSelectT3 = _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_51__/* .TableNode.getSelectTableRowColInfos */ .Fh.getSelectTableRowColInfos(this._hoEditorFactoryID, aRange),
28656
- _TableNode$getSelectT4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_TableNode$getSelectT3, 5),
28820
+ _TableNode$getSelectT4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_TableNode$getSelectT3, 5),
28657
28821
  table = _TableNode$getSelectT4[0],
28658
28822
  r1 = _TableNode$getSelectT4[1],
28659
28823
  c1 = _TableNode$getSelectT4[2],
@@ -28722,22 +28886,22 @@ var DocController = /*#__PURE__*/function () {
28722
28886
  }
28723
28887
 
28724
28888
  var _cell1$table$getCellI = cell1.table.getCellInfos(cell1),
28725
- _cell1$table$getCellI2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$getCellI, 2),
28889
+ _cell1$table$getCellI2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$getCellI, 2),
28726
28890
  r1 = _cell1$table$getCellI2[0],
28727
28891
  c1 = _cell1$table$getCellI2[1];
28728
28892
 
28729
28893
  var _cell1$table$getCellI3 = cell1.table.getCellInfos(cell2),
28730
- _cell1$table$getCellI4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$getCellI3, 2),
28894
+ _cell1$table$getCellI4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$getCellI3, 2),
28731
28895
  r2 = _cell1$table$getCellI4[0],
28732
28896
  c2 = _cell1$table$getCellI4[1];
28733
28897
 
28734
28898
  var _cell1$table$calcRowS = cell1.table.calcRowSpanColsSpan(r1, c1, r2, c2),
28735
- _cell1$table$calcRowS2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$calcRowS, 2),
28899
+ _cell1$table$calcRowS2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$calcRowS, 2),
28736
28900
  rowSpan = _cell1$table$calcRowS2[0],
28737
28901
  colSpan = _cell1$table$calcRowS2[1];
28738
28902
 
28739
28903
  var _cell1$table$canMerge = cell1.table.canMergeCell(r1, c1, rowSpan, colSpan),
28740
- _cell1$table$canMerge2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$canMerge, 3),
28904
+ _cell1$table$canMerge2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$canMerge, 3),
28741
28905
  ret = _cell1$table$canMerge2[0],
28742
28906
  aRowSpan = _cell1$table$canMerge2[1],
28743
28907
  aColSpan = _cell1$table$canMerge2[2];
@@ -28783,24 +28947,24 @@ var DocController = /*#__PURE__*/function () {
28783
28947
  var endPath = cell1.table.getNodePath();
28784
28948
 
28785
28949
  var _hoEditorFactory$draw = hoEditorFactory.drawTree.getDrawRootsByPath(endPath),
28786
- _hoEditorFactory$draw2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_hoEditorFactory$draw, 2),
28950
+ _hoEditorFactory$draw2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_hoEditorFactory$draw, 2),
28787
28951
  dcell = _hoEditorFactory$draw2[0],
28788
28952
  dRoots = _hoEditorFactory$draw2[1];
28789
28953
 
28790
28954
  var startDline = dRoots.indexOf(cell1.table.drawTable);
28791
28955
 
28792
28956
  var _cell1$table$getCellI5 = cell1.table.getCellInfos(cell1),
28793
- _cell1$table$getCellI6 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$getCellI5, 2),
28957
+ _cell1$table$getCellI6 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$getCellI5, 2),
28794
28958
  r1 = _cell1$table$getCellI6[0],
28795
28959
  c1 = _cell1$table$getCellI6[1];
28796
28960
 
28797
28961
  var _cell1$table$getCellI7 = cell1.table.getCellInfos(cell2),
28798
- _cell1$table$getCellI8 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$getCellI7, 2),
28962
+ _cell1$table$getCellI8 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$getCellI7, 2),
28799
28963
  r2 = _cell1$table$getCellI8[0],
28800
28964
  c2 = _cell1$table$getCellI8[1];
28801
28965
 
28802
28966
  var _cell1$table$calcRowS3 = cell1.table.calcRowSpanColsSpan(r1, c1, r2, c2),
28803
- _cell1$table$calcRowS4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$calcRowS3, 2),
28967
+ _cell1$table$calcRowS4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$calcRowS3, 2),
28804
28968
  rowSpan = _cell1$table$calcRowS4[0],
28805
28969
  colSpan = _cell1$table$calcRowS4[1]; // cell1.table.mergeCells(r1, c1, rowSpan, colSpan);
28806
28970
 
@@ -28978,7 +29142,7 @@ var DocController = /*#__PURE__*/function () {
28978
29142
  var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_58__/* .CellProperty */ .$W(objectValues);
28979
29143
  cellNode.cellProperty = cellProperty;
28980
29144
  cellNode.drawCell.drawPageCells.forEach(function (pcell) {
28981
- pcell.valignTop = pcell.calcValignTop();
29145
+ pcell.valignTop = pcell.calcValignTop()[0];
28982
29146
  });
28983
29147
  }
28984
29148
  /**
@@ -29199,7 +29363,7 @@ var DocController = /*#__PURE__*/function () {
29199
29363
  var nodesMap = object.obj1;
29200
29364
  var indexsMap = object.obj2;
29201
29365
 
29202
- var _iterator = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createForOfIteratorHelper_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(indexsMap.values()),
29366
+ var _iterator = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createForOfIteratorHelper_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(indexsMap.values()),
29203
29367
  _step;
29204
29368
 
29205
29369
  try {
@@ -29589,14 +29753,14 @@ var DocController = /*#__PURE__*/function () {
29589
29753
  }, {
29590
29754
  key: "initBlankDoc",
29591
29755
  value: function () {
29592
- var _initBlankDoc = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().mark(function _callee() {
29756
+ var _initBlankDoc = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().mark(function _callee2() {
29593
29757
  var hoEditorFactory, firstNode, strFirstPath, aPage;
29594
- return (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().wrap(function _callee$(_context) {
29758
+ return (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().wrap(function _callee2$(_context2) {
29595
29759
  while (1) {
29596
- switch (_context.prev = _context.next) {
29760
+ switch (_context2.prev = _context2.next) {
29597
29761
  case 0:
29598
29762
  hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
29599
- _context.next = 3;
29763
+ _context2.next = 3;
29600
29764
  return hoEditorFactory.drawPageTree.stopPageEvent();
29601
29765
 
29602
29766
  case 3:
@@ -29606,15 +29770,15 @@ var DocController = /*#__PURE__*/function () {
29606
29770
  hoEditorFactory.docTree.clearDocTree();
29607
29771
  hoEditorFactory.drawPageTree.clear();
29608
29772
  hoEditorFactory.drawPageTree.initDoc();
29609
- _context.next = 11;
29773
+ _context2.next = 11;
29610
29774
  return hoEditorFactory.drawTree.buildDrawTree(hoEditorFactory.subDocManger.headerDocTree[0].subDocNodes, hoEditorFactory.drawTree.headerDNodes[0]);
29611
29775
 
29612
29776
  case 11:
29613
- _context.next = 13;
29777
+ _context2.next = 13;
29614
29778
  return hoEditorFactory.drawTree.buildDrawTree(hoEditorFactory.subDocManger.footerDocTree[0].subDocNodes, hoEditorFactory.drawTree.footerDNodes[0]);
29615
29779
 
29616
29780
  case 13:
29617
- _context.next = 15;
29781
+ _context2.next = 15;
29618
29782
  return hoEditorFactory.drawTree.buildDrawTree(hoEditorFactory.docTree.mainNodes, hoEditorFactory.drawTree.mainDNodes);
29619
29783
 
29620
29784
  case 15:
@@ -29639,10 +29803,10 @@ var DocController = /*#__PURE__*/function () {
29639
29803
 
29640
29804
  case 25:
29641
29805
  case "end":
29642
- return _context.stop();
29806
+ return _context2.stop();
29643
29807
  }
29644
29808
  }
29645
- }, _callee, this);
29809
+ }, _callee2, this);
29646
29810
  }));
29647
29811
 
29648
29812
  function initBlankDoc() {
@@ -29975,7 +30139,7 @@ var DocController = /*#__PURE__*/function () {
29975
30139
 
29976
30140
  hoeditorfactory.undoService.begin();
29977
30141
  var newParaPath = paraNode.getNodePath();
29978
- var separateCharNode = new _treeNode_SeparateCharNode__WEBPACK_IMPORTED_MODULE_80__/* .SeparateCharNode */ .O(this._hoEditorFactoryID, np.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSeparateChar */ .Jq.ntSeparateChar, width, color);
30142
+ var separateCharNode = new _treeNode_SeparateCharNode__WEBPACK_IMPORTED_MODULE_81__/* .SeparateCharNode */ .O(this._hoEditorFactoryID, np.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSeparateChar */ .Jq.ntSeparateChar, width, color);
29979
30143
  hoeditorfactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, newParaPath, separateCharNode));
29980
30144
  hoeditorfactory.undoService.commit();
29981
30145
  }
@@ -29999,7 +30163,7 @@ var DocController = /*#__PURE__*/function () {
29999
30163
  if (np) {
30000
30164
  var node = np.node;
30001
30165
 
30002
- if (node instanceof _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_85__/* .GestationNode */ .G) {
30166
+ if (node instanceof _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_86__/* .GestationNode */ .G) {
30003
30167
  hoEditorFactory.undoService.begin();
30004
30168
  hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath, "update"));
30005
30169
  startPath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
@@ -30008,7 +30172,7 @@ var DocController = /*#__PURE__*/function () {
30008
30172
  }
30009
30173
 
30010
30174
  var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
30011
- var gestationNode = new _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_85__/* .GestationNode */ .G(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntGestation */ .Jq.ntGestation, lastMenstruationDate, usedDate, hoEditorFactory.docTree.curStyleIndex); //插入节点
30175
+ var gestationNode = new _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_86__/* .GestationNode */ .G(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntGestation */ .Jq.ntGestation, lastMenstruationDate, usedDate, hoEditorFactory.docTree.curStyleIndex); //插入节点
30012
30176
 
30013
30177
  if (operType === "add") {
30014
30178
  hoEditorFactory.undoService.begin();
@@ -30020,12 +30184,12 @@ var DocController = /*#__PURE__*/function () {
30020
30184
  }, {
30021
30185
  key: "textToLabel",
30022
30186
  value: function () {
30023
- var _textToLabel = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().mark(function _callee2(range) {
30187
+ var _textToLabel = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().mark(function _callee3(range) {
30024
30188
  var hoeditorfactory, astart, aend, sChildIndex, eChildIndex, anode, startPath, endPath, drawNode, i, text, pathArr, _pathArr, labelNode, delRange, anodeEndPath, result;
30025
30189
 
30026
- return (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().wrap(function _callee2$(_context2) {
30190
+ return (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().wrap(function _callee3$(_context3) {
30027
30191
  while (1) {
30028
- switch (_context2.prev = _context2.next) {
30192
+ switch (_context3.prev = _context3.next) {
30029
30193
  case 0:
30030
30194
  hoeditorfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
30031
30195
  astart = range.npStart.node;
@@ -30038,12 +30202,12 @@ var DocController = /*#__PURE__*/function () {
30038
30202
 
30039
30203
  case 8:
30040
30204
  if (!anode) {
30041
- _context2.next = 34;
30205
+ _context3.next = 34;
30042
30206
  break;
30043
30207
  }
30044
30208
 
30045
30209
  if (!(anode instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R)) {
30046
- _context2.next = 32;
30210
+ _context3.next = 32;
30047
30211
  break;
30048
30212
  }
30049
30213
 
@@ -30052,21 +30216,21 @@ var DocController = /*#__PURE__*/function () {
30052
30216
 
30053
30217
  case 12:
30054
30218
  if (!(i < anode.drawNodes.length)) {
30055
- _context2.next = 19;
30219
+ _context3.next = 19;
30056
30220
  break;
30057
30221
  }
30058
30222
 
30059
30223
  if (!(sChildIndex < anode.drawNodes[i].endIndex)) {
30060
- _context2.next = 16;
30224
+ _context3.next = 16;
30061
30225
  break;
30062
30226
  }
30063
30227
 
30064
30228
  drawNode = anode.drawNodes[i];
30065
- return _context2.abrupt("break", 19);
30229
+ return _context3.abrupt("break", 19);
30066
30230
 
30067
30231
  case 16:
30068
30232
  i++;
30069
- _context2.next = 12;
30233
+ _context3.next = 12;
30070
30234
  break;
30071
30235
 
30072
30236
  case 19:
@@ -30107,9 +30271,9 @@ var DocController = /*#__PURE__*/function () {
30107
30271
  }
30108
30272
  }
30109
30273
 
30110
- labelNode = new _treeNode_LabelNode__WEBPACK_IMPORTED_MODULE_81__/* .LabelNode */ .P(this._hoEditorFactoryID, range.npStart.roots, anode.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntLabel */ .Jq.ntLabel, text, anode.styleIndex);
30274
+ labelNode = new _treeNode_LabelNode__WEBPACK_IMPORTED_MODULE_82__/* .LabelNode */ .P(this._hoEditorFactoryID, range.npStart.roots, anode.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntLabel */ .Jq.ntLabel, text, anode.styleIndex);
30111
30275
  delRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath);
30112
- _context2.next = 28;
30276
+ _context3.next = 28;
30113
30277
  return this.deleteRange(delRange, true);
30114
30278
 
30115
30279
  case 28:
@@ -30123,7 +30287,7 @@ var DocController = /*#__PURE__*/function () {
30123
30287
 
30124
30288
  if (anode) {
30125
30289
  anodeEndPath = hoeditorfactory.docTree.getNodeLastPath(anode);
30126
- result = _NodePosition__WEBPACK_IMPORTED_MODULE_82__/* .NodePosition.treePathCompare */ .F.treePathCompare(anodeEndPath, range.startPath);
30290
+ result = _NodePosition__WEBPACK_IMPORTED_MODULE_83__/* .NodePosition.treePathCompare */ .F.treePathCompare(anodeEndPath, range.startPath);
30127
30291
 
30128
30292
  if (result <= 0) {
30129
30293
  anode = null;
@@ -30132,19 +30296,19 @@ var DocController = /*#__PURE__*/function () {
30132
30296
 
30133
30297
  case 34:
30134
30298
  if (anode && astart.previousLeaf() && anode !== astart.previousLeaf()) {
30135
- _context2.next = 8;
30299
+ _context3.next = 8;
30136
30300
  break;
30137
30301
  }
30138
30302
 
30139
30303
  case 35:
30140
30304
  case "end":
30141
- return _context2.stop();
30305
+ return _context3.stop();
30142
30306
  }
30143
30307
  }
30144
- }, _callee2, this);
30308
+ }, _callee3, this);
30145
30309
  }));
30146
30310
 
30147
- function textToLabel(_x) {
30311
+ function textToLabel(_x2) {
30148
30312
  return _textToLabel.apply(this, arguments);
30149
30313
  }
30150
30314
 
@@ -30188,7 +30352,7 @@ var DocController = /*#__PURE__*/function () {
30188
30352
  var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
30189
30353
  var startPath = domRange.startPath;
30190
30354
  var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
30191
- var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 0, 0, name, signType, signFormat, "", "", signTimeFormat, "", 0, 0, {}, true, hoEditorFactory.docTree.curStyleIndex, connectMode, isFront, allowEditSignTime, undefined, undefined, attribute, connectChar); //插入该表达式节点
30355
+ var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 0, 0, name, signType, signFormat, "", "", signTimeFormat, "", 0, 0, {}, true, hoEditorFactory.docTree.curStyleIndex, connectMode, isFront, allowEditSignTime, undefined, undefined, attribute, connectChar); //插入该表达式节点
30192
30356
 
30193
30357
  hoEditorFactory.undoService.begin();
30194
30358
  hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, signNode));
@@ -30218,7 +30382,7 @@ var DocController = /*#__PURE__*/function () {
30218
30382
  // }
30219
30383
  // }
30220
30384
 
30221
- var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 1, type, name, 0, "医师签名", signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, hoEditorFactory.docTree.curStyleIndex, undefined, undefined, undefined, fingerPrintSrc, fingerPosition); //插入该表达式节点
30385
+ var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 1, type, name, 0, "医师签名", signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, hoEditorFactory.docTree.curStyleIndex, undefined, undefined, undefined, fingerPrintSrc, fingerPosition); //插入该表达式节点
30222
30386
 
30223
30387
  hoEditorFactory.undoService.begin();
30224
30388
  hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, signNode));
@@ -30282,7 +30446,7 @@ var DocController = /*#__PURE__*/function () {
30282
30446
  }
30283
30447
  }
30284
30448
 
30285
- var newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 2, type, name, node.signType, node.signFormat, signor, signTime, node.signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, node.styleIndex, node.connectMode, type == 1 && node.signType == 1 ? true : node.isFront, node.allowEditSignTime, fingerPrintSrc, fingerPosition); //插入该表达式节点
30449
+ var newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 2, type, name, node.signType, node.signFormat, signor, signTime, node.signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, node.styleIndex, node.connectMode, type == 1 && node.signType == 1 ? true : node.isFront, node.allowEditSignTime, fingerPrintSrc, fingerPosition); //插入该表达式节点
30286
30450
 
30287
30451
  hoEditorFactory.undoService.begin();
30288
30452
  hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, sPath, newSignNode));
@@ -30412,7 +30576,7 @@ var DocController = /*#__PURE__*/function () {
30412
30576
  var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
30413
30577
 
30414
30578
  var _cell$table$canMergeC = cell.table.canMergeCell(r, c, rowSpan, colSpan),
30415
- _cell$table$canMergeC2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell$table$canMergeC, 3),
30579
+ _cell$table$canMergeC2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell$table$canMergeC, 3),
30416
30580
  ret = _cell$table$canMergeC2[0],
30417
30581
  aRowSpan = _cell$table$canMergeC2[1],
30418
30582
  aColSpan = _cell$table$canMergeC2[2];
@@ -47440,16 +47604,13 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
47440
47604
  _this._signTime = signTime;
47441
47605
  _this._imgSrc = imgSrc;
47442
47606
  _this._attribute = attribute === undefined ? 0 : attribute;
47443
- _this._connectChar = connectChar === undefined ? ":" : connectChar;
47444
-
47445
- if (fingerPrintSrc || imgSrc && !fingerPrintSrc && customProperty && !customProperty.abi02) {
47446
- // 用自定义属性区分并兼容旧的患者签名
47447
- _this._attribute = 1;
47448
- _this._type = 3;
47449
- } // if(attribute == 1) { // 患者签名修改 type == 3
47607
+ _this._connectChar = connectChar === undefined ? ":" : connectChar; // if (fingerPrintSrc || (imgSrc && !fingerPrintSrc && customProperty && !customProperty.created_date)) { // 用自定义属性区分并兼容旧的患者签名
47608
+ // this._attribute = 1;
47609
+ // this._type = 3;
47610
+ // }
47611
+ // if(attribute == 1) { // 患者签名修改 type == 3
47450
47612
  // this._type = 3;
47451
47613
  // }
47452
-
47453
47614
 
47454
47615
  if (fingerPrintSrc) {
47455
47616
  _this._fingerPrintSrc = fingerPrintSrc;
@@ -55595,6 +55756,8 @@ var UnitConvert = __webpack_require__(38100);
55595
55756
  var BaseNode = __webpack_require__(50369);
55596
55757
  // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawDownListNode.ts
55597
55758
  var DrawDownListNode = __webpack_require__(63756);
55759
+ // EXTERNAL MODULE: ./src/editor/dom/treeNode/TextInputFieldNode.ts
55760
+ var TextInputFieldNode = __webpack_require__(34565);
55598
55761
  ;// CONCATENATED MODULE: ./src/editor/draw/DrawLine.ts
55599
55762
 
55600
55763
 
@@ -55616,6 +55779,7 @@ var DrawDownListNode = __webpack_require__(63756);
55616
55779
 
55617
55780
 
55618
55781
 
55782
+
55619
55783
 
55620
55784
 
55621
55785
  var DrawLine = /*#__PURE__*/function (_DrawContainer) {
@@ -56230,6 +56394,10 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
56230
56394
  break;
56231
56395
  }
56232
56396
  }
56397
+
56398
+ if (Paragraph/* Align.alright */.xM.alright && this.paragraphNode.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && this.paragraphNode.parentNode.alignWithBlocked) {
56399
+ usedWidth = 0;
56400
+ }
56233
56401
  /**
56234
56402
  * 返回字间距
56235
56403
  * @param index 字序号
@@ -63059,9 +63227,12 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
63059
63227
  }
63060
63228
  }, {
63061
63229
  key: "afterHeightChanged",
63062
- value: function afterHeightChanged(oldHeight, newHeight) {
63063
- if (this._cell.cellProperty.align != TableProperty/* VAlign.vatop */.TR.vatop) {
63064
- var newValignTop = this.calcValignTop();
63230
+ value: function afterHeightChanged() {
63231
+ if (this._cell.cellProperty.align == TableProperty/* VAlign.vacenter */.TR.vacenter) {
63232
+ var _this$calcValignTop = this.calcValignTop(),
63233
+ _this$calcValignTop2 = (0,slicedToArray/* default */.Z)(_this$calcValignTop, 2),
63234
+ newValignTop = _this$calcValignTop2[0],
63235
+ topArr = _this$calcValignTop2[1];
63065
63236
 
63066
63237
  if (newValignTop != this._valignTop) {
63067
63238
  var adjustValignTop = newValignTop - this._valignTop;
@@ -63073,6 +63244,56 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
63073
63244
  }
63074
63245
  }
63075
63246
  }
63247
+ } else if (this._cell.cellProperty.align == TableProperty/* VAlign.vabottom */.TR.vabottom) {
63248
+ var _this$calcValignTop3 = this.calcValignTop(),
63249
+ _this$calcValignTop4 = (0,slicedToArray/* default */.Z)(_this$calcValignTop3, 2),
63250
+ _newValignTop = _this$calcValignTop4[0],
63251
+ rowHeightArr = _this$calcValignTop4[1];
63252
+
63253
+ if (rowHeightArr) {
63254
+ // const getPlace=(dTop:number,dPageCellIndex: number,dHeight:number):[number,number]=>{
63255
+ // let index=0;
63256
+ // let newTop=dTop;
63257
+ // let rowHeight=0;
63258
+ // for (let i=0;i<topArr.length;i++ ){
63259
+ // if (dTop+dHeight<topArr[i]){
63260
+ // index=i;
63261
+ // break;
63262
+ // }
63263
+ // else {
63264
+ // newTop-=topArr[i]
63265
+ // }
63266
+ // }
63267
+ // return [index,newTop]
63268
+ // }
63269
+ if (_newValignTop != this._valignTop) {
63270
+ this._valignTop = _newValignTop;
63271
+ var childCount = this._cell.drawCell.drawLines.length;
63272
+ var pageCellIndex = this._cell.drawCell.drawPageCells.length - 1;
63273
+ var dPageCell = this._cell.drawCell.drawPageCells[pageCellIndex];
63274
+ var cellrestHeight = rowHeightArr[pageCellIndex];
63275
+
63276
+ for (var _i = childCount - 1; _i >= 0; _i--) {
63277
+ var dObj = this._cell.drawCell.drawLines[_i];
63278
+
63279
+ if (dObj instanceof DrawLine/* DrawLine */.a || dObj instanceof DrawPageTable/* DrawPageTable */.ox) {
63280
+ while (pageCellIndex > 0 && cellrestHeight < dObj.dHeight) {
63281
+ pageCellIndex -= 1;
63282
+ dPageCell = this._cell.drawCell.drawPageCells[pageCellIndex];
63283
+ cellrestHeight = rowHeightArr[pageCellIndex];
63284
+ }
63285
+
63286
+ if (!dPageCell.contains(dObj) && dObj.parent && dObj.parent.contains(dObj)) {
63287
+ dObj.parent.removeChild(dObj);
63288
+ }
63289
+
63290
+ dObj.y = cellrestHeight - dObj.dHeight - dObj.paragraphNode.combineParagraph.lineSpace;
63291
+ cellrestHeight = dObj.y;
63292
+ dPageCell.addChild(dObj); // const [pageCellIndex,newTop]=getPlace(dTop,index,dObj.dHeight);
63293
+ }
63294
+ }
63295
+ }
63296
+ }
63076
63297
  }
63077
63298
  }
63078
63299
  }, {
@@ -63094,9 +63315,12 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
63094
63315
  value: function calcValignTop() {
63095
63316
  var index = this.cell.drawCell.drawPageCells.indexOf(this);
63096
63317
  var innerTop = 0;
63318
+ var toparr = new Array();
63319
+ var aHeight = 0;
63320
+ var hoeditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID);
63097
63321
 
63098
63322
  if (index == 0) {
63099
- innerTop = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID).unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[0] * 10, true);
63323
+ innerTop = hoeditorFactory.unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[0] * 10, true);
63100
63324
  }
63101
63325
 
63102
63326
  var valignTop = innerTop;
@@ -63104,34 +63328,63 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
63104
63328
  if (this._cell.cellProperty.align === TableProperty/* VAlign.vatop */.TR.vatop) {
63105
63329
  valignTop = innerTop;
63106
63330
  } else if (this._cell.cellProperty.align === TableProperty/* VAlign.vacenter */.TR.vacenter) {
63107
- var aHeight = this.calcCellHeight();
63331
+ var _this$calcCellHeight = this.calcCellHeight();
63332
+
63333
+ var _this$calcCellHeight2 = (0,slicedToArray/* default */.Z)(_this$calcCellHeight, 2);
63334
+
63335
+ aHeight = _this$calcCellHeight2[0];
63336
+ toparr = _this$calcCellHeight2[1];
63108
63337
  if (aHeight > this._cell.drawCell.docHeight) valignTop = (aHeight - this._cell.drawCell.docHeight) / 2;
63109
63338
  } else if (this._cell.cellProperty.align === TableProperty/* VAlign.vabottom */.TR.vabottom) {
63110
- var _aHeight = this.calcCellHeight();
63339
+ var _this$calcCellHeight3 = this.calcCellHeight();
63340
+
63341
+ var _this$calcCellHeight4 = (0,slicedToArray/* default */.Z)(_this$calcCellHeight3, 2);
63342
+
63343
+ aHeight = _this$calcCellHeight4[0];
63344
+ toparr = _this$calcCellHeight4[1];
63345
+ var innerBottom = hoeditorFactory.unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[1] * 10, true);
63346
+ var restRowHeight = 0;
63111
63347
 
63112
- var innerBottom = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID).unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[1] * 10, true);
63113
- if (_aHeight > this._cell.drawCell.docHeight) valignTop = _aHeight - this._cell.drawCell.docHeight - innerBottom;
63348
+ for (var r = index; r < toparr.length; r++) {
63349
+ restRowHeight += toparr[r];
63350
+ }
63351
+
63352
+ if (aHeight > this._cell.drawCell.docHeight && this._cell.drawCell.docHeight < restRowHeight) {
63353
+ valignTop = restRowHeight - this._cell.drawCell.docHeight - innerBottom;
63354
+ }
63114
63355
  }
63115
63356
 
63116
- return valignTop;
63357
+ return [valignTop, toparr];
63117
63358
  }
63118
63359
  }, {
63119
63360
  key: "update",
63120
63361
  value: function update(prevDrawArea, dlines, startIndex, dTop, restHeight) {
63121
- var valignTop = dTop; // if (startIndex === 0) {
63362
+ var valignTop = dTop;
63363
+
63364
+ if (this._cell.cellProperty.align == TableProperty/* VAlign.vabottom */.TR.vabottom) {
63365
+ valignTop = this.calcValignTop()[0];
63366
+ this._valignTop = valignTop;
63367
+ } // if (startIndex === 0) {
63122
63368
  // valignTop=this.calcValignTop();
63123
63369
  // this._valignTop=valignTop;
63124
63370
  // }
63125
63371
 
63372
+
63126
63373
  this._startDline = startIndex;
63127
63374
 
63128
63375
  var ret = (0,get/* default */.Z)((0,getPrototypeOf/* default */.Z)(DrawPageCell.prototype), "update", this).call(this, prevDrawArea, dlines, startIndex, valignTop, restHeight);
63129
63376
 
63130
- this._docHeight -= valignTop;
63377
+ this._docHeight = Math.max(0, this._docHeight - valignTop);
63131
63378
  this.updateDHeight();
63132
63379
  return ret; // this.updateTouchArea(this._dHeight);
63133
63380
  // this.paintCellBackground(this._dHeight);
63134
63381
  }
63382
+ /**
63383
+ *
63384
+ * @returns
63385
+ * 返回单元格在所有分页上的总高度,以及每页高度数组
63386
+ */
63387
+
63135
63388
  }, {
63136
63389
  key: "calcCellHeight",
63137
63390
  value: function calcCellHeight() {
@@ -63141,16 +63394,55 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
63141
63394
  c = _this$_cell$table$get6[1];
63142
63395
 
63143
63396
  var ret = 0;
63397
+ var hoeditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID);
63398
+ var dTopArr = new Array();
63144
63399
 
63145
- for (var r = row, count = this._cell.rowSpan + row - 1; r <= count; r++) {
63146
- var rowInfos = this._drawPageTable.partRowHeights.get(r);
63400
+ if (this._cell.cellProperty.align == TableProperty/* VAlign.vabottom */.TR.vabottom) {
63401
+ ret = 0;
63147
63402
 
63148
- if (rowInfos) {
63149
- ret += rowInfos.rowHeight;
63403
+ for (var r = row, count = this._cell.rowSpan + row - 1; r <= count; r++) {
63404
+ var rowInfos = this._cell.table.rowInfos[r];
63405
+
63406
+ if (rowInfos) {
63407
+ ret += rowInfos.rowHeight;
63408
+ }
63409
+ }
63410
+
63411
+ var icount = this._cell.table.drawTable.drawPageTables.length;
63412
+ var index = 0;
63413
+ var pageHeight = 0;
63414
+
63415
+ for (var i = 0; i < icount; i++) {
63416
+ dTopArr[index] = 0;
63417
+
63418
+ for (var _r = row, _count = this._cell.rowSpan + row - 1; _r <= _count; _r++) {
63419
+ var dTable = this._cell.table.drawTable.drawPageTables[i];
63420
+
63421
+ if (dTable.parent && dTable.parent.contains(dTable)) {
63422
+ var _rowInfos = dTable.partRowHeights.get(_r);
63423
+
63424
+ if (_rowInfos) {
63425
+ if (pageHeight < ret) {
63426
+ pageHeight += _rowInfos.rowHeight;
63427
+ dTopArr[index] += _rowInfos.rowHeight;
63428
+ }
63429
+ }
63430
+ }
63431
+
63432
+ index += 1;
63433
+ }
63434
+ }
63435
+ } else if (this._cell.cellProperty.align == TableProperty/* VAlign.vacenter */.TR.vacenter) {
63436
+ for (var _r2 = row, _count2 = this._cell.rowSpan + row - 1; _r2 <= _count2; _r2++) {
63437
+ var _rowInfos2 = this._drawPageTable.partRowHeights.get(_r2);
63438
+
63439
+ if (_rowInfos2) {
63440
+ ret += _rowInfos2.rowHeight;
63441
+ }
63150
63442
  }
63151
63443
  }
63152
63444
 
63153
- return ret;
63445
+ return [ret, dTopArr];
63154
63446
  }
63155
63447
  }]);
63156
63448
 
@@ -63801,7 +64093,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63801
64093
  if (partCell) {
63802
64094
  var oldHeight = partCell.dHeight;
63803
64095
  partCell.dHeight = newHeight;
63804
- partCell.afterHeightChanged(oldHeight, newHeight);
64096
+ partCell.afterHeightChanged();
63805
64097
 
63806
64098
  if (partCell.cell.rowSpan > 1) {
63807
64099
  var index = partCell.cell.drawCell.drawPageCells.indexOf(partCell) - 1;
@@ -65714,14 +66006,14 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
65714
66006
  /* 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);
65715
66007
  /* 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);
65716
66008
  /* 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);
65717
- /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(74916);
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__);
65719
- /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(23123);
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__);
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__);
66009
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(26699);
66010
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3__);
66011
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(32023);
66012
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4__);
66013
+ /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(74916);
66014
+ /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_5__);
66015
+ /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(23123);
66016
+ /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_6__);
65725
66017
  /* harmony import */ var _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(15798);
65726
66018
  /* harmony import */ var _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(34450);
65727
66019
  /* harmony import */ var _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(24113);
@@ -65743,7 +66035,7 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
65743
66035
  /*
65744
66036
  * @Author: your name
65745
66037
  * @Date: 2021-09-01 16:51:49
65746
- * @LastEditTime: 2022-08-18 14:08:29
66038
+ * @LastEditTime: 2022-08-29 10:17:11
65747
66039
  * @LastEditors: liyanan 2441631434@qq.com
65748
66040
  * @Description: In User Settings Edit
65749
66041
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawSignNode.ts
@@ -65782,9 +66074,20 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65782
66074
 
65783
66075
  _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight; //this.dHeight = 40;
65784
66076
 
65785
- _this._textStyle = cbStyle.getStyleKey();
66077
+ _this._textStyle = cbStyle.getStyleKey(); // 处理混乱的类型
66078
+
66079
+ if (node.customProperty && node.customProperty.created_date) {
66080
+ // 区分图片签名和普通文本签名 并更新对应的值
66081
+ if ((imgSrc.includes('data:image/') || imgSrc.split("/").length > 1) && type == 3) {
66082
+ node.type = 1;
66083
+ _this.type = 1;
66084
+ } else if (!imgSrc.includes('data:image/') && !imgSrc.includes("/") && type == 3) {
66085
+ node.type = 2;
66086
+ _this.type = 2;
66087
+ }
66088
+ }
65786
66089
 
65787
- if (_this.number > 0 && type === 2) {
66090
+ if (_this.number > 0 && _this.type === 2) {
65788
66091
  var signArr = imgSrc.split('\n');
65789
66092
 
65790
66093
  if (signArr.length > 1) {
@@ -65810,7 +66113,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65810
66113
  var dText = new createjs.Text(_this.signName, _this._textStyle, '#000000');
65811
66114
  _this.dWidth = dText.getMeasuredWidth();
65812
66115
  } else {
65813
- if (type === 1) {
66116
+ if (_this.type === 1) {
65814
66117
  var scale = _this.dHeight / imgHeight;
65815
66118
 
65816
66119
  if (number === 1) {
@@ -65825,7 +66128,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65825
66128
  }
65826
66129
  }
65827
66130
 
65828
- if (type === 2) {
66131
+ if (_this.type === 2) {
65829
66132
  var _signArr = imgSrc.split('\n');
65830
66133
 
65831
66134
  var aText = new createjs.Text(_signArr[0], _this._textStyle, '#000000');
@@ -65855,31 +66158,12 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65855
66158
  }
65856
66159
  }
65857
66160
  }
65858
- }
65859
-
65860
- if ((imgSrc || fingerPrintSrc) && type == 1 || type == 3) {
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
- }
66161
+ } // if ((((imgSrc || fingerPrintSrc) && this.type == 1) || this.type == 3) && node.customProperty && !node.customProperty.created_date) {
65871
66162
 
65872
- console.warn('医生签名');
65873
-
65874
- _this.drawSignNode();
65875
- } else {
65876
- console.warn('患者签名');
65877
66163
 
65878
- _this.drawWriteSignNode(node);
65879
- }
66164
+ if (fingerPrintSrc || imgSrc && !fingerPrintSrc && node.customProperty && !node.customProperty.created_date) {
66165
+ _this.drawWriteSignNode(node);
65880
66166
  } else {
65881
- console.warn('医生签名');
65882
-
65883
66167
  _this.drawSignNode();
65884
66168
  }
65885
66169
 
@@ -66184,6 +66468,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66184
66468
  image.src = _this3.imgSrc;
66185
66469
  var bitmap = new createjs.Bitmap(image);
66186
66470
  bitmap.y = -_this3.dHeight;
66471
+ bitmap.setBounds(0, 0, drawNode.dWidth, drawNode.dHeight);
66187
66472
 
66188
66473
  if (_this3.number === 1) {
66189
66474
  bitmap.x = 0;
@@ -66678,6 +66963,7 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
66678
66963
  key: "updateRowHeight",
66679
66964
  value: function updateRowHeight(r) {
66680
66965
  var dHeight = _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_13__/* .gDefaultRowHeight */ .dT;
66966
+ var bottonAlignCell = new Array();
66681
66967
  var rowPorpertyHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_14__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(this._table.rowInfos[r].rowProperty.rowHeight * 10, false);
66682
66968
 
66683
66969
  if (this._table.rowInfos[r].rowProperty.isSpecifyHeight) {
@@ -66692,6 +66978,10 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
66692
66978
  for (var c = 0; c < this._table.colCount; c++) {
66693
66979
  var aCell = this._table.rows[r][c];
66694
66980
 
66981
+ if (aCell && aCell.cellProperty.align == _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_11__/* .VAlign.vabottom */ .TR.vabottom) {
66982
+ bottonAlignCell.push(aCell);
66983
+ }
66984
+
66695
66985
  if (aCell && aCell.rowSpan === 1 && aCell.drawCell.dHeight > dHeight) {
66696
66986
  dHeight = aCell.drawCell.dHeight; // let nextValue = aCell.drawCell.drawPageCells.values().next();
66697
66987
  // while (!nextValue.done) {
@@ -66729,6 +67019,10 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
66729
67019
  if (dHeight > rowPorpertyHeight) this._table.rowInfos[r].rowHeight = rowPorpertyHeight;else this._table.rowInfos[r].rowHeight = dHeight;
66730
67020
  } else this._table.rowInfos[r].rowHeight = dHeight;
66731
67021
  }
67022
+
67023
+ for (var _c = 0; _c < bottonAlignCell.length; _c++) {
67024
+ bottonAlignCell[_c].drawCell.needUpdate = true;
67025
+ }
66732
67026
  } // for (let c = 0; c < this._table.colCount; c++) {
66733
67027
  // const aCell = this._table.rows[r][c];
66734
67028
  // if (aCell) {
@@ -66860,7 +67154,24 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
66860
67154
 
66861
67155
  this.finishUpdate();
66862
67156
  }
66863
- }
67157
+ } // for (let i=0;i<this._drawPageTables.length-1;i++){
67158
+ // let c=0;
67159
+ // while (c<this._table.colCount){
67160
+ // const [cell,mr,mc]= this._table.getMainCell(dPageTable.endRow,c);
67161
+ // let inc=1;
67162
+ // if (cell){
67163
+ // if (cell.cellProperty.align==VAlign.vabottom){
67164
+ // const pageCell= cell.drawCell.getDrawPageCell(dPageTable);
67165
+ // if (pageCell){
67166
+ // pageCell.afterHeightChanged()
67167
+ // }
67168
+ // inc=cell.rowSpan;
67169
+ // }
67170
+ // c+=inc;
67171
+ // }
67172
+ // }
67173
+ // }
67174
+
66864
67175
 
66865
67176
  rowTop = dTop + dPageTable.dHeight;
66866
67177
 
@@ -70154,6 +70465,8 @@ var TableFormula = __webpack_require__(39869);
70154
70465
  var DrawConfig = __webpack_require__(39353);
70155
70466
  // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawSignNode.ts
70156
70467
  var DrawSignNode = __webpack_require__(91390);
70468
+ // EXTERNAL MODULE: ./src/editor/dom/TableProperty.ts
70469
+ var TableProperty = __webpack_require__(68183);
70157
70470
  ;// CONCATENATED MODULE: ./src/editor/draw/drawTree/DrawTree.ts
70158
70471
 
70159
70472
 
@@ -70216,6 +70529,7 @@ var DrawSignNode = __webpack_require__(91390);
70216
70529
 
70217
70530
 
70218
70531
 
70532
+
70219
70533
 
70220
70534
 
70221
70535
  //当前的显示状态,psDesign为设计状态,psEdit为正常编辑状态 psPreview为打印预览态态 psPrint 正在打印状态, psReview审阅状态
@@ -72609,20 +72923,38 @@ var DrawTree = /*#__PURE__*/function () {
72609
72923
 
72610
72924
  var _index2 = dPlace.cell.drawCell.drawPageCells.indexOf(dPlace);
72611
72925
 
72612
- while (_index2 > 0) {
72613
- aPrevPlace = dPlace.cell.drawCell.drawPageCells[_index2 - 1];
72926
+ if (dPlace.cell.cellProperty.align != TableProperty/* VAlign.vabottom */.TR.vabottom) {
72927
+ while (_index2 > 0) {
72928
+ aPrevPlace = dPlace.cell.drawCell.drawPageCells[_index2 - 1];
72614
72929
 
72615
- if (!aPrevPlace.isEmpty()) {
72616
- var rootArea = hoeditfactory.drawPageTree.getMainRootArea(aPrevPlace);
72930
+ if (!aPrevPlace.isEmpty()) {
72931
+ var rootArea = hoeditfactory.drawPageTree.getMainRootArea(aPrevPlace);
72617
72932
 
72618
- if (rootArea) {
72619
- aPage = this._drawPages[rootArea.index];
72933
+ if (rootArea) {
72934
+ aPage = this._drawPages[rootArea.index];
72935
+ }
72936
+
72937
+ return this.getStagePosition(aPage, aPrevPlace, x, 99999999);
72620
72938
  }
72621
72939
 
72622
- return this.getStagePosition(aPage, aPrevPlace, x, 99999999);
72940
+ _index2 -= 1;
72623
72941
  }
72942
+ } else {
72943
+ while (_index2 < dPlace.cell.drawCell.drawPageCells.length - 1) {
72944
+ aPrevPlace = dPlace.cell.drawCell.drawPageCells[_index2 + 1];
72624
72945
 
72625
- _index2 -= 1;
72946
+ if (!aPrevPlace.isEmpty()) {
72947
+ var _rootArea = hoeditfactory.drawPageTree.getMainRootArea(aPrevPlace);
72948
+
72949
+ if (_rootArea) {
72950
+ aPage = this._drawPages[_rootArea.index];
72951
+ }
72952
+
72953
+ return this.getStagePosition(aPage, aPrevPlace, x, 99999999);
72954
+ }
72955
+
72956
+ _index2 += 1;
72957
+ }
72626
72958
  }
72627
72959
  } // if (dPlace instanceof DrawCell) {
72628
72960
  // dItems = (dPlace as DrawCell).drawLxines;
@@ -212787,7 +213119,7 @@ var map = {
212787
213119
  "./poperSelect/PoperMark.vue": 93069,
212788
213120
  "./poperSelect/PoperSelect.vue": 23915,
212789
213121
  "./poperTipText/PoperTipText.vue": 91831,
212790
- "./popers/Poper.vue": 96012,
213122
+ "./popers/Poper.vue": 25425,
212791
213123
  "./popers/Title.vue": 40168,
212792
213124
  "./printstyle/PrintLineStyle.vue": 90069,
212793
213125
  "./qrCode/QrCode.vue": 67776,
@@ -212802,7 +213134,7 @@ var map = {
212802
213134
  "./table/TableRowProperty.vue": 74456,
212803
213135
  "./textDialog/TextDialog.vue": 74796,
212804
213136
  "./upload/CanvasImageDialog.vue": 49532,
212805
- "./upload/UploadImageDialog.vue": 44584
213137
+ "./upload/UploadImageDialog.vue": 97599
212806
213138
  };
212807
213139
 
212808
213140
 
@@ -214341,9 +214673,9 @@ var es_string_match = __webpack_require__(4723);
214341
214673
  var es_number_constructor = __webpack_require__(9653);
214342
214674
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
214343
214675
  var es_json_stringify = __webpack_require__(38862);
214344
- ;// 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&
214345
- 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)}
214346
- var HoDocvue_type_template_id_22896312_staticRenderFns = []
214676
+ ;// 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=7e5f63ff&
214677
+ var HoDocvue_type_template_id_7e5f63ff_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)}
214678
+ var HoDocvue_type_template_id_7e5f63ff_staticRenderFns = []
214347
214679
 
214348
214680
 
214349
214681
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
@@ -217984,7 +218316,7 @@ var SignNode = __webpack_require__(34450);
217984
218316
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
217985
218317
  var ParagraphNode = __webpack_require__(14208);
217986
218318
  ;// CONCATENATED MODULE: ./src/components/version.ts
217987
- /* harmony default export */ var version = ('2.0.94');
218319
+ /* harmony default export */ var version = ('2.0.97');
217988
218320
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
217989
218321
  var PoperTipText = __webpack_require__(91831);
217990
218322
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -218470,7 +218802,7 @@ var ImageNode = __webpack_require__(88389);
218470
218802
 
218471
218803
  if (node instanceof SignNode/* SignNode */.N) {
218472
218804
  // 通过自定义属性内部字段判断是否属于患者签名 指纹签名只有患者签名才会有 同时患者签名不存在自定义属性可以用是否存在某个属性确定是否是患者签名(需要确定的是imgsrc要存在 imgsrc不存在是指空签名元素)
218473
- if (node.fingerPrintSrc || node.imgSrc && !node.fingerPrintSrc && node.customProperty && !node.customProperty.abi02) return false;
218805
+ if (node.fingerPrintSrc || node.imgSrc && !node.fingerPrintSrc && node.customProperty && !node.customProperty.created_date) return false;
218474
218806
  this.$emit('dblNodeClick', {
218475
218807
  node: this.getCurrentSelectNode,
218476
218808
  type: 'sign'
@@ -218763,8 +219095,8 @@ var ImageNode = __webpack_require__(88389);
218763
219095
 
218764
219096
  var HoDoc_component = (0,componentNormalizer/* default */.Z)(
218765
219097
  components_HoDocvue_type_script_lang_js_,
218766
- HoDocvue_type_template_id_22896312_render,
218767
- HoDocvue_type_template_id_22896312_staticRenderFns,
219098
+ HoDocvue_type_template_id_7e5f63ff_render,
219099
+ HoDocvue_type_template_id_7e5f63ff_staticRenderFns,
218768
219100
  false,
218769
219101
  null,
218770
219102
  null,
@@ -218817,6 +219149,7 @@ var TableNode = __webpack_require__(95883);
218817
219149
 
218818
219150
 
218819
219151
 
219152
+
218820
219153
 
218821
219154
 
218822
219155
  var NeedDrawPageInfo = /*#__PURE__*/function () {
@@ -219021,17 +219354,6 @@ var DrawPageTree = /*#__PURE__*/function () {
219021
219354
  return [ret, isNew];
219022
219355
  } //拆分成页
219023
219356
 
219024
- }, {
219025
- key: "clearAfterDTop",
219026
- value: function clearAfterDTop(dDrawArea, dTop) {
219027
- var numChildren = dDrawArea.children.length - 1;
219028
-
219029
- for (var i = numChildren; i >= 0; i--) {
219030
- if (dDrawArea.children[i].y > dTop) {
219031
- dDrawArea.removeChildAt(i);
219032
- }
219033
- }
219034
- }
219035
219357
  }, {
219036
219358
  key: "paint",
219037
219359
  value: function paint(aDrawArea, dRoots, startLine, endLine) {
@@ -219104,7 +219426,7 @@ var DrawPageTree = /*#__PURE__*/function () {
219104
219426
  }
219105
219427
 
219106
219428
  if (hoEditorFactory.isUseDrawingOptimization) {
219107
- this.clearAfterDTop(mainArea, dTop);
219429
+ this.clearAreas([mainArea]);
219108
219430
  }
219109
219431
 
219110
219432
  var nextLine = startLine;
@@ -219611,7 +219933,7 @@ var DrawPageTree = /*#__PURE__*/function () {
219611
219933
  }
219612
219934
 
219613
219935
  var startPaintWithUpdate = this._startNeedUpdatePage === -1 && this._endNeedUpdatePage === -1;
219614
- var imaxViewPage = Math.max.apply(Math, (0,toConsumableArray/* default */.Z)(hoEditorFactory.drawTree.inViewPages));
219936
+ var imaxViewPage = Math.max.apply(Math, (0,toConsumableArray/* default */.Z)(hoEditorFactory.drawTree.inViewPages).concat([this._drawMainDocs.length - 1]));
219615
219937
 
219616
219938
  try {
219617
219939
  if (this._oldPageCount === 0) {
@@ -236956,12 +237278,13 @@ var FontStyleMixin = /*#__PURE__*/function (_Vue) {
236956
237278
 
236957
237279
  var drawPageTables = tableNodeInfo.tableNode.drawTable.drawPageTables;
236958
237280
  var drawPageCells = tableNodeInfo.cellNode.drawCell.drawPageCells;
236959
- tableBounds.cellX = drawPageCells[0].x + 20;
236960
- tableBounds.cellY = drawPageCells[0].y + 20;
236961
- tableBounds.cellWidth = drawPageCells[0].dWidth;
236962
- tableBounds.cellHeight = drawPageCells[0].dHeight;
237281
+ var currentPageIndex = dPage.drawMainDoc.pageIndex;
237282
+ tableBounds.cellX = drawPageCells[currentPageIndex].x + 20;
237283
+ tableBounds.cellY = drawPageCells[currentPageIndex].y + 20;
237284
+ tableBounds.cellWidth = drawPageCells[currentPageIndex].dWidth;
237285
+ tableBounds.cellHeight = drawPageCells[currentPageIndex].dHeight;
236963
237286
  drawPageTables.forEach(function (v, key) {
236964
- if (v.parent.pageIndex === dPage.drawMainDoc.pageIndex) {
237287
+ if (v.parent.pageIndex === currentPageIndex) {
236965
237288
  tableBounds.height = v.dHeight;
236966
237289
  tableBounds.y = dPage.drawMainDoc.y + v.y;
236967
237290