hoeditor-web 3.1.91 → 3.1.93

package/lib/hoeditor.umd.js

@@ -33076,6 +33076,8 @@ var assertThisInitialized = __webpack_require__(75808);
 var get = __webpack_require__(52060);
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/getPrototypeOf.js
 var getPrototypeOf = __webpack_require__(27967);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
+var es_function_name = __webpack_require__(68309);
 // EXTERNAL MODULE: ./src/editor/utils/DrawSimpleText.ts
 var DrawSimpleText = __webpack_require__(57590);
 ;// CONCATENATED MODULE: ./src/editor/draw/drawPrint/DrawPrintRecord.ts
@@ -33087,6 +33089,7 @@ var DrawSimpleText = __webpack_require__(57590);
 
 
 
+
 /*
  * @Author: your name
  * @Date: 2021-01-28 10:33:07
@@ -33133,6 +33136,7 @@ var DrawPrintRecord = /*#__PURE__*/function (_DrawPrintBase) {
     key: "paintBar",
     value: function paintBar(selectContainer) {
       if (!this._text) this._text = new DrawSimpleText/* DrawSimpleText */.b("温馨提示，以下内容还没有打印", undefined, "#FF0000");
+      this._text.name = "print_mark";
       selectContainer.addChild(this._text);
       (0,get/* default */.Z)((0,getPrototypeOf/* default */.Z)(DrawPrintRecord.prototype), "paintBar", this).call(this, selectContainer);
       var h = this._text.getMeasuredHeight();
@@ -33166,8 +33170,6 @@ var es_regexp_sticky = __webpack_require__(88386);
 var es_regexp_to_string = __webpack_require__(39714);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.error.cause.js
 var es_error_cause = __webpack_require__(21703);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
-var es_function_name = __webpack_require__(68309);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.test.js
 var es_regexp_test = __webpack_require__(77601);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.fill.js
@@ -35465,17 +35467,7 @@ var Print = /*#__PURE__*/function () {
               return _context4.abrupt("break", 42);
             case 28:
               cpage = hoEditorFactory.drawTree.drawPages[index];
-              children = cpage.drawMainDoc.children; // if (
-              //     index === hoEditorFactory.drawTree.drawPages.length - 1 &&
-              //     children.length === 2 &&
-              //     !(children[0] instanceof DrawPageTable) &&
-              //     children[1] &&
-              //     (children[1] as any).drawItems.length === 0
-              // ) {
-              //     console.log(children, children[0]);
-              //     console.log('??????');
-              //     break;
-              // }
+              children = cpage.drawMainDoc.children;
               if (!(index === hoEditorFactory.drawTree.drawPages.length - 1 && (children.length == 1 && children[0] instanceof DrawLine/* DrawLine */.a && children[0].drawItems.length == 0 || children.length == 2 && !(children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && !(children[0] instanceof DrawLine/* DrawLine */.a) && children[1] && ((_children$1$drawItems = children[1].drawItems) === null || _children$1$drawItems === void 0 ? void 0 : _children$1$drawItems.length) == 0 || children.length == 2 && !(children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && children[0] && ((_children$0$drawItems = children[0].drawItems) === null || _children$0$drawItems === void 0 ? void 0 : _children$0$drawItems.length) == 0))) {
                 _context4.next = 32;
                 break;
@@ -77216,6 +77208,21 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
                 node.imgHeight = nodeImageWidth;
               }
               var width = hitWidth * hoEditorFactory.signHeight / image.naturalHeight; //+ this._drawText.getMeasuredWidth();
+              // 压缩高分辨率签名图片
+              if (hoEditorFactory.convertSignImage && hitHeight > hoEditorFactory.signHeight * 2) {
+                var canvas = document.createElement('canvas');
+                var ctx = canvas.getContext('2d');
+                canvas.width = width * 2;
+                canvas.height = hoEditorFactory.signHeight * 2;
+                canvas.style.width = _this3.dWidth + 'px';
+                canvas.style.height = hoEditorFactory.signHeight + 'px';
+                ctx.clearRect(0, 0, canvas.width, canvas.height);
+                ctx.fillStyle = '#FFFFFF';
+                ctx.fillRect(0, 0, canvas.width, canvas.height);
+                ctx.drawImage(image, 0, 0, canvas.width, canvas.height);
+                var base64 = canvas.toDataURL('image/png', 1);
+                drawNode.node.imgSrc = base64;
+              }
               if (node.parentNode instanceof _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_9__/* .CellNode */ .D) {
                 var cellWidth = node.parentNode.drawCell.dWidth;
                 if (width > cellWidth - 5) {
@@ -79742,7 +79749,10 @@ var DrawStyleText = /*#__PURE__*/function () {
 /* 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_array_splice_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(40561);
 /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_7__);
-/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(74089);
+/* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(68309);
+/* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(74089);
+
 
 
 
@@ -79812,7 +79822,7 @@ var DrawPrintBase = /*#__PURE__*/function () {
     key: "clear",
     value: function clear() {
       var _this = this;
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_9__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
       var pages = hoEditorFactory.drawTree.drawPages;
       try {
         this._fg.forEach(function (value, index) {
@@ -79835,7 +79845,7 @@ var DrawPrintBase = /*#__PURE__*/function () {
     key: "paintArea",
     value: function paintArea() {
       var _this2 = this;
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_9__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
       var _hasPainted = function _hasPainted(selectContainer, index) {
         if (index <= _this2._fg.length - 1) {
           // console.log("index", selectContainer.children.indexOf(this._fg[index]));
@@ -79911,7 +79921,7 @@ var DrawPrintBase = /*#__PURE__*/function () {
     value: function paintBar(selectContainer) {
       if (!this._bar) this._bar = new createjs.Shape();
       this._bar.graphics.clear();
-      this._bar.graphics.beginFill(this._barColor).drawRect(0, this._rangePosy, _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).pageProperty.widthPixes, 1).closePath();
+      this._bar.graphics.beginFill(this._barColor).drawRect(0, this._rangePosy, _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_9__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).pageProperty.widthPixes, 1).closePath();
       selectContainer.addChild(this._bar);
     }
     /**
@@ -79924,8 +79934,9 @@ var DrawPrintBase = /*#__PURE__*/function () {
     value: function paintFront(selectContainer, height, pindex) {
       var fg = new createjs.Shape();
       fg.graphics.clear();
-      fg.graphics.beginFill(this._frontColor).drawRect(0, 0, _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).pageProperty.widthPixes, height).closePath();
+      fg.graphics.beginFill(this._frontColor).drawRect(0, 0, _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_9__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).pageProperty.widthPixes, height).closePath();
       fg.alpha = 0.5;
+      fg.name = "print_mark";
       this._fg.splice(pindex, 0, fg);
       selectContainer.addChild(fg);
     }
@@ -79937,7 +79948,7 @@ var DrawPrintBase = /*#__PURE__*/function () {
     value: function paintMask() {
       if (!this.mask) this.mask = new createjs.Shape();
       this.clear();
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_9__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
       var dPage = hoEditorFactory.drawTree.drawPages[this.Position[0]];
       var domlevel = hoEditorFactory.drawTree.drawPages[this.Position[0]].drawDomLevel;
       if (!domlevel) return;
@@ -79962,7 +79973,7 @@ var DrawPrintBase = /*#__PURE__*/function () {
     key: "clearMask",
     value: function clearMask() {
       this.clear();
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_9__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
       var domlevel = hoEditorFactory.drawTree.drawPages[this.Position[0]].drawDomLevel;
       var dPage = hoEditorFactory.drawTree.drawPages[this.Position[0]];
       if (!domlevel) return;
@@ -79986,7 +79997,7 @@ var DrawPrintBase = /*#__PURE__*/function () {
     key: "preparePrint",
     value: function preparePrint() {
       this.clear();
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_9__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
       var dPage = hoEditorFactory.drawTree.drawPages[this._pageindex];
       var domlevel = hoEditorFactory.drawTree.drawPages[this._pageindex].drawDomLevel;
       if (!domlevel) return;
@@ -207322,7 +207333,7 @@ var TextNode = __webpack_require__(27198);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(67945);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.1.91');
+/* harmony default export */ var version = ('3.1.93');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -222034,9 +222045,17 @@ var VueController = /*#__PURE__*/function () {
                   arr = [];
                   arr.push(sign);
                 } else {
-                  arr.push(sign);
-                  signList.push(arr);
-                  arr = [];
+                  if (arr.filter(function (v) {
+                    return v.number == 0 || v.number == 1;
+                  }).length) {
+                    signList.push(arr);
+                    arr = [];
+                    arr.push(sign);
+                  } else {
+                    arr.push(sign);
+                    signList.push(arr);
+                    arr = [];
+                  }
                 }
               } else {
                 if (arr.length && arr[arr.length - 1].connectMode == '换行' && sign.connectMode != '换行') {
@@ -234364,7 +234383,13 @@ var PrintController = /*#__PURE__*/function () {
               if (dPage.drawSelectLevel && !dPage.drawSelectLevel.stage) {
                 dPage.drawSelectLevel.bindStage();
               }
-              dPage.selectContainer.children = [];
+              if (dPage.selectContainer.children.length) {
+                dPage.selectContainer.children.forEach(function (child) {
+                  if (child.name == 'print_mark') {
+                    dPage.selectContainer.removeChild(child);
+                  }
+                });
+              }
               (_dPage$selectContaine = dPage.selectContainer.stage) === null || _dPage$selectContaine === void 0 ? void 0 : _dPage$selectContaine.update();
             });
             hoEditorFactory.vueController.rebuildAll(true);
@@ -236120,12 +236145,14 @@ var HOEditorFactory = /*#__PURE__*/function () {
     (0,esm_defineProperty/* default */.Z)(this, "_allowUncheckRadio", false);
     //允许直接取消勾选单选控件(默认不允许)
     (0,esm_defineProperty/* default */.Z)(this, "_insHtmlWithColor", true);
+    //插入检查检验文本带颜色(默认带颜色)
+    (0,esm_defineProperty/* default */.Z)(this, "convertSignImage", false);
     this._hoEditorFactoryId = id;
   }
   (0,esm_createClass/* default */.Z)(HOEditorFactory, [{
     key: "hoLocalStorage",
     get:
-    //插入检查检验文本带颜色(默认带颜色)
+    // 处理签名图片，减小其分辨率大小，提高打印时图片处理速度
     /**
      * Getter hoLocalStorage
      * @return {HoLocalStorage}