hoeditor-web 2.0.96 → 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.
@@ -26551,14 +26551,14 @@ var SubDocManger = /*#__PURE__*/function () {
26551
26551
  /* harmony export */ __webpack_require__.d(__webpack_exports__, {
26552
26552
  /* harmony export */ "P": function() { return /* binding */ DocController; }
26553
26553
  /* harmony export */ });
26554
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(87461);
26555
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(60199);
26556
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createForOfIteratorHelper_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(42071);
26557
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(91347);
26554
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createForOfIteratorHelper_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(42071);
26555
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(91347);
26556
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(87461);
26557
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(60199);
26558
26558
  /* harmony import */ var element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(86769);
26559
26559
  /* 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__);
26560
26560
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(42015);
26561
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(16296);
26561
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(16296);
26562
26562
  /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(41539);
26563
26563
  /* 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__);
26564
26564
  /* harmony import */ var core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(88674);
@@ -26650,12 +26650,14 @@ var SubDocManger = /*#__PURE__*/function () {
26650
26650
  /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__(28831);
26651
26651
  /* harmony import */ var _undoRedo_ParseUndoUnit__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__(94294);
26652
26652
  /* harmony import */ var _undoRedo_TableUndos_TableInsertParagraphUndoUnit__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__(74487);
26653
- /* harmony import */ var _treeNode_SeparateCharNode__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(87303);
26654
- /* harmony import */ var _treeNode_LabelNode__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(37713);
26655
- /* harmony import */ var _NodePosition__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(14245);
26656
- /* harmony import */ var _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(78975);
26657
- /* harmony import */ var _events_NodeNeedModifyEvent__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(88531);
26658
- /* harmony import */ var _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(55817);
26653
+ /* harmony import */ var _draw_DrawLine__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(95329);
26654
+ /* harmony import */ var _treeNode_SeparateCharNode__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(87303);
26655
+ /* harmony import */ var _treeNode_LabelNode__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(37713);
26656
+ /* harmony import */ var _NodePosition__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(14245);
26657
+ /* harmony import */ var _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(78975);
26658
+ /* harmony import */ var _events_NodeNeedModifyEvent__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(88531);
26659
+ /* harmony import */ var _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(55817);
26660
+
26659
26661
 
26660
26662
 
26661
26663
 
@@ -26762,7 +26764,7 @@ var DocController = /*#__PURE__*/function () {
26762
26764
  // }
26763
26765
 
26764
26766
 
26765
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_86__/* ["default"] */ .Z)(DocController, [{
26767
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_87__/* ["default"] */ .Z)(DocController, [{
26766
26768
  key: "onInsertNodeByID",
26767
26769
  get: function get() {
26768
26770
  return this._onInsertNodeByID;
@@ -27273,7 +27275,7 @@ var DocController = /*#__PURE__*/function () {
27273
27275
 
27274
27276
  if (!domRange.isEmpty) {
27275
27277
  domRange = domRange.normalize();
27276
- } 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)) {
27278
+ } 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)) {
27277
27279
  element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("审阅模式下,只能选中文档内容进行删除");
27278
27280
 
27279
27281
  return;
@@ -27300,183 +27302,336 @@ var DocController = /*#__PURE__*/function () {
27300
27302
 
27301
27303
  }, {
27302
27304
  key: "deleteTextBeforePath",
27303
- value: function deleteTextBeforePath(startPath) {
27304
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
27305
- var domRange = hoEditorFactory.docTree.curDomRange.normalize();
27305
+ value: function () {
27306
+ 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) {
27307
+ 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;
27306
27308
 
27307
- if (!domRange.isEmpty) {
27308
- this.deleteRange(domRange, true); // hoEditorFactory.undoService.begin();
27309
- // hoEditorFactory.undoService.add(
27310
- // new NodesDeleteUndoUnit(
27311
- // this._hoEditorFactoryID,
27312
- // domRange.startPath,
27313
- // domRange.endPath,
27314
- // true
27315
- // )
27316
- // );
27317
- // hoEditorFactory.undoService.commit();
27318
- } else {
27319
- var nodePosition = hoEditorFactory.docTree.findNodePositionByPath(startPath);
27320
- var childIndex = nodePosition.childIndex;
27321
- var node = nodePosition.node;
27309
+ 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) {
27310
+ while (1) {
27311
+ switch (_context.prev = _context.next) {
27312
+ case 0:
27313
+ hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
27314
+ domRange = hoEditorFactory.docTree.curDomRange.normalize();
27322
27315
 
27323
- if (node) {
27324
- if (domRange.isEmpty) {
27325
- //未选中任何区域
27326
- if (node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R) {
27327
- //if (hoEditorFactory.docTree.docProperty.type === EmrType.etForm) {
27328
- if (node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
27329
- var ret = node.parentNode.delCellNodeText();
27330
- if (!ret) return;
27331
- } //}
27316
+ if (domRange.isEmpty) {
27317
+ _context.next = 6;
27318
+ break;
27319
+ }
27320
+
27321
+ this.deleteRange(domRange, true); // hoEditorFactory.undoService.begin();
27322
+ // hoEditorFactory.undoService.add(
27323
+ // new NodesDeleteUndoUnit(
27324
+ // this._hoEditorFactoryID,
27325
+ // domRange.startPath,
27326
+ // domRange.endPath,
27327
+ // true
27328
+ // )
27329
+ // );
27330
+ // hoEditorFactory.undoService.commit();
27331
+
27332
+ _context.next = 124;
27333
+ break;
27334
+
27335
+ case 6:
27336
+ nodePosition = hoEditorFactory.docTree.findNodePositionByPath(startPath);
27337
+ childIndex = nodePosition.childIndex;
27338
+ node = nodePosition.node;
27339
+
27340
+ if (!node) {
27341
+ _context.next = 124;
27342
+ break;
27343
+ }
27332
27344
 
27345
+ if (!domRange.isEmpty) {
27346
+ _context.next = 124;
27347
+ break;
27348
+ }
27349
+
27350
+ if (!(node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R)) {
27351
+ _context.next = 36;
27352
+ break;
27353
+ }
27354
+
27355
+ if (!(node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D)) {
27356
+ _context.next = 16;
27357
+ break;
27358
+ }
27359
+
27360
+ ret = node.parentNode.delCellNodeText();
27333
27361
 
27334
- var topath = "";
27362
+ if (ret) {
27363
+ _context.next = 16;
27364
+ break;
27365
+ }
27366
+
27367
+ return _context.abrupt("return");
27368
+
27369
+ case 16:
27370
+ //}
27371
+ topath = "";
27335
27372
 
27336
- if (childIndex > 0) {
27337
- var arr = startPath.split("/");
27373
+ if (!(childIndex > 0)) {
27374
+ _context.next = 23;
27375
+ break;
27376
+ }
27377
+
27378
+ arr = startPath.split("/");
27338
27379
  arr[arr.length - 1] = parseInt(arr[arr.length - 1]) - 1 + "";
27339
27380
  topath = arr.join("/");
27340
- } else {
27341
- var tmp = node.previousLeaf();
27381
+ _context.next = 30;
27382
+ break;
27342
27383
 
27343
- if (tmp) {
27344
- topath = hoEditorFactory.docTree.getNodeLastPath(tmp);
27345
- } else {
27346
- console.error("这里应该不会出现这种情况 2020.10.28");
27347
- return;
27384
+ case 23:
27385
+ tmp = node.previousLeaf();
27386
+
27387
+ if (!tmp) {
27388
+ _context.next = 28;
27389
+ break;
27348
27390
  }
27349
- }
27350
27391
 
27351
- hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, topath, startPath); // hoEditorFactory.undoService.begin();
27352
- // hoEditorFactory.undoService.add(
27353
- // new NodesDeleteUndoUnit(
27354
- // this._hoEditorFactoryID,
27355
- // topath,
27356
- // startPath,
27357
- // false
27358
- // )
27359
- // );
27360
- // hoEditorFactory.undoService.commit();
27361
-
27362
- var aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, topath).normalize();
27363
- this.deleteRange(aRange, true);
27364
- hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, topath, topath);
27365
- } else if (node instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j) {
27366
- var endPath = hoEditorFactory.docTree.getNodeLastPath(node);
27367
-
27368
- if (node.parentNode && node.parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_46__/* .TextInputFieldNode */ .re) {
27369
- if (node.parentNode.childNodes[1] instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j) {
27370
- startPath = hoEditorFactory.docTree.getNodeLastPath(node.parentNode.previousLeaf());
27371
- endPath = hoEditorFactory.docTree.getNodeLastPath(node.parentNode);
27372
- } else {
27373
- if (node === node.parentNode.last()) {
27374
- var _topath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
27392
+ topath = hoEditorFactory.docTree.getNodeLastPath(tmp);
27393
+ _context.next = 30;
27394
+ break;
27375
27395
 
27376
- hoEditorFactory.drawTree.moveCaretToPath(_topath);
27377
- hoEditorFactory.docTree.curDomRange.setSamePath(_topath);
27378
- return;
27379
- }
27396
+ case 28:
27397
+ console.error("这里应该不会出现这种情况 2020.10.28");
27398
+ return _context.abrupt("return");
27380
27399
 
27381
- if (node === node.parentNode.first()) {
27382
- return;
27383
- }
27400
+ case 30:
27401
+ hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, topath, startPath); // hoEditorFactory.undoService.begin();
27402
+ // hoEditorFactory.undoService.add(
27403
+ // new NodesDeleteUndoUnit(
27404
+ // this._hoEditorFactoryID,
27405
+ // topath,
27406
+ // startPath,
27407
+ // false
27408
+ // )
27409
+ // );
27410
+ // hoEditorFactory.undoService.commit();
27411
+
27412
+ aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, topath).normalize();
27413
+ this.deleteRange(aRange, true);
27414
+ hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, topath, topath);
27415
+ _context.next = 124;
27416
+ break;
27417
+
27418
+ case 36:
27419
+ if (!(node instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j)) {
27420
+ _context.next = 55;
27421
+ break;
27384
27422
  }
27385
- }
27386
27423
 
27387
- var _aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath //hoEditorFactory.docTree.getNodeLastPath(node)
27388
- ).normalize();
27389
-
27390
- this.deleteRange(_aRange, true); // hoEditorFactory.undoService.begin();
27391
- // hoEditorFactory.undoService.add(
27392
- // new NodesDeleteUndoUnit(
27393
- // this._hoEditorFactoryID,
27394
- // hoEditorFactory.docTree.getNodeLastPath(node),
27395
- // startPath,
27396
- // false
27397
- // )
27398
- // );
27399
- // hoEditorFactory.undoService.commit();
27400
- } else {
27401
- if (node instanceof _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_30__/* .ParagraphNode */ .C) {
27402
- var prevNode = node.prevSibling();
27424
+ endPath = hoEditorFactory.docTree.getNodeLastPath(node);
27403
27425
 
27404
- if (prevNode instanceof _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_51__/* .TableNode */ .Fh) {
27405
- return;
27426
+ if (!(node.parentNode && node.parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_46__/* .TextInputFieldNode */ .re)) {
27427
+ _context.next = 51;
27428
+ break;
27406
27429
  }
27407
27430
 
27408
- if (prevNode == null) {
27409
- return;
27431
+ if (!(node.parentNode.childNodes[1] instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j)) {
27432
+ _context.next = 44;
27433
+ break;
27434
+ }
27435
+
27436
+ startPath = hoEditorFactory.docTree.getNodeLastPath(node.parentNode.previousLeaf());
27437
+ endPath = hoEditorFactory.docTree.getNodeLastPath(node.parentNode);
27438
+ _context.next = 51;
27439
+ break;
27440
+
27441
+ case 44:
27442
+ if (!(node === node.parentNode.last())) {
27443
+ _context.next = 49;
27444
+ break;
27445
+ }
27446
+
27447
+ _topath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
27448
+ hoEditorFactory.drawTree.moveCaretToPath(_topath);
27449
+ hoEditorFactory.docTree.curDomRange.setSamePath(_topath);
27450
+ return _context.abrupt("return");
27451
+
27452
+ case 49:
27453
+ if (!(node === node.parentNode.first())) {
27454
+ _context.next = 51;
27455
+ break;
27456
+ }
27457
+
27458
+ return _context.abrupt("return");
27459
+
27460
+ case 51:
27461
+ _aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath //hoEditorFactory.docTree.getNodeLastPath(node)
27462
+ ).normalize();
27463
+ this.deleteRange(_aRange, true); // hoEditorFactory.undoService.begin();
27464
+ // hoEditorFactory.undoService.add(
27465
+ // new NodesDeleteUndoUnit(
27466
+ // this._hoEditorFactoryID,
27467
+ // hoEditorFactory.docTree.getNodeLastPath(node),
27468
+ // startPath,
27469
+ // false
27470
+ // )
27471
+ // );
27472
+ // hoEditorFactory.undoService.commit();
27473
+
27474
+ _context.next = 124;
27475
+ break;
27476
+
27477
+ case 55:
27478
+ if (!(node instanceof _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_30__/* .ParagraphNode */ .C)) {
27479
+ _context.next = 82;
27480
+ break;
27481
+ }
27482
+
27483
+ prevNode = node.prevSibling();
27484
+
27485
+ if (!(prevNode instanceof _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_51__/* .TableNode */ .Fh)) {
27486
+ _context.next = 59;
27487
+ break;
27488
+ }
27489
+
27490
+ return _context.abrupt("return");
27491
+
27492
+ case 59:
27493
+ if (!(prevNode == null)) {
27494
+ _context.next = 82;
27495
+ break;
27496
+ }
27497
+
27498
+ if (!(node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D)) {
27499
+ _context.next = 81;
27500
+ break;
27501
+ }
27502
+
27503
+ cellNode = node.parentNode;
27504
+ tableNode = cellNode.parentNode;
27505
+ tIndex = tableNode.childNodes.indexOf(cellNode);
27506
+ cIndex = cellNode.childNodes.indexOf(node);
27507
+ preParaNode = hoEditorFactory.docTree.getSameRectPrevParanode(tableNode.paragraphNode);
27508
+
27509
+ 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())) {
27510
+ _context.next = 78;
27511
+ break;
27512
+ }
27513
+
27514
+ hoEditorFactory.undoService.begin();
27515
+ hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, tableNode.paragraphNode, tableNode.paragraphNode.getNodePath()));
27516
+ tableNode.paragraphNode = preParaNode;
27517
+ _context.next = 72;
27518
+ return hoEditorFactory.undoService.commit();
27519
+
27520
+ case 72:
27521
+ newpath = cellNode.childNodes[0].getNodePath();
27522
+ hoEditorFactory.docTree.curDomRange.setSamePath(newpath);
27523
+ hoEditorFactory.drawTree.moveCaretToPath(newpath);
27524
+ return _context.abrupt("return");
27525
+
27526
+ case 78:
27527
+ return _context.abrupt("return");
27528
+
27529
+ case 79:
27530
+ _context.next = 82;
27531
+ break;
27532
+
27533
+ case 81:
27534
+ return _context.abrupt("return");
27535
+
27536
+ case 82:
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 = 87;
27539
+ break;
27410
27540
  }
27411
- }
27412
27541
 
27413
- 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)) {
27414
27542
  element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("审阅模式下,只能对文本内容进行删除");
27415
27543
 
27416
- return;
27417
- } else {
27418
- 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) {
27419
- var signUserId = node.customProperty.bce01;
27544
+ return _context.abrupt("return");
27545
+
27546
+ case 87:
27547
+ 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)) {
27548
+ _context.next = 92;
27549
+ break;
27550
+ }
27420
27551
 
27421
- if (hoEditorFactory.userInfo.id != signUserId) {
27422
- element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("不是本人签名,不允许删除!");
27552
+ signUserId = node.customProperty.bce01;
27423
27553
 
27424
- return;
27425
- }
27554
+ if (!(hoEditorFactory.userInfo.id != signUserId)) {
27555
+ _context.next = 92;
27556
+ break;
27426
27557
  }
27427
27558
 
27428
- 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) {
27429
- element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("不允许使用删除键删除签名,请右键删除元素", "系统提示");
27559
+ element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("不是本人签名,不允许删除!");
27430
27560
 
27431
- return;
27561
+ return _context.abrupt("return");
27562
+
27563
+ case 92:
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)) {
27565
+ _context.next = 95;
27566
+ break;
27432
27567
  }
27433
27568
 
27434
- 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) {
27435
- element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("该签名元素不允许删除!", "系统提示");
27569
+ element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("不允许使用删除键删除签名,请右键删除元素", "系统提示");
27436
27570
 
27437
- return;
27571
+ return _context.abrupt("return");
27572
+
27573
+ case 95:
27574
+ 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)) {
27575
+ _context.next = 98;
27576
+ break;
27438
27577
  }
