hoeditor-web 3.0.25 → 3.0.26

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.
@@ -9076,7 +9076,7 @@ var component = (0,componentNormalizer/* default */.Z)(
9076
9076
 
9077
9077
  /***/ }),
9078
9078
 
9079
- /***/ 1933:
9079
+ /***/ 12602:
9080
9080
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
9081
9081
 
9082
9082
  "use strict";
@@ -9096,7 +9096,7 @@ var es_string_includes = __webpack_require__(32023);
9096
9096
  var es_regexp_exec = __webpack_require__(74916);
9097
9097
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
9098
9098
  var es_string_replace = __webpack_require__(15306);
9099
- ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=af700224&
9099
+ ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=41386ead&
9100
9100
 
9101
9101
 
9102
9102
 
@@ -9477,7 +9477,7 @@ var render = function render() {
9477
9477
  };
9478
9478
  var staticRenderFns = [];
9479
9479
 
9480
- ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=af700224&
9480
+ ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=41386ead&
9481
9481
 
9482
9482
  // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
9483
9483
  var toConsumableArray = __webpack_require__(61748);
@@ -12036,8 +12036,9 @@ var type = __webpack_require__(41542);
12036
12036
  var checkText = '<span>' + textArr.join('') + '</span>';
12037
12037
  hoEditorFactory.vueController.insertHtmlText(checkText, checkText, keyValue, this.selectedList, true);
12038
12038
  } else {
12039
- var customProperty = this.getCustomProperty ? this.getCustomProperty() : {};
12040
- hoEditorFactory.elementController.updateTextInputFieldValue(currentPoperNode, text, customProperty, keyValue, value);
12039
+ // const customProperty = this.getCustomProperty ? this.getCustomProperty() : {};
12040
+
12041
+ hoEditorFactory.elementController.updateTextInputFieldValue(currentPoperNode, text, currentPoperNode.customProperty, keyValue, value);
12041
12042
  }
12042
12043
  }
12043
12044
  // 元素联动内容延时关闭下拉选项,防止双击把光标移动到联动元素外
@@ -12089,10 +12090,10 @@ var type = __webpack_require__(41542);
12089
12090
  });
12090
12091
  ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=script&lang=js&
12091
12092
  /* harmony default export */ var poperSelect_PoperSelectvue_type_script_lang_js_ = (PoperSelectvue_type_script_lang_js_);
12092
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=af700224&prod&lang=scss&
12093
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=41386ead&prod&lang=scss&
12093
12094
  // extracted by mini-css-extract-plugin
12094
12095
 
12095
- ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=af700224&prod&lang=scss&
12096
+ ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=41386ead&prod&lang=scss&
12096
12097
 
12097
12098
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
12098
12099
  var componentNormalizer = __webpack_require__(70713);
@@ -29916,10 +29917,17 @@ _ctx.prototype.rect = function (x, y, width, height) {
29916
29917
  if (this.__currentElement.nodeName !== "path") {
29917
29918
  this.beginPath();
29918
29919
  }
29920
+ // 处理打开前默认宽高为a4纵向时 第一次生成html背景色绘制大小错误的问题
29921
+ var dwidth = width;
29922
+ var dheight = height;
29923
+ if (width == 794 && height == 1122) {
29924
+ dwidth = this.width;
29925
+ dheight = this.height;
29926
+ }
29919
29927
  this.moveTo(x, y);
29920
- this.lineTo(x + width, y);
29921
- this.lineTo(x + width, y + height);
29922
- this.lineTo(x, y + height);
29928
+ this.lineTo(x + dwidth, y);
29929
+ this.lineTo(x + dwidth, y + dheight);
29930
+ this.lineTo(x, y + dheight);
29923
29931
  this.lineTo(x, y);
29924
29932
  this.closePath();
29925
29933
  };
