hoeditor-web 3.0.51 → 3.0.52

package/lib/hoeditor.umd.js

@@ -35272,6 +35272,10 @@ jspdf/* jsPDF.API.svg */.kH.API.svg = function (element, options) {
 
 // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawPageTable.ts
 var DrawPageTable = __webpack_require__(15694);
+// EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
+var ParagraphNode = __webpack_require__(67945);
+// EXTERNAL MODULE: ./src/editor/draw/drawArea/DrawPageMainDoc.ts
+var DrawPageMainDoc = __webpack_require__(77441);
 ;// CONCATENATED MODULE: ./src/editor/PrintStatus.ts
 
 
@@ -35310,6 +35314,8 @@ var DrawPageTable = __webpack_require__(15694);
 
 
 
+
+
 
 
 
@@ -36398,8 +36404,8 @@ var Print = /*#__PURE__*/function () {
   }, {
     key: "printAllNew",
     value: function () {
-      var _printAllNew = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee5(hoEditorFactoryID, reslove, PDF, position) {
-        var hoEditorFactory, a4Size, svgBox, last, widthPixes, heightPixes, orientation, formats, format, svg2pdfOptions, _iterator4, _step4, _cpage$drawDomLevel10, index, cpage, _cpage$drawDomLevel8, _cpage$drawDomLevel8$, pageSize, ctx, _cpage$drawDomLevel9, _cpage$drawDomLevel9$, _ctx7, _ctx6, lastPos;
+      var _printAllNew = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee5(hoEditorFactoryID, reslove, PDF, position, isPrintFirstDoc) {
+        var hoEditorFactory, a4Size, svgBox, last, widthPixes, heightPixes, orientation, formats, format, svg2pdfOptions, firstPageIndex, _iterator4, _step4, _cpage$drawDomLevel10, index, cpage, _cpage$drawDomLevel8, _cpage$drawDomLevel8$, pageSize, ctx, _cpage$drawDomLevel9, _cpage$drawDomLevel9$, _ctx7, _ctx6, lastPos;
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee5$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
@@ -36431,22 +36437,36 @@ var Print = /*#__PURE__*/function () {
                     svg2pdfOptions.x = (format[0] - widthPixes) / 2;
                   }
                 }
+                firstPageIndex = -1; // 用来处理 批量打印----首次病程单独打印----未选择首次病程----只选择病程记录----合并时带上首次病程确保页数准确----打印时丢掉首次病程确保不重复打印首次病程
+                if (isPrintFirstDoc) {
+                  hoEditorFactory.docTree.mainNodes.forEach(function (node) {
+                    if (node instanceof ParagraphNode/* ParagraphNode */.C && node.printAsSinglePage && node.drawlines[0].parent instanceof DrawPageMainDoc/* DrawPageMainDoc */.$ && firstPageIndex == -1) {
+                      firstPageIndex = node.drawlines[0].parent.pageIndex;
+                    }
+                  });
+                }
                 _iterator4 = (0,createForOfIteratorHelper/* default */.Z)(hoEditorFactory.printStatus.printProcess());
-                _context6.prev = 15;
+                _context6.prev = 17;
                 _iterator4.s();
-              case 17:
+              case 19:
                 if ((_step4 = _iterator4.n()).done) {
-                  _context6.next = 50;
+                  _context6.next = 54;
                   break;
                 }
                 index = _step4.value;
                 if (!(index == -1)) {
-                  _context6.next = 22;
+                  _context6.next = 24;
                   break;
                 }
                 message/* default.info */.Z.info('请进行翻页');
-                return _context6.abrupt("continue", 48);
-              case 22:
+                return _context6.abrupt("continue", 52);
+              case 24:
+                if (!(index < firstPageIndex)) {
+                  _context6.next = 26;
+                  break;
+                }
+                return _context6.abrupt("continue", 52);
+              case 26:
                 last = index;
                 cpage = hoEditorFactory.drawTree.drawPages[index];
                 if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
@@ -36458,13 +36478,13 @@ var Print = /*#__PURE__*/function () {
                   cpage.needUpdateStage = false;
                 }
                 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)) {
-                  _context6.next = 28;
+                  _context6.next = 32;
                   break;
                 }
-                return _context6.abrupt("break", 50);
-              case 28:
+                return _context6.abrupt("break", 54);
+              case 32:
                 if (!hoEditorFactory.isUseImagePrint) {
-                  _context6.next = 41;
+                  _context6.next = 45;
                   break;
                 }
                 pageSize = JSON.stringify([hoEditorFactory.pageProperty.widthMm, hoEditorFactory.pageProperty.heightMm]);
@@ -36496,9 +36516,9 @@ var Print = /*#__PURE__*/function () {
                 ctx.posY = svg2pdfOptions.y;
                 ctx && ((_cpage$drawDomLevel8 = cpage.drawDomLevel) === null || _cpage$drawDomLevel8 === void 0 ? void 0 : (_cpage$drawDomLevel8$ = _cpage$drawDomLevel8.stage) === null || _cpage$drawDomLevel8$ === void 0 ? void 0 : _cpage$drawDomLevel8$.draw(ctx));
                 ctx = null;
-                _context6.next = 47;
+                _context6.next = 51;
                 break;
-              case 41:
+              case 45:
                 _ctx6 = new canvas2svg({
                   width: widthPixes,
                   height: orientation === 'l' ? heightPixes - 1 : heightPixes,
@@ -36510,27 +36530,27 @@ var Print = /*#__PURE__*/function () {
                 } else {
                   PDF === null || PDF === void 0 ? void 0 : PDF.addPage(format, orientation);
                 }
-                _context6.next = 46;
+                _context6.next = 50;
                 return svg2pdf((_ctx7 = _ctx6) === null || _ctx7 === void 0 ? void 0 : _ctx7.getSvg(), PDF, svg2pdfOptions);
-              case 46:
+              case 50:
                 _ctx6 = null;
-              case 47:
+              case 51:
                 index > 0 && ((_cpage$drawDomLevel10 = cpage.drawDomLevel) === null || _cpage$drawDomLevel10 === void 0 ? void 0 : _cpage$drawDomLevel10.clearStage());
-              case 48:
-                _context6.next = 17;
+              case 52:
+                _context6.next = 19;
                 break;
-              case 50:
-                _context6.next = 55;
+              case 54:
+                _context6.next = 59;
                 break;
-              case 52:
-                _context6.prev = 52;
-                _context6.t0 = _context6["catch"](15);
+              case 56:
+                _context6.prev = 56;
+                _context6.t0 = _context6["catch"](17);
                 _iterator4.e(_context6.t0);
-              case 55:
-                _context6.prev = 55;
+              case 59:
+                _context6.prev = 59;
                 _iterator4.f();
-                return _context6.finish(55);
-              case 58:
+                return _context6.finish(59);
+              case 62:
                 if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) {
                   hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
                 }
@@ -36544,14 +36564,14 @@ var Print = /*#__PURE__*/function () {
                 }
                 hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
                 reslove();
-              case 62:
+              case 66:
               case "end":
                 return _context6.stop();
             }
           }
-        }, _callee5, null, [[15, 52, 55, 58]]);
+        }, _callee5, null, [[17, 56, 59, 62]]);
       }));