27439
27578
 
27440
- if (node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) {
27441
- var preNode = node.previousLeaf();
27442
- var nextNode = node.nextLeaf();
27443
-
27444
- 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)) {
27445
- var path = hoEditorFactory.docTree.getNodeLastPath(preNode);
27446
- 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);
27447
- hoEditorFactory.undoService.begin();
27448
- hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
27449
- hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, path, signNode));
27450
- hoEditorFactory.undoService.commit();
27451
- return;
27452
- }
27579
+ element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("该签名元素不允许删除!", "系统提示");
27453
27580
 
27454
- if (preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) {
27455
- var spath = "";
27581
+ return _context.abrupt("return");
27456
27582
 
27457
- if (node.number === 2 || node.number === 1 && node.isTemplate) {
27458
- spath = hoEditorFactory.docTree.getNodeLastPath(preNode.previousLeaf());
27459
- } else {
27460
- spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
27461
- } //const spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
27583
+ case 98:
27584
+ if (!(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
27585
+ _context.next = 119;
27586
+ break;
27587
+ }
27462
27588
 
27589
+ preNode = node.previousLeaf();
27590
+ nextNode = node.nextLeaf();
27463
27591
 
27464
- var epath = hoEditorFactory.docTree.getNodeLastPath(node);
27465
- 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,
27466
- node.styleIndex, preNode.connectMode, preNode.isFront, preNode.allowEditSignTime);
27467
- hoEditorFactory.undoService.begin();
27468
- hoEditorFactory.undoService.add(new _undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_36__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, spath, epath));
27592
+ 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))) {
27593
+ _context.next = 109;
27594
+ break;
27595
+ }
27469
27596
 
