hoeditor-web 2.0.93 → 2.0.96

package/lib/hoeditor.common.js

@@ -9053,7 +9053,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 96012:
+/***/ 25425:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -9065,8 +9065,8 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ Poper; }
 });
 
-;// 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/popers/Poper.vue?vue&type=template&id=3d052018&
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.classSelected,style:(_vm.poperStyle),on:{"mouseenter":_vm.mouseenter,"mouseleave":_vm.mouseleave}},[_vm._t("default",function(){return [_c('span',{class:_vm.classNames})]}),(_vm.title && _vm.show)?_c('Title',{attrs:{"title":_vm.title,"styles":_vm.styles}}):_vm._e()],2)}
+;// 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/popers/Poper.vue?vue&type=template&id=c961989a&
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.classSelected,style:(_vm.poperStyle),on:{"mouseenter":_vm.mouseenter,"mouseleave":_vm.mouseleave}},[(_vm.svg)?_c('span',{class:_vm.classNames}):_vm._t("default"),(_vm.title && _vm.show)?_c('Title',{attrs:{"title":_vm.title,"styles":_vm.styles}}):_vm._e()],2)}
 var staticRenderFns = []
 
 
@@ -9084,7 +9084,6 @@ var Title = __webpack_require__(40168);
 //
 //
 //
