hoeditor-web 3.0.80 → 3.0.81

package/lib/hoeditor.umd.js

@@ -39481,6 +39481,16 @@ var DocController = /*#__PURE__*/function () {
       }
       startPath = domRange.startPath;
       endPath = domRange.endPath;
+      if (startPath !== endPath && domRange.npEnd.node instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_46__/* .MarkNode */ .j) {
+        var nodes = _DomRange__WEBPACK_IMPORTED_MODULE_30__/* .DomRange.getSelectDomNodesForDelete */ .a.getSelectDomNodesForDelete(this._hoEditorFactoryID, startPath, endPath);
+        if (nodes.length == 1 && nodes[0] instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_45__/* .TextInputFieldNode */ .re && nodes[0].isEmpty()) {
+          startPath = nodes[0].StartMarkNode.getNodePath();
+          endPath = nodes[0].childNodes[1].getNodePath();
+          var newDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_30__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath);
+          hoEditorFactory.docTree.curDomRange = newDomRange;
+          hoEditorFactory.drawTree.moveCaretToPath(startPath);
+        }
+      }
       var changingEvent = new _events_NodeChangingEvent__WEBPACK_IMPORTED_MODULE_22__/* .NodeChangingEvent */ .Q(_DocTree__WEBPACK_IMPORTED_MODULE_25__/* .DocAction.daInsert */ .gk.daInsert, startPath, endPath, _events_NodeChangingEvent__WEBPACK_IMPORTED_MODULE_22__/* .OperType.keyBoardInput */ .y.keyBoardInput);
       if (hoEditorFactory.docTree.changing(changingEvent)) {
         if (domRange.npStart.node && domRange.npStart.node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_56__/* .CellNode */ .D) {
@@ -39882,7 +39892,7 @@ 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_3__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().mark(function _callee(startPath) {
-        var hoEditorFactory, domRange, nodePosition, childIndex, node, ret, topath, arr, tmp, aRange, endPath, _topath, _aRange, prevNode, cellNode, tableNode, tIndex, cIndex, preParaNode, newpath, signUserId, preNode, nextNode, path, signNode, spath, epath, newSignNode, pNode;
+        var hoEditorFactory, domRange, nodePosition, childIndex, node, ret, topath, arr, tmp, aRange, endPath, _topath, _aRange, isError, prevNode, cellNode, tableNode, tIndex, cIndex, preParaNode, newpath, signUserId, preNode, nextNode, path, signNode, spath, epath, newSignNode, pNode;
         return (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -39904,18 +39914,18 @@ var DocController = /*#__PURE__*/function () {
                 //   )
                 // );
                 // hoEditorFactory.undoService.commit();
-                _context.next = 123;
+                _context.next = 124;
                 break;
               case 6:
                 nodePosition = hoEditorFactory.docTree.findNodePositionByPath(startPath);
                 childIndex = nodePosition.childIndex;
                 node = nodePosition.node;
                 if (!node) {
-                  _context.next = 123;
+                  _context.next = 124;
                   break;
                 }
                 if (!domRange.isEmpty) {
-                  _context.next = 123;
+                  _context.next = 124;
                   break;
                 }
                 if (!(node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_26__/* .TextNode */ .R)) {
@@ -39971,11 +39981,11 @@ var DocController = /*#__PURE__*/function () {
                 aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_30__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, topath).normalize();
                 this.deleteRange(aRange, true);
                 hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_30__/* .DomRange */ .a(this._hoEditorFactoryID, topath, topath);
-                _context.next = 123;
+                _context.next = 124;
                 break;
               case 36:
                 if (!(node instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_46__/* .MarkNode */ .j)) {
-                  _context.next = 55;
+                  _context.next = 56;
                   break;
                 }
                 endPath = hoEditorFactory.docTree.getNodeLastPath(node);
@@ -40009,7 +40019,10 @@ var DocController = /*#__PURE__*/function () {
               case 51:
                 _aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_30__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath //hoEditorFactory.docTree.getNodeLastPath(node)
                 ).normalize();
-                this.deleteRange(_aRange, true);
+                isError = this.deleteRange(_aRange, true);
+                if (isError) {
+                  hoEditorFactory.docTree.curDomRange.setSamePath(node.getNodePath());
+                }
                 // hoEditorFactory.undoService.begin();
                 // hoEditorFactory.undoService.add(
                 //   new NodesDeleteUndoUnit(
@@ -40020,26 +40033,26 @@ var DocController = /*#__PURE__*/function () {
                 //   )
                 // );
                 // hoEditorFactory.undoService.commit();
-                _context.next = 123;
+                _context.next = 124;
                 break;
-              case 55:
+              case 56:
                 if (!(node instanceof _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_29__/* .ParagraphNode */ .C)) {
-                  _context.next = 81;
+                  _context.next = 82;
                   break;
                 }
                 prevNode = node.prevSibling();
                 if (!(prevNode instanceof _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_50__/* .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_56__/* .CellNode */ .D)) {
-                  _context.next = 80;
+                  _context.next = 81;
                   break;
                 }
                 cellNode = node.parentNode;
@@ -40048,7 +40061,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_79__/* .DrawLine */ .a && preParaNode.drawlines[0].isEmpty())) {
-                  _context.next = 77;
+                  _context.next = 78;
                   break;
                 }
                 // hoEditorFactory.undoService.begin();
@@ -40058,62 +40071,62 @@ var DocController = /*#__PURE__*/function () {
                 // await hoEditorFactory.undoService.commit();
                 hoEditorFactory.undoService.begin();
                 hoEditorFactory.undoService.add(new _undoRedo_TableUndos_TableDeleteParagraphUndoUnit__WEBPACK_IMPORTED_MODULE_86__/* .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:
+                return _context.abrupt("return");
+              case 82:
                 if (!(hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_27__/* .PaintState.psReview */ .Dh.psReview && !(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N))) {
-                  _context.next = 86;
+                  _context.next = 87;
                   break;
                 }
                 ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_91__/* ["default"].warn */ .Z.warn("审阅模式下，只能对文本内容进行删除");
                 return _context.abrupt("return");
-              case 86:
+              case 87:
                 if (!(hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_27__/* .PaintState.psReview */ .Dh.psReview && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N)) {
-                  _context.next = 91;
+                  _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_91__/* ["default"].warn */ .Z.warn("不是本人签名，不允许删除！");
                 return _context.abrupt("return");
-              case 91:
+              case 92:
                 if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_27__/* .PaintState.psDesign */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N)) {
-                  _context.next = 94;
+                  _context.next = 95;
                   break;
                 }
                 ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_91__/* ["default"].warn */ .Z.warn("不允许使用删除键删除签名，请右键删除元素");
                 return _context.abrupt("return");
-              case 94:
+              case 95:
                 if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_27__/* .PaintState.psDesign */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
-                  _context.next = 97;
+                  _context.next = 98;
                   break;
                 }
                 ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_91__/* ["default"].warn */ .Z.warn("该签名元素不允许删除！");
                 return _context.abrupt("return");
-              case 97:
+              case 98:
                 if (!(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N)) {
-                  _context.next = 118;
+                  _context.next = 119;
                   break;
                 }
                 preNode = node.previousLeaf();
                 nextNode = node.nextLeaf();
                 if (!((node.imgSrc !== "" || node.fingerPrintSrc !== "") && node.isTemplate && !(preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) && !(nextNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N))) {
-                  _context.next = 108;
+                  _context.next = 109;
                   break;
                 }
                 path = hoEditorFactory.docTree.getNodeLastPath(preNode);
@@ -40123,9 +40136,9 @@ var DocController = /*#__PURE__*/function () {
                 hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_24__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, path, signNode));
                 hoEditorFactory.undoService.commit();
                 return _context.abrupt("return");
-              case 108:
+              case 109:
                 if (!(preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N)) {
-                  _context.next = 118;
+                  _context.next = 119;
                   break;
                 }
                 spath = "";
@@ -40146,7 +40159,7 @@ var DocController = /*#__PURE__*/function () {
                 }
                 hoEditorFactory.undoService.commit();
                 return _context.abrupt("return");
-              case 118:
+              case 119:
                 pNode = node.parentNode;
                 hoEditorFactory.undoService.begin();
                 hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_36__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
@@ -40154,7 +40167,7 @@ var DocController = /*#__PURE__*/function () {
                 if (pNode && pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_45__/* .TextInputFieldNode */ .re && pNode.childNodes.length === 2) {
                   this.resetEmptyInputFieldNode(hoEditorFactory, pNode);
                 }
-              case 123:
+              case 124:
               case "end":
                 return _context.stop();
             }
@@ -237704,7 +237717,7 @@ var ParagraphNode = __webpack_require__(67945);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/MarkNode.ts
 var MarkNode = __webpack_require__(57727);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.0.80');
+/* harmony default export */ var version = ('3.0.81');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(36081);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts