hoeditor-web 2.0.53 → 2.0.55

package/lib/hoeditor.common.js

@@ -11518,7 +11518,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, 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, name;
 
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee2$(_context3) {
           while (1) {
@@ -11581,7 +11581,7 @@ var Print = /*#__PURE__*/function () {
 
               case 17:
                 if ((_step = _iterator.n()).done) {
-                  _context3.next = 57;
+                  _context3.next = 58;
                   break;
                 }
 
@@ -11599,7 +11599,7 @@ var Print = /*#__PURE__*/function () {
                 });
 
               case 22:
-                return _context3.abrupt("continue", 55);
+                return _context3.abrupt("continue", 56);
 
               case 23:
                 last = index;
@@ -11610,19 +11610,35 @@ var Print = /*#__PURE__*/function () {
                   break;
                 }
 
-                return _context3.abrupt("break", 57);
+                return _context3.abrupt("break", 58);
 
               case 27:
                 if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
                   cpage.drawDomLevel.bindStage();
                   cpage.needUpdateStage = true;
-                }
+                } // 合并续打： 上一页还有空余时续打起始页隐藏页脚
+
 
                 if (index === hoEditorFactory.startPageNum && positionY) {
                   dShape = new createjs.Shape();
                   dShape.graphics.beginFill("#fff").rect(0, 0, width, positionY).endFill();
                   cpage.drawDocContainer.addChild(dShape);
                   cpage.drawFooter.alpha = 0; // 上一页还有空余时续打起始页隐藏页脚
+                } // 光标处续打
+
+
+                if (hoEditorFactory.printStatus.printRange == PrintRange.prCaret) {
+                  posIndex = hoEditorFactory.printStatus.drawPrintCaret.Position[0];
+                  posY = hoEditorFactory.printStatus.drawPrintCaret.Position[1];
+
+                  if (index === posIndex && posY) {
+                    _dShape = new createjs.Shape();
+
+                    _dShape.graphics.beginFill("#fff").rect(0, 0, width, posY).endFill();
+
+                    cpage.drawDocContainer.addChild(_dShape);
+                    cpage.drawFooter.alpha = 0;
+                  }
                 }
 
                 if (cpage.drawDomLevel && cpage.needUpdateStage && cpage.drawDomLevel.stage) {
@@ -11645,7 +11661,7 @@ var Print = /*#__PURE__*/function () {
                 }
 
                 if (!hoEditorFactory.isUseImagePrint) {
-                  _context3.next = 41;
+                  _context3.next = 42;
                   break;
                 }
 
@@ -11655,10 +11671,10 @@ var Print = /*#__PURE__*/function () {
                 ctx.posY = svg2pdfOptions.y;
                 ctx && ((_cpage$drawDomLevel = cpage.drawDomLevel) === null || _cpage$drawDomLevel === void 0 ? void 0 : (_cpage$drawDomLevel$s = _cpage$drawDomLevel.stage) === null || _cpage$drawDomLevel$s === void 0 ? void 0 : _cpage$drawDomLevel$s.draw(ctx));
                 ctx = null;
-                _context3.next = 54;
+                _context3.next = 55;
                 break;
 
-              case 41:
+              case 42:
                 _ctx = new canvas2svg({
                   width: width,
                   height: height,
@@ -11667,68 +11683,68 @@ var Print = /*#__PURE__*/function () {
                 _ctx && ((_cpage$drawDomLevel2 = cpage.drawDomLevel) === null || _cpage$drawDomLevel2 === void 0 ? void 0 : (_cpage$drawDomLevel2$ = _cpage$drawDomLevel2.stage) === null || _cpage$drawDomLevel2$ === void 0 ? void 0 : _cpage$drawDomLevel2$.draw(_ctx));
 
                 if (!(type === "html")) {
-                  _context3.next = 48;
+                  _context3.next = 49;
                   break;
                 }
 
                 svgData = (_ctx2 = _ctx) === null || _ctx2 === void 0 ? void 0 : _ctx2.getSvg();
                 svgData && ((_svgBox2 = svgBox) === null || _svgBox2 === void 0 ? void 0 : _svgBox2.appendChild(svgData));
-                _context3.next = 53;
+                _context3.next = 54;
                 break;
 
-              case 48:
+              case 49:
                 PDF === null || PDF === void 0 ? void 0 : PDF.addPage();
                 _context3.t0 = PDF;
 
                 if (!_context3.t0) {
-                  _context3.next = 53;
+                  _context3.next = 54;
                   break;
                 }
 
-                _context3.next = 53;
+                _context3.next = 54;
                 return svg2pdf((_ctx3 = _ctx) === null || _ctx3 === void 0 ? void 0 : _ctx3.getSvg(), PDF, svg2pdfOptions);
 
-              case 53:
+              case 54:
                 _ctx = null;
 
-              case 54:
+              case 55:
                 index > 0 && ((_cpage$drawDomLevel3 = cpage.drawDomLevel) === null || _cpage$drawDomLevel3 === void 0 ? void 0 : _cpage$drawDomLevel3.clearStage());
 
-              case 55:
+              case 56:
                 _context3.next = 17;
                 break;
 
-              case 57:
-                _context3.next = 62;
+              case 58:
+                _context3.next = 63;
                 break;
 
-              case 59:
-                _context3.prev = 59;
+              case 60:
+                _context3.prev = 60;
                 _context3.t1 = _context3["catch"](15);
 
                 _iterator.e(_context3.t1);
 
-              case 62:
-                _context3.prev = 62;
+              case 63:
+                _context3.prev = 63;
 
                 _iterator.f();
 
-                return _context3.finish(62);
+                return _context3.finish(63);
 
-              case 65:
+              case 66:
                 console.timeEnd("绘制svg和生成pdf");
                 if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
                 hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
 
                 if (!(positionY || hoEditorFactory.startPageNum !== 0 && positionY !== undefined)) {
-                  _context3.next = 74;
+                  _context3.next = 75;
                   break;
                 }
 
                 _last = hoEditorFactory.printStatus.printRecord.last();
 
                 if (!(_last && hoEditorFactory.startPageNum == _last[0] && positionY === _last[1])) {
-                  _context3.next = 74;
+                  _context3.next = 75;
                   break;
                 }
 
@@ -11740,21 +11756,21 @@ var Print = /*#__PURE__*/function () {
                 reslove && reslove("printend");
                 return _context3.abrupt("return");
 
-              case 74:
+              case 75:
                 if (!(type === "pdf")) {
-                  _context3.next = 80;
+                  _context3.next = 81;
                   break;
                 }
 
                 PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
                 PDF === null || PDF === void 0 ? void 0 : PDF.save(fileName + ".pdf");
                 hoEditorFactory.printStatus.drawPrintRecord.clear();
-                _context3.next = 86;
+                _context3.next = 87;
                 break;
 
-              case 80:
+              case 81:
                 if (!(svgBox && svgBox.childNodes.length === 0)) {
-                  _context3.next = 84;
+                  _context3.next = 85;
                   break;
                 }
 
@@ -11766,7 +11782,7 @@ var Print = /*#__PURE__*/function () {
                 reslove && reslove("printend");
                 return _context3.abrupt("return");
 
-              case 84:
+              case 85:
                 printStyle = (0,util/* createPrintHTMLStyle */.j_)(hoEditorFactory.pageProperty.pageSize, orientation);
 
                 if (type === "html") {
@@ -11789,15 +11805,15 @@ var Print = /*#__PURE__*/function () {
                   PDF && this.openDataUriInWindow(PDF, name, hoEditorFactory.pageProperty.widthPixes);
                 }
 
-              case 86:
+              case 87:
                 reslove && reslove("printend");
 
-              case 87:
+              case 88:
               case "end":
                 return _context3.stop();
             }
           }
-        }, _callee2, this, [[15, 59, 62, 65]]);
+        }, _callee2, this, [[15, 60, 63, 66]]);
       }));
 
       function printToPDF(_x2, _x3, _x4, _x5, _x6, _x7, _x8) {
@@ -15955,11 +15971,12 @@ var DocController = /*#__PURE__*/function () {
 
       curArea.areaComments.set(commentID, comment);
       hoEditorFactory.drawTree.commentsMap.set(commentID, comment);
-      curArea.drawComments();
-      var newEndpath = endNode.getNodePath();
+      curArea.drawComments(); //const newEndpath = endNode.getNodePath();
+
       hoEditorFactory.undoService.begin();
-      hoEditorFactory.undoService.add(new _undoRedo_NodeStyleUndoUnit__WEBPACK_IMPORTED_MODULE_34__/* .NodeStyleUndoUnit */ .o(this._hoEditorFactoryID, startPath, newEndpath, new _undoRedo_NodeStyleUndoUnit__WEBPACK_IMPORTED_MODULE_34__/* .Operate */ .p("insertComment", commentID)));
+      hoEditorFactory.undoService.add(new _undoRedo_NodeStyleUndoUnit__WEBPACK_IMPORTED_MODULE_34__/* .NodeStyleUndoUnit */ .o(this._hoEditorFactoryID, startPath, endPath, new _undoRedo_NodeStyleUndoUnit__WEBPACK_IMPORTED_MODULE_34__/* .Operate */ .p("insertComment", commentID)));
       hoEditorFactory.undoService.commit();
+      var newEndpath = endNode.getNodePath();
       var newRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, newEndpath, newEndpath);
       var cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_35__/* .SelectionChangeEvent */ .r(newRange, newRange); //选中范围变化事件
 
@@ -16777,9 +16794,9 @@ var DocController = /*#__PURE__*/function () {
         node.customProperty = customProperty;
         node.imgWidth = imgWidth;
         node.imgHeight = imgHeight;
-        node.imgSrc = imgSrc;
         node.fingerPrintSrc = fingerPrintSrc ? fingerPrintSrc : "";
         node.fingerPosition = fingerPosition ? fingerPosition : 0;
+        node.imgSrc = imgSrc;
 
         if (type == 1 && node.signType == 1) {
           node.isFront = true;
@@ -16829,6 +16846,29 @@ var DocController = /*#__PURE__*/function () {
       node.imgSrc = signText;
       hoEditorFactory.docTree.change(changeEvent);
     }
+    /**
+     * 更新签名类型
+     * @param node 签名节点
+     * @param type 签名类型
+     * @param imgSrc 签名内容
+     */
+
+  }, {
+    key: "updateSignType",
+    value: function updateSignType(node, type, imgSrc, imgWidth, imgHeight) {
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var sPath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
+      var ePath = hoEditorFactory.docTree.getNodeLastPath(node);
+      var changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_75__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _DocTree__WEBPACK_IMPORTED_MODULE_26__/* .DocAction.daModifyStyle */ .gk.daModifyStyle, sPath, ePath);
+      changeEvent.oldEndPath = ePath;
+      changeEvent.afterChangePath = ePath;
+      changeEvent.oldDrawLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_76__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawLines(sPath, ePath, true);
+      node.type = type;
+      node.imgWidth = imgWidth;
+      node.imgHeight = imgHeight;
+      node.imgSrc = imgSrc;
+      hoEditorFactory.docTree.change(changeEvent);
+    }
     /**
      *
      * @returns 返回病历文件变更日志
@@ -49740,6 +49780,17 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
 
           if (partCell && aHeight) {
             rowHeight = Math.max(aHeight, partCell.docHeight);
+            rowSpan = mainCell.rowSpan;
+          }
+        }
+
+        if (rowSpan > 1) {
+          for (var i = 1; i < rowSpan; i++) {
+            var arowInfos = this._partRowHeights.get(r + i);
+
+            if (arowInfos && arowInfos.rowHeight && aHeight) {
+              aHeight += arowInfos.rowHeight;
+            }
           }
         } //this._partRowHeights.get(r)?.rowHeight
 
@@ -61243,7 +61294,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86160);
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(39873);
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(35671);
-/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(22342);
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(22342);
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(99640);
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(28214);
 /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(41539);
@@ -61269,6 +61320,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(41005);
 /* harmony import */ var _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(15868);
 /* harmony import */ var _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(15798);
+/* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(98199);
 
 
 
@@ -61283,8 +61335,8 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
 /*
  * @Author: your name
  * @Date: 2020-09-24 15:56:09
- * @LastEditTime: 2022-03-28 11:38:19
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-06-07 15:10:10
+ * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\undoRedo\NodeInsertUndoUnit.ts
  */
@@ -61303,6 +61355,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
 
 
 
+
 var NodeInsertUndoUnit = /*#__PURE__*/function (_UndoInfo) {
   (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(NodeInsertUndoUnit, _UndoInfo);
 
@@ -61323,7 +61376,7 @@ var NodeInsertUndoUnit = /*#__PURE__*/function (_UndoInfo) {
     return _this;
   }
 
-  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_24__/* ["default"] */ .Z)(NodeInsertUndoUnit, [{
+  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_25__/* ["default"] */ .Z)(NodeInsertUndoUnit, [{
     key: "undo",
     value: function undo() {
       this.doUndo();
@@ -61415,6 +61468,11 @@ var NodeInsertUndoUnit = /*#__PURE__*/function (_UndoInfo) {
       } else if (this._pnode && this._pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_19__/* .TextInputFieldNode */ .re && this.strBeforePath != hoEditorFactory.docTree.getNodeLastPath(this._pnode)) {
         //删除文本域节点的提示文本，并更新重绘整个文本域
         var pTiNode = this._pnode;
+
+        if (hoEditorFactory.drawTree.paintStatus == _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_24__/* .PaintState.psReview */ .Dh.psReview && this.node instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_22__/* .MarkNode */ .j && this.node.MarkNodeType === 2 && this.node.text.startsWith("C") && this._pnode.childNodes.length === 3 && this._pnode.childNodes[1] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_22__/* .MarkNode */ .j) {
+          return path;
+        }
+
         var res = pTiNode.getReadyToEdit(function (value) {
           //NOTE:在redo当中不能使用同一实例UndoRedoService的commit
           _this2._undo.begin();
@@ -198703,7 +198761,7 @@ var es_function_name = __webpack_require__(68309);
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__(13797);
 var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=template&id=33700d44&
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=template&id=3651fabe&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.hoEditorFactoryIdList.length > 0)?_c('div',{staticClass:"ho-docs"},[_c('section',{class:_vm.defaultEditJson.isFooter ? 'ho-editor-list' : 'ho-editor-list editor-no-footer',on:{"contextmenu":function($event){return _vm.blankAreaRightClick.apply(null, arguments)}}},[_vm._l((_vm.hoEditorFactoryIdList),function(hoEditorId,index){return [_c('HoDoc',{key:index,attrs:{"docIndex":index,"hoEditorId":hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"activeDocId":_vm.activeDocId,"editJson":_vm.defaultEditJson,"isUseTipText":_vm.isUseTipText,"textStyle":_vm.textStyle},on:{"dblNodeClick":_vm.dblNodeClick,"setFontStyles":_vm.setFontStyles,"rightClickEvent":_vm.rightClickEvent,"setActiveDocIndex":_vm.setActiveDocIndex,"setActivePageIndex":_vm.setActivePageIndex,"drawPagesLengthChange":_vm.drawPagesLengthChange},scopedSlots:_vm._u([{key:"hoDocHead",fn:function(){return [_vm._t("hoHead")]},proxy:true},{key:"hoDocFoot",fn:function(){return [_vm._t("hoFoot")]},proxy:true}],null,true)})]})],2),(_vm.notUseModal)?_c('ControlModal',{attrs:{"hoEditorFactoryId":_vm.activeDocId,"controlProperty":_vm.controlProperty,"isDataSource":_vm.isDataSource,"isCustoms":_vm.isCustoms,"isTableProperty":_vm.isTableProperty,"isListStyle":_vm.isListStyle,"uploadImageParams":_vm.uploadImageParams},on:{"insertComments":_vm.insertComments,"closeControlmodal":_vm.closeControlModal},scopedSlots:_vm._u([{key:"hoTextModal",fn:function(){return [_vm._t("hoTextField")]},proxy:true},{key:"hoComment",fn:function(){return [_vm._t("hoTextComment")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlFindType)?_c('FindReplaceDialog',{attrs:{"hoEditorFactoryId":_vm.activeDocId}}):_vm._e(),(_vm.defaultEditJson.isFooter)?_c('HoFooter',{attrs:{"docProperty":_vm.defaultDocProperty,"hoEditorFactoryId":_vm.activeDocId,"drawPages":_vm.drawPageLength,"currentActivePages":_vm.activePageIndex}}):_vm._e(),_c('ViewContinuousXml',{attrs:{"hoEditorFactoryId":_vm.activeDocId}})],1):_vm._e()}
 var staticRenderFns = []
 
@@ -199997,7 +200055,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
     key: "mouseDblClick",
     value: function () {
       var _mouseDblClick = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee(aevent) {
-        var hoEditorFactory, dPage, oldDPage, oldPageIndex, oldArea, targetArea, isSameArea, cgEvent, startPos, np, _np$node$parentNode, prevNode, oldRange, startPath, endPath, newRange, selectChangeEvent, nodeNeedModifyEvent, cellNode, colInfos, rowInfos, colProperty, _nodeNeedModifyEvent, _nodeNeedModifyEvent2, dPageTable, dPageCell, pos, docHeight, dHeight, index, i, dLastObj, distance, aHeight, count, str, j, _oldRange, _endPath, _newRange;
+        var hoEditorFactory, dPage, oldDPage, oldPageIndex, oldArea, targetArea, isSameArea, cgEvent, startPos, np, _np$node$parentNode, prevNode, oldRange, startPath, endPath, newRange, selectChangeEvent, nodeNeedModifyEvent, cellNode, colInfos, rowInfos, colProperty, _nodeNeedModifyEvent, _nodeNeedModifyEvent2;
 
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee$(_context) {
           while (1) {
@@ -200155,48 +200213,42 @@ var DrawSelectLevel = /*#__PURE__*/function () {
                 } else if (cellNode.cellProperty.editorProperty === TableProperty/* EditorProperty.DateTime */.YS.DateTime || cellNode.cellProperty.editorProperty === TableProperty/* EditorProperty.DownList */.YS.DownList) {
                   _nodeNeedModifyEvent2 = new NodeNeedModifyEvent/* NodeNeedModifyEvent */.x(np.node, "dblclick", this._pageIndex);
                   hoEditorFactory.docTree.nodeNeedModify(_nodeNeedModifyEvent2);
-                } else if (cellNode.table.tableProperty.isAutoChangeLine) {
-                  //处理自动换行表格，双击时光标跳到指定双击位置
-                  dPageTable = cellNode.table.drawTable.getDrawTableByPageIndex(dPage.pageIndex);
-
-                  if (dPageTable) {
-                    dPageCell = cellNode.drawCell.getDrawPageCell(dPageTable);
-
-                    if (dPageCell) {
-                      pos = dPageCell.globalToLocal(aevent.stageX, aevent.stageY);
-                      docHeight = 0;
-                      dHeight = 0;
-                      index = cellNode.drawCell.drawPageCells.indexOf(dPageCell);
-
-                      for (i = 0; i < index; i++) {
-                        docHeight += cellNode.drawCell.drawPageCells[i].docHeight;
-                        dHeight += cellNode.drawCell.drawPageCells[i].dHeight;
-                      }
-
-                      dLastObj = cellNode.drawCell.drawLines[cellNode.drawCell.drawLines.length - 1];
-
-                      if (dLastObj.dTop + dLastObj.docHeight < dHeight + pos.y) {
-                        distance = pos.y + dHeight - (dLastObj.dTop + dLastObj.dHeight);
-                        aHeight = cellNode.table.tableProperty.autoLineHeightPx;
-                        count = Math.floor(distance / aHeight);
-                        str = "";
-
-                        for (j = 0; j < count; j++) {
-                          str += "\n";
-                        }
+                } //   else if (cellNode.table.tableProperty.isAutoChangeLine) {
+                //     //处理自动换行表格，双击时光标跳到指定双击位置
+                //     const dPageTable = cellNode.table.drawTable.getDrawTableByPageIndex(dPage.pageIndex);
+                //     if (dPageTable) {
+                //       const dPageCell = cellNode.drawCell.getDrawPageCell(dPageTable);
+                //       if (dPageCell) {
+                //         const pos = dPageCell.globalToLocal(aevent.stageX, aevent.stageY);
+                //         let docHeight = 0;
+                //         let dHeight = 0;
+                //         const index = cellNode.drawCell.drawPageCells.indexOf(dPageCell);
+                //         for (let i = 0; i < index; i++) {
+                //           docHeight += cellNode.drawCell.drawPageCells[i].docHeight;
+                //           dHeight += cellNode.drawCell.drawPageCells[i].dHeight
+                //         }
+                //         const dLastObj = cellNode.drawCell.drawLines[cellNode.drawCell.drawLines.length - 1]
+                //         if (dLastObj.dTop + dLastObj.docHeight < dHeight + pos.y) {
+                //           const distance = pos.y + dHeight - (dLastObj.dTop + dLastObj.dHeight)
+                //           const aHeight = cellNode.table.tableProperty.autoLineHeightPx;
+                //           const count = Math.floor(distance / aHeight);
+                //           let str = "";
+                //           for (let j = 0; j < count; j++) {
+                //             str += "\n"
+                //           }
+                //           if (str != "") {
+                //             const oldRange = hoEditorFactory.docTree.curDomRange.clone();
+                //             const endPath = hoEditorFactory.docTree.getNodeLastPath(cellNode.childNodes[cellNode.childNodes.length - 1]);
+                //             const newRange = new DomRange(hoEditorFactory.hoEditorFactoryId, endPath, endPath);
+                //             hoEditorFactory.drawTree.moveCaretToPath(endPath);
+                //             hoEditorFactory.docTree.curDomRange = newRange;
+                //             hoEditorFactory.docController.insertPlainTextAfterPath(endPath, str);
+                //           }
+                //         }
+                //       }
+                //     }
+                //   }
 
-                        if (str != "") {
-                          _oldRange = hoEditorFactory.docTree.curDomRange.clone();
-                          _endPath = hoEditorFactory.docTree.getNodeLastPath(cellNode.childNodes[cellNode.childNodes.length - 1]);
-                          _newRange = new DomRange/* DomRange */.a(hoEditorFactory.hoEditorFactoryId, _endPath, _endPath);
-                          hoEditorFactory.drawTree.moveCaretToPath(_endPath);
-                          hoEditorFactory.docTree.curDomRange = _newRange;
-                          hoEditorFactory.docController.insertPlainTextAfterPath(_endPath, str);
-                        }
-                      }
-                    }
-                  }
-                }
 
               case 45:
                 return _context.abrupt("return", true);
@@ -206691,7 +206743,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.53');
+/* harmony default export */ var version = ('2.0.55');
 ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperTipText/PoperTipText.vue?vue&type=template&id=3fa4e4d3&scoped=true&
 var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.isShow),expression:"isShow"},{name:"click-outside",rawName:"v-click-outside",value:(_vm.handleClose),expression:"handleClose"}],ref:"poperTextNode",staticClass:"poper-text-modal animation-in",style:(_vm.posStyle),on:{"mouseenter":_vm.mouseEnter,"mouseleave":_vm.mouseLeave}},_vm._l((_vm.poperText),function(text){return _c('div',{key:text + Math.random(0, 1),staticClass:"poper-text"},[_vm._v(" "+_vm._s(text)+" ")])}),0)}
 var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_staticRenderFns = []
@@ -218847,6 +218899,19 @@ var VueController = /*#__PURE__*/function () {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       hoEditorFactory.docController.updateSignTime(node, signText);
     }
+    /**
+     * 更新签名类型
+     * @param node 签名节点
+     * @param type 签名类型
+     * @param imgSrc 签名内容
+     */
+
+  }, {
+    key: "updateSignType",
+    value: function updateSignType(node, type, imgSrc, imgWidth, imgHeight) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      hoEditorFactory.docController.updateSignType(node, type, imgSrc, imgWidth, imgHeight);
+    }
     /**
      * 强制删除
      */
@@ -219138,7 +219203,7 @@ var VueController = /*#__PURE__*/function () {
         var _loop2 = function _loop2(i) {
           var node = nodes[i];
 
-          if (node instanceof DownListNode/* DownListNode */.yF || node instanceof DateTimeNode/* DateTimeNode */.Z || node instanceof TextInputFieldNode/* TextInputFieldNode */.re && node.childNodes.filter(function (child) {
+          if (node instanceof DownListNode/* DownListNode */.yF && node.isReadOnly || node instanceof DateTimeNode/* DateTimeNode */.Z && node.isReadOnly || node instanceof TextInputFieldNode/* TextInputFieldNode */.re && !node.canModifyContent && node.inputFieldType == 0 && node.childNodes.filter(function (child) {
             return child instanceof TextInputFieldNode/* TextInputFieldNode */.re;
           }).length === 0) {
             if (arr.filter(function (v) {
@@ -220200,6 +220265,15 @@ var VueController = /*#__PURE__*/function () {
       });
       return ishandle;
     }
+    /**
+     * 获取当前病历中所以批注
+     */
+
+  }, {
+    key: "getDocCommentValue",
+    value: function getDocCommentValue() {
+      return HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).drawTree.commentsMap;
+    }
     /**
      * 批量修改当前病历中批注处理状态
      * @param status 默认修改为  1==已处理
@@ -220211,10 +220285,12 @@ var VueController = /*#__PURE__*/function () {
       var drawTree = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).drawTree;
       var commentsMap = drawTree.commentsMap;
       commentsMap.forEach(function (value, key) {
-        if (value.customProperty) {
-          value.customProperty.ishandle = status == undefined ? '1' : status;
-          commentsMap.set(key, value);
+        if (!value.customProperty) {
+          value.customProperty = {};
         }
+
+        value.customProperty.ishandle = status == undefined ? '1' : status;
+        commentsMap.set(key, value);
       });
       drawTree.commentsMap = commentsMap;
     }
@@ -224923,9 +224999,9 @@ var HoFooter_component = normalizeComponent(
 )
 
 /* harmony default export */ var components_HoFooter = (HoFooter_component.exports);
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/ControlModal.vue?vue&type=template&id=23e9e01e&
-var ControlModalvue_type_template_id_23e9e01e_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"toolModals",staticClass:"control-modal",on:{"mousedown":_vm.toolModalDown}},[(_vm.controlType === 'barcode')?_c('Barcode',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'qrcode')?_c('QrCode',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'express')?_c('ExpressionForm',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"controlProperty":_vm.controlProperty},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'text')?_c('TextDialog',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose},scopedSlots:_vm._u([{key:"hoTextFieldModal",fn:function(){return [_vm._t("hoTextModal")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlType === 'date')?_c('DateDialog',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose},scopedSlots:_vm._u([{key:"hoDateFieldModal",fn:function(){return [_vm._t("hoDateModal")]},proxy:true},{key:"hoTextFieldModal",fn:function(){return [_vm._t("hoTextModal")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlType === 'select')?_c('SelectDialog',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'gestation')?_c('Gestation',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table')?_c('TableProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table-row')?_c('TableRowProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table-cell')?_c('TableCellProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table-col')?_c('TableColProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.isCustoms)?_c('CustomAttributes',{attrs:{"isTableProperty":_vm.isTableProperty},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.isDataSource)?_c('DataSourceDialog',{on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.isListStyle)?_c('ListSource',{on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'RadioBox' || _vm.controlType === 'CheckBox')?_c('RadioCheckbox',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId,"controlProperty":_vm.controlProperty},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'waterset')?_c('WaterSetDialog',{attrs:{"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'comment')?_c('CommentDialog',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"insertComments":_vm.insertComments,"closed":_vm.handleClose},scopedSlots:_vm._u([{key:"hoCommentModal",fn:function(){return [_vm._t("hoComment")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlType === 'pageInfoes')?_c('PageInfoes',{attrs:{"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'delimiter')?_c('Delimiter',{attrs:{"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'sign')?_c('Sign',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'upload-image')?_c('UploadImageDialog',{attrs:{"uploadImageParams":_vm.uploadImageParams,"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e()],1)}
-var ControlModalvue_type_template_id_23e9e01e_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/ControlModal.vue?vue&type=template&id=2efd7672&
+var ControlModalvue_type_template_id_2efd7672_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"toolModals",staticClass:"control-modal",on:{"mousedown":_vm.toolModalDown}},[(_vm.controlType === 'barcode')?_c('Barcode',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'qrcode')?_c('QrCode',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'express')?_c('ExpressionForm',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"controlProperty":_vm.controlProperty},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'text')?_c('TextDialog',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose},scopedSlots:_vm._u([{key:"hoTextFieldModal",fn:function(){return [_vm._t("hoTextModal")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlType === 'date')?_c('DateDialog',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose},scopedSlots:_vm._u([{key:"hoDateFieldModal",fn:function(){return [_vm._t("hoDateModal")]},proxy:true},{key:"hoTextFieldModal",fn:function(){return [_vm._t("hoTextModal")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlType === 'select')?_c('SelectDialog',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'gestation')?_c('Gestation',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table')?_c('TableProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table-row')?_c('TableRowProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table-cell')?_c('TableCellProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table-col')?_c('TableColProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.isCustoms)?_c('CustomAttributes',{attrs:{"isTableProperty":_vm.isTableProperty},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.isDataSource)?_c('DataSourceDialog',{on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.isListStyle)?_c('ListSource',{on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'RadioBox' || _vm.controlType === 'CheckBox')?_c('RadioCheckbox',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId,"controlProperty":_vm.controlProperty},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'waterset')?_c('WaterSetDialog',{attrs:{"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'comment')?_c('CommentDialog',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"insertComments":_vm.insertComments,"closed":_vm.handleClose},scopedSlots:_vm._u([{key:"hoCommentModal",fn:function(){return [_vm._t("hoComment")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlType === 'pageInfoes')?_c('PageInfoes',{attrs:{"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'delimiter')?_c('Delimiter',{attrs:{"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'sign')?_c('Sign',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'upload-image')?_c('UploadImageDialog',{attrs:{"uploadImageParams":_vm.uploadImageParams,"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e()],1)}
+var ControlModalvue_type_template_id_2efd7672_staticRenderFns = []
 
 
 ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/selectDialog/SelectDialog.vue?vue&type=template&id=3b6d4c1e&scoped=true&
@@ -227116,9 +227192,9 @@ var RadioCheckbox_component = normalizeComponent(
 ;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/index.ts
 
 /* harmony default export */ var radioCheckBox = (radioCheckBox_RadioCheckbox);
-;// 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/commentDialog/CommentDialog.vue?vue&type=template&id=cea35636&
-var CommentDialogvue_type_template_id_cea35636_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"control-modal-contents comment-modal animation-in"},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("批注")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":function($event){return _vm.$emit('closed')}}})]),_c('section',{staticClass:"modal-content"},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item",staticStyle:{"align-items":"baseline"}},[_c('span',{staticClass:"label"},[_vm._v("批注内容")]),_c('el-input',{attrs:{"type":"textarea","size":"mini","autosize":{ minRows: 6, maxRows: 6 },"clearable":"","placeholder":"批注内容","maxlength":"256","show-word-limit":""},model:{value:(_vm.textContent),callback:function ($$v) {_vm.textContent=$$v},expression:"textContent"}})],1),_vm._t("hoCommentModal")],2)]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.sure}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":function($event){return _vm.$emit('closed')}}},[_vm._v("取消")])],1)])}
-var CommentDialogvue_type_template_id_cea35636_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/commentDialog/CommentDialog.vue?vue&type=template&id=27b7d6e2&
+var CommentDialogvue_type_template_id_27b7d6e2_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"control-modal-contents comment-modal animation-in"},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("批注")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":function($event){return _vm.$emit('closed')}}})]),_c('section',{staticClass:"modal-content"},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item",staticStyle:{"align-items":"baseline"}},[_c('span',{staticClass:"label"},[_vm._v("批注内容")]),_c('el-input',{attrs:{"type":"textarea","size":"mini","autosize":{ minRows: 6, maxRows: 6 },"clearable":"","placeholder":"批注内容","maxlength":"256","show-word-limit":""},model:{value:(_vm.textContent),callback:function ($$v) {_vm.textContent=$$v},expression:"textContent"}})],1),_vm._t("hoCommentModal")],2)]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.sure}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":function($event){return _vm.$emit('closed')}}},[_vm._v("取消")])],1)])}
+var CommentDialogvue_type_template_id_27b7d6e2_staticRenderFns = []
 
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40[0].rules[0].use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/commentDialog/CommentDialog.vue?vue&type=script&lang=js&
@@ -227171,15 +227247,27 @@ var CommentDialogvue_type_template_id_cea35636_staticRenderFns = []
   mounted: function mounted() {},
   methods: {
     sure: function sure() {
-      if (this.textContent) {
-        if (this.controlStatus === 'update') {
-          this.vueController.editComment(this.commentValue.id, this.textContent, this.getCustomProperty());
-        } else {
-          this.$emit('insertComments', this.textContent);
-          this.vueController.insertComment(this.textContent, this.getCustomProperty());
-        }
+      var _this = this;
 
-        this.$emit('closed');
+      var callback = function callback() {
+        _this.$emit('closed');
+      };
+
+      if (this.controlStatus === 'update') {
+        this.$emit('insertComments', {
+          id: this.commentValue.id,
+          content: this.textContent,
+          customProperty: this.getCustomProperty(),
+          type: 'update',
+          callback: callback
+        }); // this.vueController.editComment(this.commentValue.id, this.textContent, this.getCustomProperty());
+      } else {
+        this.$emit('insertComments', {
+          content: this.textContent,
+          customProperty: this.getCustomProperty(),
+          type: 'add',
+          callback: callback
+        }); // this.vueController.insertComment(this.textContent, this.getCustomProperty());
       }
     }
   }
@@ -227202,8 +227290,8 @@ var CommentDialogvue_type_template_id_cea35636_staticRenderFns = []
 
 var CommentDialog_component = normalizeComponent(
   commentDialog_CommentDialogvue_type_script_lang_js_,
-  CommentDialogvue_type_template_id_cea35636_render,
-  CommentDialogvue_type_template_id_cea35636_staticRenderFns,
+  CommentDialogvue_type_template_id_27b7d6e2_render,
+  CommentDialogvue_type_template_id_27b7d6e2_staticRenderFns,
   false,
   null,
   null,
@@ -230527,8 +230615,8 @@ ControlModal = __decorate([vue_class_component_esm({
 ;
 var ControlModal_component = normalizeComponent(
   controls_ControlModalvue_type_script_lang_ts_,
-  ControlModalvue_type_template_id_23e9e01e_render,
-  ControlModalvue_type_template_id_23e9e01e_staticRenderFns,
+  ControlModalvue_type_template_id_2efd7672_render,
+  ControlModalvue_type_template_id_2efd7672_staticRenderFns,
   false,
   null,
   null,
@@ -232374,9 +232462,9 @@ var HoDocs_component = normalizeComponent(
 )
 
 /* harmony default export */ var components_HoDocs = (HoDocs_component.exports);
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=template&id=5232c890&
-var ToolBarvue_type_template_id_5232c890_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('tabs',{attrs:{"tabKey":_vm.tabKey},on:{"tabClick":_vm.mainBarClick,"updateTabKey":_vm.updateTabKey}},[_vm._t("beforeBrowse"),_c('tab-pane',{attrs:{"isShow":_vm.defaultBrowseJson.isBrowse,"label":"浏览模式","notHover":true,"name":"ho-browse"}},[(_vm.defaultBrowseJson.saveAsFile)?_c('li',{staticClass:"sub-bar-items"},[_c('el-dropdown',{attrs:{"trigger":"click"}},[_c('span',{staticClass:"el-dropdown-link"},[_vm._v("另存为")]),_c('el-dropdown-menu',{attrs:{"slot":"dropdown"},slot:"dropdown"},[_c('el-dropdown-item',{nativeOn:{"click":function($event){return _vm.saveAsFile('xml')}}},[_vm._v("XML")]),_c('el-dropdown-item',{nativeOn:{"click":function($event){return _vm.saveAsFile('html')}}},[_vm._v("HTML")]),_c('el-dropdown-item',{nativeOn:{"click":function($event){return _vm.saveAsFile('pdf')}}},[_vm._v("PDF")]),_c('el-dropdown-item',{nativeOn:{"click":function($event){return _vm.saveAsFile('plain')}}},[_vm._v("TXT")]),_c('el-dropdown-item',{nativeOn:{"click":function($event){return _vm.saveAsFile('json')}}},[_vm._v("JSON")])],1)],1)],1):_vm._e(),(_vm.isPrinted)?_c('li',{staticClass:"sub-bar-items"},[_c('span',{class:_vm.isPrintClass,on:{"click":_vm.outPrinted}},[_vm._v("退出打印预览状态")])]):_vm._e(),_c('li',{staticClass:"sub-bar-items"},[(_vm.defaultBrowseJson.printed)?_c('span',{class:_vm.printedClass,on:{"click":_vm.printed}},[_vm._v("打印")]):_vm._e()]),_c('li',{staticClass:"sub-bar-items"},[(_vm.defaultBrowseJson.printSelected)?_c('span',{class:_vm.printSelectedClass,on:{"click":_vm.printSelected}},[_vm._v("打印拖动鼠标选中区域")]):_vm._e()]),_c('li',{staticClass:"sub-bar-items",staticStyle:{"border-right":"1px solid #e6e6e6"}},[(_vm.defaultBrowseJson.printCaret)?_c('span',{class:_vm.printCaretClass,on:{"click":_vm.printCaret}},[_vm._v("打印鼠标点击位置")]):_vm._e()]),_c('li',{staticClass:"sub-bar-items",staticStyle:{"border":"0"}},[(_vm.defaultBrowseJson.printContinue)?_c('span',{class:_vm.printContinueClass,on:{"click":_vm.printContinue}},[_vm._v("续打")]):_vm._e()]),_c('HoPrintDialog',{attrs:{"vueController":_vm.vueController,"printBeforeStatus":5,"printModal":_vm.printModal},on:{"closed":_vm.closedHoPrintModal}})],1),_vm._t("beforeEdit"),_c('tab-pane',{attrs:{"isShow":_vm.defaultEditJson.isEdit,"label":"编辑模式","notHover":true,"name":"ho-edit"}},[_c('ToolBarChild',{attrs:{"editJson":_vm.defaultEditJson,"vueController":_vm.vueController,"tabStatus":_vm.tabStatus,"textStyle":_vm.textStyle,"uploadImageParams":_vm.uploadImageParams},on:{"setModalStatus":_vm.setModalStatus}})],1),_vm._t("afterEdit"),_c('tab-pane',{attrs:{"isShow":_vm.defaultEditJson.isInsertElement,"label":"插入","name":"ho-insert"}},[_c('tool-control',{attrs:{"insert":_vm.defaultEditJson,"vueController":_vm.vueController,"uploadImageParams":_vm.uploadImageParams},on:{"setModalStatus":_vm.setModalStatus},scopedSlots:_vm._u([{key:"hoInsertItem",fn:function(){return [_vm._t("insideInsert")]},proxy:true}],null,true)})],1),_c('tab-pane',{attrs:{"isShow":_vm.defaultEditJson.isInsertTable,"label":"表格","name":"ho-table"}},[_c('tool-table',{attrs:{"table":_vm.defaultEditJson,"tableProperty":{canAddRow: _vm.textStyle.canAddRow, canDeleteRow: _vm.textStyle.canDeleteRow},"vueController":_vm.vueController},scopedSlots:_vm._u([{key:"hoTableItem",fn:function(){return [_vm._t("insideTable")]},proxy:true}],null,true)})],1),_c('tab-pane',{attrs:{"isShow":_vm.defaultReviewJson.isReview,"label":"审阅模式","name":"ho-review"}},[_c('li',{staticClass:"sub-bar-items"},[(_vm.defaultReviewJson.insertComment)?_c('span',{staticClass:"review",on:{"click":function($event){$event.stopPropagation();return _vm.createControlComment.apply(null, arguments)}}},[_vm._v("插入批注")]):_vm._e()]),_c('li',{staticClass:"sub-bar-items"},[(_vm.defaultReviewJson.editComment)?_c('span',{staticClass:"review",on:{"click":_vm.editComment}},[_vm._v("编辑批注")]):_vm._e()]),_c('li',{staticClass:"sub-bar-items"},[(_vm.defaultReviewJson.deleteComment)?_c('span',{staticClass:"review",on:{"click":_vm.deleteComment}},[_vm._v("删除批注")]):_vm._e()]),_c('li',{staticClass:"sub-bar-items"},[(_vm.defaultReviewJson.deleteAllComment)?_c('span',{staticClass:"review",on:{"click":_vm.deleteAllComment}},[_vm._v("删除全部批注")]):_vm._e()]),_c('li',{staticClass:"sub-bar-items"},[(_vm.defaultReviewJson.cancelDelete)?_c('span',{staticClass:"review",on:{"click":_vm.cancelDelete}},[_vm._v("取消删除文本")]):_vm._e()]),_vm._t("insertReview"),(_vm.defaultReviewJson.printStatus)?_c('li',{staticClass:"sub-bar-items"},[_c('span',{on:{"click":_vm.reviewPrintStatus}},[_vm._v(_vm._s(_vm.isPrinted ? "返回审阅模式" : "浏览模式"))])]):_vm._e()],2),_vm._t("afterReview")],2)}
-var ToolBarvue_type_template_id_5232c890_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=template&id=3f61d307&
+var ToolBarvue_type_template_id_3f61d307_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('tabs',{attrs:{"tabKey":_vm.tabKey},on:{"tabClick":_vm.mainBarClick,"updateTabKey":_vm.updateTabKey}},[_vm._t("beforeBrowse"),_c('tab-pane',{attrs:{"isShow":_vm.defaultBrowseJson.isBrowse,"label":"浏览模式","notHover":true,"name":"ho-browse"}},[(_vm.defaultBrowseJson.saveAsFile)?_c('li',{staticClass:"sub-bar-items"},[_c('el-dropdown',{attrs:{"trigger":"click"}},[_c('span',{staticClass:"el-dropdown-link"},[_vm._v("另存为")]),_c('el-dropdown-menu',{attrs:{"slot":"dropdown"},slot:"dropdown"},[_c('el-dropdown-item',{nativeOn:{"click":function($event){return _vm.saveAsFile('xml')}}},[_vm._v("XML")]),_c('el-dropdown-item',{nativeOn:{"click":function($event){return _vm.saveAsFile('html')}}},[_vm._v("HTML")]),_c('el-dropdown-item',{nativeOn:{"click":function($event){return _vm.saveAsFile('pdf')}}},[_vm._v("PDF")]),_c('el-dropdown-item',{nativeOn:{"click":function($event){return _vm.saveAsFile('plain')}}},[_vm._v("TXT")]),_c('el-dropdown-item',{nativeOn:{"click":function($event){return _vm.saveAsFile('json')}}},[_vm._v("JSON")])],1)],1)],1):_vm._e(),(_vm.isPrinted)?_c('li',{staticClass:"sub-bar-items"},[_c('span',{class:_vm.isPrintClass,on:{"click":_vm.outPrinted}},[_vm._v("退出打印预览状态")])]):_vm._e(),_c('li',{staticClass:"sub-bar-items"},[(_vm.defaultBrowseJson.printed)?_c('span',{class:_vm.printedClass,on:{"click":_vm.printed}},[_vm._v("打印")]):_vm._e()]),_c('li',{staticClass:"sub-bar-items"},[(_vm.defaultBrowseJson.printSelected)?_c('span',{class:_vm.printSelectedClass,on:{"click":_vm.printSelected}},[_vm._v("打印拖动鼠标选中区域")]):_vm._e()]),_c('li',{staticClass:"sub-bar-items",staticStyle:{"border-right":"1px solid #e6e6e6"}},[(_vm.defaultBrowseJson.printCaret)?_c('span',{class:_vm.printCaretClass,on:{"click":_vm.printCaret}},[_vm._v("打印鼠标点击位置")]):_vm._e()]),_c('li',{staticClass:"sub-bar-items",staticStyle:{"border":"0"}},[(_vm.defaultBrowseJson.printContinue)?_c('span',{class:_vm.printContinueClass,on:{"click":_vm.printContinue}},[_vm._v("续打")]):_vm._e()]),_c('HoPrintDialog',{attrs:{"vueController":_vm.vueController,"printBeforeStatus":5,"printModal":_vm.printModal},on:{"closed":_vm.closedHoPrintModal}})],1),_vm._t("beforeEdit"),_c('tab-pane',{attrs:{"isShow":_vm.defaultEditJson.isEdit,"label":"编辑模式","notHover":true,"name":"ho-edit"}},[_c('ToolBarChild',{attrs:{"editJson":_vm.defaultEditJson,"vueController":_vm.vueController,"tabStatus":_vm.tabStatus,"textStyle":_vm.textStyle,"uploadImageParams":_vm.uploadImageParams},on:{"setModalStatus":_vm.setModalStatus}})],1),_vm._t("afterEdit"),_c('tab-pane',{attrs:{"isShow":_vm.defaultEditJson.isInsertElement,"label":"插入","name":"ho-insert"}},[_c('tool-control',{attrs:{"insert":_vm.defaultEditJson,"vueController":_vm.vueController,"uploadImageParams":_vm.uploadImageParams},on:{"setModalStatus":_vm.setModalStatus},scopedSlots:_vm._u([{key:"hoInsertItem",fn:function(){return [_vm._t("insideInsert")]},proxy:true}],null,true)})],1),_c('tab-pane',{attrs:{"isShow":_vm.defaultEditJson.isInsertTable,"label":"表格","name":"ho-table"}},[_c('tool-table',{attrs:{"table":_vm.defaultEditJson,"tableProperty":{canAddRow: _vm.textStyle.canAddRow, canDeleteRow: _vm.textStyle.canDeleteRow},"vueController":_vm.vueController},scopedSlots:_vm._u([{key:"hoTableItem",fn:function(){return [_vm._t("insideTable")]},proxy:true}],null,true)})],1),_c('tab-pane',{attrs:{"isShow":_vm.defaultReviewJson.isReview,"label":"审阅模式","name":"ho-review"}},[_c('li',{staticClass:"sub-bar-items"},[(_vm.defaultReviewJson.insertComment)?_c('span',{staticClass:"review",on:{"click":function($event){$event.stopPropagation();return _vm.createControlComment.apply(null, arguments)}}},[_vm._v("插入批注")]):_vm._e()]),_c('li',{staticClass:"sub-bar-items"},[(_vm.defaultReviewJson.editComment)?_c('span',{staticClass:"review",on:{"click":_vm.editComment}},[_vm._v("编辑批注")]):_vm._e()]),_c('li',{staticClass:"sub-bar-items"},[(_vm.defaultReviewJson.deleteComment)?_c('span',{staticClass:"review",on:{"click":_vm.deleteComment}},[_vm._v("删除批注")]):_vm._e()]),_c('li',{staticClass:"sub-bar-items"},[(_vm.defaultReviewJson.deleteAllComment)?_c('span',{staticClass:"review",on:{"click":_vm.deleteAllComment}},[_vm._v("删除全部批注")]):_vm._e()]),_c('li',{staticClass:"sub-bar-items"},[(_vm.defaultReviewJson.cancelDelete)?_c('span',{staticClass:"review",on:{"click":_vm.cancelDelete}},[_vm._v("取消删除文本")]):_vm._e()]),_vm._t("insertReview"),(_vm.defaultReviewJson.printStatus)?_c('li',{staticClass:"sub-bar-items"},[_c('span',{on:{"click":_vm.reviewPrintStatus}},[_vm._v(_vm._s(_vm.isPrinted ? "返回审阅模式" : "浏览模式"))])]):_vm._e()],2),_vm._t("afterReview")],2)}
+var ToolBarvue_type_template_id_3f61d307_staticRenderFns = []
 
 
 ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoMedicalExpression.vue?vue&type=template&id=7096edd1&scoped=true&
@@ -237498,27 +237586,32 @@ var ToolBar = /*#__PURE__*/function (_Vue) {
   }, {
     key: "deleteComment",
     value: function deleteComment() {
-      var _this5 = this;
-
-      var selectedComment = this.vueController.getOnSelectedComment();
-
-      if (selectedComment) {
-        this.$elConfirm("确定要删除选中的批注吗", "删除确认", {
-          cancelButtonText: "取消",
-          confirmButtonText: "确定",
-          type: "warning"
-        }).then(function () {
-          _this5.vueController.deleteComment(1);
-        }).catch(function () {});
-      } else {
-        this.$elMessage.closeAll();
-        this.$elMessage.warning({
-          message: "点击选中右侧批注区域内已添加的批注后，进行删除操作",
-          duration: 3000,
-          offset: 120
-        });
-        return;
-      }
+      this.$emit("insertComments", {
+        type: 'delete',
+        selectedComment: this.vueController.getOnSelectedComment()
+      }); // const selectedComment = this.vueController.getOnSelectedComment();
+      // if (selectedComment) {
+      // 	(this as any)
+      // 		.$elConfirm("确定要删除选中的批注吗", "删除确认", {
+      // 			cancelButtonText: "取消",
+      // 			confirmButtonText: "确定",
+      // 			type: "warning",
+      // 		})
+      // 		.then(() => {
+      // 			this.vueController.deleteComment(1);
+      // 		})
+      // 		.catch(() => {
+      // 			console.log("取消删除");
+      // 		});
+      // } else {
+      // 	(this as any).$elMessage.closeAll();
+      // 	(this as any).$elMessage.warning({
+      // 		message: "点击选中右侧批注区域内已添加的批注后，进行删除操作",
+      // 		duration: 3000,
+      // 		offset: 120,
+      // 	});
+      // 	return;
+      // }
     }
     /**
      * 删除全部批注
@@ -237527,15 +237620,21 @@ var ToolBar = /*#__PURE__*/function (_Vue) {
   }, {
     key: "deleteAllComment",
     value: function deleteAllComment() {
-      var _this6 = this;
-
-      this.$elConfirm("确定要删除文档内全部的批注吗(只能删除用户本人创建的批注)", "删除确认", {
-        cancelButtonText: "取消",
-        confirmButtonText: "确定",
-        type: "warning"
-      }).then(function () {
-        _this6.vueController.deleteComment(0);
-      }).catch(function () {});
+      this.$emit("insertComments", {
+        type: 'deleteAll',
+        commentValue: this.vueController.getDocCommentValue()
+      }); // (this as any)
+      // 	.$elConfirm("确定要删除文档内全部的批注吗(只能删除用户本人创建的批注)", "删除确认", {
+      // 		cancelButtonText: "取消",
+      // 		confirmButtonText: "确定",
+      // 		type: "warning",
+      // 	})
+      // 	.then(() => {
+      // 		this.vueController.deleteComment(0);
+      // 	})
+      // 	.catch(() => {
+      // 		console.log("取消删除");
+      // 	});
     }
     /**
      * 取消删除
@@ -237663,8 +237762,8 @@ ToolBar = __decorate([vue_class_component_esm({
 
 var ToolBar_component = normalizeComponent(
   toolbar_ToolBarvue_type_script_lang_ts_,
-  ToolBarvue_type_template_id_5232c890_render,
-  ToolBarvue_type_template_id_5232c890_staticRenderFns,
+  ToolBarvue_type_template_id_3f61d307_render,
+  ToolBarvue_type_template_id_3f61d307_staticRenderFns,
   false,
   null,
   null,