npm - hoeditor-web - Versions diffs - 2.0.57 → 2.0.60 - Mend

hoeditor-web 2.0.57 → 2.0.60

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/lib/hoeditor.common.js +1375 -487
package/lib/hoeditor.css +854 -2
package/lib/hoeditor.umd.js +1375 -487
package/lib/hoeditor.umd.min.js +23 -23
package/package.json +1 -1

package/lib/hoeditor.common.js CHANGED Viewed

@@ -10970,7 +10970,7 @@ var PrintStatus = /*#__PURE__*/function () {
     this._printRecord = new PrintRecord(hoEditorFactoryID);
     this._DrawRange = new Array();
     this.pageSettingMap = new Map();
-    this._printAppoint = "";
+    this._printAppoint = '';
   }
   (0,createClass/* default */.Z)(PrintStatus, [{
@@ -11158,16 +11158,16 @@ var PrintStatus = /*#__PURE__*/function () {
           return;
         }
-        if (values == "") {
+        if (values == '') {
           values = "".concat(this.startIndex, "-").concat(hoEditorFactory.drawTree.drawPages.length);
         }
-        values = values.replace(/\s*/g, "").replace(/[^\d|-]/g, ",").replace(/\,{2,}/g, ",");
+        values = values.replace(/\s*/g, '').replace(/[^\d|-]/g, ',').replace(/\,{2,}/g, ',');
         var val = values;
-        var arr = val.split(",");
+        var arr = val.split(',');
         var pages = new Array();
         arr.forEach(function (value) {
-          var tmp = value.split("-");
+          var tmp = value.split('-');
           if (tmp.length == 1) {
             pages.push(parseInt(tmp[0]));
@@ -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();
       }
@@ -11442,21 +11443,21 @@ var Print = /*#__PURE__*/function () {
   (0,createClass/* default */.Z)(Print, null, [{
     key: "openDataUriInWindow",
     value: function openDataUriInWindow(PDF, fileName, width) {
-      if (navigator && navigator.userAgent.toLowerCase().indexOf("electron") !== -1) {
-        var htmlForNewWindow = "<html>" + "<title>" + fileName + "</title>" + "<style>html, body { padding: 0; margin: 0; } iframe { width: 100%; height: 100%; border: 0;}  </style>" + "<body>" + '<iframe src="' + PDF.output("bloburl") + '"></iframe>' + "</body></html>";
-        var nW = window.open("", "modal", "width=" + (width + 400) + ",height=800");
+      if (navigator && navigator.userAgent.toLowerCase().indexOf('electron') !== -1) {
+        var htmlForNewWindow = '<html>' + '<title>' + fileName + '</title>' + '<style>html, body { padding: 0; margin: 0; } iframe { width: 100%; height: 100%; border: 0;}  </style>' + '<body>' + '<iframe src="' + PDF.output('bloburl') + '"></iframe>' + '</body></html>';
+        var nW = window.open('', 'modal', 'width=' + (width + 400) + ',height=800');
         if (nW) {
           nW.document.write(htmlForNewWindow);
         }
       } else {
-        if (document.querySelector("#Ho_Editor_Print_Iframe")) {
-          document.body.removeChild(document.querySelector("#Ho_Editor_Print_Iframe"));
+        if (document.querySelector('#Ho_Editor_Print_Iframe')) {
+          document.body.removeChild(document.querySelector('#Ho_Editor_Print_Iframe'));
         }
         this.printPage(PDF).catch(function (error) {
           PDF.autoPrint();
-          PDF.output("dataurlnewwindow");
+          PDF.output('dataurlnewwindow');
         });
       }
     }
@@ -11469,7 +11470,7 @@ var Print = /*#__PURE__*/function () {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                oHiddFrame = document.createElement("iframe");
+                oHiddFrame = document.createElement('iframe');
                 printPromise = new Promise(function (resolve, reject) {
                   oHiddFrame.onload = function () {
                     try {
@@ -11478,20 +11479,20 @@ var Print = /*#__PURE__*/function () {
                       oHiddFrame === null || oHiddFrame === void 0 ? void 0 : (_oHiddFrame$contentWi = oHiddFrame.contentWindow) === null || _oHiddFrame$contentWi === void 0 ? void 0 : _oHiddFrame$contentWi.focus(); // Required for IE
                       oHiddFrame === null || oHiddFrame === void 0 ? void 0 : (_oHiddFrame$contentWi2 = oHiddFrame.contentWindow) === null || _oHiddFrame$contentWi2 === void 0 ? void 0 : _oHiddFrame$contentWi2.print();
-                      resolve("print");
+                      resolve('print');
                     } catch (error) {
                       reject(error);
                     }
                   };
                 });
-                oHiddFrame.id = "Ho_Editor_Print_Iframe";
-                oHiddFrame.style.position = "fixed";
-                oHiddFrame.style.right = "0";
-                oHiddFrame.style.bottom = "0";
-                oHiddFrame.style.width = "0";
-                oHiddFrame.style.height = "0";
-                oHiddFrame.style.border = "0";
-                oHiddFrame.src = PDF.output("bloburl");
+                oHiddFrame.id = 'Ho_Editor_Print_Iframe';
+                oHiddFrame.style.position = 'fixed';
+                oHiddFrame.style.right = '0';
+                oHiddFrame.style.bottom = '0';
+                oHiddFrame.style.width = '0';
+                oHiddFrame.style.height = '0';
+                oHiddFrame.style.border = '0';
+                oHiddFrame.src = PDF.output('bloburl');
                 document.body.appendChild(oHiddFrame);
                 _context2.next = 13;
                 return printPromise;
@@ -11531,7 +11532,7 @@ var Print = /*#__PURE__*/function () {
                   break;
                 }
-                message_box_default().alert("病程记录文件有删除或者内容减少，导致上一次记录的打印位置错误无法使用，请用重打进行打印或者删除所有打印记录后续打");
+                message_box_default().alert('病程记录文件有删除或者内容减少，导致上一次记录的打印位置错误无法使用，请用重打进行打印或者删除所有打印记录后续打');
                 reslove && reslove(null);
                 return _context3.abrupt("return");
@@ -11563,17 +11564,17 @@ var Print = /*#__PURE__*/function () {
                   hoEditorFactory.printStatus.DrawPrintRange().preparePrint();
                 }
-                orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? "l" : "p";
+                orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? 'l' : 'p';
                 width = hoEditorFactory.pageProperty.widthPixes;
-                height = orientation === "l" ? hoEditorFactory.pageProperty.heightPixes - 1 : hoEditorFactory.pageProperty.heightPixes;
+                height = orientation === 'l' ? hoEditorFactory.pageProperty.heightPixes - 1 : hoEditorFactory.pageProperty.heightPixes;
-                if (type === "html") {
-                  svgBox = document.createElement("div");
-                  svgBox.className = "ho-print-svg-box";
+                if (type === 'html') {
+                  svgBox = document.createElement('div');
+                  svgBox.className = 'ho-print-svg-box';
                 }
                 last = -1;
-                console.time("绘制svg和生成pdf");
+                console.time('绘制svg和生成pdf');
                 _iterator = (0,createForOfIteratorHelper/* default */.Z)(hoEditorFactory.printStatus.printProcess());
                 _context3.prev = 15;
@@ -11581,7 +11582,7 @@ var Print = /*#__PURE__*/function () {
               case 17:
                 if ((_step = _iterator.n()).done) {
-                  _context3.next = 58;
+                  _context3.next = 60;
                   break;
                 }
@@ -11593,13 +11594,13 @@ var Print = /*#__PURE__*/function () {
                 }
                 _context3.next = 22;
-                return message_box_default().confirm("请进行翻页", "打印提示", {
-                  confirmButtonText: "确定",
-                  type: "info"
+                return message_box_default().confirm('请进行翻页', '打印提示', {
+                  confirmButtonText: '确定',
+                  type: 'info'
                 });
               case 22:
-                return _context3.abrupt("continue", 56);
+                return _context3.abrupt("continue", 58);
               case 23:
                 last = index;
@@ -11610,7 +11611,7 @@ var Print = /*#__PURE__*/function () {
                   break;
                 }
-                return _context3.abrupt("break", 58);
+                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('#fff').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('#fff').rect(0, 0, width, posY).endFill();
                     cpage.drawDocContainer.addChild(_dShape);
                     cpage.drawFooter.alpha = 0;
@@ -11651,8 +11652,8 @@ var Print = /*#__PURE__*/function () {
                   y: 0
                 };
-                if (hoEditorFactory.isFixedPrintToA4 && format) {
-                  if (orientation == "l") {
+                if (hoEditorFactory.isFixedPrintToA4 == '1' && format) {
+                  if (orientation == 'l') {
                     svg2pdfOptions.x = format[0] - width;
                     svg2pdfOptions.y = (format[1] - height) / 2;
                   } else {
@@ -11661,20 +11662,31 @@ var Print = /*#__PURE__*/function () {
                 }
                 if (!hoEditorFactory.isUseImagePrint) {
-                  _context3.next = 42;
+                  _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.isFixedPrintToA4 == '2' && format) {
+                  // 避免切换纸张的打印方式 绘制只处理竖向情况
+                  if (orientation === 'p' && hoEditorFactory.pageProperty.pageSize.toLocaleLowerCase() == 'a5' && index == 0) {
+                    ctx.translate(0, 1122 / 2); // 由于旋转是默认以左上角为中心 所以需要先移动位置 改变起始点
+                    ctx.rotate(270 * Math.PI / 180); // 旋转 context2d
+                  }
+                }
                 ctx.posX = svg2pdfOptions.x;
                 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 = 55;
+                _context3.next = 57;
                 break;
-              case 42:
+              case 44:
                 _ctx = new canvas2svg({
                   width: width,
                   height: height,
@@ -11682,142 +11694,142 @@ 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 = 49;
+                if (!(type === 'html')) {
+                  _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 = 54;
+                _context3.next = 56;
                 break;
-              case 49:
+              case 51:
                 PDF === null || PDF === void 0 ? void 0 : PDF.addPage();
                 _context3.t0 = PDF;
                 if (!_context3.t0) {
-                  _context3.next = 54;
+                  _context3.next = 56;
                   break;
                 }
-                _context3.next = 54;
+                _context3.next = 56;
                 return svg2pdf((_ctx3 = _ctx) === null || _ctx3 === void 0 ? void 0 : _ctx3.getSvg(), PDF, svg2pdfOptions);
-              case 54:
+              case 56:
                 _ctx = null;
-              case 55:
+              case 57:
                 index > 0 && ((_cpage$drawDomLevel3 = cpage.drawDomLevel) === null || _cpage$drawDomLevel3 === void 0 ? void 0 : _cpage$drawDomLevel3.clearStage());
-              case 56:
+              case 58:
                 _context3.next = 17;
                 break;
-              case 58:
-                _context3.next = 63;
+              case 60:
+                _context3.next = 65;
                 break;
-              case 60:
-                _context3.prev = 60;
+              case 62:
+                _context3.prev = 62;
                 _context3.t1 = _context3["catch"](15);
                 _iterator.e(_context3.t1);
-              case 63:
-                _context3.prev = 63;
+              case 65:
+                _context3.prev = 65;
                 _iterator.f();
-                return _context3.finish(63);
+                return _context3.finish(65);
-              case 66:
-                console.timeEnd("绘制svg和生成pdf");
+              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 = 75;
+                  _context3.next = 77;
                   break;
                 }
                 _last = hoEditorFactory.printStatus.printRecord.last();
                 if (!(_last && hoEditorFactory.startPageNum == _last[0] && positionY === _last[1])) {
-                  _context3.next = 75;
+                  _context3.next = 77;
                   break;
                 }
-                message_box_default().confirm("无新增内容无法续打，如果要打印最后一份病历，请打开打印记录，删除最近一次打印记录", "打印提示", {
-                  confirmButtonText: "确定",
-                  type: "info"
+                message_box_default().confirm('无新增内容无法续打，如果要打印最后一份病历，请打开打印记录，删除最近一次打印记录', '打印提示', {
+                  confirmButtonText: '确定',
+                  type: 'info'
                 });
-                reslove && reslove("printend");
+                reslove && reslove('printend');
                 return _context3.abrupt("return");
-              case 75:
-                if (!(type === "pdf")) {
-                  _context3.next = 81;
+              case 77:
+                if (!(type === 'pdf')) {
+                  _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");
+                PDF === null || PDF === void 0 ? void 0 : PDF.save(fileName + '.pdf');
                 hoEditorFactory.printStatus.drawPrintRecord.clear();
-                _context3.next = 87;
+                _context3.next = 89;
                 break;
-              case 81:
+              case 83:
                 if (!(svgBox && svgBox.childNodes.length === 0)) {
-                  _context3.next = 85;
+                  _context3.next = 87;
                   break;
                 }
-                message_box_default().confirm("无新增内容", "打印提示", {
-                  confirmButtonText: "确定",
-                  type: "info"
+                message_box_default().confirm('无新增内容', '打印提示', {
+                  confirmButtonText: '确定',
+                  type: 'info'
                 });
-                reslove && reslove("printend");
+                reslove && reslove('printend');
                 return _context3.abrupt("return");
-              case 85:
+              case 87:
                 printStyle = (0,util/* createPrintHTMLStyle */.j_)(hoEditorFactory.pageProperty.pageSize, orientation);
-                if (type === "html") {
+                if (type === 'html') {
                   exportHtml = "\n                    <!DOCTYPE html>\n                    <html lang=\"en\">\n                        <head>\n                        <meta charset=\"utf-8\">\n                        <style>".concat(printStyle.innerHTML, "</style>\n                        </head>\n                        <body>").concat((_svgBox = svgBox) === null || _svgBox === void 0 ? void 0 : _svgBox.innerHTML, "</body>\n                    </html>\n                ");
                   url = window.URL.createObjectURL(new Blob([exportHtml], {
                     type: "text/html"
                   }));
-                  link = document.createElement("a");
-                  link.style.display = "none";
+                  link = document.createElement('a');
+                  link.style.display = 'none';
                   link.href = url;
-                  link.setAttribute("download", fileName ? fileName : "电子病历文档");
+                  link.setAttribute('download', fileName ? fileName : '电子病历文档');
                   document.body.appendChild(link);
                   link.click();
                   setTimeout(function () {
                     return link.remove();
                   }, 100);
                 } else {
-                  if (height <= 560) {
+                  if (height <= 560 && hoEditorFactory.isFixedPrintToA4 !== '2') {
                     PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
                   }
                   PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
-                  name = hoEditorFactory.vueController.getDocTitle() ? hoEditorFactory.vueController.getDocTitle() : "电子病历文档";
+                  name = hoEditorFactory.vueController.getDocTitle() ? hoEditorFactory.vueController.getDocTitle() : '电子病历文档';
                   PDF && this.openDataUriInWindow(PDF, name, hoEditorFactory.pageProperty.widthPixes);
                 }
-              case 87:
-                reslove && reslove("printend");
+              case 89:
+                reslove && reslove('printend');
-              case 88:
+              case 90:
               case "end":
                 return _context3.stop();
             }
           }
-        }, _callee2, this, [[15, 60, 63, 66]]);
+        }, _callee2, this, [[15, 62, 65, 68]]);
       }));
       function printToPDF(_x2, _x3, _x4, _x5, _x6, _x7, _x8) {
@@ -11844,9 +11856,9 @@ var Print = /*#__PURE__*/function () {
                   hoEditorFactory.printStatus.DrawPrintRange().preparePrint();
                 }
-                orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? "l" : "p";
-                svgBox = document.createElement("div");
-                svgBox.className = "ho-print-svg-box";
+                orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? 'l' : 'p';
+                svgBox = document.createElement('div');
+                svgBox.className = 'ho-print-svg-box';
                 last = -1;
                 _iterator2 = (0,createForOfIteratorHelper/* default */.Z)(hoEditorFactory.printStatus.printProcess());
                 _context4.prev = 9;
@@ -11855,7 +11867,7 @@ var Print = /*#__PURE__*/function () {
               case 11:
                 if ((_step2 = _iterator2.n()).done) {
-                  _context4.next = 39;
+                  _context4.next = 40;
                   break;
                 }
@@ -11867,13 +11879,13 @@ var Print = /*#__PURE__*/function () {
                 }
                 _context4.next = 16;
-                return message_box_default().confirm("请进行翻页", "打印提示", {
-                  confirmButtonText: "确定",
-                  type: "info"
+                return message_box_default().confirm('请进行翻页', '打印提示', {
+                  confirmButtonText: '确定',
+                  type: 'info'
                 });
               case 16:
-                return _context4.abrupt("continue", 37);
+                return _context4.abrupt("continue", 38);
               case 17:
                 last = index;
@@ -11884,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) {
@@ -11898,69 +11910,70 @@ 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,
+                  height: orientation === 'l' ? hoEditorFactory.pageProperty.heightPixes - 1 : hoEditorFactory.pageProperty.heightPixes,
                   printBlack: hoEditorFactory.printBlack
                 });
                 _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);
                 }
                 hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
-                reslove && reslove("printend");
+                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) {
@@ -11982,11 +11995,11 @@ var Print = /*#__PURE__*/function () {
                 hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(hoEditorFactoryID);
                 hoEditorFactory.printStatus.startIndex = 1;
                 hoEditorFactory.printStatus.generatePageIndexs(hoEditorFactory.printStatus.printAppoint);
-                svgBox = document.createElement("div");
-                svgBox.className = "ho-print-svg-box";
-                orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? "l" : "p";
+                svgBox = document.createElement('div');
+                svgBox.className = 'ho-print-svg-box';
+                orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? 'l' : 'p';
                 width = hoEditorFactory.pageProperty.widthPixes;
-                height = orientation === "l" ? hoEditorFactory.pageProperty.heightPixes - 1 : hoEditorFactory.pageProperty.heightPixes;
+                height = orientation === 'l' ? hoEditorFactory.pageProperty.heightPixes - 1 : hoEditorFactory.pageProperty.heightPixes;
                 last = -1;
                 _iterator3 = (0,createForOfIteratorHelper/* default */.Z)(hoEditorFactory.printStatus.printProcess());
                 _context5.prev = 10;
@@ -12007,9 +12020,9 @@ var Print = /*#__PURE__*/function () {
                 }
                 _context5.next = 17;
-                return message_box_default().confirm("请进行翻页", "打印提示", {
-                  confirmButtonText: "确定",
-                  type: "info"
+                return message_box_default().confirm('请进行翻页', '打印提示', {
+                  confirmButtonText: '确定',
+                  type: 'info'
                 });
               case 17:
@@ -12076,7 +12089,7 @@ var Print = /*#__PURE__*/function () {
                 hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
                 printStyle = (0,util/* createPrintHTMLStyle */.j_)(hoEditorFactory.pageProperty.pageSize, orientation);
                 htmlText.text = "\n            <!DOCTYPE html>\n            <html lang=\"en\">\n                <head>\n                    <meta charset=\"utf-8\">\n                    <style>".concat(printStyle.innerHTML, "</style>\n                </head>\n                <body>").concat(svgBox === null || svgBox === void 0 ? void 0 : svgBox.innerHTML, "</body>\n            </html>\n        ");
-                reslove && reslove("printend");
+                reslove && reslove('printend');
               case 44:
               case "end":
@@ -12096,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) {
@@ -12109,37 +12122,56 @@ var Print = /*#__PURE__*/function () {
                   p: [793, 1122],
                   l: [1122, 793]
                 };
-                svgBox = document.createElement("div");
-                svgBox.className = "ho-print-svg-box";
+                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 = 47;
+                  _context6.next = 50;
                   break;
                 }
                 index = _step4.value;
                 if (!(index == -1)) {
-                  _context6.next = 16;
+                  _context6.next = 23;
                   break;
                 }
-                _context6.next = 15;
-                return message_box_default().confirm("请进行翻页", "打印提示", {
-                  confirmButtonText: "确定",
-                  type: "info"
+                _context6.next = 22;
+                return message_box_default().confirm('请进行翻页', '打印提示', {
+                  confirmButtonText: '确定',
+                  type: 'info'
                 });
-              case 15:
-                return _context6.abrupt("continue", 45);
+              case 22:
+                return _context6.abrupt("continue", 48);
-              case 16:
+              case 23:
                 last = index;
                 cpage = hoEditorFactory.drawTree.drawPages[index];
@@ -12154,55 +12186,58 @@ 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", 47);
-              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 = 38;
+                  _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.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);
+                    hoEditorFactory.isRotate = true;
+                  }
+                }
                 ctx.posX = svg2pdfOptions.x;
                 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 = 44;
+                _context6.next = 47;
                 break;
-              case 38:
+              case 41:
                 _ctx6 = new canvas2svg({
                   width: widthPixes,
-                  height: orientation === "l" ? heightPixes - 1 : heightPixes,
+                  height: orientation === 'l' ? heightPixes - 1 : heightPixes,
                   printBlack: hoEditorFactory.printBlack
                 });
                 _ctx6 && ((_cpage$drawDomLevel10 = cpage.drawDomLevel) === null || _cpage$drawDomLevel10 === void 0 ? void 0 : (_cpage$drawDomLevel11 = _cpage$drawDomLevel10.stage) === null || _cpage$drawDomLevel11 === void 0 ? void 0 : _cpage$drawDomLevel11.draw(_ctx6));
@@ -12213,37 +12248,37 @@ var Print = /*#__PURE__*/function () {
                   PDF === null || PDF === void 0 ? void 0 : PDF.addPage(format, orientation);
                 }
-                _context6.next = 43;
+                _context6.next = 46;
                 return svg2pdf((_ctx7 = _ctx6) === null || _ctx7 === void 0 ? void 0 : _ctx7.getSvg(), PDF, svg2pdfOptions);
-              case 43:
+              case 46:
                 _ctx6 = null;
-              case 44:
+              case 47:
                 index > 0 && ((_cpage$drawDomLevel12 = cpage.drawDomLevel) === null || _cpage$drawDomLevel12 === void 0 ? void 0 : _cpage$drawDomLevel12.clearStage());
-              case 45:
-                _context6.next = 10;
+              case 48:
+                _context6.next = 17;
                 break;
-              case 47:
-                _context6.next = 52;
+              case 50:
+                _context6.next = 55;
                 break;
-              case 49:
-                _context6.prev = 49;
-                _context6.t0 = _context6["catch"](8);
+              case 52:
+                _context6.prev = 52;
+                _context6.t0 = _context6["catch"](15);
                 _iterator4.e(_context6.t0);
-              case 52:
-                _context6.prev = 52;
+              case 55:
+                _context6.prev = 55;
                 _iterator4.f();
-                return _context6.finish(52);
+                return _context6.finish(55);
-              case 55:
+              case 58:
                 if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) {
                   hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
                 }
@@ -12261,12 +12296,12 @@ var Print = /*#__PURE__*/function () {
                 hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
                 reslove();
-              case 59:
+              case 62:
               case "end":
                 return _context6.stop();
             }
           }
-        }, _callee5, null, [[8, 49, 52, 55]]);
+        }, _callee5, null, [[15, 52, 55, 58]]);
       }));
       function printAllNew(_x15, _x16, _x17, _x18) {
@@ -19693,8 +19728,10 @@ var DomRange = /*#__PURE__*/function () {
         // const hoEditorFactory = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
         // const isValidPath = hoEditorFactory.docTree.checkPath(value);
         if (value.indexOf("-") >= 0) {
-          element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0___default().alert("当前路径s(" + value + ")异常，请用鼠标点击一下页面(重获路径)再进行之后的操作。");
+          //const hoEditorFactory = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
+          element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0___default().alert("当前路径s(" + value + ")异常，请用鼠标点击一下页面(重获路径)再进行之后的操作。(" + this._startPath + ")");
+          this.setSamePath(this._startPath);
           return;
         } else {
           this._startPath = value;
@@ -19711,8 +19748,9 @@ var DomRange = /*#__PURE__*/function () {
         // const hoEditorFactory = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
         // const isValidPath = hoEditorFactory.docTree.checkPath(value);
         if (value.indexOf("-") >= 0) {
-          element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0___default().alert("当前路径e(" + value + ")异常，请用鼠标点击一下页面(重获路径)再进行之后的操作。");
+          element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0___default().alert("当前路径e(" + value + ")异常，请用鼠标点击一下页面(重获路径)再进行之后的操作。(" + this._endPath + ")");
+          this.setSamePath(this._endPath);
           return;
         } else {
           this._endPath = value;
@@ -24761,8 +24799,13 @@ var BaseNode = /*#__PURE__*/function () {
         var index = parentNodes.indexOf(this);
         if (index != -1) {
-          if (this.parentNode) //有父节点，使用父节点的删除方法
-            return this.parentNode.removeChild(this);else parentNodes.splice(index, 1);
+          if (this.parentNode) {
+            //有父节点，使用父节点的删除方法
+            return this.parentNode.removeChild(this);
+          } else {
+            parentNodes.splice(index, 1);
+          }
           return true;
         }
@@ -26210,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);
@@ -28592,8 +28653,8 @@ var BaseNode = __webpack_require__(50369);
 /*
  * @Author: your name
  * @Date: 2020-11-11 10:02:30
- * @LastEditTime: 2021-09-28 14:10:50
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-06-23 09:54:03
+ * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\ImageNode.ts
  */
@@ -28700,6 +28761,12 @@ var ImageNode = /*#__PURE__*/function (_BaseNode) {
     key: "imageDataBase64String",
     get: function get() {
       return this._imageDataBase64String;
+    },
+    set: function set(value) {
+      if (this._imageDataBase64String !== value) {
+        this._imageDataBase64String = value;
+        this.node2DrawNodeRange(0, 0);
+      }
     }
     /**
      * imageNode 节点删除时 如果 imageDataBase64String是url地址形式 需要保存url列表
@@ -28727,6 +28794,7 @@ var ImageNode = /*#__PURE__*/function (_BaseNode) {
   }, {
     key: "node2DrawNodeRange",
     value: function node2DrawNodeRange(startIndex, endIndex) {
+      this._drawNodes.length = 0;
       var dNode = new DrawImageNode(this._hoEditorFactoryID, this._rootPath, this, 0, this.imageDataBase64String, this.width, this.height //,
       //this.scaleX,
       //this.scaleY
@@ -30564,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);
@@ -30604,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;
@@ -30655,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() {
@@ -30676,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];
@@ -30689,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];
@@ -30700,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;
@@ -30716,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;
@@ -30739,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];
@@ -30767,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;
@@ -30781,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
@@ -30828,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;
@@ -30882,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) {
@@ -30900,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);
@@ -30940,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]);
       }
     }
@@ -30958,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],
@@ -31033,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",
@@ -31043,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++) {
@@ -31055,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);
@@ -31094,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();
     }
@@ -31124,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,
@@ -31145,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) {
@@ -31182,8 +31293,13 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
         var index = parentNodes.indexOf(this);
         if (index != -1) {
-          if (this.parentNode) //有父节点，使用父节点的删除方法
-            return this.parentNode.removeChild(this);else parentNodes.splice(index, 1);
+          if (this.parentNode) {
+            //有父节点，使用父节点的删除方法
+            return this.parentNode.removeChild(this);
+          } else {
+            parentNodes.splice(index, 1);
+          }
           return true;
         }
@@ -31203,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);
@@ -31227,7 +31343,7 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
   }]);
   return ParagraphNode;
-}(_BaseNode__WEBPACK_IMPORTED_MODULE_8__/* .BaseNode */ .Hd);
+}(_BaseNode__WEBPACK_IMPORTED_MODULE_10__/* .BaseNode */ .Hd);
 /***/ }),
@@ -33346,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;
@@ -35760,6 +35876,10 @@ var ColInfos = /*#__PURE__*/function () {
       return this._colWidth;
     },
     set: function set(colWidth) {
+      if (isNaN(colWidth)) {
+        console.warn('当前列宽 === NaN');
+      }
       this._colWidth = colWidth;
     }
   }, {
@@ -38482,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);
@@ -42518,8 +42639,8 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
 /*
  * @Author: your name
  * @Date: 2021-01-19 10:05:08
- * @LastEditTime: 2021-09-26 22:46:04
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-06-24 16:54:17
+ * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\draw\DrawResize.ts
  */
@@ -42591,6 +42712,8 @@ var DrawResize = /*#__PURE__*/function () {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_5__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       hoEditorFactory.docTree.curOnDragNode = this.node;
+      this.dragFlag = true;
+      this.sLocation = new createjs.Point(e.stageX, e.stageY);
       this.drawBorders(this._drawNode.dWidth, this._drawNode.dHeight, true); //const drawLine = hoEditorFactory.drawTree.getDrawLineByDNode(
       //this.drawNode
       //);
@@ -42598,8 +42721,6 @@ var DrawResize = /*#__PURE__*/function () {
       //drawLine.drawItems.splice(index, 1);
       //drawLine.removeChild(this.drawNode);
-      this.dragFlag = true;
-      this.sLocation = new createjs.Point(e.stageX, e.stageY);
       var shapes = this.drawNode.children;
       shapes.forEach(function (value, index) {
         // if (value.name !== this.node.id && value.alpha !== 1) {
@@ -42781,7 +42902,7 @@ var DrawResize = /*#__PURE__*/function () {
           //左上
           this.drawNode.dWidth = this.drawNode.dWidth - changeX;
           this.drawNode.dHeight = this.drawNode.dHeight - changeY;
-          this.imageY = this.imageY - changeY;
+          this.imageY = this.imageY + changeY;
         } else if (e.target.name === "centerTop") {
           //向上
           this.drawNode.dHeight = this.drawNode.dHeight - changeY;
@@ -43435,7 +43556,7 @@ var StagePosition = /*#__PURE__*/function () {
 /* harmony export */   "l": function() { return /* binding */ DrawArea; }
 /* harmony export */ });
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__ = __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_createClass_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(22342);
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(99640);
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(28214);
 /* harmony import */ var core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(66992);
@@ -43463,6 +43584,8 @@ var StagePosition = /*#__PURE__*/function () {
 /* harmony import */ var _editor_dom_NodePosition__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(2242);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(41005);
 /* harmony import */ var _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(95883);
+/* harmony import */ var _drawNode_DrawPageCell__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(39648);
@@ -43516,7 +43639,7 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
   // }
-  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_19__/* ["default"] */ .Z)(DrawArea, [{
+  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(DrawArea, [{
     key: "endDline",
     get: function get() {
       return this._endDline;
@@ -44354,7 +44477,7 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
         var localPos = _this2.globalToLocal(stagePos.x, stagePos.y); // 末尾标记节点的stage坐标
-        var spX = endDrawNode.x;
+        var spX = dline.parent instanceof _drawNode_DrawPageCell__WEBPACK_IMPORTED_MODULE_19__/* .DrawPageCell */ .k ? localPos.x : endDrawNode.x;
         var spY = localPos.y;
         _this2.removeComment(value);
@@ -44585,11 +44708,176 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
         if (child.name === comment.id) {
           child.alpha = 1;
         }
-      } //this.stage.update();
+      }
+      hoEditorFactory.drawPageTree.updateDrawPage(this.index);
+    }
+  }, {
+    key: "drawEditRecords",
+    value: function drawEditRecords(comment, nodeX, nodeY, commentY) {
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var commentWidth = hoEditorFactory.pageProperty.rightMarginPixes - 15;
+      var docWidth = this.docWidth;
+      var container = new createjs.Container();
+      container.x = docWidth + 15;
+      container.y = commentY - comment.lineHeight / 2;
+      container.name = comment.id;
+      var commentTextShape = null; // 批注内容
+      var commentArr = comment.commentTextWarp(commentWidth, comment.text);
+      var text = commentArr[0];
+      var textLen = commentArr[1] > 1 ? commentArr[1] - 1 : commentArr[1];
+      comment.lineHeight = 20 * textLen + 10;
+      commentTextShape = new createjs.Text(text, "12px 微软雅黑", "#666");
+      commentTextShape.lineWidth = commentWidth - 25;
+      commentTextShape.lineHeight = 20;
+      commentTextShape.name = "oldValue";
+      commentTextShape.x = 5;
+      commentTextShape.y = 10;
+      commentTextShape.alpha = 1; //背景
+      var textWidth = commentTextShape.getMeasuredWidth();
+      var shapeWidth = textWidth + 10 > commentWidth - 30 ? commentWidth - 30 : textWidth + 10;
+      var backShape = new createjs.Shape();
+      backShape.graphics.setStrokeDash([4, 1], 0).setStrokeStyle(1).beginStroke("rgba(255, 0, 0, 1)").beginFill("#ffe5e5").drawRoundRect(0, 0, shapeWidth, comment.lineHeight, 5);
+      backShape.name = "backShape";
+      backShape.alpha = 0.5; //横线
+      var horizontalLine = new createjs.Shape();
+      horizontalLine.graphics.setStrokeDash([4, 1], 0).setStrokeStyle(1).beginStroke("rgba(255, 0, 0, 1)").moveTo(nodeX, nodeY).lineTo(docWidth, nodeY);
+      horizontalLine.name = comment.id;
+      horizontalLine.alpha = 1; //指向线
+      var guideLine = new createjs.Shape();
+      guideLine.graphics.setStrokeDash([4, 1], 0).setStrokeStyle(1).beginStroke("rgba(255, 0, 0, 1)").moveTo(docWidth, nodeY).lineTo(docWidth + 15, commentY - comment.lineHeight / 4);
+      guideLine.name = comment.id;
+      guideLine.alpha = 1;
+      container.addChild(backShape);
+      container.addChild(commentTextShape);
+      this.addChild(horizontalLine);
+      this.addChild(guideLine);
+      this.addChild(container);
       hoEditorFactory.drawPageTree.updateDrawPage(this.index);
     }
+  }, {
+    key: "repaintRecored",
+    value: function repaintRecored(comments, comment, nPath, spX, spY) {
+      var _this5 = this;
+      var topComments = new Array();
+      var bottomComments = new Array();
+      var tempArr = new Array();
+      var getStagePos = function getStagePos(comment) {
+        var endDrawNode = comment.eNode.drawNodes[0];
+        var dline = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(_this5._hoEditorFactoryID).drawTree.getDrawLineByDNode(endDrawNode); // 末尾标记节点所在行
+        var stagePos = dline.localToGlobal(endDrawNode.x, endDrawNode.y); // 末尾标记节点的stage坐标
+        var localPos = _this5.globalToLocal(stagePos.x, stagePos.y); // 末尾标记节点的stage坐标
+        return [endDrawNode.x, localPos.y];
+      };
+      var commentY = spY;
+      comments.forEach(function (value) {
+        if (value.id !== comment.id) {
+          tempArr.push(value);
+        }
+      });
+      tempArr.forEach(function (value) {
+        var aPath = value.eNode.getNodePath();
+        var result = _editor_dom_NodePosition__WEBPACK_IMPORTED_MODULE_16__/* .NodePosition.treePathCompare */ .F.treePathCompare(nPath, aPath);
+        if (result > 0) {
+          topComments.push(value);
+        } else {
+          bottomComments.push(value);
+        }
+      });
+      if (topComments.length > 0) {
+        var tempComment = topComments[0];
+        var maxValue = getStagePos(tempComment)[1];
+        var lHeight = tempComment.lineHeight;
+        for (var i = 1; i < topComments.length; i++) {
+          var stageY = getStagePos(topComments[i])[1];
+          if (stageY > maxValue) {
+            maxValue = stageY;
+            lHeight = topComments[i].lineHeight;
+            tempComment = topComments[i];
+          }
+        }
+        if (maxValue + lHeight + 5 > spY) {
+          commentY = maxValue + lHeight + 5;
+          for (var j = 0; j < this.children.length; j++) {
+            var child = this.children[j];
+            if (child.name === tempComment.id && child instanceof createjs.Container) {
+              if (child.y + tempComment.lineHeight / 2 > maxValue) {
+                commentY = child.y + tempComment.lineHeight / 2 + lHeight + 5;
+              }
+            }
+          }
+        }
+      }
+      this.drawEditRecords(comment, spX, spY, commentY);
+      if (bottomComments.length > 0) {
+        var repaintComment = function repaintComment(commentObj, commentY, lineHeight) {
+          var nodeX = getStagePos(commentObj)[0];
+          var nodeY = getStagePos(commentObj)[1];
+          var arrIndex = bottomComments.indexOf(commentObj);
+          bottomComments.splice(arrIndex, 1);
+          if (commentY + lineHeight + 5 > nodeY) {
+            commentY = commentY + lineHeight + 5;
+          } else {
+            commentY = nodeY;
+          }
+          _this5.removeComment(commentObj);
+          _this5.drawEditRecords(commentObj, nodeX, nodeY, commentY);
+          if (bottomComments.length > 0) {
+            var _minValue2 = getStagePos(bottomComments[0])[1];
+            var _tempComment4 = bottomComments[0];
+            for (var _j2 = 1; _j2 < bottomComments.length; _j2++) {
+              var _stageY3 = getStagePos(bottomComments[_j2])[1];
+              if (_stageY3 < _minValue2) {
+                _minValue2 = _stageY3;
+                _tempComment4 = bottomComments[_j2];
+              }
+            }
+            repaintComment(_tempComment4, commentY, commentObj.lineHeight);
+          }
+        };
+        var minValue = getStagePos(bottomComments[0])[1];
+        var _tempComment3 = bottomComments[0];
+        for (var _i2 = 1; _i2 < bottomComments.length; _i2++) {
+          var _stageY4 = getStagePos(bottomComments[_i2])[1];
+          if (_stageY4 < minValue) {
+            minValue = _stageY4;
+            _tempComment3 = bottomComments[_i2];
+          }
+        }
+        repaintComment(_tempComment3, commentY, comment.lineHeight);
+      }
+    }
   }]);
   return DrawArea;
@@ -53284,7 +53572,9 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
       if (hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPreview */.Dh.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPrint */.Dh.psPrint) {
         if (this.node.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
           if (this.node.parentNode.inputFieldType === 0) {
-            backColor = hoEditorFactory.option.getColorByLevel(10);
+            if (backColor === hoEditorFactory.pageProperty.backColor) {
+              backColor = hoEditorFactory.option.getColorByLevel(10);
+            }
           } else {
             if (this.node.parentNode.keyValue == "") {
               backColor = hoEditorFactory.option.getColorByLevel(120);
@@ -53293,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";
           }
@@ -62974,30 +63270,34 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "e": function() { return /* binding */ ParseUndoUnit; }
 /* harmony export */ });
-/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(35671);
-/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(22342);
-/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(41539);
-/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(54747);
-/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(21703);
-/* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(23375);
-/* harmony import */ var _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(91538);
-/* harmony import */ var _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(34534);
-/* harmony import */ var _dom_DomRange__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(66828);
-/* harmony import */ var _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(58416);
-/* harmony import */ var _UndoService__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(48508);
-/* harmony import */ var _editor_undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(50356);
-/* harmony import */ var _dom_NodePosition__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(2242);
-/* harmony import */ var _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(14208);
-/* harmony import */ var _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(95883);
-/* harmony import */ var _dom_treeNode_BaseCombineNode__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(8);
-/* harmony import */ var _draw_SelectRange__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(1470);
-/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(41005);
-/* harmony import */ var _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(34565);
-/* harmony import */ var _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(15868);
-/* harmony import */ var _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(15798);
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86160);
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(39873);
+/* 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_22__ = __webpack_require__(22342);
+/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(41539);
+/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(54747);
+/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(21703);
+/* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(23375);
+/* harmony import */ var _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(91538);
+/* harmony import */ var _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(34534);
+/* harmony import */ var _dom_DomRange__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(66828);
+/* harmony import */ var _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(58416);
+/* harmony import */ var _UndoService__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(48508);
+/* harmony import */ var _editor_undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(50356);
+/* harmony import */ var _dom_NodePosition__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(2242);
+/* harmony import */ var _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(14208);
+/* harmony import */ var _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(95883);
+/* harmony import */ var _dom_treeNode_BaseCombineNode__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(8);
+/* harmony import */ var _draw_SelectRange__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(1470);
+/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(41005);
+/* harmony import */ var _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(34565);
+/* harmony import */ var _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(15868);
+/* harmony import */ var _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(15798);
@@ -63021,7 +63321,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
 var ParseUndoUnit = /*#__PURE__*/function () {
   function ParseUndoUnit(hoEditorFactoryID, startPath, endPath, nodes) {
-    (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, ParseUndoUnit);
+    (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(this, ParseUndoUnit);
     //插入后的，变更范围
     this._tmp = {
@@ -63031,42 +63331,66 @@ var ParseUndoUnit = /*#__PURE__*/function () {
     this._hoEditorFactoryID = hoEditorFactoryID;
     this._startPath = startPath;
     this._endPath = endPath;
-    this._undo = new _UndoService__WEBPACK_IMPORTED_MODULE_9__/* .UndoService */ .O(this._hoEditorFactoryID); //hoEditorFactory.undoService;
+    this._undo = new _UndoService__WEBPACK_IMPORTED_MODULE_11__/* .UndoService */ .O(this._hoEditorFactoryID); //hoEditorFactory.undoService;
     this._undoNodes = new Array();
     this._nodes = nodes;
     this._opTime = new Date();
-    this._affectText = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_16__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodesText(nodes);
+    this._affectText = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodesText(nodes);
   }
-  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(ParseUndoUnit, [{
+  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_22__/* ["default"] */ .Z)(ParseUndoUnit, [{
     key: "undo",
-    value: function undo() {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_16__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID); //先删除插入绘画节点
+    value: function () {
+      var _undo = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().mark(function _callee() {
+        var hoEditorFactory, delEvent, np;
+        return (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+                delEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_8__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_6__/* .DocAction.daUndoInsert */ .gk.daUndoInsert, this._tmp.start, this._tmp.start);
+                delEvent.oldEndPath = this._tmp.end;
+                delEvent.oldDrawTreeLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_17__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawTreeLines(this._tmp.start, this._tmp.end); //删除插入的节点
-      var delEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_6__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_4__/* .DocAction.daDelete */ .gk.daDelete, this._tmp.start, this._tmp.start); //undo
+                this._undoNodes.forEach(function (value) {
+                  hoEditorFactory.docTree.deleteNode(value, "update");
+                });
-      this._undoNodes.forEach(function (value) {
-        hoEditorFactory.docTree.deleteNode(value, "update");
-      });
+                delEvent.afterChangePath = this._tmp.start;
+                _context.next = 8;
+                return hoEditorFactory.docTree.change(delEvent);
-      while (!this._undo.atBottom()) {
-        this._undo.undo();
-      }
+              case 8:
+                hoEditorFactory.docTree.curDomRange.setSamePath(this._tmp.start);
+                while (!this._undo.atBottom()) {
+                  this._undo.undo();
+                }
-      delEvent.oldEndPath = this._tmp.start;
-      delEvent.oldDrawTreeLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_15__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawTreeLines(this._tmp.start, this._tmp.start);
-      hoEditorFactory.docTree.change(delEvent); //删除插入的节点
+                hoEditorFactory.docTree.curDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_9__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath);
+                hoEditorFactory.drawTree.moveCaretToPath(this._endPath);
+                np = hoEditorFactory.docTree.findNodePositionByPath(this._endPath);
-      hoEditorFactory.docTree.curDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_7__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath);
-      hoEditorFactory.drawTree.moveCaretToPath(this._endPath);
-      var np = hoEditorFactory.docTree.findNodePositionByPath(this._endPath);
+                if (np && np.node instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_20__/* .MarkNode */ .j && np.node.parentNode && np.node.parentNode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_19__/* .TextInputFieldNode */ .re && np.node.parentNode.childNodes.length === 2) {
+                  hoEditorFactory.docController.resetEmptyInputFieldNode(hoEditorFactory, np.node.parentNode);
+                } // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.repaintSelectShape();
-      if (np && np.node instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_18__/* .MarkNode */ .j && np.node.parentNode && np.node.parentNode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_17__/* .TextInputFieldNode */ .re && np.node.parentNode.childNodes.length === 2) {
-        hoEditorFactory.docController.resetEmptyInputFieldNode(hoEditorFactory, np.node.parentNode);
-      } // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.repaintSelectShape();
-    }
+              case 14:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+      function undo() {
+        return _undo.apply(this, arguments);
+      }
+      return undo;
+    }()
     /**
      * @description 初始化变量，因为有撤销恢复可能需要反复操作，初始化不能放到create里
      */
@@ -63085,8 +63409,8 @@ var ParseUndoUnit = /*#__PURE__*/function () {
           _startPosition$node;
       this.initParam();
-      var curRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_7__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_16__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var curRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_9__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var rootNodes = hoEditorFactory.docTree.getPathRoots(this._startPath);
       if (!rootNodes) {
@@ -63100,7 +63424,7 @@ var ParseUndoUnit = /*#__PURE__*/function () {
         //删除选中节点
         this._undo.begin();
-        this._undo.add(new _editor_undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_10__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, curRange.startPath, curRange.endPath));
+        this._undo.add(new _editor_undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_12__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, curRange.startPath, curRange.endPath));
         this._undo.commit();
       }
@@ -63113,12 +63437,12 @@ var ParseUndoUnit = /*#__PURE__*/function () {
         var prevNode = startPosition.node;
         var i = -1;
         var path = nodeLastPath;
-        var positon = _dom_NodePosition__WEBPACK_IMPORTED_MODULE_11__/* .NodePosition.treePathCompare */ .F.treePathCompare(curRange.startPath, nodeLastPath);
+        var positon = _dom_NodePosition__WEBPACK_IMPORTED_MODULE_13__/* .NodePosition.treePathCompare */ .F.treePathCompare(curRange.startPath, nodeLastPath);
         if (positon < 0) {
           //如果是中间,先拆分
-          if (startPosition.node instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_5__/* .TextNode */ .R) {
-            var textNodeSplitUndoUnit = new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_8__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, curRange.startPath, startPosition.node, new _dom_DomRange__WEBPACK_IMPORTED_MODULE_7__/* .DomRange */ .a(this._hoEditorFactoryID, curRange.startPath, nodeLastPath));
+          if (startPosition.node instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_7__/* .TextNode */ .R) {
+            var textNodeSplitUndoUnit = new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_10__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, curRange.startPath, startPosition.node, new _dom_DomRange__WEBPACK_IMPORTED_MODULE_9__/* .DomRange */ .a(this._hoEditorFactoryID, curRange.startPath, nodeLastPath));
             this._undo.begin();
@@ -63137,7 +63461,7 @@ var ParseUndoUnit = /*#__PURE__*/function () {
           //第一个节点是段落时，不插入
           var curr = hoEditorFactory.docTree.findNodePositionByPath(curRange.startPath).node;
-          if (curr instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_12__/* .ParagraphNode */ .C) {
+          if (curr instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_14__/* .ParagraphNode */ .C) {
             curr.combineParagraph.copyStyle(node.combineParagraph);
           } else {
             hoEditorFactory.docTree.insertNodeAfterPath(path, node);
@@ -63155,7 +63479,7 @@ var ParseUndoUnit = /*#__PURE__*/function () {
           var _prevNode;
           return {
-            isTable: _this._nodes[index] instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_13__/* .TableNode */ .Fh,
+            isTable: _this._nodes[index] instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_15__/* .TableNode */ .Fh,
             prevNode: index == 0 ? prevNode : _this._nodes[index - 1],
             nextNode: index == _this._nodes.length - 1 ? (_prevNode = prevNode) === null || _prevNode === void 0 ? void 0 : _prevNode.nextSibling() : _this._nodes[index + 1]
           };
@@ -63168,7 +63492,7 @@ var ParseUndoUnit = /*#__PURE__*/function () {
         var checkTableNode2 = function checkTableNode2(node) {
           return {
-            isTable: node instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_13__/* .TableNode */ .Fh,
+            isTable: node instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_15__/* .TableNode */ .Fh,
             node: node,
             prevNode: node.prevSibling(),
             nextNode: node.nextSibling()
@@ -63184,8 +63508,8 @@ var ParseUndoUnit = /*#__PURE__*/function () {
         var insertParaNode = function insertParaNode(info) {
           if (!info.isTable) return;
-          if (!(info.prevNode instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_12__/* .ParagraphNode */ .C)) {
-            var lpara = new _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_12__/* .ParagraphNode */ .C(_this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, hoEditorFactory.docTree.getParentNode(info.node.getNodePath()), hoEditorFactory.docTree.curParaNo);
+          if (!(info.prevNode instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_14__/* .ParagraphNode */ .C)) {
+            var lpara = new _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_14__/* .ParagraphNode */ .C(_this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, hoEditorFactory.docTree.getParentNode(info.node.getNodePath()), hoEditorFactory.docTree.curParaNo);
             hoEditorFactory.docTree.insertNodeAfterPath(hoEditorFactory.docTree.getNodeLastPath(info.prevNode), lpara);
             _this._undoNodes.push(lpara);
@@ -63193,8 +63517,8 @@ var ParseUndoUnit = /*#__PURE__*/function () {
             info.node.paragraphNode = lpara; // endNode = lpara;
           }
-          if (!(info.nextNode instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_12__/* .ParagraphNode */ .C)) {
-            var _lpara = new _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_12__/* .ParagraphNode */ .C(_this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, hoEditorFactory.docTree.getParentNode(info.node.getNodePath()), hoEditorFactory.docTree.curParaNo);
+          if (!(info.nextNode instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_14__/* .ParagraphNode */ .C)) {
+            var _lpara = new _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_14__/* .ParagraphNode */ .C(_this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, hoEditorFactory.docTree.getParentNode(info.node.getNodePath()), hoEditorFactory.docTree.curParaNo);
             hoEditorFactory.docTree.insertNodeAfterPath(hoEditorFactory.docTree.getNodeLastPath(info.node), _lpara);
@@ -63215,7 +63539,7 @@ var ParseUndoUnit = /*#__PURE__*/function () {
             insertParaNode(info);
           }
-          if (node instanceof _dom_treeNode_BaseCombineNode__WEBPACK_IMPORTED_MODULE_14__/* .BaseCombineNode */ .V) {
+          if (node instanceof _dom_treeNode_BaseCombineNode__WEBPACK_IMPORTED_MODULE_16__/* .BaseCombineNode */ .V) {
             node.childNodes.forEach(function (value) {
               var info = checkTableNode2(value);
@@ -63236,8 +63560,8 @@ var ParseUndoUnit = /*#__PURE__*/function () {
           var info = checkTableNode(i);
           if (info.isTable) {
-            if (!(info.nextNode instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_12__/* .ParagraphNode */ .C)) {
-              var lpara = new _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_12__/* .ParagraphNode */ .C(this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, hoEditorFactory.docTree.getParentNode(startPosition.path), hoEditorFactory.docTree.curParaNo);
+            if (!(info.nextNode instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_14__/* .ParagraphNode */ .C)) {
+              var lpara = new _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_14__/* .ParagraphNode */ .C(this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, hoEditorFactory.docTree.getParentNode(startPosition.path), hoEditorFactory.docTree.curParaNo);
               hoEditorFactory.docTree.insertNodeAfterPath(path, lpara);
               this._undoNodes.push(lpara);
@@ -63249,8 +63573,8 @@ var ParseUndoUnit = /*#__PURE__*/function () {
             this._undoNodes.push(node);
-            if (!(info.prevNode instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_12__/* .ParagraphNode */ .C)) {
-              var _lpara2 = new _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_12__/* .ParagraphNode */ .C(this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, hoEditorFactory.docTree.getParentNode(path), hoEditorFactory.docTree.curParaNo);
+            if (!(info.prevNode instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_14__/* .ParagraphNode */ .C)) {
+              var _lpara2 = new _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_14__/* .ParagraphNode */ .C(this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, hoEditorFactory.docTree.getParentNode(path), hoEditorFactory.docTree.curParaNo);
               hoEditorFactory.docTree.insertNodeAfterPath(path, _lpara2);
               node.paragraphNode = _lpara2;
@@ -63269,7 +63593,7 @@ var ParseUndoUnit = /*#__PURE__*/function () {
           hoEditorFactory.docTree.insertNodeAfterPath(path, node);
-          if (node instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_12__/* .ParagraphNode */ .C) {
+          if (node instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_14__/* .ParagraphNode */ .C) {
             node.refreshDrootNodes();
           }
@@ -63284,22 +63608,22 @@ var ParseUndoUnit = /*#__PURE__*/function () {
         endNode = this._nodes[this._nodes.length - 1];
-        if (endNode instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_13__/* .TableNode */ .Fh) {
+        if (endNode instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_15__/* .TableNode */ .Fh) {
           endNode = this._nodes[this._nodes.length - 1].nextSibling();
         }
       }
       var endPath = hoEditorFactory.docTree.getNodeLastPath(endNode);
-      var changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_6__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_4__/* .DocAction.daInsert */ .gk.daInsert, curRange.startPath, endPath);
+      var changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_8__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_6__/* .DocAction.daInsert */ .gk.daInsert, curRange.startPath, endPath);
       hoEditorFactory.docTree.change(changeEvent);
-      if (((_startPosition$node = startPosition.node) === null || _startPosition$node === void 0 ? void 0 : _startPosition$node.parentNode) instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_17__/* .TextInputFieldNode */ .re) {
+      if (((_startPosition$node = startPosition.node) === null || _startPosition$node === void 0 ? void 0 : _startPosition$node.parentNode) instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_19__/* .TextInputFieldNode */ .re) {
         var _startPosition$node2;
         (_startPosition$node2 = startPosition.node) === null || _startPosition$node2 === void 0 ? void 0 : _startPosition$node2.parentNode.update();
         var ppNode = startPosition.node.parentNode.parentNode;
-        if (ppNode instanceof _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_19__/* .CellNode */ .D && ppNode.drawCell.drawPageCells.length > 1) {
+        if (ppNode instanceof _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_21__/* .CellNode */ .D && ppNode.drawCell.drawPageCells.length > 1) {
           ppNode.drawCell.needUpdate = true;
           ppNode.table.update();
         }
@@ -63308,7 +63632,7 @@ var ParseUndoUnit = /*#__PURE__*/function () {
       this._tmp.start = curRange.startPath;
       this._tmp.end = endPath;
       hoEditorFactory.drawTree.moveCaretToPath(endPath);
-      hoEditorFactory.docTree.curDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_7__/* .DomRange */ .a(this._hoEditorFactoryID, endPath, endPath); // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.repaintSelectShape();
+      hoEditorFactory.docTree.curDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_9__/* .DomRange */ .a(this._hoEditorFactoryID, endPath, endPath); // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.repaintSelectShape();
     }
   }, {
     key: "isEmpty",
@@ -97817,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
@@ -97835,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
@@ -98641,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
@@ -99274,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
@@ -99729,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
@@ -99768,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.
@@ -99808,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
@@ -99822,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
@@ -99975,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
@@ -100039,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()
@@ -100067,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
    *
@@ -100089,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.
@@ -100946,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
@@ -198762,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=3651fabe&
+;// 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 = []
@@ -200366,11 +200706,12 @@ var DrawSelectLevel = /*#__PURE__*/function () {
                   drawNode.children.splice(d, 1);
                 }
               }
-            }
-            hoeditorfactory.docTree.curOnDragNode = null;
-            HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).drawPageTree.updateDrawPage(dPage.pageIndex); //if (drawLine instanceof DrawLine) drawLine.updateCache();
+              hoeditorfactory.docTree.curOnDragNode = null;
+              HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).drawPageTree.updateDrawPage(dPage.pageIndex);
+            } //if (drawLine instanceof DrawLine) drawLine.updateCache();
             //drawNode.stage.update();
           }
           var curComment = hoeditorfactory.drawTree.curOnSelectedComment;
@@ -206744,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.57');
+/* harmony default export */ var version = ('2.0.60');
 ;// 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 = []
@@ -208900,9 +209241,7 @@ var DrawPageTree = /*#__PURE__*/function () {
           }
           if (dPage.drawDomLevel && dPage.drawDomLevel.stage) {
-            {
-              dPage.drawDomLevel.clearStage();
-            }
+            dPage.drawDomLevel.clearStage();
           }
         }
       }
@@ -214408,6 +214747,9 @@ var StagePosition = __webpack_require__(57674);
@@ -219205,7 +219547,7 @@ var VueController = /*#__PURE__*/function () {
         var _loop2 = function _loop2(i) {
           var node = nodes[i];
-          if (node instanceof DownListNode/* DownListNode */.yF && node.isReadOnly || node instanceof DateTimeNode/* DateTimeNode */.Z && node.isReadOnly || node instanceof TextInputFieldNode/* TextInputFieldNode */.re && !node.canModifyContent && node.inputFieldType == 0 && node.childNodes.filter(function (child) {
+          if (node instanceof DownListNode/* DownListNode */.yF && node.isReadOnly || node instanceof DateTimeNode/* DateTimeNode */.Z && node.isReadOnly || node instanceof TextInputFieldNode/* TextInputFieldNode */.re && node.inputFieldType == 0 && node.childNodes.filter(function (child) {
             return child instanceof TextInputFieldNode/* TextInputFieldNode */.re;
           }).length === 0) {
             if (arr.filter(function (v) {
@@ -219667,6 +220009,17 @@ var VueController = /*#__PURE__*/function () {
       var y = (hoEditorFactory.pageProperty.heightPixes - caret.stageY) * 0.75;
       return [caret.pageIndex + 1, caret.stageX * 0.75, y];
     }
+    /**
+     * 获取光标位置
+     * returns [pageIndex, x, y]
+     */
+    // public getSignNodePosition(): [number, number, number] {
+    // 	const hoEditorFactory = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
+    // 	const caret = hoEditorFactory.drawTree.caret;
+    // 	const y = (hoEditorFactory.pageProperty.heightPixes - caret.stageY) * 0.75;
+    // 	return [caret.pageIndex + 1, caret.stageX * 0.75, y];
+    // }
     /**
      * 文档生成并返回base64格式pdf文件 患者签名使用
      */
@@ -219749,7 +220102,7 @@ var VueController = /*#__PURE__*/function () {
   }, {
     key: "insertWriteSign",
-    value: function insertWriteSign(imgSrc, fingerPrintSrc, fingerPosition) {
+    value: function insertWriteSign(imgSrc, fingerPrintSrc, fingerPosition, callback) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var curDomRange = hoEditorFactory.docTree.curDomRange.normalize();
       var startPath = curDomRange.normalize().startPath;
@@ -219780,7 +220133,11 @@ var VueController = /*#__PURE__*/function () {
             var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction.daInsert */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType.insertSign */.y.insertSign);
             if (hoEditorFactory.docTree.changing(changingEvent)) {
-              hoEditorFactory.docController.insertSignNode(curDomRange, 1, "患者签名", node.signor, node.signTime, node.signTimeFormat, imgSrc, node.imgWidth, node.imgHeight, node.customProperty, fingerPrintSrc, fingerPosition);
+              Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 1, "患者签名", node.signor, node.signTime, node.signTimeFormat, imgSrc, node.imgWidth, node.imgHeight, node.customProperty, fingerPrintSrc, fingerPosition)]).then(function () {
+                setTimeout(function () {
+                  callback && callback();
+                }, 0);
+              });
             }
           }, 0);
         }
@@ -219788,7 +220145,11 @@ var VueController = /*#__PURE__*/function () {
         var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction.daInsert */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType.insertSign */.y.insertSign);
         if (hoEditorFactory.docTree.changing(changingEvent)) {
-          hoEditorFactory.docController.insertSignNode(curDomRange, 1, "患者签名", "", "", "", imgSrc, 0, 0, {}, fingerPrintSrc, fingerPosition);
+          Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 1, "患者签名", "", "", "", imgSrc, 0, 0, {}, fingerPrintSrc, fingerPosition)]).then(function () {
+            setTimeout(function () {
+              callback && callback();
+            }, 0);
+          });
         }
       }
     }
@@ -220213,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;
+    }
     /**
      * 初始化文档
      */
@@ -220392,6 +220791,72 @@ var VueController = /*#__PURE__*/function () {
         }
       }
     }
+  }, {
+    key: "showElementsEditRecord",
+    value: function showElementsEditRecord(objects) {
+      var comments = [];
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      for (var i = 0; i < objects.length; i++) {
+        var object = objects[i];
+        var name = object.name;
+        var oldValue = object.oldValue;
+        var elements = this.getNodesByName("main", true, name);
+        for (var j = 0; j < elements.length; j++) {
+          var element = elements[j];
+          if (element instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
+            var commentID = hoEditorFactory.gernerateCode.generateID("C");
+            var comment = new Comment/* Comment */.s(this._hoEditorFactoryID, commentID, oldValue, element.EndMarkNode);
+            comment.lineHeight = comment.lineHeight - 20;
+            comments.push(comment);
+          }
+        }
+      }
+      comments.forEach(function (comment, index) {
+        index++;
+        var endDrawNode = comment.eNode.drawNodes[0];
+        var drawArea = hoEditorFactory.drawPageTree.getMainRootArea(endDrawNode);
+        var dline = hoEditorFactory.drawTree.getDrawLineByDNode(endDrawNode); // 末尾标记节点所在行
+        var stagePos = dline.localToGlobal(endDrawNode.x, endDrawNode.y); // 末尾标记节点的stage坐标
+        var localPos = drawArea.globalToLocal(stagePos.x, stagePos.y); // 末尾标记节点的stage坐标
+        var spX = dline.parent instanceof DrawPageCell/* DrawPageCell */.k ? localPos.x : endDrawNode.x;
+        var spY = localPos.y;
+        drawArea.removeComment(comment);
+        var path = comment.eNode.getNodePath();
+        if (index === 1) {
+          drawArea.drawEditRecords(comment, spX, spY, spY);
+        }
+        if (index >= 2) {
+          drawArea.repaintRecored(comments, comment, path, spX, spY);
+        }
+      });
+    }
+  }, {
+    key: "updateImageSrc",
+    value: function updateImageSrc(node, src) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      var sPath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
+      var ePath = node.getNodePath();
+      var changeEvent = new NodeChangeEvent/* NodeChangeEvent */.G(this._hoEditorFactoryID, DocTree/* DocAction.daModifyStyle */.gk.daModifyStyle, sPath, ePath);
+      changeEvent.oldEndPath = ePath;
+      changeEvent.afterChangePath = ePath;
+      changeEvent.oldDrawLines = new SelectRange/* SelectRange */.E(this._hoEditorFactoryID).getRangeDrawLines(sPath, ePath, true);
+      node.imageDataBase64String = src;
+      hoEditorFactory.docTree.change(changeEvent);
+    }
+  }, {
+    key: "setParaCustomProperty",
+    value: function setParaCustomProperty(paragraphNode, customProperty) {
+      paragraphNode.setCustomProperty(customProperty);
+    }
   }]);
   return VueController;
@@ -222454,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 () {
@@ -222525,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();
@@ -222553,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'));
                   });
                 });
@@ -222568,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);
@@ -222595,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;
@@ -222629,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);
@@ -222644,16 +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.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, );
@@ -222683,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
@@ -222704,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 () {
@@ -222754,18 +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.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);
@@ -222773,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);
+          }
         }
       });
     }
@@ -222854,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]);
@@ -222873,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 () {
@@ -222887,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;
@@ -222896,23 +223385,28 @@ 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.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);
-                            case 6:
+                            case 7:
                             case "end":
                               return _context4.stop();
                           }
@@ -222928,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;
@@ -222963,7 +223457,7 @@ var PrintController = /*#__PURE__*/function () {
                       // 	hoEditorFactory.drawTree.rebuildAllDrawLine(false);
                       // }, 0);
-                      console.timeEnd("连续打印总用时");
+                      console.timeEnd('连续打印总用时');
                       resolves(pos);
                     });
                   } else {
@@ -222979,7 +223473,7 @@ var PrintController = /*#__PURE__*/function () {
                     // 	hoEditorFactory.drawTree.rebuildAllDrawLine(false);
                     // }, 0);
-                    console.timeEnd("连续打印总用时");
+                    console.timeEnd('连续打印总用时');
                     return null;
                   }
                 });
@@ -223017,7 +223511,7 @@ var PrintController = /*#__PURE__*/function () {
     }()
     /**
      * 批量打印病历 当前
-     * @param xmlList [boolean, string, boolean, boolean][]
+     * @param xmlList [string, boolean, string, boolean][]
      * 四个参数分别是： xml内容  是否合并 病程记录id：用来判断是否是病程记录和返回对应病程记录的坐标(处理多个不同病程记录的情况)  是否是最后一份病程记录
      */
@@ -223041,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);
@@ -223102,6 +223596,8 @@ var PrintController = /*#__PURE__*/function () {
                                     } else {
                                       hoEditorFactory.loadImageCallback = toPrint;
                                     }
+                                    mergeList = [];
                                   });
                                 } else {
                                   createSvg();
@@ -223124,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);
                             }
@@ -224035,6 +224531,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
     this._lastSaveTime = new Date(Date.now());
     this._superiorSigns = []; //上级医生签名
+    this._isEnabledGlobalColor = false;
     this._hoEditorFactoryId = id;
   }
   /**
@@ -224692,6 +225189,16 @@ var HOEditorFactory = /*#__PURE__*/function () {
         this._isFixedPrintToA4 = value;
       }
     }
+  }, {
+    key: "isRotate",
+    get: function get() {
+      return this._isRotate;
+    },
+    set: function set(value) {
+      if (this._isRotate !== value) {
+        this._isRotate = value;
+      }
+    }
   }, {
     key: "isUseImagePrint",
     get: function get() {
@@ -224722,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() {
@@ -225078,9 +225595,9 @@ var HoFooter_component = normalizeComponent(
 )
 /* harmony default export */ var components_HoFooter = (HoFooter_component.exports);
-;// 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/ControlModal.vue?vue&type=template&id=2efd7672&
-var ControlModalvue_type_template_id_2efd7672_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"toolModals",staticClass:"control-modal",on:{"mousedown":_vm.toolModalDown}},[(_vm.controlType === 'barcode')?_c('Barcode',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'qrcode')?_c('QrCode',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'express')?_c('ExpressionForm',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"controlProperty":_vm.controlProperty},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'text')?_c('TextDialog',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose},scopedSlots:_vm._u([{key:"hoTextFieldModal",fn:function(){return [_vm._t("hoTextModal")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlType === 'date')?_c('DateDialog',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose},scopedSlots:_vm._u([{key:"hoDateFieldModal",fn:function(){return [_vm._t("hoDateModal")]},proxy:true},{key:"hoTextFieldModal",fn:function(){return [_vm._t("hoTextModal")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlType === 'select')?_c('SelectDialog',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'gestation')?_c('Gestation',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table')?_c('TableProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table-row')?_c('TableRowProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table-cell')?_c('TableCellProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table-col')?_c('TableColProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.isCustoms)?_c('CustomAttributes',{attrs:{"isTableProperty":_vm.isTableProperty},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.isDataSource)?_c('DataSourceDialog',{on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.isListStyle)?_c('ListSource',{on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'RadioBox' || _vm.controlType === 'CheckBox')?_c('RadioCheckbox',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId,"controlProperty":_vm.controlProperty},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'waterset')?_c('WaterSetDialog',{attrs:{"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'comment')?_c('CommentDialog',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"insertComments":_vm.insertComments,"closed":_vm.handleClose},scopedSlots:_vm._u([{key:"hoCommentModal",fn:function(){return [_vm._t("hoComment")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlType === 'pageInfoes')?_c('PageInfoes',{attrs:{"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'delimiter')?_c('Delimiter',{attrs:{"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'sign')?_c('Sign',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'upload-image')?_c('UploadImageDialog',{attrs:{"uploadImageParams":_vm.uploadImageParams,"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e()],1)}
-var ControlModalvue_type_template_id_2efd7672_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/components/controls/ControlModal.vue?vue&type=template&id=35544190&
+var ControlModalvue_type_template_id_35544190_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"toolModals",staticClass:"control-modal",on:{"mousedown":_vm.toolModalDown}},[(_vm.controlType === 'barcode')?_c('Barcode',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'qrcode')?_c('QrCode',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'express')?_c('ExpressionForm',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"controlProperty":_vm.controlProperty},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'text')?_c('TextDialog',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose},scopedSlots:_vm._u([{key:"hoTextFieldModal",fn:function(){return [_vm._t("hoTextModal")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlType === 'date')?_c('DateDialog',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose},scopedSlots:_vm._u([{key:"hoDateFieldModal",fn:function(){return [_vm._t("hoDateModal")]},proxy:true},{key:"hoTextFieldModal",fn:function(){return [_vm._t("hoTextModal")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlType === 'select')?_c('SelectDialog',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'gestation')?_c('Gestation',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table')?_c('TableProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table-row')?_c('TableRowProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table-cell')?_c('TableCellProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table-col')?_c('TableColProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.isCustoms)?_c('CustomAttributes',{attrs:{"isTableProperty":_vm.isTableProperty},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.isDataSource)?_c('DataSourceDialog',{on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.isListStyle)?_c('ListSource',{on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'RadioBox' || _vm.controlType === 'CheckBox')?_c('RadioCheckbox',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId,"controlProperty":_vm.controlProperty},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'waterset')?_c('WaterSetDialog',{attrs:{"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'comment')?_c('CommentDialog',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"insertComments":_vm.insertComments,"closed":_vm.handleClose},scopedSlots:_vm._u([{key:"hoCommentModal",fn:function(){return [_vm._t("hoComment")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlType === 'pageInfoes')?_c('PageInfoes',{attrs:{"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'delimiter')?_c('Delimiter',{attrs:{"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'sign')?_c('Sign',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'upload-image')?_c('UploadImageDialog',{attrs:{"uploadImageParams":_vm.uploadImageParams,"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'edit-image')?_c('CanvasImageDialog',{attrs:{"vueController":_vm.vueController,"hoEditorFactoryId":_vm.hoEditorFactoryId,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e()],1)}
+var ControlModalvue_type_template_id_35544190_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/components/controls/selectDialog/SelectDialog.vue?vue&type=template&id=3b6d4c1e&scoped=true&
@@ -228366,9 +228883,9 @@ var Delimiter_component = normalizeComponent(
 ;// CONCATENATED MODULE: ./src/components/controls/delimiter/index.ts
 /* harmony default export */ var delimiter = (delimiter_Delimiter);
-;// 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/sign/Sign.vue?vue&type=template&id=0d96e4f0&
-var Signvue_type_template_id_0d96e4f0_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.animationClassNames},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("签名")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content",staticStyle:{"paDDing":"20px"}},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名名称")]),_c('el-input',{staticStyle:{"width":"120px","display":"flex"},attrs:{"size":"mini"},model:{value:(_vm.name),callback:function ($$v) {_vm.name=$$v},expression:"name"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"}),_c('el-radio',{attrs:{"label":0},model:{value:(_vm.signType),callback:function ($$v) {_vm.signType=$$v},expression:"signType"}},[_vm._v("单人签名")]),_c('el-radio',{attrs:{"label":1},model:{value:(_vm.signType),callback:function ($$v) {_vm.signType=$$v},expression:"signType"}},[_vm._v("多人签名")])],1),(_vm.signType === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名格式")]),_c('el-select',{attrs:{"size":"mini","placeholder":"请选择"},model:{value:(_vm.signFormat),callback:function ($$v) {_vm.signFormat=$$v},expression:"signFormat"}},[_c('el-option',{attrs:{"label":"<医师姓名>","value":"<医师姓名>"}}),_c('el-option',{attrs:{"label":"<医师姓名>（<医师职称>）","value":"<医师姓名>（<医师职称>）"}}),_c('el-option',{attrs:{"label":"<医师姓名>：<医师职称>","value":"<医师姓名>：<医师职称>"}}),_c('el-option',{attrs:{"label":"<医师姓名>：<医师职称>\\n<签名时间>","value":"<医师姓名>：<医师职称>\\n<签名时间>"}}),_vm._l((_vm.customSignFormatList),function(format){return _c('el-option',{key:format.label,attrs:{"label":format.label,"value":format.value}})})],2)],1):_vm._e(),(_vm.signType === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名时间格式")]),_c('el-select',{attrs:{"size":"mini","placeholder":"请选择"},model:{value:(_vm.signTimeFormat),callback:function ($$v) {_vm.signTimeFormat=$$v},expression:"signTimeFormat"}},[_c('el-option',{attrs:{"label":"yyyy-MM-DD HH:mm:ss","value":"yyyy-MM-DD HH:mm:ss"}}),_c('el-option',{attrs:{"label":"yyyy-MM-DD HH:mm","value":"yyyy-MM-DD HH:mm"}}),_c('el-option',{attrs:{"label":"yyyy/MM/DD HH:mm:ss","value":"yyyy/MM/DD HH:mm:ss"}}),_c('el-option',{attrs:{"label":"yyyy/MM/DD HH:mm","value":"yyyy/MM/DD HH:mm"}}),_c('el-option',{attrs:{"label":"yyyy年MM月DD日 HH时mm分ss秒","value":"yyyy年MM月DD日 HH时mm分ss秒"}}),_c('el-option',{attrs:{"label":"yyyy年MM月DD日 HH时mm分","value":"yyyy年MM月DD日 HH时mm分"}})],1)],1):_vm._e(),(_vm.signType === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名连接方式")]),_c('el-select',{attrs:{"size":"mini","placeholder":"请选择"},model:{value:(_vm.connectMode),callback:function ($$v) {_vm.connectMode=$$v},expression:"connectMode"}},[_c('el-option',{attrs:{"label":"/","value":"/"}}),_c('el-option',{attrs:{"label":"换行","value":"换行"}}),_c('el-option',{attrs:{"label":"、","value":"、"}}),_c('el-option',{attrs:{"label":"，","value":"，"}})],1)],1):_vm._e(),(_vm.signType === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"}),_c('el-checkbox',{model:{value:(_vm.isFront),callback:function ($$v) {_vm.isFront=$$v},expression:"isFront"}},[_vm._v("连接符前置")]),_c('el-tooltip',{attrs:{"placement":"right","effect":"dark"}},[_c('div',{attrs:{"slot":"content"},slot:"content"},[_vm._v("不勾选参数:     医师签名 / "),_c('br'),_vm._v("   勾选参数:     / 医师签名 ")]),_c('i',{staticClass:"el-icon-info",staticStyle:{"font-size":"18px","margin-left":"10px"}})])],1):_vm._e(),(_vm.signType === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"}),_c('el-checkbox',{model:{value:(_vm.allowEditSignTime),callback:function ($$v) {_vm.allowEditSignTime=$$v},expression:"allowEditSignTime"}},[_vm._v("允许修改签名时间")])],1):_vm._e()]),(_vm.signType === 1)?_c('div',{staticClass:"section-right"},[_c('div',{staticClass:"custom-format-tool-box"},[_c('ul',{staticClass:"custom-format-tool"},[_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<医师姓名>'}}},[_vm._v("医师姓名")]),_c('i',{staticClass:"el-icon-circle-plus"})],1),_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<医师工号>'}}},[_vm._v("医师工号")]),_c('i',{staticClass:"el-icon-circle-plus"})],1),_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<医师职称>'}}},[_vm._v("医师职称")]),_c('i',{staticClass:"el-icon-circle-plus"})],1),_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<签名时间>'}}},[_vm._v("签名时间")]),_c('i',{staticClass:"el-icon-circle-plus"})],1)]),_c('el-input',{attrs:{"type":"textarea","placeholder":"请输入内容"},model:{value:(_vm.customFormatContent),callback:function ($$v) {_vm.customFormatContent=$$v},expression:"customFormatContent"}})],1),_c('p',[_vm._v("提示：")]),_c('p',[_vm._v("1. 尖括号内的内容用来替换, 不能修改")]),_c('p',[_vm._v("2. 尖括号外的内容处理格式，可以编辑")]),_c('p',[_vm._v("2. 回车键可以自动换行，或者手动插入换行符\\n")]),_c('div',{staticClass:"custom-format-tool-btn"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.createSignFormat}},[_vm._v("添加自定义签名格式")])],1)]):_vm._e()]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.insertSign}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
-var Signvue_type_template_id_0d96e4f0_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/components/controls/sign/Sign.vue?vue&type=template&id=6c042af0&
+var Signvue_type_template_id_6c042af0_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.animationClassNames},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("签名")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content",staticStyle:{"paDDing":"20px"}},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名名称")]),_c('el-input',{staticStyle:{"width":"120px","display":"flex"},attrs:{"size":"mini"},model:{value:(_vm.name),callback:function ($$v) {_vm.name=$$v},expression:"name"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"}),_c('el-radio',{attrs:{"label":0},model:{value:(_vm.signType),callback:function ($$v) {_vm.signType=$$v},expression:"signType"}},[_vm._v("常规签名")]),_c('el-radio',{attrs:{"label":1},model:{value:(_vm.signType),callback:function ($$v) {_vm.signType=$$v},expression:"signType"}},[_vm._v("自定义签名")])],1),(_vm.signType === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名格式")]),_c('el-select',{attrs:{"size":"mini","placeholder":"请选择"},model:{value:(_vm.signFormat),callback:function ($$v) {_vm.signFormat=$$v},expression:"signFormat"}},[_c('el-option',{attrs:{"label":"<医师姓名>","value":"<医师姓名>"}}),_c('el-option',{attrs:{"label":"<医师姓名>（<医师职称>）","value":"<医师姓名>（<医师职称>）"}}),_c('el-option',{attrs:{"label":"<医师姓名>：<医师职称>","value":"<医师姓名>：<医师职称>"}}),_c('el-option',{attrs:{"label":"<医师姓名>：<医师职称>\\n<签名时间>","value":"<医师姓名>：<医师职称>\\n<签名时间>"}}),_vm._l((_vm.customSignFormatList),function(format){return _c('el-option',{key:format.label,attrs:{"label":format.label,"value":format.value}})})],2)],1):_vm._e(),(_vm.signType === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名时间格式")]),_c('el-select',{attrs:{"size":"mini","placeholder":"请选择"},model:{value:(_vm.signTimeFormat),callback:function ($$v) {_vm.signTimeFormat=$$v},expression:"signTimeFormat"}},[_c('el-option',{attrs:{"label":"yyyy-MM-DD HH:mm:ss","value":"yyyy-MM-DD HH:mm:ss"}}),_c('el-option',{attrs:{"label":"yyyy-MM-DD HH:mm","value":"yyyy-MM-DD HH:mm"}}),_c('el-option',{attrs:{"label":"yyyy/MM/DD HH:mm:ss","value":"yyyy/MM/DD HH:mm:ss"}}),_c('el-option',{attrs:{"label":"yyyy/MM/DD HH:mm","value":"yyyy/MM/DD HH:mm"}}),_c('el-option',{attrs:{"label":"yyyy年MM月DD日 HH时mm分ss秒","value":"yyyy年MM月DD日 HH时mm分ss秒"}}),_c('el-option',{attrs:{"label":"yyyy年MM月DD日 HH时mm分","value":"yyyy年MM月DD日 HH时mm分"}})],1)],1):_vm._e(),(_vm.signType === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名连接方式")]),_c('el-select',{attrs:{"size":"mini","placeholder":"请选择"},model:{value:(_vm.connectMode),callback:function ($$v) {_vm.connectMode=$$v},expression:"connectMode"}},[_c('el-option',{attrs:{"label":"/","value":"/"}}),_c('el-option',{attrs:{"label":"换行","value":"换行"}}),_c('el-option',{attrs:{"label":"、","value":"、"}}),_c('el-option',{attrs:{"label":"，","value":"，"}})],1)],1):_vm._e(),(_vm.signType === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"}),_c('el-checkbox',{model:{value:(_vm.isFront),callback:function ($$v) {_vm.isFront=$$v},expression:"isFront"}},[_vm._v("连接符前置")]),_c('el-tooltip',{attrs:{"placement":"right","effect":"dark"}},[_c('div',{attrs:{"slot":"content"},slot:"content"},[_vm._v("不勾选参数:     医师签名 / "),_c('br'),_vm._v("   勾选参数:     / 医师签名 ")]),_c('i',{staticClass:"el-icon-info",staticStyle:{"font-size":"18px","margin-left":"10px"}})])],1):_vm._e(),(_vm.signType === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"}),_c('el-checkbox',{model:{value:(_vm.allowEditSignTime),callback:function ($$v) {_vm.allowEditSignTime=$$v},expression:"allowEditSignTime"}},[_vm._v("允许修改签名时间")])],1):_vm._e()]),(_vm.signType === 1)?_c('div',{staticClass:"section-right"},[_c('div',{staticClass:"custom-format-tool-box"},[_c('ul',{staticClass:"custom-format-tool"},[_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<医师姓名>'}}},[_vm._v("医师姓名")]),_c('i',{staticClass:"el-icon-circle-plus"})],1),_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<医师工号>'}}},[_vm._v("医师工号")]),_c('i',{staticClass:"el-icon-circle-plus"})],1),_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<医师职称>'}}},[_vm._v("医师职称")]),_c('i',{staticClass:"el-icon-circle-plus"})],1),_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<签名时间>'}}},[_vm._v("签名时间")]),_c('i',{staticClass:"el-icon-circle-plus"})],1)]),_c('el-input',{attrs:{"type":"textarea","placeholder":"请输入内容"},model:{value:(_vm.customFormatContent),callback:function ($$v) {_vm.customFormatContent=$$v},expression:"customFormatContent"}})],1),_c('p',[_vm._v("提示：")]),_c('p',[_vm._v("1. 尖括号内的内容用来替换, 不能修改")]),_c('p',[_vm._v("2. 尖括号外的内容处理格式，可以编辑")]),_c('p',[_vm._v("2. 回车键可以自动换行，或者手动插入换行符\\n")]),_c('div',{staticClass:"custom-format-tool-btn"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.createSignFormat}},[_vm._v("添加自定义签名格式")])],1)]):_vm._e()]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.insertSign}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
+var Signvue_type_template_id_6c042af0_staticRenderFns = []
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/sign/Sign.vue?vue&type=script&lang=ts&
@@ -228515,8 +229032,8 @@ Sign = __decorate([vue_class_component_esm({
 var Sign_component = normalizeComponent(
   sign_Signvue_type_script_lang_ts_,
-  Signvue_type_template_id_0d96e4f0_render,
-  Signvue_type_template_id_0d96e4f0_staticRenderFns,
+  Signvue_type_template_id_6c042af0_render,
+  Signvue_type_template_id_6c042af0_staticRenderFns,
   false,
   null,
   null,
@@ -228891,9 +229408,339 @@ var UploadImageDialog_component = normalizeComponent(
 )
 /* harmony default export */ var upload_UploadImageDialog = (UploadImageDialog_component.exports);
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/upload/CanvasImageDialog.vue?vue&type=template&id=6832ea7e&scoped=true&
+var CanvasImageDialogvue_type_template_id_6832ea7e_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"canvas-image",class:_vm.animationClassNames,style:({ width: _vm.canvasWidth + 250 + 'px', height: _vm.canvasHeight + 150 + 'px' })},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("编辑图片")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content",attrs:{"id":"loon_canvas_editor"}},[_c('div',{style:({ width: _vm.canvasWidth + 'px', height: _vm.canvasHeight + 'px' }),attrs:{"id":"loon_canvas_editor_box"}},[_c('canvas',{style:({ width: _vm.canvasWidth + 'px', height: _vm.canvasHeight + 'px' }),attrs:{"id":"image_canvas","width":_vm.canvasWidth,"height":_vm.canvasHeight}}),(_vm.tool === 0 && _vm.textAreaStyle.width)?_c('textarea',{ref:"textCanvas",style:(_vm.textAreaStyle),attrs:{"id":"text_canvas"},on:{"blur":function($event){return _vm.drawText()}}}):_vm._e()])]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"type":_vm.tool === 0 ? 'primary' : '',"size":"small"},on:{"click":function($event){_vm.tool = 0}}},[_vm._v("文字")]),_c('el-button',{attrs:{"type":_vm.tool === 1 ? 'primary' : '',"size":"small"},on:{"click":function($event){_vm.tool = 1}}},[_vm._v("画笔")]),_c('el-button',{attrs:{"size":"small"},on:{"click":function($event){return _vm.canvasUndo()}}},[_vm._v("撤销")]),_c('el-button',{attrs:{"size":"small"},on:{"click":function($event){return _vm.canvasRedo()}}},[_vm._v("恢复")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small","loading":_vm.uploadLoading,"type":"primary"},on:{"click":_vm.sure}},[_vm._v("保存")]),_c('el-button',{attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
+var CanvasImageDialogvue_type_template_id_6832ea7e_scoped_true_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40[0].rules[0].use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/upload/CanvasImageDialog.vue?vue&type=script&lang=js&
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+/* harmony default export */ var CanvasImageDialogvue_type_script_lang_js_ = ({
+  name: 'canvasImageDialog',
+  props: {
+    hoEditorFactoryId: {
+      type: String,
+      required: true
+    },
+    vueController: {
+      type: Object,
+      required: true
+    }
+  },
+  data: function data() {
+    return {
+      canvasWidth: 500,
+      canvasHeight: 400,
+      animationClassNames: 'control-modal-contents image-modal animation-in',
+      uploadLoading: false,
+      eraserEnabled: false,
+      activeBgColor: '#fff',
+      ifPop: false,
+      lWidth: 2,
+      opacity: 1,
+      strokeColor: '#FF0000',
+      radius: 5,
+      canvasHistory: [],
+      step: -1,
+      canvas: null,
+      textarea: null,
+      canvasArea: null,
+      context: null,
+      painting: false,
+      // 定义一个变量初始化画笔状态
+      startPoint: {
+        x: undefined,
+        y: undefined
+      },
+      // 记录画笔最后一次的位置
+      tool: 1,
+      textAreaStyle: {}
+    };
+  },
+  watch: {
+    tool: function tool() {
+      if (this.tool === 0) {
+        this.canvas.removeEventListener('mousemove', this.move);
+      } else if (this.tool === 1) {
+        this.canvas.addEventListener('mousemove', this.move);
+      }
+    },
+    canvasHistory: function canvasHistory() {}
+  },
+  mounted: function mounted() {
+    var _this = this;
+    this.canvas = document.querySelector('#image_canvas');
+    this.canvasArea = document.querySelector('#loon_canvas_editor_box');
+    this.context = this.canvas.getContext('2d');
+    this.listenDrawLine();
+    var updateNode = this.getImageNode();
+    var image = new Image();
+    image.src = updateNode.imageDataBase64String;
+    image.onload = function () {
+      _this.canvasWidth = image.naturalWidth;
+      _this.canvasHeight = image.naturalHeight;
+      _this.context.clearRect(0, 0, _this.canvasWidth, _this.canvasHeight);
+      setTimeout(function () {
+        _this.context.drawImage(image, 0, 0, _this.canvasWidth, _this.canvasHeight);
+        _this.canvasDraw();
+      }, 0);
+    };
+  },
+  methods: {
+    getImageNode: function getImageNode() {
+      var value;
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorFactoryId);
+      var curOnDragNode = hoEditorFactory.docTree.curOnDragNode;
+      if (curOnDragNode instanceof ImageNode/* ImageNode */.H) {
+        value = curOnDragNode;
+      }
+      return value;
+    },
+    listenDrawLine: function listenDrawLine() {
+      this.canvas.addEventListener('mousedown', this.down);
+      this.canvas.addEventListener('mousemove', this.move);
+      this.canvasArea.addEventListener('mouseup', this.up);
+    },
+    clearListenDrawLine: function clearListenDrawLine() {
+      this.canvas.removeEventListener('mousedown', this.down);
+      this.canvas.removeEventListener('mousemove', this.move);
+      this.canvasArea.removeEventListener('mouseup', this.up);
+    },
+    changeTool: function changeTool(tool) {
+      this.tool = tool;
+    },
+    down: function down(e) {
+      var _this2 = this;
+      this.painting = true;
+      this.startPoint = {
+        x: e.offsetX,
+        y: e.offsetY
+      };
+      if (this.tool === 0) {
+        this.textAreaStyle = {
+          width: '100px',
+          height: '27px',
+          left: e.offsetX + 'px',
+          top: e.offsetY + 'px'
+        };
+        setTimeout(function () {
+          if (_this2.$refs.textCanvas) {
+            _this2.$refs.textCanvas.focus();
+          }
+        }, 0);
+      }
+      e.stopPropagation();
+      e.preventDefault();
+    },
+    move: function move(e) {
+      switch (this.tool) {
+        case 0:
+          {
+            this.drawText(e);
+            break;
+          }
+        case 1:
+          {
+            this.drawLine(e);
+            break;
+          }
+      }
+    },
+    up: function up(e) {
+      if (this.tool === 0) {
+        this.canvas.removeEventListener('mousemove', this.move);
+      }
+      this.painting = false;
+      if (this.tool === 1) {
+        this.canvasDraw();
+      }
+      e.stopPropagation();
+      e.preventDefault();
+    },
+    changeText: function changeText(e) {
+      if (e.offsetX - this.startPoint.x > 0) {
+        this.textAreaStyle.width = e.offsetX - this.startPoint.x + 'px';
+      } else {
+        this.textAreaStyle.width = -(e.offsetX - this.startPoint.x) + 'px';
+        this.textAreaStyle.left = e.offsetX + 'px';
+      }
+      if (e.offsetY - this.startPoint.y > 0) {
+        this.textAreaStyle.height = e.offsetY - this.startPoint.y + 'px';
+      } else {
+        this.textAreaStyle.height = -(e.offsetY - this.startPoint.y) + 'px';
+        this.textAreaStyle.top = e.offsetY + 'px';
+      }
+    },
+    drawText: function drawText() {
+      if (this.$refs.textCanvas && this.$refs.textCanvas.value) {
+        this.context.font = '16px 宋体';
+        this.context.fillStyle = '#F00';
+        this.context.fillText(this.$refs.textCanvas.value, this.textAreaStyle.left.split('px')[0], Number(this.textAreaStyle.top.split('px')[0]) + 16);
+        this.canvasDraw();
+        this.$refs.textCanvas.value = '';
+        this.textAreaStyle = {};
+      }
+    },
+    drawLine: function drawLine(e) {
+      if (!this.painting) return;
+      this.context.beginPath();
+      this.context.lineWidth = this.lWidth;
+      this.context.strokeStyle = this.strokeColor; // 设置线条末端样式。
+      this.context.lineCap = 'round'; // 设定线条与线条间接合处的样式
+      this.context.lineJoin = 'round';
+      this.context.moveTo(this.startPoint.x, this.startPoint.y);
+      this.context.lineTo(e.offsetX, e.offsetY);
+      this.context.stroke();
+      this.context.closePath();
+      this.startPoint = {
+        x: e.offsetX,
+        y: e.offsetY
+      };
+      e.stopPropagation();
+      e.preventDefault();
+    },
+    // 绘制方法
+    canvasDraw: function canvasDraw() {
+      this.step++;
+      if (this.step < this.canvasHistory.length) {
+        this.canvasHistory.length = this.step; // 截断数组
+      }
+      var quality = 1;
+      var base64 = this.canvas.toDataURL('image/jpeg', quality); //压缩语句
+      // 如想确保图片压缩到自己想要的尺寸,如要求在100kb以下，请加以下语句，quality初始值根据情况自定
+      while (base64.length / 1024 > 100) {
+        quality -= 0.01;
+        base64 = this.canvas.toDataURL('image/jpeg', quality);
+      } // 添加新的绘制到历史记录
+      this.canvasHistory.push(this.canvas.toDataURL());
+    },
+    // 撤销方法
+    canvasUndo: function canvasUndo() {
+      var _this3 = this;
+      if (this.step > 0) {
+        this.step--;
+        var canvasPic = new Image();
+        canvasPic.src = this.canvasHistory[this.step];
+        this.context.clearRect(0, 0, this.canvasWidth, this.canvasHeight);
+        canvasPic.onload = function () {
+          _this3.context.drawImage(canvasPic, 0, 0);
+        };
+      }
+    },
+    // 恢复方法
+    canvasRedo: function canvasRedo() {
+      var _this4 = this;
+      if (this.step < this.canvasHistory.length - 1) {
+        this.step++;
+        var canvasPic = new Image();
+        canvasPic.src = this.canvasHistory[this.step];
+        this.context.clearRect(0, 0, this.canvasWidth, this.canvasHeight);
+        canvasPic.onload = function () {
+          _this4.context.drawImage(canvasPic, 0, 0);
+        };
+      }
+    },
+    handleClose: function handleClose() {
+      this.clearListenDrawLine();
+      this.$emit('closed');
+    },
+    sure: function sure() {
+      var updateNode = this.getImageNode();
+      var src = this.canvasHistory[this.canvasHistory.length - 1];
+      if (updateNode && src) {
+        this.vueController.updateImageSrc(updateNode, src);
+        this.handleClose();
+      }
+    }
+  }
+});
+;// CONCATENATED MODULE: ./src/components/controls/upload/CanvasImageDialog.vue?vue&type=script&lang=js&
+ /* harmony default export */ var upload_CanvasImageDialogvue_type_script_lang_js_ = (CanvasImageDialogvue_type_script_lang_js_);
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/upload/CanvasImageDialog.vue?vue&type=style&index=0&id=6832ea7e&lang=scss&scoped=true&
+// extracted by mini-css-extract-plugin
+;// CONCATENATED MODULE: ./src/components/controls/upload/CanvasImageDialog.vue?vue&type=style&index=0&id=6832ea7e&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./src/components/controls/upload/CanvasImageDialog.vue
+;
+/* normalize component */
+var CanvasImageDialog_component = normalizeComponent(
+  upload_CanvasImageDialogvue_type_script_lang_js_,
+  CanvasImageDialogvue_type_template_id_6832ea7e_scoped_true_render,
+  CanvasImageDialogvue_type_template_id_6832ea7e_scoped_true_staticRenderFns,
+  false,
+  null,
+  "6832ea7e",
+  null
+)
+/* harmony default export */ var CanvasImageDialog = (CanvasImageDialog_component.exports);
 ;// CONCATENATED MODULE: ./src/components/controls/upload/index.ts
-/* harmony default export */ var upload = (upload_UploadImageDialog);
 ;// 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/watermark/WaterSet.vue?vue&type=template&id=58b59c58&
 var WaterSetvue_type_template_id_58b59c58_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"control-modal-contents water-set animation-in"},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("水印")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content"},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label",staticStyle:{"width":"50px"}},[_vm._v("内容")]),_c('el-input',{attrs:{"type":"text","size":"mini","clearable":"","placeholder":"文本内容","maxlength":"20","show-word-limit":""},on:{"input":_vm.codeChange},model:{value:(_vm.textContent),callback:function ($$v) {_vm.textContent=$$v},expression:"textContent"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label",staticStyle:{"width":"50px"}},[_vm._v("角度")]),_c('el-radio-group',{attrs:{"size":"mini"},on:{"change":_vm.codeChange},model:{value:(_vm.rotate),callback:function ($$v) {_vm.rotate=$$v},expression:"rotate"}},[_c('el-radio-button',{attrs:{"label":0}},[_vm._v("水平")]),_c('el-radio-button',{attrs:{"label":1}},[_vm._v("倾斜")])],1)],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label",staticStyle:{"width":"50px"}},[_vm._v("颜色")]),_c('el-color-picker',{attrs:{"show-alpha":""},on:{"change":_vm.codeChange},model:{value:(_vm.color),callback:function ($$v) {_vm.color=$$v},expression:"color"}})],1)]),_c('div',{staticClass:"section-right"},[_c('fieldset',{staticClass:"fieldset"},[_c('legend',[_vm._v("预 览")]),_c('div',{attrs:{"id":"water"}},[_c('img',{directives:[{name:"show",rawName:"v-show",value:(_vm.waterUrl),expression:"waterUrl"}],attrs:{"src":_vm.waterUrl,"alt":"背景水印"}})])])])]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.sure}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
 var WaterSetvue_type_template_id_58b59c58_staticRenderFns = []
