hoeditor-web 2.0.58 → 2.0.61

package/lib/hoeditor.common.js

@@ -11186,9 +11186,10 @@ var PrintStatus = /*#__PURE__*/function () {
 
         pages.sort(function (a, b) {
           return a - b;
-        });
+        }); // console.log(pages);
         // 去重
-        this._printPages = (0,toConsumableArray/* default */.Z)(new Set(pages));
+
+        this._printPages = (0,toConsumableArray/* default */.Z)(new Set(pages)); // console.log('页码范围:', this._printPages);
       } catch (error) {
         Exception/* Exception.printCallStack */.P.printCallStack();
       }
@@ -11581,7 +11582,7 @@ var Print = /*#__PURE__*/function () {
 
               case 17:
                 if ((_step = _iterator.n()).done) {
-                  _context3.next = 59;
+                  _context3.next = 60;
                   break;
                 }
 
@@ -11599,7 +11600,7 @@ var Print = /*#__PURE__*/function () {
                 });
 
               case 22:
-                return _context3.abrupt("continue", 57);
+                return _context3.abrupt("continue", 58);
 
               case 23:
                 last = index;
@@ -11610,7 +11611,7 @@ var Print = /*#__PURE__*/function () {
                   break;
                 }
 
-                return _context3.abrupt("break", 59);
+                return _context3.abrupt("break", 60);
 
               case 27:
                 if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
@@ -11621,7 +11622,7 @@ var Print = /*#__PURE__*/function () {
 
                 if (index === hoEditorFactory.startPageNum && positionY) {
                   dShape = new createjs.Shape();
-                  dShape.graphics.beginFill('#fff').rect(0, 0, width, positionY).endFill();
+                  dShape.graphics.beginFill('#FFFFFF').rect(0, 0, width, positionY).endFill();
                   cpage.drawDocContainer.addChild(dShape);
                   cpage.drawFooter.alpha = 0; // 上一页还有空余时续打起始页隐藏页脚
                 } // 光标处续打
@@ -11634,7 +11635,7 @@ var Print = /*#__PURE__*/function () {
                   if (index === posIndex && posY) {
                     _dShape = new createjs.Shape();
 
-                    _dShape.graphics.beginFill('#fff').rect(0, 0, width, posY).endFill();
+                    _dShape.graphics.beginFill('#FFFFFF').rect(0, 0, width, posY).endFill();
 
                     cpage.drawDocContainer.addChild(_dShape);
                     cpage.drawFooter.alpha = 0;
@@ -11651,7 +11652,7 @@ var Print = /*#__PURE__*/function () {
                   y: 0
                 };
 
-                if (hoEditorFactory.isFixedPrintToA4 && format) {
+                if (hoEditorFactory.isFixedPrintToA4 == '1' && format) {
                   if (orientation == 'l') {
                     svg2pdfOptions.x = format[0] - width;
                     svg2pdfOptions.y = (format[1] - height) / 2;
@@ -11661,14 +11662,15 @@ var Print = /*#__PURE__*/function () {
                 }
 
                 if (!hoEditorFactory.isUseImagePrint) {
-                  _context3.next = 43;
+                  _context3.next = 44;
                   break;
                 }
 
                 PDF === null || PDF === void 0 ? void 0 : PDF.addPage();
                 ctx = PDF === null || PDF === void 0 ? void 0 : PDF.context2d;
+                window.printBlack = hoEditorFactory.printBlack;
 
-                if (hoEditorFactory.isFixedPrintToA4T && format) {
+                if (hoEditorFactory.isFixedPrintToA4 == '2' && format) {
                   // 避免切换纸张的打印方式 绘制只处理竖向情况
                   if (orientation === 'p' && hoEditorFactory.pageProperty.pageSize.toLocaleLowerCase() == 'a5' && index == 0) {
                     ctx.translate(0, 1122 / 2); // 由于旋转是默认以左上角为中心 所以需要先移动位置 改变起始点
@@ -11681,10 +11683,10 @@ var Print = /*#__PURE__*/function () {
                 ctx.posY = svg2pdfOptions.y;
                 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));
                 ctx = null;
-                _context3.next = 56;
+                _context3.next = 57;
                 break;
 
-              case 43:
+              case 44:
                 _ctx = new canvas2svg({
                   width: width,
                   height: height,
@@ -11693,68 +11695,68 @@ var Print = /*#__PURE__*/function () {
                 _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));
 
                 if (!(type === 'html')) {
-                  _context3.next = 50;
+                  _context3.next = 51;
                   break;
                 }
 
                 svgData = (_ctx2 = _ctx) === null || _ctx2 === void 0 ? void 0 : _ctx2.getSvg();
                 svgData && ((_svgBox2 = svgBox) === null || _svgBox2 === void 0 ? void 0 : _svgBox2.appendChild(svgData));
-                _context3.next = 55;
+                _context3.next = 56;
                 break;
 
-              case 50:
+              case 51:
                 PDF === null || PDF === void 0 ? void 0 : PDF.addPage();
                 _context3.t0 = PDF;
 
                 if (!_context3.t0) {
-                  _context3.next = 55;
+                  _context3.next = 56;
                   break;
                 }
 
-                _context3.next = 55;
+                _context3.next = 56;
                 return svg2pdf((_ctx3 = _ctx) === null || _ctx3 === void 0 ? void 0 : _ctx3.getSvg(), PDF, svg2pdfOptions);
 
-              case 55:
+              case 56:
                 _ctx = null;
 
-              case 56:
+              case 57:
                 index > 0 && ((_cpage$drawDomLevel3 = cpage.drawDomLevel) === null || _cpage$drawDomLevel3 === void 0 ? void 0 : _cpage$drawDomLevel3.clearStage());
 
-              case 57:
+              case 58:
                 _context3.next = 17;
                 break;
 
-              case 59:
-                _context3.next = 64;
+              case 60:
+                _context3.next = 65;
                 break;
 
-              case 61:
-                _context3.prev = 61;
+              case 62:
+                _context3.prev = 62;
                 _context3.t1 = _context3["catch"](15);
 
                 _iterator.e(_context3.t1);
 
-              case 64:
-                _context3.prev = 64;
+              case 65:
+                _context3.prev = 65;
 
                 _iterator.f();
 
-                return _context3.finish(64);
+                return _context3.finish(65);
 
-              case 67:
+              case 68:
                 console.timeEnd('绘制svg和生成pdf');
                 if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
                 hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
 
                 if (!(positionY || hoEditorFactory.startPageNum !== 0 && positionY !== undefined)) {
-                  _context3.next = 76;
+                  _context3.next = 77;
                   break;
                 }
 
                 _last = hoEditorFactory.printStatus.printRecord.last();
 
                 if (!(_last && hoEditorFactory.startPageNum == _last[0] && positionY === _last[1])) {
-                  _context3.next = 76;
+                  _context3.next = 77;
                   break;
                 }
 
@@ -11766,21 +11768,21 @@ var Print = /*#__PURE__*/function () {
                 reslove && reslove('printend');
                 return _context3.abrupt("return");
 
-              case 76:
+              case 77:
                 if (!(type === 'pdf')) {
-                  _context3.next = 82;
+                  _context3.next = 83;
                   break;
                 }
 
                 PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
                 PDF === null || PDF === void 0 ? void 0 : PDF.save(fileName + '.pdf');
                 hoEditorFactory.printStatus.drawPrintRecord.clear();
-                _context3.next = 88;
+                _context3.next = 89;
                 break;
 
-              case 82:
+              case 83:
                 if (!(svgBox && svgBox.childNodes.length === 0)) {
-                  _context3.next = 86;
+                  _context3.next = 87;
                   break;
                 }
 
@@ -11792,7 +11794,7 @@ var Print = /*#__PURE__*/function () {
                 reslove && reslove('printend');
                 return _context3.abrupt("return");
 
-              case 86:
+              case 87:
                 printStyle = (0,util/* createPrintHTMLStyle */.j_)(hoEditorFactory.pageProperty.pageSize, orientation);
 
                 if (type === 'html') {
@@ -11810,7 +11812,7 @@ var Print = /*#__PURE__*/function () {
                     return link.remove();
                   }, 100);
                 } else {
-                  if (height <= 560 && !hoEditorFactory.isFixedPrintToA4T) {
+                  if (height <= 560 && hoEditorFactory.isFixedPrintToA4 !== '2') {
                     PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
                   }
 
@@ -11819,15 +11821,15 @@ var Print = /*#__PURE__*/function () {
                   PDF && this.openDataUriInWindow(PDF, name, hoEditorFactory.pageProperty.widthPixes);
                 }
 
-              case 88:
+              case 89:
                 reslove && reslove('printend');
 
-              case 89:
+              case 90:
               case "end":
                 return _context3.stop();
             }
           }
-        }, _callee2, this, [[15, 61, 64, 67]]);
+        }, _callee2, this, [[15, 62, 65, 68]]);
       }));
 
       function printToPDF(_x2, _x3, _x4, _x5, _x6, _x7, _x8) {
@@ -11865,7 +11867,7 @@ var Print = /*#__PURE__*/function () {
 
               case 11:
                 if ((_step2 = _iterator2.n()).done) {
-                  _context4.next = 39;
+                  _context4.next = 40;
                   break;
                 }
 
@@ -11883,7 +11885,7 @@ var Print = /*#__PURE__*/function () {
                 });
 
               case 16:
-                return _context4.abrupt("continue", 37);
+                return _context4.abrupt("continue", 38);
 
               case 17:
                 last = index;
@@ -11894,7 +11896,7 @@ var Print = /*#__PURE__*/function () {
                   break;
                 }
 
-                return _context4.abrupt("break", 39);
+                return _context4.abrupt("break", 40);
 
               case 21:
                 if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
@@ -11908,18 +11910,19 @@ var Print = /*#__PURE__*/function () {
                 }
 
                 if (!hoEditorFactory.isUseImagePrint) {
-                  _context4.next = 30;
+                  _context4.next = 31;
                   break;
                 }
 
                 PDF === null || PDF === void 0 ? void 0 : PDF.addPage();
                 ctx = PDF === null || PDF === void 0 ? void 0 : PDF.context2d;
+                window.printBlack = hoEditorFactory.printBlack;
                 ctx && ((_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(ctx));
                 ctx = null;
-                _context4.next = 36;
+                _context4.next = 37;
                 break;
 
-              case 30:
+              case 31:
                 _ctx4 = new canvas2svg({
                   width: hoEditorFactory.pageProperty.widthPixes,
                   height: orientation === 'l' ? hoEditorFactory.pageProperty.heightPixes - 1 : hoEditorFactory.pageProperty.heightPixes,
@@ -11927,37 +11930,37 @@ var Print = /*#__PURE__*/function () {
                 });
                 _ctx4 && ((_cpage$drawDomLevel5 = cpage.drawDomLevel) === null || _cpage$drawDomLevel5 === void 0 ? void 0 : (_cpage$drawDomLevel5$ = _cpage$drawDomLevel5.stage) === null || _cpage$drawDomLevel5$ === void 0 ? void 0 : _cpage$drawDomLevel5$.draw(_ctx4));
                 PDF.addPage();
-                _context4.next = 35;
+                _context4.next = 36;
                 return svg2pdf((_ctx5 = _ctx4) === null || _ctx5 === void 0 ? void 0 : _ctx5.getSvg(), PDF);
 
-              case 35:
+              case 36:
                 _ctx4 = null;
 
-              case 36:
+              case 37:
                 index > 0 && ((_cpage$drawDomLevel6 = cpage.drawDomLevel) === null || _cpage$drawDomLevel6 === void 0 ? void 0 : _cpage$drawDomLevel6.clearStage());
 
-              case 37:
+              case 38:
                 _context4.next = 11;
                 break;
 
-              case 39:
-                _context4.next = 44;
+              case 40:
+                _context4.next = 45;
                 break;
 
-              case 41:
-                _context4.prev = 41;
+              case 42:
+                _context4.prev = 42;
                 _context4.t0 = _context4["catch"](9);
 
                 _iterator2.e(_context4.t0);
 
-              case 44:
-                _context4.prev = 44;
+              case 45:
+                _context4.prev = 45;
 
                 _iterator2.f();
 
-                return _context4.finish(44);
+                return _context4.finish(45);
 
-              case 47:
+              case 48:
                 if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) {
                   hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
                 }
@@ -11965,12 +11968,12 @@ var Print = /*#__PURE__*/function () {
                 hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
                 reslove && reslove('printend');
 
-              case 50:
+              case 51:
               case "end":
                 return _context4.stop();
             }
           }
-        }, _callee3, null, [[9, 41, 44, 47]]);
+        }, _callee3, null, [[9, 42, 45, 48]]);
       }));
 
       function createPDFBase64(_x9, _x10, _x11) {
@@ -12106,7 +12109,7 @@ 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, _iterator4, _step4, _cpage$drawDomLevel12, index, cpage, widthPixes, heightPixes, orientation, formats, format, svg2pdfOptions, _cpage$drawDomLevel9, _cpage$drawDomLevel9$, ctx, _cpage$drawDomLevel10, _cpage$drawDomLevel11, _ctx7, _ctx6, lastPos;
+        var hoEditorFactory, a4Size, svgBox, last, widthPixes, heightPixes, orientation, formats, format, svg2pdfOptions, _iterator4, _step4, _cpage$drawDomLevel12, index, cpage, _cpage$drawDomLevel9, _cpage$drawDomLevel9$, ctx, _cpage$drawDomLevel10, _cpage$drawDomLevel11, _ctx7, _ctx6, lastPos;
 
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee5$(_context6) {
           while (1) {
@@ -12122,34 +12125,53 @@ var Print = /*#__PURE__*/function () {
                 svgBox = document.createElement('div');
                 svgBox.className = 'ho-print-svg-box';
                 last = -1;
+                widthPixes = hoEditorFactory.unitConvert.mmConversionPx(hoEditorFactory.pageProperty.widthMm, true);
+                heightPixes = hoEditorFactory.unitConvert.mmConversionPx(hoEditorFactory.pageProperty.heightMm, true);
+                orientation = widthPixes > heightPixes ? 'l' : 'p';
+                formats = [widthPixes, heightPixes];
+                format = a4Size[orientation];
+                svg2pdfOptions = {
+                  x: 0,
+                  y: 0
+                };
+
+                if (hoEditorFactory.isFixedPrintToA4 == '1' && format) {
+                  if (orientation == 'l') {
+                    svg2pdfOptions.x = format[0] - widthPixes;
+                    svg2pdfOptions.y = (format[1] - heightPixes) / 2;
+                  } else {
+                    svg2pdfOptions.x = (format[0] - widthPixes) / 2;
+                  }
+                }
+
                 _iterator4 = (0,createForOfIteratorHelper/* default */.Z)(hoEditorFactory.printStatus.printProcess());
-                _context6.prev = 8;
+                _context6.prev = 15;
 
                 _iterator4.s();
 
-              case 10:
+              case 17:
                 if ((_step4 = _iterator4.n()).done) {
-                  _context6.next = 48;
+                  _context6.next = 50;
                   break;
                 }
 
                 index = _step4.value;
 
                 if (!(index == -1)) {
-                  _context6.next = 16;
+                  _context6.next = 23;
                   break;
                 }
 
-                _context6.next = 15;
+                _context6.next = 22;
                 return message_box_default().confirm('请进行翻页', '打印提示', {
                   confirmButtonText: '确定',
                   type: 'info'
                 });
 
-              case 15:
-                return _context6.abrupt("continue", 46);
+              case 22:
+                return _context6.abrupt("continue", 48);
 
-              case 16:
+              case 23:
                 last = index;
                 cpage = hoEditorFactory.drawTree.drawPages[index];
 
@@ -12164,51 +12186,44 @@ var Print = /*#__PURE__*/function () {
                 }
 
                 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 = 22;
+                  _context6.next = 29;
                   break;
                 }
 
-                return _context6.abrupt("break", 48);
-
-              case 22:
-                widthPixes = hoEditorFactory.unitConvert.mmConversionPx(hoEditorFactory.pageProperty.widthMm, true);
-                heightPixes = hoEditorFactory.unitConvert.mmConversionPx(hoEditorFactory.pageProperty.heightMm, true);
-                orientation = widthPixes > heightPixes ? 'l' : 'p';
-                formats = [widthPixes, heightPixes];
-                format = a4Size[orientation];
-                svg2pdfOptions = {
-                  x: 0,
-                  y: 0
-                };
-
-                if (hoEditorFactory.isFixedPrintToA4 && format) {
-                  if (orientation == 'l') {
-                    svg2pdfOptions.x = format[0] - widthPixes;
-                    svg2pdfOptions.y = (format[1] - heightPixes) / 2;
-                  } else {
-                    svg2pdfOptions.x = (format[0] - widthPixes) / 2;
-                  }
-                }
+                return _context6.abrupt("break", 50);
 
+              case 29:
                 if (!hoEditorFactory.isUseImagePrint) {
-                  _context6.next = 39;
+                  _context6.next = 41;
                   break;
                 }
 
-                if (formats.length == 2 && !hoEditorFactory.isFixedPrintToA4) {
+                if (formats.length == 2 && hoEditorFactory.isFixedPrintToA4 == '1') {
                   PDF === null || PDF === void 0 ? void 0 : PDF.addPage(formats, orientation);
+                } else if (hoEditorFactory.isFixedPrintToA4 == '2' && hoEditorFactory.pageProperty.pageSize.toLocaleLowerCase() == 'a5') {
+                  PDF === null || PDF === void 0 ? void 0 : PDF.addPage([793, 1122], 'p');
                 } else {
                   PDF === null || PDF === void 0 ? void 0 : PDF.addPage(format, orientation);
                 }
 
                 ctx = PDF === null || PDF === void 0 ? void 0 : PDF.context2d;
 
-                if (hoEditorFactory.isFixedPrintToA4T && format && hoEditorFactory.pageProperty.pageSize.toLocaleLowerCase() == 'a5' && index == 0) {
+                if (hoEditorFactory.isFixedPrintToA4 == '2' && index == 0 && hoEditorFactory.isRotate) {
+                  // 复位 需要先按移动过的位置恢复旋转前的角度，然后才能移动位置
+                  ctx.rotate(90 * Math.PI / 180);
+                  ctx.translate(0, -1122 / 2);
+                  hoEditorFactory.isRotate = false;
+                }
+
+                window.printBlack = hoEditorFactory.printBlack;
+
+                if (hoEditorFactory.isFixedPrintToA4 == '2' && index == 0 && !hoEditorFactory.isRotate && hoEditorFactory.pageProperty.pageSize.toLocaleLowerCase() == 'a5') {
                   // 避免切换纸张的打印方式 绘制只处理竖向情况
                   if (orientation === 'p') {
-                    ctx.translate(0, 1122 / 2); // 由于旋转是默认以左上角为中心 所以需要先移动位置 改变起始点
-
-                    ctx.rotate(270 * Math.PI / 180); // 旋转 context2d
+                    // 旋转是默认以左上角为中心 需要先移动位置 再进行旋转
+                    ctx.translate(0, 1122 / 2);
+                    ctx.rotate(270 * Math.PI / 180);
+                    hoEditorFactory.isRotate = true;
                   }
                 }
 
@@ -12216,10 +12231,10 @@ var Print = /*#__PURE__*/function () {
                 ctx.posY = svg2pdfOptions.y;
                 ctx && ((_cpage$drawDomLevel9 = cpage.drawDomLevel) === null || _cpage$drawDomLevel9 === void 0 ? void 0 : (_cpage$drawDomLevel9$ = _cpage$drawDomLevel9.stage) === null || _cpage$drawDomLevel9$ === void 0 ? void 0 : _cpage$drawDomLevel9$.draw(ctx));
                 ctx = null;
-                _context6.next = 45;
+                _context6.next = 47;
                 break;
 
-              case 39:
+              case 41:
                 _ctx6 = new canvas2svg({
                   width: widthPixes,
                   height: orientation === 'l' ? heightPixes - 1 : heightPixes,
@@ -12233,37 +12248,37 @@ var Print = /*#__PURE__*/function () {
                   PDF === null || PDF === void 0 ? void 0 : PDF.addPage(format, orientation);
                 }
 
-                _context6.next = 44;
+                _context6.next = 46;
                 return svg2pdf((_ctx7 = _ctx6) === null || _ctx7 === void 0 ? void 0 : _ctx7.getSvg(), PDF, svg2pdfOptions);
 
-              case 44:
+              case 46:
                 _ctx6 = null;
 
-              case 45:
+              case 47:
                 index > 0 && ((_cpage$drawDomLevel12 = cpage.drawDomLevel) === null || _cpage$drawDomLevel12 === void 0 ? void 0 : _cpage$drawDomLevel12.clearStage());
 
-              case 46:
-                _context6.next = 10;
-                break;
-
               case 48:
-                _context6.next = 53;
+                _context6.next = 17;
                 break;
 
               case 50:
-                _context6.prev = 50;
-                _context6.t0 = _context6["catch"](8);
+                _context6.next = 55;
+                break;
+
+              case 52:
+                _context6.prev = 52;
+                _context6.t0 = _context6["catch"](15);
 
                 _iterator4.e(_context6.t0);
 
-              case 53:
-                _context6.prev = 53;
+              case 55:
+                _context6.prev = 55;
 
                 _iterator4.f();
 
-                return _context6.finish(53);
+                return _context6.finish(55);
 
-              case 56:
+              case 58:
                 if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) {
                   hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
                 }
@@ -12281,12 +12296,12 @@ var Print = /*#__PURE__*/function () {
                 hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
                 reslove();
 
-              case 60:
+              case 62:
               case "end":
                 return _context6.stop();
             }
           }
-        }, _callee5, null, [[8, 50, 53, 56]]);
+        }, _callee5, null, [[15, 52, 55, 58]]);
       }));
 
       function printAllNew(_x15, _x16, _x17, _x18) {
@@ -26238,10 +26253,28 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
       //     return;
       //   }
       // }
+      //const startPath = `${this.getNodePath()}/0`;
+      //const startPath = hoEditorFactory.docTree.curDomRange.startPath;
+
 
+      var endPath = "";
+      var startPath = "";
+
+      if (this.table.tableProperty.isAutoChangeLine) {
+        var curDomRange = hoEditorFactory.docTree.curDomRange.normalize();
+
+        if (curDomRange.npEnd.node instanceof _ParagraphNode__WEBPACK_IMPORTED_MODULE_31__/* .ParagraphNode */ .C) {
+          startPath = curDomRange.startPath;
+          endPath = startPath;
+        } else {
+          startPath = curDomRange.npEnd.node.prevSibling().getNodePath();
+          endPath = hoEditorFactory.docTree.getNodeLastPath(curDomRange.npEnd.node);
+        }
+      } else {
+        startPath = "".concat(this.getNodePath(), "/0");
+        endPath = hoEditorFactory.docTree.getNodeLastPath(this);
+      }
 
-      var startPath = "".concat(this.getNodePath(), "/0");
-      var endPath = hoEditorFactory.docTree.getNodeLastPath(this);
       var aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_24__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath);
       hoEditorFactory.docController.deleteRange(aRange, true);
       hoEditorFactory.docController.insertPlainTextAfterPath(startPath, value);