-//
 
 /* harmony default export */ var Popervue_type_script_lang_js_ = ({
   name: 'Poper',
@@ -14288,7 +14287,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 44584:
+/***/ 97599:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -14300,7 +14299,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ 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/upload/UploadImageDialog.vue?vue&type=template&id=2365d481&scoped=true&
+;// 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/UploadImageDialog.vue?vue&type=template&id=7ab93c5e&scoped=true&
 var 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"},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("上传图片")]),_c('el-upload',{ref:"upload",staticClass:"upload-image",attrs:{"action":"","file-list":_vm.fileList,"show-file-list":false,"auto-upload":false,"on-change":_vm.uploadImage,"accept":"image/*"}},[_c('el-button',{attrs:{"size":"small"}},[_vm._v("选择图片")])],1)],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("修改")]),_c('el-radio',{attrs:{"label":"w"},model:{value:(_vm.radio),callback:function ($$v) {_vm.radio=$$v},expression:"radio"}},[_vm._v("宽度")]),_c('el-radio',{attrs:{"label":"h"},model:{value:(_vm.radio),callback:function ($$v) {_vm.radio=$$v},expression:"radio"}},[_vm._v("高度")])],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("图片宽度")]),_c('el-input',{attrs:{"disabled":_vm.radio == 'h',"size":"mini","placeholder":"设置插入后的图片宽度","maxlength":"20"},model:{value:(_vm.width),callback:function ($$v) {_vm.width=$$v},expression:"width"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("图片高度")]),_c('el-input',{attrs:{"disabled":_vm.radio == 'w',"size":"mini","placeholder":"设置插入后的图片高度","maxlength":"20"},model:{value:(_vm.height),callback:function ($$v) {_vm.height=$$v},expression:"height"}})],1),(_vm.uploadImageParams && _vm.uploadImageParams.uploadUrl)?[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("图片格式")]),_c('el-radio',{attrs:{"label":false},model:{value:(_vm.upload),callback:function ($$v) {_vm.upload=$$v},expression:"upload"}},[_vm._v("生成base64")]),_c('el-radio',{attrs:{"label":true},model:{value:(_vm.upload),callback:function ($$v) {_vm.upload=$$v},expression:"upload"}},[_vm._v("上传到服务器")])],1)]:_vm._e(),(!_vm.upload)?[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"}),_c('el-checkbox',{model:{value:(_vm.compress),callback:function ($$v) {_vm.compress=$$v},expression:"compress"}},[_vm._v("是否按缩放后尺寸压缩图片")])],1),_c('li',{staticStyle:{"text-align":"left","padding":"0 0 0 10px","line-height":"20px"}},[_vm._v("图片初始大小："+_vm._s((_vm.uploadImageUrl.length / 1024).toFixed(2))+" kb")]),_c('li',{staticStyle:{"text-align":"left","padding":"0 0 0 10px","line-height":"20px"}},[_vm._v("压缩后图片大小："+_vm._s((_vm.imageUrl.length / 1024).toFixed(2))+" kb")]),_c('li',{staticStyle:{"text-align":"left","padding":"0 0 0 10px","line-height":"20px"}},[_vm._v("图片默认压缩为 jpeg 格式")])]:_vm._e(),_c('fieldset',{staticClass:"fieldset"},[_c('legend',[_vm._v("预 览")]),_c('div',{staticClass:"view-image"},[(_vm.imageUrl)?_c('img',{ref:"image",attrs:{"width":this.width,"src":_vm.imageUrl}}):_vm._e()])])],2)]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","loading":_vm.uploadLoading,"type":"primary"},on:{"click":_vm.sure}},[_vm._v(_vm._s(_vm.uploadLoading ? '正在上传。。。' : '上传'))]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
 var staticRenderFns = []
 
@@ -14312,8 +14311,6 @@ var message_default = /*#__PURE__*/__webpack_require__.n(message);
 var es_number_to_fixed = __webpack_require__(56977);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
 var es_number_constructor = __webpack_require__(9653);
-// EXTERNAL MODULE: ./node_modules/vue-property-decorator/lib/vue-property-decorator.js + 1 modules
-var vue_property_decorator = __webpack_require__(14391);
 // EXTERNAL MODULE: ./src/plugins/ajax.ts
 var ajax = __webpack_require__(6255);
 // EXTERNAL MODULE: ./src/plugins/util.ts
@@ -14396,7 +14393,6 @@ var util = __webpack_require__(33913);
 //
 
 
-
 /* harmony default export */ var UploadImageDialogvue_type_script_lang_js_ = ({
   name: 'UploadImageDialog',
   props: {
@@ -14616,10 +14612,10 @@ var util = __webpack_require__(33913);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/upload/UploadImageDialog.vue?vue&type=script&lang=js&
  /* harmony default export */ var upload_UploadImageDialogvue_type_script_lang_js_ = (UploadImageDialogvue_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/UploadImageDialog.vue?vue&type=style&index=0&id=2365d481&lang=scss&scoped=true&
+;// 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/UploadImageDialog.vue?vue&type=style&index=0&id=7ab93c5e&lang=scss&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/upload/UploadImageDialog.vue?vue&type=style&index=0&id=2365d481&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./src/components/controls/upload/UploadImageDialog.vue?vue&type=style&index=0&id=7ab93c5e&lang=scss&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(1001);
@@ -14638,7 +14634,7 @@ var component = (0,componentNormalizer/* default */.Z)(
   staticRenderFns,
   false,
   null,
-  "2365d481",
+  "7ab93c5e",
   null
   
 )
@@ -16360,7 +16356,7 @@ var commonParamList = new Map();
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _Poper_vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(96012);
+/* harmony import */ var _Poper_vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(25425);
 
 /* harmony default export */ __webpack_exports__["Z"] = (_Poper_vue__WEBPACK_IMPORTED_MODULE_0__["default"]);
 
@@ -24813,7 +24809,7 @@ var Print = /*#__PURE__*/function () {
     key: "printToPDF",
     value: function () {
       var _printToPDF = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee2(hoEditorFactoryID, PDF, type, fileName, reslove, positionY, format) {
-        var hoEditorFactory, dPage, docHeight, dHeight, startPageNum, svgBox, orientation, width, height, last, _iterator, _step, _cpage$drawDomLevel3, index, cpage, dShape, posIndex, posY, _dShape, svg2pdfOptions, _cpage$drawDomLevel, _cpage$drawDomLevel$s, ctx, _cpage$drawDomLevel2, _cpage$drawDomLevel2$, _ctx, _ctx2, _svgBox2, svgData, _ctx3, _last, printStyle, _svgBox, exportHtml, url, link, name;
+        var hoEditorFactory, dPage, docHeight, dHeight, startPageNum, svgBox, orientation, width, height, last, _iterator, _step, _cpage$drawDomLevel3, index, cpage, dShape, posIndex, posY, _dShape, svg2pdfOptions, _cpage$drawDomLevel, _cpage$drawDomLevel$s, ctx, _cpage$drawDomLevel2, _cpage$drawDomLevel2$, _ctx, _ctx2, _svgBox2, svgData, _ctx3, _last, printStyle, _svgBox, exportHtml, url, link, otherPageNumber, i, name;
 
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee2$(_context3) {
           while (1) {
@@ -25108,11 +25104,15 @@ var Print = /*#__PURE__*/function () {
                     return link.remove();
                   }, 100);
                 } else {
-                  if (height <= 560 && hoEditorFactory.isFixedPrintToA4 === '') {
-                    PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
+                  otherPageNumber = PDF.internal.getNumberOfPages() - hoEditorFactory.drawTree.drawPages.length;
+
+                  if (otherPageNumber >= 1) {
+                    for (i = 0; i < otherPageNumber; i++) {
+                      PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
+                    }
                   }
 
-                  PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
+                  console.warn("\u4ECE\u5F00\u59CB\u5220\u6389".concat(otherPageNumber, "\u9875\u7A7A\u767D\u9875"));
                   name = hoEditorFactory.vueController.getDocTitle() ? hoEditorFactory.vueController.getDocTitle() : '电子病历文档';
                   PDF && this.openDataUriInWindow(PDF, name, hoEditorFactory.pageProperty.widthPixes);
                 }
@@ -28157,13 +28157,13 @@ var DocController = /*#__PURE__*/function () {
               if (node.keyValue !== "") {
                 node.childNodes.splice(1, node.childNodes.length - 2);
                 var textNode = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R(this._hoEditorFactoryID, node.rootNodes, node, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntText */ .Jq.ntText, values["text"], hoEditorFactory.docTree.curStyleIndex);
-                node.childNodes.splice(1, 0, textNode); //changeEvent.afterChangePath = hoEditorFactory.docTree.getNodeLastPath(textNode);
+                node.childNodes.splice(1, 0, textNode);
+                changeEvent.afterChangePath = hoEditorFactory.docTree.getNodeLastPath(textNode);
               } else {
                 node.childNodes.splice(1, node.childNodes.length - 2);
                 node.childNodes.splice(1, 0, node.childNodes2[1]);
+                changeEvent.afterChangePath = ePath;
               }
-
-              changeEvent.afterChangePath = ePath;
             } else {
               //changeEvent.afterChangePath = hoEditorFactory.docTree.getNodeLastPath(node);
               changeEvent.afterChangePath = ePath;
@@ -47440,16 +47440,13 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
     _this._signTime = signTime;
     _this._imgSrc = imgSrc;
     _this._attribute = attribute === undefined ? 0 : attribute;
-    _this._connectChar = connectChar === undefined ? ":" : connectChar;
-
-    if (fingerPrintSrc || imgSrc && !fingerPrintSrc && customProperty && !customProperty.abi02) {
-      // 用自定义属性区分并兼容旧的患者签名
-      _this._attribute = 1;
-      _this._type = 3;
-    } // if(attribute == 1) { // 患者签名修改 type == 3
+    _this._connectChar = connectChar === undefined ? ":" : connectChar; // if (fingerPrintSrc || (imgSrc && !fingerPrintSrc && customProperty && !customProperty.created_date)) { // 用自定义属性区分并兼容旧的患者签名
+    //     this._attribute = 1;
+    //     this._type = 3;
+    // }
+    // if(attribute == 1) { // 患者签名修改 type == 3
     //     this._type = 3;
     // }
-
 
     if (fingerPrintSrc) {
       _this._fingerPrintSrc = fingerPrintSrc;
@@ -58454,10 +58451,10 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
       commentTextShape.alpha = 1; //背景
 
       var backShape = new createjs.Shape();
-      backShape.graphics.setStrokeDash([4, 1], 0).setStrokeStyle(1).beginStroke("rgba(255, 0, 0, 1)").beginFill("#ffe5e5").drawRoundRect(0, 0, commentWidth - 20, comment.lineHeight, 5);
+      backShape.graphics.setStrokeDash([4, 1], 0).setStrokeStyle(1).beginStroke("rgba(255, 0, 0, 1)").beginFill("#ffe5e5") //.drawRoundRect(0, 0, commentWidth - 20, comment.lineHeigh,5);
+      .drawRect(0, 0, commentWidth - 20, comment.lineHeight);
       backShape.name = "back";
-      backShape.alpha = 0.5; //backShape.cache(0, 0, commentWidth - 20, comment.lineHeight, 5);
-      //横线
+      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);
@@ -65714,14 +65711,14 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_12__ = __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_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(74916);
-/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(23123);
-/* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(26699);
-/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(32023);
-/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(26699);
+/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(32023);
+/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(74916);
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(23123);
+/* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_6__);
 /* harmony import */ var _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(15798);
 /* harmony import */ var _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(34450);
 /* harmony import */ var _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(24113);
@@ -65743,7 +65740,7 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
 /*
  * @Author: your name
  * @Date: 2021-09-01 16:51:49
- * @LastEditTime: 2022-08-18 14:08:29
+ * @LastEditTime: 2022-08-29 10:17:11
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawSignNode.ts
@@ -65782,9 +65779,20 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
 
     _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight; //this.dHeight = 40;
 
-    _this._textStyle = cbStyle.getStyleKey();
+    _this._textStyle = cbStyle.getStyleKey(); // 处理混乱的类型
 
-    if (_this.number > 0 && type === 2) {
+    if (node.customProperty && node.customProperty.created_date) {
+      // 区分图片签名和普通文本签名 并更新对应的值
+      if ((imgSrc.includes('data:image/') || imgSrc.split("/").length > 1) && type == 3) {
+        node.type = 1;
+        _this.type = 1;
+      } else if (!imgSrc.includes('data:image/') && !imgSrc.includes("/") && type == 3) {
+        node.type = 2;
+        _this.type = 2;
+      }
+    }
+
+    if (_this.number > 0 && _this.type === 2) {
       var signArr = imgSrc.split('\n');
 
       if (signArr.length > 1) {
@@ -65810,7 +65818,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
       var dText = new createjs.Text(_this.signName, _this._textStyle, '#000000');
       _this.dWidth = dText.getMeasuredWidth();
     } else {
-      if (type === 1) {
+      if (_this.type === 1) {
         var scale = _this.dHeight / imgHeight;
 
         if (number === 1) {
@@ -65825,7 +65833,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
         }
       }
 
-      if (type === 2) {
+      if (_this.type === 2) {
         var _signArr = imgSrc.split('\n');
 
         var aText = new createjs.Text(_signArr[0], _this._textStyle, '#000000');
@@ -65855,31 +65863,12 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
           }
         }
       }
-    }
+    } // if ((((imgSrc || fingerPrintSrc) && this.type == 1) || this.type == 3) && node.customProperty && !node.customProperty.created_date) {
 
-    if ((imgSrc || fingerPrintSrc) && type == 1 || type == 3) {
-      // 处理混乱的
-      if (node.customProperty && node.customProperty.abi02) {
-        // 区分图片签名和普通文本签名 并更新对应的值
-        if ((imgSrc.includes('data:image/') || imgSrc.split("/").length > 1) && type == 3) {
-          node.type = 1;
-          _this.type = 1;
-        } else if (!imgSrc.includes('data:image/') && !imgSrc.includes("/") && type == 3) {
-          node.type = 2;
-          _this.type = 2;
-        }
-
-        console.warn('医生签名');
-
-        _this.drawSignNode();
-      } else {
-        console.warn('患者签名');
 
-        _this.drawWriteSignNode(node);
-      }
+    if (fingerPrintSrc || imgSrc && !fingerPrintSrc && node.customProperty && !node.customProperty.created_date) {
+      _this.drawWriteSignNode(node);
     } else {
-      console.warn('医生签名');
-
       _this.drawSignNode();
     }
 
@@ -66184,6 +66173,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
           image.src = _this3.imgSrc;
           var bitmap = new createjs.Bitmap(image);
           bitmap.y = -_this3.dHeight;
+          bitmap.setBounds(0, 0, drawNode.dWidth, drawNode.dHeight);
 
           if (_this3.number === 1) {
             bitmap.x = 0;
@@ -71474,9 +71464,14 @@ var DrawTree = /*#__PURE__*/function () {
           paragraphNode = this.clearDrawParagraphAfterDline(dline.paragraphNode, dline, inLineIndex, e.beforeChangePath);
           dendDrawLine = this.drawDocInsert(paragraphNode, lineIndex, // inLineIndex,
           node, startChildIndex + 1, e.afterChangePath);
-          var endIndex = alines.length - 1; // if (paragraphNode.parentNode === null) {
+          var endIndex = alines.indexOf(dendDrawLine);
+
+          if (hoEditorFactory.isUseDrawingOptimization) {
+            endIndex = alines.length - 1;
+          } // if (paragraphNode.parentNode === null) {
           // const darea = this.getDrawA(dline);
 
+
           if (e.repaintImmediate) {
             if (!dArea) {
               return false;
@@ -212782,7 +212777,7 @@ var map = {
 	"./poperSelect/PoperMark.vue": 93069,
 	"./poperSelect/PoperSelect.vue": 23915,
 	"./poperTipText/PoperTipText.vue": 91831,
-	"./popers/Poper.vue": 96012,
+	"./popers/Poper.vue": 25425,
 	"./popers/Title.vue": 40168,
 	"./printstyle/PrintLineStyle.vue": 90069,
 	"./qrCode/QrCode.vue": 67776,
@@ -212797,7 +212792,7 @@ var map = {
 	"./table/TableRowProperty.vue": 74456,
 	"./textDialog/TextDialog.vue": 74796,
 	"./upload/CanvasImageDialog.vue": 49532,
-	"./upload/UploadImageDialog.vue": 44584
+	"./upload/UploadImageDialog.vue": 97599
 };
 
 
@@ -214336,9 +214331,9 @@ 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/@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/HoDoc.vue?vue&type=template&id=22896312&
-var HoDocvue_type_template_id_22896312_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.docClassNames},[_c('div',{ref:"editorArea",staticClass:"editors"},[(_vm.drawPageLength > 0)?_c('div',{staticClass:"editor",on:{"click":function($event){return _vm.setActiveDocIndex(_vm.hoEditorId)}}},[_vm._l((_vm.drawPageCount.count),function(pgIndex){return [_c('HoPage',{key:pgIndex - 1,attrs:{"data-id":pgIndex - 1,"index":pgIndex - 1,"docIndex":_vm.docIndex,"canvasWidth":_vm.canvasParams.width,"canvasHeight":_vm.canvasParams.height,"currentActivePages":_vm.activePageIndex.index,"hoEditorId":_vm.hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"mouseMoveNodes":_vm.mouseMoveNodes,"viewableAreaObserver":_vm.viewableAreaObserver,"inViewPages":_vm.inViewPages,"canvasHeadFootPos":_vm.canvasHeadFootPos,"poperTipPos":_vm.poperTipPos,"textStyle":_vm.textStyle,"aiInfo":_vm.aiInfo},on:{"pageReady":_vm.pageReady,"canvasRightClick":_vm.mouseRightClickEvent},scopedSlots:_vm._u([{key:"hoPageHead",fn:function(){return [_vm._t("hoDocHead")]},proxy:true},{key:"hoPageFoot",fn:function(){return [_vm._t("hoDocFoot")]},proxy:true}],null,true)})]})],2):_vm._e()]),(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper')?_c('PoperSelectModal',{attrs:{"poperType":_vm.poperType,"poperSelectList":_vm.poperSelectList,"poperPos":_vm.poperPos,"hoEditorId":_vm.hoEditorId},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('PoperMark',{directives:[{name:"show",rawName:"v-show",value:(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper' || _vm.poperType === 'table-cell-poper'),expression:"poperType === 'datePoper' || poperType === 'selectPoper' || poperType === 'table-cell-poper'"}]}),(_vm.poperType === 'table-cell-poper')?_c('TableCellPoper',{attrs:{"poperNode":_vm.nodeValue,"poperPos":_vm.poperPos},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('HoToPage',{attrs:{"hoEditorId":_vm.hoEditorId,"inViewPages":_vm.inViewPages}}),_c('PoperTipText',{attrs:{"isPoperText":_vm.isPoperText,"poperText":_vm.poperText,"poperPos":_vm.poperTextPos},on:{"poperTextClose":_vm.poperTextClose}}),_c('ul',{directives:[{name:"click-outside",rawName:"v-click-outside",value:(function () { return (_vm.isCreateRightMenuModal = false); }),expression:"() => (isCreateRightMenuModal = false)"},{name:"show",rawName:"v-show",value:(_vm.isCreateRightMenuModal),expression:"isCreateRightMenuModal"}],ref:"rightMenuModal",staticClass:"create-right-menu"},[(_vm.showCommentsBtn)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.hideComments}},[_vm._v(_vm._s(_vm.isHideComments ? '显示' : '隐藏')+"批注")]):_vm._e(),(_vm.showDeleteSignMenu)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.deleteSignNode}},[_vm._v("删除签名")]):_vm._e(),_c('li',{staticClass:"mouse-menu-item"},[_vm._v(" 编辑器内核版本:   "),_c('span',{staticStyle:{"font-size":"14px","color":"#0a77e3"}},[_vm._v("v "+_vm._s(_vm.version))])])])],1)}
-var HoDocvue_type_template_id_22896312_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/HoDoc.vue?vue&type=template&id=5f466836&
+var HoDocvue_type_template_id_5f466836_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.docClassNames},[_c('div',{ref:"editorArea",staticClass:"editors"},[(_vm.drawPageLength > 0)?_c('div',{staticClass:"editor",on:{"click":function($event){return _vm.setActiveDocIndex(_vm.hoEditorId)}}},[_vm._l((_vm.drawPageCount.count),function(pgIndex){return [_c('HoPage',{key:pgIndex - 1,attrs:{"data-id":pgIndex - 1,"index":pgIndex - 1,"docIndex":_vm.docIndex,"canvasWidth":_vm.canvasParams.width,"canvasHeight":_vm.canvasParams.height,"currentActivePages":_vm.activePageIndex.index,"hoEditorId":_vm.hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"mouseMoveNodes":_vm.mouseMoveNodes,"viewableAreaObserver":_vm.viewableAreaObserver,"inViewPages":_vm.inViewPages,"canvasHeadFootPos":_vm.canvasHeadFootPos,"poperTipPos":_vm.poperTipPos,"textStyle":_vm.textStyle,"aiInfo":_vm.aiInfo},on:{"pageReady":_vm.pageReady,"canvasRightClick":_vm.mouseRightClickEvent},scopedSlots:_vm._u([{key:"hoPageHead",fn:function(){return [_vm._t("hoDocHead")]},proxy:true},{key:"hoPageFoot",fn:function(){return [_vm._t("hoDocFoot")]},proxy:true}],null,true)})]})],2):_vm._e()]),(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper')?_c('PoperSelectModal',{attrs:{"poperType":_vm.poperType,"poperSelectList":_vm.poperSelectList,"poperPos":_vm.poperPos,"hoEditorId":_vm.hoEditorId},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('PoperMark',{directives:[{name:"show",rawName:"v-show",value:(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper' || _vm.poperType === 'table-cell-poper'),expression:"poperType === 'datePoper' || poperType === 'selectPoper' || poperType === 'table-cell-poper'"}]}),(_vm.poperType === 'table-cell-poper')?_c('TableCellPoper',{attrs:{"poperNode":_vm.nodeValue,"poperPos":_vm.poperPos},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('HoToPage',{attrs:{"hoEditorId":_vm.hoEditorId,"inViewPages":_vm.inViewPages}}),_c('PoperTipText',{attrs:{"isPoperText":_vm.isPoperText,"poperText":_vm.poperText,"poperPos":_vm.poperTextPos},on:{"poperTextClose":_vm.poperTextClose}}),_c('ul',{directives:[{name:"click-outside",rawName:"v-click-outside",value:(function () { return (_vm.isCreateRightMenuModal = false); }),expression:"() => (isCreateRightMenuModal = false)"},{name:"show",rawName:"v-show",value:(_vm.isCreateRightMenuModal),expression:"isCreateRightMenuModal"}],ref:"rightMenuModal",staticClass:"create-right-menu"},[(_vm.showCommentsBtn)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.hideComments}},[_vm._v(_vm._s(_vm.isHideComments ? '显示' : '隐藏')+"批注")]):_vm._e(),(_vm.showDeleteSignMenu)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.deleteSignNode}},[_vm._v("删除签名")]):_vm._e(),_c('li',{staticClass:"mouse-menu-item"},[_vm._v(" 编辑器内核版本:   "),_c('span',{staticStyle:{"font-size":"14px","color":"#0a77e3"}},[_vm._v("v "+_vm._s(_vm.version))])])])],1)}
+var HoDocvue_type_template_id_5f466836_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
@@ -217979,7 +217974,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.93');
+/* harmony default export */ var version = ('2.0.96');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(91831);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -218465,7 +218460,7 @@ var ImageNode = __webpack_require__(88389);
 
       if (node instanceof SignNode/* SignNode */.N) {
         // 通过自定义属性内部字段判断是否属于患者签名 指纹签名只有患者签名才会有 同时患者签名不存在自定义属性可以用是否存在某个属性确定是否是患者签名（需要确定的是imgsrc要存在 imgsrc不存在是指空签名元素）
-        if (node.fingerPrintSrc || node.imgSrc && !node.fingerPrintSrc && node.customProperty && !node.customProperty.abi02) return false;
+        if (node.fingerPrintSrc || node.imgSrc && !node.fingerPrintSrc && node.customProperty && !node.customProperty.created_date) return false;
         this.$emit('dblNodeClick', {
           node: this.getCurrentSelectNode,
           type: 'sign'
@@ -218758,8 +218753,8 @@ var ImageNode = __webpack_require__(88389);
 
 var HoDoc_component = (0,componentNormalizer/* default */.Z)(
   components_HoDocvue_type_script_lang_js_,
-  HoDocvue_type_template_id_22896312_render,
-  HoDocvue_type_template_id_22896312_staticRenderFns,
+  HoDocvue_type_template_id_5f466836_render,
+  HoDocvue_type_template_id_5f466836_staticRenderFns,
   false,
   null,
   null,
@@ -219098,7 +219093,10 @@ var DrawPageTree = /*#__PURE__*/function () {
         return;
       }
 
-      this.clearAfterDTop(mainArea, dTop);
+      if (hoEditorFactory.isUseDrawingOptimization) {
+        this.clearAfterDTop(mainArea, dTop);
+      }
+
       var nextLine = startLine;
       var pageIsFull = new Map();
 
@@ -219154,7 +219152,7 @@ var DrawPageTree = /*#__PURE__*/function () {
                 restHeight = drawArea.maxHeight - dTop;
               }
 
-              if (!isNew) {
+              if (!isNew && hoEditorFactory.isUseDrawingOptimization) {
                 break;
               }
             }
@@ -219674,7 +219672,6 @@ var DrawPageTree = /*#__PURE__*/function () {
             }
           }
 
-          this.clearAfterDTop(drawArea, dTop);
           drawArea.update(prevArea, dRoots, startIndex, dTop, restHeight);
           this.afterAreaFinishPaint(drawArea);
           this._startNeedUpdatePage = Math.min(drawArea.index, this._startNeedUpdatePage === -1 ? 99999 : this._startNeedUpdatePage);
@@ -233394,13 +233391,14 @@ var jspdf = __webpack_require__(53672);
 
 
 
+
 
 
 /*
  * @Author: your name
  * @Date: 2021-07-31 09:25:57
- * @LastEditTime: 2021-07-31 13:59:29
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-08-26 13:53:54
+ * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\externalCall\PrintController.ts
  */
@@ -233709,10 +233707,21 @@ var PrintController = /*#__PURE__*/function () {
         });
 
         return;
-      }
+      } // if (hoEditorFactory.isHideComments) {
+      //     hoEditorFactory.vueController.hideComments(true);
+      // }
+
 