@@ -230678,7 +231525,8 @@ ControlModal = __decorate([vue_class_component_esm({
     CommentDialog: commentDialog,
     PageInfoes: pageInfoes,
     Delimiter: delimiter,
-    UploadImageDialog: upload
+    UploadImageDialog: upload_UploadImageDialog,
+    CanvasImageDialog: CanvasImageDialog
   }
 })], ControlModal);
 /* harmony default export */ var ControlModalvue_type_script_lang_ts_ = (ControlModal);
@@ -230694,8 +231542,8 @@ ControlModal = __decorate([vue_class_component_esm({
 ;
 var ControlModal_component = normalizeComponent(
   controls_ControlModalvue_type_script_lang_ts_,
-  ControlModalvue_type_template_id_2efd7672_render,
-  ControlModalvue_type_template_id_2efd7672_staticRenderFns,
+  ControlModalvue_type_template_id_35544190_render,
+  ControlModalvue_type_template_id_35544190_staticRenderFns,
   false,
   null,
   null,
@@ -231384,7 +232232,7 @@ var ControlMixin = /*#__PURE__*/function (_Vue) {
         this.rightType = node.controlStyle;
         this.dataSource = node.bandDataSource;
       } else if (node instanceof ImageNode/* ImageNode */.H) {
-        this.rightType = "img";
+        this.rightType = "edit-image";
       } else if (node instanceof LabelNode/* LabelNode */.P) {
         this.rightType = "label";
       } else if (node instanceof SignNode/* SignNode */.N) {
@@ -231914,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
@@ -231937,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",
@@ -231954,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;
@@ -231968,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));
       }
     }
   }, {
@@ -232013,7 +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);
+      var isFixedPrintToA4 = this.isFixedPrintToA4;
+      if (isFixedPrintToA4 === true) {
+        isFixedPrintToA4 = '1';
+      } else if (isFixedPrintToA4 === false) {
+        isFixedPrintToA4 = '';
+      }
+      hoEditorFactory && (hoEditorFactory.isFixedPrintToA4 = isFixedPrintToA4);
     } // 监听默认打印纸张设置变化
   }, {
@@ -232057,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() {
@@ -232087,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);
@@ -232096,10 +232959,18 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
           hoEditor.superiorSigns = (0,toConsumableArray/* default */.Z)(_this3.superiorSigns);
         }
