hoeditor-web 3.1.171 → 3.1.173

package/lib/hoeditor.umd.js

@@ -35872,9 +35872,8 @@ var Print = /*#__PURE__*/function () {
           chromes = undefined;
         }
         try {
-          var _chromes;
-          if ((_chromes = chromes) !== null && _chromes !== void 0 && _chromes.webview && printSilently) {
-            var _chromes2;
+          var _window$top;
+          if ((_window$top = window.top) !== null && _window$top !== void 0 && (_window$top = _window$top.chrome) !== null && _window$top !== void 0 && _window$top.webview && printSilently) {
             // console.log({
             //     exec: 'printpdf',
             //     data: {
@@ -35884,7 +35883,7 @@ var Print = /*#__PURE__*/function () {
             //         base64: PDF.output('datauristring').replace(/^data:application\/pdf;filename=generated.pdf;base64,/, ''),
             //     },
             // })
-            (_chromes2 = chromes) === null || _chromes2 === void 0 ? void 0 : _chromes2.webview.postMessage({
+            window.top.chrome.webview.postMessage({
               exec: 'printpdf',
               data: {
                 // showsetup: true, // 是否显示打印设置
@@ -38333,80 +38332,70 @@ var DocController = /*#__PURE__*/function () {
     key: "deleteTextBeforePath",
     value: function () {
       var _deleteTextBeforePath = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)().mark(function _callee(startPath) {
-        var hoEditorFactory, domRange, nodePosition, childIndex, node, ret, topath, arr, tmp, aRange, endPath, _topath, _aRange, isError, prevNode, cellNode, tableNode, tIndex, cIndex, preParaNode, newpath, signUserId, preNode, sPath, ePath, path, signNode, table, c, colProperty, pNode;
+        var hoEditorFactory, paintStatus, domRange, nodePosition, childIndex, node, ret, topath, arr, tmp, aRange, endPath, _topath, _aRange, isError, prevNode, cellNode, tableNode, tIndex, cIndex, preParaNode, newpath, signUserId, preNode, sPath, ePath, path, signNode, table, c, colProperty, pNode;
         return (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+              paintStatus = hoEditorFactory.drawTree.paintStatus;
               domRange = hoEditorFactory.docTree.curDomRange.normalize();
               if (domRange.isEmpty) {
-                _context.next = 6;
+                _context.next = 7;
                 break;
               }
               this.deleteRange(domRange, true);
-              // hoEditorFactory.undoService.begin();
-              // hoEditorFactory.undoService.add(
-              //   new NodesDeleteUndoUnit(
-              //     this._hoEditorFactoryID,
-              //     domRange.startPath,
-              //     domRange.endPath,
-              //     true
-              //   )
-              // );
-              // hoEditorFactory.undoService.commit();
-              _context.next = 122;
+              _context.next = 123;
               break;
-            case 6:
+            case 7:
               nodePosition = hoEditorFactory.docTree.findNodePositionByPath(startPath);
               childIndex = nodePosition.childIndex;
               node = nodePosition.node;
               if (!node) {
-                _context.next = 122;
+                _context.next = 123;
                 break;
               }
               if (!domRange.isEmpty) {
-                _context.next = 122;
+                _context.next = 123;
                 break;
               }
               if (!(node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_35__/* .TextNode */ .R)) {
-                _context.next = 35;
+                _context.next = 36;
                 break;
               }
               if (!(node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_64__/* .CellNode */ .D)) {
-                _context.next = 16;
+                _context.next = 17;
                 break;
               }
               ret = node.parentNode.delCellNodeText();
               if (ret) {
-                _context.next = 16;
+                _context.next = 17;
                 break;
               }
               return _context.abrupt("return");
-            case 16:
-              //}
+            case 17:
               topath = '';
               if (!(childIndex > 0)) {
-                _context.next = 23;
+                _context.next = 24;
                 break;
               }
               arr = startPath.split('/');
               arr[arr.length - 1] = parseInt(arr[arr.length - 1]) - 1 + '';
               topath = arr.join('/');
-              _context.next = 30;
+              _context.next = 31;
               break;
-            case 23:
+            case 24:
               tmp = node.previousLeaf();
               if (!tmp) {
-                _context.next = 28;
+                _context.next = 29;
                 break;
               }
               topath = hoEditorFactory.docTree.getNodeLastPath(tmp);
-              _context.next = 30;
+              _context.next = 31;
               break;
-            case 28:
+            case 29:
               console.error('这里应该不会出现这种情况 2020.10.28');
               return _context.abrupt("return");
-            case 30:
+            case 31:
               hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_38__/* .DomRange */ .a(this._hoEditorFactoryID, topath, startPath);
               // hoEditorFactory.undoService.begin();
               // hoEditorFactory.undoService.add(
@@ -38425,42 +38414,42 @@ var DocController = /*#__PURE__*/function () {
               // if (node.parentNode instanceof TextInputFieldNode) {
               //     node.parentNode.update();
               // }
-              _context.next = 122;
+              _context.next = 123;
               break;
-            case 35:
+            case 36:
               if (!(node instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_54__/* .MarkNode */ .j)) {
-                _context.next = 55;
+                _context.next = 56;
                 break;
               }
               endPath = hoEditorFactory.docTree.getNodeLastPath(node);
               if (!(node.parentNode && node.parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_53__/* .TextInputFieldNode */ .re)) {
-                _context.next = 50;
+                _context.next = 51;
                 break;
               }
               if (!(node.parentNode.childNodes[1] instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_54__/* .MarkNode */ .j)) {
-                _context.next = 43;
+                _context.next = 44;
                 break;
               }
               startPath = hoEditorFactory.docTree.getNodeLastPath(node.parentNode.previousLeaf());
               endPath = hoEditorFactory.docTree.getNodeLastPath(node.parentNode);
-              _context.next = 50;
+              _context.next = 51;
               break;
-            case 43:
+            case 44:
               if (!(node === node.parentNode.last())) {
-                _context.next = 48;
+                _context.next = 49;
                 break;
               }
               _topath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
               hoEditorFactory.drawTree.moveCaretToPath(_topath);
               hoEditorFactory.docTree.curDomRange.setSamePath(_topath);
               return _context.abrupt("return");
-            case 48:
+            case 49:
               if (!(node === node.parentNode.first())) {
-                _context.next = 50;
+                _context.next = 51;
                 break;
               }
               return _context.abrupt("return");
-            case 50:
+            case 51:
               _aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_38__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath //hoEditorFactory.docTree.getNodeLastPath(node)
               ).normalize();
               isError = this.deleteRange(_aRange, true);
@@ -38477,26 +38466,26 @@ var DocController = /*#__PURE__*/function () {
               //   )
               // );
               // hoEditorFactory.undoService.commit();
-              _context.next = 122;
+              _context.next = 123;
               break;
-            case 55:
+            case 56:
               if (!(node instanceof _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_37__/* .ParagraphNode */ .C)) {
-                _context.next = 81;
+                _context.next = 82;
                 break;
               }
               prevNode = node.prevSibling();
               if (!(prevNode instanceof _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_58__/* .TableNode */ .Fh)) {
-                _context.next = 59;
+                _context.next = 60;
                 break;
               }
               return _context.abrupt("return");
-            case 59:
+            case 60:
               if (!(prevNode == null)) {
-                _context.next = 81;
+                _context.next = 82;
                 break;
               }
               if (!(node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_64__/* .CellNode */ .D)) {
-                _context.next = 80;
+                _context.next = 81;
                 break;
               }
               cellNode = node.parentNode;
@@ -38505,7 +38494,7 @@ var DocController = /*#__PURE__*/function () {
               cIndex = cellNode.childNodes.indexOf(node);
               preParaNode = hoEditorFactory.docTree.getSameRectPrevParanode(tableNode.paragraphNode);
               if (!(preParaNode && tIndex == 0 && cIndex == 0 && preParaNode.drawlines.length == 1 && preParaNode.drawlines[0] instanceof _draw_DrawLine__WEBPACK_IMPORTED_MODULE_87__/* .DrawLine */ .a && preParaNode.drawlines[0].isEmpty())) {
-                _context.next = 77;
+                _context.next = 78;
                 break;
               }
               // hoEditorFactory.undoService.begin();
@@ -38515,64 +38504,63 @@ var DocController = /*#__PURE__*/function () {
               // await hoEditorFactory.undoService.commit();
               hoEditorFactory.undoService.begin();
               hoEditorFactory.undoService.add(new _undoRedo_TableUndos_TableDeleteParagraphUndoUnit__WEBPACK_IMPORTED_MODULE_94__/* .TableDeleteParagraphUndoUnit */ .T(this._hoEditorFactoryID, tableNode, tableNode.paragraphNode));
-              _context.next = 71;
+              _context.next = 72;
               return hoEditorFactory.undoService.commit();
-            case 71:
+            case 72:
               newpath = cellNode.childNodes[0].getNodePath();
               hoEditorFactory.docTree.curDomRange.setSamePath(newpath);
               hoEditorFactory.drawTree.moveCaretToPath(newpath);
               return _context.abrupt("return");
-            case 77:
-              return _context.abrupt("return");
             case 78:
-              _context.next = 81;
-              break;
-            case 80:
               return _context.abrupt("return");
+            case 79:
+              _context.next = 82;
+              break;
             case 81:
-              if (!(hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psReview && !(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_91__/* .SignNode */ .N))) {
-                _context.next = 86;
+              return _context.abrupt("return");
+            case 82:
+              if (!(paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psReview && !(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_91__/* .SignNode */ .N))) {
+                _context.next = 87;
                 break;
               }
               ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('审阅模式下，只能对文本内容进行删除');
               return _context.abrupt("return");
-            case 86:
-              if (!((hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psReview || hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psTrace) && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_91__/* .SignNode */ .N)) {
-                _context.next = 91;
+            case 87:
+              if (!((paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psReview || paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psTrace) && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_91__/* .SignNode */ .N)) {
+                _context.next = 92;
                 break;
               }
               signUserId = node.customProperty.bce01;
               if (!(hoEditorFactory.userInfo.id != signUserId)) {
-                _context.next = 91;
+                _context.next = 92;
                 break;
               }
               ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('不是本人签名，不允许删除！');
               return _context.abrupt("return");
-            case 91:
-              if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_91__/* .SignNode */ .N)) {
-                _context.next = 94;
+            case 92:
+              if (!(paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_91__/* .SignNode */ .N)) {
+                _context.next = 95;
                 break;
               }
               ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('不允许使用删除键删除签名，请右键删除元素');
               return _context.abrupt("return");
-            case 94:
-              if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_91__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
-                _context.next = 97;
+            case 95:
+              if (!(paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_91__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
+                _context.next = 98;
                 break;
               }
               ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('该签名元素不允许删除！');
               return _context.abrupt("return");
-            case 97:
+            case 98:
               if (!(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_91__/* .SignNode */ .N)) {
-                _context.next = 117;
+                _context.next = 118;
                 break;
               }
               preNode = node.previousLeaf();
               sPath = hoEditorFactory.docTree.getNodeLastPath(preNode);
-              ePath = hoEditorFactory.docTree.getNodeLastPath(node); //const nextNode = node.nextLeaf();
-              //if ((node.imgSrc !== "" || node.fingerPrintSrc !== "") && node.isTemplate && !(preNode instanceof SignNode) && !(nextNode instanceof SignNode)) {
+              ePath = hoEditorFactory.docTree.getNodeLastPath(node);
               if (!((node.imgSrc !== '' || node.fingerPrintSrc !== '') && node.isTemplate)) {
-                _context.next = 112;
+                _context.next = 113;
                 break;
               }
               path = hoEditorFactory.docTree.getNodeLastPath(preNode);
@@ -38594,7 +38582,7 @@ var DocController = /*#__PURE__*/function () {
                 }
               }
               return _context.abrupt("return");
-            case 112:
+            case 113:
               if (node.connectMode == '换行' && preNode instanceof _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_37__/* .ParagraphNode */ .C) {
                 sPath = hoEditorFactory.docTree.getNodeLastPath(preNode.previousLeaf());
               }
@@ -38602,7 +38590,7 @@ var DocController = /*#__PURE__*/function () {
               hoEditorFactory.undoService.add(new _undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_43__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, sPath, ePath, true));
               hoEditorFactory.undoService.commit();
               return _context.abrupt("return");
-            case 117:
+            case 118:
               pNode = node.parentNode;
               hoEditorFactory.undoService.begin();
               hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_44__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
@@ -38610,7 +38598,7 @@ var DocController = /*#__PURE__*/function () {
               if (pNode && pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_53__/* .TextInputFieldNode */ .re && pNode.childNodes.length === 2) {
                 this.resetEmptyInputFieldNode(hoEditorFactory, pNode);
               }
-            case 122:
+            case 123:
             case "end":
               return _context.stop();
           }
@@ -60579,7 +60567,7 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
 /* harmony export */   a: function() { return /* binding */ FormularType; }
 /* harmony export */ });
 /* harmony import */ var ant_design_vue_es_message_style__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(94310);
-/* harmony import */ var ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(40735);
+/* harmony import */ var ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(40735);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(27222);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(8495);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(70280);
@@ -60644,6 +60632,8 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
 /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(91105);
 /* harmony import */ var _RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(99152);
 /* harmony import */ var _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(65043);
+/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(51760);
+
 
 
 
@@ -61229,7 +61219,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
       var table = this.getParentCell().table;
       var arrStr = this.formulaStr.split(",");
       if (arrStr.length < 2) {
-        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_43__/* ["default"] */ .Z.warn("体重和身高对应的单元格编号传入有误:" + this.formulaStr);
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_44__/* ["default"] */ .Z.warn("体重和身高对应的单元格编号传入有误:" + this.formulaStr);
       }
       var _this$getRowColByCell7 = this.getRowColByCellAdress(arrStr[0]),
         _this$getRowColByCell8 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getRowColByCell7, 2),
@@ -61275,7 +61265,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
       var table = this.getParentCell().table;
       var arrStr = this.formulaStr.split(",");
       if (arrStr.length < 2) {
-        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_43__/* ["default"] */ .Z.warn("单元格编号传入有误:" + this.formulaStr);
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_44__/* ["default"] */ .Z.warn("单元格编号传入有误:" + this.formulaStr);
       }
       var _this$getRowColByCell11 = this.getRowColByCellAdress(arrStr[0]),
         _this$getRowColByCell12 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getRowColByCell11, 2),
@@ -61611,7 +61601,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
       var strRet = " ";
       var table = this.getParentCell().table;
       if (this.formulaStr == "") {
-        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_43__/* ["default"] */ .Z.warn("体重的单元格编号传入有误:" + this.formulaStr);
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_44__/* ["default"] */ .Z.warn("体重的单元格编号传入有误:" + this.formulaStr);
       }
       var _this$getRowColByCell21 = this.getRowColByCellAdress(this.formulaStr),
         _this$getRowColByCell22 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getRowColByCell21, 2),
@@ -61647,7 +61637,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
       var table = this.getParentCell().table;
       var arrStr = this.formulaStr.split(",");
       if (arrStr.length < 2) {
-        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_43__/* ["default"] */ .Z.warn("入院时间和出院时间对应的单元格编号传入有误:" + this.formulaStr);
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_44__/* ["default"] */ .Z.warn("入院时间和出院时间对应的单元格编号传入有误:" + this.formulaStr);
         return strRet;
       }
       var _this$getRowColByCell23 = this.getRowColByCellAdress(arrStr[0]),
@@ -61691,7 +61681,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
       var table = this.getParentCell().table;
       var arrStr = this.formulaStr.split(",");
       if (arrStr.length < 2) {
-        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_43__/* ["default"] */ .Z.warn("开始时间和结束时间对应的单元格编号传入有误:" + this.formulaStr);
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_44__/* ["default"] */ .Z.warn("开始时间和结束时间对应的单元格编号传入有误:" + this.formulaStr);
         return strRet;
       }
       var _this$getRowColByCell27 = this.getRowColByCellAdress(arrStr[0]),
@@ -61784,7 +61774,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
       var strRet = " ";
       var table = this.getParentCell().table;
       if (this.formulaStr == "") {
-        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_43__/* ["default"] */ .Z.warn("身高的单元格编号传入有误:" + this.formulaStr);
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_44__/* ["default"] */ .Z.warn("身高的单元格编号传入有误:" + this.formulaStr);
       }
       var cellNo = "";
       var isRange = false;
@@ -61915,8 +61905,13 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
   }, {
     key: "delete",
     value: function _delete(operType) {
-      _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_35__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.formularNodes.delete(this._id);
-      (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z)(TableFormula.prototype), "delete", this).call(this, operType);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_35__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+      if (hoEditorFactory.drawTree.paintStatus == _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_43__/* .PaintState */ .Dh.psDesign) {
+        hoEditorFactory.drawTree.formularNodes.delete(this._id);
+        (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z)(TableFormula.prototype), "delete", this).call(this, operType);
+      } else {
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_44__/* ["default"] */ .Z.warn("不能删除表格计算公式");
+      }
       return true;
     }
   }, {
@@ -81085,36 +81080,32 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
   }, {
     key: "getRowStartLineMaxHeight",
     value: function getRowStartLineMaxHeight(r) {
-      var startRow = -1;
-      var endRow = -1;
-      var inSameRow = true;
+      // let startRow = -1;
+      // let endRow = -1;
+      // let inSameRow = true;
       //判断所有行的起始行是否一样   并且结束行也是否一样
+      // for (let c = 0; c < this._table.colCount; c++) {
+      //     const [cell, mr, mc] = this._table.getMainCell(r, c);
+      //     if (startRow == -1) {
+      //         startRow = mr;
+      //     }
+      //     if (endRow == -1) {
+      //         endRow = mr + cell.rowSpan - 1;
+      //     }
+      //     if (mr != startRow || endRow != mr + cell.rowSpan - 1) {
+      //         inSameRow = false;
+      //         return gDefaultRowHeight;
+      //     }
+      // }
+      var maxRowHeight = _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_17__/* .gDefaultRowHeight */ .dT;
       for (var c = 0; c < this._table.colCount; c++) {
         var _this$_table$getMainC5 = this._table.getMainCell(r, c),
           _this$_table$getMainC6 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$_table$getMainC5, 3),
           cell = _this$_table$getMainC6[0],
           mr = _this$_table$getMainC6[1],
           mc = _this$_table$getMainC6[2];
-        if (startRow == -1) {
-          startRow = mr;
-        }
-        if (endRow == -1) {
-          endRow = mr + cell.rowSpan - 1;
-        }
-        if (mr != startRow || endRow != mr + cell.rowSpan - 1) {
-          inSameRow = false;
-          return _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_17__/* .gDefaultRowHeight */ .dT;
-        }
-      }
-      var maxRowHeight = 0;
-      for (var _c2 = 0; _c2 < this._table.colCount; _c2++) {
-        var _this$_table$getMainC7 = this._table.getMainCell(r, _c2),
-          _this$_table$getMainC8 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$_table$getMainC7, 3),
-          _cell = _this$_table$getMainC8[0],
-          _mr = _this$_table$getMainC8[1],
-          _mc = _this$_table$getMainC8[2];
-        if (_cell && _mc === _c2) {
-          var aHeight = _cell.drawCell.drawLines[0].dHeight;
+        if (cell && mc === c) {
+          var aHeight = cell.drawCell.drawLines[0].dHeight;
           if (aHeight > maxRowHeight) {
             maxRowHeight = aHeight;
           }
@@ -81124,7 +81115,7 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
     }
   }, {
     key: "isFirstRowCanFit",
-    value: function isFirstRowCanFit(restHeight) {
+    value: function isFirstRowCanFit(restHeight, dline) {
       var _this$table$getHeadRo = this.table.getHeadRowCountHeight(),
         _this$table$getHeadRo2 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$table$getHeadRo, 2),
         headCount = _this$table$getHeadRo2[0],
@@ -90307,17 +90298,9 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
               this._isError = true;
               return _context3.abrupt("return");
             case 12:
-              nodes = _dom_DomRange__WEBPACK_IMPORTED_MODULE_19__/* .DomRange */ .a.getSelectDomNodesForDelete(this._hoEditorFactoryID, this._startPath, this._endPath); // const npFirst = hoEditorFactory.docTree.findNodePositionByPath(this._startPath);
-              // if (npFirst && npFirst.node) {
-              //   //const parentNode = hoEditorFactory.docTree.getParentNode(this._startPath);
-              //   //if (parentNode) {
-              //   //if (!nodes.includes(parentNode)) nodes.splice(0, 0, parentNode);
-              //   //} else {
-              //   if (!nodes.includes(npFirst.node)) nodes.splice(0, 0, npFirst.node);
-              //   //}
-              // }
+              nodes = _dom_DomRange__WEBPACK_IMPORTED_MODULE_19__/* .DomRange */ .a.getSelectDomNodesForDelete(this._hoEditorFactoryID, this._startPath, this._endPath);
               if (!(paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_41__/* .PaintState */ .Dh.psDesign && !this._isForceDelete)) {
-                _context3.next = 75;
+                _context3.next = 83;
                 break;
               }
               lastNode = nodes[nodes.length - 1];
@@ -90358,12 +90341,12 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
               n = 0;
             case 32:
               if (!(n < nodes.length)) {
-                _context3.next = 74;
+                _context3.next = 82;
                 break;
               }
               node = nodes[n];
               if (!(node instanceof _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_32__/* .ControlNode */ .w && !(node instanceof _dom_treeNode_RareCharNode__WEBPACK_IMPORTED_MODULE_40__/* .RareCharNode */ .Q) || node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__/* .TextInputFieldNode */ .re)) {
-                _context3.next = 45;
+                _context3.next = 47;
                 break;
               }
               if (node.isAllowDelete) {
@@ -90388,90 +90371,91 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
               this._isError = true;
               return _context3.abrupt("return");
             case 45:
+              _context3.next = 79;
+              break;
+            case 47:
               if (!(node instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_25__/* .MarkNode */ .j)) {
-                _context3.next = 56;
+                _context3.next = 60;
                 break;
               }
               if (!(node.MarkNodeType === 0)) {
-                _context3.next = 51;
+                _context3.next = 53;
                 break;
               }
               ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.destroy();
               ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.warn("元素已设置为不允许删除,请正确操作。");
               this._isError = true;
               return _context3.abrupt("return");
-            case 51:
+            case 53:
               if (!(node.MarkNodeType === 2 && node.parentNode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__/* .TextInputFieldNode */ .re && !node.parentNode.canModifyContent)) {
-                _context3.next = 56;
+                _context3.next = 58;
                 break;
               }
               ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.destroy();
               ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.warn("该元素不允许编辑、删除，请正确操作。");
               this._isError = true;
               return _context3.abrupt("return");
-            case 56:
+            case 58:
+              _context3.next = 79;
+              break;
+            case 60:
               if (!(node instanceof _dom_treeNode_TableFormula__WEBPACK_IMPORTED_MODULE_39__/* .TableFormula */ .N)) {
-                _context3.next = 61;
+                _context3.next = 67;
                 break;
               }
               ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.destroy();
               ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.warn("不允许删除表格计算公式");
               this._isError = true;
               return _context3.abrupt("return");
-            case 61:
+            case 67:
               if (!(node instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_30__/* .TableNode */ .Fh && !node.tableProperty.canDelTable)) {
-                _context3.next = 66;
+                _context3.next = 74;
                 break;
               }
               ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.destroy();
               ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.warn("不允许删除表格");
               this._isError = true;
               return _context3.abrupt("return");
-            case 66:
+            case 74:
               if (!(node instanceof _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_37__/* .SignNode */ .N)) {
-                _context3.next = 71;
+                _context3.next = 79;
                 break;
               }
               ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.destroy();
               ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.warn("不允许直接删除签名！");
               this._isError = true;
               return _context3.abrupt("return");
-            case 71:
+            case 79:
               n++;
               _context3.next = 32;
               break;
-            case 74:
+            case 82:
               if (nodes.length === 1 && nodes[0] instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__/* .TextInputFieldNode */ .re && !nodes[0].isAllowDelete && nodes[0].childNodes[1] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_25__/* .MarkNode */ .j) {
                 hoEditorFactory.docTree.curDomRange.setSamePath(this._endPath);
               }
-            case 75:
+            case 83:
               pnode = (_currRange$npEnd$node = currRange.npEnd.node) === null || _currRange$npEnd$node === void 0 ? void 0 : _currRange$npEnd$node.parentNode;
               if (!(pnode && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__/* .TextInputFieldNode */ .re && currRange.npEnd.path != hoEditorFactory.docTree.getNodeLastPath(pnode))) {
-                _context3.next = 81;
+                _context3.next = 89;
                 break;
               }
               //判断当前TextInputField是否可编辑
               pTiNode = pnode;
-              _res = pTiNode.getReadyToEdit(function (value) {
-                //NOTE:在redo当中不能使用同一实例UndoRedoService的commit
-                // this._undo.begin();
-                // this._undo.add(new NodeDeleteUndoUnit(value));
-                // this._undo.commit();
-              });
+              _res = pTiNode.getReadyToEdit(function (value) {});
               if (_res[0]) {
-                _context3.next = 81;
+                _context3.next = 89;
                 break;
               }
               return _context3.abrupt("return");
-            case 81:
+            case 89:
               changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_18__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_16__/* .DocAction */ .gk.daUndoInsert, currRange.startPath, ""); //FIXME:deleteRange函数完成后调用这个
               // hoEditorFactory.docTree.deleteRange(arange.startPath, arange.endPath);
               if (currRange.npStart.node && currRange.npEnd.node) {
-                _context3.next = 84;
+                _context3.next = 92;
                 break;
               }
               throw _events_Exception__WEBPACK_IMPORTED_MODULE_26__/* .Exception */ .P.NodeNotFound();
-            case 84:
+            case 92:
               // const [startPath, endPath] = DomRange.skipStartEndTablePath(
               //   this._hoEditorFactory,
               //   currRange.startPath,
@@ -90483,17 +90467,17 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
               changeEvent.oldDrawTreeLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_29__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawTreeLines(startPath, endPath);
               res = this.deleteRange(currRange.endPath, currRange.startPath);
               if (!(res == 1)) {
-                _context3.next = 96;
+                _context3.next = 104;
                 break;
               }
               changeEvent.beforeChangePath = startPath;
               changeEvent.afterChangePath = this._tmp.start;
-              _context3.next = 94;
+              _context3.next = 102;
               return hoEditorFactory.docTree.change(changeEvent);
-            case 94:
+            case 102:
               cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_22__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, new _dom_DomRange__WEBPACK_IMPORTED_MODULE_19__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.start));
               hoEditorFactory.docTree.selectChange(cgEvent);
-            case 96:
+            case 104:
               hoEditorFactory.docTree.curDomRange.setSamePath(this._tmp.start);
               hoEditorFactory.drawTree.moveCaretToPath(this._tmp.start);
               aNode = currRange.npStart.node;
@@ -90501,12 +90485,12 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 pnode = aNode.parentNode;
               }
               if (!(aNode && pnode)) {
-                _context3.next = 103;
+                _context3.next = 111;
                 break;
               }
-              _context3.next = 103;
+              _context3.next = 111;
               return this.ParentRepaint(pnode);
-            case 103:
+            case 111:
             case "end":
               return _context3.stop();
           }
@@ -94000,11 +93984,9 @@ var NodeConvert = /*#__PURE__*/function () {
           if (value.node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_26__/* .TextInputFieldNode */ .re) {
             value.node.text = "";
             value.node.childNodes.splice(1, value.node.childNodes.length - 2);
-          }
-          if (value.node instanceof _dom_treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_27__/* .DateTimeNode */ .Z) {
+          } else if (value.node instanceof _dom_treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_27__/* .DateTimeNode */ .Z) {
             value.node.text = "";
-          }
-          if (value.node instanceof _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_28__/* .DownListNode */ .yF) {
+          } else if (value.node instanceof _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_28__/* .DownListNode */ .yF) {
             value.node.text = "";
           }
         }
@@ -205833,7 +205815,7 @@ Input.install = function (Vue) {
 
 
 /* harmony default export */ var antd = ([es_button, input, input_number, es_checkbox, date_picker, time_picker, es_radio, es_select, es_tabs, es_dropdown, es_menu, es_upload, tooltip, table, popover, es_icon/* default */.Z, config_provider]);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=template&id=2055fa91&
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=template&id=241e7c23&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -209146,7 +209128,7 @@ var TextNode = __webpack_require__(27198);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(67945);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.1.171');
+/* harmony default export */ var version = ('3.1.173');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(84531);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -224668,6 +224650,7 @@ var VueController = /*#__PURE__*/function () {
     key: "setBackgroundByName",
     value: function setBackgroundByName(items) {
       var _this6 = this;
+      var clearSelectRange = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       var selectRangeArr = [];
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       var iteratesNodes = function iteratesNodes(nodes) {
@@ -224683,7 +224666,7 @@ var VueController = /*#__PURE__*/function () {
                 if (range.length > 0) {
                   selectRangeArr = selectRangeArr.concat(range);
                 }
-              } else if (item.text === '' && isCurrent) {
+              } else if ((item.text === '' || item.text == undefined) && isCurrent) {
                 var sPath = hoEditorFactory.docTree.getNodeLastPath(anode.previousLeaf());
                 var ePath = hoEditorFactory.docTree.getNodeLastPath(anode);
                 var pStartPoint = StagePosition/* StagePosition */.M.getStagePosByPath(_this6._hoEditorFactoryID, sPath);
@@ -224711,7 +224694,7 @@ var VueController = /*#__PURE__*/function () {
         iteratesNodes(footerDocTree[f].subDocNodes);
       }
       if (selectRangeArr.length > 0) {
-        hoEditorFactory.drawTree.drawMultiCustomRange(selectRangeArr, true, true);
+        hoEditorFactory.drawTree.drawMultiCustomRange(selectRangeArr, clearSelectRange, true);
       } else {
         console.warn('未搜索到符合条件的元素');
       }
@@ -224910,6 +224893,12 @@ var VueController = /*#__PURE__*/function () {
       }
       return selectRangeArr;
     }
+  }, {
+    key: "clearSelectedRange",
+    value: function clearSelectedRange() {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      hoEditorFactory.drawTree.selectRange.clearAllCustomSelectShape();
+    }
   }, {
     key: "findAndLightElementsByNames",
     value: function findAndLightElementsByNames(names) {
@@ -225188,6 +225177,9 @@ var VueController = /*#__PURE__*/function () {
         hoEditorFactory._docTree.clearDocTree();
         delete hoEditorFactory._docTree;
       }
+      if (hoEditorFactory.hoLocalStorage) {
+        hoEditorFactory.hoLocalStorage.removeEvent();
+      }
       delete hoEditorFactory._subDocManger;
       delete hoEditorFactory._drawPageTree;
       delete hoEditorFactory._vueController;
@@ -226775,6 +226767,7 @@ var VueController = /*#__PURE__*/function () {
   }, {
     key: "structuredLookup",
     value: function structuredLookup(findTextArr) {
+      var clearSelectRange = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       var selectRangeArr = [];
       var paths = [];
@@ -226829,7 +226822,7 @@ var VueController = /*#__PURE__*/function () {
         selectRangeArr.push(selectRange);
       }
       if (selectRangeArr.length > 0) {
-        hoEditorFactory.drawTree.drawMultiCustomRange(selectRangeArr, true, true);
+        hoEditorFactory.drawTree.drawMultiCustomRange(selectRangeArr, clearSelectRange, true);
       }
     }
   }, {
@@ -226970,7 +226963,7 @@ var VueController = /*#__PURE__*/function () {
     //校验单复选必选
   }, {
     key: "verifyRadioAndCheckBoxs",
-    value: function verifyRadioAndCheckBoxs() {
+    value: function verifyRadioAndCheckBoxs(clearSelect) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       var radioAndCheckBoxs = hoEditorFactory.docTree.radioAndCheckBoxsMap;
       var names = [];
@@ -227022,7 +227015,7 @@ var VueController = /*#__PURE__*/function () {
         // message.warn(tip);
         result = groupNames;
       }
-      hoEditorFactory.drawTree.selectRange.clearAllCustomSelectShape();
+      // hoEditorFactory.drawTree.selectRange.clearAllCustomSelectShape();
       if (elements.length > 0) {
         var elementArr = elements.filter(function (item, index, array) {
           return array.indexOf(item) === index;
@@ -227039,7 +227032,7 @@ var VueController = /*#__PURE__*/function () {
           selectRangeArr.push(selectRange);
         }
         if (selectRangeArr.length > 0) {
-          hoEditorFactory.drawTree.drawMultiCustomRange(selectRangeArr, true, true);
+          hoEditorFactory.drawTree.drawMultiCustomRange(selectRangeArr, clearSelect, true);
         }
       }
       return result;
@@ -228158,6 +228151,8 @@ var DomController = /*#__PURE__*/function () {
 
 
 
+
+
 
 
 
@@ -228588,16 +228583,27 @@ var EditController = /*#__PURE__*/function () {
             var fromCell = tableNode.rows[i][j];
             var toCell = parentNode.table.rows[rs + i][cs + j];
             if (fromCell && toCell) {
-              if (fromCell.rowSpan > 1 || fromCell.colSpan > 1) {
-                hoeditorfactory.docController.mergeCells(toCell, rs + i, cs + j, fromCell.rowSpan, fromCell.colSpan);
+              var hasFormula = toCell.childNodes.filter(function (child) {
+                return child.nodeType == BaseNode/* NodeType */.Jq.ntTableFormula;
+              }).length;
+              var fromCell2 = [];
+              if (hoeditorfactory.drawTree.paintStatus === DrawTree/* PaintState */.Dh.psEdit || hoeditorfactory.drawTree.paintStatus === DrawTree/* PaintState */.Dh.psReview) {
+                fromCell2 = fromCell.childNodes.filter(function (child) {
+                  return child.nodeType != BaseNode/* NodeType */.Jq.ntSign;
+                });
               }
-              toCell.childNodes.splice(1, toCell.childNodes.length);
-              var childNodes = fromCell.childNodes;
-              for (var s = 1; s < childNodes.length; s++) {
-                var path = hoeditorfactory.docTree.getNodeLastPath(toCell.childNodes[toCell.childNodes.length - 1]);
-                hoeditorfactory.docTree.insertNodeAfterPath(path, childNodes[s]);
+              if (!hasFormula) {
+                if (fromCell.rowSpan > 1 || fromCell.colSpan > 1) {
+                  hoeditorfactory.docController.mergeCells(toCell, rs + i, cs + j, fromCell.rowSpan, fromCell.colSpan);
+                }
+                toCell.childNodes.splice(1, toCell.childNodes.length);
+                var childNodes = fromCell2;
+                for (var s = 1; s < childNodes.length; s++) {
+                  var path = hoeditorfactory.docTree.getNodeLastPath(toCell.childNodes[toCell.childNodes.length - 1]);
+                  hoeditorfactory.docTree.insertNodeAfterPath(path, childNodes[s]);
+                }
+                toCell.drawCell.needUpdate = true;
               }
-              toCell.drawCell.needUpdate = true;
             }
           }
         }
@@ -238131,7 +238137,6 @@ var localforage_default = /*#__PURE__*/__webpack_require__.n(localforage);
 var HoLocalStorage = /*#__PURE__*/function () {
   // 增加页面刷新时缓存未保存的病历数据
   function HoLocalStorage(hoEditorFactoryID) {
-    var _this$getChromeWebvie;
     (0,esm_classCallCheck/* default */.Z)(this, HoLocalStorage);
     (0,esm_defineProperty/* default */.Z)(this, "_hoEditorFactoryID", void 0);
     (0,esm_defineProperty/* default */.Z)(this, "_key", void 0);
@@ -238157,6 +238162,8 @@ var HoLocalStorage = /*#__PURE__*/function () {
     //当前缓存的xml文件列表
     (0,esm_defineProperty/* default */.Z)(this, "_xmlToLoad", void 0);
     //当前缓存的xml文件列表
+    (0,esm_defineProperty/* default */.Z)(this, "isWebview", void 0);
+    // 是否是webview
     (0,esm_defineProperty/* default */.Z)(this, "callBack", void 0);
     (0,esm_defineProperty/* default */.Z)(this, "callBackForLoad", void 0);
     (0,esm_defineProperty/* default */.Z)(this, "_offline_cache_list", void 0);
@@ -238166,19 +238173,14 @@ var HoLocalStorage = /*#__PURE__*/function () {
     (0,esm_defineProperty/* default */.Z)(this, "_offLineIntervalCacheTimer", void 0);
     // 网络连接中断后定时30s缓存一次
     (0,esm_defineProperty/* default */.Z)(this, "pageLoadCacheList", void 0);
-    var _this = this;
     this._hoEditorFactoryID = hoEditorFactoryID;
-    // 设置今天的 storeName
-    // this._storeName = String(new Date().getTime());
-    // 创建当前时段
-    // this._ho_web = localforage.createInstance({
-    // 	name: "_ho_web",
-    // 	storeName: this._storeName,
-    // });
-    (_this$getChromeWebvie = this.getChromeWebview()) === null || _this$getChromeWebvie === void 0 ? void 0 : _this$getChromeWebvie.addEventListener('message', function (e) {
-      if (e && e.data) {
-        var res = JSON.parse(e.data);
-        // console.log('res-----', res);
+  }
+  (0,esm_createClass/* default */.Z)(HoLocalStorage, [{
+    key: "initEvent",
+    value: function initEvent(message) {
+      var _this = this;
+      if (message && message.data) {
+        var res = JSON.parse(message.data);
         if (res.result == true && res.res.cmd == 'GetList') {
           var _this$callBack;
           _this._localXmlList = res.res.EMR;
@@ -238197,29 +238199,19 @@ var HoLocalStorage = /*#__PURE__*/function () {
           return false;
         }
       }
-    });
-  }
-  (0,esm_createClass/* default */.Z)(HoLocalStorage, [{
-    key: "getChromeWebview",
-    value: function getChromeWebview() {
-      var _chromes;
-      var chromes;
-      try {
-        if (window.top) {
-          chromes = window.top.chrome;
-        }
-      } catch (error) {
-        console.error(error);
-        chromes = undefined;
+    }
+  }, {
+    key: "removeEvent",
+    value: function removeEvent() {
+      var _window$top;
+      if ((_window$top = window.top) !== null && _window$top !== void 0 && (_window$top = _window$top.chrome) !== null && _window$top !== void 0 && (_window$top = _window$top.webview) !== null && _window$top !== void 0 && _window$top.addEventListener) {
+        window.top.chrome.webview.removeEventListener('message', this.initEvent);
       }
-      return (_chromes = chromes) === null || _chromes === void 0 ? void 0 : _chromes.webview;
     }
-    // set ho_web(value: any) {
-    //     this._ho_web = value;
-    // }
   }, {
     key: "initHoWebSql",
     value: function initHoWebSql() {
+      var _window$top2;
       localforage_default().config({
         driver: (localforage_default()).INDEXEDDB
       });
@@ -238243,13 +238235,16 @@ var HoLocalStorage = /*#__PURE__*/function () {
         name: '_ho_web',
         storeName: 'PageLoadCacheList'
       });
+      if ((_window$top2 = window.top) !== null && _window$top2 !== void 0 && (_window$top2 = _window$top2.chrome) !== null && _window$top2 !== void 0 && (_window$top2 = _window$top2.webview) !== null && _window$top2 !== void 0 && _window$top2.addEventListener) {
+        window.top.chrome.webview.addEventListener('message', this.initEvent);
+      }
       // this.networkEventListener();
     }
     //获取localXmlList
   }, {
     key: "getLocalXmlList",
     value: function getLocalXmlList(callBack) {
-      var _this$getChromeWebvie2;
+      var _window$top3;
       this.callBack = callBack;
       var hoEditfactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       var data = {
@@ -238262,7 +238257,10 @@ var HoLocalStorage = /*#__PURE__*/function () {
           }
         }
       };
-      (_this$getChromeWebvie2 = this.getChromeWebview()) === null || _this$getChromeWebvie2 === void 0 ? void 0 : _this$getChromeWebvie2.postMessage(data);
+      if ((_window$top3 = window.top) !== null && _window$top3 !== void 0 && (_window$top3 = _window$top3.chrome) !== null && _window$top3 !== void 0 && _window$top3.webview) {
+        var _window$top4;
+        (_window$top4 = window.top) === null || _window$top4 === void 0 || (_window$top4 = _window$top4.chrome) === null || _window$top4 === void 0 || (_window$top4 = _window$top4.webview) === null || _window$top4 === void 0 ? void 0 : _window$top4.postMessage(data);
+      }
     }
     // 获取key的数据 => { data, keyInfo }
   }, {
@@ -238276,7 +238274,7 @@ var HoLocalStorage = /*#__PURE__*/function () {
   }, {
     key: "loadLocalXml",
     value: function loadLocalXml(item, callBack) {
-      var _this$getChromeWebvie3;
+      var _window$top5;
       this.callBackForLoad = callBack;
       var data = {
         exec: 'emr',
@@ -238288,7 +238286,10 @@ var HoLocalStorage = /*#__PURE__*/function () {
           }
         }
       };
-      (_this$getChromeWebvie3 = this.getChromeWebview()) === null || _this$getChromeWebvie3 === void 0 ? void 0 : _this$getChromeWebvie3.postMessage(data);
+      if ((_window$top5 = window.top) !== null && _window$top5 !== void 0 && (_window$top5 = _window$top5.chrome) !== null && _window$top5 !== void 0 && _window$top5.webview) {
+        var _window$top6;
+        (_window$top6 = window.top) === null || _window$top6 === void 0 || (_window$top6 = _window$top6.chrome) === null || _window$top6 === void 0 || (_window$top6 = _window$top6.webview) === null || _window$top6 === void 0 ? void 0 : _window$top6.postMessage(data);
+      }
     }
   }, {
     key: "removeLocalStorage",
@@ -238319,18 +238320,17 @@ var HoLocalStorage = /*#__PURE__*/function () {
   }, {
     key: "autoSaveLocalStorage",
     value: function autoSaveLocalStorage() {
-      var _this4 = this;
+      var _window$top7,
+        _this4 = this;
       if (this._lastSaveTime && new Date().getTime() - this._lastSaveTime <= this._intervalsTime) {
         return;
       }
-      var HoBrowser = this.getChromeWebview();
       var saveTime = (0,plugins_util/* dateFormat */.vc)(new Date());
       var hoEditfactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       this._key = hoEditfactory.userInfo.id + hoEditfactory.docTree.docProperty.patientID + hoEditfactory.docTree.docProperty.title;
-      if (HoBrowser) {
+      if ((_window$top7 = window.top) !== null && _window$top7 !== void 0 && (_window$top7 = _window$top7.chrome) !== null && _window$top7 !== void 0 && _window$top7.webview) {
         this._lastSaveTime = new Date(saveTime).getTime();
         if (hoEditfactory && hoEditfactory.vueController.isModifyDoc()) {
-          var _this$getChromeWebvie4;
           var data = {
             exec: 'emr',
             data: {
@@ -238343,7 +238343,7 @@ var HoLocalStorage = /*#__PURE__*/function () {
             }
           };
           // console.log('SaveEmrData', data);
-          (_this$getChromeWebvie4 = this.getChromeWebview()) === null || _this$getChromeWebvie4 === void 0 ? void 0 : _this$getChromeWebvie4.postMessage(data);
+          window.top.chrome.webview.postMessage(data);
         }
       } else if (this._networkConnectionStatus) {
         // 网络连接正常情况下正常缓存
@@ -238414,7 +238414,7 @@ var HoLocalStorage = /*#__PURE__*/function () {
     value: function saveFontString(font) {
       var _this5 = this;
       this._print_font.keys().then(function (keys) {
-        if (keys.includes("sunsim_font")) {
+        if (keys.includes('sunsim_font')) {
           _this5._print_font.removeItem('sunsim_font');
         }
       });
@@ -240190,6 +240190,11 @@ var commondata = __webpack_require__(76285);
       document.addEventListener('mousemove', this.mouseMove);
     }
   },
+  destroyed: function destroyed() {
+    document.removeEventListener('mouseup', this.mouseMove);
+    document.removeEventListener('mousemove', this.mouseMove);
+    document.removeEventListener('keydown', this.mouseMove);
+  },
   created: function created() {
     var _this4 = this;
     // 禁掉默认的左键菜单
@@ -240198,19 +240203,7 @@ var commondata = __webpack_require__(76285);
     };
     this.$nextTick(function () {
       if (_this4.editJson && _this4.editJson.findModal) {
-        document.onkeydown = function (event) {
-          var keyCode = event.keyCode || event.which || event.charCode;
-          var ctrlKey = event.ctrlKey || event.metaKey;
-          // ctrl + F组合键 覆盖浏览器自身查询替换功能
-          if (ctrlKey && keyCode === 70) {
-            event.preventDefault();
-            _this4.hoEditorProvider.controlFindType = !_this4.hoEditorProvider.controlFindType;
-          }
-          // esc快捷键 自动关闭查询替换弹窗
-          if (keyCode === 27) {
-            _this4.hoEditorProvider.controlFindType = false;
-          }
-        };
+        document.addEventListener('keydown', _this4.onKeydown);
       }
     });
     // 初始化所有文档
@@ -240766,15 +240759,28 @@ var commondata = __webpack_require__(76285);
     autoSelect: function autoSelect(id) {
       if (!id) return;
       this.hoEditorProvider.autoSelectElementId = id;
+    },
+    onKeydown: function onKeydown(event) {
+      var keyCode = event.keyCode || event.which || event.charCode;
+      var ctrlKey = event.ctrlKey || event.metaKey;
+      // ctrl + F组合键 覆盖浏览器自身查询替换功能
+      if (ctrlKey && keyCode === 70) {
+        event.preventDefault();
+        this.hoEditorProvider.controlFindType = !this.hoEditorProvider.controlFindType;
+      }
+      // esc快捷键 自动关闭查询替换弹窗
+      if (keyCode === 27) {
+        this.hoEditorProvider.controlFindType = false;
+      }
     }
   }
 });
 ;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocsvue_type_script_lang_js_ = (HoDocsvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=style&index=0&id=2055fa91&prod&lang=less&media=print&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=style&index=0&id=241e7c23&prod&lang=less&media=print&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=style&index=0&id=2055fa91&prod&lang=less&media=print&
+;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=style&index=0&id=241e7c23&prod&lang=less&media=print&
 
 ;// CONCATENATED MODULE: ./src/components/HoDocs.vue
 
@@ -241851,7 +241857,7 @@ var ToolFamily_component = (0,componentNormalizer/* default */.Z)(
     return {
       aligned: 'both',
       lineHeight: 1.25,
-      lineHeightList: [1.25, 1.5, 2, 2.5, 3],
+      lineHeightList: [1.25, 1.5, 1.75, 2, 2.5, 3, 4, 5],
       lineHeightVisible: false,
       isInMenu: false,
       editorSubber: null,