27470
- if (node.number === 2 || node.number === 1 && node.isTemplate) {
27471
- hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, spath, newSignNode));
27472
- }
27597
+ path = hoEditorFactory.docTree.getNodeLastPath(preNode);
27598
+ 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);
27599
+ hoEditorFactory.undoService.begin();
27600
+ hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
27601
+ hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, path, signNode));
27602
+ hoEditorFactory.undoService.commit();
27603
+ return _context.abrupt("return");
27473
27604
 
27474
- hoEditorFactory.undoService.commit();
27475
- return;
27476
- }
27605
+ case 109:
27606
+ if (!(preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
27607
+ _context.next = 119;
27608
+ break;
27477
27609
  }
27478
27610
 
27479
- var pNode = node.parentNode;
27611
+ spath = "";
27612
+
27613
+ if (node.number === 2 || node.number === 1 && node.isTemplate) {
27614
+ spath = hoEditorFactory.docTree.getNodeLastPath(preNode.previousLeaf());
27615
+ } else {
27616
+ spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
27617
+ } //const spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
27618
+
27619
+
27620
+ epath = hoEditorFactory.docTree.getNodeLastPath(node);
27621
+ 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,
27622
+ node.styleIndex, preNode.connectMode, preNode.isFront, preNode.allowEditSignTime);
27623
+ hoEditorFactory.undoService.begin();
27624
+ hoEditorFactory.undoService.add(new _undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_36__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, spath, epath));
27625
+
27626
+ if (node.number === 2 || node.number === 1 && node.isTemplate) {
27627
+ hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, spath, newSignNode));
27628
+ }
27629
+
27630
+ hoEditorFactory.undoService.commit();
27631
+ return _context.abrupt("return");
27632
+
27633
+ case 119:
27634
+ pNode = node.parentNode;
27480
27635
  hoEditorFactory.undoService.begin();
27481
27636
  hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
27482
27637
  hoEditorFactory.undoService.commit();
@@ -27484,12 +27639,21 @@ var DocController = /*#__PURE__*/function () {
27484
27639
  if (pNode && pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_46__/* .TextInputFieldNode */ .re && pNode.childNodes.length === 2) {
27485
27640
  this.resetEmptyInputFieldNode(hoEditorFactory, pNode);
27486
27641
  }
27487
- }
27642
+
27643
+ case 124:
27644
+ case "end":
27645
+ return _context.stop();
27488
27646
  }
27489
27647
  }
27490
- }
27648
+ }, _callee, this);
27649
+ }));
27650
+
27651
+ function deleteTextBeforePath(_x) {
27652
+ return _deleteTextBeforePath.apply(this, arguments);
27491
27653
  }
27492
- }
27654
+
27655
+ return deleteTextBeforePath;
27656
+ }()
27493
27657
  }, {
27494
27658
  key: "resetEmptyInputFieldNode",
27495
27659
  value: function resetEmptyInputFieldNode(hoEditorFactory, node) {
@@ -27601,7 +27765,7 @@ var DocController = /*#__PURE__*/function () {
27601
27765
  var drawArea = hoEditorFactory.drawPageTree.getMainRootArea(drawNode);
27602
27766
 
27603
27767
  if (drawArea) {
27604
- var nodeNeedModifyEvent = new _events_NodeNeedModifyEvent__WEBPACK_IMPORTED_MODULE_84__/* .NodeNeedModifyEvent */ .x(arange.npEnd.node, "dblclick", drawArea.index);
27768
+ var nodeNeedModifyEvent = new _events_NodeNeedModifyEvent__WEBPACK_IMPORTED_MODULE_85__/* .NodeNeedModifyEvent */ .x(arange.npEnd.node, "dblclick", drawArea.index);
27605
27769
  hoEditorFactory.docTree.nodeNeedModify(nodeNeedModifyEvent);
27606
27770
  return;
27607
27771
  } else {
@@ -28426,7 +28590,7 @@ var DocController = /*#__PURE__*/function () {
28426
28590
  if (cell && cell instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
28427
28591
  if (cell.table.tableProperty.canAddRow) {
28428
28592
  var _cell$table$getCellIn = cell.table.getCellInfos(cell),
28429
- _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),
28593
+ _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),
28430
28594
  r = _cell$table$getCellIn2[0],
28431
28595
  c = _cell$table$getCellIn2[1];
28432
28596
 
@@ -28474,7 +28638,7 @@ var DocController = /*#__PURE__*/function () {
28474
28638
  if (cell && cell instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
28475
28639
  if (cell.table.tableProperty.canAddRow) {
28476
28640
  var _cell$table$getCellIn3 = cell.table.getCellInfos(cell),
28477
- _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),
28641
+ _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),
28478
28642
  r = _cell$table$getCellIn4[0],
28479
28643
  c = _cell$table$getCellIn4[1];
28480
28644
 
@@ -28521,7 +28685,7 @@ var DocController = /*#__PURE__*/function () {
28521
28685
 
28522
28686
  if (cell && cell instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
28523
28687
  var _cell$table$getCellIn5 = cell.table.getCellInfos(cell),
28524
- _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),
28688
+ _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),
28525
28689
  r = _cell$table$getCellIn6[0],
28526
28690
  c = _cell$table$getCellIn6[1];
28527
28691
 
@@ -28569,7 +28733,7 @@ var DocController = /*#__PURE__*/function () {
28569
28733
 
28570
28734
  if (cell && cell instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
28571
28735
  var _cell$table$getCellIn7 = cell.table.getCellInfos(cell),
28572
- _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),
28736
+ _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),
28573
28737
  r = _cell$table$getCellIn8[0],
28574
28738
  c = _cell$table$getCellIn8[1];
28575
28739
 
@@ -28608,7 +28772,7 @@ var DocController = /*#__PURE__*/function () {
28608
28772
  key: "tableDeleteRows",
28609
28773
  value: function tableDeleteRows(aRange) {
28610
28774
  var _TableNode$getSelectT = _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_51__/* .TableNode.getSelectTableRowColInfos */ .Fh.getSelectTableRowColInfos(this._hoEditorFactoryID, aRange),
28611
- _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),
28775
+ _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),
28612
28776
  table = _TableNode$getSelectT2[0],
28613
28777
  r1 = _TableNode$getSelectT2[1],
28614
28778
  c1 = _TableNode$getSelectT2[2],
@@ -28663,7 +28827,7 @@ var DocController = /*#__PURE__*/function () {
28663
28827
  key: "tableDeleteCols",
28664
28828
  value: function tableDeleteCols(aRange) {
28665
28829
  var _TableNode$getSelectT3 = _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_51__/* .TableNode.getSelectTableRowColInfos */ .Fh.getSelectTableRowColInfos(this._hoEditorFactoryID, aRange),
28666
- _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),
28830
+ _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),
28667
28831
  table = _TableNode$getSelectT4[0],
28668
28832
  r1 = _TableNode$getSelectT4[1],
28669
28833
  c1 = _TableNode$getSelectT4[2],
@@ -28732,22 +28896,22 @@ var DocController = /*#__PURE__*/function () {
28732
28896
  }
28733
28897
 
28734
28898
  var _cell1$table$getCellI = cell1.table.getCellInfos(cell1),
28735
- _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),
28899
+ _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),
28736
28900
  r1 = _cell1$table$getCellI2[0],
28737
28901
  c1 = _cell1$table$getCellI2[1];
28738
28902
 
28739
28903
  var _cell1$table$getCellI3 = cell1.table.getCellInfos(cell2),
28740
- _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),
28904
+ _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),
28741
28905
  r2 = _cell1$table$getCellI4[0],
28742
28906
  c2 = _cell1$table$getCellI4[1];
28743
28907
 
28744
28908
  var _cell1$table$calcRowS = cell1.table.calcRowSpanColsSpan(r1, c1, r2, c2),
28745
- _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),
28909
+ _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),
28746
28910
  rowSpan = _cell1$table$calcRowS2[0],
