hoeditor-web 2.0.58 → 2.0.59

package/lib/hoeditor.common.js

@@ -11581,7 +11581,7 @@ var Print = /*#__PURE__*/function () {
 
               case 17:
                 if ((_step = _iterator.n()).done) {
-                  _context3.next = 59;
+                  _context3.next = 60;
                   break;
                 }
 
@@ -11599,7 +11599,7 @@ var Print = /*#__PURE__*/function () {
                 });
 
               case 22:
-                return _context3.abrupt("continue", 57);
+                return _context3.abrupt("continue", 58);
 
               case 23:
                 last = index;
@@ -11610,7 +11610,7 @@ var Print = /*#__PURE__*/function () {
                   break;
                 }
 
-                return _context3.abrupt("break", 59);
+                return _context3.abrupt("break", 60);
 
               case 27:
                 if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
@@ -11661,12 +11661,13 @@ var Print = /*#__PURE__*/function () {
                 }
 
                 if (!hoEditorFactory.isUseImagePrint) {
-                  _context3.next = 43;
+                  _context3.next = 44;
                   break;
                 }
 
                 PDF === null || PDF === void 0 ? void 0 : PDF.addPage();
                 ctx = PDF === null || PDF === void 0 ? void 0 : PDF.context2d;
+                window.printBlack = hoEditorFactory.printBlack;
 
                 if (hoEditorFactory.isFixedPrintToA4T && format) {
                   // 避免切换纸张的打印方式 绘制只处理竖向情况
@@ -11681,10 +11682,10 @@ var Print = /*#__PURE__*/function () {
                 ctx.posY = svg2pdfOptions.y;
                 ctx && ((_cpage$drawDomLevel = cpage.drawDomLevel) === null || _cpage$drawDomLevel === void 0 ? void 0 : (_cpage$drawDomLevel$s = _cpage$drawDomLevel.stage) === null || _cpage$drawDomLevel$s === void 0 ? void 0 : _cpage$drawDomLevel$s.draw(ctx));
                 ctx = null;
-                _context3.next = 56;
+                _context3.next = 57;
                 break;
 
-              case 43:
+              case 44:
                 _ctx = new canvas2svg({
                   width: width,
                   height: height,
@@ -11693,68 +11694,68 @@ var Print = /*#__PURE__*/function () {
                 _ctx && ((_cpage$drawDomLevel2 = cpage.drawDomLevel) === null || _cpage$drawDomLevel2 === void 0 ? void 0 : (_cpage$drawDomLevel2$ = _cpage$drawDomLevel2.stage) === null || _cpage$drawDomLevel2$ === void 0 ? void 0 : _cpage$drawDomLevel2$.draw(_ctx));
 
                 if (!(type === 'html')) {
-                  _context3.next = 50;
+                  _context3.next = 51;
                   break;
                 }
 
                 svgData = (_ctx2 = _ctx) === null || _ctx2 === void 0 ? void 0 : _ctx2.getSvg();
                 svgData && ((_svgBox2 = svgBox) === null || _svgBox2 === void 0 ? void 0 : _svgBox2.appendChild(svgData));
-                _context3.next = 55;
+                _context3.next = 56;
                 break;
 
-              case 50:
+              case 51:
                 PDF === null || PDF === void 0 ? void 0 : PDF.addPage();
                 _context3.t0 = PDF;
 
                 if (!_context3.t0) {
-                  _context3.next = 55;
+                  _context3.next = 56;
                   break;
                 }
 
-                _context3.next = 55;
+                _context3.next = 56;
                 return svg2pdf((_ctx3 = _ctx) === null || _ctx3 === void 0 ? void 0 : _ctx3.getSvg(), PDF, svg2pdfOptions);
 
-              case 55:
+              case 56:
                 _ctx = null;
 
-              case 56:
+              case 57:
                 index > 0 && ((_cpage$drawDomLevel3 = cpage.drawDomLevel) === null || _cpage$drawDomLevel3 === void 0 ? void 0 : _cpage$drawDomLevel3.clearStage());
 
-              case 57:
+              case 58:
                 _context3.next = 17;
                 break;
 
-              case 59:
-                _context3.next = 64;
+              case 60:
+                _context3.next = 65;
                 break;
 
-              case 61:
-                _context3.prev = 61;
+              case 62:
+                _context3.prev = 62;
                 _context3.t1 = _context3["catch"](15);
 
                 _iterator.e(_context3.t1);
 
-              case 64:
-                _context3.prev = 64;
+              case 65:
+                _context3.prev = 65;
 
                 _iterator.f();
 
-                return _context3.finish(64);
+                return _context3.finish(65);
 
-              case 67:
+              case 68:
                 console.timeEnd('绘制svg和生成pdf');
                 if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
                 hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
 
                 if (!(positionY || hoEditorFactory.startPageNum !== 0 && positionY !== undefined)) {
-                  _context3.next = 76;
+                  _context3.next = 77;
                   break;
                 }
 
                 _last = hoEditorFactory.printStatus.printRecord.last();
 
                 if (!(_last && hoEditorFactory.startPageNum == _last[0] && positionY === _last[1])) {
-                  _context3.next = 76;
+                  _context3.next = 77;
                   break;
                 }
 
@@ -11766,21 +11767,21 @@ var Print = /*#__PURE__*/function () {
                 reslove && reslove('printend');
                 return _context3.abrupt("return");
 
-              case 76:
+              case 77:
                 if (!(type === 'pdf')) {
-                  _context3.next = 82;
+                  _context3.next = 83;
                   break;
                 }
 
                 PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
                 PDF === null || PDF === void 0 ? void 0 : PDF.save(fileName + '.pdf');
                 hoEditorFactory.printStatus.drawPrintRecord.clear();
-                _context3.next = 88;
+                _context3.next = 89;
                 break;
 
-              case 82:
+              case 83:
                 if (!(svgBox && svgBox.childNodes.length === 0)) {
-                  _context3.next = 86;
+                  _context3.next = 87;
                   break;
                 }
 
@@ -11792,7 +11793,7 @@ var Print = /*#__PURE__*/function () {
                 reslove && reslove('printend');
                 return _context3.abrupt("return");
 
-              case 86:
+              case 87:
                 printStyle = (0,util/* createPrintHTMLStyle */.j_)(hoEditorFactory.pageProperty.pageSize, orientation);
 
                 if (type === 'html') {
@@ -11819,15 +11820,15 @@ var Print = /*#__PURE__*/function () {
                   PDF && this.openDataUriInWindow(PDF, name, hoEditorFactory.pageProperty.widthPixes);
                 }
 
-              case 88:
+              case 89:
                 reslove && reslove('printend');
 
-              case 89:
+              case 90:
               case "end":
                 return _context3.stop();
             }
           }
-        }, _callee2, this, [[15, 61, 64, 67]]);
+        }, _callee2, this, [[15, 62, 65, 68]]);
       }));
 
       function printToPDF(_x2, _x3, _x4, _x5, _x6, _x7, _x8) {
@@ -11865,7 +11866,7 @@ var Print = /*#__PURE__*/function () {
 
               case 11:
                 if ((_step2 = _iterator2.n()).done) {
-                  _context4.next = 39;
+                  _context4.next = 40;
                   break;
                 }
 
@@ -11883,7 +11884,7 @@ var Print = /*#__PURE__*/function () {
                 });
 
               case 16:
-                return _context4.abrupt("continue", 37);
+                return _context4.abrupt("continue", 38);
 
               case 17:
                 last = index;
@@ -11894,7 +11895,7 @@ var Print = /*#__PURE__*/function () {
                   break;
                 }
 
-                return _context4.abrupt("break", 39);
+                return _context4.abrupt("break", 40);
 
               case 21:
                 if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
@@ -11908,18 +11909,19 @@ var Print = /*#__PURE__*/function () {
                 }
 
                 if (!hoEditorFactory.isUseImagePrint) {
-                  _context4.next = 30;
+                  _context4.next = 31;
                   break;
                 }
 
                 PDF === null || PDF === void 0 ? void 0 : PDF.addPage();
                 ctx = PDF === null || PDF === void 0 ? void 0 : PDF.context2d;
+                window.printBlack = hoEditorFactory.printBlack;
                 ctx && ((_cpage$drawDomLevel4 = cpage.drawDomLevel) === null || _cpage$drawDomLevel4 === void 0 ? void 0 : (_cpage$drawDomLevel4$ = _cpage$drawDomLevel4.stage) === null || _cpage$drawDomLevel4$ === void 0 ? void 0 : _cpage$drawDomLevel4$.draw(ctx));
                 ctx = null;
-                _context4.next = 36;
+                _context4.next = 37;
                 break;
 
-              case 30:
+              case 31:
                 _ctx4 = new canvas2svg({
                   width: hoEditorFactory.pageProperty.widthPixes,
                   height: orientation === 'l' ? hoEditorFactory.pageProperty.heightPixes - 1 : hoEditorFactory.pageProperty.heightPixes,
@@ -11927,37 +11929,37 @@ var Print = /*#__PURE__*/function () {
                 });
                 _ctx4 && ((_cpage$drawDomLevel5 = cpage.drawDomLevel) === null || _cpage$drawDomLevel5 === void 0 ? void 0 : (_cpage$drawDomLevel5$ = _cpage$drawDomLevel5.stage) === null || _cpage$drawDomLevel5$ === void 0 ? void 0 : _cpage$drawDomLevel5$.draw(_ctx4));
                 PDF.addPage();
-                _context4.next = 35;
+                _context4.next = 36;
                 return svg2pdf((_ctx5 = _ctx4) === null || _ctx5 === void 0 ? void 0 : _ctx5.getSvg(), PDF);
 
-              case 35:
+              case 36:
                 _ctx4 = null;
 
-              case 36:
+              case 37:
                 index > 0 && ((_cpage$drawDomLevel6 = cpage.drawDomLevel) === null || _cpage$drawDomLevel6 === void 0 ? void 0 : _cpage$drawDomLevel6.clearStage());
 
-              case 37:
+              case 38:
                 _context4.next = 11;
                 break;
 
-              case 39:
-                _context4.next = 44;
+              case 40:
+                _context4.next = 45;
                 break;
 
-              case 41:
-                _context4.prev = 41;
+              case 42:
+                _context4.prev = 42;
                 _context4.t0 = _context4["catch"](9);
 
                 _iterator2.e(_context4.t0);
 
-              case 44:
-                _context4.prev = 44;
+              case 45:
+                _context4.prev = 45;
 
                 _iterator2.f();
 
-                return _context4.finish(44);
+                return _context4.finish(45);
 
-              case 47:
+              case 48:
                 if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) {
                   hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
                 }
@@ -11965,12 +11967,12 @@ var Print = /*#__PURE__*/function () {
                 hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
                 reslove && reslove('printend');
 
-              case 50:
+              case 51:
               case "end":
                 return _context4.stop();
             }
           }