-      function printAllNew(_x15, _x16, _x17, _x18) {
+      function printAllNew(_x15, _x16, _x17, _x18, _x19) {
         return _printAllNew.apply(this, arguments);
       }
       return printAllNew;
@@ -37936,7 +37956,7 @@ var DocController = /*#__PURE__*/function () {
                   }
                 } else {
                   var styleIndex = hoEditorFactory.docTree.curStyleIndex;
-                  if (pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_45__/* .TextInputFieldNode */ .re && node === pNode.first()) {
+                  if (pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_45__/* .TextInputFieldNode */ .re && node === pNode.first() && hoEditorFactory.drawTree.paintStatus != _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_27__/* .PaintState.psReview */ .Dh.psReview) {
                     styleIndex = node.styleIndex;
                   }
                   if (aTextArray[0] > 1) {
@@ -38019,7 +38039,7 @@ var DocController = /*#__PURE__*/function () {
         curStyleIndex = hoEditorFactory.docTree.styleCompare(nodeStyle);
         hoEditorFactory.docTree.curStyleIndex = curStyleIndex;
         var pNode = node.parentNode;
-        if (pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_45__/* .TextInputFieldNode */ .re && pNode.childNodes.indexOf(node) === 0) {
+        if (pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_45__/* .TextInputFieldNode */ .re && pNode.childNodes.indexOf(node) === 0 && hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_27__/* .PaintState.psReview */ .Dh.psReview) {
           //const aNode = pNode.childNodes[0];
           //if (aNode instanceof MarkNode) {
           //curStyleIndex = aNode.styleIndex;
@@ -38054,6 +38074,7 @@ var DocController = /*#__PURE__*/function () {
           _this2.insertNodeByPath(aPath, paragraphNode);
           return hoEditorFactory.docTree.curDomRange.startPath;
         };
+        curTextStyle = hoEditorFactory.docTree.styles[curStyleIndex];
         var aPromise = new Promise(function (resolve, reject) {
           resolve(strPath);
         });
@@ -63073,7 +63094,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /*
  * @Author: your name
  * @Date: 2020-11-03 15:17:54
- * @LastEditTime: 2023-04-17 14:18:00
+ * @LastEditTime: 2023-04-18 14:15:13
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -64056,11 +64077,22 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
   }, {
     key: "getLabel",
     value: function getLabel() {
-      if (this._childNodes2.length == 3) {
-        if (this.childNodes.indexOf(this._childNodes2[1]) != -1) return this._childNodes2[1];
+      //if (this._childNodes2.length == 3) {
+      // if (this.childNodes.indexOf(this._childNodes2[1]) != -1) {
+      //     return this._childNodes2[1];
+      // }
+      // return null;
+      if (this.childNodes.indexOf(this._childNodes2[1]) != -1) {
+        return this._childNodes2[1];
+      } else {
+        for (var i = 0; i < this.childNodes.length; i++) {
+          var child = this.childNodes[i];
+          if (child instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_45__/* .MarkNode */ .j && child.MarkNodeType == 1) {
+            return child;
+          }
+        }
         return null;
       }
-      return null;
     }
     /**
      * 文本域重绘
@@ -235462,7 +235494,7 @@ var ParagraphNode = __webpack_require__(67945);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/MarkNode.ts
 var MarkNode = __webpack_require__(57727);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.0.51');
+/* harmony default export */ var version = ('3.0.52');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(15845);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -252861,6 +252893,7 @@ var jspdf = __webpack_require__(77937);
 
 
 
+
 
 
 /*
@@ -253488,7 +253521,7 @@ var PrintController = /*#__PURE__*/function () {
   }, {
     key: "pintAllToPDF",
     value: function () {
-      var _pintAllToPDF = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee8(xmlList, callback) {
+      var _pintAllToPDF = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee8(xmlList, callback, params) {
         var _this6 = this;
         var hoEditorFactory, beforePrintStatus, xml, xmlIndex, mergeList, position, continuousid, options, toPrint, createSvg;
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee8$(_context8) {
@@ -253517,7 +253550,11 @@ var PrintController = /*#__PURE__*/function () {
                       while (1) {
                         switch (_context6.prev = _context6.next) {
                           case 0:
-                            PrintStatus/* Print.printAllNew */.Kh.printAllNew(_this6._hoEditorFactoryID, createSvg, _this6.PDF, position);
+                            if (params && continuousid && Array.isArray(params.notPrintDocId) && params.notPrintDocId.length > 0 && params.notPrintDocId.includes(continuousid)) {
+                              PrintStatus/* Print.printAllNew */.Kh.printAllNew(_this6._hoEditorFactoryID, createSvg, _this6.PDF, position, true);
+                            } else {
+                              PrintStatus/* Print.printAllNew */.Kh.printAllNew(_this6._hoEditorFactoryID, createSvg, _this6.PDF, position);
+                            }
                           case 1:
                           case "end":
                             return _context6.stop();
@@ -253607,7 +253644,7 @@ var PrintController = /*#__PURE__*/function () {
           }
         }, _callee8, this);
       }));
-      function pintAllToPDF(_x7, _x8) {
+      function pintAllToPDF(_x7, _x8, _x9) {
         return _pintAllToPDF.apply(this, arguments);
       }
       return pintAllToPDF;