28747
28911
  colSpan = _cell1$table$calcRowS2[1];
28748
28912
 
28749
28913
  var _cell1$table$canMerge = cell1.table.canMergeCell(r1, c1, rowSpan, colSpan),
28750
- _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),
28914
+ _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),
28751
28915
  ret = _cell1$table$canMerge2[0],
28752
28916
  aRowSpan = _cell1$table$canMerge2[1],
28753
28917
  aColSpan = _cell1$table$canMerge2[2];
@@ -28793,24 +28957,24 @@ var DocController = /*#__PURE__*/function () {
28793
28957
  var endPath = cell1.table.getNodePath();
28794
28958
 
28795
28959
  var _hoEditorFactory$draw = hoEditorFactory.drawTree.getDrawRootsByPath(endPath),
28796
- _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),
28960
+ _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),
28797
28961
  dcell = _hoEditorFactory$draw2[0],
28798
28962
  dRoots = _hoEditorFactory$draw2[1];
28799
28963
 
28800
28964
  var startDline = dRoots.indexOf(cell1.table.drawTable);
28801
28965
 
28802
28966
  var _cell1$table$getCellI5 = cell1.table.getCellInfos(cell1),
28803
- _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),
28967
+ _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),
28804
28968
  r1 = _cell1$table$getCellI6[0],
28805
28969
  c1 = _cell1$table$getCellI6[1];
28806
28970
 
28807
28971
  var _cell1$table$getCellI7 = cell1.table.getCellInfos(cell2),
28808
- _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),
28972
+ _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),
28809
28973
  r2 = _cell1$table$getCellI8[0],
28810
28974
  c2 = _cell1$table$getCellI8[1];
28811
28975
 
28812
28976
  var _cell1$table$calcRowS3 = cell1.table.calcRowSpanColsSpan(r1, c1, r2, c2),
28813
- _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),
28977
+ _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),
28814
28978
  rowSpan = _cell1$table$calcRowS4[0],
28815
28979
  colSpan = _cell1$table$calcRowS4[1]; // cell1.table.mergeCells(r1, c1, rowSpan, colSpan);
28816
28980
 
@@ -28988,7 +29152,7 @@ var DocController = /*#__PURE__*/function () {
28988
29152
  var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_58__/* .CellProperty */ .$W(objectValues);
28989
29153
  cellNode.cellProperty = cellProperty;
28990
29154
  cellNode.drawCell.drawPageCells.forEach(function (pcell) {
28991
- pcell.valignTop = pcell.calcValignTop();
29155
+ pcell.valignTop = pcell.calcValignTop()[0];
28992
29156
  });
28993
29157
  }
28994
29158
  /**
@@ -29209,7 +29373,7 @@ var DocController = /*#__PURE__*/function () {
29209
29373
  var nodesMap = object.obj1;
29210
29374
  var indexsMap = object.obj2;
29211
29375
 
29212
- 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()),
29376
+ 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()),
29213
29377
  _step;
29214
29378
 
29215
29379
  try {
@@ -29599,14 +29763,14 @@ var DocController = /*#__PURE__*/function () {
29599
29763
  }, {
29600
29764
  key: "initBlankDoc",
29601
29765
  value: function () {
29602
- 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() {
29766
+ 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() {
29603
29767
  var hoEditorFactory, firstNode, strFirstPath, aPage;
29604
- 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) {
29768
+ 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) {
29605
29769
  while (1) {
29606
- switch (_context.prev = _context.next) {
29770
+ switch (_context2.prev = _context2.next) {
29607
29771
  case 0:
29608
29772
  hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
29609
- _context.next = 3;
29773
+ _context2.next = 3;
29610
29774
  return hoEditorFactory.drawPageTree.stopPageEvent();
29611
29775
 
29612
29776
  case 3:
@@ -29616,15 +29780,15 @@ var DocController = /*#__PURE__*/function () {
29616
29780
  hoEditorFactory.docTree.clearDocTree();
29617
29781
  hoEditorFactory.drawPageTree.clear();
29618
29782
  hoEditorFactory.drawPageTree.initDoc();
29619
- _context.next = 11;
29783
+ _context2.next = 11;
29620
29784
  return hoEditorFactory.drawTree.buildDrawTree(hoEditorFactory.subDocManger.headerDocTree[0].subDocNodes, hoEditorFactory.drawTree.headerDNodes[0]);
29621
29785
 
29622
29786
  case 11:
29623
- _context.next = 13;
29787
+ _context2.next = 13;
29624
29788
  return hoEditorFactory.drawTree.buildDrawTree(hoEditorFactory.subDocManger.footerDocTree[0].subDocNodes, hoEditorFactory.drawTree.footerDNodes[0]);
29625
29789
 
29626
29790
  case 13:
29627
- _context.next = 15;
29791
+ _context2.next = 15;
29628
29792
  return hoEditorFactory.drawTree.buildDrawTree(hoEditorFactory.docTree.mainNodes, hoEditorFactory.drawTree.mainDNodes);
29629
29793
 
29630
29794
  case 15:
@@ -29649,10 +29813,10 @@ var DocController = /*#__PURE__*/function () {
29649
29813
 
29650
29814
  case 25:
29651
29815
  case "end":
29652
- return _context.stop();
29816
+ return _context2.stop();
29653
29817
  }
29654
29818
  }
29655
- }, _callee, this);
29819
+ }, _callee2, this);
29656
29820
  }));
29657
29821
 
29658
29822
  function initBlankDoc() {
@@ -29985,7 +30149,7 @@ var DocController = /*#__PURE__*/function () {
29985
30149
 
29986
30150
  hoeditorfactory.undoService.begin();
29987
30151
  var newParaPath = paraNode.getNodePath();
29988
- 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);
30152
+ 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);
29989
30153
  hoeditorfactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, newParaPath, separateCharNode));
29990
30154
  hoeditorfactory.undoService.commit();
29991
30155
  }
@@ -30009,7 +30173,7 @@ var DocController = /*#__PURE__*/function () {
30009
30173
  if (np) {
30010
30174
  var node = np.node;
30011
30175
 
30012
- if (node instanceof _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_85__/* .GestationNode */ .G) {
30176
+ if (node instanceof _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_86__/* .GestationNode */ .G) {
30013
30177
  hoEditorFactory.undoService.begin();
30014
30178
  hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath, "update"));
30015
30179
  startPath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
@@ -30018,7 +30182,7 @@ var DocController = /*#__PURE__*/function () {
30018
30182
  }
30019
30183
 
30020
30184
  var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
30021
- 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); //插入节点
30185
+ 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); //插入节点
30022
30186
 
