hoeditor-web 3.1.62 → 3.1.64

package/lib/hoeditor.umd.js

@@ -44825,6 +44825,7 @@ var DocController = /*#__PURE__*/function () {
       if (parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_58__/* .CellNode */ .D) {
         this.signLockCheck(parentNode);
       }
+      this.drawMask(signNode);
     }
     /**
      * 更新签名
@@ -44868,6 +44869,7 @@ var DocController = /*#__PURE__*/function () {
         if (node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_58__/* .CellNode */ .D) {
           this.signLockCheck(node.parentNode);
         }
+        this.drawMask(node);
       } else {
         //第二次更新签名
         if (node.connectMode === '换行') {
@@ -44891,6 +44893,26 @@ var DocController = /*#__PURE__*/function () {
         hoEditorFactory.undoService.commit();
       }
     }
+  }, {
+    key: "drawMask",
+    value: function drawMask(node) {
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_78__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+      if (hoEditorFactory.forbidEditBeforeSign) {
+        if (hoEditorFactory.structureConvert._superiorSign.length === 0) {
+          hoEditorFactory.structureConvert._superiorSign[0] = node;
+          hoEditorFactory.vueController.hiddenMask(false);
+        } else {
+          var sign1 = hoEditorFactory.structureConvert._superiorSign[0];
+          var path1 = sign1.getNodePath();
+          var path2 = node.getNodePath();
+          var result = _NodePosition__WEBPACK_IMPORTED_MODULE_84__/* .NodePosition */ .F.treePathCompare(path1, path2);
+          if (result < 0) {
+            hoEditorFactory.structureConvert._superiorSign[0] = node;
+            hoEditorFactory.vueController.hiddenMask(false);
+          }
+        }
+      }
+    }
     /**
      * 修改空签名
      * @param node 签名节点
@@ -55117,12 +55139,12 @@ var DateTimeNode = /*#__PURE__*/function (_ControlNode) {
       this.transType(json);
       if (isPaste) {
         var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .b.instance().getFactory(hoEditorFactoryID);
-        // if (hoEditorFactory.vueController.getNodeByDataID("all", json.dataId)) {
-        //   //json.id = hoEditorFactory.gernerateCode.generateID("DT");
-        //   json.dataId = hoEditorFactory.gernerateCode.generateID("DateTime");
-        // }
-        json.dataId = hoEditorFactory.gernerateCode.generateID("DateTime");
+        if (hoEditorFactory.vueController.getNodeByDataID("all", json.dataId)) {
+          json.dataId = hoEditorFactory.gernerateCode.generateID("DateTime");
+        }
+        //json.dataId = hoEditorFactory.gernerateCode.generateID("DateTime");
       }
+
       json.readType = json.readType ? Number(json.readType) : -1;
       json.isSynchro = !json.isSynchro ? false : json.isSynchro;
       json.isAllowDelete = !json.isAllowDelete ? false : json.isAllowDelete;
@@ -55996,12 +56018,12 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
       this.transType(json);
       if (isPaste) {
         var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_23__/* .HOEditorFactorys */ .b.instance().getFactory(hoEditorFactoryID);
-        // if (hoEditorFactory.vueController.getNodeByDataID("all", json.dataId)) {
-        //   //json.id = hoEditorFactory.gernerateCode.generateID("DL");
-        //   json.dataId = hoEditorFactory.gernerateCode.generateID("DownList");
-        // }
-        json.dataId = hoEditorFactory.gernerateCode.generateID("DownList");
+        if (hoEditorFactory.vueController.getNodeByDataID("all", json.dataId)) {
+          json.dataId = hoEditorFactory.gernerateCode.generateID("DownList");
+        }
+        //json.dataId = hoEditorFactory.gernerateCode.generateID("DownList");
       }
+
       json.isAllowDelete = !json.isAllowDelete ? false : json.isAllowDelete;
       json.isReadOnly = !json.isReadOnly ? false : json.isReadOnly;
       json.mutexSelect = !json.mutexSelect ? false : json.mutexSelect;
@@ -61941,14 +61963,15 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
         //let name = "";
         //if (json.controlStyle === "RadioBox") name = "RB";
         //if (json.controlStyle === "CheckBox") name = "CB";
-        // hoEditorFactory.docTree.radioAndCheckBoxsMap.forEach((value, key) => {
-        //   if (value.dataId === json.dataId) {
-        //     //json.id = hoEditorFactory.gernerateCode.generateID(name);
-        //     json.dataId = hoEditorFactory.gernerateCode.generateID(json.controlStyle);
-        //   }
-        // });
-        json.dataId = hoEditorFactory.gernerateCode.generateID(json.controlStyle);
+        hoEditorFactory.docTree.radioAndCheckBoxsMap.forEach(function (value, key) {
+          if (value.dataId === json.dataId) {
+            //json.id = hoEditorFactory.gernerateCode.generateID(name);
+            json.dataId = hoEditorFactory.gernerateCode.generateID(json.controlStyle);
+          }
+        });
+        //json.dataId = hoEditorFactory.gernerateCode.generateID(json.controlStyle);
       }
+
       json.isAllowDelete = !json.isAllowDelete ? false : json.isAllowDelete;
       json.isSelected = !json.isSelected ? false : json.isSelected.text != undefined ? json.isSelected.text : json.isSelected;
       json.boxAlign = json.boxAlign === undefined ? true : json.boxAlign;
@@ -67581,7 +67604,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /*
  * @Author: your name
  * @Date: 2020-11-03 15:17:54
- * @LastEditTime: 2024-01-17 11:31:50
+ * @LastEditTime: 2024-01-29 11:40:48
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -68874,11 +68897,13 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                 hoEditorFactory.docTree.curDomRange.setSamePath(startPath);
               }
               if (!(text === '')) {
-                _context2.next = 25;
+                _context2.next = 26;
                 break;
               }
               this._canModifyContent = oldValue;
-              hoEditorFactory.docController.deleteRange(aRange, true, 'update');
+              _context2.next = 21;
+              return hoEditorFactory.docController.deleteRange(aRange, true, 'update');
+            case 21:
               // this._childNodes.splice(1, this._childNodes.length - 2);
               // const markNode = new MarkNode(this._hoEditorFactoryID, this.rootNodes, this, NodeType.ntText, this.labelText, hoEditorFactory.docTree.curStyleIndex, MarkNodeType.mtContent);
               // this._childNodes.splice(1, 0, markNode);
@@ -68893,10 +68918,10 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
               hoEditorFactory.drawTree.editor.input.focus();
               hoEditorFactory.drawTree.moveCaretToPath(startPath);
               return _context2.abrupt("return");
-            case 25:
-              _context2.next = 27;
+            case 26:
+              _context2.next = 28;
               return hoEditorFactory.docController.insertPlainTextAfterPath(startPath, text, oldValue);
-            case 27:
+            case 28:
             case "end":
               return _context2.stop();
           }
@@ -69567,12 +69592,12 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
       delete json.nodeType;
       this.transType(json);
       if (isPaste) {
-        // if (hoEditorFactory.vueController.getNodeByDataID('all', json.dataId)) {
-        //     //json.id = hoEditorFactory.gernerateCode.generateID("TF");
-        //     json.dataId = hoEditorFactory.gernerateCode.generateID('Field');
-        // }
-        json.dataId = hoEditorFactory.gernerateCode.generateID('Field');
+        if (hoEditorFactory.vueController.getNodeByDataID('all', json.dataId)) {
+          json.dataId = hoEditorFactory.gernerateCode.generateID('Field');
+        }
+        //json.dataId = hoEditorFactory.gernerateCode.generateID('Field');
       }
+
       json.canModifyContent = json.canModifyContent === undefined ? true : json.canModifyContent;
       json.isAllowDelete = !json.isAllowDelete ? false : json.isAllowDelete;
       json.enableGlobalColor = !json.enableGlobalColor ? false : json.enableGlobalColor;
@@ -77945,7 +77970,12 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
           prevDocHeight += toparr[_r][1];
         }
         if (drawTreeHeight > this._cell.drawCell.docHeight) {
-          valignTop = pageHeight - Math.max(0, this._cell.drawCell.docHeight - restRowHeight - innerBottom - prevDocHeight);
+          //valignTop = pageHeight - Math.max(0, (this._cell.drawCell.docHeight - restRowHeight - innerBottom - prevDocHeight));
+          if (this._cell.drawCell.docHeight <= 13) {
+            valignTop = pageHeight - Math.max(0, this._cell.drawCell.docHeight - restRowHeight - innerBottom - prevDocHeight) - 5;
+          } else {
+            valignTop = pageHeight - Math.max(0, this._cell.drawCell.docHeight - restRowHeight - innerBottom - prevDocHeight);
+          }
         }
       }
       return [valignTop, toparr];
@@ -91643,22 +91673,22 @@ var NodeStyleUndoUnit = /*#__PURE__*/function () {
 /* harmony import */ var _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(27198);
 /* harmony import */ var _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(2613);
 /* harmony import */ var _dom_DomRange__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(94639);
-/* harmony import */ var _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(59057);
-/* harmony import */ var _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(931);
-/* harmony import */ var _UndoService__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(19229);
-/* harmony import */ var _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(90161);
-/* harmony import */ var _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(57727);
-/* harmony import */ var _events_Exception__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(8277);
-/* harmony import */ var _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(67945);
-/* harmony import */ var _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(68598);
-/* harmony import */ var _draw_SelectRange__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(53901);
-/* harmony import */ var _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(5010);
-/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(74089);
-/* harmony import */ var _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(91105);
-/* harmony import */ var _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(99152);
-/* harmony import */ var _dom_treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(92501);
-/* harmony import */ var _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(45712);
-/* harmony import */ var _NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(64465);
+/* harmony import */ var _dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(62358);
+/* harmony import */ var _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(59057);
+/* harmony import */ var _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(931);
+/* harmony import */ var _UndoService__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(19229);
+/* harmony import */ var _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(90161);
+/* harmony import */ var _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(57727);
+/* harmony import */ var _events_Exception__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(8277);
+/* harmony import */ var _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(67945);
+/* harmony import */ var _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(68598);
+/* harmony import */ var _draw_SelectRange__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(53901);
+/* harmony import */ var _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(5010);
+/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(74089);
+/* harmony import */ var _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(91105);
+/* harmony import */ var _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(99152);
+/* harmony import */ var _dom_treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(92501);
+/* harmony import */ var _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(45712);
 /* harmony import */ var _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(24701);
 /* harmony import */ var _dom_NodePosition__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(42921);
 /* harmony import */ var _dom_treeNode_TableFormula__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(90832);
@@ -91739,7 +91769,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
     this._startPath = startPath;
     this._endPath = endPath;
     this._isForceDelete = isForceDelete;
-    this._undo = new _UndoService__WEBPACK_IMPORTED_MODULE_23__/* .UndoService */ .O(this._hoEditorFactoryID); //hoEditorFactory.undoService;
+    this._undo = new _UndoService__WEBPACK_IMPORTED_MODULE_24__/* .UndoService */ .O(this._hoEditorFactoryID); //hoEditorFactory.undoService;
     this._undoNodes = new Map();
     var aDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_20__/* .DomRange */ .a(hoEditorFactoryID, startPath, endPath).normalize();
     var _aDomRange$inSameTabl = aDomRange.inSameTable(),
@@ -91748,7 +91778,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
       aTable = _aDomRange$inSameTabl2[1];
     this._bSameTable = bSametable;
     this._opTime = new Date();
-    this._affectText = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_31__/* .HOEditorFactorys */ .b.instance().getFactory(hoEditorFactoryID).vueController.getRangeText(aDomRange);
+    this._affectText = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys */ .b.instance().getFactory(hoEditorFactoryID).vueController.getRangeText(aDomRange);
   }
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(NodesDeleteUndoUnit, [{
     key: "undo",
@@ -91767,10 +91797,10 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
               arr = Array.from(this._undoNodes).reverse();
               i = 0;
               prevIsTable = false;
-              hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_31__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+              hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
               while (i < arr.length) {
                 value = arr[i];
-                if (value[1] instanceof _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_28__/* .CellNode */ .D) {
+                if (value[1] instanceof _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_29__/* .CellNode */ .D) {
                   // (value[1] as CellNode).redrawCell(true, DocAction.daInsert);
                 } else {
                   if (prevIsTable) {
@@ -91778,12 +91808,12 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                   } else {
                     hoEditorFactory.docTree.insertNodeAfterPath(value[0], value[1]);
                   }
-                  if (value[1] instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_30__/* .TableNode */ .Fh) {
+                  if (value[1] instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_31__/* .TableNode */ .Fh) {
                     prevIsTable = true;
                     // value[1].clearDrawNodes();
                     // value[1].drawTable.drawPageTables.length = 0;
                     np = hoEditorFactory.docTree.findNodePositionByPath(value[0]);
-                    if (np && np.node && np.node instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_27__/* .ParagraphNode */ .C) value[1].drawTable.paragraphNode = np.node;
+                    if (np && np.node && np.node instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_28__/* .ParagraphNode */ .C) value[1].drawTable.paragraphNode = np.node;
                   } else {
                     prevIsTable = false;
                   }
@@ -91822,7 +91852,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
               //选中范围变化事件
               newRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_20__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
               hoEditorFactory.docTree.curDomRange = newRange;
-              cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_22__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, newRange);
+              cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_23__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, newRange);
               hoEditorFactory.docTree.selectChange(cgEvent);
               //光标定位
               hoEditorFactory.drawTree.moveCaretToPath(newRange.endPath);
@@ -91849,7 +91879,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
   }, {
     key: "MoveCaret",
     value: function MoveCaret(path) {
-      _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_31__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.moveCaretToPath(path);
+      _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.moveCaretToPath(path);
     }
     /**
      * @description 返回前面一个node的开始结束选中范围  文本节点时候返回文本中单个文字的选中范围
@@ -91859,20 +91889,20 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
     key: "getPrevNodeDomRange",
     value: function getPrevNodeDomRange(Anode) {
       var spath;
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_31__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
       var prev = Anode.prevSibling();
       if (!prev) {
-        throw _events_Exception__WEBPACK_IMPORTED_MODULE_26__/* .Exception */ .P.NodeNotFound();
+        throw _events_Exception__WEBPACK_IMPORTED_MODULE_27__/* .Exception */ .P.NodeNotFound();
       }
       var epath = hoEditorFactory.docTree.getNodeLastPath(prev);
       if (prev instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_18__/* .TextNode */ .R) {
         spath = prev.prevPath(epath);
-      } else if (prev instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_27__/* .ParagraphNode */ .C) {
+      } else if (prev instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_28__/* .ParagraphNode */ .C) {
         spath = epath;
       } else {
         var prev1 = prev.previousLeaf();
         if (!prev1) {
-          throw _events_Exception__WEBPACK_IMPORTED_MODULE_26__/* .Exception */ .P.NodeNotFound();
+          throw _events_Exception__WEBPACK_IMPORTED_MODULE_27__/* .Exception */ .P.NodeNotFound();
         }
         spath = hoEditorFactory.docTree.getNodeLastPath(prev1);
       }
@@ -91895,14 +91925,14 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
         return 0;
       }
       var newDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_20__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.end);
-      if (!newDomRange.npStart.node) throw _events_Exception__WEBPACK_IMPORTED_MODULE_26__/* .Exception */ .P.NodeNotFound();
-      if (!newDomRange.npEnd.node) throw _events_Exception__WEBPACK_IMPORTED_MODULE_26__/* .Exception */ .P.NodeNotFound();
+      if (!newDomRange.npStart.node) throw _events_Exception__WEBPACK_IMPORTED_MODULE_27__/* .Exception */ .P.NodeNotFound();
+      if (!newDomRange.npEnd.node) throw _events_Exception__WEBPACK_IMPORTED_MODULE_27__/* .Exception */ .P.NodeNotFound();
       var aStart = newDomRange.npStart.node;
       if (currRange.startMainNode) {
         aStart = currRange.startMainNode;
       }
       var nodes = _dom_DomRange__WEBPACK_IMPORTED_MODULE_20__/* .DomRange */ .a.getSelectDomNodesForDelete(this._hoEditorFactoryID, this._tmp.start, this._tmp.end);
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_31__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
       // this.DeleteBaseCombineNodeContent(
       //   newDomRange,
       //   newDomRange.npEnd.node,
@@ -92030,15 +92060,15 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
        *
        * @param Anode
        */
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_31__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
       var forMarkNode = function forMarkNode(Anode) {
-        if (Anode.parentNode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__/* .TextInputFieldNode */ .re) {
+        if (Anode.parentNode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__/* .TextInputFieldNode */ .re) {
           var pTINode = Anode.parentNode;
           if (pTINode.isEmpty() || !pTINode.canModifyContent) {
             //为空  或者   不允许编辑
             var tmp = pTINode.previousLeaf();
             if (!tmp) {
-              throw _events_Exception__WEBPACK_IMPORTED_MODULE_26__/* .Exception */ .P.NodeNotFound();
+              throw _events_Exception__WEBPACK_IMPORTED_MODULE_27__/* .Exception */ .P.NodeNotFound();
             }
             info[0] = 0;
             info[1] = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_20__/* .DomRange */ .a(_this._hoEditorFactoryID, hoEditorFactory.docTree.getNodeLastPath(tmp), hoEditorFactory.docTree.getNodeLastPath(pTINode));
@@ -92064,20 +92094,20 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
         }
       };
       if (!(s && e)) {
-        throw _events_Exception__WEBPACK_IMPORTED_MODULE_26__/* .Exception */ .P.NodeNotFound();
+        throw _events_Exception__WEBPACK_IMPORTED_MODULE_27__/* .Exception */ .P.NodeNotFound();
       }
       this._tmp.start = Arange.startPath;
       this._tmp.end = Arange.endPath;
       var spnode = s.parentNode;
       var epnode = e.parentNode;
       var pnode = epnode;
-      if (spnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__/* .TextInputFieldNode */ .re && epnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__/* .TextInputFieldNode */ .re && spnode != epnode) {
+      if (spnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__/* .TextInputFieldNode */ .re && epnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__/* .TextInputFieldNode */ .re && spnode != epnode) {
         var result = _dom_NodePosition__WEBPACK_IMPORTED_MODULE_38__/* .NodePosition */ .F.nodePositionCompare(spnode.StartMarkNode, epnode.StartMarkNode);
         if (result < 0) {
           pnode = spnode;
         }
       }
-      if (this._isForceDelete && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__/* .TextInputFieldNode */ .re && pnode.inputFieldType === 1 && (_pnode$downListProper = pnode.downListProperty.listItems) !== null && _pnode$downListProper !== void 0 && _pnode$downListProper.includes("<元素>")) {
+      if (this._isForceDelete && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__/* .TextInputFieldNode */ .re && pnode.inputFieldType === 1 && (_pnode$downListProper = pnode.downListProperty.listItems) !== null && _pnode$downListProper !== void 0 && _pnode$downListProper.includes("<元素>")) {
         this._tmp.start = pnode.StartMarkNode.getNodePath();
         this._tmp.end = hoEditorFactory.docTree.getNodeLastPath(pnode.EndMarkNode.previousLeaf());
         return true;
@@ -92085,12 +92115,12 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
       if (s === e) {
         if (s instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_18__/* .TextNode */ .R) {
           // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange = Arange;
-          var tmp = new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_21__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.startPath, s, Arange);
+          var tmp = new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_22__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.startPath, s, Arange);
           this._undo.begin();
           this._undo.add(tmp);
           this._undo.commit();
           this._tmp.end = hoEditorFactory.docTree.getNodeLastPath(tmp.theNode);
-        } else if (s instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_25__/* .MarkNode */ .j) {
+        } else if (s instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNode */ .j) {
           forMarkNode(s);
           if (info[0] == 0 && info[1]) {
             this._tmp.start = info[1].startPath;
@@ -92106,17 +92136,17 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
       } else {
         var _tmp3 = null;
         if (e instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_18__/* .TextNode */ .R && Arange.npEnd.childIndex >= 0 && Arange.npEnd.childIndex < e.getLength() - 1) {
-          _tmp3 = new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_21__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.endPath, e, Arange);
+          _tmp3 = new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_22__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.endPath, e, Arange);
           this._undo.begin();
           this._undo.add(_tmp3);
           this._undo.commit();
         }
         if (s instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_18__/* .TextNode */ .R && Arange.npStart.childIndex >= 0 && Arange.npStart.childIndex < s.getLength() - 1) {
           this._undo.begin();
-          this._undo.add(new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_21__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.startPath, s, Arange));
+          this._undo.add(new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_22__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.startPath, s, Arange));
           this._undo.commit();
         }
-        if (e instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_25__/* .MarkNode */ .j) {
+        if (e instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNode */ .j) {
           forMarkNode(e);
           if (info[0] == 0 && info[1]) {
             this._tmp.end = info[1].endPath;
@@ -92137,17 +92167,21 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
   }, {
     key: "ParentRepaint",
     value: function ParentRepaint(Anode) {
-      if (Anode && Anode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__/* .TextInputFieldNode */ .re) {
-        var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_31__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+      if (Anode && Anode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__/* .TextInputFieldNode */ .re) {
+        //const hoEditorFactory = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
         if (Anode.childNodes.length === 2) {
-          var contentMarkNode = Anode.childNodes2[1];
-          contentMarkNode.styleIndex = Anode.childNodes[0].styleIndex;
-          var insertPath = hoEditorFactory.docTree.getNodeLastPath(Anode.childNodes[0]);
-          hoEditorFactory.undoService.begin();
-          hoEditorFactory.undoService.add(new _NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_36__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, insertPath, contentMarkNode));
-          hoEditorFactory.undoService.commit();
+          var contentMark = Anode.childNodes2[1];
+          var styleIndex = Anode.childNodes[0].styleIndex;
+          var contentMarkNode = new _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNode */ .j(this._hoEditorFactoryID, Anode.childNodes[0].rootNodes, Anode, _dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_21__/* .NodeType */ .Jq.ntMark, contentMark.text, styleIndex, _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNodeType */ .q.mtContent);
+          //const insertPath = hoEditorFactory.docTree.getNodeLastPath(Anode.childNodes[0]);
+          // hoEditorFactory.undoService.begin();
+          // hoEditorFactory.undoService.add(
+          //   new NodeInsertUndoUnit(this._hoEditorFactoryID, insertPath, contentMarkNode)
+          // );
+          // hoEditorFactory.undoService.commit();
+          Anode.childNodes.splice(1, 0, contentMarkNode);
         }
-        Anode.update();
+        Anode.update(0);
       }
     }
   }, {
@@ -92167,7 +92201,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
             case 0:
               this.initParam();
               currRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_20__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
-              hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_31__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+              hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
               hoEditorFactory.docTree.curDomRange = currRange;
               if (!(hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_41__/* .PaintState */ .Dh.psReview)) {
                 _context2.next = 11;
@@ -92201,7 +92235,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 break;
               }
               lastNode = nodes[nodes.length - 1];
-              if (!(lastNode instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_25__/* .MarkNode */ .j && lastNode.MarkNodeType === 0)) {
+              if (!(lastNode instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNode */ .j && lastNode.MarkNodeType === 0)) {
                 _context2.next = 22;
                 break;
               }
@@ -92215,18 +92249,18 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
               hoEditorFactory.docTree.curDomRange.endPath = ePath;
               nodes.splice(nodes.length - 1, 1);
             case 22:
-              if (!(nodes.length === 1 && nodes[0] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_25__/* .MarkNode */ .j && nodes[0].MarkNodeType === 2)) {
+              if (!(nodes.length === 1 && nodes[0] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNode */ .j && nodes[0].MarkNodeType === 2)) {
                 _context2.next = 24;
                 break;
               }
               return _context2.abrupt("return");
             case 24:
-              if (nodes.length === 2 && nodes[0] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_25__/* .MarkNode */ .j && nodes[0].MarkNodeType === 0) {
+              if (nodes.length === 2 && nodes[0] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNode */ .j && nodes[0].MarkNodeType === 0) {
                 sPath = nodes[0].getNodePath();
                 hoEditorFactory.docTree.curDomRange.startPath = sPath;
                 nodes.splice(0, 1);
               }
-              if (!(nodes.length === 2 && nodes[1] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_25__/* .MarkNode */ .j && nodes[1].MarkNodeType === 2 && !nodes[1].parentNode.canModifyContent)) {
+              if (!(nodes.length === 2 && nodes[1] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNode */ .j && nodes[1].MarkNodeType === 2 && !nodes[1].parentNode.canModifyContent)) {
                 _context2.next = 30;
                 break;
               }
@@ -92246,7 +92280,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
               //   this._isError = true;
               //   return;
               // }
-              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)) {
+              if (!(node instanceof _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_33__/* .ControlNode */ .w && !(node instanceof _dom_treeNode_RareCharNode__WEBPACK_IMPORTED_MODULE_40__/* .RareCharNode */ .Q) || node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__/* .TextInputFieldNode */ .re)) {
                 _context2.next = 44;
                 break;
               }
@@ -92255,16 +92289,16 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 break;
               }
               tip = "";
-              if (node instanceof _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_33__/* .RadioAndCheckBoxNode */ .Yh && node.controlStyle === "RadioBox") {
+              if (node instanceof _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_34__/* .RadioAndCheckBoxNode */ .Yh && node.controlStyle === "RadioBox") {
                 tip = "单选框";
               }
-              if (node instanceof _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_33__/* .RadioAndCheckBoxNode */ .Yh && node.controlStyle === "CheckBox") {
+              if (node instanceof _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_34__/* .RadioAndCheckBoxNode */ .Yh && node.controlStyle === "CheckBox") {
                 tip = "复选框";
               }
-              if (node instanceof _dom_treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_34__/* .DateTimeNode */ .Z) {
+              if (node instanceof _dom_treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_35__/* .DateTimeNode */ .Z) {
                 tip = "日期时间";
               }
-              if (node instanceof _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_35__/* .DownListNode */ .yF) {
+              if (node instanceof _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_36__/* .DownListNode */ .yF) {
                 tip = "下拉列表";
               }
               ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.destroy();
@@ -92272,7 +92306,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
               this._isError = true;
               return _context2.abrupt("return");
             case 44:
-              if (!(node instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_25__/* .MarkNode */ .j && node.MarkNodeType === 0)) {
+              if (!(node instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNode */ .j && node.MarkNodeType === 0)) {
                 _context2.next = 49;
                 break;
               }
@@ -92290,7 +92324,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
               this._isError = true;
               return _context2.abrupt("return");
             case 54:
-              if (!(node instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_30__/* .TableNode */ .Fh)) {
+              if (!(node instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_31__/* .TableNode */ .Fh)) {
                 _context2.next = 59;
                 break;
               }
@@ -92312,12 +92346,12 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
               _context2.next = 31;
               break;
             case 67:
-              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) {
+              if (nodes.length === 1 && nodes[0] instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__/* .TextInputFieldNode */ .re && !nodes[0].isAllowDelete && nodes[0].childNodes[1] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNode */ .j) {
                 hoEditorFactory.docTree.curDomRange.setSamePath(this._endPath);
               }
             case 68:
               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))) {
+              if (!(pnode && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__/* .TextInputFieldNode */ .re && currRange.npEnd.path != hoEditorFactory.docTree.getNodeLastPath(pnode))) {
                 _context2.next = 74;
                 break;
               }
@@ -92341,7 +92375,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 _context2.next = 77;
                 break;
               }
-              throw _events_Exception__WEBPACK_IMPORTED_MODULE_26__/* .Exception */ .P.NodeNotFound();
+              throw _events_Exception__WEBPACK_IMPORTED_MODULE_27__/* .Exception */ .P.NodeNotFound();
             case 77:
               // const [startPath, endPath] = DomRange.skipStartEndTablePath(
               //   this._hoEditorFactory,
@@ -92351,7 +92385,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
               startPath = currRange.startPath;
               endPath = currRange.endPath;
               changeEvent.oldEndPath = endPath;
-              changeEvent.oldDrawTreeLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_29__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawTreeLines(startPath, endPath);
+              changeEvent.oldDrawTreeLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_30__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawTreeLines(startPath, endPath);
               res = this.deleteRange(currRange.endPath, currRange.startPath);
               if (!(res == 1)) {
                 _context2.next = 89;
@@ -92362,7 +92396,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
               _context2.next = 87;
               return hoEditorFactory.docTree.change(changeEvent);
             case 87:
-              cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_22__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, new _dom_DomRange__WEBPACK_IMPORTED_MODULE_20__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.start));
+              cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_23__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, new _dom_DomRange__WEBPACK_IMPORTED_MODULE_20__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.start));
               hoEditorFactory.docTree.selectChange(cgEvent);
             case 89:
               hoEditorFactory.docTree.curDomRange.setSamePath(this._tmp.start);
@@ -96357,6 +96391,11 @@ var UnitConvert = /*#__PURE__*/function () {
     value: function fontPt2Pix(value) {
       return Math.round(this.dpiX / 72 * value);
     }
+  }, {
+    key: "pxToPt",
+    value: function pxToPt(value) {
+      return Math.round(value * 72 / this.dpiX);
+    }
   }, {
     key: "replaceAll",
     value: function replaceAll(str, s1, s2) {
@@ -219729,7 +219768,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.62');
+/* harmony default export */ var version = ('3.1.64');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -226778,8 +226817,6 @@ var es_array_flat = __webpack_require__(84944);
 var es_array_unscopables_flat = __webpack_require__(33792);
 // EXTERNAL MODULE: ./src/editor/events/NodeChangingEvent.ts
 var NodeChangingEvent = __webpack_require__(10574);
-// EXTERNAL MODULE: ./src/plugins/pretty-data.js
-var pretty_data = __webpack_require__(49049);
 // EXTERNAL MODULE: ./src/editor/draw/SelectRange.ts
 var SelectRange = __webpack_require__(53901);
 // EXTERNAL MODULE: ./src/plugins/type.ts
@@ -226808,8 +226845,8 @@ var commonParamList = new Map();
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.from.js
 var es_array_from = __webpack_require__(91038);
-;// 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/common/history/index.vue?vue&type=template&id=2ca49858&
-var historyvue_type_template_id_2ca49858_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/common/history/index.vue?vue&type=template&id=6ee36d74&
+var historyvue_type_template_id_6ee36d74_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -226839,7 +226876,7 @@ var historyvue_type_template_id_2ca49858_render = function render() {
     slot: "title"
   }, [_vm._v(" 修改后：" + _vm._s(_vm.afterContent) + " ")]), _vm._v(" 修改后：" + _vm._s(_vm.afterContent) + " ")], 2) : [_vm._v(" 修改后：" + _vm._s(_vm.afterContent) + " ")]], 2)])]);
 };
-var historyvue_type_template_id_2ca49858_staticRenderFns = [];
+var historyvue_type_template_id_6ee36d74_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/common/history/index.vue?vue&type=script&lang=js&
 
@@ -226886,7 +226923,7 @@ var historyvue_type_template_id_2ca49858_staticRenderFns = [];
       var hoCommentItemList = Array.from(document.querySelectorAll('.ho-comment-item'));
       hoCommentItemList.forEach(function (element) {
         if (element.id === _this.id) {
-          _this.selected = true;
+          // this.selected = true;
           element.style.border = '1px dashed #F00';
         } else {
           element.style.border = '1px dashed #aaa';
@@ -226930,10 +226967,10 @@ var historyvue_type_template_id_2ca49858_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./src/components/common/history/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var common_historyvue_type_script_lang_js_ = (historyvue_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/common/history/index.vue?vue&type=style&index=0&id=2ca49858&prod&lang=less&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/common/history/index.vue?vue&type=style&index=0&id=6ee36d74&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/common/history/index.vue?vue&type=style&index=0&id=2ca49858&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/common/history/index.vue?vue&type=style&index=0&id=6ee36d74&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/common/history/index.vue
 
@@ -226946,8 +226983,8 @@ var historyvue_type_template_id_2ca49858_staticRenderFns = [];
 
 var history_component = (0,componentNormalizer/* default */.Z)(
   common_historyvue_type_script_lang_js_,
-  historyvue_type_template_id_2ca49858_render,
-  historyvue_type_template_id_2ca49858_staticRenderFns,
+  historyvue_type_template_id_6ee36d74_render,
+  historyvue_type_template_id_6ee36d74_staticRenderFns,
   false,
   null,
   null,
@@ -227065,7 +227102,7 @@ var hoCreateHistory = {
 
 
 
-
+// import pd from '@/plugins/pretty-data';
 
 
 
@@ -228803,11 +228840,11 @@ var VueController = /*#__PURE__*/function () {
         }
 
         if (type === 'json') {
+          var pd = __webpack_require__(49049);
           ret = hoEditorFactory.structureConvert.doc2Xml('json', true, true);
-
           // ret = JSON.stringify(ret);
 
-          ret = pretty_data.pd.json(ret);
+          ret = pd.pd.json(ret);
         }
         return ret;
       }
@@ -228950,7 +228987,6 @@ var VueController = /*#__PURE__*/function () {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       var data = hoEditorFactory.testDataSet.getTestJsonData();
       var retJson = hoEditorFactory.structureConvert.getRowsJsonData(data);
-      //retJson = pd.json(retJson);
       return retJson;
     }
     // /**
@@ -232611,6 +232647,60 @@ var VueController = /*#__PURE__*/function () {
       var caret = hoEditorFactory.drawTree.caret;
       return [caret.pageIndex + 1, caret.stageX * 0.75, caret.stageY * 0.75 + 40];
     }
+    /**
+     * @param type bottom:页左下角坐标点(0,0) top:页左上角坐标点(0,0)
+     */
+  }, {
+    key: "getPosition3",
+    value: function getPosition3(type) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      var curDomRange = hoEditorFactory.docTree.curDomRange.normalize();
+      var node = curDomRange.npEnd.node;
+      var caret = hoEditorFactory.drawTree.caret;
+      var y = hoEditorFactory.pageProperty.heightPixes - caret.stageY;
+      // if(type == 'top') {
+      //     y = caret.stageY
+      // }
+      var result = {
+        page: caret.pageIndex + 1,
+        pxX: caret.stageX,
+        pxY: y,
+        mmX: hoEditorFactory.unitConvert.pxConversionMm(caret.stageX, true),
+        mmY: hoEditorFactory.unitConvert.pxConversionMm(y, true),
+        ptX: hoEditorFactory.unitConvert.pxToPt(caret.stageX),
+        ptY: hoEditorFactory.unitConvert.pxToPt(y),
+        ptTop: 0,
+        ptRight: 0,
+        ptBottom: 0,
+        ptLeft: 0
+      };
+      if (node instanceof SignNode/* SignNode */.N && node !== null && node !== void 0 && node.drawNodes[0]) {
+        var drawNode = node === null || node === void 0 ? void 0 : node.drawNodes[0];
+        result = (0,objectSpread2/* default */.Z)((0,objectSpread2/* default */.Z)({}, result), {}, {
+          ptRight: hoEditorFactory.unitConvert.pxToPt(caret.stageX + drawNode.dWidth),
+          ptLeft: result.ptX
+        });
+        if (node.number == 0) {
+          // if(type == 'top') {
+          //     result.ptTop = result.ptY;
+          //     result.ptBottom = hoEditorFactory.unitConvert.pxToPt(y + drawNode.dHeight);
+          // } else {
+          result.ptTop = result.ptY;
+          result.ptBottom = hoEditorFactory.unitConvert.pxToPt(y - drawNode.dHeight);
+          // }
+        } else {
+          // if(type == 'top') {
+          //     result.ptTop = hoEditorFactory.unitConvert.pxToPt(y + drawNode.dHeight);
+          //     result.ptBottom = hoEditorFactory.unitConvert.pxToPt(y + drawNode.dHeight * 2);
+          // } else {
+          result.ptTop = hoEditorFactory.unitConvert.pxToPt(y - drawNode.dHeight);
+          result.ptBottom = hoEditorFactory.unitConvert.pxToPt(y - drawNode.dHeight * 2);
+          // }
+        }
+      }
+
+      return result;
+    }
     /**
      * 获取光标位置
      * returns [pageIndex, x, y]
@@ -233281,6 +233371,17 @@ var VueController = /*#__PURE__*/function () {
       }
       return text ? text : '';
     }
+    /**
+     * 查询光标所在位置之前的文本内容
+     */
+  }, {
+    key: "getCaretTextNode",
+    value: function getCaretTextNode() {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      var curDomRange = hoEditorFactory.docTree.curDomRange.normalize();
+      var node = curDomRange.npEnd.node;
+      return node !== null && node !== void 0 && node.name ? node.name : '';
+    }
     /**
      * 初始化文档
      */
@@ -243306,8 +243407,8 @@ var HoDocs_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ var HoDocs = (HoDocs_component.exports);
-;// 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/toolbar/ToolBar.vue?vue&type=template&id=26f26696&
-var ToolBarvue_type_template_id_26f26696_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=template&id=1bf8a068&
+var ToolBarvue_type_template_id_1bf8a068_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -243540,7 +243641,7 @@ var ToolBarvue_type_template_id_26f26696_render = function render() {
     }, [_vm._v(_vm._s(item.title))]);
   }), 1)], 1) : _vm._e()], 1);
 };