-        hoEditor.isFixedPrintToA4 = _this3.isFixedPrintToA4;
+        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;
@@ -232130,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];
@@ -232148,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);
               }
             });
@@ -232187,7 +233058,7 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
         };
       }
-      this.$emit("rightClickEvent", nodeInfoes);
+      this.$emit('rightClickEvent', nodeInfoes);
     }
     /**
      * 初始化事件
@@ -232229,7 +233100,7 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
   }, {
     key: "insertComments",
     value: function insertComments(content) {
-      this.$emit("insertComments", content);
+      this.$emit('insertComments', content);
     }
     /**
      * 双击事件
@@ -232238,7 +233109,7 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
   }, {
     key: "dblNodeClick",
     value: function dblNodeClick(node) {
-      this.$emit("dblClickEvent", node);
+      this.$emit('dblClickEvent', node);
     } // 设置字体
   }, {
@@ -232260,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,
@@ -232291,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) {
@@ -232318,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'
           });
         } // 复制粘贴基准值
@@ -232394,7 +233265,7 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
   }, {
     key: "closeControlModal",
     value: function closeControlModal() {
-      this.setControlProperty("", "add", "");
+      this.setControlProperty('', 'add', '');
     }
     /**
      * 非文档区域右键事件
@@ -232403,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') {}
     }
   }]);
@@ -232441,7 +233312,7 @@ __decorate([Prop({
 })], HoDocs.prototype, "isUseTipText", void 0);
 __decorate([Prop({
-  default: false
+  default: ''
 })], HoDocs.prototype, "isFixedPrintToA4", void 0);
 __decorate([Prop({
@@ -232456,54 +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("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,
@@ -236638,9 +237515,9 @@ var ToolTablevue_type_template_id_194f516e_render = function () {var _vm=this;va
 var ToolTablevue_type_template_id_194f516e_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/components/toolbar/insert/HoTableFeatures.vue?vue&type=template&id=2fd610cb&
-var HoTableFeaturesvue_type_template_id_2fd610cb_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('li',{ref:"hoTableFeatures",staticClass:"ho-table-features"},[_c('el-dialog',{attrs:{"width":"520px","top":"20%","center":"","append-to-body":"","close-on-click-modal":false,"title":_vm.dialogFormTitle,"visible":_vm.dialogFormVisible},on:{"update:visible":function($event){_vm.dialogFormVisible=$event}}},[_c('p',{staticStyle:{"padding":"10px 0"}},[_vm._v(" 请输入表单项对应的单元格编号，从左到右依次为ABCD...，从上到下依次为1234... ")]),(_vm.formula === 'a1: a2' || _vm.formula === '(a1 + a2) * 2')?_c('section',[_c('div',{staticStyle:{"height":"26px","line-height":"36px","font-size":"16px"}},[_vm._v(" "+_vm._s(_vm.dialogFormTitle)+" ")]),_c('div',{staticStyle:{"height":"36px","line-height":"36px"}},[_vm._v("示例： "+_vm._s(_vm.dialogFormTitle === '表格行列求和公式' ? 'a1: a2' : '(a1 + a2) * 2'))]),_c('el-checkbox',{model:{value:(_vm.isHideZero),callback:function ($$v) {_vm.isHideZero=$$v},expression:"isHideZero"}},[_vm._v("结果为 0 不显示")]),_c('p',{staticStyle:{"height":"10px"}}),_c('el-input',{attrs:{"autocomplete":"off"},model:{value:(_vm.simpleFormula),callback:function ($$v) {_vm.simpleFormula=$$v},expression:"simpleFormula"}})],1):_vm._e(),(_vm.formula === 'bmi')?_c('section',[_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v("身高")]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.height),callback:function ($$v) {_vm.height=$$v},expression:"height"}})],1),_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v("体重")]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.weight),callback:function ($$v) {_vm.weight=$$v},expression:"weight"}})],1)]):_vm._e(),(_vm.formula === 'labor')?_c('section',[_c('el-checkbox',{model:{value:(_vm.isHideZero),callback:function ($$v) {_vm.isHideZero=$$v},expression:"isHideZero"}},[_vm._v("结果为 0 不显示")]),_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v("产程类型")]),_c('el-select',{attrs:{"size":"mini"},on:{"change":_vm.laborTypeChange},model:{value:(_vm.laborType),callback:function ($$v) {_vm.laborType=$$v},expression:"laborType"}},[_c('el-option',{attrs:{"value":1,"label":"第一产程"}}),_c('el-option',{attrs:{"value":2,"label":"第二产程"}}),_c('el-option',{attrs:{"value":3,"label":"第三产程"}}),_c('el-option',{attrs:{"value":0,"label":"总产程"}})],1)],1),_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v(_vm._s(['第一产程', '宫缩开始', '宫口全开', '胎儿娩出'][_vm.laborType]))]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.labor1),callback:function ($$v) {_vm.labor1=$$v},expression:"labor1"}})],1),_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v(_vm._s(['第二产程', '宫口全开', '胎儿娩出', '胎盘娩出'][_vm.laborType]))]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.labor2),callback:function ($$v) {_vm.labor2=$$v},expression:"labor2"}})],1),(_vm.laborType === 0)?_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v(_vm._s(['第三产程', '宫缩开始', '宫口全开', '胎儿娩出'][_vm.laborType]))]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.labor3),callback:function ($$v) {_vm.labor3=$$v},expression:"labor3"}})],1):_vm._e()],1):_vm._e(),(_vm.formula === 'expectedDate' || _vm.formula === 'pregnantDays' || _vm.formula === 'pregnantWeeks')?_c('section',[_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v("末次月经")]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.expectedDate),callback:function ($$v) {_vm.expectedDate=$$v},expression:"expectedDate"}})],1)]):_vm._e(),(_vm.formula === 'ftScoreMapping')?_c('section',[_c('div',{staticClass:"ho-table-features-list"},[_c('p',{staticStyle:{"width":"220px"}},[_vm._v("分值所在的单元格编号")]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.ftScoreMapping.cell),callback:function ($$v) {_vm.$set(_vm.ftScoreMapping, "cell", $$v)},expression:"ftScoreMapping.cell"}})],1),_c('div',{staticClass:"ho-table-features-list"},[_c('p',{staticStyle:{"width":"143px"}},[_vm._v("分值区间及映射值")]),_c('ul',[_vm._l((_vm.ftScoreMapping.item),function(item,index){return _c('li',[_c('el-input-number',{staticClass:"ft-score-mapping-input",attrs:{"size":"mini","controls":false,"min":0},model:{value:(item.range[0]),callback:function ($$v) {_vm.$set(item.range, 0, $$v)},expression:"item.range[0]"}}),_c('span',{staticStyle:{"padding":"0 10px"}},[_vm._v("到")]),_c('el-input-number',{staticClass:"ft-score-mapping-input",attrs:{"size":"mini","controls":false,"min":1},model:{value:(item.range[1]),callback:function ($$v) {_vm.$set(item.range, 1, $$v)},expression:"item.range[1]"}}),_c('span',{staticStyle:{"padding":"0 10px 0 0"}},[_vm._v(" :")]),_c('el-input',{staticClass:"ft-score-mapping-input",attrs:{"size":"mini","autocomplete":"off"},model:{value:(item.text),callback:function ($$v) {_vm.$set(item, "text", $$v)},expression:"item.text"}})],1)}),_c('li',[_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.addFtScoreMappingItem}},[_c('i',{staticClass:"el-icon-folder-add",staticStyle:{"font-size":"20px"}})])],1)],2)])]):_vm._e(),_c('div',{staticClass:"dialog-footer",attrs:{"slot":"footer"},slot:"footer"},[_c('el-button',{attrs:{"type":"primary","size":"small"},on:{"click":_vm.sure}},[_vm._v("确 定")]),_c('el-button',{attrs:{"size":"small"},on:{"click":function($event){_vm.dialogFormVisible = false}}},[_vm._v("取 消")])],1)]),(_vm.table.tableFormula)?_c('div',{staticClass:"sub-bar-items"},[_c('el-dropdown',{class:_vm.dropdownClassName,attrs:{"trigger":"click","placement":"bottom-start","popper-append-to-body":"","tabindex":-1},on:{"visible-change":_vm.dropdownChange}},[_c('span',{staticClass:"el-dropdown-link"},[_c('span',[_vm._v("表格计算公式")]),_c('i',{staticClass:"el-icon-arrow-down el-icon--right"})]),_c('el-dropdown-menu',{attrs:{"slot":"dropdown"},slot:"dropdown"},[(_vm.table.isTableCode)?_c('el-dropdown-item',{staticClass:"ho-insert-table-item"},[_c('div',{directives:[{name:"debounce",rawName:"v-debounce:30.click",value:(_vm.setCellCode),expression:"setCellCode",arg:"30",modifiers:{"click":true}}]},[_c('span',[_vm._v(_vm._s(_vm.tableCellCode ? '隐藏' : '显示')+"单元格编号")])])]):_vm._e(),_c('el-dropdown-item',{staticClass:"ho-insert-table-item"},[_c('div',{attrs:{"index":"sumFormula"},on:{"click":function($event){return _vm.openFormula(['表格行列求和公式', 'a1: a2'])}}},[_vm._v(" 表格行列求和 ")])]),_c('el-dropdown-item',{staticClass:"ho-insert-table-item"},[_c('div',{attrs:{"index":"arithmeticFormula"},on:{"click":function($event){_vm.openFormula(['表格行列混合运算公式', '(a1 + a2) * 2'])}}},[_vm._v(" 表格行列混合运算 ")])]),_c('el-dropdown-item',{staticClass:"ho-insert-table-item"},[_c('div',{attrs:{"index":"bmiFormula"},on:{"click":function($event){return _vm.openFormula(['BMI指数计算公式', 'bmi'])}}},[_vm._v(" BMI指数 ")])]),_c('el-dropdown-item',{staticClass:"ho-insert-table-item"},[_c('div',{attrs:{"index":"laborFormula"},on:{"click":function($event){return _vm.openFormula(['产程计算公式', 'labor'])}}},[_vm._v(" 产程 ")])]),_c('el-dropdown-item',{staticClass:"ho-insert-table-item"},[_c('div',{attrs:{"index":"expectedDate"},on:{"click":function($event){return _vm.openFormula(['预产期计算公式', 'expectedDate'])}}},[_vm._v(" 预产期 ")])]),_c('el-dropdown-item',{staticClass:"ho-insert-table-item"},[_c('div',{attrs:{"index":"pregnantWeeks"},on:{"click":function($event){return _vm.openFormula(['孕周计算公式', 'pregnantWeeks'])}}},[_vm._v(" 孕周 ")])]),_c('el-dropdown-item',{staticClass:"ho-insert-table-item"},[_c('div',{attrs:{"index":"ftScoreMapping"},on:{"click":function($event){return _vm.openFormula(['分值映射计算公式', 'ftScoreMapping'])}}},[_vm._v(" 分值映射 ")])])],1)],1)],1):_vm._e(),(_vm.table.insertRowAbove && _vm.tableProperty.canAddRow)?_c('div',{directives:[{name:"debounce",rawName:"v-debounce:1000.click",value:(_vm.tableInsertRowAbove),expression:"tableInsertRowAbove",arg:"1000",modifiers:{"click":true}}],staticClass:"sub-bar-items"},[_c('span',[_vm._v("上方插入 ")]),_c('el-input-number',{staticClass:"insert-top",attrs:{"size":"mini","controls":false,"precision":0,"min":1},model:{value:(_vm.topRows),callback:function ($$v) {_vm.topRows=$$v},expression:"topRows"}}),_c('span',[_vm._v(" 行")])],1):_vm._e(),(_vm.table.insertRowBelow && _vm.tableProperty.canAddRow)?_c('div',{directives:[{name:"debounce",rawName:"v-debounce:1000.click",value:(_vm.tableInsertRowBelow),expression:"tableInsertRowBelow",arg:"1000",modifiers:{"click":true}}],staticClass:"sub-bar-items"},[_c('span',[_vm._v("下方插入 ")]),_c('el-input-number',{staticClass:"insert-bottom",attrs:{"size":"mini","controls":false,"precision":0,"min":1},model:{value:(_vm.bottomRows),callback:function ($$v) {_vm.bottomRows=$$v},expression:"bottomRows"}}),_c('span',[_vm._v(" 行")])],1):_vm._e(),(_vm.table.insertColLeft && _vm.tableProperty.canAddRow)?_c('div',{directives:[{name:"debounce",rawName:"v-debounce:1000.click",value:(_vm.tableInsertColLeft),expression:"tableInsertColLeft",arg:"1000",modifiers:{"click":true}}],staticClass:"sub-bar-items"},[_c('span',[_vm._v("左侧插入 ")]),_c('el-input-number',{staticClass:"insert-left",attrs:{"size":"mini","controls":false,"precision":0,"min":1},model:{value:(_vm.leftRows),callback:function ($$v) {_vm.leftRows=$$v},expression:"leftRows"}}),_c('span',[_vm._v(" 列")])],1):_vm._e(),(_vm.table.insertColRight && _vm.tableProperty.canAddRow)?_c('div',{directives:[{name:"debounce",rawName:"v-debounce:1000.click",value:(_vm.tableInsertColRight),expression:"tableInsertColRight",arg:"1000",modifiers:{"click":true}}],staticClass:"sub-bar-items"},[_c('span',[_vm._v("右侧插入 ")]),_c('el-input-number',{staticClass:"insert-right",attrs:{"size":"mini","precision":0,"controls":false,"min":1},model:{value:(_vm.rightRows),callback:function ($$v) {_vm.rightRows=$$v},expression:"rightRows"}}),_c('span',[_vm._v(" 列")])],1):_vm._e(),(_vm.table.deleteRows && _vm.tableProperty.canDeleteRow)?_c('div',{directives:[{name:"debounce",rawName:"v-debounce:1000.click",value:(_vm.tableDeleteRows),expression:"tableDeleteRows",arg:"1000",modifiers:{"click":true}}],staticClass:"sub-bar-items"},[_c('span',[_vm._v("删除行")])]):_vm._e(),(_vm.table.deleteCols && _vm.tableProperty.canDeleteRow)?_c('div',{directives:[{name:"debounce",rawName:"v-debounce:1000.click",value:(_vm.tableDeleteCols),expression:"tableDeleteCols",arg:"1000",modifiers:{"click":true}}],staticClass:"sub-bar-items"},[_c('span',[_vm._v("删除列")])]):_vm._e(),(_vm.table.mergerCells)?_c('div',{directives:[{name:"debounce",rawName:"v-debounce:1000.click",value:(_vm.tableMergerCells),expression:"tableMergerCells",arg:"1000",modifiers:{"click":true}}],staticClass:"sub-bar-items"},[_c('span',[_vm._v("合并单元格")])]):_vm._e(),(_vm.table.unMergerCells)?_c('div',{directives:[{name:"debounce",rawName:"v-debounce:1000.click",value:(_vm.tableUnMergerCells),expression:"tableUnMergerCells",arg:"1000",modifiers:{"click":true}}],staticClass:"sub-bar-items"},[_c('span',[_vm._v("取消合并单元格")])]):_vm._e()],1)}
-var HoTableFeaturesvue_type_template_id_2fd610cb_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/components/toolbar/insert/HoTableFeatures.vue?vue&type=template&id=02d0c560&
+var HoTableFeaturesvue_type_template_id_02d0c560_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('li',{ref:"hoTableFeatures",staticClass:"ho-table-features"},[_c('el-dialog',{attrs:{"width":"520px","top":"20%","center":"","append-to-body":"","close-on-click-modal":false,"title":_vm.dialogFormTitle,"visible":_vm.dialogFormVisible},on:{"update:visible":function($event){_vm.dialogFormVisible=$event}}},[_c('p',{staticStyle:{"padding":"10px 0"}},[_vm._v(" 请输入表单项对应的单元格编号，从左到右依次为ABCD...，从上到下依次为1234... ")]),(_vm.formula === 'a1: a2' || _vm.formula === '(a1 + a2) * 2')?_c('section',[_c('div',{staticStyle:{"height":"26px","line-height":"36px","font-size":"16px"}},[_vm._v(" "+_vm._s(_vm.dialogFormTitle)+" ")]),_c('div',{staticStyle:{"height":"36px","line-height":"36px"}},[_vm._v("示例： "+_vm._s(_vm.dialogFormTitle === '表格行列求和公式' ? 'a1: a2' : '(a1 + a2) * 2'))]),_c('el-checkbox',{model:{value:(_vm.isHideZero),callback:function ($$v) {_vm.isHideZero=$$v},expression:"isHideZero"}},[_vm._v("结果为 0 不显示")]),_c('p',{staticStyle:{"height":"10px"}}),_c('el-input',{attrs:{"autocomplete":"off"},model:{value:(_vm.simpleFormula),callback:function ($$v) {_vm.simpleFormula=$$v},expression:"simpleFormula"}})],1):_vm._e(),(_vm.formula === 'bmi')?_c('section',[_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v("身高")]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.height),callback:function ($$v) {_vm.height=$$v},expression:"height"}})],1),_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v("体重")]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.weight),callback:function ($$v) {_vm.weight=$$v},expression:"weight"}})],1)]):_vm._e(),(_vm.formula === 'labor')?_c('section',[_c('el-checkbox',{model:{value:(_vm.isHideZero),callback:function ($$v) {_vm.isHideZero=$$v},expression:"isHideZero"}},[_vm._v("结果为 0 不显示")]),_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v("产程类型")]),_c('el-select',{attrs:{"size":"mini"},on:{"change":_vm.laborTypeChange},model:{value:(_vm.laborType),callback:function ($$v) {_vm.laborType=$$v},expression:"laborType"}},[_c('el-option',{attrs:{"value":1,"label":"第一产程"}}),_c('el-option',{attrs:{"value":2,"label":"第二产程"}}),_c('el-option',{attrs:{"value":3,"label":"第三产程"}}),_c('el-option',{attrs:{"value":0,"label":"总产程"}})],1)],1),_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v(_vm._s(['第一产程', '宫缩开始', '宫口全开', '胎儿娩出'][_vm.laborType]))]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.labor1),callback:function ($$v) {_vm.labor1=$$v},expression:"labor1"}})],1),_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v(_vm._s(['第二产程', '宫口全开', '胎儿娩出', '胎盘娩出'][_vm.laborType]))]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.labor2),callback:function ($$v) {_vm.labor2=$$v},expression:"labor2"}})],1),(_vm.laborType === 0)?_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v(_vm._s(['第三产程', '宫缩开始', '宫口全开', '胎儿娩出'][_vm.laborType]))]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.labor3),callback:function ($$v) {_vm.labor3=$$v},expression:"labor3"}})],1):_vm._e()],1):_vm._e(),(_vm.formula === 'expectedDate' || _vm.formula === 'pregnantDays' || _vm.formula === 'pregnantWeeks')?_c('section',[_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v("末次月经")]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.expectedDate),callback:function ($$v) {_vm.expectedDate=$$v},expression:"expectedDate"}})],1)]):_vm._e(),(_vm.formula === 'ftScoreMapping')?_c('section',[_c('div',{staticClass:"ho-table-features-list"},[_c('p',{staticStyle:{"width":"220px"}},[_vm._v("分值所在的单元格编号")]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.ftScoreMapping.cell),callback:function ($$v) {_vm.$set(_vm.ftScoreMapping, "cell", $$v)},expression:"ftScoreMapping.cell"}})],1),_c('div',{staticClass:"ho-table-features-list"},[_c('p',{staticStyle:{"width":"143px"}},[_vm._v("分值区间及映射值")]),_c('ul',[_vm._l((_vm.ftScoreMapping.item),function(item,index){return _c('li',[_c('el-input-number',{staticClass:"ft-score-mapping-input",attrs:{"size":"mini","controls":false,"min":0},model:{value:(item.range[0]),callback:function ($$v) {_vm.$set(item.range, 0, $$v)},expression:"item.range[0]"}}),_c('span',{staticStyle:{"padding":"0 10px"}},[_vm._v("到")]),_c('el-input-number',{staticClass:"ft-score-mapping-input",attrs:{"size":"mini","controls":false,"min":1},model:{value:(item.range[1]),callback:function ($$v) {_vm.$set(item.range, 1, $$v)},expression:"item.range[1]"}}),_c('span',{staticStyle:{"padding":"0 10px 0 0"}},[_vm._v(" :")]),_c('el-input',{staticClass:"ft-score-mapping-input",attrs:{"size":"mini","autocomplete":"off"},model:{value:(item.text),callback:function ($$v) {_vm.$set(item, "text", $$v)},expression:"item.text"}})],1)}),_c('li',[_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.addFtScoreMappingItem}},[_c('i',{staticClass:"el-icon-folder-add",staticStyle:{"font-size":"20px"}})])],1)],2)])]):_vm._e(),_c('div',{staticClass:"dialog-footer",attrs:{"slot":"footer"},slot:"footer"},[_c('el-button',{attrs:{"type":"primary","size":"small"},on:{"click":_vm.sure}},[_vm._v("确 定")]),_c('el-button',{attrs:{"size":"small"},on:{"click":function($event){_vm.dialogFormVisible = false}}},[_vm._v("取 消")])],1)]),(_vm.table.tableFormula)?_c('div',{staticClass:"sub-bar-items"},[_c('el-dropdown',{class:_vm.dropdownClassName,attrs:{"trigger":"click","placement":"bottom-start","popper-append-to-body":"","tabindex":-1},on:{"visible-change":_vm.dropdownChange}},[_c('span',{staticClass:"el-dropdown-link"},[_c('span',[_vm._v("表格计算公式")]),_c('i',{staticClass:"el-icon-arrow-down el-icon--right"})]),_c('el-dropdown-menu',{attrs:{"slot":"dropdown"},slot:"dropdown"},[(_vm.table.isTableCode)?_c('el-dropdown-item',{staticClass:"ho-insert-table-item"},[_c('div',{directives:[{name:"debounce",rawName:"v-debounce:30.click",value:(_vm.setCellCode),expression:"setCellCode",arg:"30",modifiers:{"click":true}}]},[_c('span',[_vm._v(_vm._s(_vm.tableCellCode ? '隐藏' : '显示')+"单元格编号")])])]):_vm._e(),_c('el-dropdown-item',{staticClass:"ho-insert-table-item"},[_c('div',{attrs:{"index":"sumFormula"},on:{"click":function($event){return _vm.openFormula(['表格行列求和公式', 'a1: a2'])}}},[_vm._v(" 表格行列求和 ")])]),_c('el-dropdown-item',{staticClass:"ho-insert-table-item"},[_c('div',{attrs:{"index":"arithmeticFormula"},on:{"click":function($event){_vm.openFormula(['表格行列混合运算公式', '(a1 + a2) * 2'])}}},[_vm._v(" 表格行列混合运算 ")])]),_c('el-dropdown-item',{staticClass:"ho-insert-table-item"},[_c('div',{attrs:{"index":"bmiFormula"},on:{"click":function($event){return _vm.openFormula(['BMI指数计算公式', 'bmi'])}}},[_vm._v(" BMI指数 ")])]),_c('el-dropdown-item',{staticClass:"ho-insert-table-item"},[_c('div',{attrs:{"index":"laborFormula"},on:{"click":function($event){return _vm.openFormula(['产程计算公式', 'labor'])}}},[_vm._v(" 产程 ")])]),_c('el-dropdown-item',{staticClass:"ho-insert-table-item"},[_c('div',{attrs:{"index":"expectedDate"},on:{"click":function($event){return _vm.openFormula(['预产期计算公式', 'expectedDate'])}}},[_vm._v(" 预产期 ")])]),_c('el-dropdown-item',{staticClass:"ho-insert-table-item"},[_c('div',{attrs:{"index":"ftScoreMapping"},on:{"click":function($event){return _vm.openFormula(['分值映射计算公式', 'ftScoreMapping'])}}},[_vm._v(" 分值映射 ")])])],1)],1)],1):_vm._e(),(_vm.table.insertRowAbove && _vm.tableProperty.canAddRow)?_c('div',{directives:[{name:"debounce",rawName:"v-debounce:1000.click",value:(_vm.tableInsertRowAbove),expression:"tableInsertRowAbove",arg:"1000",modifiers:{"click":true}}],staticClass:"sub-bar-items"},[_c('span',[_vm._v("上方插入 ")]),_c('el-input-number',{staticClass:"insert-top",attrs:{"size":"mini","controls":false,"precision":0,"min":1},model:{value:(_vm.topRows),callback:function ($$v) {_vm.topRows=$$v},expression:"topRows"}}),_c('span',[_vm._v(" 行")])],1):_vm._e(),(_vm.table.insertRowBelow && _vm.tableProperty.canAddRow)?_c('div',{directives:[{name:"debounce",rawName:"v-debounce:1000.click",value:(_vm.tableInsertRowBelow),expression:"tableInsertRowBelow",arg:"1000",modifiers:{"click":true}}],staticClass:"sub-bar-items"},[_c('span',[_vm._v("下方插入 ")]),_c('el-input-number',{staticClass:"insert-bottom",attrs:{"size":"mini","controls":false,"precision":0,"min":1},model:{value:(_vm.bottomRows),callback:function ($$v) {_vm.bottomRows=$$v},expression:"bottomRows"}}),_c('span',[_vm._v(" 行")])],1):_vm._e(),(_vm.table.insertColLeft && _vm.tableProperty.canAddRow)?_c('div',{directives:[{name:"debounce",rawName:"v-debounce:1000.click",value:(_vm.tableInsertColLeft),expression:"tableInsertColLeft",arg:"1000",modifiers:{"click":true}}],staticClass:"sub-bar-items"},[_c('span',[_vm._v("左侧插入 ")]),_c('el-input-number',{staticClass:"insert-left",attrs:{"size":"mini","controls":false,"precision":0,"min":1},model:{value:(_vm.leftRows),callback:function ($$v) {_vm.leftRows=$$v},expression:"leftRows"}}),_c('span',[_vm._v(" 列")])],1):_vm._e(),(_vm.table.insertColRight && _vm.tableProperty.canAddRow)?_c('div',{directives:[{name:"debounce",rawName:"v-debounce:1000.click",value:(_vm.tableInsertColRight),expression:"tableInsertColRight",arg:"1000",modifiers:{"click":true}}],staticClass:"sub-bar-items"},[_c('span',[_vm._v("右侧插入 ")]),_c('el-input-number',{staticClass:"insert-right",attrs:{"size":"mini","precision":0,"controls":false,"min":1},model:{value:(_vm.rightRows),callback:function ($$v) {_vm.rightRows=$$v},expression:"rightRows"}}),_c('span',[_vm._v(" 列")])],1):_vm._e(),(_vm.table.deleteRows && _vm.tableProperty.canDeleteRow)?_c('div',{directives:[{name:"debounce",rawName:"v-debounce:1000.click",value:(_vm.tableDeleteRows),expression:"tableDeleteRows",arg:"1000",modifiers:{"click":true}}],staticClass:"sub-bar-items"},[_c('span',[_vm._v("删除行")])]):_vm._e(),(_vm.table.deleteCols && _vm.tableProperty.canDeleteRow)?_c('div',{directives:[{name:"debounce",rawName:"v-debounce:1000.click",value:(_vm.tableDeleteCols),expression:"tableDeleteCols",arg:"1000",modifiers:{"click":true}}],staticClass:"sub-bar-items"},[_c('span',[_vm._v("删除列")])]):_vm._e(),(_vm.table.mergerCells)?_c('div',{directives:[{name:"debounce",rawName:"v-debounce:1000.click",value:(_vm.tableMergerCells),expression:"tableMergerCells",arg:"1000",modifiers:{"click":true}}],staticClass:"sub-bar-items"},[_c('span',[_vm._v("合并单元格")])]):_vm._e(),(_vm.table.unMergerCells)?_c('div',{directives:[{name:"debounce",rawName:"v-debounce:1000.click",value:(_vm.tableUnMergerCells),expression:"tableUnMergerCells",arg:"1000",modifiers:{"click":true}}],staticClass:"sub-bar-items"},[_c('span',[_vm._v("取消合并单元格")])]):_vm._e()],1)}
+var HoTableFeaturesvue_type_template_id_02d0c560_staticRenderFns = []
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40[0].rules[0].use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoTableFeatures.vue?vue&type=script&lang=js&
@@ -237044,8 +237921,8 @@ var HoTableFeaturesvue_type_template_id_2fd610cb_staticRenderFns = []
 var HoTableFeatures_component = normalizeComponent(
   insert_HoTableFeaturesvue_type_script_lang_js_,
-  HoTableFeaturesvue_type_template_id_2fd610cb_render,
-  HoTableFeaturesvue_type_template_id_2fd610cb_staticRenderFns,
+  HoTableFeaturesvue_type_template_id_02d0c560_render,
+  HoTableFeaturesvue_type_template_id_02d0c560_staticRenderFns,
   false,
   null,
   null,
@@ -238125,7 +239002,8 @@ var HoRightMenu = /*#__PURE__*/function (_Mixins) {
           _this$rightNode13,
           _this$rightNode14,
           _this$rightNode15,
-          _this$rightNode16;
+          _this$rightNode16,
+          _this$rightNode17;
       var h = arguments[0];
       return h("div", {
@@ -238223,7 +239101,18 @@ var HoRightMenu = /*#__PURE__*/function (_Mixins) {
             return _this4.toUpdateNodes("qrcode", event);
           }
         }
-      }, ["\u4E8C\u7EF4\u7801\u5C5E\u6027"])]), (((_this$rightNode11 = this.rightNode) === null || _this$rightNode11 === void 0 ? void 0 : _this$rightNode11.type) === "text" || this.emrDebug) && h("ul", {
+      }, ["\u4E8C\u7EF4\u7801\u5C5E\u6027"])]), ((_this$rightNode11 = this.rightNode) === null || _this$rightNode11 === void 0 ? void 0 : _this$rightNode11.type) === "edit-image" && h("ul", {
+        "class": "mouse-right-menu"
+      }, [h("li", {
+        "class": "mouse-menu-item mouse-right-menu-line"
+      }), h("li", {
+        "class": "mouse-menu-item",
+        "on": {
+          "click": function click() {
+            return _this4.toUpdateNodes("edit-image", event);
+          }
+        }
+      }, ["\u7F16\u8F91\u56FE\u7247"])]), (((_this$rightNode12 = this.rightNode) === null || _this$rightNode12 === void 0 ? void 0 : _this$rightNode12.type) === "text" || this.emrDebug) && h("ul", {
         "class": "mouse-right-menu"
       }, [h("li", {
         "class": "mouse-menu-item mouse-right-menu-line"
@@ -238234,7 +239123,7 @@ var HoRightMenu = /*#__PURE__*/function (_Mixins) {
             return _this4.toUpdateNodes("text", event);
           }
         }
-      }, ["\u6587\u672C\u57DF\u5C5E\u6027"])]), (((_this$rightNode12 = this.rightNode) === null || _this$rightNode12 === void 0 ? void 0 : _this$rightNode12.rightTypeIsTable) && this.defaultTable && ((_this$rightNode13 = this.rightNode) === null || _this$rightNode13 === void 0 ? void 0 : _this$rightNode13.paintStatus) === 0 || this.emrDebug) && h("ul", {
+      }, ["\u6587\u672C\u57DF\u5C5E\u6027"])]), (((_this$rightNode13 = this.rightNode) === null || _this$rightNode13 === void 0 ? void 0 : _this$rightNode13.rightTypeIsTable) && this.defaultTable && ((_this$rightNode14 = this.rightNode) === null || _this$rightNode14 === void 0 ? void 0 : _this$rightNode14.paintStatus) === 0 || this.emrDebug) && h("ul", {
         "class": "mouse-right-menu"
       }, [h("li", {
         "class": "mouse-menu-item mouse-right-menu-line"
@@ -238266,7 +239155,7 @@ var HoRightMenu = /*#__PURE__*/function (_Mixins) {
             return _this4.toUpdateNodes("table-cell", event);
           }
         }
-      }, ["\u5355\u5143\u683C\u5C5E\u6027"])]), ((_this$rightNode14 = this.rightNode) === null || _this$rightNode14 === void 0 ? void 0 : _this$rightNode14.rightTypeIsTable) && this.defaultTable && h("ul", {
+      }, ["\u5355\u5143\u683C\u5C5E\u6027"])]), ((_this$rightNode15 = this.rightNode) === null || _this$rightNode15 === void 0 ? void 0 : _this$rightNode15.rightTypeIsTable) && this.defaultTable && h("ul", {
         "class": "mouse-right-menu"
       }, [h("li", {
         "class": "mouse-menu-item mouse-right-menu-line"
@@ -238280,7 +239169,7 @@ var HoRightMenu = /*#__PURE__*/function (_Mixins) {
           table: this.defaultTable,
           tableProperty: this.rightNode.tableProperty
         })
-      })]), ((_this$rightNode15 = this.rightNode) === null || _this$rightNode15 === void 0 ? void 0 : _this$rightNode15.canShowComment) && h("ul", {
+      })]), ((_this$rightNode16 = this.rightNode) === null || _this$rightNode16 === void 0 ? void 0 : _this$rightNode16.canShowComment) && h("ul", {
         "class": "mouse-right-menu"
       }, [h("li", {
         "class": "mouse-menu-item",
@@ -238289,7 +239178,7 @@ var HoRightMenu = /*#__PURE__*/function (_Mixins) {
             return _this4.hideComments();
           }
         }
-      }, [(_this$rightNode16 = this.rightNode) !== null && _this$rightNode16 !== void 0 && _this$rightNode16.isHideComments ? "显示" : "隐藏", "\u6279\u6CE8"])]), h("ul", {
+      }, [(_this$rightNode17 = this.rightNode) !== null && _this$rightNode17 !== void 0 && _this$rightNode17.isHideComments ? "显示" : "隐藏", "\u6279\u6CE8"])]), h("ul", {
         "class": "mouse-right-menu"
       }, [h("li", {
         "class": "mouse-menu-item"
@@ -238321,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&
@@ -238766,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
   }, {
@@ -238845,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({
@@ -238887,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,
@@ -238959,8 +239847,8 @@ var form_item_default = /*#__PURE__*/__webpack_require__.n(form_item);
 var lib_form = __webpack_require__(54223);
 var form_default = /*#__PURE__*/__webpack_require__.n(lib_form);
 // EXTERNAL MODULE: ./node_modules/element-ui/lib/upload.js
-var lib_upload = __webpack_require__(26906);
-var upload_default = /*#__PURE__*/__webpack_require__.n(lib_upload);
+var upload = __webpack_require__(26906);
+var upload_default = /*#__PURE__*/__webpack_require__.n(upload);
 // EXTERNAL MODULE: ./node_modules/element-ui/lib/dropdown-item.js
 var dropdown_item = __webpack_require__(42173);
 var dropdown_item_default = /*#__PURE__*/__webpack_require__.n(dropdown_item);