-        }, _callee3, null, [[9, 41, 44, 47]]);
+        }, _callee3, null, [[9, 42, 45, 48]]);
       }));
 
       function createPDFBase64(_x9, _x10, _x11) {
@@ -12129,7 +12131,7 @@ var Print = /*#__PURE__*/function () {
 
               case 10:
                 if ((_step4 = _iterator4.n()).done) {
-                  _context6.next = 48;
+                  _context6.next = 49;
                   break;
                 }
 
@@ -12147,7 +12149,7 @@ var Print = /*#__PURE__*/function () {
                 });
 
               case 15:
-                return _context6.abrupt("continue", 46);
+                return _context6.abrupt("continue", 47);
 
               case 16:
                 last = index;
@@ -12168,7 +12170,7 @@ var Print = /*#__PURE__*/function () {
                   break;
                 }
 
-                return _context6.abrupt("break", 48);
+                return _context6.abrupt("break", 49);
 
               case 22:
                 widthPixes = hoEditorFactory.unitConvert.mmConversionPx(hoEditorFactory.pageProperty.widthMm, true);
@@ -12191,7 +12193,7 @@ var Print = /*#__PURE__*/function () {
                 }
 
                 if (!hoEditorFactory.isUseImagePrint) {
-                  _context6.next = 39;
+                  _context6.next = 40;
                   break;
                 }
 
@@ -12202,6 +12204,7 @@ var Print = /*#__PURE__*/function () {
                 }
 
                 ctx = PDF === null || PDF === void 0 ? void 0 : PDF.context2d;
+                window.printBlack = hoEditorFactory.printBlack;
 
                 if (hoEditorFactory.isFixedPrintToA4T && format && hoEditorFactory.pageProperty.pageSize.toLocaleLowerCase() == 'a5' && index == 0) {
                   // 避免切换纸张的打印方式 绘制只处理竖向情况
@@ -12216,10 +12219,10 @@ var Print = /*#__PURE__*/function () {
                 ctx.posY = svg2pdfOptions.y;
                 ctx && ((_cpage$drawDomLevel9 = cpage.drawDomLevel) === null || _cpage$drawDomLevel9 === void 0 ? void 0 : (_cpage$drawDomLevel9$ = _cpage$drawDomLevel9.stage) === null || _cpage$drawDomLevel9$ === void 0 ? void 0 : _cpage$drawDomLevel9$.draw(ctx));
                 ctx = null;
-                _context6.next = 45;
+                _context6.next = 46;
                 break;
 
-              case 39:
+              case 40:
                 _ctx6 = new canvas2svg({
                   width: widthPixes,
                   height: orientation === 'l' ? heightPixes - 1 : heightPixes,
@@ -12233,37 +12236,37 @@ var Print = /*#__PURE__*/function () {
                   PDF === null || PDF === void 0 ? void 0 : PDF.addPage(format, orientation);
                 }
 
-                _context6.next = 44;
+                _context6.next = 45;
                 return svg2pdf((_ctx7 = _ctx6) === null || _ctx7 === void 0 ? void 0 : _ctx7.getSvg(), PDF, svg2pdfOptions);
 
-              case 44:
+              case 45:
                 _ctx6 = null;
 
-              case 45:
+              case 46:
                 index > 0 && ((_cpage$drawDomLevel12 = cpage.drawDomLevel) === null || _cpage$drawDomLevel12 === void 0 ? void 0 : _cpage$drawDomLevel12.clearStage());
 
-              case 46:
+              case 47:
                 _context6.next = 10;
                 break;
 
-              case 48:
-                _context6.next = 53;
+              case 49:
+                _context6.next = 54;
                 break;
 
-              case 50:
-                _context6.prev = 50;
+              case 51:
+                _context6.prev = 51;
                 _context6.t0 = _context6["catch"](8);
 
                 _iterator4.e(_context6.t0);
 
-              case 53:
-                _context6.prev = 53;
+              case 54:
+                _context6.prev = 54;
 
                 _iterator4.f();
 
-                return _context6.finish(53);
+                return _context6.finish(54);
 
-              case 56:
+              case 57:
                 if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) {
                   hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
                 }
@@ -12281,12 +12284,12 @@ var Print = /*#__PURE__*/function () {
                 hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
                 reslove();
 
-              case 60:
+              case 61:
               case "end":
                 return _context6.stop();
             }
           }
-        }, _callee5, null, [[8, 50, 53, 56]]);
+        }, _callee5, null, [[8, 51, 54, 57]]);
       }));
 
       function printAllNew(_x15, _x16, _x17, _x18) {
@@ -33386,7 +33389,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;
@@ -99969,8 +99972,9 @@ var f2,getHorizontalCoordinateString,getVerticalCoordinateString,getHorizontalCo
      * @property {(color|gradient|pattern)} value The color of the drawing. Default value is #000000<br />
      * 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});}});/**
+     */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;console.log(this.ctx.fillStyle,this.ctx.fillStyle!=="#000000"&&this.ctx.fillStyle!=="#FFFFFF");//自定义修改  当透明度小于1时改成0 ,以适配不支持透明度的打印机
+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
@@ -206986,7 +206990,7 @@ var SignNode = __webpack_require__(34450);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(14208);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('2.0.58');
+/* harmony default export */ var version = ('2.0.59');
 ;// 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 = []