-      if (!hoEditorFactory.isHideComments) {
-        hoEditorFactory.vueController.hideComments(true);
+      var drawMainDocs = hoEditorFactory.drawPageTree.drawMainDocs;
+
+      for (var k = 0; k < drawMainDocs.length; k++) {
+        for (var s = drawMainDocs[k].children.length - 1; s >= 0; s--) {
+          var child = drawMainDocs[k].children[s];
+
+          if (child.name && child.name.substring(0, 1) === "C" && child.name.length > 15) {
+            drawMainDocs[k].removeChildAt(s);
+          }
+        }
       }
 
       if (printMode && printAppoint) {
@@ -235160,7 +235169,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
 
     this._isCanUseTableProperty = false; //非设计模式下是否可以使用表格、单元格、行、列属性设置
 
-    this._isUseDrawingOptimization = true; // 是否启用绘制优化 默认启用
+    this._isUseDrawingOptimization = false; // 是否启用绘制优化 默认启用
 
     this._loadImageCount = 0; // 待加载的图片数量
 

package/lib/hoeditor.css

@@ -103,7 +103,7 @@ canvas[data-v-4ca2496a] {
 .table-row-modal[data-v-3bd61b91]{z-index:2000;width:420px}.table-row-modal .footer[data-v-3bd61b91]{margin:20px 0 0 0;text-align:center}
 .text-modal{z-index:2000;width:470px;height:614px;background:#fff}.text-modal .el-checkbox,.text-modal .el-checkbox:last-of-type{margin:0 10px 0 0}.text-modal .line{width:423px;height:1px;background:#bbb;margin:5px auto}.text-modal .el-tabs{margin:0 auto;width:443px}.text-modal .modal-content .el-tabs{min-height:338px}.text-modal .control-list .control-item{padding:2px 10px}.text-modal fieldset{padding:2px 10px 10px}.text-modal fieldset legend{margin:0}.text-modal .ho-toolbar{-webkit-box-shadow:none;box-shadow:none}.text-modal .ho-toolbar .tabs-active-bar{display:block}.text-modal .main-bar li.selected{background-color:#fff;color:#409eff}.text-modal .sub-bar-box,.text-modal .sub-bar{overflow-y:auto;min-height:300px;height:476px}.text-modal .main-bar li:hover{background-color:#fff;color:#409eff}
 .canvas-image[data-v-1e0a2026]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.canvas-image #loon_canvas_editor[data-v-1e0a2026]{-webkit-box-flex:1;-ms-flex:1;flex:1;margin:0;display:block;position:relative}.canvas-image #loon_canvas_editor #loon_canvas_editor_box[data-v-1e0a2026]{position:absolute;left:50%;top:50%;z-index:111;border:1px solid #ccc;-webkit-box-sizing:content-box;box-sizing:content-box;-webkit-transform:translate(-50%, -50%);transform:translate(-50%, -50%)}.canvas-image #loon_canvas_editor textarea[data-v-1e0a2026]{background:rgba(0,0,0,0);position:absolute;color:red;border:1px dashed #000;font-size:16px;z-index:1222;outline:none;padding:2px}
-.view-image[data-v-2365d481]{padding:20px 0;max-height:418px;max-width:418px;overflow:auto;margin:5px 0 10px 0;background:#f2f4f7;border:1px solid #f0f0f0;text-align:center;color:red;overflow-y:hidden}.view-image image[data-v-2365d481]{background:#fff}.image-modal[data-v-2365d481]{z-index:2000;background:#fff}.image-modal .control-list[data-v-2365d481]{padding:0 20px;min-width:360px}.image-modal .footer[data-v-2365d481]{margin:20px 0 0 0;text-align:center}.control-item .upload-image[data-v-2365d481]{-webkit-box-flex:1;-ms-flex:1;flex:1}.upload-image[data-v-2365d481]{width:100%;height:36px;line-height:36px}.upload-image[data-v-2365d481]  .el-upload{text-align:left;width:100%;height:36px;line-height:36px}
+.view-image[data-v-7ab93c5e]{padding:20px 0;max-height:418px;max-width:418px;overflow:auto;margin:5px 0 10px 0;background:#f2f4f7;border:1px solid #f0f0f0;text-align:center;color:red;overflow-y:hidden}.view-image image[data-v-7ab93c5e]{background:#fff}.image-modal[data-v-7ab93c5e]{z-index:2000;background:#fff}.image-modal .control-list[data-v-7ab93c5e]{padding:0 20px;min-width:360px}.image-modal .footer[data-v-7ab93c5e]{margin:20px 0 0 0;text-align:center}.control-item .upload-image[data-v-7ab93c5e]{-webkit-box-flex:1;-ms-flex:1;flex:1}.upload-image[data-v-7ab93c5e]{width:100%;height:36px;line-height:36px}.upload-image[data-v-7ab93c5e]  .el-upload{text-align:left;width:100%;height:36px;line-height:36px}
 #HoPrintToPDF{position:absolute;left:0;top:0;z-index:6666}#versionPoper{position:fixed;right:10px;top:10px;font-size:14px;z-index:10}#versionPoper span{font-size:14px}
 .el-dropdown-menu[data-v-beffa98c]  .el-dropdown-menu__item:focus,.el-dropdown-menu[data-v-beffa98c]  .el-dropdown-menu__item:not(.is-disabled):hover{color:#000}.el-dropdown-menu p[data-v-beffa98c]{height:24px;line-height:24px}.el-dropdown-menu svg[data-v-beffa98c]{width:130px;height:60px}.el-dropdown-menu svg .text[data-v-beffa98c]{width:130px;height:60px}.el-dropdown-menu svg .text text[data-v-beffa98c]{height:16px;font-family:"微软雅黑"}
 .ho-print-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;padding:20px 0 0 0;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.ho-print-content label{line-height:30px;margin:0;padding:0;text-align:left}.ho-print-content .el-radio__label{font-size:14px}.ho-print-content .el-input{width:64%}.ho-print-content .ho-print-more{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.ho-print-content .ho-print-error{font-size:14px;color:red;width:100%;text-align:right;line-height:30px}.ho-print-content .ho-print-title{font-size:12px;color:#66b3ff;width:100%;text-align:right;line-height:20px}