@@ -30599,27 +30632,32 @@ var PageNumNode = /*#__PURE__*/function (_ControlNode) {
 /* harmony export */   "C": function() { return /* binding */ ParagraphNode; }
 /* harmony export */ });
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(37174);
-/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(35671);
-/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(22342);
-/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(99640);
-/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(28214);
-/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(41539);
-/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(54747);
-/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(40561);
-/* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_6__);
-/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(9653);
-/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_7__);
-/* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(50369);
-/* harmony import */ var _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(53570);
-/* harmony import */ var _RectNode__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(27807);
-/* harmony import */ var _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(94407);
-/* harmony import */ var _editor_draw_drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(83078);
-/* harmony import */ var _TableNode__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(95883);
-/* harmony import */ var _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(34565);
-/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(41005);
-/* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(15798);
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(58913);
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(35671);
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(22342);
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(99640);
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(28214);
+/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(41539);
+/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(54747);
+/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(47941);
+/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(40561);
+/* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(9653);
+/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(50369);
+/* harmony import */ var _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(53570);
+/* harmony import */ var _RectNode__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(27807);
+/* harmony import */ var _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(94407);
+/* harmony import */ var _editor_draw_drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(83078);
+/* harmony import */ var _TableNode__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(95883);
+/* harmony import */ var _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(34565);
+/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(41005);
+/* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(15798);
+
+
 
 
 
@@ -30639,31 +30677,58 @@ var PageNumNode = /*#__PURE__*/function (_ControlNode) {
 
 
 var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
-  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(ParagraphNode, _BaseNode);
+  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(ParagraphNode, _BaseNode);
 
-  var _super = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(ParagraphNode);
+  var _super = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(ParagraphNode);
 
-  function ParagraphNode(hoEditorFactoryID, rootNodes, parentNode, paraNo) {
+  function ParagraphNode(hoEditorFactoryID, rootNodes, parentNode, paraNo, customProperty) {
     var _this;
 
-    (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(this, ParagraphNode);
+    (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(this, ParagraphNode);
 
-    _this = _super.call(this, hoEditorFactoryID, rootNodes, parentNode, _BaseNode__WEBPACK_IMPORTED_MODULE_8__/* .NodeType.ntParagraph */ .Jq.ntParagraph);
+    _this = _super.call(this, hoEditorFactoryID, rootNodes, parentNode, _BaseNode__WEBPACK_IMPORTED_MODULE_10__/* .NodeType.ntParagraph */ .Jq.ntParagraph);
     _this._parentNode = parentNode;
     _this._drawLines = new Array();
     _this._drawNodes = _this._drawLines;
     _this._paraNo = paraNo;
-    _this._styleIndex = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys.instance */ .b.instance().getFactory(_this.hoEditorFactoryID).docTree.curStyleIndex;
+    _this._styleIndex = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(_this.hoEditorFactoryID).docTree.curStyleIndex;
     _this._dTop = 0;
     _this._dHeight = 0;
     _this._pagePaintStart = null;
     _this._printAsSinglePage = false;
-    _this._docId = ""; // this.node2DrawNode();
+    _this._docId = "";
+    _this._customProperty = new Object();
+
+    if (customProperty) {
+      _this.setCustomProperty(customProperty);
+    } // this.node2DrawNode();
+
 
     return _this;
   }
 
-  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .Z)(ParagraphNode, [{
+  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_19__/* ["default"] */ .Z)(ParagraphNode, [{
+    key: "setCustomProperty",
+    value: function setCustomProperty(customProperty) {
+      var assignvalue = function assignvalue(target, source) {
+        Object.keys(source).forEach(function (value) {
+          if ((0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(target[value]) == "object") {
+            if (Object.prototype.toString.call(source[value]) === "[object Object]") {
+              assignvalue(target[value], source[value]);
+            } else {
+              if (source[value] !== "" && source[value] !== null) {
+                assignvalue(target[value], eval("(" + source[value] + ")"));
+              }
+            }
+          } else {
+            target[value] = source[value];
+          }
+        });
+      };
+
+      assignvalue(this._customProperty, customProperty);
+    }
+  }, {
     key: "paraNo",
     get: function get() {
       return this._paraNo;
@@ -30690,6 +30755,16 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
         this._styleIndex = val;
       }
     }
+  }, {
+    key: "customProperty",
+    get: function get() {
+      return this._customProperty;
+    },
+    set: function set(val) {
+      if (val != this._customProperty) {
+        this._customProperty = val;
+      }
+    }
   }, {
     key: "combineParagraph",
     get: function get() {
@@ -30711,7 +30786,7 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
     key: "drootNodes",
     get: function get() {
       if (!this._drawRoots) {
-        var _HOEditorFactorys$ins = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.getDrawRootsByPath(this.getNodePath()),
+        var _HOEditorFactorys$ins = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.getDrawRootsByPath(this.getNodePath()),
             _HOEditorFactorys$ins2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_HOEditorFactorys$ins, 2),
             dCell = _HOEditorFactorys$ins2[0],
             dRoots = _HOEditorFactorys$ins2[1];
@@ -30724,7 +30799,7 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
   }, {
     key: "refreshDrootNodes",
     value: function refreshDrootNodes() {
-      var _HOEditorFactorys$ins3 = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.getDrawRootsByPath(this.getNodePath()),
+      var _HOEditorFactorys$ins3 = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.getDrawRootsByPath(this.getNodePath()),
           _HOEditorFactorys$ins4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_HOEditorFactorys$ins3, 2),
           dCell = _HOEditorFactorys$ins4[0],
           dRoots = _HOEditorFactorys$ins4[1];
@@ -30735,7 +30810,7 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
     key: "getParagraphLeftWidth",
     value: function getParagraphLeftWidth() {
       //如果父文档节点派生于rectNode(用于表格基类),则取
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var pNode = this._parentNode;
       var aLeft;
       var aWidth;
@@ -30751,7 +30826,7 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
         aWidth = _pRectNode$getLeftWid2[1];
         bRectAlign = _pRectNode$getLeftWid2[2];
 
-        if (pRectNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_16__/* .CellNode */ .D) {
+        if (pRectNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_18__/* .CellNode */ .D) {
           aLeft = hoEditorFactory.unitConvert.mmConversionPx(pRectNode.cellProperty.cellInnerMargin[2] * 10, true);
           aWidth = aWidth - aLeft - hoEditorFactory.unitConvert.mmConversionPx(pRectNode.cellProperty.cellInnerMargin[3] * 10, true);
           bRectAlign = true;
@@ -30774,7 +30849,7 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
       var dline = this._drawLines[index];
 
       if (dline) {
-        var _HOEditorFactorys$ins5 = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.getDrawRootsByPath(this.getNodePath()),
+        var _HOEditorFactorys$ins5 = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.getDrawRootsByPath(this.getNodePath()),
             _HOEditorFactorys$ins6 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_HOEditorFactorys$ins5, 2),
             dCell = _HOEditorFactorys$ins6[0],
             dRoots = _HOEditorFactorys$ins6[1];
@@ -30802,9 +30877,9 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
       // }
 
       while (pNode) {
-        if (pNode instanceof _RectNode__WEBPACK_IMPORTED_MODULE_10__/* .RectNode */ .z) {
+        if (pNode instanceof _RectNode__WEBPACK_IMPORTED_MODULE_12__/* .RectNode */ .z) {
           return pNode;
-        } else if (pNode instanceof _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_14__/* .TextInputFieldNode */ .re && pNode.alignWithBlocked) {
+        } else if (pNode instanceof _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_16__/* .TextInputFieldNode */ .re && pNode.alignWithBlocked) {
           return pNode;
         } else {
           pNode = pNode.parentNode;
@@ -30816,14 +30891,14 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
   }, {
     key: "updateCombineParagraph",
     value: function updateCombineParagraph() {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var para = hoEditorFactory.docTree.paragraphs[this._paraNo];
 
       if (!para) {
         para = hoEditorFactory.docTree.paragraphs[0];
       }
 
-      return _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_9__/* .Paragraph.para2CombinePara */ .nv.para2CombinePara(this._hoEditorFactoryID, this, para, hoEditorFactory.docTree.combineParagraph);
+      return _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_11__/* .Paragraph.para2CombinePara */ .nv.para2CombinePara(this._hoEditorFactoryID, this, para, hoEditorFactory.docTree.combineParagraph);
     }
     /**
      * @author xyl
@@ -30863,10 +30938,10 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
 
       if (index > 0) {
         var prevLine = this._drawLines[index - 1];
-        if (prevLine instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_11__/* .DrawLine */ .a) prevLine.updateLineStyle();
+        if (prevLine instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_13__/* .DrawLine */ .a) prevLine.updateLineStyle();
       }
 
-      var aline = new _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_11__/* .DrawLine */ .a(this._rootPath, this, index, paragraphWidth);
+      var aline = new _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_13__/* .DrawLine */ .a(this._rootPath, this, index, paragraphWidth);
       aline.dTop = itop;
       aline.dLeft = ileft;
       aline.x = this.combineParagraph.leftMarginPixes;
@@ -30917,7 +30992,7 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
         var dline = this.drawlines[i];
 
         if (dline) {
-          if (dline instanceof _editor_draw_drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_12__/* .DrawTable */ .t) {
+          if (dline instanceof _editor_draw_drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_14__/* .DrawTable */ .t) {
             dline.clear();
           } else {
             if (dline.parent) {
@@ -30935,12 +31010,12 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
     key: "node2DrawNode",
     value: function node2DrawNode() {
       this.clear();
-      var itop = this.combineParagraph.topMarginPixes + _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.getParagraphStartTop(this);
+      var itop = this.combineParagraph.topMarginPixes + _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.getParagraphStartTop(this);
       var leftTopInfos = this.getParagraphLeftWidth();
       var ileft = leftTopInfos[0];
       var paragraphWidth = leftTopInfos[1]; // console.log(this._combineParagraph);
 
-      var aline = new _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_11__/* .DrawLine */ .a(this._rootPath, this, 0, paragraphWidth);
+      var aline = new _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_13__/* .DrawLine */ .a(this._rootPath, this, 0, paragraphWidth);
       this._dHeight = aline.dHeight;
 
       this._drawLines.push(aline);
@@ -30975,7 +31050,7 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
       //   this.drootNodes.push(this.drawlines[0]);
       // }
       if (dline) {
-        var dTop = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.getParagraphStartTop(this);
+        var dTop = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.getParagraphStartTop(this);
         this.placeDNodeAfterDTop(dTop, dline); //    HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.insertDline(droots,index+1,this._drawLines[0]);
       }
     }
@@ -30993,7 +31068,7 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
       var dline = prevDline;
 
       while (index === -1) {
-        var _TableNode$isNodeInTa = _TableNode__WEBPACK_IMPORTED_MODULE_13__/* .TableNode.isNodeInTable */ .Fh.isNodeInTable(dline.paragraphNode),
+        var _TableNode$isNodeInTa = _TableNode__WEBPACK_IMPORTED_MODULE_15__/* .TableNode.isNodeInTable */ .Fh.isNodeInTable(dline.paragraphNode),
             _TableNode$isNodeInTa2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_TableNode$isNodeInTa, 3),
             bret = _TableNode$isNodeInTa2[0],
             aTable = _TableNode$isNodeInTa2[1],
@@ -31068,7 +31143,7 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
   }, {
     key: "isInCell",
     value: function isInCell() {
-      return this.parentNode !== null && this.parentNode instanceof _RectNode__WEBPACK_IMPORTED_MODULE_10__/* .RectNode */ .z;
+      return this.parentNode !== null && this.parentNode instanceof _RectNode__WEBPACK_IMPORTED_MODULE_12__/* .RectNode */ .z;
     }
   }, {
     key: "drawlines",
@@ -31078,7 +31153,7 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
   }, {
     key: "adjustNextDline",
     value: function adjustNextDline(dline, index) {
-      var droots = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.getDrawRootsByPath(dline.rootPath);
+      var droots = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.getDrawRootsByPath(dline.rootPath);
       var dNextLine = this.getNextDline(dline);
 
       for (var i = index; i < dline.drawItems.length; i++) {
@@ -31090,7 +31165,7 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
   }, {
     key: "getParagraphLastNodePath",
     value: function getParagraphLastNodePath() {
-      return _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getParaNodeLastPath(this); // return this.getParagraphLastNode().getNodePath()
+      return _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getParaNodeLastPath(this); // return this.getParagraphLastNode().getNodePath()
       // const pNode = this._parentNode;
       // if (pNode) {
       //   const index = pNode.childNodes.indexOf(this);
@@ -31129,7 +31204,7 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
     value: function updateDrawLineStyle() {
       for (var i = 0; i < this._drawLines.length; i++) {
         var dline = this._drawLines[i];
-        if (dline instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_11__/* .DrawLine */ .a) dline.updateLineStyle();
+        if (dline instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_13__/* .DrawLine */ .a) dline.updateLineStyle();
       } // if (dline instanceof DrawLine) dline.updateLineStyle();
 
     }
@@ -31159,12 +31234,12 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
   }, {
     key: "node2Json",
     value: function node2Json(range, iscopy) {
-      var combinePara = new _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_9__/* .CombineParagraph */ .kh(this._hoEditorFactoryID, null);
+      var combinePara = new _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_11__/* .CombineParagraph */ .kh(this._hoEditorFactoryID, null);
       combinePara.copyStyle(this.combineParagraph);
       var paragraphStyle = {
         height: this.dHeight,
         top: this.dTop,
-        align: _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_9__/* .Align */ .xM[combinePara.align],
+        align: _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_11__/* .Align */ .xM[combinePara.align],
         charSpace: combinePara.charSpace,
         lineSpace: combinePara.lineSpace,
         leftMargin: combinePara.leftMarginMm,
@@ -31180,14 +31255,15 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
       //paragraphJson._align = Align[parseInt(paragraphJson._align)];
 
       var paga = {
-        nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_8__/* .NodeType */ .Jq[this.nodeType],
+        nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_10__/* .NodeType */ .Jq[this.nodeType],
         style: paragraphStyle,
         // height: this.dHeight,
         // top: this.dTop,
         styleIndex: this._paraNo,
         textStyleNo: this.styleIndex,
         printAsSinglePage: this.printAsSinglePage,
-        docId: this.docId
+        docId: this.docId,
+        customProperty: this.customProperty
       }; //const dictType = NodeType[this.nodeType].substring(2);
 
       if (iscopy) {
@@ -31243,20 +31319,20 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
       var paraNo = Number(json.styleIndex);
 
       if (json["style"]) {
-        var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID);
+        var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID);
         var style = json.style;
-        var paragraph = new _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_9__/* .Paragraph */ .nv(hoEditorFactoryID);
+        var paragraph = new _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_11__/* .Paragraph */ .nv(hoEditorFactoryID);
         paragraph.leftMargin = style._leftMarginMm ? Number(style._leftMarginMm) : Number(style.leftMargin);
         paragraph.rightMargin = style._rightMarginMm ? Number(style._rightMarginMm) : Number(style.rightMargin);
         paragraph.topMargin = style._topMarginMm ? Number(style._topMarginMm) : Number(style.topMargin);
         paragraph.bottomMargin = style._bottomMarginMm ? Number(style._bottomMarginMm) : Number(style.bottomMargin);
-        paragraph.align = style._align !== undefined ? parseInt(_domNode_Paragraph__WEBPACK_IMPORTED_MODULE_9__/* .Align */ .xM[style._align]) : parseInt(_domNode_Paragraph__WEBPACK_IMPORTED_MODULE_9__/* .Align */ .xM[style.align]);
+        paragraph.align = style._align !== undefined ? parseInt(_domNode_Paragraph__WEBPACK_IMPORTED_MODULE_11__/* .Align */ .xM[style._align]) : parseInt(_domNode_Paragraph__WEBPACK_IMPORTED_MODULE_11__/* .Align */ .xM[style.align]);
         paragraph.charSpace = style._charSpace ? Number(style._charSpace) : Number(style.charSpace);
         paragraph.lineSpace = style._lineSpace ? Number(style._lineSpace) : Number(style.lineSpace);
         paraNo = hoEditorFactory.docTree.styleCompare(paragraph);
       }
 
-      var paragraphNode = new ParagraphNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, paraNo);
+      var paragraphNode = new ParagraphNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, paraNo, json.customProperty);
       paragraphNode.docId = json.docId && json.docId !== "" ? json.docId : "";
       paragraphNode.printAsSinglePage = json.printAsSinglePage ? json.printAsSinglePage === "true" ? true : false : false;
       paragraphNode.styleIndex = json.textStyleNo ? Number(json.textStyleNo) : 0; // paragraphNode._dHeight = Number(json.height);
@@ -31267,7 +31343,7 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
   }]);
 
   return ParagraphNode;
-}(_BaseNode__WEBPACK_IMPORTED_MODULE_8__/* .BaseNode */ .Hd);
+}(_BaseNode__WEBPACK_IMPORTED_MODULE_10__/* .BaseNode */ .Hd);
 
 /***/ }),
 
@@ -33386,7 +33462,7 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
       }
 
       json.isAllowDelete = !json.isAllowDelete ? false : json.isAllowDelete;
-      json.isSelected = !json.isSelected ? false : json.isSelected;
+      json.isSelected = !json.isSelected ? false : json.isSelected.text != undefined ? json.isSelected.text : json.isSelected;
       json.boxAlign = !json.boxAlign ? false : json.boxAlign;
       json.isEditText = !json.isEditText ? false : json.isEditText;
       json.isTransToText = !json.isTransToText ? false : json.isTransToText;
@@ -38526,12 +38602,13 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "OL": function() { return /* binding */ DownListProperty; },
 /* harmony export */   "ZX": function() { return /* binding */ DataFormat; },
+/* harmony export */   "Zi": function() { return /* binding */ InputFieldType; },
 /* harmony export */   "hc": function() { return /* binding */ ExecuteStatus; },
 /* harmony export */   "mK": function() { return /* binding */ ReadOnlyStatus; },
 /* harmony export */   "re": function() { return /* binding */ TextInputFieldNode; },
 /* harmony export */   "wz": function() { return /* binding */ DataVerifyFormat; }
 /* harmony export */ });
-/* unused harmony exports InputFieldType, SpecialFormat, BandDataSource */
+/* unused harmony exports SpecialFormat, BandDataSource */
 /* harmony import */ var element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86769);
 /* harmony import */ var element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(26982);
@@ -53506,6 +53583,12 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
             }
           }
 
+          if (hoEditorFactory.isEnabledGlobalColor) {
+            if (!(this.node instanceof MarkNode/* MarkNode */.j) && this.node.parentNode.inputFieldType === 0) {
+              backColor = "transparent";
+            }
+          }
+
           if (this.node.parentNode.enableGlobalColor) {
             backColor = "transparent";
           }
@@ -98058,7 +98141,8 @@ while(len--){curDa=sa.shift();if(typeof curDa!=="string"||Array.isArray(curDa)&&
 //we assume the user knows what they are doing.
 //Convert text into an array anyway to simplify
 //later code.
-if(typeof text==="string"){if(text.match(/[\r?\n]/)){text=[text.replace(/\r\n|\r|\n/g,'')];}else{text=[text];}}//baseline
+if(typeof text==="string"){if(text.match(/[\r?\n]/)){text=[text.replace(/\r\n|\r|\n/g,'')];// 自定义修改 处理打印回车的问题
+}else{text=[text];}}//baseline
 var height=activeFontSize/scope.internal.scaleFactor;var descent=height*(lineHeightFactor-1);switch(options.baseline){case"bottom":y-=descent;break;case"top":y+=height-descent;break;case"hanging":y+=height-2*descent;break;case"middle":y+=height/2-descent;break;}//multiline
 maxWidth=options.maxWidth||0;if(maxWidth>0){if(typeof text==="string"){text=scope.splitTextToSize(text,maxWidth);}else if(Object.prototype.toString.call(text)==="[object Array]"){text=text.reduce(function(acc,textLine){return acc.concat(scope.splitTextToSize(textLine,maxWidth));},[]);}}//creating Payload-Object to make text byRef
 payload={text:text,x:x,y:y,options:options,mutex:{pdfEscape:pdfEscape,activeFontKey:activeFontKey,fonts:fonts,activeFontSize:activeFontSize}};events.publish("preProcessText",payload);text=payload.text;options=payload.options;//angle
@@ -98076,7 +98160,8 @@ var prevWidth=0;var newX;if(align==="right"){//The passed in x coordinate define
 //rightmost point of the text.
 x-=lineWidths[0];text=[];len=da.length;for(var i=0;i<len;i++){if(i===0){newX=getHorizontalCoordinate(x);newY=getVerticalCoordinate(y);}else{newX=scale(prevWidth-lineWidths[i]);newY=-leading;}text.push([da[i],newX,newY]);prevWidth=lineWidths[i];}}else if(align==="center"){//The passed in x coordinate defines
 //the center point.
-x-=lineWidths[0]/2;text=[];len=da.length;for(var j=0;j<len;j++){if(j===0){newX=getHorizontalCoordinate(x);newY=getVerticalCoordinate(y);}else{newX=scale((prevWidth-lineWidths[j])/2);newY=-leading;}text.push([da[j],newX,newY]);prevWidth=lineWidths[j];}}else if(align==="left"){text=[];len=da.length;for(var h=0;h<len;h++){text.push(da[h]);}}else if(align==="justify"){text=[];len=da.length;maxWidth=maxWidth!==0?maxWidth:pageWidth;for(var l=0;l<len;l++){newY=l===0?getVerticalCoordinate(y):-leading;newX=l===0?getHorizontalCoordinate(x):0;if(l<len-1){wordSpacingPerLine.push(hpf(scale((maxWidth-lineWidths[l])/(da[l].split("").length-1))));}else{wordSpacingPerLine.push(0);}text.push([da[l],newX,newY]);}}else{throw new Error('Unrecognized alignment option, use "left", "center", "right" or "justify".');}}//R2L
+x-=lineWidths[0]/2;text=[];len=da.length;for(var j=0;j<len;j++){if(j===0){newX=getHorizontalCoordinate(x);newY=getVerticalCoordinate(y);}else{newX=scale((prevWidth-lineWidths[j])/2);newY=-leading;}text.push([da[j],newX,newY]);prevWidth=lineWidths[j];}}else if(align==="left"){text=[];len=da.length;for(var h=0;h<len;h++){text.push(da[h]);}}else if(align==="justify"){text=[];len=da.length;maxWidth=maxWidth!==0?maxWidth:pageWidth;for(var l=0;l<len;l++){newY=l===0?getVerticalCoordinate(y):-leading;newX=l===0?getHorizontalCoordinate(x):0;if(l<len-1){// 自定义修改 字符间距
+wordSpacingPerLine.push(hpf(scale((maxWidth-lineWidths[l])/(da[l].split("").length-1))));}else{wordSpacingPerLine.push(0);}text.push([da[l],newX,newY]);}}else{throw new Error('Unrecognized alignment option, use "left", "center", "right" or "justify".');}}//R2L
 var doReversing=typeof options.R2L==="boolean"?options.R2L:R2L;if(doReversing===true){text=processTextByFunction(text,function(text,posX,posY){return[text.split("").reverse().join(""),posX,posY];});}//creating Payload-Object to make text byRef
 payload={text:text,x:x,y:y,options:options,mutex:{pdfEscape:pdfEscape,activeFontKey:activeFontKey,fonts:fonts,activeFontSize:activeFontSize}};events.publish("postProcessText",payload);text=payload.text;isHex=payload.mutex.isHex||false;//Escaping
 var activeFontEncoding=fonts[activeFontKey].encoding;if(activeFontEncoding==="WinAnsiEncoding"||activeFontEncoding==="StandardEncoding"){text=processTextByFunction(text,function(text,posX,posY){return[ESC(text),posX,posY];});}da=transformTextToSpecialArray(text);text=[];var STRING=0;var ARRAY=1;var variant=Array.isArray(da[0])?ARRAY:STRING;var posX;var posY;var content;var wordSpacing="";var generatePosition=function generatePosition(parmPosX,parmPosY,parmTransformationMatrix){var position="";if(parmTransformationMatrix instanceof Matrix){// It is kind of more intuitive to apply a plain rotation around the text anchor set by x and y
@@ -98882,6 +98967,7 @@ stream.push(formObject.scope.__private__.encodeColorString(formObject.color));st
 stream.push(calcRes.text);stream.push("ET");// End Text
 stream.push("Q");stream.push("EMC");var appearanceStreamContent=createFormXObject(formObject);appearanceStreamContent.scope=formObject.scope;appearanceStreamContent.stream=stream.join("\n");return appearanceStreamContent;};var calculateX=function calculateX(formObject,text){var maxFontSize=formObject.fontSize===0?formObject.maxFontSize:formObject.fontSize;var returnValue={text:"",fontSize:""};// Remove Brackets
 text=text.substr(0,1)=="("?text.substr(1):text;text=text.substr(text.length-1)==")"?text.substr(0,text.length-1):text;// split into array of words
+// 自定义修改 字符间距
 var textSplit=text.split("");var fontSize=maxFontSize;// The Starting fontSize (The Maximum)
 var lineSpacing=2;var borderPadding=2;var height=AcroFormAppearance.internal.getHeight(formObject)||0;height=height<0?-height:height;var width=AcroFormAppearance.internal.getWidth(formObject)||0;width=width<0?-width:width;var isSmallerThanWidth=function isSmallerThanWidth(i,lastLine,fontSize){if(i+1<textSplit.length){var tmp=lastLine+" "+textSplit[i+1];var TextWidth=calculateFontSpace(tmp,formObject,fontSize).width;var FieldWidth=width-2*borderPadding;return TextWidth<=FieldWidth;}else{return false;}};fontSize++;FontSize:while(fontSize>0){text="";fontSize--;var textHeight=calculateFontSpace("3",formObject,fontSize).height;var startY=formObject.multiline?height-fontSize:(height-textHeight)/2;startY+=lineSpacing;var startX;var lastY=startY;var firstWordInLine=0,lastWordInLine=0;var lastLength;if(fontSize<=0){// In case, the Text doesn't fit at all
 fontSize=12;text="(...) Tj\n";text+="% Width of Text: "+calculateFontSpace(text,formObject,fontSize).width+", FieldWidth:"+width+"\n";break;}var lastLine="";var lineCount=0;Line:for(var i in textSplit){if(textSplit.hasOwnProperty(i)){lastLine+=textSplit[i]+" ";// Remove last blank
@@ -99515,7 +99601,8 @@ out+=String.fromCharCode.apply(null,buf.subarray(i,i+ARRAY_APPLY_BATCH));}return
    * @param {posY}
    *
    * @returns jsPDF
-   */jsPDFAPI.addImage=function(){var imageData,format,x,y,w,h,alias,compression,rotation,posX,posY;imageData=arguments[0];if(typeof arguments[1]==="number"){format=UNKNOWN;x=arguments[1];y=arguments[2];w=arguments[3];h=arguments[4];alias=arguments[5];compression=arguments[6];rotation=arguments[7];posX=arguments[8];posY=arguments[9];}else{format=arguments[1];x=arguments[2];y=arguments[3];w=arguments[4];h=arguments[5];alias=arguments[6];compression=arguments[7];rotation=arguments[8];posX=arguments[9];posY=arguments[10];}if((0,esm_typeof/* default */.Z)(imageData)==="object"&&!isDOMElement(imageData)&&"imageData"in imageData){var options=imageData;imageData=options.imageData;format=options.format||format||UNKNOWN;x=options.x||x||0;y=options.y||y||0;w=options.w||options.width||w;h=options.h||options.height||h;alias=options.alias||alias;compression=options.compression||compression;rotation=options.rotation||options.angle||rotation;}//If compression is not explicitly set, determine if we should use compression
+   */jsPDFAPI.addImage=function(){// 自定义修改 处理签名图片打印
+var imageData,format,x,y,w,h,alias,compression,rotation,posX,posY;imageData=arguments[0];if(typeof arguments[1]==="number"){format=UNKNOWN;x=arguments[1];y=arguments[2];w=arguments[3];h=arguments[4];alias=arguments[5];compression=arguments[6];rotation=arguments[7];posX=arguments[8];posY=arguments[9];}else{format=arguments[1];x=arguments[2];y=arguments[3];w=arguments[4];h=arguments[5];alias=arguments[6];compression=arguments[7];rotation=arguments[8];posX=arguments[9];posY=arguments[10];}if((0,esm_typeof/* default */.Z)(imageData)==="object"&&!isDOMElement(imageData)&&"imageData"in imageData){var options=imageData;imageData=options.imageData;format=options.format||format||UNKNOWN;x=options.x||x||0;y=options.y||y||0;w=options.w||options.width||w;h=options.h||options.height||h;alias=options.alias||alias;compression=options.compression||compression;rotation=options.rotation||options.angle||rotation;}//If compression is not explicitly set, determine if we should use compression
 var filter=this.internal.getFilters();if(compression===undefined&&filter.indexOf("FlateEncode")!==-1){compression="SLOW";}if(isNaN(x)||isNaN(y)){throw new Error("Invalid coordinates passed to jsPDF.addImage");}// if(posX) x += posX;
 // if(posY) y += posY;
 initialize.call(this);var image=processImageData.call(this,imageData,format,alias,compression);writeImageToPDF.call(this,x,y,w,h,image,rotation);return this;};var processImageData=function processImageData(imageData,format,alias,compression){var result,dataAsBinaryString;if(typeof imageData==="string"&&getImageFileTypeByImageData(imageData)===UNKNOWN){imageData=unescape(imageData);var tmpImageData=convertBase64ToBinaryString(imageData,false);if(tmpImageData!==""){imageData=tmpImageData;}else{tmpImageData=jsPDFAPI.loadFile(imageData,true);if(tmpImageData!==undefined){imageData=tmpImageData;}}}if(isDOMElement(imageData)){imageData=getImageDataFromElement(imageData,format);}format=getImageFileTypeByImageData(imageData,format);if(!isImageTypeSupported(format)){throw new Error("addImage does not support files of type '"+format+"', please ensure that a plugin for '"+format+"' support is added.");}// now do the heavy lifting
@@ -99970,7 +100057,8 @@ var f2,getHorizontalCoordinateString,getVerticalCoordinateString,getHorizontalCo
      * A gradient object (linear or radial) used to fill the drawing (not supported by context2d)<br />
      * A pattern object to use to fill the drawing (not supported by context2d)
      */Object.defineProperty(this,"fillStyle",{get:function get(){return this.ctx.fillStyle;},set:function set(value){var rgba;rgba=getRGBA(value);this.ctx.fillStyle=rgba.style;this.ctx.isFillTransparent=rgba.a===0;//自定义修改  当透明度小于1时改成0 ,以适配不支持透明度的打印机
-if(rgba.a<1){this.ctx.fillOpacity=0;}else{this.ctx.fillOpacity=rgba.a;}var alpha=this.ctx.fillOpacity;this.pdf.setFillColor(rgba.r,rgba.g,rgba.b,{a:alpha});this.pdf.setTextColor(rgba.r,rgba.g,rgba.b,{a:alpha});}});/**
+if(rgba.a<1){this.ctx.fillOpacity=0;}else{this.ctx.fillOpacity=rgba.a;}// 自定义修改 处理彩色字体打印问题
+if(window.printBlack&&this.ctx.fillStyle!=="#000000"&&this.ctx.fillStyle!=="#FFFFFF"){this.ctx.fillStyle="#000000";rgba.r=0;rgba.g=0;rgba.b=0;}var alpha=this.ctx.fillOpacity;this.pdf.setFillColor(rgba.r,rgba.g,rgba.b,{a:alpha});this.pdf.setTextColor(rgba.r,rgba.g,rgba.b,{a:alpha});}});/**
      * Sets or returns the color, gradient, or pattern used for strokes
      *
      * @name strokeStyle
@@ -100009,7 +100097,8 @@ if(fontFace!==null){fontFace.ref={name:family,style:style};fontFaces.push(fontFa
      * will be used. If not set it will fallback to previous behavior.
      */Object.defineProperty(this,"fontFaces",{get:function get(){return _fontFaces;},set:function set(value){_fontFaceMap=null;_fontFaces=value;}});Object.defineProperty(this,"font",{get:function get(){return this.ctx.font;},set:function set(value){this.ctx.font=value;var rx,matches;//source: https://stackoverflow.com/a/10136041
 // eslint-disable-next-line no-useless-escape
-rx=/^\s*(?=(?:(?:[-a-z]+\s*){0,2}(italic|oblique))?)(?=(?:(?:[-a-z]+\s*){0,2}(small-caps))?)(?=(?:(?:[-a-z]+\s*){0,2}(bold(?:er)?|lighter|[1-9]00))?)(?:(?:normal|\1|\2|\3)\s*){0,3}((?:xx?-)?(?:small|large)|medium|smaller|larger|[.\d]+(?:\%|in|[cem]m|ex|p[ctx]))(?:\s*\/\s*(normal|[.\d]+(?:\%|in|[cem]m|ex|p[ctx])))?\s*([-_,\"\'\sa-z]+?)\s*$/i;matches=rx.exec(value);if(matches!==null){var fontStyle=matches[1];var fontVariant=matches[2];var fontWeight=matches[3];var fontSize=matches[4];var lineHeight=matches[5];var fontFamily=matches[6];}else{return;}var rxFontSize=/^([.\d]+)((?:%|in|[cem]m|ex|p[ctx]))$/i;var fontSizeUnit=rxFontSize.exec(fontSize)[2];if("px"===fontSizeUnit){fontSize=parseFloat(fontSize)*this.pdf.internal.scaleFactor;}else if("em"===fontSizeUnit){fontSize=Math.floor(parseFloat(fontSize)*this.pdf.getFontSize());}else{fontSize=Math.floor(parseFloat(fontSize)*this.pdf.internal.scaleFactor);}this.pdf.setFontSize(fontSize);var parts=parseFontFamily(fontFamily);if(this.fontFaces){var fontFaceMap=getFontFaceMap(this.pdf,this.fontFaces);var rules=parts.map(function(ff){return{family:ff,stretch:"normal",// TODO: Extract font-stretch from font rule (perhaps write proper parser for it?)
+rx=/^\s*(?=(?:(?:[-a-z]+\s*){0,2}(italic|oblique))?)(?=(?:(?:[-a-z]+\s*){0,2}(small-caps))?)(?=(?:(?:[-a-z]+\s*){0,2}(bold(?:er)?|lighter|[1-9]00))?)(?:(?:normal|\1|\2|\3)\s*){0,3}((?:xx?-)?(?:small|large)|medium|smaller|larger|[.\d]+(?:\%|in|[cem]m|ex|p[ctx]))(?:\s*\/\s*(normal|[.\d]+(?:\%|in|[cem]m|ex|p[ctx])))?\s*([-_,\"\'\sa-z]+?)\s*$/i;matches=rx.exec(value);if(matches!==null){var fontStyle=matches[1];var fontVariant=matches[2];var fontWeight=matches[3];var fontSize=matches[4];var lineHeight=matches[5];var fontFamily=matches[6];}else{return;}var rxFontSize=/^([.\d]+)((?:%|in|[cem]m|ex|p[ctx]))$/i;var fontSizeUnit=rxFontSize.exec(fontSize)[2];if("px"===fontSizeUnit){fontSize=parseFloat(fontSize)*this.pdf.internal.scaleFactor;//自定义修改 pt字体转为px
+}else if("em"===fontSizeUnit){fontSize=Math.floor(parseFloat(fontSize)*this.pdf.getFontSize());}else{fontSize=Math.floor(parseFloat(fontSize)*this.pdf.internal.scaleFactor);}this.pdf.setFontSize(fontSize);var parts=parseFontFamily(fontFamily);if(this.fontFaces){var fontFaceMap=getFontFaceMap(this.pdf,this.fontFaces);var rules=parts.map(function(ff){return{family:ff,stretch:"normal",// TODO: Extract font-stretch from font rule (perhaps write proper parser for it?)
 weight:fontWeight,style:fontStyle};});var font=resolveFontFace(fontFaceMap,rules);this.pdf.setFont(font.ref.name,font.ref.style);return;}var style="";if(fontWeight==="bold"||parseInt(fontWeight,10)>=700||fontStyle==="bold"){style="bold";}if(fontStyle==="italic"){style+="italic";}if(style.length===0){style="normal";}var jsPdfFontName="";var fallbackFonts={arial:"Helvetica",Arial:"Helvetica",verdana:"Helvetica",Verdana:"Helvetica",helvetica:"Helvetica",Helvetica:"Helvetica","sans-serif":"Helvetica",fixed:"Courier",monospace:"Courier",terminal:"Courier",cursive:"Times",fantasy:"Times",serif:"Times"};for(var i=0;i<parts.length;i++){if(this.pdf.internal.getFont(parts[i],style,{noFallback:true,disableWarning:true})!==undefined){jsPdfFontName=parts[i];break;}else if(style==="bolditalic"&&this.pdf.internal.getFont(parts[i],"bold",{noFallback:true,disableWarning:true})!==undefined){jsPdfFontName=parts[i];style="bold";}else if(this.pdf.internal.getFont(parts[i],"normal",{noFallback:true,disableWarning:true})!==undefined){jsPdfFontName=parts[i];style="normal";break;}}if(jsPdfFontName===""){for(var j=0;j<parts.length;j++){if(fallbackFonts[parts[j]]){jsPdfFontName=fallbackFonts[parts[j]];break;}}}jsPdfFontName=jsPdfFontName===""?"Times":jsPdfFontName;this.pdf.setFont(jsPdfFontName,style);}});Object.defineProperty(this,"globalCompositeOperation",{get:function get(){return this.ctx.globalCompositeOperation;},set:function set(value){this.ctx.globalCompositeOperation=value;}});Object.defineProperty(this,"globalAlpha",{get:function get(){return this.ctx.globalAlpha;},set:function set(value){//自定义修改
 if(value<1){this.ctx.globalAlpha=0;}else{this.ctx.globalAlpha=value;}}});/**
      * A float specifying the amount of the line dash offset. The default value is 0.0.
@@ -100049,7 +100138,8 @@ return this.lineDash.slice();}};Context2D.prototype.fill=function(){pathPreProce
    * @function
    * @param x {Number} The x-coordinate of where to move the path to
    * @param y {Number} The y-coordinate of where to move the path to
-   */Context2D.prototype.moveTo=function(x,y){if(isNaN(x)||isNaN(y)){console.error("jsPDF.context2d.moveTo: Invalid arguments",arguments);throw new Error("Invalid arguments passed to jsPDF.context2d.moveTo");}x+=this.posX;y+=this.posY;var pt=this.ctx.transform.applyToPoint(new Point(x,y));this.path.push({type:"mt",x:pt.x,y:pt.y});this.ctx.lastPoint=new Point(x,y);};/**
+   */Context2D.prototype.moveTo=function(x,y){if(isNaN(x)||isNaN(y)){console.error("jsPDF.context2d.moveTo: Invalid arguments",arguments);throw new Error("Invalid arguments passed to jsPDF.context2d.moveTo");}// 自定义修改 表格的边框线/页面边框位置不对的问题
+x+=this.posX;y+=this.posY;var pt=this.ctx.transform.applyToPoint(new Point(x,y));this.path.push({type:"mt",x:pt.x,y:pt.y});this.ctx.lastPoint=new Point(x,y);};/**
    * Creates a path from the current point back to the starting point
    *
    * @name closePath
@@ -100063,7 +100153,8 @@ return this.lineDash.slice();}};Context2D.prototype.fill=function(){pathPreProce
    * @param x The x-coordinate of where to create the line to
    * @param y The y-coordinate of where to create the line to
    * @description The lineTo() method adds a new point and creates a line TO that point FROM the last specified point in the canvas (this method does not draw the line).
-   */Context2D.prototype.lineTo=function(x,y){if(isNaN(x)||isNaN(y)){console.error("jsPDF.context2d.lineTo: Invalid arguments",arguments);throw new Error("Invalid arguments passed to jsPDF.context2d.lineTo");}x+=this.posX;y+=this.posY;var pt=this.ctx.transform.applyToPoint(new Point(x,y));this.path.push({type:"lt",x:pt.x,y:pt.y});this.ctx.lastPoint=new Point(pt.x,pt.y);};/**
+   */Context2D.prototype.lineTo=function(x,y){if(isNaN(x)||isNaN(y)){console.error("jsPDF.context2d.lineTo: Invalid arguments",arguments);throw new Error("Invalid arguments passed to jsPDF.context2d.lineTo");}// 自定义修改 表格的边框线/页面边框位置不对的问题
+x+=this.posX;y+=this.posY;var pt=this.ctx.transform.applyToPoint(new Point(x,y));this.path.push({type:"lt",x:pt.x,y:pt.y});this.ctx.lastPoint=new Point(pt.x,pt.y);};/**
    * Clips a region of any shape and size from the original canvas
    *
    * @name clip
@@ -100216,7 +100307,9 @@ putText.call(this,{text:text,x:x,y:y,scale:scale,angle:degs,align:this.textAlign
    * @param y {Number} The y coordinate where to start painting the text (relative to the canvas)
    * @param maxWidth {Number} Optional. The maximum allowed width of the text, in pixels
    * @description The strokeText() method draws text (with no fill) on the canvas. The default color of the text is black.
-   */Context2D.prototype.strokeText=function(text,x,y,maxWidth){if(isNaN(x)||isNaN(y)||typeof text!=="string"){console.error("jsPDF.context2d.strokeText: Invalid arguments",arguments);throw new Error("Invalid arguments passed to jsPDF.context2d.strokeText");}if(isStrokeTransparent.call(this)){return;}maxWidth=isNaN(maxWidth)?undefined:maxWidth;var degs=rad2deg(this.ctx.transform.rotation);var scale=this.ctx.transform.scaleX;var acharSpace=this.letterSpacing?this.letterSpacing:0;putText.call(this,{text:text,x:x,y:y,scale:scale,renderingMode:"stroke",angle:degs,align:this.textAlign,maxWidth:maxWidth,charSpace:acharSpace});};/**
+   */Context2D.prototype.strokeText=function(text,x,y,maxWidth){if(isNaN(x)||isNaN(y)||typeof text!=="string"){console.error("jsPDF.context2d.strokeText: Invalid arguments",arguments);throw new Error("Invalid arguments passed to jsPDF.context2d.strokeText");}if(isStrokeTransparent.call(this)){return;}maxWidth=isNaN(maxWidth)?undefined:maxWidth;var degs=rad2deg(this.ctx.transform.rotation);var scale=this.ctx.transform.scaleX;var acharSpace=this.letterSpacing?this.letterSpacing:0;// 自定义修改
+putText.call(this,{text:text,x:x,y:y,scale:scale,renderingMode:"stroke",angle:degs,align:this.textAlign,maxWidth:maxWidth,charSpace:acharSpace// 自定义修改
+});};/**
    * Returns an object that contains the width of the specified text
    *
    * @name measureText
@@ -100280,6 +100373,7 @@ putText.call(this,{text:text,x:x,y:y,scale:scale,angle:degs,align:this.textAlign
 // if (isNaN(f)){
 //   f=0;
 // }
+// 自定义修改 处理打印图片报错
 a=isNaN(a)?1:a;b=isNaN(b)?0:b;c=isNaN(c)?0:c;d=isNaN(d)?1:d;e=isNaN(e)?0:e;f=isNaN(f)?0:f;var matrix=new Matrix(a,b,c,d,e,f);this.ctx.transform=this.ctx.transform.multiply(matrix);// console.log("this.transform值",this.ctx.transform);
 };/**
    * Resets the current transform to the identity matrix. Then runs transform()
@@ -100308,8 +100402,9 @@ a=isNaN(a)?1:a;b=isNaN(b)?0:b;c=isNaN(c)?0:c;d=isNaN(d)?1:d;e=isNaN(e)?0:e;f=isN
    * @param height {Number} Optional. The height of the image to use (stretch or reduce the image)
    */Context2D.prototype.drawImage=function(img,sx,sy,swidth,sheight,x,y,width,height){var imageProperties=this.pdf.getImageProperties(img);var factorX=1;var factorY=1;var clipFactorX=1;var clipFactorY=1;if(typeof swidth!=="undefined"&&typeof width!=="undefined"){clipFactorX=width/swidth;clipFactorY=height/sheight;factorX=imageProperties.width/swidth*width/swidth;factorY=imageProperties.height/sheight*height/sheight;}//is sx and sy are set and x and y not, set x and y with values of sx and sy
 if(typeof x==="undefined"){x=sx;y=sy;sx=0;sy=0;}if(typeof swidth!=="undefined"&&typeof width==="undefined"){width=swidth;height=sheight;}if(typeof swidth==="undefined"&&typeof width==="undefined"){width=imageProperties.width;height=imageProperties.height;}var decomposedTransformationMatrix=this.ctx.transform.decompose();// console.log("transform.decompose",decomposedTransformationMatrix.scale);
-var angle=rad2deg(decomposedTransformationMatrix.rotate.shx);var matrix=new Matrix();matrix=matrix.multiply(decomposedTransformationMatrix.translate);matrix=matrix.multiply(decomposedTransformationMatrix.skew);matrix=matrix.multiply(decomposedTransformationMatrix.scale);if(!swidth){swidth=width;}if(!sheight){sheight=height;}var xRect;if(img.nodeName&&img.nodeName=="CANVAS"){xRect=matrix.applyToRectangle(new Rectangle(x+this.posX-sx*clipFactorX,y+this.posY-sy*clipFactorY,swidth*factorX,sheight*factorY));}else{xRect=matrix.applyToRectangle(new Rectangle(x-sx*clipFactorX,y-sy*clipFactorY,swidth*factorX,sheight*factorY));}var pageArray=getPagesByPath.call(this,xRect);var pages=[];for(var ii=0;ii<pageArray.length;ii+=1){if(pages.indexOf(pageArray[ii])===-1){pages.push(pageArray[ii]);}}sortPages(pages);var clipPath;if(this.autoPaging){var min=pages[0];var max=pages[pages.length-1];for(var i=min;i<max+1;i++){this.pdf.setPage(i);var pageWidthMinusMargins=this.pdf.internal.pageSize.width-this.margin[3]-this.margin[1];var topMargin=i===1?this.posY+this.margin[0]:this.margin[0];var firstPageHeight=this.pdf.internal.pageSize.height-this.posY-this.margin[0]-this.margin[2];var pageHeightMinusMargins=this.pdf.internal.pageSize.height-this.margin[0]-this.margin[2];var previousPageHeightSum=i===1?0:firstPageHeight+(i-2)*pageHeightMinusMargins;if(this.ctx.clip_path.length!==0){var tmpPaths=this.path;clipPath=JSON.parse(JSON.stringify(this.ctx.clip_path));this.path=pathPositionRedo(clipPath,this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset);drawPaths.call(this,"fill",true);this.path=tmpPaths;}var tmpRect=JSON.parse(JSON.stringify(xRect));tmpRect=pathPositionRedo([tmpRect],this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset)[0];var needsClipping=(i>min||i<max)&&hasMargins.call(this);if(needsClipping){this.pdf.saveGraphicsState();this.pdf.rect(this.margin[3],this.margin[0],pageWidthMinusMargins,pageHeightMinusMargins,null).clip().discardPath();}this.pdf.addImage(img,"JPEG",tmpRect.x,tmpRect.y,tmpRect.w,tmpRect.h,null,null,angle);if(needsClipping){this.pdf.restoreGraphicsState();}}}else{if(img.nodeName&&img.nodeName=="CANVAS"){// console.log("使用canvas绘制图像");
-this.pdf.addImage(img.toDataURL("image/jpg"),'',xRect.x,xRect.y,xRect.w,xRect.h);}else{// console.log("pdf.addImage绘制图片", xRect.x, xRect.y, xRect.w, xRect.h, null, null, angle);
+var angle=rad2deg(decomposedTransformationMatrix.rotate.shx);var matrix=new Matrix();matrix=matrix.multiply(decomposedTransformationMatrix.translate);matrix=matrix.multiply(decomposedTransformationMatrix.skew);matrix=matrix.multiply(decomposedTransformationMatrix.scale);if(!swidth){swidth=width;}if(!sheight){sheight=height;}var xRect;// 自定义修改 处理签名图片打印和普通图片打印
+if(img.nodeName&&img.nodeName=="CANVAS"){xRect=matrix.applyToRectangle(new Rectangle(x+this.posX-sx*clipFactorX,y+this.posY-sy*clipFactorY,swidth*factorX,sheight*factorY));}else{xRect=matrix.applyToRectangle(new Rectangle(x-sx*clipFactorX,y-sy*clipFactorY,swidth*factorX,sheight*factorY));}var pageArray=getPagesByPath.call(this,xRect);var pages=[];for(var ii=0;ii<pageArray.length;ii+=1){if(pages.indexOf(pageArray[ii])===-1){pages.push(pageArray[ii]);}}sortPages(pages);var clipPath;if(this.autoPaging){var min=pages[0];var max=pages[pages.length-1];for(var i=min;i<max+1;i++){this.pdf.setPage(i);var pageWidthMinusMargins=this.pdf.internal.pageSize.width-this.margin[3]-this.margin[1];var topMargin=i===1?this.posY+this.margin[0]:this.margin[0];var firstPageHeight=this.pdf.internal.pageSize.height-this.posY-this.margin[0]-this.margin[2];var pageHeightMinusMargins=this.pdf.internal.pageSize.height-this.margin[0]-this.margin[2];var previousPageHeightSum=i===1?0:firstPageHeight+(i-2)*pageHeightMinusMargins;if(this.ctx.clip_path.length!==0){var tmpPaths=this.path;clipPath=JSON.parse(JSON.stringify(this.ctx.clip_path));this.path=pathPositionRedo(clipPath,this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset);drawPaths.call(this,"fill",true);this.path=tmpPaths;}var tmpRect=JSON.parse(JSON.stringify(xRect));tmpRect=pathPositionRedo([tmpRect],this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset)[0];var needsClipping=(i>min||i<max)&&hasMargins.call(this);if(needsClipping){this.pdf.saveGraphicsState();this.pdf.rect(this.margin[3],this.margin[0],pageWidthMinusMargins,pageHeightMinusMargins,null).clip().discardPath();}this.pdf.addImage(img,"JPEG",tmpRect.x,tmpRect.y,tmpRect.w,tmpRect.h,null,null,angle);if(needsClipping){this.pdf.restoreGraphicsState();}}}else{if(img.nodeName&&img.nodeName=="CANVAS"){// 自定义修改
+this.pdf.addImage(img.toDataURL("image/jpg"),'',xRect.x,xRect.y,xRect.w,xRect.h);}else{// 自定义修改
 this.pdf.addImage(img,"JPEG",xRect.x+this.posX,xRect.y+this.posY,xRect.w,xRect.h,null,null,angle,this.posX,this.posY);}}};var getPagesByPath=function getPagesByPath(path,pageWrapX,pageWrapY){var result=[];pageWrapX=pageWrapX||this.pdf.internal.pageSize.width;pageWrapY=pageWrapY||this.pdf.internal.pageSize.height-this.margin[0]-this.margin[2];var yOffset=this.posY+this.ctx.prevPageLastElemOffset;switch(path.type){default:case"mt":case"lt":result.push(Math.floor((path.y+yOffset)/pageWrapY)+1);break;case"arc":result.push(Math.floor((path.y+yOffset-path.radius)/pageWrapY)+1);result.push(Math.floor((path.y+yOffset+path.radius)/pageWrapY)+1);break;case"qct":var rectOfQuadraticCurve=getQuadraticCurveBoundary(this.ctx.lastPoint.x,this.ctx.lastPoint.y,path.x1,path.y1,path.x,path.y);result.push(Math.floor((rectOfQuadraticCurve.y+yOffset)/pageWrapY)+1);result.push(Math.floor((rectOfQuadraticCurve.y+rectOfQuadraticCurve.h+yOffset)/pageWrapY)+1);break;case"bct":var rectOfBezierCurve=getBezierCurveBoundary(this.ctx.lastPoint.x,this.ctx.lastPoint.y,path.x1,path.y1,path.x2,path.y2,path.x,path.y);result.push(Math.floor((rectOfBezierCurve.y+yOffset)/pageWrapY)+1);result.push(Math.floor((rectOfBezierCurve.y+rectOfBezierCurve.h+yOffset)/pageWrapY)+1);break;case"rect":result.push(Math.floor((path.y+yOffset)/pageWrapY)+1);result.push(Math.floor((path.y+path.h+yOffset)/pageWrapY)+1);}for(var i=0;i<result.length;i+=1){while(this.pdf.internal.getNumberOfPages()<result[i]){addPage.call(this);}}return result;};var addPage=function addPage(){var fillStyle=this.fillStyle;var strokeStyle=this.strokeStyle;var font=this.font;var lineCap=this.lineCap;var lineWidth=this.lineWidth;var lineJoin=this.lineJoin;this.pdf.addPage();this.fillStyle=fillStyle;this.strokeStyle=strokeStyle;this.font=font;this.lineCap=lineCap;this.lineWidth=lineWidth;this.lineJoin=lineJoin;};var pathPositionRedo=function pathPositionRedo(paths,x,y){for(var i=0;i<paths.length;i++){switch(paths[i].type){case"bct":paths[i].x2+=x;paths[i].y2+=y;case"qct":paths[i].x1+=x;paths[i].y1+=y;case"mt":case"lt":case"arc":default:paths[i].x+=x;paths[i].y+=y;}}return paths;};var sortPages=function sortPages(pages){return pages.sort(function(a,b){return a-b;});};var pathPreProcess=function pathPreProcess(rule,isClip){var fillStyle=this.fillStyle;var strokeStyle=this.strokeStyle;var lineCap=this.lineCap;var oldLineWidth=this.lineWidth;var lineWidth=Math.abs(oldLineWidth*this.ctx.transform.scaleX);var lineJoin=this.lineJoin;var origPath=JSON.parse(JSON.stringify(this.path));var xPath=JSON.parse(JSON.stringify(this.path));var clipPath;var tmpPath;var pages=[];for(var i=0;i<xPath.length;i++){if(typeof xPath[i].x!=="undefined"){var page=getPagesByPath.call(this,xPath[i]);for(var ii=0;ii<page.length;ii+=1){if(pages.indexOf(page[ii])===-1){pages.push(page[ii]);}}}}for(var j=0;j<pages.length;j++){while(this.pdf.internal.getNumberOfPages()<pages[j]){addPage.call(this);}}sortPages(pages);if(this.autoPaging){var min=pages[0];var max=pages[pages.length-1];for(var k=min;k<max+1;k++){this.pdf.setPage(k);this.fillStyle=fillStyle;this.strokeStyle=strokeStyle;this.lineCap=lineCap;this.lineWidth=lineWidth;this.lineJoin=lineJoin;var pageWidthMinusMargins=this.pdf.internal.pageSize.width-this.margin[3]-this.margin[1];var topMargin=k===1?this.posY+this.margin[0]:this.margin[0];var firstPageHeight=this.pdf.internal.pageSize.height-this.posY-this.margin[0]-this.margin[2];var pageHeightMinusMargins=this.pdf.internal.pageSize.height-this.margin[0]-this.margin[2];var previousPageHeightSum=k===1?0:firstPageHeight+(k-2)*pageHeightMinusMargins;if(this.ctx.clip_path.length!==0){var tmpPaths=this.path;clipPath=JSON.parse(JSON.stringify(this.ctx.clip_path));this.path=pathPositionRedo(clipPath,this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset);drawPaths.call(this,rule,true);this.path=tmpPaths;}tmpPath=JSON.parse(JSON.stringify(origPath));this.path=pathPositionRedo(tmpPath,this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset);if(isClip===false||k===0){var needsClipping=(k>min||k<max)&&hasMargins.call(this);if(needsClipping){this.pdf.saveGraphicsState();this.pdf.rect(this.margin[3],this.margin[0],pageWidthMinusMargins,pageHeightMinusMargins,null).clip().discardPath();}drawPaths.call(this,rule,isClip);if(needsClipping){this.pdf.restoreGraphicsState();}}this.lineWidth=oldLineWidth;}}else{this.lineWidth=lineWidth;drawPaths.call(this,rule,isClip);this.lineWidth=oldLineWidth;}this.path=origPath;};/**
    * Processes the paths
    *
@@ -100330,10 +100425,13 @@ return y;case"alphabetic":default:return y;}};var getTextBottom=function getText
    * @param counterclockwise
    * @param style
    * @param isClip
-   */var drawArc=function drawArc(x,y,r,a1,a2,counterclockwise,style,isClip){var curves=createArc.call(this,r,a1,a2,counterclockwise);for(var i=0;i<curves.length;i++){var curve=curves[i];if(i===0){doMove.call(this,curve.x1+x,curve.y1+y);}drawCurve.call(this,x,y,curve.x2,curve.y2,curve.x3,curve.y3,curve.x4,curve.y4);}if(!isClip){putStyle.call(this,style);}else{doClip.call(this);}};var putStyle=function putStyle(style){switch(style){case"stroke":this.pdf.internal.out("S");break;case"fill":this.pdf.internal.out("f");break;}};var doClip=function doClip(){this.pdf.clip();this.pdf.discardPath();};var doMove=function doMove(x,y){this.pdf.internal.out(getHorizontalCoordinateString(x)+" "+getVerticalCoordinateString(y)+" m");};var putText=function putText(options){var textAlign;switch(options.align){case"right":case"end":textAlign="right";break;case"center":textAlign="center";break;case"left":case"start":default:textAlign="left";break;}var textDimensions=this.pdf.getTextDimensions(options.text);var yBaseLine=getBaseline.call(this,options.y);var yBottom=getTextBottom.call(this,yBaseLine);var yTop=yBottom-textDimensions.h;var pt=this.ctx.transform.applyToPoint(new Point(options.x,yBaseLine));var decomposedTransformationMatrix=this.ctx.transform.decompose();var matrix=new Matrix();matrix=matrix.multiply(decomposedTransformationMatrix.translate);matrix=matrix.multiply(decomposedTransformationMatrix.skew);matrix=matrix.multiply(decomposedTransformationMatrix.scale);var baselineRect=this.ctx.transform.applyToRectangle(new Rectangle(options.x,yBaseLine,textDimensions.w,textDimensions.h));var textBounds=matrix.applyToRectangle(new Rectangle(options.x,yTop,textDimensions.w,textDimensions.h));var pageArray=getPagesByPath.call(this,textBounds);var pages=[];for(var ii=0;ii<pageArray.length;ii+=1){if(pages.indexOf(pageArray[ii])===-1){pages.push(pageArray[ii]);}}sortPages(pages);var clipPath,oldSize,oldLineWidth;options.text=options.text.replace(/[\t]/g,' ');if(this.autoPaging){var min=pages[0];var max=pages[pages.length-1];for(var i=min;i<max+1;i++){this.pdf.setPage(i);var topMargin=i===1?this.posY+this.margin[0]:this.margin[0];var firstPageHeight=this.pdf.internal.pageSize.height-this.posY-this.margin[0]-this.margin[2];var pageHeightMinusBottomMargin=this.pdf.internal.pageSize.height-this.margin[2];var pageHeightMinusMargins=pageHeightMinusBottomMargin-this.margin[0];var pageWidthMinusRightMargin=this.pdf.internal.pageSize.width-this.margin[1];var pageWidthMinusMargins=pageWidthMinusRightMargin-this.margin[3];var previousPageHeightSum=i===1?0:firstPageHeight+(i-2)*pageHeightMinusMargins;var acharSpace=options.charSpace?parseFloat(options.charSpace):0.0;if(this.ctx.clip_path.length!==0){var tmpPaths=this.path;clipPath=JSON.parse(JSON.stringify(this.ctx.clip_path));this.path=pathPositionRedo(clipPath,this.posX+this.margin[3],-1*previousPageHeightSum+topMargin);drawPaths.call(this,"fill",true);this.path=tmpPaths;}var textBoundsOnPage=pathPositionRedo([JSON.parse(JSON.stringify(textBounds))],this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset)[0];if(options.scale>=0.01){oldSize=this.pdf.internal.getFontSize();this.pdf.setFontSize(oldSize*options.scale);oldLineWidth=this.lineWidth;this.lineWidth=oldLineWidth*options.scale;}var doSlice=this.autoPaging!=="text";if(doSlice||textBoundsOnPage.y+textBoundsOnPage.h<=pageHeightMinusBottomMargin){if(doSlice||textBoundsOnPage.y>=topMargin&&textBoundsOnPage.x<=pageWidthMinusRightMargin){var croppedText=doSlice?options.text:this.pdf.splitTextToSize(options.text,options.maxWidth||pageWidthMinusRightMargin-textBoundsOnPage.x)[0];var baseLineRectOnPage=pathPositionRedo([JSON.parse(JSON.stringify(baselineRect))],this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset)[0];var needsClipping=doSlice&&(i>min||i<max)&&hasMargins.call(this);if(needsClipping){this.pdf.saveGraphicsState();this.pdf.rect(this.margin[3],this.margin[0],pageWidthMinusMargins,pageHeightMinusMargins,null).clip().discardPath();}this.pdf.text(croppedText,baseLineRectOnPage.x,baseLineRectOnPage.y,{angle:options.angle,align:textAlign,renderingMode:options.renderingMode,charSpace:acharSpace});if(needsClipping){this.pdf.restoreGraphicsState();}}}else{// This text is the last element of the page, but it got cut off due to the margin
+   */var drawArc=function drawArc(x,y,r,a1,a2,counterclockwise,style,isClip){var curves=createArc.call(this,r,a1,a2,counterclockwise);for(var i=0;i<curves.length;i++){var curve=curves[i];if(i===0){doMove.call(this,curve.x1+x,curve.y1+y);}drawCurve.call(this,x,y,curve.x2,curve.y2,curve.x3,curve.y3,curve.x4,curve.y4);}if(!isClip){putStyle.call(this,style);}else{doClip.call(this);}};var putStyle=function putStyle(style){switch(style){case"stroke":this.pdf.internal.out("S");break;case"fill":this.pdf.internal.out("f");break;}};var doClip=function doClip(){this.pdf.clip();this.pdf.discardPath();};var doMove=function doMove(x,y){this.pdf.internal.out(getHorizontalCoordinateString(x)+" "+getVerticalCoordinateString(y)+" m");};var putText=function putText(options){var textAlign;switch(options.align){case"right":case"end":textAlign="right";break;case"center":textAlign="center";break;case"left":case"start":default:textAlign="left";break;}var textDimensions=this.pdf.getTextDimensions(options.text);var yBaseLine=getBaseline.call(this,options.y);var yBottom=getTextBottom.call(this,yBaseLine);var yTop=yBottom-textDimensions.h;var pt=this.ctx.transform.applyToPoint(new Point(options.x,yBaseLine));var decomposedTransformationMatrix=this.ctx.transform.decompose();var matrix=new Matrix();matrix=matrix.multiply(decomposedTransformationMatrix.translate);matrix=matrix.multiply(decomposedTransformationMatrix.skew);matrix=matrix.multiply(decomposedTransformationMatrix.scale);var baselineRect=this.ctx.transform.applyToRectangle(new Rectangle(options.x,yBaseLine,textDimensions.w,textDimensions.h));var textBounds=matrix.applyToRectangle(new Rectangle(options.x,yTop,textDimensions.w,textDimensions.h));var pageArray=getPagesByPath.call(this,textBounds);var pages=[];for(var ii=0;ii<pageArray.length;ii+=1){if(pages.indexOf(pageArray[ii])===-1){pages.push(pageArray[ii]);}}sortPages(pages);var clipPath,oldSize,oldLineWidth;options.text=options.text.replace(/[\t]/g,' ');// 自定义修改 修复打印不了tab键的问题
+if(this.autoPaging){var min=pages[0];var max=pages[pages.length-1];for(var i=min;i<max+1;i++){this.pdf.setPage(i);var topMargin=i===1?this.posY+this.margin[0]:this.margin[0];var firstPageHeight=this.pdf.internal.pageSize.height-this.posY-this.margin[0]-this.margin[2];var pageHeightMinusBottomMargin=this.pdf.internal.pageSize.height-this.margin[2];var pageHeightMinusMargins=pageHeightMinusBottomMargin-this.margin[0];var pageWidthMinusRightMargin=this.pdf.internal.pageSize.width-this.margin[1];var pageWidthMinusMargins=pageWidthMinusRightMargin-this.margin[3];var previousPageHeightSum=i===1?0:firstPageHeight+(i-2)*pageHeightMinusMargins;var acharSpace=options.charSpace?parseFloat(options.charSpace):0.0;//自定义修改
+if(this.ctx.clip_path.length!==0){var tmpPaths=this.path;clipPath=JSON.parse(JSON.stringify(this.ctx.clip_path));this.path=pathPositionRedo(clipPath,this.posX+this.margin[3],-1*previousPageHeightSum+topMargin);drawPaths.call(this,"fill",true);this.path=tmpPaths;}var textBoundsOnPage=pathPositionRedo([JSON.parse(JSON.stringify(textBounds))],this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset)[0];if(options.scale>=0.01){oldSize=this.pdf.internal.getFontSize();this.pdf.setFontSize(oldSize*options.scale);oldLineWidth=this.lineWidth;this.lineWidth=oldLineWidth*options.scale;}var doSlice=this.autoPaging!=="text";if(doSlice||textBoundsOnPage.y+textBoundsOnPage.h<=pageHeightMinusBottomMargin){if(doSlice||textBoundsOnPage.y>=topMargin&&textBoundsOnPage.x<=pageWidthMinusRightMargin){var croppedText=doSlice?options.text:this.pdf.splitTextToSize(options.text,options.maxWidth||pageWidthMinusRightMargin-textBoundsOnPage.x)[0];var baseLineRectOnPage=pathPositionRedo([JSON.parse(JSON.stringify(baselineRect))],this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset)[0];var needsClipping=doSlice&&(i>min||i<max)&&hasMargins.call(this);if(needsClipping){this.pdf.saveGraphicsState();this.pdf.rect(this.margin[3],this.margin[0],pageWidthMinusMargins,pageHeightMinusMargins,null).clip().discardPath();}this.pdf.text(croppedText,baseLineRectOnPage.x,baseLineRectOnPage.y,{angle:options.angle,align:textAlign,renderingMode:options.renderingMode,charSpace:acharSpace// 自定义修改
+});if(needsClipping){this.pdf.restoreGraphicsState();}}}else{// This text is the last element of the page, but it got cut off due to the margin
 // so we render it in the next page
 if(textBoundsOnPage.y<pageHeightMinusBottomMargin){// As a result, all other elements have their y offset increased
-this.ctx.prevPageLastElemOffset+=pageHeightMinusBottomMargin-textBoundsOnPage.y;}}if(options.scale>=0.01){this.pdf.setFontSize(oldSize);this.lineWidth=oldLineWidth;}}}else{if(options.scale>=0.01){oldSize=this.pdf.internal.getFontSize();this.pdf.setFontSize(oldSize*options.scale);oldLineWidth=this.lineWidth;this.lineWidth=oldLineWidth*options.scale;}// console.log("options.text",options.text);
+this.ctx.prevPageLastElemOffset+=pageHeightMinusBottomMargin-textBoundsOnPage.y;}}if(options.scale>=0.01){this.pdf.setFontSize(oldSize);this.lineWidth=oldLineWidth;}}}else{if(options.scale>=0.01){oldSize=this.pdf.internal.getFontSize();this.pdf.setFontSize(oldSize*options.scale);oldLineWidth=this.lineWidth;this.lineWidth=oldLineWidth*options.scale;}// 自定义修改
 var acharSpace=options.charSpace?parseFloat(options.charSpace):0.0;this.pdf.text(options.text,pt.x+this.posX,pt.y+this.posY,{angle:options.angle,align:textAlign,renderingMode:options.renderingMode,// maxWidth: options.maxWidth,
 charSpace:acharSpace});if(options.scale>=0.01){this.pdf.setFontSize(oldSize);this.lineWidth=oldLineWidth;}}};var drawLine=function drawLine(x,y,prevX,prevY){prevX=prevX||0;prevY=prevY||0;this.pdf.internal.out(getHorizontalCoordinateString(x+prevX)+" "+getVerticalCoordinateString(y+prevY)+" l");};var drawLines=function drawLines(lines,x,y){return this.pdf.lines(lines,x,y,null,null);};var drawCurve=function drawCurve(x,y,x1,y1,x2,y2,x3,y3){this.pdf.internal.out([f2(getHorizontalCoordinate(x1+x)),f2(getVerticalCoordinate(y1+y)),f2(getHorizontalCoordinate(x2+x)),f2(getVerticalCoordinate(y2+y)),f2(getHorizontalCoordinate(x3+x)),f2(getVerticalCoordinate(y3+y)),"c"].join(" "));};/**
    * Return a array of objects that represent bezier curves which approximate the circular arc centered at the origin, from startAngle to endAngle (radians) with the specified radius.
@@ -101187,7 +101285,8 @@ var startOfLine=i;workingLen=0;while(i!==l){if(workingLen+widths_array[i]>maxLen
 // By default, for PDF, it's "point".
 var splitParagraphIntoLines=function splitParagraphIntoLines(text,maxlen,options){// at this time works only on Western scripts, ones with space char
 // separating the words. Feel free to expand.
-if(!options){options={};}var line=[],lines=[line],line_length=options.textIndent||0,separator_length=0,current_word_length=0,word,widths_array,words=text.split(""),spaceCharWidth=getCharWidthsArray.apply(this,[" ",options])[0],i,l,tmp,lineIndent;if(options.lineIndent===-1){lineIndent=words[0].length+2;}else{lineIndent=options.lineIndent||0;}if(lineIndent){var pad=Array(lineIndent).join(" "),wrds=[];words.map(function(wrd){wrd=wrd.split(/\s*\n/);if(wrd.length>1){wrds=wrds.concat(wrd.map(function(wrd,idx){return(idx&&wrd.length?"\n":"")+wrd;}));}else{wrds.push(wrd[0]);}});words=wrds;lineIndent=getStringUnitWidth.apply(this,[pad,options]);}for(i=0,l=words.length;i<l;i++){var force=0;word=words[i];if(lineIndent&&word[0]=="\n"){word=word.substr(1);force=1;}widths_array=getCharWidthsArray.apply(this,[word,options]);current_word_length=widths_array.reduce(function(pv,cv){return pv+cv;},0);if(line_length+separator_length+current_word_length>maxlen||force){if(current_word_length>maxlen){// this happens when you have space-less long URLs for example.
+if(!options){options={};}// 自定义修改 字符间距 split(" ") ==> split("")
+var line=[],lines=[line],line_length=options.textIndent||0,separator_length=0,current_word_length=0,word,widths_array,words=text.split(""),spaceCharWidth=getCharWidthsArray.apply(this,[" ",options])[0],i,l,tmp,lineIndent;if(options.lineIndent===-1){lineIndent=words[0].length+2;}else{lineIndent=options.lineIndent||0;}if(lineIndent){var pad=Array(lineIndent).join(" "),wrds=[];words.map(function(wrd){wrd=wrd.split(/\s*\n/);if(wrd.length>1){wrds=wrds.concat(wrd.map(function(wrd,idx){return(idx&&wrd.length?"\n":"")+wrd;}));}else{wrds.push(wrd[0]);}});words=wrds;lineIndent=getStringUnitWidth.apply(this,[pad,options]);}for(i=0,l=words.length;i<l;i++){var force=0;word=words[i];if(lineIndent&&word[0]=="\n"){word=word.substr(1);force=1;}widths_array=getCharWidthsArray.apply(this,[word,options]);current_word_length=widths_array.reduce(function(pv,cv){return pv+cv;},0);if(line_length+separator_length+current_word_length>maxlen||force){if(current_word_length>maxlen){// this happens when you have space-less long URLs for example.
 // we just chop these to size. We do NOT insert hiphens
 tmp=splitLongWord.apply(this,[word,widths_array,maxlen-(line_length+separator_length),maxlen]);// first line we add to existing line object
 line.push(tmp.shift());// it's ok to have extra space indicator there
@@ -199003,7 +199102,7 @@ var es_function_name = __webpack_require__(68309);
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__(13797);
 var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
-;// 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/HoDocs.vue?vue&type=template&id=08a395d8&
+;// 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/HoDocs.vue?vue&type=template&id=78774540&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.hoEditorFactoryIdList.length > 0)?_c('div',{staticClass:"ho-docs"},[_c('section',{class:_vm.defaultEditJson.isFooter ? 'ho-editor-list' : 'ho-editor-list editor-no-footer',on:{"contextmenu":function($event){return _vm.blankAreaRightClick.apply(null, arguments)}}},[_vm._l((_vm.hoEditorFactoryIdList),function(hoEditorId,index){return [_c('HoDoc',{key:index,attrs:{"docIndex":index,"hoEditorId":hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"activeDocId":_vm.activeDocId,"editJson":_vm.defaultEditJson,"isUseTipText":_vm.isUseTipText,"textStyle":_vm.textStyle},on:{"dblNodeClick":_vm.dblNodeClick,"setFontStyles":_vm.setFontStyles,"rightClickEvent":_vm.rightClickEvent,"setActiveDocIndex":_vm.setActiveDocIndex,"setActivePageIndex":_vm.setActivePageIndex,"drawPagesLengthChange":_vm.drawPagesLengthChange},scopedSlots:_vm._u([{key:"hoDocHead",fn:function(){return [_vm._t("hoHead")]},proxy:true},{key:"hoDocFoot",fn:function(){return [_vm._t("hoFoot")]},proxy:true}],null,true)})]})],2),(_vm.notUseModal)?_c('ControlModal',{attrs:{"hoEditorFactoryId":_vm.activeDocId,"controlProperty":_vm.controlProperty,"isDataSource":_vm.isDataSource,"isCustoms":_vm.isCustoms,"isTableProperty":_vm.isTableProperty,"isListStyle":_vm.isListStyle,"uploadImageParams":_vm.uploadImageParams},on:{"insertComments":_vm.insertComments,"closeControlmodal":_vm.closeControlModal},scopedSlots:_vm._u([{key:"hoTextModal",fn:function(){return [_vm._t("hoTextField")]},proxy:true},{key:"hoComment",fn:function(){return [_vm._t("hoTextComment")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlFindType)?_c('FindReplaceDialog',{attrs:{"hoEditorFactoryId":_vm.activeDocId}}):_vm._e(),(_vm.defaultEditJson.isFooter)?_c('HoFooter',{attrs:{"docProperty":_vm.defaultDocProperty,"hoEditorFactoryId":_vm.activeDocId,"drawPages":_vm.drawPageLength,"currentActivePages":_vm.activePageIndex}}):_vm._e(),_c('ViewContinuousXml',{attrs:{"hoEditorFactoryId":_vm.activeDocId}})],1):_vm._e()}
 var staticRenderFns = []
 
@@ -206986,7 +207085,7 @@ var SignNode = __webpack_require__(34450);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(14208);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('2.0.58');
+/* harmony default export */ var version = ('2.0.61');
 ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperTipText/PoperTipText.vue?vue&type=template&id=3fa4e4d3&scoped=true&
 var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.isShow),expression:"isShow"},{name:"click-outside",rawName:"v-click-outside",value:(_vm.handleClose),expression:"handleClose"}],ref:"poperTextNode",staticClass:"poper-text-modal animation-in",style:(_vm.posStyle),on:{"mouseenter":_vm.mouseEnter,"mouseleave":_vm.mouseLeave}},_vm._l((_vm.poperText),function(text){return _c('div',{key:text + Math.random(0, 1),staticClass:"poper-text"},[_vm._v(" "+_vm._s(text)+" ")])}),0)}
 var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_staticRenderFns = []
@@ -209142,9 +209241,7 @@ var DrawPageTree = /*#__PURE__*/function () {
           }
 
           if (dPage.drawDomLevel && dPage.drawDomLevel.stage) {
-            {
-              dPage.drawDomLevel.clearStage();
-            }
+            dPage.drawDomLevel.clearStage();
           }
         }
       }
@@ -214654,6 +214751,7 @@ var StagePosition = __webpack_require__(57674);
 
 
 
+
 
 
 var VueController = /*#__PURE__*/function () {
@@ -220476,6 +220574,44 @@ var VueController = /*#__PURE__*/function () {
       hoEditorFactory.docTree.curDomRange = newRange;
       hoEditorFactory.drawTree.moveCaretToPath(curDomRange.startPath);
     }
+    /**
+     * 查询光标所在位置之前的文本内容
+     */
+
+  }, {
+    key: "getCaretPreviousTextNode",
+    value: function getCaretPreviousTextNode() {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      var curDomRange = hoEditorFactory.docTree.curDomRange.normalize();
+      var node = curDomRange.npEnd.node;
+      var text = "";
+
+      var getText = function getText(previousNode) {
+        if (previousNode instanceof TextNode/* TextNode */.R || previousNode instanceof LabelNode/* LabelNode */.P || previousNode instanceof DownListNode/* DownListNode */.yF) {
+          return previousNode.text;
+        } else if ((previousNode === null || previousNode === void 0 ? void 0 : previousNode.parentNode) instanceof TextInputFieldNode/* TextInputFieldNode */.re && (previousNode === null || previousNode === void 0 ? void 0 : previousNode.parentNode.inputFieldType) === TextInputFieldNode/* InputFieldType.dropDownList */.Zi.dropDownList) {
+          return previousNode === null || previousNode === void 0 ? void 0 : previousNode.parentNode.text;
+        }
+      };
+
+      if (node instanceof TextNode/* TextNode */.R && !(node instanceof TextInputFieldNode/* TextInputFieldNode */.re)) {
+        if (node.text) {
+          text = node.text;
+        } else {
+          text = getText(node.previousLeaf());
+        }
+      } else if ((node === null || node === void 0 ? void 0 : node.parentNode) instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
+        text = getText(node.parentNode.previousLeaf());
+
+        if (!text) {
+          text = getText(node.previousLeaf());
+        }
+      } else if (node instanceof SignNode/* SignNode */.N && node.type !== 3) {
+        text = getText(node.previousLeaf());
+      }
+
+      return text;
+    }
     /**
      * 初始化文档
      */
@@ -220716,6 +220852,11 @@ var VueController = /*#__PURE__*/function () {
       node.imageDataBase64String = src;
       hoEditorFactory.docTree.change(changeEvent);
     }
+  }, {
+    key: "setParaCustomProperty",
+    value: function setParaCustomProperty(paragraphNode, customProperty) {
+      paragraphNode.setCustomProperty(customProperty);
+    }
   }]);
 
   return VueController;
@@ -222778,7 +222919,7 @@ var PrintController = /*#__PURE__*/function () {
                 beforePrintStatus = hoEditorFactory.drawTree.paintStatus;
                 xml = hoEditorFactory.vueController.getDocXml(true);
                 htmlText = {
-                  text: ""
+                  text: ''
                 };
                 hPromise = Promise.resolve();
                 hPromise = hPromise.then(function () {
@@ -222849,12 +222990,14 @@ var PrintController = /*#__PURE__*/function () {
                 path = hoEditorFactory.docTree.curDomRange.normalize().endPath;
                 beforePrintStatus = hoEditorFactory.drawTree.paintStatus;
                 xml = hoEditorFactory.vueController.getDocXml(true);
-                orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? "l" : "p";
+                orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? 'l' : 'p';
                 format = [hoEditorFactory.pageProperty.widthPixes, hoEditorFactory.pageProperty.heightPixes];
                 options = {
                   orientation: orientation,
-                  unit: "px",
-                  format: format
+                  unit: 'px',
+                  format: format,
+                  hotfixes: ['px_scaling'],
+                  compress: true
                 };
                 PDF = new jspdf/* default */.ZP(options);
                 hPromise = Promise.resolve();
@@ -222877,7 +223020,7 @@ var PrintController = /*#__PURE__*/function () {
                   hoEditorFactory.vueController.openXml(xml);
                   PDF.deletePage(1);
                   return new Promise(function (resolves) {
-                    resolves(PDF.output("datauristring"));
+                    resolves(PDF.output('datauristring'));
                   });
                 });
 
@@ -222892,7 +223035,7 @@ var PrintController = /*#__PURE__*/function () {
                 setTimeout(function () {
                   hoEditorFactory.vueController.moveCaretToPath(path);
                 }, 0);
-                return _context2.abrupt("return", base64.replace(/^data:application\/pdf;filename=generated.pdf;base64,/, ""));
+                return _context2.abrupt("return", base64.replace(/^data:application\/pdf;filename=generated.pdf;base64,/, ''));
 
               case 20:
                 return _context2.abrupt("return", null);
@@ -222919,10 +223062,10 @@ var PrintController = /*#__PURE__*/function () {
   }, {
     key: "setjsPDFFonts",
     value: function setjsPDFFonts(font) {
-      jspdf/* default.API.events.push */.ZP.API.events.push(["addFonts", function () {
-        this.addFileToVFS("SimSun-normal.ttf", font);
-        this.addFont("SimSun-normal.ttf", "SimSun", "normal");
-        this.setFont("SimSun", "normal");
+      jspdf/* default.API.events.push */.ZP.API.events.push(['addFonts', function () {
+        this.addFileToVFS('SimSun-normal.ttf', font);
+        this.addFont('SimSun-normal.ttf', 'SimSun', 'normal');
+        this.setFont('SimSun', 'normal');
       }]);
       this._isSetFont = true;
 
@@ -222953,8 +223096,8 @@ var PrintController = /*#__PURE__*/function () {
         return;
       }
 
-      var fileType = type ? type : "pdf";
-      var fileName = pdfName ? pdfName : hoEditorFactory.vueController.getDocTitle() ? hoEditorFactory.vueController.getDocTitle() : "电子病历文档"; // 保存打印前文档状态 和 内容
+      var fileType = type ? type : 'pdf';
+      var fileName = pdfName ? pdfName : hoEditorFactory.vueController.getDocTitle() ? hoEditorFactory.vueController.getDocTitle() : '电子病历文档'; // 保存打印前文档状态 和 内容
 
       var beforePrintStatus = hoEditorFactory.drawTree.paintStatus;
       var xml = hoEditorFactory.vueController.getDocXml(true);
@@ -222968,21 +223111,21 @@ var PrintController = /*#__PURE__*/function () {
       });
       hPromise = hPromise.then(function () {
         return new Promise(function (resolve) {
-          var orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? "l" : "p";
+          var orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? 'l' : 'p';
           var format = [hoEditorFactory.pageProperty.widthPixes, hoEditorFactory.pageProperty.heightPixes];
 
-          if (hoEditorFactory.isFixedPrintToA4 && isSpecial) {
+          if (hoEditorFactory.isFixedPrintToA4 == '1' && isSpecial) {
             format = _this3._a4Size[orientation];
           }
 
-          if (hoEditorFactory.isFixedPrintToA4T && hoEditorFactory.pageProperty.pageSize.toLocaleLowerCase() == 'a5') {
+          if (hoEditorFactory.isFixedPrintToA4 == '2' && hoEditorFactory.pageProperty.pageSize.toLocaleLowerCase() == 'a5') {
             format = [793, 1122];
             orientation = 'p';
           }
 
           var options = {
             orientation: orientation,
-            unit: "px",
+            unit: 'px',
             format: format
           };
           // const PDF = new jsPDF(orientation, "px", [hoEditorFactory.pageProperty.widthMm, hoEditorFactory.pageProperty.heightMm], false, true, );
@@ -223012,14 +223155,20 @@ var PrintController = /*#__PURE__*/function () {
 
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var beforeStatus = hoEditorFactory.drawTree.paintStatus;
+      var xml = "";
+
+      if (hoEditorFactory.printStatus.printRange !== 2) {
+        xml = hoEditorFactory.vueController.getDocXml(true, true);
+      }
+
       hoEditorFactory.startPageNum = 0;
       hoEditorFactory.firstPageStartTop = 0;
 
       if (!this._isSetFont) {
         this._waitPrint = true;
 
-        message_box_default().alert("<p>\u6253\u5370\u6240\u9700\u6587\u4EF6\u6B63\u5728\u52A0\u8F7D\u4E2D\uFF0C\u8BF7\u7A0D\u5019</p><p>\u52A0\u8F7D\u5B8C\u6210\u540E\u4F1A\u81EA\u52A8\u8FDB\u884C\u6253\u5370</p>", "提示", {
-          iconClass: "el-icon-loading",
+        message_box_default().alert("<p>\u6253\u5370\u6240\u9700\u6587\u4EF6\u6B63\u5728\u52A0\u8F7D\u4E2D\uFF0C\u8BF7\u7A0D\u5019</p><p>\u52A0\u8F7D\u5B8C\u6210\u540E\u4F1A\u81EA\u52A8\u8FDB\u884C\u6253\u5370</p>", '提示', {
+          iconClass: 'el-icon-loading',
           center: true,
           showConfirmButton: false,
           dangerouslyUseHTMLString: true
@@ -223033,12 +223182,12 @@ var PrintController = /*#__PURE__*/function () {
       }
 
       if (printMode && printAppoint) {
-        var appoint = printAppoint.replace(/\s*/g, "").replace(/[^\d]/g, ",").split(",");
+        var appoint = printAppoint.replace(/\s*/g, '').replace(/[^\d]/g, ',').split(',');
         var maxLen = hoEditorFactory.drawTree.drawPages.length;
         var error = appoint.filter(function (pages) {
           return pages && Number(pages) > maxLen;
         });
-        if (error.length > 0) return "指定页输入超出文档页范围";
+        if (error.length > 0) return '指定页输入超出文档页范围';
       }
 
       var setStatus = new Promise( /*#__PURE__*/function () {
@@ -223083,23 +223232,23 @@ var PrintController = /*#__PURE__*/function () {
       setStatus.then(function (res) {
         if (res) {
           return new Promise(function (reslove, reject) {
-            var orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? "l" : "p";
+            var orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? 'l' : 'p';
             var format = [hoEditorFactory.pageProperty.widthPixes, hoEditorFactory.pageProperty.heightPixes];
 
-            if (hoEditorFactory.isFixedPrintToA4) {
+            if (hoEditorFactory.isFixedPrintToA4 == '1') {
               format = _this4._a4Size[orientation];
             }
 
-            if (hoEditorFactory.isFixedPrintToA4T && hoEditorFactory.pageProperty.pageSize.toLocaleLowerCase() == 'a5') {
+            if (hoEditorFactory.isFixedPrintToA4 == '2' && hoEditorFactory.pageProperty.pageSize.toLocaleLowerCase() == 'a5') {
               format = [793, 1122];
               orientation = 'p';
             }
 
             var options = {
               orientation: orientation,
-              unit: "px",
+              unit: 'px',
               format: format,
-              hotfixes: ["px_scaling"],
+              hotfixes: ['px_scaling'],
               compress: true
             };
             var PDF = new jspdf/* default */.ZP(options);
@@ -223107,20 +223256,26 @@ var PrintController = /*#__PURE__*/function () {
           });
         }
       }).then(function (res) {
-        if (res === "printend") {
+        if (res === 'printend') {
           if (callback) {
             callback(hoEditorFactory.printStatus.printRecord.last());
           }
 
-          hoEditorFactory.drawTree.paintStatus = beforeStatus;
-          hoEditorFactory.printStatus.printRange = 2;
           hoEditorFactory.printStatus.printAppoint = '';
           hoEditorFactory.printStatus.drawPrintRecord.Position = [0, 0];
           hoEditorFactory.startPageNum = 0;
           hoEditorFactory.firstPageStartTop = 0;
-          hoEditorFactory.printStatus.clearArea();
-          hoEditorFactory.printStatus.drawPrintRecord.clear();
-          hoEditorFactory.drawTree.rebuildAllDrawLine(false);
+
+          if (hoEditorFactory.printStatus.printRange !== 2) {
+            hoEditorFactory.printStatus.printRange = 2;
+            hoEditorFactory.drawTree.paintStatus = 5;
+            hoEditorFactory.vueController.openXml(xml);
+          } else {
+            hoEditorFactory.drawTree.paintStatus = beforeStatus;
+            hoEditorFactory.printStatus.clearArea();
+            hoEditorFactory.printStatus.drawPrintRecord.clear();
+            hoEditorFactory.vueController.rebuildAll(true);
+          }
         }
       });
     }
@@ -223188,7 +223343,7 @@ var PrintController = /*#__PURE__*/function () {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
-                console.time("连续打印总用时");
+                console.time('连续打印总用时');
                 list = [];
                 xmlInfoes.xmlList.forEach(function (v) {
                   list.push([v.isMerge, v.xml]);
@@ -223207,7 +223362,7 @@ var PrintController = /*#__PURE__*/function () {
                 hoEditorFactory.printStatus.printMode = 0;
                 hoEditorFactory.drawTree.paintStatus = DrawTree/* PaintState.psPreview */.Dh.psPreview;
                 hPromise = Promise.resolve();
-                console.time("连续查看病历合并总用时");
+                console.time('连续查看病历合并总用时');
                 hPromise = hPromise.then(function (res) {
                   return new Promise(function (resolve) {
                     Promise.all([hoEditorFactory.vueController.openDocsForPrint(list)]).then(function () {
@@ -223221,8 +223376,8 @@ var PrintController = /*#__PURE__*/function () {
                   });
                 });
                 hPromise = hPromise.then(function () {
-                  console.timeEnd("连续查看病历合并总用时");
-                  console.time("生成pdf用时");
+                  console.timeEnd('连续查看病历合并总用时');
+                  console.time('生成pdf用时');
                   return new Promise( /*#__PURE__*/function () {
                     var _ref2 = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee4(resolve) {
                       var orientation, format, options, PDF;
@@ -223230,23 +223385,23 @@ var PrintController = /*#__PURE__*/function () {
                         while (1) {
                           switch (_context4.prev = _context4.next) {
                             case 0:
-                              orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? "l" : "p";
+                              orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? 'l' : 'p';
                               format = [hoEditorFactory.pageProperty.widthPixes, hoEditorFactory.pageProperty.heightPixes];
 
-                              if (hoEditorFactory.isFixedPrintToA4) {
+                              if (hoEditorFactory.isFixedPrintToA4 == '1') {
                                 format = _this5._a4Size[orientation];
                               }
 
-                              if (hoEditorFactory.isFixedPrintToA4T && hoEditorFactory.pageProperty.pageSize.toLocaleLowerCase() == 'a5') {
+                              if (hoEditorFactory.isFixedPrintToA4 == '2' && hoEditorFactory.pageProperty.pageSize.toLocaleLowerCase() == 'a5') {
                                 format = [793, 1122];
                                 orientation = 'p';
                               }
 
                               options = {
                                 orientation: orientation,
-                                unit: "px",
+                                unit: 'px',
                                 format: format,
-                                hotfixes: ["px_scaling"]
+                                hotfixes: ['px_scaling']
                               };
                               PDF = new jspdf/* default */.ZP(options);
                               PrintStatus/* Print.printToPDF */.Kh.printToPDF(_this5._hoEditorFactoryID, PDF, undefined, undefined, resolve, positionY, format);
@@ -223267,7 +223422,7 @@ var PrintController = /*#__PURE__*/function () {
                 _context5.next = 17;
                 return hPromise.then(function (res) {
                   if (res) {
-                    console.timeEnd("生成pdf用时");
+                    console.timeEnd('生成pdf用时');
                     return new Promise(function (resolves) {
                       var last = hoEditorFactory.printStatus.printRecord.last();
                       var pos;
@@ -223302,7 +223457,7 @@ var PrintController = /*#__PURE__*/function () {
                       // 	hoEditorFactory.drawTree.rebuildAllDrawLine(false);
                       // }, 0);
 
-                      console.timeEnd("连续打印总用时");
+                      console.timeEnd('连续打印总用时');
                       resolves(pos);
                     });
                   } else {
@@ -223318,7 +223473,7 @@ var PrintController = /*#__PURE__*/function () {
                     // 	hoEditorFactory.drawTree.rebuildAllDrawLine(false);
                     // }, 0);
 
-                    console.timeEnd("连续打印总用时");
+                    console.timeEnd('连续打印总用时');
                     return null;
                   }
                 });
@@ -223356,7 +223511,7 @@ var PrintController = /*#__PURE__*/function () {
     }()
     /**
      * 批量打印病历 当前
-     * @param xmlList [boolean, string, boolean, boolean][]
+     * @param xmlList [string, boolean, string, boolean][]
      * 四个参数分别是： xml内容  是否合并 病程记录id：用来判断是否是病程记录和返回对应病程记录的坐标(处理多个不同病程记录的情况)  是否是最后一份病程记录
      */
 
@@ -223380,8 +223535,8 @@ var PrintController = /*#__PURE__*/function () {
                 xmlIndex = -1;
                 mergeList = [];
                 options = {
-                  unit: "px",
-                  hotfixes: ["px_scaling"],
+                  unit: 'px',
+                  hotfixes: ['px_scaling'],
                   compress: true
                 };
                 PDF = new jspdf/* default */.ZP(options);
@@ -223465,7 +223620,7 @@ var PrintController = /*#__PURE__*/function () {
                               hoEditorFactory.drawTree.paintStatus = beforePrintStatus;
                               hoEditorFactory.vueController.openXml(xml);
                               PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
-                              name = hoEditorFactory.vueController.getDocTitle() ? hoEditorFactory.vueController.getDocTitle() : "电子病历文档";
+                              name = hoEditorFactory.vueController.getDocTitle() ? hoEditorFactory.vueController.getDocTitle() : '电子病历文档';
                               PrintStatus/* Print.openDataUriInWindow */.Kh.openDataUriInWindow(PDF, name, hoEditorFactory.pageProperty.widthPixes);
                             }
 
@@ -224376,6 +224531,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
     this._lastSaveTime = new Date(Date.now());
     this._superiorSigns = []; //上级医生签名
 
+    this._isEnabledGlobalColor = false;
     this._hoEditorFactoryId = id;
   }
   /**
@@ -225034,13 +225190,13 @@ var HOEditorFactory = /*#__PURE__*/function () {
       }
     }
   }, {
-    key: "isFixedPrintToA4T",
+    key: "isRotate",
     get: function get() {
-      return this._isFixedPrintToA4T;
+      return this._isRotate;
     },
     set: function set(value) {
-      if (this._isFixedPrintToA4T !== value) {
-        this._isFixedPrintToA4T = value;
+      if (this._isRotate !== value) {
+        this._isRotate = value;
       }
     }
   }, {
@@ -225073,6 +225229,16 @@ var HOEditorFactory = /*#__PURE__*/function () {
         this._printBlack = value;
       }
     }
+  }, {
+    key: "isEnabledGlobalColor",
+    get: function get() {
+      return this._isEnabledGlobalColor;
+    },
+    set: function set(value) {
+      if (this._isEnabledGlobalColor !== value) {
+        this._isEnabledGlobalColor = value;
+      }
+    }
   }, {
     key: "clear",
     value: function clear() {
@@ -232596,14 +232762,14 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
     _this.defaultDocProperty = {
       version: version,
       type: 0,
-      title: "",
-      docID: "",
-      patientID: "",
-      patientName: "",
-      lastEditTime: "",
-      lastEditorID: "",
-      lastEditorName: "",
-      currentIP: ""
+      title: '',
+      docID: '',
+      patientID: '',
+      patientName: '',
+      lastEditTime: '',
+      lastEditorID: '',
+      lastEditorName: '',
+      currentIP: ''
     };
     _this.contentIsModify = {
       isModify: false
@@ -232619,7 +232785,7 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
   }, {
     key: "contentIsModifyChange",
     value: function contentIsModifyChange(value) {
-      this.$emit("contentIsModify", this.contentIsModify);
+      this.$emit('contentIsModify', this.contentIsModify);
     }
   }, {
     key: "editJsonChange",
@@ -232636,12 +232802,12 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
   }, {
     key: "textStyleChange",
     value: function textStyleChange(val) {
-      this.$emit("textStyleChange", val);
+      this.$emit('textStyleChange', val);
     }
   }, {
     key: "modalStatusChange",
     value: function modalStatusChange(newStr) {
-      if (newStr[0] !== "find") {
+      if (newStr[0] !== 'find') {
         this.setControlProperty(newStr[0], newStr[1], newStr[2]);
       } else {
         this.controlFindType = true;
@@ -232650,20 +232816,20 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
   }, {
     key: "controlTypeChange",
     value: function controlTypeChange(newValue, oldValue) {
-      if (newValue === "" && ['text', 'date', 'comment'].includes(oldValue)) {
-        this.$emit("closeTextModal");
+      if (newValue === '' && ['text', 'date', 'comment'].includes(oldValue)) {
+        this.$emit('closeTextModal');
         this.customPropertyValue = {};
       }
 
       if (['text', 'date'].includes(newValue)) {
         if ((0,type/* isObject */.Kn)(this.customPropertyValue)) {
-          this.$emit("openTextModal", _objectSpread2({}, this.customPropertyValue));
+          this.$emit('openTextModal', _objectSpread2({}, this.customPropertyValue));
         }
       } else if (['comment'].includes(newValue)) {
         var _HOEditorFactorys$ins;
 
         var customProperty = (_HOEditorFactorys$ins = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.activeDocId).vueController.getOnSelectedComment()) === null || _HOEditorFactorys$ins === void 0 ? void 0 : _HOEditorFactorys$ins.customProperty;
-        if (customProperty) this.$emit("openTextModal", _objectSpread2({}, customProperty));
+        if (customProperty) this.$emit('openTextModal', _objectSpread2({}, customProperty));
       }
     }
   }, {
@@ -232695,14 +232861,15 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
     value: function isFixedPrintToA4Change() {
       var activeDocId = this.activeDocId ? this.activeDocId : this.hoEditorFactoryIdList[0];
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().hoEditorFactoryMap.get(activeDocId);
-      hoEditorFactory && (hoEditorFactory.isFixedPrintToA4 = this.isFixedPrintToA4);
-    }
-  }, {
-    key: "isFixedPrintToA4TChange",
-    value: function isFixedPrintToA4TChange() {
-      var activeDocId = this.activeDocId ? this.activeDocId : this.hoEditorFactoryIdList[0];
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().hoEditorFactoryMap.get(activeDocId);
-      hoEditorFactory && (hoEditorFactory.isFixedPrintToA4T = this.isFixedPrintToA4T);
+      var isFixedPrintToA4 = this.isFixedPrintToA4;
+
+      if (isFixedPrintToA4 === true) {
+        isFixedPrintToA4 = '1';
+      } else if (isFixedPrintToA4 === false) {
+        isFixedPrintToA4 = '';
+      }
+
+      hoEditorFactory && (hoEditorFactory.isFixedPrintToA4 = isFixedPrintToA4);
     } // 监听默认打印纸张设置变化
 
   }, {
@@ -232746,6 +232913,13 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().hoEditorFactoryMap.get(activeDocId);
       hoEditorFactory && (hoEditorFactory.printBlack = this.printBlack);
     }
+  }, {
+    key: "isEnabledGlobalColorChange",
+    value: function isEnabledGlobalColorChange() {
+      var activeDocId = this.activeDocId ? this.activeDocId : this.hoEditorFactoryIdList[0];
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().hoEditorFactoryMap.get(activeDocId);
+      hoEditorFactory && (hoEditorFactory.isEnabledGlobalColor = this.isEnabledGlobalColor);
+    }
   }, {
     key: "created",
     value: function created() {
@@ -232776,7 +232950,7 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
       }); // 初始化所有文档
 
       this.docList.forEach(function () {
-        var id = (0,util/* generateID */.y)("HO");
+        var id = (0,util/* generateID */.y)('HO');
         var hoEditor = new HOEditorFactory(id);
 
         _this3.hoEditorFactoryIdList.push(id);
@@ -232785,11 +232959,18 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
           hoEditor.superiorSigns = (0,toConsumableArray/* default */.Z)(_this3.superiorSigns);
         }
 
-        hoEditor.isFixedPrintToA4 = _this3.isFixedPrintToA4;
-        hoEditor.isFixedPrintToA4T = _this3.isFixedPrintToA4T;
+        if (_this3.isFixedPrintToA4 === true) {
+          hoEditor.isFixedPrintToA4 = '1';
+        } else if (_this3.isFixedPrintToA4 === false) {
+          hoEditor.isFixedPrintToA4 = '';
+        } else {
+          hoEditor.isFixedPrintToA4 = _this3.isFixedPrintToA4;
+        }
+
         hoEditor.isUseImagePrint = _this3.isUseImagePrint;
         hoEditor.isUseForm = _this3.isUseForm;
         hoEditor.printBlack = _this3.printBlack;
+        hoEditor.isEnabledGlobalColor = _this3.isEnabledGlobalColor;
         hoEditor.contentIsModify = _this3.contentIsModify;
         hoEditor.isCanEditHeadFoot = _this3.isCanEditHeadFoot;
         hoEditor.docTree.docProperty = _this3.defaultDocProperty;
@@ -232820,17 +233001,17 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
 
       var getLabelNode = function getLabelNode() {
         var labelNode = [];
-        var isIncludes = "";
+        var isIncludes = '';
         var hoEditor = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(_this4.activeDocId);
         var currentDomRange = hoEditor.vueController.getDomRange();
 
         if (currentDomRange !== null && currentDomRange !== void 0 && currentDomRange.isEmpty) {
           if (nodeInfoes.node() instanceof LabelNode/* LabelNode */.P) {
             labelNode.push(nodeInfoes.node());
-            isIncludes = "toText";
+            isIncludes = 'toText';
           }
         } else {
-          isIncludes = "toLabel";
+          isIncludes = 'toLabel';
           var startPath = currentDomRange.startPath;
           var endPath = currentDomRange.endPath;
           var selectNodes = DomRange/* DomRange.getSelectDomNodes */.a.getSelectDomNodes(_this4.activeDocId, startPath, endPath, true)[0];
@@ -232838,7 +233019,7 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
           if (selectNodes.length > 0) {
             selectNodes.forEach(function (v) {
               if (v instanceof LabelNode/* LabelNode */.P) {
-                isIncludes = "toText";
+                isIncludes = 'toText';
                 labelNode.push(v);
               }
             });
@@ -232877,7 +233058,7 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
         };
       }
 
-      this.$emit("rightClickEvent", nodeInfoes);
+      this.$emit('rightClickEvent', nodeInfoes);
     }
     /**
      * 初始化事件
@@ -232919,7 +233100,7 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
   }, {
     key: "insertComments",
     value: function insertComments(content) {
-      this.$emit("insertComments", content);
+      this.$emit('insertComments', content);
     }
     /**
      * 双击事件
@@ -232928,7 +233109,7 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
   }, {
     key: "dblNodeClick",
     value: function dblNodeClick(node) {
-      this.$emit("dblClickEvent", node);
+      this.$emit('dblClickEvent', node);
     } // 设置字体
 
   }, {
@@ -232950,7 +233131,7 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
       this.activeDocId = activeDocId;
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.activeDocId);
       hoEditorFactory.hoLocalStorage.initHoWebSql();
-      this.$emit("docReady", {
+      this.$emit('docReady', {
         vueController: hoEditorFactory.vueController,
         baseController: hoEditorFactory.baseController,
         domController: hoEditorFactory.domController,
@@ -232981,7 +233162,7 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
         var property = _objectSpread2({}, pageProperty); // 字体
 
 
-        property.fontFormat = property.fontFormat ? (_property$fontFormat = property.fontFormat) === null || _property$fontFormat === void 0 ? void 0 : _property$fontFormat.match(/[\u4e00-\u9fa5]/g).join("") : "宋体"; // 字号
+        property.fontFormat = property.fontFormat ? (_property$fontFormat = property.fontFormat) === null || _property$fontFormat === void 0 ? void 0 : _property$fontFormat.match(/[\u4e00-\u9fa5]/g).join('') : '宋体'; // 字号
 
         if (isNaN(Number(property.fontSize))) {
           json_font_namespaceObject.CH.forEach(function (v) {
@@ -233008,12 +233189,12 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
 
         if (pageProperty.elementBackColor) {
           hoEditorFactory.vueController.setReviewLevelColor({
-            reviewLev1Color: "#F19191",
-            reviewLev2Color: "#FFFFFF",
-            reviewLev3Color: "#FFFFFF",
-            fieldColor: "#DFFFFF",
-            dateTimeColor: "#FBFAD0",
-            downListColor: "#D2ECB1"
+            reviewLev1Color: '#F19191',
+            reviewLev2Color: '#FFFFFF',
+            reviewLev3Color: '#FFFFFF',
+            fieldColor: '#DFFFFF',
+            dateTimeColor: '#FBFAD0',
+            downListColor: '#D2ECB1'
           });
         } // 复制粘贴基准值
 
@@ -233084,7 +233265,7 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
   }, {
     key: "closeControlModal",
     value: function closeControlModal() {
-      this.setControlProperty("", "add", "");
+      this.setControlProperty('', 'add', '');
     }
     /**
      * 非文档区域右键事件
@@ -233093,7 +233274,7 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
   }, {
     key: "blankAreaRightClick",
     value: function blankAreaRightClick(e) {
-      if (e.target instanceof HTMLDivElement && e.target.className === "editor") {}
+      if (e.target instanceof HTMLDivElement && e.target.className === 'editor') {}
     }
   }]);
 
@@ -233131,13 +233312,9 @@ __decorate([Prop({
 })], HoDocs.prototype, "isUseTipText", void 0);
 
 __decorate([Prop({
-  default: false
+  default: ''
 })], HoDocs.prototype, "isFixedPrintToA4", void 0);
 
-__decorate([Prop({
-  default: false
-})], HoDocs.prototype, "isFixedPrintToA4T", void 0);
-
 __decorate([Prop({
   default: true
 })], HoDocs.prototype, "isUseImagePrint", void 0);
@@ -233150,58 +233327,60 @@ __decorate([Prop({
   default: true
 })], HoDocs.prototype, "printBlack", void 0);
 
-__decorate([Watch("contentIsModify", {
+__decorate([Prop({
+  default: false
+})], HoDocs.prototype, "isEnabledGlobalColor", void 0);
+
+__decorate([Watch('contentIsModify', {
   deep: true
 })], HoDocs.prototype, "contentIsModifyChange", null);
 
-__decorate([Watch("editJson")], HoDocs.prototype, "editJsonChange", null);
+__decorate([Watch('editJson')], HoDocs.prototype, "editJsonChange", null);
 
 __decorate([Provide()], HoDocs.prototype, "getCustomProperty", null);
 
-__decorate([Watch("textStyle", {
+__decorate([Watch('textStyle', {
   deep: true
 })], HoDocs.prototype, "textStyleChange", null);
 
-__decorate([Watch("modalStatus", {
+__decorate([Watch('modalStatus', {
   deep: true
 })], HoDocs.prototype, "modalStatusChange", null);
 
-__decorate([Watch("controlType", {
+__decorate([Watch('controlType', {
   deep: true
 })], HoDocs.prototype, "controlTypeChange", null);
 
-__decorate([Watch("pageProperty", {
+__decorate([Watch('pageProperty', {
   deep: true
 })], HoDocs.prototype, "pagePropertyChange", null);
 
-__decorate([Watch("docProperty", {
+__decorate([Watch('docProperty', {
   deep: true
 })], HoDocs.prototype, "docPropertyChange", null);
 
-__decorate([Watch("isFixedPrintToA4", {
+__decorate([Watch('isFixedPrintToA4', {
   deep: true
 })], HoDocs.prototype, "isFixedPrintToA4Change", null);
 
-__decorate([Watch("isFixedPrintToA4T", {
-  deep: true
-})], HoDocs.prototype, "isFixedPrintToA4TChange", null);
-
-__decorate([Watch("isUseImagePrint", {
+__decorate([Watch('isUseImagePrint', {
   deep: true
 })], HoDocs.prototype, "isUseImagePrintChange", null);
 
-__decorate([Watch("isUseForm", {
+__decorate([Watch('isUseForm', {
   deep: true
 })], HoDocs.prototype, "isUseFormChange", null);
 
-__decorate([Watch("superiorSigns")], HoDocs.prototype, "superiorSignsChange", null);
+__decorate([Watch('superiorSigns')], HoDocs.prototype, "superiorSignsChange", null);
+
+__decorate([Watch('isCanEditHeadFoot')], HoDocs.prototype, "isCanEditHeadFootChange", null);
 
-__decorate([Watch("isCanEditHeadFoot")], HoDocs.prototype, "isCanEditHeadFootChange", null);
+__decorate([Watch('printBlack')], HoDocs.prototype, "printBlackChange", null);
 
-__decorate([Watch("printBlack")], HoDocs.prototype, "printBlackChange", null);
+__decorate([Watch('isEnabledGlobalColor')], HoDocs.prototype, "isEnabledGlobalColorChange", null);
 
 HoDocs = __decorate([vue_class_component_esm({
-  name: "HoDocs",
+  name: 'HoDocs',
   components: {
     HoDoc: components_HoDoc,
     HoFooter: components_HoFooter,
@@ -239031,9 +239210,9 @@ HoRightMenu = __decorate([vue_class_component_esm({
   }
 })], HoRightMenu);
 /* harmony default export */ var toolbar_HoRightMenu = (HoRightMenu);
-;// 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/view/view.vue?vue&type=template&id=3c4d2e63&
-var viewvue_type_template_id_3c4d2e63_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.hoEditorFactoryIdList.length > 0)?_c('div',{staticClass:"ho-docs",staticStyle:{"width":"1px","height":"1px"}},[_c('section',{staticClass:"ho-editor-list editor-no-footer"},[_vm._l((_vm.hoEditorFactoryIdList),function(hoEditorId,index){return [_c('PrintDoc',{key:index,attrs:{"docIndex":index,"hoEditorId":hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"activeDocId":_vm.activeDocId},on:{"setActiveDocIndex":_vm.setActiveDocIndex,"drawPagesLengthChange":_vm.drawPagesLengthChange}})]})],2)]):_vm._e()}
-var viewvue_type_template_id_3c4d2e63_staticRenderFns = []
+;// 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/view/view.vue?vue&type=template&id=4a7f3e3a&
+var viewvue_type_template_id_4a7f3e3a_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.hoEditorFactoryIdList.length > 0)?_c('div',{staticClass:"ho-docs",staticStyle:{"width":"1px","height":"1px"}},[_c('section',{staticClass:"ho-editor-list editor-no-footer"},[_vm._l((_vm.hoEditorFactoryIdList),function(hoEditorId,index){return [_c('PrintDoc',{key:index,attrs:{"docIndex":index,"hoEditorId":hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"activeDocId":_vm.activeDocId},on:{"setActiveDocIndex":_vm.setActiveDocIndex,"drawPagesLengthChange":_vm.drawPagesLengthChange}})]})],2)]):_vm._e()}
+var viewvue_type_template_id_4a7f3e3a_staticRenderFns = []
 
 
 ;// 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/view/viewDoc.vue?vue&type=template&id=717b1315&
@@ -239476,8 +239655,7 @@ var PrintDocs = /*#__PURE__*/function (_Mixins) {
     key: "isFixedPrintToA4Change",
     value: function isFixedPrintToA4Change() {
       var activeDocId = this.activeDocId ? this.activeDocId : this.hoEditorFactoryIdList[0];
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().hoEditorFactoryMap.get(activeDocId);
-      hoEditorFactory && (hoEditorFactory.isFixedPrintToA4 = this.isFixedPrintToA4);
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().hoEditorFactoryMap.get(activeDocId); // hoEditorFactory && (hoEditorFactory.isFixedPrintToA4 = this.isFixedPrintToA4);
     } // 打印时彩色字体转成黑色 printBlack
 
   }, {
@@ -239555,7 +239733,7 @@ var PrintDocs = /*#__PURE__*/function (_Mixins) {
 __decorate([Prop()], PrintDocs.prototype, "pageProperty", void 0);
 
 __decorate([Prop({
-  default: false
+  default: ''
 })], PrintDocs.prototype, "isFixedPrintToA4", void 0);
 
 __decorate([Prop({
@@ -239597,8 +239775,8 @@ PrintDocs = __decorate([vue_class_component_esm({
 
 var view_component = normalizeComponent(
   view_viewvue_type_script_lang_ts_,
-  viewvue_type_template_id_3c4d2e63_render,
-  viewvue_type_template_id_3c4d2e63_staticRenderFns,
+  viewvue_type_template_id_4a7f3e3a_render,
+  viewvue_type_template_id_4a7f3e3a_staticRenderFns,
   false,
   null,
   null,