30023
30187
  if (operType === "add") {
30024
30188
  hoEditorFactory.undoService.begin();
@@ -30030,12 +30194,12 @@ var DocController = /*#__PURE__*/function () {
30030
30194
  }, {
30031
30195
  key: "textToLabel",
30032
30196
  value: function () {
30033
- 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) {
30197
+ 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) {
30034
30198
  var hoeditorfactory, astart, aend, sChildIndex, eChildIndex, anode, startPath, endPath, drawNode, i, text, pathArr, _pathArr, labelNode, delRange, anodeEndPath, result;
30035
30199
 
30036
- 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) {
30200
+ 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) {
30037
30201
  while (1) {
30038
- switch (_context2.prev = _context2.next) {
30202
+ switch (_context3.prev = _context3.next) {
30039
30203
  case 0:
30040
30204
  hoeditorfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
30041
30205
  astart = range.npStart.node;
@@ -30048,12 +30212,12 @@ var DocController = /*#__PURE__*/function () {
30048
30212
 
30049
30213
  case 8:
30050
30214
  if (!anode) {
30051
- _context2.next = 34;
30215
+ _context3.next = 34;
30052
30216
  break;
30053
30217
  }
30054
30218
 
30055
30219
  if (!(anode instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R)) {
30056
- _context2.next = 32;
30220
+ _context3.next = 32;
30057
30221
  break;
30058
30222
  }
30059
30223
 
@@ -30062,21 +30226,21 @@ var DocController = /*#__PURE__*/function () {
30062
30226
 
30063
30227
  case 12:
30064
30228
  if (!(i < anode.drawNodes.length)) {
30065
- _context2.next = 19;
30229
+ _context3.next = 19;
30066
30230
  break;
30067
30231
  }
30068
30232
 
30069
30233
  if (!(sChildIndex < anode.drawNodes[i].endIndex)) {
30070
- _context2.next = 16;
30234
+ _context3.next = 16;
30071
30235
  break;
30072
30236
  }
30073
30237
 
30074
30238
  drawNode = anode.drawNodes[i];
30075
- return _context2.abrupt("break", 19);
30239
+ return _context3.abrupt("break", 19);
30076
30240
 
30077
30241
  case 16:
30078
30242
  i++;
30079
- _context2.next = 12;
30243
+ _context3.next = 12;
30080
30244
  break;
30081
30245
 
30082
30246
  case 19:
@@ -30117,9 +30281,9 @@ var DocController = /*#__PURE__*/function () {
30117
30281
  }
30118
30282
  }
30119
30283
 
30120
- 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);
30284
+ 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);
30121
30285
  delRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath);
30122
- _context2.next = 28;
30286
+ _context3.next = 28;
30123
30287
  return this.deleteRange(delRange, true);
30124
30288
 
30125
30289
  case 28:
@@ -30133,7 +30297,7 @@ var DocController = /*#__PURE__*/function () {
30133
30297
 
30134
30298
  if (anode) {
30135
30299
  anodeEndPath = hoeditorfactory.docTree.getNodeLastPath(anode);
30136
- result = _NodePosition__WEBPACK_IMPORTED_MODULE_82__/* .NodePosition.treePathCompare */ .F.treePathCompare(anodeEndPath, range.startPath);
30300
+ result = _NodePosition__WEBPACK_IMPORTED_MODULE_83__/* .NodePosition.treePathCompare */ .F.treePathCompare(anodeEndPath, range.startPath);
30137
30301
 
30138
30302
  if (result <= 0) {
30139
30303
  anode = null;
@@ -30142,19 +30306,19 @@ var DocController = /*#__PURE__*/function () {
30142
30306
 
30143
30307
  case 34:
30144
30308
  if (anode && astart.previousLeaf() && anode !== astart.previousLeaf()) {
30145
- _context2.next = 8;
30309
+ _context3.next = 8;
30146
30310
  break;
30147
30311
  }
30148
30312
 
30149
30313
  case 35:
30150
30314
  case "end":
30151
- return _context2.stop();
30315
+ return _context3.stop();
30152
30316
  }
30153
30317
  }
30154
- }, _callee2, this);
30318
+ }, _callee3, this);
30155
30319
  }));
30156
30320
 
30157
- function textToLabel(_x) {
30321
+ function textToLabel(_x2) {
30158
30322
  return _textToLabel.apply(this, arguments);
30159
30323
  }
30160
30324
 
@@ -30198,7 +30362,7 @@ var DocController = /*#__PURE__*/function () {
30198
30362
  var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
30199
30363
  var startPath = domRange.startPath;
30200
30364
  var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
30201
- 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); //插入该表达式节点
30365
+ 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); //插入该表达式节点
30202
30366
 
30203
30367
  hoEditorFactory.undoService.begin();
30204
30368
  hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, signNode));
@@ -30228,7 +30392,7 @@ var DocController = /*#__PURE__*/function () {
30228
30392
  // }
30229
30393
  // }
30230
30394
 
30231
- 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); //插入该表达式节点
30395
+ 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); //插入该表达式节点
30232
30396
 
30233
30397
  hoEditorFactory.undoService.begin();
30234
30398
  hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, signNode));
@@ -30292,7 +30456,7 @@ var DocController = /*#__PURE__*/function () {
30292
30456
  }
30293
30457
  }
30294
30458
 
30295
- 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); //插入该表达式节点
30459
+ 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); //插入该表达式节点
30296
30460
 
30297
30461
  hoEditorFactory.undoService.begin();
30298
30462
  hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, sPath, newSignNode));
@@ -30422,7 +30586,7 @@ var DocController = /*#__PURE__*/function () {
30422
30586
  var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
30423
30587
 
30424
30588
  var _cell$table$canMergeC = cell.table.canMergeCell(r, c, rowSpan, colSpan),
30425
- _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),
30589
+ _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),
30426
30590
  ret = _cell$table$canMergeC2[0],
30427
30591
  aRowSpan = _cell$table$canMergeC2[1],
30428
30592
  aColSpan = _cell$table$canMergeC2[2];
@@ -55602,6 +55766,8 @@ var UnitConvert = __webpack_require__(55479);
55602
55766
  var BaseNode = __webpack_require__(92178);
55603
55767
  // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawDownListNode.ts
55604
55768
  var DrawDownListNode = __webpack_require__(19459);
55769
+ // EXTERNAL MODULE: ./src/editor/dom/treeNode/TextInputFieldNode.ts
55770
+ var TextInputFieldNode = __webpack_require__(69802);
55605
55771
  ;// CONCATENATED MODULE: ./src/editor/draw/DrawLine.ts
55606
55772
 
55607
55773
 
@@ -55623,6 +55789,7 @@ var DrawDownListNode = __webpack_require__(19459);
55623
55789
 
55624
55790
 
55625
55791
 
55792
+
55626
55793
 
55627
55794
 
55628
55795
  var DrawLine = /*#__PURE__*/function (_DrawContainer) {
@@ -56237,6 +56404,10 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
56237
56404
  break;
56238
56405
  }
56239
56406
  }