@@ -35359,7 +35367,7 @@ var Print = /*#__PURE__*/function () {
35359
35367
  key: "printToPDF",
35360
35368
  value: function () {
35361
35369
  var _printToPDF = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee2(hoEditorFactoryID, PDF, type, fileName, reslove, positionY, format) {
35362
- var hoEditorFactory, dPage, docHeight, dHeight, startPageNum, svgBox, orientation, width, height, last, startPageNumOver, _iterator, _step, index, cpage, mainHeight, lastDline, dShape, posIndex, posY, _dShape, svg2pdfOptions, _cpage$drawDomLevel, _cpage$drawDomLevel$s, ctx, _cpage$drawDomLevel2, _cpage$drawDomLevel2$, _ctx, _ctx2, _svgBox2, svgData, _ctx3, _cpage$drawDomLevel$s2, _svgBox, printStyle, exportHtml, url, link, _last, otherPageNumber, i, name;
35370
+ var hoEditorFactory, dPage, docHeight, dHeight, startPageNum, svgBox, orientation, width, height, last, pageNumber, startPageNumOver, _iterator, _step, index, cpage, mainHeight, lastDline, dShape, posIndex, posY, _dShape, svg2pdfOptions, _cpage$drawDomLevel, _cpage$drawDomLevel$s, ctx, _cpage$drawDomLevel2, _cpage$drawDomLevel2$, _ctx, _ctx2, _svgBox2, svgData, _ctx3, _cpage$drawDomLevel$s2, _svgBox, printStyle, exportHtml, url, link, _last, otherPageNumber, i, name;
35363
35371
  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee2$(_context3) {
35364
35372
  while (1) {
35365
35373
  switch (_context3.prev = _context3.next) {
@@ -35404,37 +35412,38 @@ var Print = /*#__PURE__*/function () {
35404
35412
  }
35405
35413
  last = -1;
35406
35414
  console.time('绘制svg和生成pdf');
35415
+ pageNumber = 0;
35407
35416
  startPageNumOver = false;
35408
35417
  _iterator = (0,createForOfIteratorHelper/* default */.Z)(hoEditorFactory.printStatus.printProcess());
35409
- _context3.prev = 16;
35418
+ _context3.prev = 17;
35410
35419
  _iterator.s();
35411
- case 18:
35420
+ case 19:
35412
35421
  if ((_step = _iterator.n()).done) {
35413
- _context3.next = 62;
35422
+ _context3.next = 65;
35414
35423
  break;
35415
35424
  }
35416
35425
  index = _step.value;
35417
35426
  if (!(index == -1)) {
35418
- _context3.next = 23;
35427
+ _context3.next = 24;
35419
35428
  break;
35420
35429
  }
35421
35430
  message/* default.info */.Z.info('请进行翻页');
35422
- return _context3.abrupt("continue", 60);
35423
- case 23:
35431
+ return _context3.abrupt("continue", 63);
35432
+ case 24:
35424
35433
  last = index;
35425
35434
  if (!(index < hoEditorFactory.startPageNum)) {
35426
- _context3.next = 26;
35435
+ _context3.next = 27;
35427
35436
  break;
35428
35437
  }
35429
- return _context3.abrupt("break", 62);
35430
- case 26:
35438
+ return _context3.abrupt("break", 65);
35439
+ case 27:
35431
35440
  cpage = hoEditorFactory.drawTree.drawPages[index];
35432
35441
  if (!(index === hoEditorFactory.drawTree.drawPages.length - 1 && cpage.drawMainDoc.children.length === 2 && !(cpage.drawMainDoc.children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && cpage.drawMainDoc.children[1] && cpage.drawMainDoc.children[1].drawItems.length === 0)) {
35433
- _context3.next = 29;
35442
+ _context3.next = 30;
35434
35443
  break;
35435
35444
  }
35436
- return _context3.abrupt("break", 62);
35437
- case 29:
35445
+ return _context3.abrupt("break", 65);
35446
+ case 30:
35438
35447
  if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
35439
35448
  cpage.drawDomLevel.bindStage();
35440
35449
  cpage.needUpdateStage = true;
@@ -35484,10 +35493,11 @@ var Print = /*#__PURE__*/function () {
35484
35493
  }
35485
35494
  }
35486
35495
  if (!(hoEditorFactory.isUseImagePrint && type !== 'html')) {
35487
- _context3.next = 46;
35496
+ _context3.next = 48;
35488
35497
  break;
35489
35498
  }
35490
35499
  PDF === null || PDF === void 0 ? void 0 : PDF.addPage();
35500
+ pageNumber++;
35491
35501
  ctx = PDF === null || PDF === void 0 ? void 0 : PDF.context2d;
35492
35502
  ctx.posX = svg2pdfOptions.x;
35493
35503
  ctx.posY = svg2pdfOptions.y;
@@ -35504,9 +35514,9 @@ var Print = /*#__PURE__*/function () {
35504
35514
 
35505
35515
  ctx && ((_cpage$drawDomLevel = cpage.drawDomLevel) === null || _cpage$drawDomLevel === void 0 ? void 0 : (_cpage$drawDomLevel$s = _cpage$drawDomLevel.stage) === null || _cpage$drawDomLevel$s === void 0 ? void 0 : _cpage$drawDomLevel$s.draw(ctx));
35506
35516
  ctx = null;
35507
- _context3.next = 59;
35517
+ _context3.next = 62;
35508
35518
  break;
35509
- case 46:
35519
+ case 48:
35510
35520
  _ctx = new canvas2svg({
35511
35521
  width: width,
35512
35522
  height: height,
@@ -35514,60 +35524,61 @@ var Print = /*#__PURE__*/function () {
35514
35524
  });
35515
35525
  _ctx && ((_cpage$drawDomLevel2 = cpage.drawDomLevel) === null || _cpage$drawDomLevel2 === void 0 ? void 0 : (_cpage$drawDomLevel2$ = _cpage$drawDomLevel2.stage) === null || _cpage$drawDomLevel2$ === void 0 ? void 0 : _cpage$drawDomLevel2$.draw(_ctx));
35516
35526
  if (!(type === 'html')) {
35517
- _context3.next = 53;
35527
+ _context3.next = 55;
35518
35528
  break;
35519
35529
  }
35520
35530
  svgData = (_ctx2 = _ctx) === null || _ctx2 === void 0 ? void 0 : _ctx2.getSvg();
35521
35531
  svgData && ((_svgBox2 = svgBox) === null || _svgBox2 === void 0 ? void 0 : _svgBox2.appendChild(svgData));
35522
- _context3.next = 58;
35532
+ _context3.next = 61;
35523
35533
  break;
35524
- case 53:
35534
+ case 55:
35525
35535
  PDF === null || PDF === void 0 ? void 0 : PDF.addPage();
35536
+ pageNumber++;
35526
35537
  _context3.t0 = PDF;
35527
35538
  if (!_context3.t0) {
35528
- _context3.next = 58;
35539
+ _context3.next = 61;
35529
35540
  break;
35530
35541
  }
35531
- _context3.next = 58;
35542
+ _context3.next = 61;
35532
35543
  return svg2pdf((_ctx3 = _ctx) === null || _ctx3 === void 0 ? void 0 : _ctx3.getSvg(), PDF, svg2pdfOptions);
35533
- case 58:
35544
+ case 61:
35534
35545
  _ctx = null;
35535
- case 59:
35546
+ case 62:
35536
35547
  if (index > 0 && cpage.drawDomLevel) {
35537
35548
  (_cpage$drawDomLevel$s2 = cpage.drawDomLevel.stage) === null || _cpage$drawDomLevel$s2 === void 0 ? void 0 : _cpage$drawDomLevel$s2.removeAllChildren();
35538
35549
  cpage.drawDomLevel.clearStage();
35539
35550
  }
35540
35551
  // index > 0 && cpage.drawDomLevel?.clearStage();
35541
- case 60:
35542
- _context3.next = 18;
35552
+ case 63:
35553
+ _context3.next = 19;
35543
35554
  break;
35544
- case 62:
35545
- _context3.next = 67;
35555
+ case 65:
35556
+ _context3.next = 70;
35546
35557
  break;
35547
- case 64:
35548
- _context3.prev = 64;
35549
- _context3.t1 = _context3["catch"](16);
35550
- _iterator.e(_context3.t1);
35551
35558
  case 67:
35552
35559
  _context3.prev = 67;
35553
- _iterator.f();
35554
- return _context3.finish(67);
35560
+ _context3.t1 = _context3["catch"](17);
35561
+ _iterator.e(_context3.t1);
35555
35562
  case 70:
35563
+ _context3.prev = 70;
35564
+ _iterator.f();
35565
+ return _context3.finish(70);
35566
+ case 73:
35556
35567
  console.timeEnd('绘制svg和生成pdf');
35557
35568
  if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
35558
35569
  hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
35559
35570
  if (!(type === 'html')) {
35560
- _context3.next = 90;
35571
+ _context3.next = 93;
35561
35572
  break;
35562
35573
  }
35563
35574
  if (!(svgBox && svgBox.childNodes.length === 0)) {
35564
- _context3.next = 78;
35575
+ _context3.next = 81;
35565
35576
  break;
35566
35577
  }
35567
35578
  message/* default.info */.Z.info('无新增内容');
35568
35579
  reslove && reslove('printend');
35569
35580
  return _context3.abrupt("return");
35570
- case 78:
35581
+ case 81:
35571
35582
  printStyle = (0,util/* createPrintHTMLStyle */.j_)(hoEditorFactory.pageProperty.pageSize, orientation);
35572
35583
  exportHtml = "\n <!DOCTYPE html>\n <html lang=\"en\">\n <head>\n <meta charset=\"utf-8\">\n <style>".concat(printStyle.innerHTML, "</style>\n </head>\n <body>").concat((_svgBox = svgBox) === null || _svgBox === void 0 ? void 0 : _svgBox.innerHTML, "</body>\n </html>\n ");
35573
35584
  url = window.URL.createObjectURL(new Blob([exportHtml], {
@@ -35584,34 +35595,34 @@ var Print = /*#__PURE__*/function () {
35584
35595
  }, 100);
35585
35596
  reslove && reslove('printend');
35586
35597
  return _context3.abrupt("return");
35587
- case 90:
35598
+ case 93:
35588
35599
  if (!(positionY || hoEditorFactory.startPageNum !== 0 && positionY !== undefined)) {
35589
- _context3.next = 96;
35600
+ _context3.next = 99;
35590
35601
  break;
35591
35602
  }
35592
35603
  _last = hoEditorFactory.printStatus.printRecord.last();
35593
35604
  if (!(_last && hoEditorFactory.startPageNum == _last[0] && positionY === _last[1])) {
35594
- _context3.next = 96;
35605
+ _context3.next = 99;
35595
35606
  break;
35596
35607
  }
35597
35608
  message/* default.info */.Z.info('无新增内容无法续打,如果要打印最后一份病历,请打开打印记录,删除最近一次打印记录');
35598
35609
  reslove && reslove('printend');
35599
35610
  return _context3.abrupt("return");
35600
- case 96:
35611
+ case 99:
35601
35612
  if (type === 'pdf') {
35602
35613
  PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
35603
35614
  PDF === null || PDF === void 0 ? void 0 : PDF.save(fileName + '.pdf');
35604
35615
  hoEditorFactory.printStatus.drawPrintRecord.clear();
35605
35616
  } else {
35606
- otherPageNumber = PDF.internal.getNumberOfPages() - hoEditorFactory.drawTree.drawPages.length;
35607
- if (otherPageNumber >= 1) {
35617
+ otherPageNumber = PDF.internal.getNumberOfPages() - pageNumber;
35618
+ if (otherPageNumber >= 2) {
35608
35619
  for (i = 0; i < otherPageNumber; i++) {
35609
35620
  PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
35610
35621
  }
35611
35622
  console.warn("\u4ECE\u5F00\u59CB\u5220\u6389".concat(otherPageNumber, "\u9875\u7A7A\u767D\u9875"));
35612
- } else if (otherPageNumber <= 0) {
35623
+ } else if (otherPageNumber <= 1) {
35613
35624
  PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
35614
- console.warn("otherPageNumber <= 0 \u65F6\u4ECE\u5F00\u59CB\u5220\u63891\u9875\u7A7A\u767D\u9875");
35625
+ console.warn("".concat(otherPageNumber, " <= 0 \u65F6\u4ECE\u5F00\u59CB\u5220\u63891\u9875\u7A7A\u767D\u9875"));
35615
35626
  }
35616
35627
  if (startPageNumOver) {
35617
35628
  PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
@@ -35620,12 +35631,12 @@ var Print = /*#__PURE__*/function () {
35620
35631
  PDF && this.openDataUriInWindow(PDF, name, hoEditorFactory.pageProperty.widthPixes);
35621
35632
  }
35622
35633
  reslove && reslove('printend');
35623
- case 98:
35634
+ case 101:
35624
35635
  case "end":
35625
35636
  return _context3.stop();
35626
35637
  }
35627
35638
  }
35628
- }, _callee2, this, [[16, 64, 67, 70]]);
35639
+ }, _callee2, this, [[17, 67, 70, 73]]);
35629
35640
  }));
35630
35641
  function printToPDF(_x2, _x3, _x4, _x5, _x6, _x7, _x8) {
35631
35642
  return _printToPDF.apply(this, arguments);
@@ -35636,7 +35647,7 @@ var Print = /*#__PURE__*/function () {
35636
35647
  key: "createPDFBase64",
35637
35648
  value: function () {
35638
35649
  var _createPDFBase = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee3(hoEditorFactoryID, reslove, PDF) {
35639
- var hoEditorFactory, orientation, svgBox, last, _iterator2, _step2, _cpage$drawDomLevel5, index, cpage, _cpage$drawDomLevel3, _cpage$drawDomLevel3$, ctx, _cpage$drawDomLevel4, _cpage$drawDomLevel4$, _ctx5, _ctx4;
35650
+ var hoEditorFactory, orientation, svgBox, last, pageNumber, _iterator2, _step2, _cpage$drawDomLevel5, index, cpage, _cpage$drawDomLevel3, _cpage$drawDomLevel3$, ctx, _cpage$drawDomLevel4, _cpage$drawDomLevel4$, _ctx5, _ctx4;
35640
35651
  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee3$(_context4) {
35641
35652
  while (1) {
35642
35653
  switch (_context4.prev = _context4.next) {
@@ -35651,30 +35662,31 @@ var Print = /*#__PURE__*/function () {
35651
35662
  svgBox = document.createElement('div');
35652
35663
  svgBox.className = 'ho-print-svg-box';
35653
35664
  last = -1;
35665
+ pageNumber = 0;
35654
35666
  _iterator2 = (0,createForOfIteratorHelper/* default */.Z)(hoEditorFactory.printStatus.printProcess());
35655
- _context4.prev = 9;
35667
+ _context4.prev = 10;
35656
35668
  _iterator2.s();
35657
- case 11:
35669
+ case 12:
35658
35670
  if ((_step2 = _iterator2.n()).done) {
35659
- _context4.next = 39;
35671
+ _context4.next = 42;
35660
35672
  break;
35661
35673
  }
35662
35674
  index = _step2.value;
35663
35675
  if (!(index == -1)) {
35664
- _context4.next = 16;
35676
+ _context4.next = 17;
35665
35677
  break;
35666
35678
  }
35667
35679
  message/* default.info */.Z.info('请进行翻页');
35668
- return _context4.abrupt("continue", 37);
35669
- case 16:
35680
+ return _context4.abrupt("continue", 40);
35681
+ case 17:
35670
35682
  last = index;
35671
35683
  cpage = hoEditorFactory.drawTree.drawPages[index];
35672
35684
  if (!(index === hoEditorFactory.drawTree.drawPages.length - 1 && cpage.drawMainDoc.children.length === 2 && !(cpage.drawMainDoc.children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && cpage.drawMainDoc.children[1] && cpage.drawMainDoc.children[1].drawItems.length === 0)) {
35673
- _context4.next = 20;
35685
+ _context4.next = 21;
35674
35686
  break;
35675
35687
  }
35676
- return _context4.abrupt("break", 39);
35677
- case 20:
35688
+ return _context4.abrupt("break", 42);
35689
+ case 21:
35678
35690
  if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
35679
35691
  cpage.drawDomLevel.bindStage();
35680
35692
  cpage.needUpdateStage = true;
@@ -35684,17 +35696,18 @@ var Print = /*#__PURE__*/function () {
35684
35696
  cpage.needUpdateStage = false;
35685
35697
  }
35686
35698
  if (!hoEditorFactory.isUseImagePrint) {
35687
- _context4.next = 30;
35699
+ _context4.next = 32;
35688
35700
  break;
35689
35701
  }
35690
35702
  PDF === null || PDF === void 0 ? void 0 : PDF.addPage();
35703
+ pageNumber++;
35691
35704
  ctx = PDF === null || PDF === void 0 ? void 0 : PDF.context2d;
35692
35705
  window.printBlack = hoEditorFactory.printBlack;
35693
35706
  ctx && ((_cpage$drawDomLevel3 = cpage.drawDomLevel) === null || _cpage$drawDomLevel3 === void 0 ? void 0 : (_cpage$drawDomLevel3$ = _cpage$drawDomLevel3.stage) === null || _cpage$drawDomLevel3$ === void 0 ? void 0 : _cpage$drawDomLevel3$.draw(ctx));
35694
35707
  ctx = null;
35695
- _context4.next = 36;
35708
+ _context4.next = 39;
35696
35709
  break;
35697
- case 30:
35710
+ case 32:
35698
35711
  _ctx4 = new canvas2svg({
35699
35712
  width: hoEditorFactory.pageProperty.widthPixes,
35700
35713
  height: orientation === 'l' ? hoEditorFactory.pageProperty.heightPixes - 1 : hoEditorFactory.pageProperty.heightPixes,
@@ -35702,38 +35715,39 @@ var Print = /*#__PURE__*/function () {
35702
35715
  });
35703
35716
  _ctx4 && ((_cpage$drawDomLevel4 = cpage.drawDomLevel) === null || _cpage$drawDomLevel4 === void 0 ? void 0 : (_cpage$drawDomLevel4$ = _cpage$drawDomLevel4.stage) === null || _cpage$drawDomLevel4$ === void 0 ? void 0 : _cpage$drawDomLevel4$.draw(_ctx4));
35704
35717
  PDF.addPage();
35705
- _context4.next = 35;
35718
+ pageNumber++;
35719
+ _context4.next = 38;
35706
35720
  return svg2pdf((_ctx5 = _ctx4) === null || _ctx5 === void 0 ? void 0 : _ctx5.getSvg(), PDF);
35707
- case 35:
35721
+ case 38:
35708
35722
  _ctx4 = null;
35709
- case 36:
35723
+ case 39:
35710
35724
  index > 0 && ((_cpage$drawDomLevel5 = cpage.drawDomLevel) === null || _cpage$drawDomLevel5 === void 0 ? void 0 : _cpage$drawDomLevel5.clearStage());
35711
- case 37:
35712
- _context4.next = 11;
35725
+ case 40:
35726
+ _context4.next = 12;
35713
35727
  break;
35714
- case 39:
35715
- _context4.next = 44;
35728
+ case 42:
35729
+ _context4.next = 47;
35716
35730
  break;
35717
- case 41:
35718
- _context4.prev = 41;
35719
- _context4.t0 = _context4["catch"](9);
35720
- _iterator2.e(_context4.t0);
35721
35731
  case 44:
35722
35732
  _context4.prev = 44;
35723
- _iterator2.f();
35724
- return _context4.finish(44);
35733
+ _context4.t0 = _context4["catch"](10);
35734
+ _iterator2.e(_context4.t0);
35725
35735
  case 47:
35736
+ _context4.prev = 47;
35737
+ _iterator2.f();
35738
+ return _context4.finish(47);
35739
+ case 50:
35726
35740
  if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) {
35727
35741
  hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
35728
35742
  }
35729
35743
  hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
35730
- reslove && reslove('printend');
35731
- case 50:
35744
+ reslove && reslove(pageNumber);
35745
+ case 53:
35732
35746
  case "end":
35733
35747
  return _context4.stop();
35734
35748
  }
35735
35749
  }
35736
- }, _callee3, null, [[9, 41, 44, 47]]);
35750
+ }, _callee3, null, [[10, 44, 47, 50]]);
35737
35751
  }));
35738
35752
  function createPDFBase64(_x9, _x10, _x11) {
35739
35753
  return _createPDFBase.apply(this, arguments);
@@ -37123,15 +37137,15 @@ var DocController = /*#__PURE__*/function () {
37123
37137
  //插入节点到指定位置
37124
37138
  }, {
37125
37139
  key: "insertNodeByPath",
37126
- value: function insertNodeByPath(path, node, isResetFieldText) {
37140
+ value: function insertNodeByPath(path, node, isResetFieldText, isHasRelateEle) {
37127
37141
  var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_76__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
37128
37142
  var curRange = hoEditorFactory.docTree.curDomRange.normalize();
37129
37143
  var parentNode = node.parentNode;
37130
- if (node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_26__/* .TextNode */ .R && parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_45__/* .TextInputFieldNode */ .re && parentNode.inputFieldType == 1 && isResetFieldText
37144
+ if (node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_26__/* .TextNode */ .R && parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_45__/* .TextInputFieldNode */ .re && parentNode.inputFieldType == 1 && isResetFieldText && !isHasRelateEle
37131
37145
  //&& !parentNode.downListProperty.listItems?.includes("<元素>")
37132
37146
  ) {
37133
37147
  var firstPath = parentNode.StartMarkNode.getNodePath();
37134
- var lastPath = parentNode.EndMarkNode.getNodePath();
37148
+ //const lastPath = parentNode.EndMarkNode.getNodePath();
37135
37149
  var ePath = hoEditorFactory.docTree.getNodeLastPath(parentNode.EndMarkNode.previousLeaf());
37136
37150
  curRange.startPath = firstPath;
37137
37151
  curRange.endPath = ePath;
@@ -37323,6 +37337,13 @@ var DocController = /*#__PURE__*/function () {
37323
37337
  resolve(path);
37324
37338
  });
37325
37339
  var strPath = path;
37340
+ var isHasRelateEle = false;
37341
+ for (var k = 0; k < arrSubString.length; k++) {
37342
+ if (arrSubString[k][0] == 1) {
37343
+ isHasRelateEle = true;
37344
+ break;
37345
+ }
37346
+ }
37326
37347
  arrSubString.forEach(function (aTextArray, index) {
37327
37348
  aPromise = aPromise.then(function (res) {
37328
37349
  if (res) {
@@ -37358,7 +37379,7 @@ var DocController = /*#__PURE__*/function () {
37358
37379
  strPath = hoEditorFactory.docTree.getNodeLastPath(textNode);
37359
37380
  } else {
37360
37381
  var _textNode = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_26__/* .TextNode */ .R(_this._hoEditorFactoryID, roots, pNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntText */ .Jq.ntText, aText, hoEditorFactory.docTree.curStyleIndex);
37361
- strPath = _this.insertNodeByPath(strPath, _textNode, oldCanModifyContent == undefined ? false : true);
37382
+ strPath = _this.insertNodeByPath(strPath, _textNode, oldCanModifyContent == undefined ? false : true, isHasRelateEle && index > 1 ? true : false);
37362
37383
  }
37363
37384
  } else {
37364
37385
  var styleIndex = hoEditorFactory.docTree.curStyleIndex;
@@ -37371,7 +37392,7 @@ var DocController = /*#__PURE__*/function () {
37371
37392
  styleIndex = hoEditorFactory.docTree.styleCompare(newStyle);
37372
37393
  }
37373
37394
  var _textNode2 = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_26__/* .TextNode */ .R(_this._hoEditorFactoryID, roots, pNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntText */ .Jq.ntText, aText, styleIndex);
37374
- strPath = _this.insertNodeByPath(strPath, _textNode2, oldCanModifyContent == undefined ? false : true);
37395
+ strPath = _this.insertNodeByPath(strPath, _textNode2, oldCanModifyContent == undefined ? false : true, isHasRelateEle && index > 1 ? true : false);
37375
37396
  }
37376
37397
  // if (index === arrSubString.length - 1 && isEndLine && oldCanModifyContent !== undefined && pNode instanceof TextInputFieldNode) {
37377
37398
  // pNode.canModifyContent = oldCanModifyContent;
@@ -38720,6 +38741,12 @@ var DocController = /*#__PURE__*/function () {
38720
38741
  _cell$table$getCellIn2 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell$table$getCellIn, 2),
38721
38742
  r = _cell$table$getCellIn2[0],
38722
38743
  c = _cell$table$getCellIn2[1];
38744
+ if (hoEditorFactory.drawTree.paintStatus == _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_27__/* .PaintState.psEdit */ .Dh.psEdit && r > 0) {
38745
+ if (cell.table.rowInfos[r].rowProperty.repeatAsTitleAtPageTop && cell.table.rowInfos[r - 1].rowProperty.repeatAsTitleAtPageTop) {
38746
+ ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_89__/* ["default"].warn */ .Z.warn("不允许在表头行中间插入行");
38747
+ return;
38748
+ }
38749
+ }
38723
38750
  hoEditorFactory.undoService.begin();
38724
38751
  hoEditorFactory.undoService.add(new _undoRedo_TableUndos_TableInsertRowUndoUnit__WEBPACK_IMPORTED_MODULE_62__/* .TableInsertRowUndoUnit */ .I(this._hoEditorFactoryID, cell.table, r, r, count));
38725
38752
  hoEditorFactory.undoService.commit();
@@ -38765,6 +38792,12 @@ var DocController = /*#__PURE__*/function () {
38765
38792
  _cell$table$getCellIn4 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell$table$getCellIn3, 2),
38766
38793
  r = _cell$table$getCellIn4[0],
38767
38794
  c = _cell$table$getCellIn4[1];
38795
+ if (hoEditorFactory.drawTree.paintStatus == _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_27__/* .PaintState.psEdit */ .Dh.psEdit) {
38796
+ if (cell.table.rowInfos[r].rowProperty.repeatAsTitleAtPageTop && cell.table.rowInfos[r + 1].rowProperty.repeatAsTitleAtPageTop) {
38797
+ ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_89__/* ["default"].warn */ .Z.warn("不允许在表头行中间插入行");
38798
+ return;
38799
+ }
38800
+ }
38768
38801
  hoEditorFactory.undoService.begin();
38769
38802
  hoEditorFactory.undoService.add(new _undoRedo_TableUndos_TableInsertRowUndoUnit__WEBPACK_IMPORTED_MODULE_62__/* .TableInsertRowUndoUnit */ .I(this._hoEditorFactoryID, cell.table, r + 1, r, count));
38770
38803
  hoEditorFactory.undoService.commit();
@@ -220161,7 +220194,7 @@ var map = {
220161
220194
  "./pageInfoes/PageInfoes.vue": 17481,
220162
220195
  "./paragraph/ParagraphDialog.vue": 54949,
220163
220196
  "./poperSelect/PoperMark.vue": 71472,
220164
- "./poperSelect/PoperSelect.vue": 1933,
220197
+ "./poperSelect/PoperSelect.vue": 12602,
220165
220198
  "./poperTipText/PoperTipText.vue": 15845,
220166
220199
  "./popers/Poper.vue": 57937,
220167
220200
  "./popers/Title.vue": 89987,
@@ -258387,7 +258420,7 @@ var DrawPage = __webpack_require__(72722);
258387
258420
  // EXTERNAL MODULE: ./src/plugins/util.ts
258388
258421
  var plugins_util = __webpack_require__(62783);
258389
258422
  // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperSelect.vue + 9 modules
258390
- var PoperSelect = __webpack_require__(1933);
258423
+ var PoperSelect = __webpack_require__(12602);
258391
258424
  // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperMark.vue + 5 modules
258392
258425
  var PoperMark = __webpack_require__(71472);
258393
258426
  ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/index.ts
@@ -260082,7 +260115,7 @@ var SignNode = __webpack_require__(24701);
260082
260115
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
260083
260116
  var ParagraphNode = __webpack_require__(67945);
260084
260117
  ;// CONCATENATED MODULE: ./src/components/version.ts
260085
- /* harmony default export */ var version = ('3.0.25');
260118
+ /* harmony default export */ var version = ('3.0.26');
260086
260119
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
260087
260120
  var PoperTipText = __webpack_require__(15845);
260088
260121
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -271440,7 +271473,7 @@ var VueController = /*#__PURE__*/function () {
271440
271473
  }, {
271441
271474
  key: "getBase64",
271442
271475
  value: function () {
271443
- var _getBase = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee8(type) {
271476
+ var _getBase = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee8(type, callback) {
271444
271477
  var _hoEditorFactory2$vue, _hoEditorFactory2, curDomRange, endPath, node, htmlText, _hoEditorFactory3$vue, _hoEditorFactory3, _curDomRange2, _endPath, _node, base64;
271445
271478
  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee8$(_context8) {
271446
271479
  while (1) {
@@ -271479,7 +271512,7 @@ var VueController = /*#__PURE__*/function () {
271479
271512
  return this.deleteNode(_node);
271480
271513
  case 21:
271481
271514
  _context8.next = 23;
271482
- return _hoEditorFactory3.printController.createBase64();
271515
+ return _hoEditorFactory3.printController.createBase64(callback);
271483
271516
  case 23:
271484
271517
  base64 = _context8.sent;
271485
271518
  return _context8.abrupt("return", base64);
@@ -271490,7 +271523,7 @@ var VueController = /*#__PURE__*/function () {
271490
271523
  }
271491
271524
  }, _callee8, this);
271492
271525
  }));
271493
- function getBase64(_x21) {
271526
+ function getBase64(_x21, _x22) {
271494
271527
  return _getBase.apply(this, arguments);
271495
271528
  }
271496
271529
  return getBase64;
@@ -276255,7 +276288,7 @@ var PrintController = /*#__PURE__*/function () {
276255
276288
  }, {
276256
276289
  key: "createBase64",
276257
276290
  value: function () {
276258
- var _createBase = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee2() {
276291
+ var _createBase = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee2(callback) {
276259
276292
  var _this2 = this;
276260
276293
  var hoEditorFactory, path, beforePrintStatus, xml, orientation, format, options, hPromise, base64;
276261
276294
  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee2$(_context2) {
@@ -276298,24 +276331,30 @@ var PrintController = /*#__PURE__*/function () {
276298
276331
  });
276299
276332
  });
276300
276333
  _context2.next = 17;
276301
- return hPromise.then(function (resolve) {
276334
+ return hPromise.then(function (pageNumber) {
276302
276335
  // 恢复文档状态 和 内容;
276303
276336
  hoEditorFactory.drawTree.paintStatus = beforePrintStatus;
276304
276337
  hoEditorFactory.vueController.openXml(xml);
276305
276338
  // this.PDF.deletePage(1);
276306
- var otherPageNumber = _this2.PDF.internal.getNumberOfPages() - hoEditorFactory.drawTree.drawPages.length;
276307
- if (otherPageNumber >= 1) {
276339
+ var otherPageNumber = _this2.PDF.internal.getNumberOfPages() - pageNumber;
276340
+ if (otherPageNumber >= 2) {
276308
276341
  for (var i = 0; i < otherPageNumber; i++) {
276309
276342
  var _this2$PDF;
276310
276343
  (_this2$PDF = _this2.PDF) === null || _this2$PDF === void 0 ? void 0 : _this2$PDF.deletePage(1);
276311
276344
  }
276312
276345
  console.warn("\u4ECE\u5F00\u59CB\u5220\u6389".concat(otherPageNumber, "\u9875\u7A7A\u767D\u9875"));
276313
- } else if (otherPageNumber <= 0) {
276346
+ } else if (otherPageNumber <= 1) {
276314
276347
  var _this2$PDF2;
276315
276348
  (_this2$PDF2 = _this2.PDF) === null || _this2$PDF2 === void 0 ? void 0 : _this2$PDF2.deletePage(1);
276316
- console.warn("otherPageNumber <= 0 \u65F6\u4ECE\u5F00\u59CB\u5220\u63891\u9875\u7A7A\u767D\u9875");
276349
+ console.warn("".concat(otherPageNumber, " <= 0 \u65F6\u4ECE\u5F00\u59CB\u5220\u63891\u9875\u7A7A\u767D\u9875"));
276317
276350
  }
276318
276351
  return new Promise(function (resolves) {
276352
+ if (callback) {
276353
+ callback && callback({
276354
+ page: pageNumber,
276355
+ pdf: _this2.PDF.output('datauristring').replace(/^data:application\/pdf;filename=generated.pdf;base64,/, '')
276356
+ });
276357
+ }
276319
276358
  resolves(_this2.PDF.output('datauristring'));
276320
276359
  });
276321
276360
  });
@@ -276338,7 +276377,7 @@ var PrintController = /*#__PURE__*/function () {
276338
276377
  }
276339
276378
  }, _callee2, this);
276340
276379
  }));
276341
- function createBase64() {
276380
+ function createBase64(_x) {
276342
276381
  return _createBase.apply(this, arguments);
276343
276382
  }
276344
276383
  return createBase64;
@@ -276404,7 +276443,7 @@ var PrintController = /*#__PURE__*/function () {
276404
276443
  orientation: orientation,
276405
276444
  unit: 'px',
276406
276445
  format: format,
276407
- hotfixes: ["px_scaling"],
276446
+ hotfixes: ['px_scaling'],
276408
276447
  compress: true
276409
276448
  };
276410
276449
  _this3.PDF = null;
@@ -276448,9 +276487,6 @@ var PrintController = /*#__PURE__*/function () {
276448
276487
  });
276449
276488
  return;
276450
276489
  }
276451
- // if (hoEditorFactory.isHideComments) {
276452
- // hoEditorFactory.vueController.hideComments(true);
276453
- // }
276454
276490
  var drawMainDocs = hoEditorFactory.drawPageTree.drawMainDocs;
276455
276491
  for (var k = 0; k < drawMainDocs.length; k++) {
276456
276492
  for (var s = drawMainDocs[k].children.length - 1; s >= 0; s--) {
@@ -276497,7 +276533,7 @@ var PrintController = /*#__PURE__*/function () {
276497
276533
  }
276498
276534
  }, _callee3, null, [[0, 9]]);
276499
276535
  }));
276500
- return function (_x, _x2) {
276536
+ return function (_x2, _x3) {
276501
276537
  return _ref.apply(this, arguments);
276502
276538
  };
276503
276539
  }());
@@ -276683,7 +276719,7 @@ var PrintController = /*#__PURE__*/function () {
276683
276719
  }
276684
276720
  }, _callee4);
276685
276721
  }));
276686
- return function (_x5) {
276722
+ return function (_x6) {
276687
276723
  return _ref2.apply(this, arguments);
276688
276724
  };
276689
276725
  }());
@@ -276762,7 +276798,7 @@ var PrintController = /*#__PURE__*/function () {
276762
276798
  }
276763
276799
  }, _callee5, this);
276764
276800
  }));
276765
- function mergeXmlToPrintPDFNew(_x3, _x4) {
276801
+ function mergeXmlToPrintPDFNew(_x4, _x5) {
276766
276802
  return _mergeXmlToPrintPDFNew.apply(this, arguments);
276767
276803
  }
276768
276804
  return mergeXmlToPrintPDFNew;
@@ -276894,7 +276930,7 @@ var PrintController = /*#__PURE__*/function () {
276894
276930
  }
276895
276931
  }, _callee8, this);
276896
276932
  }));
276897
- function pintAllToPDF(_x6, _x7) {
276933
+ function pintAllToPDF(_x7, _x8) {
276898
276934
  return _pintAllToPDF.apply(this, arguments);
276899
276935
  }
276900
276936
  return pintAllToPDF;