hoeditor-web 3.1.45 → 3.1.46

package/lib/hoeditor.umd.js

@@ -9491,7 +9491,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 93795:
+/***/ 43284:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -9511,7 +9511,7 @@ var es_string_includes = __webpack_require__(32023);
 var es_regexp_exec = __webpack_require__(74916);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
 var es_string_replace = __webpack_require__(15306);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=68100230&
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=3e8ee4b5&
 
 
 
@@ -9958,7 +9958,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=68100230&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=3e8ee4b5&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(61748);
@@ -12393,6 +12393,7 @@ var columns = [{
       var node = null;
       if (this.selectMarkStyle.open && this.selectMarkStyle.dataid) {
         node = hoEditorFactory.vueController.getNodeByDataID('main', this.selectMarkStyle.dataid);
+        return node;
       } else {
         var _hoEditorFactory$vueC;
         node = (_hoEditorFactory$vueC = hoEditorFactory.vueController.findNodebyPath(this.endPath)) === null || _hoEditorFactory$vueC === void 0 ? void 0 : _hoEditorFactory$vueC.node;
@@ -12400,17 +12401,17 @@ var columns = [{
       if (node instanceof MarkNode/* MarkNode */.j || node instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
         var parentNode = node.parentNode;
         if (parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
-          value = parentNode;
+          return parentNode;
         } else {
-          value = node;
+          return node;
         }
       } else if (node instanceof TextNode/* TextNode */.R) {
         var _parentNode = node.parentNode;
         if (_parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
-          value = _parentNode;
+          return _parentNode;
         }
       } else if (node instanceof DateTimeNode/* DateTimeNode */.Z || node instanceof DownListNode/* DownListNode */.yF) {
-        value = node;
+        return node;
       }
       return value;
     },
@@ -12856,10 +12857,10 @@ var columns = [{
 });
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=script&lang=js&
  /* harmony default export */ var poperSelect_PoperSelectvue_type_script_lang_js_ = (PoperSelectvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=68100230&prod&lang=less&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=3e8ee4b5&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=68100230&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=3e8ee4b5&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -38965,7 +38966,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        ");
+              htmlText.text = svgBox === null || svgBox === void 0 ? void 0 : svgBox.innerHTML;
               reslove && reslove('printend');
             case 44:
             case "end":
@@ -178099,7 +178100,7 @@ var map = {
 	"./pageInfoes/PageInfoes.vue": 99749,
 	"./paragraph/ParagraphDialog.vue": 58874,
 	"./poperSelect/PoperMark.vue": 20734,
-	"./poperSelect/PoperSelect.vue": 93795,
+	"./poperSelect/PoperSelect.vue": 43284,
 	"./poperTipText/PoperTipText.vue": 50987,
 	"./popers/Poper.vue": 57937,
 	"./popers/Title.vue": 85516,
@@ -215554,8 +215555,8 @@ var es_string_match = __webpack_require__(4723);
 var es_number_constructor = __webpack_require__(9653);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
 var es_json_stringify = __webpack_require__(38862);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=beccc54c&
-var HoDocvue_type_template_id_beccc54c_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=e388825c&
+var HoDocvue_type_template_id_e388825c_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -215739,7 +215740,7 @@ var HoDocvue_type_template_id_beccc54c_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_beccc54c_staticRenderFns = [];
+var HoDocvue_type_template_id_e388825c_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -217339,7 +217340,7 @@ var HoToPage_component = (0,componentNormalizer/* default */.Z)(
 // EXTERNAL MODULE: ./src/plugins/util.ts
 var plugins_util = __webpack_require__(62783);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperSelect.vue + 9 modules
-var PoperSelect = __webpack_require__(93795);
+var PoperSelect = __webpack_require__(43284);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperMark.vue + 5 modules
 var PoperMark = __webpack_require__(20734);
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/index.ts
@@ -218744,7 +218745,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.45');
+/* harmony default export */ var version = ('3.1.46');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -219321,16 +219322,18 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
       if (node instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
         parentNode = node;
       } else {
-        parentNode = node.parentNode;
+        parentNode = node === null || node === void 0 ? void 0 : node.parentNode;
       }
       var index = 5;
       var flag = false;
       while (!flag && index >= 0) {
-        index--;
-        flag = parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && parentNode.inputFieldType == 1 && parentNode.downListProperty.listItems.includes("<元素>");
         if (!flag) {
-          var _parentNode2;
-          parentNode = (_parentNode2 = parentNode) === null || _parentNode2 === void 0 ? void 0 : _parentNode2.parentNode;
+          index--;
+          flag = parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && parentNode.inputFieldType == 1 && parentNode.downListProperty.listItems.includes("<元素>");
+          if (!flag) {
+            var _parentNode2;
+            parentNode = (_parentNode2 = parentNode) === null || _parentNode2 === void 0 ? void 0 : _parentNode2.parentNode;
+          }
         }
       }
       return parentNode;
@@ -219636,10 +219639,10 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
 });
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocvue_type_script_lang_js_ = (HoDocvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=style&index=0&id=beccc54c&prod&lang=less&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=style&index=0&id=e388825c&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=beccc54c&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=e388825c&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -219652,8 +219655,8 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
 
 var HoDoc_component = (0,componentNormalizer/* default */.Z)(
   components_HoDocvue_type_script_lang_js_,
-  HoDocvue_type_template_id_beccc54c_render,
-  HoDocvue_type_template_id_beccc54c_staticRenderFns,
+  HoDocvue_type_template_id_e388825c_render,
+  HoDocvue_type_template_id_e388825c_staticRenderFns,
   false,
   null,
   null,
@@ -231392,22 +231395,47 @@ var VueController = /*#__PURE__*/function () {
       return getBase64;
     }()
   }, {
-    key: "isSetFontFamily",
+    key: "getSvg",
     value: function () {
-      var _isSetFontFamily = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee10(callback) {
-        var hoEditorFactory, font;
+      var _getSvg = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee10() {
+        var hoEditorFactory, text;
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee10$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
+            case 0:
+              hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+              _context11.next = 3;
+              return hoEditorFactory.printController.createHtml();
+            case 3:
+              text = _context11.sent;
+              return _context11.abrupt("return", text);
+            case 5:
+            case "end":
+              return _context11.stop();
+          }
+        }, _callee10, this);
+      }));
+      function getSvg() {
+        return _getSvg.apply(this, arguments);
+      }
+      return getSvg;
+    }()
+  }, {
+    key: "isSetFontFamily",
+    value: function () {
+      var _isSetFontFamily = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee11(callback) {
+        var hoEditorFactory, font;
+        return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee11$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
               if (hoEditorFactory.printController.isSetFont) {
-                _context11.next = 8;
+                _context12.next = 8;
                 break;
               }
-              _context11.next = 4;
+              _context12.next = 4;
               return hoEditorFactory.vueController.hoLocalStorage().loadFontString();
             case 4:
-              font = _context11.sent;
+              font = _context12.sent;
               if (font) {
                 hoEditorFactory.printController.setjsPDFFonts(font);
                 callback && callback();
@@ -231415,15 +231443,15 @@ var VueController = /*#__PURE__*/function () {
                   font = '';
                 }, 0);
               }
-              _context11.next = 9;
+              _context12.next = 9;
               break;
             case 8:
               callback && callback();
             case 9:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee10, this);
+        }, _callee11, this);
       }));
       function isSetFontFamily(_x25) {
         return _isSetFontFamily.apply(this, arguments);
@@ -233874,10 +233902,10 @@ var VueController = /*#__PURE__*/function () {
   }, {
     key: "importWordFile",
     value: function () {
-      var _importWordFile = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee11(fileStr) {
+      var _importWordFile = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee12(fileStr) {
         var hoEditorFactory, _curDomRange, startPath, endPath, changingEvent, nodes;
-        return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee11$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee12$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
               hoEditorFactory.isThrowError = false;
@@ -233886,10 +233914,10 @@ var VueController = /*#__PURE__*/function () {
               endPath = _curDomRange.normalize().endPath;
               changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType */.y.openLocalFiles);
               if (!hoEditorFactory.docTree.changing(changingEvent)) {
-                _context12.next = 14;
+                _context13.next = 14;
                 break;
               }
-              _context12.next = 9;
+              _context13.next = 9;
               return hoEditorFactory.docController.initBlankDoc();
             case 9:
               hoEditorFactory.drawTree.inViewPages = [0];
@@ -233901,9 +233929,9 @@ var VueController = /*#__PURE__*/function () {
               hoEditorFactory.undoService.stack = [];
             case 15:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee11, this);
+        }, _callee12, this);
       }));
       function importWordFile(_x26) {
         return _importWordFile.apply(this, arguments);
@@ -237647,6 +237675,7 @@ var jspdf = __webpack_require__(77937);
 
 
 
+
 var PrintController = /*#__PURE__*/function () {
   function PrintController(hoEditorFactoryID) {
     (0,esm_classCallCheck/* default */.Z)(this, PrintController);
@@ -237675,9 +237704,9 @@ var PrintController = /*#__PURE__*/function () {
      * 生成html
      */
   }, {
-    key: "createHtml",
+    key: "createSvg",
     value: function () {
-      var _createHtml = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee() {
+      var _createSvg = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee() {
         var _this = this;
         var hoEditorFactory, path, beforePrintStatus, xml, htmlText, hPromise;
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee$(_context) {
@@ -237720,6 +237749,30 @@ var PrintController = /*#__PURE__*/function () {
           }
         }, _callee, this);
       }));
+      function createSvg() {
+        return _createSvg.apply(this, arguments);
+      }
+      return createSvg;
+    }()
+  }, {
+    key: "createHtml",
+    value: function () {
+      var _createHtml = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee2() {
+        var text, hoEditorFactory, orientation, printStyle;
+        return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              text = this.createSvg();
+              hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+              orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? 'l' : 'p';
+              printStyle = (0,plugins_util/* createPrintHTMLStyle */.j_)(hoEditorFactory.pageProperty.pageSize, orientation);
+              return _context2.abrupt("return", "\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(text, "</body>\n            </html>\n        "));
+            case 5:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
       function createHtml() {
         return _createHtml.apply(this, arguments);
       }
@@ -237731,18 +237784,18 @@ var PrintController = /*#__PURE__*/function () {
   }, {
     key: "createBase64",
     value: function () {
-      var _createBase = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee2(callback) {
+      var _createBase = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee3(callback) {
         var _this2 = this;
         var hoEditorFactory, path, beforePrintStatus, xml, orientation, format, options, hPromise, base64;
-        return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               if (this._isSetFont) {
-                _context2.next = 3;
+                _context3.next = 3;
                 break;
               }
               this._waitSavepdf = true;
-              return _context2.abrupt("return");
+              return _context3.abrupt("return");
             case 3:
               hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID); // 保存打印前文档状态 和 内容
               path = hoEditorFactory.docTree.curDomRange.normalize().endPath;
@@ -237772,7 +237825,7 @@ var PrintController = /*#__PURE__*/function () {
                   PrintStatus/* Print */.Kh.createPDFBase64(_this2._hoEditorFactoryID, resolve, _this2.PDF);
                 });
               });
-              _context2.next = 17;
+              _context3.next = 17;
               return hPromise.then(function (pageNumber) {
                 // 恢复文档状态 和 内容;
                 hoEditorFactory.drawTree.paintStatus = beforePrintStatus;
@@ -237801,23 +237854,23 @@ var PrintController = /*#__PURE__*/function () {
                 });
               });
             case 17:
-              base64 = _context2.sent;
+              base64 = _context3.sent;
               if (!base64) {
-                _context2.next = 21;
+                _context3.next = 21;
                 break;
               }
               setTimeout(function () {
                 hoEditorFactory.vueController.moveCaretToPath(path);
                 _this2.clearJsPDF();
               }, 0);
-              return _context2.abrupt("return", base64.replace(/^data:application\/pdf;filename=generated.pdf;base64,/, ''));
+              return _context3.abrupt("return", base64.replace(/^data:application\/pdf;filename=generated.pdf;base64,/, ''));
             case 21:
-              return _context2.abrupt("return", null);
+              return _context3.abrupt("return", null);
             case 22:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
       function createBase64(_x) {
         return _createBase.apply(this, arguments);
@@ -237968,31 +238021,31 @@ var PrintController = /*#__PURE__*/function () {
         if (error.length > 0) return '指定页输入超出文档页范围';
       }
       var setStatus = new Promise( /*#__PURE__*/function () {
-        var _ref = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee3(resolve, reject) {
-          return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee3$(_context3) {
-            while (1) switch (_context3.prev = _context3.next) {
+        var _ref = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee4(resolve, reject) {
+          return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee4$(_context4) {
+            while (1) switch (_context4.prev = _context4.next) {
               case 0:
-                _context3.prev = 0;
+                _context4.prev = 0;
                 hoEditorFactory.printStatus.printAppoint = '';
                 hoEditorFactory.printStatus.printMode = printMode ? printMode : 0;
                 if (printMode === 3 && printAppoint) {
                   hoEditorFactory.printStatus.printAppoint = printAppoint;
                 }
                 hoEditorFactory.drawTree.paintStatus = DrawTree/* PaintState */.Dh.psPreview;
-                _context3.next = 7;
+                _context4.next = 7;
                 return hoEditorFactory.drawTree.rebuildAllDrawLine(false, resolve);
               case 7:
-                _context3.next = 12;
+                _context4.next = 12;
                 break;
               case 9:
-                _context3.prev = 9;
-                _context3.t0 = _context3["catch"](0);
+                _context4.prev = 9;
+                _context4.t0 = _context4["catch"](0);
                 reject(false);
               case 12:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
-          }, _callee3, null, [[0, 9]]);
+          }, _callee4, null, [[0, 9]]);
         }));
         return function (_x2, _x3) {
           return _ref.apply(this, arguments);
@@ -238113,11 +238166,11 @@ var PrintController = /*#__PURE__*/function () {
   }, {
     key: "mergeXmlToPrintPDFNew",
     value: function () {
-      var _mergeXmlToPrintPDFNew = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee5(xmlInfoes, callback) {
+      var _mergeXmlToPrintPDFNew = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee6(xmlInfoes, callback) {
         var _this5 = this;
         var list, positionY, hoEditorFactory, beforePrintStatus, xml, hPromise, lastPrintPosition;
-        return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               console.time('连续打印总用时');
               list = [];
@@ -238157,10 +238210,10 @@ var PrintController = /*#__PURE__*/function () {
                 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 _ref2 = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee5(resolve) {
                     var orientation, format, pageSize, options;
-                    return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee4$(_context4) {
-                      while (1) switch (_context4.prev = _context4.next) {
+                    return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee5$(_context5) {
+                      while (1) switch (_context5.prev = _context5.next) {
                         case 0:
                           orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? 'l' : 'p';
                           format = [hoEditorFactory.pageProperty.widthPixes, hoEditorFactory.pageProperty.heightPixes];
@@ -238184,16 +238237,16 @@ var PrintController = /*#__PURE__*/function () {
                           PrintStatus/* Print */.Kh.printToPDF(_this5._hoEditorFactoryID, _this5.PDF, undefined, undefined, resolve, positionY, format);
                         case 9:
                         case "end":
-                          return _context4.stop();
+                          return _context5.stop();
                       }
-                    }, _callee4);
+                    }, _callee5);
                   }));
                   return function (_x6) {
                     return _ref2.apply(this, arguments);
                   };
                 }());
               });
-              _context5.next = 17;
+              _context6.next = 17;
               return hPromise.then(function (res) {
                 if (res) {
                   console.timeEnd('生成pdf用时');
@@ -238247,23 +238300,23 @@ var PrintController = /*#__PURE__*/function () {
                 }
               });
             case 17:
-              lastPrintPosition = _context5.sent;
+              lastPrintPosition = _context6.sent;
               if (!lastPrintPosition) {
-                _context5.next = 20;
+                _context6.next = 20;
                 break;
               }
-              return _context5.abrupt("return", {
+              return _context6.abrupt("return", {
                 startPageNum: lastPrintPosition[0],
                 pageNum: lastPrintPosition[1],
                 positionY: lastPrintPosition[2]
               });
             case 20:
-              return _context5.abrupt("return", null);
+              return _context6.abrupt("return", null);
             case 21:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
       function mergeXmlToPrintPDFNew(_x4, _x5) {
         return _mergeXmlToPrintPDFNew.apply(this, arguments);
@@ -238278,11 +238331,11 @@ var PrintController = /*#__PURE__*/function () {
   }, {
     key: "pintAllToPDF",
     value: function () {
-      var _pintAllToPDF = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee8(xmlList, callback, params) {
+      var _pintAllToPDF = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee9(xmlList, callback, params) {
         var _this6 = this;
         var hoEditorFactory, beforePrintStatus, xml, xmlIndex, mergeList, position, continuousid, options, pageNumber, toPrint, createSvg;
-        return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
               beforePrintStatus = hoEditorFactory.drawTree.paintStatus;
@@ -238304,9 +238357,9 @@ var PrintController = /*#__PURE__*/function () {
                 value: 0
               };
               toPrint = /*#__PURE__*/function () {
-                var _ref3 = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee6() {
-                  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee6$(_context6) {
-                    while (1) switch (_context6.prev = _context6.next) {
+                var _ref3 = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee7() {
+                  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee7$(_context7) {
+                    while (1) switch (_context7.prev = _context7.next) {
                       case 0:
                         if (params && continuousid && Array.isArray(params.notPrintDocId) && params.notPrintDocId.length > 0 && params.notPrintDocId.includes(continuousid)) {
                           PrintStatus/* Print */.Kh.printAllNew(_this6._hoEditorFactoryID, createSvg, _this6.PDF, position, true, pageNumber);
@@ -238315,19 +238368,19 @@ var PrintController = /*#__PURE__*/function () {
                         }
                       case 1:
                       case "end":
-                        return _context6.stop();
+                        return _context7.stop();
                     }
-                  }, _callee6);
+                  }, _callee7);
                 }));
                 return function toPrint() {
                   return _ref3.apply(this, arguments);
                 };
               }();
               createSvg = /*#__PURE__*/function () {
-                var _ref4 = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee7() {
+                var _ref4 = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee8() {
                   var otherPageNumber, i, _this6$PDF, _this6$PDF2, name;
-                  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee7$(_context7) {
-                    while (1) switch (_context7.prev = _context7.next) {
+                  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee8$(_context8) {
+                    while (1) switch (_context8.prev = _context8.next) {
                       case 0:
                         xmlIndex++;
                         if (xmlIndex <= xmlList.length - 1) {
@@ -238393,9 +238446,9 @@ var PrintController = /*#__PURE__*/function () {
                         }
                       case 2:
                       case "end":
-                        return _context7.stop();
+                        return _context8.stop();
                     }
-                  }, _callee7);
+                  }, _callee8);
                 }));
                 return function createSvg() {
                   return _ref4.apply(this, arguments);
@@ -238404,9 +238457,9 @@ var PrintController = /*#__PURE__*/function () {
               createSvg();
             case 16:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8, this);
+        }, _callee9, this);
       }));
       function pintAllToPDF(_x7, _x8, _x9) {
         return _pintAllToPDF.apply(this, arguments);
@@ -238421,11 +238474,11 @@ var PrintController = /*#__PURE__*/function () {
   }, {
     key: "pintAllToPDFBase64",
     value: function () {
-      var _pintAllToPDFBase = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee11(xmlList, callback, params) {
+      var _pintAllToPDFBase = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee12(xmlList, callback, params) {
         var _this7 = this;
         var hoEditorFactory, beforePrintStatus, xml, xmlIndex, mergeList, position, continuousid, currentName, pdfList, options, toPrint, createSvg;
-        return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
               beforePrintStatus = hoEditorFactory.drawTree.paintStatus;
@@ -238446,26 +238499,26 @@ var PrintController = /*#__PURE__*/function () {
               this.PDF = null;
               this.PDF = new jspdf/* default */.ZP(options);
               toPrint = /*#__PURE__*/function () {
-                var _ref5 = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee9() {
+                var _ref5 = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee10() {
                   var emrOptions, _this7$PDF;
-                  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee9$(_context9) {
-                    while (1) switch (_context9.prev = _context9.next) {
+                  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee10$(_context10) {
+                    while (1) switch (_context10.prev = _context10.next) {
                       case 0:
                         emrOptions = {
                           name: hoEditorFactory.vueController.getDocTitle() ? hoEditorFactory.vueController.getDocTitle() : '电子病历文档',
                           continuousid: continuousid
                         };
                         if (!(params && continuousid && Array.isArray(params.notPrintDocId) && params.notPrintDocId.length > 0 && params.notPrintDocId.includes(continuousid))) {
-                          _context9.next = 6;
+                          _context10.next = 6;
                           break;
                         }
-                        _context9.next = 4;
+                        _context10.next = 4;
                         return PrintStatus/* Print */.Kh.printAllNew(_this7._hoEditorFactoryID, createSvg, _this7.PDF, position, true);
                       case 4:
-                        _context9.next = 8;
+                        _context10.next = 8;
                         break;
                       case 6:
-                        _context9.next = 8;
+                        _context10.next = 8;
                         return PrintStatus/* Print */.Kh.printAllNew(_this7._hoEditorFactoryID, createSvg, _this7.PDF, position);
                       case 8:
                         if (!params.mergePDF) {
@@ -238482,19 +238535,19 @@ var PrintController = /*#__PURE__*/function () {
                         }
                       case 9:
                       case "end":
-                        return _context9.stop();
+                        return _context10.stop();
                     }
-                  }, _callee9);
+                  }, _callee10);
                 }));
                 return function toPrint() {
                   return _ref5.apply(this, arguments);
                 };
               }();
               createSvg = /*#__PURE__*/function () {
-                var _ref6 = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee10() {
+                var _ref6 = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee11() {
                   var _this7$PDF2;
-                  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee10$(_context10) {
-                    while (1) switch (_context10.prev = _context10.next) {
+                  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee11$(_context11) {
+                    while (1) switch (_context11.prev = _context11.next) {
                       case 0:
                         xmlIndex++;
                         currentName = xmlList[xmlIndex - 1] ? xmlList[xmlIndex - 1][5] : '';
@@ -238562,9 +238615,9 @@ var PrintController = /*#__PURE__*/function () {
                         }
                       case 3:
                       case "end":
-                        return _context10.stop();
+                        return _context11.stop();
                     }
-                  }, _callee10);
+                  }, _callee11);
                 }));
                 return function createSvg() {
                   return _ref6.apply(this, arguments);
@@ -238573,9 +238626,9 @@ var PrintController = /*#__PURE__*/function () {
               createSvg();
             case 17:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee11, this);
+        }, _callee12, this);
       }));
       function pintAllToPDFBase64(_x10, _x11, _x12) {
         return _pintAllToPDFBase.apply(this, arguments);