56407
+
56408
+ if (Paragraph/* Align.alright */.xM.alright && this.paragraphNode.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && this.paragraphNode.parentNode.alignWithBlocked) {
56409
+ usedWidth = 0;
56410
+ }
56240
56411
  /**
56241
56412
  * 返回字间距
56242
56413
  * @param index 字序号
@@ -63066,9 +63237,12 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
63066
63237
  }
63067
63238
  }, {
63068
63239
  key: "afterHeightChanged",
63069
- value: function afterHeightChanged(oldHeight, newHeight) {
63070
- if (this._cell.cellProperty.align != TableProperty/* VAlign.vatop */.TR.vatop) {
63071
- var newValignTop = this.calcValignTop();
63240
+ value: function afterHeightChanged() {
63241
+ if (this._cell.cellProperty.align == TableProperty/* VAlign.vacenter */.TR.vacenter) {
63242
+ var _this$calcValignTop = this.calcValignTop(),
63243
+ _this$calcValignTop2 = (0,slicedToArray/* default */.Z)(_this$calcValignTop, 2),
63244
+ newValignTop = _this$calcValignTop2[0],
63245
+ topArr = _this$calcValignTop2[1];
63072
63246
 
63073
63247
  if (newValignTop != this._valignTop) {
63074
63248
  var adjustValignTop = newValignTop - this._valignTop;
@@ -63080,6 +63254,56 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
63080
63254
  }
63081
63255
  }
63082
63256
  }
63257
+ } else if (this._cell.cellProperty.align == TableProperty/* VAlign.vabottom */.TR.vabottom) {
63258
+ var _this$calcValignTop3 = this.calcValignTop(),
63259
+ _this$calcValignTop4 = (0,slicedToArray/* default */.Z)(_this$calcValignTop3, 2),
63260
+ _newValignTop = _this$calcValignTop4[0],
63261
+ rowHeightArr = _this$calcValignTop4[1];
63262
+
63263
+ if (rowHeightArr) {
63264
+ // const getPlace=(dTop:number,dPageCellIndex: number,dHeight:number):[number,number]=>{
63265
+ // let index=0;
63266
+ // let newTop=dTop;
63267
+ // let rowHeight=0;
63268
+ // for (let i=0;i<topArr.length;i++ ){
63269
+ // if (dTop+dHeight<topArr[i]){
63270
+ // index=i;
63271
+ // break;
63272
+ // }
63273
+ // else {
63274
+ // newTop-=topArr[i]
63275
+ // }
63276
+ // }
63277
+ // return [index,newTop]
63278
+ // }
63279
+ if (_newValignTop != this._valignTop) {
63280
+ this._valignTop = _newValignTop;
63281
+ var childCount = this._cell.drawCell.drawLines.length;
63282
+ var pageCellIndex = this._cell.drawCell.drawPageCells.length - 1;
63283
+ var dPageCell = this._cell.drawCell.drawPageCells[pageCellIndex];
63284
+ var cellrestHeight = rowHeightArr[pageCellIndex];
63285
+
63286
+ for (var _i = childCount - 1; _i >= 0; _i--) {
63287
+ var dObj = this._cell.drawCell.drawLines[_i];
63288
+
63289
+ if (dObj instanceof DrawLine/* DrawLine */.a || dObj instanceof DrawPageTable/* DrawPageTable */.ox) {
63290
+ while (pageCellIndex > 0 && cellrestHeight < dObj.dHeight) {
63291
+ pageCellIndex -= 1;
63292
+ dPageCell = this._cell.drawCell.drawPageCells[pageCellIndex];
63293
+ cellrestHeight = rowHeightArr[pageCellIndex];
63294
+ }
63295
+
63296
+ if (!dPageCell.contains(dObj) && dObj.parent && dObj.parent.contains(dObj)) {
63297
+ dObj.parent.removeChild(dObj);
63298
+ }
63299
+
63300
+ dObj.y = cellrestHeight - dObj.dHeight - dObj.paragraphNode.combineParagraph.lineSpace;
63301
+ cellrestHeight = dObj.y;
63302
+ dPageCell.addChild(dObj); // const [pageCellIndex,newTop]=getPlace(dTop,index,dObj.dHeight);
63303
+ }
63304
+ }
63305
+ }
63306
+ }
63083
63307
  }
63084
63308
  }
63085
63309
  }, {
@@ -63101,9 +63325,12 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
63101
63325
  value: function calcValignTop() {
63102
63326
  var index = this.cell.drawCell.drawPageCells.indexOf(this);
63103
63327
  var innerTop = 0;
63328
+ var toparr = new Array();
63329
+ var aHeight = 0;
63330
+ var hoeditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID);
63104
63331
 
63105
63332
  if (index == 0) {
63106
- innerTop = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID).unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[0] * 10, true);
63333
+ innerTop = hoeditorFactory.unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[0] * 10, true);
63107
63334
  }
63108
63335
 
63109
63336
  var valignTop = innerTop;
@@ -63111,34 +63338,63 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
63111
63338
  if (this._cell.cellProperty.align === TableProperty/* VAlign.vatop */.TR.vatop) {
63112
63339
  valignTop = innerTop;
63113
63340
  } else if (this._cell.cellProperty.align === TableProperty/* VAlign.vacenter */.TR.vacenter) {
63114
- var aHeight = this.calcCellHeight();
63341
+ var _this$calcCellHeight = this.calcCellHeight();
63342
+
63343
+ var _this$calcCellHeight2 = (0,slicedToArray/* default */.Z)(_this$calcCellHeight, 2);
63344
+
63345
+ aHeight = _this$calcCellHeight2[0];
63346
+ toparr = _this$calcCellHeight2[1];
63115
63347
  if (aHeight > this._cell.drawCell.docHeight) valignTop = (aHeight - this._cell.drawCell.docHeight) / 2;
63116
63348
  } else if (this._cell.cellProperty.align === TableProperty/* VAlign.vabottom */.TR.vabottom) {
63117
- var _aHeight = this.calcCellHeight();
63349
+ var _this$calcCellHeight3 = this.calcCellHeight();
63350
+
63351
+ var _this$calcCellHeight4 = (0,slicedToArray/* default */.Z)(_this$calcCellHeight3, 2);
63352
+
63353
+ aHeight = _this$calcCellHeight4[0];
63354
+ toparr = _this$calcCellHeight4[1];
63355
+ var innerBottom = hoeditorFactory.unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[1] * 10, true);
63356
+ var restRowHeight = 0;
63118
63357
 
63119
- var innerBottom = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID).unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[1] * 10, true);
63120
- if (_aHeight > this._cell.drawCell.docHeight) valignTop = _aHeight - this._cell.drawCell.docHeight - innerBottom;
63358
+ for (var r = index; r < toparr.length; r++) {
63359
+ restRowHeight += toparr[r];
63360
+ }
63361
+
63362
+ if (aHeight > this._cell.drawCell.docHeight && this._cell.drawCell.docHeight < restRowHeight) {
63363
+ valignTop = restRowHeight - this._cell.drawCell.docHeight - innerBottom;
63364
+ }
63121
63365
  }
63122
63366
 
63123
- return valignTop;
63367
+ return [valignTop, toparr];
63124
63368
  }
63125
63369
  }, {
63126
63370
  key: "update",
63127
63371
  value: function update(prevDrawArea, dlines, startIndex, dTop, restHeight) {
63128
- var valignTop = dTop; // if (startIndex === 0) {
63372
+ var valignTop = dTop;
63373
+
63374
+ if (this._cell.cellProperty.align == TableProperty/* VAlign.vabottom */.TR.vabottom) {
63375
+ valignTop = this.calcValignTop()[0];
63376
+ this._valignTop = valignTop;
63377
+ } // if (startIndex === 0) {
63129
63378
  // valignTop=this.calcValignTop();
63130
63379
  // this._valignTop=valignTop;
63131
63380
  // }
63132
63381
 
63382
+
63133
63383
  this._startDline = startIndex;
63134
63384
 
63135
63385
  var ret = (0,get/* default */.Z)((0,getPrototypeOf/* default */.Z)(DrawPageCell.prototype), "update", this).call(this, prevDrawArea, dlines, startIndex, valignTop, restHeight);
63136
63386
 
63137
- this._docHeight -= valignTop;
63387
+ this._docHeight = Math.max(0, this._docHeight - valignTop);
63138
63388
  this.updateDHeight();
63139
63389
  return ret; // this.updateTouchArea(this._dHeight);
63140
63390
  // this.paintCellBackground(this._dHeight);
63141
63391
  }
63392
+ /**
63393
+ *
63394
+ * @returns
63395
+ * 返回单元格在所有分页上的总高度,以及每页高度数组
63396
+ */
63397
+
63142
63398
  }, {
63143
63399
  key: "calcCellHeight",
63144
63400
  value: function calcCellHeight() {
@@ -63148,16 +63404,55 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
63148
63404
  c = _this$_cell$table$get6[1];
63149
63405
 
63150
63406
  var ret = 0;
63407
+ var hoeditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID);
63408
+ var dTopArr = new Array();
63409
+
63410
+ if (this._cell.cellProperty.align == TableProperty/* VAlign.vabottom */.TR.vabottom) {
63411
+ ret = 0;
63412
+
63413
+ for (var r = row, count = this._cell.rowSpan + row - 1; r <= count; r++) {
63414
+ var rowInfos = this._cell.table.rowInfos[r];
63415
+
63416
+ if (rowInfos) {
63417
+ ret += rowInfos.rowHeight;
63418
+ }
63419
+ }
63420
+
63421
+ var icount = this._cell.table.drawTable.drawPageTables.length;
63422
+ var index = 0;
63423
+ var pageHeight = 0;
63424
+
63425
+ for (var i = 0; i < icount; i++) {
63426
+ dTopArr[index] = 0;
63427
+
63428
+ for (var _r = row, _count = this._cell.rowSpan + row - 1; _r <= _count; _r++) {
63429
+ var dTable = this._cell.table.drawTable.drawPageTables[i];
63151
63430
 
63152
- for (var r = row, count = this._cell.rowSpan + row - 1; r <= count; r++) {
63153
- var rowInfos = this._drawPageTable.partRowHeights.get(r);
63431
+ if (dTable.parent && dTable.parent.contains(dTable)) {
63432
+ var _rowInfos = dTable.partRowHeights.get(_r);
63154
63433
 
63155
- if (rowInfos) {
63156
- ret += rowInfos.rowHeight;
63434
+ if (_rowInfos) {
63435
+ if (pageHeight < ret) {
63436
+ pageHeight += _rowInfos.rowHeight;
63437
+ dTopArr[index] += _rowInfos.rowHeight;
63438
+ }
63439
+ }
63440
+ }
63441
+
63442
+ index += 1;
63443
+ }
63444
+ }
63445
+ } else if (this._cell.cellProperty.align == TableProperty/* VAlign.vacenter */.TR.vacenter) {
63446
+ for (var _r2 = row, _count2 = this._cell.rowSpan + row - 1; _r2 <= _count2; _r2++) {
63447
+ var _rowInfos2 = this._drawPageTable.partRowHeights.get(_r2);
63448
+
63449
+ if (_rowInfos2) {
63450
+ ret += _rowInfos2.rowHeight;
63451
+ }
63157
63452
  }
63158
63453
  }
63159
63454
 
63160
- return ret;
63455
+ return [ret, dTopArr];
63161
63456
  }
63162
63457
  }]);