-var ToolBarvue_type_template_id_26f26696_staticRenderFns = [];
+var ToolBarvue_type_template_id_1bf8a068_staticRenderFns = [];
 
 ;// 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/toolbar/insert/HoMedicalExpression.vue?vue&type=template&id=4699ffee&
 var HoMedicalExpressionvue_type_template_id_4699ffee_render = function render() {
@@ -248769,13 +248870,15 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
      * 下载文件
      */
     downloadFile: function downloadFile(file, fileName, fileType) {
+      var type = fileType === "plain" ? ".txt" : ".json";
+      var name = fileName + type;
       var url = window.URL.createObjectURL(new Blob([file], {
         type: "text/".concat(fileType)
       }));
       var link = document.createElement('a');
       link.style.display = 'none';
       link.href = url;
-      link.setAttribute('download', fileName);
+      link.setAttribute('download', name);
       document.body.appendChild(link);
       link.click();
       this.$nextTick(function () {
@@ -248786,10 +248889,10 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
 });
 ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=script&lang=js&
  /* harmony default export */ var toolbar_ToolBarvue_type_script_lang_js_ = (ToolBarvue_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/toolbar/ToolBar.vue?vue&type=style&index=0&id=26f26696&prod&lang=less&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=1bf8a068&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=26f26696&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=1bf8a068&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue
 
@@ -248802,8 +248905,8 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
 
 var ToolBar_component = (0,componentNormalizer/* default */.Z)(
   toolbar_ToolBarvue_type_script_lang_js_,
-  ToolBarvue_type_template_id_26f26696_render,
-  ToolBarvue_type_template_id_26f26696_staticRenderFns,
+  ToolBarvue_type_template_id_1bf8a068_render,
+  ToolBarvue_type_template_id_1bf8a068_staticRenderFns,
   false,
   null,
   null,