63163
63458
 
@@ -63808,7 +64103,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63808
64103
  if (partCell) {
63809
64104
  var oldHeight = partCell.dHeight;
63810
64105
  partCell.dHeight = newHeight;
63811
- partCell.afterHeightChanged(oldHeight, newHeight);
64106
+ partCell.afterHeightChanged();
63812
64107
 
63813
64108
  if (partCell.cell.rowSpan > 1) {
63814
64109
  var index = partCell.cell.drawCell.drawPageCells.indexOf(partCell) - 1;
@@ -66678,6 +66973,7 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
66678
66973
  key: "updateRowHeight",
66679
66974
  value: function updateRowHeight(r) {
66680
66975
  var dHeight = _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_13__/* .gDefaultRowHeight */ .dT;
66976
+ var bottonAlignCell = new Array();
66681
66977
  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
66978
 
66683
66979
  if (this._table.rowInfos[r].rowProperty.isSpecifyHeight) {
@@ -66692,6 +66988,10 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
66692
66988
  for (var c = 0; c < this._table.colCount; c++) {
66693
66989
  var aCell = this._table.rows[r][c];
66694
66990
 
66991
+ if (aCell && aCell.cellProperty.align == _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_11__/* .VAlign.vabottom */ .TR.vabottom) {
66992
+ bottonAlignCell.push(aCell);
66993
+ }
66994
+
66695
66995
  if (aCell && aCell.rowSpan === 1 && aCell.drawCell.dHeight > dHeight) {
66696
66996
  dHeight = aCell.drawCell.dHeight; // let nextValue = aCell.drawCell.drawPageCells.values().next();
66697
66997
  // while (!nextValue.done) {
@@ -66729,6 +67029,10 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
66729
67029
  if (dHeight > rowPorpertyHeight) this._table.rowInfos[r].rowHeight = rowPorpertyHeight;else this._table.rowInfos[r].rowHeight = dHeight;
66730
67030
  } else this._table.rowInfos[r].rowHeight = dHeight;
66731
67031
  }
67032
+
67033
+ for (var _c = 0; _c < bottonAlignCell.length; _c++) {
67034
+ bottonAlignCell[_c].drawCell.needUpdate = true;
67035
+ }
66732
67036
  } // for (let c = 0; c < this._table.colCount; c++) {
66733
67037
  // const aCell = this._table.rows[r][c];
66734
67038
  // if (aCell) {
@@ -66860,7 +67164,24 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
66860
67164
 
66861
67165
  this.finishUpdate();
66862
67166
  }
66863
- }
67167
+ } // for (let i=0;i<this._drawPageTables.length-1;i++){
67168
+ // let c=0;
67169
+ // while (c<this._table.colCount){
67170
+ // const [cell,mr,mc]= this._table.getMainCell(dPageTable.endRow,c);
67171
+ // let inc=1;
67172
+ // if (cell){
67173
+ // if (cell.cellProperty.align==VAlign.vabottom){
67174
+ // const pageCell= cell.drawCell.getDrawPageCell(dPageTable);
67175
+ // if (pageCell){
67176
+ // pageCell.afterHeightChanged()
67177
+ // }
67178
+ // inc=cell.rowSpan;
67179
+ // }
67180
+ // c+=inc;
67181
+ // }
67182
+ // }
67183
+ // }
67184
+
66864
67185
 
66865
67186
  rowTop = dTop + dPageTable.dHeight;
66866
67187
 
@@ -70154,6 +70475,8 @@ var TableFormula = __webpack_require__(72330);
70154
70475
  var DrawConfig = __webpack_require__(15654);
70155
70476
  // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawSignNode.ts
70156
70477
  var DrawSignNode = __webpack_require__(23127);
70478
+ // EXTERNAL MODULE: ./src/editor/dom/TableProperty.ts
70479
+ var TableProperty = __webpack_require__(74004);
70157
70480
  ;// CONCATENATED MODULE: ./src/editor/draw/drawTree/DrawTree.ts
70158
70481
 
70159
70482
 
@@ -70216,6 +70539,7 @@ var DrawSignNode = __webpack_require__(23127);
70216
70539
 
70217
70540
 
70218
70541
 
70542
+
70219
70543
 
70220
70544
 
70221
70545
  //当前的显示状态,psDesign为设计状态,psEdit为正常编辑状态 psPreview为打印预览态态 psPrint 正在打印状态, psReview审阅状态
@@ -72609,20 +72933,38 @@ var DrawTree = /*#__PURE__*/function () {
72609
72933
 
72610
72934
  var _index2 = dPlace.cell.drawCell.drawPageCells.indexOf(dPlace);
72611
72935
 
72612
- while (_index2 > 0) {
72613
- aPrevPlace = dPlace.cell.drawCell.drawPageCells[_index2 - 1];
72936
+ if (dPlace.cell.cellProperty.align != TableProperty/* VAlign.vabottom */.TR.vabottom) {
72937
+ while (_index2 > 0) {
72938
+ aPrevPlace = dPlace.cell.drawCell.drawPageCells[_index2 - 1];
72939
+
72940
+ if (!aPrevPlace.isEmpty()) {
72941
+ var rootArea = hoeditfactory.drawPageTree.getMainRootArea(aPrevPlace);
72614
72942
 
72615
- if (!aPrevPlace.isEmpty()) {
72616
- var rootArea = hoeditfactory.drawPageTree.getMainRootArea(aPrevPlace);
72943
+ if (rootArea) {
72944
+ aPage = this._drawPages[rootArea.index];
72945
+ }
72617
72946
 
72618
- if (rootArea) {
72619
- aPage = this._drawPages[rootArea.index];
72947
+ return this.getStagePosition(aPage, aPrevPlace, x, 99999999);
72620
72948
  }
72621
72949
 
72622
- return this.getStagePosition(aPage, aPrevPlace, x, 99999999);
72950
+ _index2 -= 1;
72623
72951
  }
72952
+ } else {
72953
+ while (_index2 < dPlace.cell.drawCell.drawPageCells.length - 1) {
72954
+ aPrevPlace = dPlace.cell.drawCell.drawPageCells[_index2 + 1];
72955
+
72956
+ if (!aPrevPlace.isEmpty()) {
72957
+ var _rootArea = hoeditfactory.drawPageTree.getMainRootArea(aPrevPlace);
72958
+
72959
+ if (_rootArea) {
72960
+ aPage = this._drawPages[_rootArea.index];
72961
+ }
72624
72962
 
72625
- _index2 -= 1;
72963
+ return this.getStagePosition(aPage, aPrevPlace, x, 99999999);
72964
+ }
72965
+
72966
+ _index2 += 1;
72967
+ }
72626
72968
  }
72627
72969
  } // if (dPlace instanceof DrawCell) {
72628
72970
  // dItems = (dPlace as DrawCell).drawLxines;
@@ -214341,9 +214683,9 @@ var es_string_match = __webpack_require__(4723);
214341
214683
  var es_number_constructor = __webpack_require__(9653);
214342
214684
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
214343
214685
  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=5f466836&
214345
- var HoDocvue_type_template_id_5f466836_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.docClassNames},[_c('div',{ref:"editorArea",staticClass:"editors"},[(_vm.drawPageLength > 0)?_c('div',{staticClass:"editor",on:{"click":function($event){return _vm.setActiveDocIndex(_vm.hoEditorId)}}},[_vm._l((_vm.drawPageCount.count),function(pgIndex){return [_c('HoPage',{key:pgIndex - 1,attrs:{"data-id":pgIndex - 1,"index":pgIndex - 1,"docIndex":_vm.docIndex,"canvasWidth":_vm.canvasParams.width,"canvasHeight":_vm.canvasParams.height,"currentActivePages":_vm.activePageIndex.index,"hoEditorId":_vm.hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"mouseMoveNodes":_vm.mouseMoveNodes,"viewableAreaObserver":_vm.viewableAreaObserver,"inViewPages":_vm.inViewPages,"canvasHeadFootPos":_vm.canvasHeadFootPos,"poperTipPos":_vm.poperTipPos,"textStyle":_vm.textStyle,"aiInfo":_vm.aiInfo},on:{"pageReady":_vm.pageReady,"canvasRightClick":_vm.mouseRightClickEvent},scopedSlots:_vm._u([{key:"hoPageHead",fn:function(){return [_vm._t("hoDocHead")]},proxy:true},{key:"hoPageFoot",fn:function(){return [_vm._t("hoDocFoot")]},proxy:true}],null,true)})]})],2):_vm._e()]),(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper')?_c('PoperSelectModal',{attrs:{"poperType":_vm.poperType,"poperSelectList":_vm.poperSelectList,"poperPos":_vm.poperPos,"hoEditorId":_vm.hoEditorId},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('PoperMark',{directives:[{name:"show",rawName:"v-show",value:(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper' || _vm.poperType === 'table-cell-poper'),expression:"poperType === 'datePoper' || poperType === 'selectPoper' || poperType === 'table-cell-poper'"}]}),(_vm.poperType === 'table-cell-poper')?_c('TableCellPoper',{attrs:{"poperNode":_vm.nodeValue,"poperPos":_vm.poperPos},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('HoToPage',{attrs:{"hoEditorId":_vm.hoEditorId,"inViewPages":_vm.inViewPages}}),_c('PoperTipText',{attrs:{"isPoperText":_vm.isPoperText,"poperText":_vm.poperText,"poperPos":_vm.poperTextPos},on:{"poperTextClose":_vm.poperTextClose}}),_c('ul',{directives:[{name:"click-outside",rawName:"v-click-outside",value:(function () { return (_vm.isCreateRightMenuModal = false); }),expression:"() => (isCreateRightMenuModal = false)"},{name:"show",rawName:"v-show",value:(_vm.isCreateRightMenuModal),expression:"isCreateRightMenuModal"}],ref:"rightMenuModal",staticClass:"create-right-menu"},[(_vm.showCommentsBtn)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.hideComments}},[_vm._v(_vm._s(_vm.isHideComments ? '显示' : '隐藏')+"批注")]):_vm._e(),(_vm.showDeleteSignMenu)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.deleteSignNode}},[_vm._v("删除签名")]):_vm._e(),_c('li',{staticClass:"mouse-menu-item"},[_vm._v(" 编辑器内核版本:   "),_c('span',{staticStyle:{"font-size":"14px","color":"#0a77e3"}},[_vm._v("v "+_vm._s(_vm.version))])])])],1)}
214346
- var HoDocvue_type_template_id_5f466836_staticRenderFns = []
214686
+ ;// 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&
214687
+ 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)}
214688
+ var HoDocvue_type_template_id_7e5f63ff_staticRenderFns = []
214347
214689
 
214348
214690
 
214349
214691
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
@@ -217984,7 +218326,7 @@ var SignNode = __webpack_require__(78975);
217984
218326
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
217985
218327
  var ParagraphNode = __webpack_require__(13880);
217986
218328
  ;// CONCATENATED MODULE: ./src/components/version.ts
217987
- /* harmony default export */ var version = ('2.0.96');
218329
+ /* harmony default export */ var version = ('2.0.97');
217988
218330
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
217989
218331
  var PoperTipText = __webpack_require__(97824);
217990
218332
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -218763,8 +219105,8 @@ var ImageNode = __webpack_require__(23778);
218763
219105
 
218764
219106
  var HoDoc_component = (0,componentNormalizer/* default */.Z)(
218765
219107
  components_HoDocvue_type_script_lang_js_,
218766
- HoDocvue_type_template_id_5f466836_render,
218767
- HoDocvue_type_template_id_5f466836_staticRenderFns,
219108
+ HoDocvue_type_template_id_7e5f63ff_render,
219109
+ HoDocvue_type_template_id_7e5f63ff_staticRenderFns,
218768
219110
  false,
218769
219111
  null,
218770
219112
  null,
@@ -218817,6 +219159,7 @@ var TableNode = __webpack_require__(59530);
218817
219159
 
218818
219160
 
218819
219161
 
219162
+
218820
219163
 
218821
219164
 
218822
219165
  var NeedDrawPageInfo = /*#__PURE__*/function () {
@@ -219021,17 +219364,6 @@ var DrawPageTree = /*#__PURE__*/function () {
219021
219364
  return [ret, isNew];
219022
219365
  } //拆分成页
219023
219366
 
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
219367
  }, {
219036
219368
  key: "paint",
219037
219369
  value: function paint(aDrawArea, dRoots, startLine, endLine) {
@@ -219104,7 +219436,7 @@ var DrawPageTree = /*#__PURE__*/function () {
219104
219436
  }
219105
219437
 
219106
219438
  if (hoEditorFactory.isUseDrawingOptimization) {
219107
- this.clearAfterDTop(mainArea, dTop);
219439
+ this.clearAreas([mainArea]);
219108
219440
  }
219109
219441
 
219110
219442
  var nextLine = startLine;
@@ -219611,7 +219943,7 @@ var DrawPageTree = /*#__PURE__*/function () {
219611
219943
  }
219612
219944
 
219613
219945
  var startPaintWithUpdate = this._startNeedUpdatePage === -1 && this._endNeedUpdatePage === -1;
219614
- var imaxViewPage = Math.max.apply(Math, (0,toConsumableArray/* default */.Z)(hoEditorFactory.drawTree.inViewPages));
219946
+ var imaxViewPage = Math.max.apply(Math, (0,toConsumableArray/* default */.Z)(hoEditorFactory.drawTree.inViewPages).concat([this._drawMainDocs.length - 1]));
219615
219947
 
219616
219948
  try {
219617
219949
  if (this._oldPageCount === 0) {
@@ -236956,12 +237288,13 @@ var FontStyleMixin = /*#__PURE__*/function (_Vue) {
236956
237288
 
236957
237289
  var drawPageTables = tableNodeInfo.tableNode.drawTable.drawPageTables;
236958
237290
  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;
237291
+ var currentPageIndex = dPage.drawMainDoc.pageIndex;
237292
+ tableBounds.cellX = drawPageCells[currentPageIndex].x + 20;
237293
+ tableBounds.cellY = drawPageCells[currentPageIndex].y + 20;
237294
+ tableBounds.cellWidth = drawPageCells[currentPageIndex].dWidth;
237295
+ tableBounds.cellHeight = drawPageCells[currentPageIndex].dHeight;
236963
237296
  drawPageTables.forEach(function (v, key) {
236964
- if (v.parent.pageIndex === dPage.drawMainDoc.pageIndex) {
237297
+ if (v.parent.pageIndex === currentPageIndex) {
236965
237298
  tableBounds.height = v.dHeight;
236966
237299
  tableBounds.y = dPage.drawMainDoc.y + v.y;
236967
237300