hoeditor-web 3.1.166 → 3.1.167

package/lib/hoeditor.umd.js

@@ -7847,7 +7847,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 98064:
+/***/ 33693:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -7859,7 +7859,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ FindReplace; }
 });
 
-;// 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/controls/findReplace/FindReplace.vue?vue&type=template&id=4253b228&
+;// 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/controls/findReplace/FindReplace.vue?vue&type=template&id=3e1097a1&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -7893,6 +7893,7 @@ var render = function render() {
       "color": "#000"
     }
   }, [_vm._v("查找内容")]), _c('a-input', {
+    ref: "findInput",
     attrs: {
       "type": "text"
     },
@@ -8047,7 +8048,13 @@ var HOEditorFactorys = __webpack_require__(74089);
     };
   },
   mounted: function mounted() {
+    var _this = this;
     this.findModal = this.$refs.findModal;
+    this.$nextTick(function () {
+      if (_this.$refs.findInput) {
+        _this.$refs.findInput.focus();
+      }
+    });
   },
   methods: {
     switchTypes: function switchTypes(val) {
@@ -8067,7 +8074,8 @@ var HOEditorFactorys = __webpack_require__(74089);
     },
     toReplace: function toReplace() {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorFactoryId);
-      if (this.path === '' || this.path === '-1') {
+      // this.path = hoEditorFactory.vueController.find(this.findContent, this.direction, this.matchCase);
+      if (!this.path || this.path === '-1') {
         if (this.callbackCount <= 2) {
           this.callbackCount++;
           this.toFind(this.toReplace);
@@ -8087,11 +8095,11 @@ var HOEditorFactorys = __webpack_require__(74089);
       this.path = '';
     },
     handleClose: function handleClose() {
-      var _this = this;
+      var _this2 = this;
       this.animationClassNames = 'control-modal-contents find-modal animation-out';
       window.clearTimeout();
       setTimeout(function () {
-        _this.hoEditorProvider.setControlFindType('');
+        _this2.hoEditorProvider.setControlFindType('');
       }, 100);
     },
     toolModalDown: function toolModalDown(e) {
@@ -8101,10 +8109,10 @@ var HOEditorFactorys = __webpack_require__(74089);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/findReplace/FindReplace.vue?vue&type=script&lang=js&
  /* harmony default export */ var findReplace_FindReplacevue_type_script_lang_js_ = (FindReplacevue_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/controls/findReplace/FindReplace.vue?vue&type=style&index=0&id=4253b228&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/controls/findReplace/FindReplace.vue?vue&type=style&index=0&id=3e1097a1&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/findReplace/FindReplace.vue?vue&type=style&index=0&id=4253b228&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/findReplace/FindReplace.vue?vue&type=style&index=0&id=3e1097a1&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -33281,16 +33289,7 @@ var Caret = /*#__PURE__*/function () {
       return this._visible;
     },
     set: function set(val) {
-      // if (val !== this._visible) {
       this.div_cursor.style.visibility = val ? 'visible' : 'hidden';
-      // 	this._visible = val;
-      // 	if (this.cursor) {
-      // 		this.cursor.visible = this.visible;
-      // 		if (this.cursor.stage) {
-      // 			this.cursor.stage.update();
-      // 		}
-      // 	}
-      // }
     }
   }, {
     key: "cursor",
@@ -37412,23 +37411,7 @@ var SubDocManger = /*#__PURE__*/function () {
           _dPage.reFreshBounds();
           hoEditorFactory.drawPageTree.updateDrawPage(_dPage.pageIndex);
         }
-        // e.newActiveArea.drawLines.length = 0;
-        // e.newActiveArea.removeAllChildren();
-        // e.newActiveArea.stage.update();
-        // const [dRoots, path] = hoEditorFactory.drawTree.getFooterDNodes(
-        //   e.newPageIndex
-        // );
-        // if (dRoots)
-        // hoEditorFactory.redrawManger.addRedrawRange(
-        //   null,
-        //   0,
-        //   dRoots,
-        //   0,
-        //   dRoots.length - 1,
-        //   path
-        // );
       }
-
       return true;
     }
   }, {
@@ -37442,14 +37425,6 @@ var SubDocManger = /*#__PURE__*/function () {
         return HeaderFooterType.hftUnkown;
       }
     }
-    // public updateAllPageMark(pageIndex: number, type: HeaderFooterType) {
-    //   const [index, roots] = this.getSubDocIndex(pageIndex, type);
-    //   const path = hoEditorFactory.docTree.getRootPathByNodes(roots);
-    //   const arr = hoEditorFactory.drawTree.getSubDocPageMarkNodes(path);
-    //   for (let i = 0; i < arr.length; i++) {
-    //     this.updateAPageMark(arr[i]);
-    //   }
-    // }
     // /**
     //  * @author xyl
     //  * @param markNode
@@ -37459,36 +37434,6 @@ var SubDocManger = /*#__PURE__*/function () {
     key: "updateAPageMark",
     value: function updateAPageMark(markNode) {
       markNode.drawNodes[0].updatePaint();
-      // const strPath = markNode.getNodePath();
-      // const rootArea = hoEditorFactory.drawTree.getParentDrawArea(
-      //   markNode.drawNodes[0]
-      // );
-      // const dArea = hoEditorFactory.drawPageTree.getMainRootArea(
-      //   markNode.drawNodes[0]
-      // );
-      // const type = this.getHeaderFooterType(strPath);
-      // if (dArea) {
-      //   const [start, end] = this.getAllSameSubDocRange(dArea.index, type, false);
-      //   for (let i = start; i <= end; i++) {
-      //     const aPage = hoEditorFactory.drawTree.drawPages[i];
-      //     const subDoc = this.getSubDocDrawArea(i, type);
-      //     if (subDoc) {
-      //       (subDoc as DrawPageHeaderFooter).removePageMarkDrawNode(markNode);
-      //       const dPageMarkNode = DrawPageMarkNode.paintMarkNode(
-      //         this._hoEditorFactory,
-      //         markNode,
-      //         aPage,
-      //         subDoc
-      //       );
-      //       (subDoc as DrawPageHeaderFooter).drawPageMarks.push(dPageMarkNode);
-      //       aPage.drawDomLevel?.stage.addChild(dPageMarkNode);
-      //       if (aPage.drawDomLevel)
-      //         hoEditorFactory.drawPageTree.updateStage(
-      //           aPage.drawDomLevel.stage
-      //         );
-      //     }
-      //   }
-      // }
     }
   }, {
     key: "clearPageMarkNode",
@@ -37503,23 +37448,11 @@ var SubDocManger = /*#__PURE__*/function () {
   }, {
     key: "repaintPageMarkNodes",
     value: function repaintPageMarkNodes(dArea, type) {
-      // const [index,rootNodes]= this.getSubDocIndex(dArea.index,type);
       var strPath = dArea.rootPath;
       var arrNodes = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_16__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.getSubDocPageMarkNodes(strPath);
       for (var i = arrNodes.length - 1; i >= 0; i--) {
         var aNode = arrNodes[i];
         aNode.drawNodes[0].repaintPageMarkNodes(dArea, type);
-        // (dArea as DrawPageHeaderFooter).removePageMarkDrawNode(aNode);
-        // const dPageMarkNode = DrawPageMarkNode.paintMarkNode(
-        //   this._hoEditorFactory,
-        //   aNode,
-        //   HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.drawPages[dArea.index],
-        //   dArea
-        // );
-        // (dArea as DrawPageHeaderFooter).drawPageMarks.push(dPageMarkNode);
-        // if (dArea.stage) {
-        //   dArea.stage.addChild(dPageMarkNode);
-        // }
       }
     }
   }]);
@@ -40167,21 +40100,6 @@ var DocController = /*#__PURE__*/function () {
           hoEditorFactory.undoService.begin();
           hoEditorFactory.undoService.add(new _undoRedo_TableUndos_TableMergeCellUndoUnit__WEBPACK_IMPORTED_MODULE_73__/* .TableMergeCellUndoUnit */ .A(this._hoEditorFactoryID, cell1.table, r1, c1, aRowSpan, aColSpan));
           hoEditorFactory.undoService.commit();
-          // cell1.table.mergeCells(r1, c1, rowSpan, colSpan);
-          // const endPath = (cell1 as CellNode).table.getNodePath();
-          // const [dcell, dRoots] = hoEditorFactory.drawTree.getDrawRootsByPath(
-          //   endPath
-          // );
-          // const startDline = dRoots.indexOf((cell1 as CellNode).table.drawTable);
-          // if (startDline >= 0) {
-          //   hoEditorFactory.redrawManger.addRedrawRange(
-          //     null,
-          //     dRoots,
-          //     startDline,
-          //     dRoots.length - 1,
-          //     endPath
-          //   );
-          // }
         }
       }
     }
@@ -40630,8 +40548,8 @@ var DocController = /*#__PURE__*/function () {
           }
           this._count = 0;
           var getArr2 = hoEditorFactory.docTree.singleReplace(path, findContent, replaceContent);
-          var endPath2 = getArr2[0];
-          var newTextNode2 = getArr2[1];
+          var endPath2 = getArr2[1];
+          var newTextNode2 = getArr2[2];
           if (getArr2[3]) {
             hoEditorFactory.undoService.begin();
             hoEditorFactory.undoService.add(new _undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_43__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, path, endPath2));
@@ -41244,7 +41162,6 @@ var DocController = /*#__PURE__*/function () {
             }
           }
         }
-        //mainArea.stage.update();
         hoEditorFactory.drawPageTree.updateDrawPage(mainArea.index);
       } else {
         return;
@@ -43812,15 +43729,12 @@ var DocTree = /*#__PURE__*/function () {
       } else {
         var npEnd = this.findNodePositionByPath(ePath);
         if (npEnd && npEnd.node) {
-          //if (npEnd.node instanceof TextNode) {
           var _preNode = npEnd.node.previousLeaf();
           if (_preNode) {
             endPath = this.getNodeLastPath(_preNode);
           }
-          //}
         }
       }
-      // const parentNode = this.getParentNode(sPath);
       var node = this.getFindPathNode(sPath);
       if (node instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_36__/* .TextInputFieldNode */ .re) {
         var textNode = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_29__/* .TextNode */ .R(this._hoEditorFactoryID, np.roots, node, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_26__/* .NodeType */ .Jq.ntText, replaceContent, styleIndex);
@@ -43833,6 +43747,11 @@ var DocTree = /*#__PURE__*/function () {
       } else if (node instanceof _treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_47__/* .DownListNode */ .yF) {
         var _hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_45__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
         _hoEditorFactory.elementController.updateDownListText(node, replaceContent);
+      } else if (node instanceof _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_28__/* .ParagraphNode */ .C || node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_29__/* .TextNode */ .R) {
+        var _textNode = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_29__/* .TextNode */ .R(this._hoEditorFactoryID, np.roots, null, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_26__/* .NodeType */ .Jq.ntText, replaceContent, styleIndex);
+        retArray[0] = startPath;
+        retArray[1] = endPath;
+        retArray[2] = _textNode;
       }
       return retArray;
     }
@@ -43906,6 +43825,12 @@ var DocTree = /*#__PURE__*/function () {
         _hoEditorFactory2.elementController.updateDownListText(snode, replaceContent);
         // retArray[2] = snode;
         retArray[3] = false;
+      } else if (snode instanceof _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_28__/* .ParagraphNode */ .C) {
+        var _textNode2 = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_29__/* .TextNode */ .R(this._hoEditorFactoryID, np.roots, null, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_26__/* .NodeType */ .Jq.ntText, replaceContent, styleIndex);
+        retArray[0] = startPath;
+        retArray[1] = endPath;
+        retArray[2] = _textNode2;
+        retArray[3] = true;
       }
       return retArray;
     }
@@ -44215,7 +44140,7 @@ var DocTree = /*#__PURE__*/function () {
       if (!(np && np.node)) {
         throw _events_Exception__WEBPACK_IMPORTED_MODULE_42__/* .Exception */ .P.NodeNotFound();
       }
-      if (np.node instanceof _treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_46__/* .DateTimeNode */ .Z || np.node instanceof _treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_47__/* .DownListNode */ .yF) {
+      if (np.node instanceof _treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_46__/* .DateTimeNode */ .Z || np.node instanceof _treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_47__/* .DownListNode */ .yF || np.node instanceof _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_28__/* .ParagraphNode */ .C || np.node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_29__/* .TextNode */ .R) {
         return np.node;
       } else {
         node = np.node.parentNode;
@@ -55118,12 +55043,9 @@ var MarkNode = /*#__PURE__*/function (_BaseNode) {
     set: function set(val) {
       if (this._alpha != val) {
         this._alpha = val;
-        if (this._type == MarkNodeType.mtContent) {
-          // this.node2DrawNode();
-        } else {
+        if (this._type == MarkNodeType.mtContent) {} else {
           if (this.drawNodes[0].parent && this.drawNodes[0].parent.stage) {
             this.drawNodes[0].alpha = this._alpha;
-            // (this.drawNodes[0].parent as DrawLine).updateCache();
             this.drawNodes[0].parent.stage.update();
           }
         }
@@ -56232,28 +56154,11 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
     if (customProperty) {
       _this.setCustomProperty(customProperty);
     }
-    // this.node2DrawNode();
     return _this;
   }
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(ParagraphNode, [{
     key: "setCustomProperty",
     value: function setCustomProperty(customProperty, printAsSinglePage, forceChangeHeader) {
-      // const assignvalue = (target: any, source: any) => {
-      //   Object.keys(source).forEach((value) => {
-      //     if (typeof target[value] == "object") {
-      //       if (Object.prototype.toString.call(source[value]) === "[object Object]") {
-      //         assignvalue(target[value], source[value]);
-      //       } else {
-      //         if (source[value] !== "" && source[value] !== null) {
-      //           assignvalue(target[value], eval("(" + source[value] + ")"));
-      //         }
-      //       }
-      //     } else {
-      //       target[value] = source[value];
-      //     }
-      //   });
-      // };
-      // assignvalue(this._customProperty, customProperty);
       if (customProperty) {
         this._customProperty = customProperty;
       }
@@ -56274,7 +56179,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
       if (val != this._paraNo) {
         this._paraNo = val;
         this.combineParagraph = this.updateCombineParagraph();
-        // this.node2DrawNode();
         this._drawLines.forEach(function (value) {
           value.paragraphNode.combineParagraph.copyStyle(_this2.combineParagraph);
         });
@@ -63149,9 +63053,6 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
           for (var col = c; col < c + aColSpan; col++) {
             victimCell = this._rows[row][col];
             if (victimCell !== vampireCell && victimCell) {
-              // if (vampireCell.childNodes.length > 0) {
-              //   vampireCell.childNodes.concat(victimCell.childNodes);
-              // }
               victimCell.drawCell.removeAllPartCell();
               this._rows[row][col] = undefined;
             }
@@ -63159,16 +63060,6 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         }
         vampireCell.rowSpan = aRowSpan;
         vampireCell.colSpan = aColSpan;
-        // let aWidth = 0;
-        // for (let i = c; i <= c + vampireCell.colSpan - 1; i++) {
-        //   aWidth += this._colInfos[i].colWidth;
-        // }
-        // vampireCell.updateWidth(aWidth);
-        // let aHeight = 0;
-        // for (let i = r; i <= r + vampireCell.rowSpan - 1; i++) {
-        //   aHeight += this._rowInfos[i].rowHeight;
-        // }
-        // vampireCell.updateHeight(aHeight);
         this.countChildNodes();
         vampireCell.drawCell.needUpdate = true;
         return vampireCell;
@@ -71359,21 +71250,6 @@ var DrawResize = /*#__PURE__*/function () {
         changeEvent.oldDrawLines = new _SelectRange__WEBPACK_IMPORTED_MODULE_10__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawLines(path, path, true, true);
         hoEditorFactory.docTree.change(changeEvent);
         hoEditorFactory.docTree.curDomRange.setSamePath(path);
-        //hoEditorFactory.drawTree.moveCaretToPath(path);
-        // const drawArea = hoEditorFactory.drawPageTree.getMainRootArea(this.drawNode);
-        // drawArea.changed = true;
-        // const redrawPositions = hoEditorFactory.drawTree.getDlineDrawRootLists(drawLine);
-        // //const startUpdateLine = hoEditorFactory.drawTree.getDlineRootDrawNode(drawLine as DrawLine);
-        // hoEditorFactory.drawPageTree.update(
-        //     drawArea,
-        //     redrawPositions[0].drawRoots,
-        //     drawLine as DrawLine,
-        //     redrawPositions[0].index,
-        //     redrawPositions[0].drawRoots.length - 1
-        // );
-        // drawArea.stage.update();
-        //if (drawLine instanceof DrawLine) drawLine.updateCache();
-        //this.drawNode.stage.update();
         var dArea = hoEditorFactory.drawPageTree.getMainRootArea(this.drawNode);
         if (dArea) {
           hoEditorFactory.drawPageTree.updateDrawPage(dArea.index);
@@ -72397,7 +72273,7 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
           var startChildIndex = 0;
           var dHeadHeight = dTable.getHeadHeight();
           var dPageTable = dTable.getDrawTableByParentArea(this);
-          if (dHeadHeight + _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_23__/* .gDefaultRowHeight */ .dT > dRestHeight) {
+          if (dHeadHeight + _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_23__/* .gDefaultRowHeight */ .dT > dRestHeight || !dTable.isFirstRowCanFit(dRestHeight)) {
             if (dPageTable) {
               dPageTable.parent.removeChild(dPageTable);
             }
@@ -72577,7 +72453,7 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
         // const pagePos = hoEditorFactory.drawTree.getDrawLinePagePos(dline);
         if (dline instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_18__/* .DrawTable */ .t) {
           var dTable = dline;
-          if (dTable.getHeadHeight() + _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_23__/* .gDefaultRowHeight */ .dT > restHeight) {
+          if (dTable.getHeadHeight() + _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_23__/* .gDefaultRowHeight */ .dT > restHeight || !dTable.isFirstRowCanFit(restHeight)) {
             isFull = true;
             this.clearOverDitem(dlines, nextDline);
             return [isFull, dTop, restHeight];
@@ -73905,7 +73781,6 @@ var DrawCell = /*#__PURE__*/function (_DrawRect) {
     set: function set(val) {
       if (val !== this._dWidth) {
         this._dWidth = val;
-        // ((this as unknown) as DrawInfos).dWidth = val;
       }
     }
   }, {
@@ -73963,98 +73838,6 @@ var DrawCell = /*#__PURE__*/function (_DrawRect) {
         }
       }
     }
-    // public update(
-    //   index: number,
-    //   dParent: DrawPageTable,
-    //   startIndex: number,
-    //   canSkipIndex: number,
-    //   dTop: number,
-    //   dRestHeight: number
-    // ): [DrawArea, number, number, number] {
-    //   if (this._drawPageCells.length <= index) {
-    //     throw new Error("需要先更新当前单元格的前一页绘制");
-    //   }
-    //   const dPageCell = this._drawPageCells[index];
-    //   if (dPageCell) {
-    //     for (let i = startIndex; i < this._drawLines.length; i++) {
-    //       const dobj = this._drawLines[i];
-    //       if (i > canSkipIndex && dobj.y === dTop) {
-    //         break;
-    //       }
-    //       if (dobj instanceof DrawTable) {
-    //         const adrawPageTable = dobj.getDrawTableByParentArea(
-    //           dParent.pageIndex
-    //         );
-    //         if (
-    //           dobj.needUpdate ||
-    //           (adrawPageTable && adrawPageTable.dHeight + dTop > dRestHeight)
-    //         ) {
-    //           dobj.update(pageIndex, dPageCell, dTop, dRestHeight);
-    //         }
-    //         const drawPageTable = dobj.getDrawTableByParentArea(pageIndex);
-    //         if (drawPageTable) {
-    //           if (!dPageCell.contains(drawPageTable)) {
-    //             dPageCell.addChild(drawPageTable);
-    //           }
-    //           drawPageTable.y = dTop;
-    //           dTop +=
-    //             drawPageTable.dHeight +
-    //             drawPageTable.paragraphNode.combineParagraph.lineSpace;
-    //           this._docHeight = dTop;
-    //           this._dHeight = dTop;
-    //         } else {
-    //           //表格无法在此页摆下，放入下一页
-    //         }
-    //       } else {
-    //         if (dTop + dobj.dHeight > dRestHeight) {
-    //           const dTop = dPageCell.getParentHeadHeight();
-    //           const dRestHeight =
-    //             HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawPageTree.getMainDoc(pageIndex + 1)
-    //               .restHeight - dTop;
-    //           const adParent = dParent.getPageTableByIndex(pageIndex);
-    //           this.update(
-    //             pageIndex + 1,
-    //             adParent,
-    //             i,
-    //             canSkipIndex,
-    //             dTop,
-    //             dRestHeight
-    //           );
-    //           return;
-    //         }
-    //         if (!dPageCell.contains(dobj)) {
-    //           dPageCell.addChild(dobj);
-    //         }
-    //         dTop += dobj.dHeight + dobj.paragraphNode.combineParagraph.lineSpace;
-    //         this._docHeight = dTop;
-    //         this._dHeight = dTop;
-    //       }
-    //     }
-    //   }
-    // }
-    // public update() {
-    //   let dHeight = 0;
-    //   for (let i = 0; i < this._drawLines.length; i++) {
-    //     dHeight += this._drawLines[i].dHeight;
-    //   }
-    //   this._dHeight = dHeight;
-    //   const rowIndex = this._cell.table.rows.indexOf(this._cell.row);
-    //   this._cell.table.drawTable.updateRow(rowIndex);
-    // }
-    // public clear() {
-    //   for (const map of this._drawCells) {
-    //     map[1].clear();
-    //   }
-    //   this._drawCells.clear();
-    // }
-    // public clearAfterPageNo(pageNo: number) {
-    //   for (const map of this._drawCells) {
-    //     if (map[0] >= pageNo) {
-    //       map[1].clear();
-    //       this._drawCells.delete(map[0]);
-    //     }
-    //   }
-    // }
   }, {
     key: "getCellRestHeight",
     value: function getCellRestHeight(index) {
@@ -74073,21 +73856,10 @@ var DrawCell = /*#__PURE__*/function (_DrawRect) {
     key: "copyPaintCell",
     value: function copyPaintCell(destParent, r, dTop) {
       var dParent = destParent;
-      // if (!dParent)
-      //   dParent = this._cell.table.drawTable.getDrawTableByParentArea(pageIndex);
       if (dParent) {
-        // const [irow, icol] = dParent.table.getCellRowCol(this._cell);
-        // let dPage: DrawPage | null = null;
-        // if (dParent.stage)
-        //   dPage = this.cell.hoEditorFactory.drawTree.getDrawPageByDomStage(
-        //     dParent.stage
-        //   );
-        // if (dPage && dPage.pageIndex !== pageIndex) {
         var subDocArea = this._cell.drawCell._drawPageCells[0];
         var destArea = this._cell.drawCell.getDrawPageCell(dParent);
         if (subDocArea) {
-          // const dPage = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.drawPages[pageIndex];
-          // if (dPage && dPage.drawDomLevel) {
           var cc = subDocArea.clone(true);
           var destSubDocArea;
           if (destArea) {
@@ -74096,11 +73868,6 @@ var DrawCell = /*#__PURE__*/function (_DrawRect) {
             if (!destParent.contains(destArea)) {
               destParent.addChild(destSubDocArea);
             }
-            // // dPage.drawDomLevel.stage.removeChild(destSubDocArea);
-            // cc.x = subDocArea.x;
-            // cc.y = subDocArea.y;
-            // destSubDocArea.addChild(cc);
-            // this.updateAllDlineStage(destSubDocArea, destSubDocArea.children, dPage);
           } else {
             destSubDocArea = new _DrawPageCell__WEBPACK_IMPORTED_MODULE_12__/* .DrawPageCell */ .k(this._hoEditorFactoryID, destParent, this._cell, subDocArea.dLeft, subDocArea.dTop, subDocArea.dWidth, subDocArea.dHeight, subDocArea.index, subDocArea.startDline, subDocArea.maxHeight, false);
             destParent.addChild(destSubDocArea);
@@ -74112,12 +73879,6 @@ var DrawCell = /*#__PURE__*/function (_DrawRect) {
           if (tindex >= 0) {
             destSubDocArea.removeChildAt(tindex);
           }
-          // const index = subDocArea.getChildIndex(subDocArea.backImage);
-          // if (index >= 0){
-          //   destSubDocArea.removeChildAt(index);
-          // }
-          // destSubDocArea.removeChildAt(0);
-          // destSubDocArea.drawLines = subDocArea.drawLines;
           destSubDocArea.dHeight = subDocArea.dHeight;
           destSubDocArea.dLeft = subDocArea.dLeft;
           destSubDocArea.dTop = dTop;
@@ -74132,21 +73893,15 @@ var DrawCell = /*#__PURE__*/function (_DrawRect) {
           destSubDocArea.x = subDocArea.x;
           destSubDocArea.y = dTop;
           return destSubDocArea;
-          // dPage.drawDomLevel.stage.update();
-          // }
         }
-
         return destArea;
-        // }
       }
-
       return null;
     }
   }, {
     key: "paintCell",
     value: function paintCell(dParent, dTop, dHeight, maxHeight, startDline) {
       var ret = 0;
-      // let aTop = 0;
       var _this$_cell$getLeftWi = this._cell.getLeftWidth(),
         _this$_cell$getLeftWi2 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_this$_cell$getLeftWi, 2),
         aleft = _this$_cell$getLeftWi2[0],
@@ -74164,36 +73919,7 @@ var DrawCell = /*#__PURE__*/function (_DrawRect) {
           valignTop = aHeight - this._cell.drawCell.docHeight;
         }
       }
-      // if (this.drawPageCells.size > 0 && bContinuePaint) {
-      //   const prevDCell = this._getDrawPageCellByPageIndex(pageIndex - 1);
-      //   if (prevDCell) {
-      //     // aTop += prevDCell.drawPageTable.getPageCellTop(this._cell);
-      //     if (
-      //       !prevDCell.lastDrawLine &&
-      //       prevDCell.startDline >= this._drawLines.length
-      //     ) {
-      //       startDline = this._drawLines.length;
-      //     } else if (prevDCell.lastDrawLine instanceof DrawLine) {
-      //       startDline = this.drawLines.indexOf(prevDCell.lastDrawLine) + 1;
-      //     } else if (prevDCell.lastDrawLine instanceof DrawPageTable) {
-      //       startDline = this.drawLines.indexOf(
-      //         (prevDCell.lastDrawLine as DrawPageTable).table.drawTable
-      //       );
-      //       if (
-      //         (prevDCell.lastDrawLine as DrawPageTable).table.drawTable.isFinishedPaint(
-      //           drawPage
-      //         )
-      //       ) {
-      //         startDline += 1;
-      //       }
-      //     }
-      //   }
-      // }
-      // if (!bContinuePaint) {
-      //   startDline = this._drawLines.length;
-      // }
       var dPartTable = dParent;
-      //const cellRestHeight = this.getCellRestHeight(drawPage.pageIndex);
       var dPartCell = new _DrawPageCell__WEBPACK_IMPORTED_MODULE_12__/* .DrawPageCell */ .k(this._hoEditorFactoryID, dPartTable, this._cell, aleft, dTop, awidth, dHeight, this._drawPageCells.length, startDline, maxHeight);
       dPartCell.x = aleft;
       dPartCell.y = dTop;
@@ -74217,8 +73943,6 @@ var DrawCell = /*#__PURE__*/function (_DrawRect) {
         });
         if (this._drawPageCells.length > 0) {
           this._drawPageCells[0].addChild(paraNode.drawlines[0]);
-          // paraNode.drawlines[0].x = paraNode.combineParagraph.leftMarginPixes;
-          // paraNode.drawlines[0].y = paraNode.combineParagraph.topMarginPixes;
         }
       }
     }
@@ -76749,23 +76473,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
         bret = _get$call2[0],
         aTop = _get$call2[1],
         aRestHeight = _get$call2[2];
-      // this._docHeight -= dTop;
       this.updateDHeight();
-      var _this$_cell$table$get = this._cell.table.getCellRowCol(this._cell),
-        _this$_cell$table$get2 = (0,slicedToArray/* default */.Z)(_this$_cell$table$get, 2),
-        r = _this$_cell$table$get2[0],
-        c = _this$_cell$table$get2[1];
-      // if (this._cell.table.rowInfos[r].rowProperty.repeatAsTitleAtPageTop) {
-      //   const keyPages = this._cell.table.drawTable.drawPageTables.keys();
-      //   let pageKey = keyPages.next();
-      //   if (pageKey.value === pageIndex) {
-      //     pageKey = keyPages.next();
-      //     while (!pageKey.done) {
-      //       this._cell.drawCell.copyPaintCell(pageKey.value, undefined, aTop);
-      //       pageKey = keyPages.next();
-      //     }
-      //   }
-      // }
       return [bret, aTop, aRestHeight];
     }
   }, {
@@ -77116,10 +76824,10 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
     key: "paintCellAdress",
     value: function paintCellAdress(visible) {
       if (visible) {
-        var _this$_cell$table$get3 = this._cell.table.getCellInfos(this._cell),
-          _this$_cell$table$get4 = (0,slicedToArray/* default */.Z)(_this$_cell$table$get3, 2),
-          row = _this$_cell$table$get4[0],
-          col = _this$_cell$table$get4[1];
+        var _this$_cell$table$get = this._cell.table.getCellInfos(this._cell),
+          _this$_cell$table$get2 = (0,slicedToArray/* default */.Z)(_this$_cell$table$get, 2),
+          row = _this$_cell$table$get2[0],
+          col = _this$_cell$table$get2[1];
         var strRow = this._cell.table.colToStr(col + 1).toUpperCase();
         if (!this._fronAddress) {
           this._fronAddress = new DrawSimpleText/* DrawSimpleText */.b("", "18px Arial", "#111");
@@ -77295,10 +77003,10 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
   }, {
     key: "calcCellHeight",
     value: function calcCellHeight(restHeight) {
-      var _this$_cell$table$get5 = this._cell.table.getCellInfos(this._cell),
-        _this$_cell$table$get6 = (0,slicedToArray/* default */.Z)(_this$_cell$table$get5, 2),
-        row = _this$_cell$table$get6[0],
-        c = _this$_cell$table$get6[1];
+      var _this$_cell$table$get3 = this._cell.table.getCellInfos(this._cell),
+        _this$_cell$table$get4 = (0,slicedToArray/* default */.Z)(_this$_cell$table$get3, 2),
+        row = _this$_cell$table$get4[0],
+        c = _this$_cell$table$get4[1];
       var ret = 0;
       var hoeditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._cell.hoEditorFactoryID);
       var dTopArr = new Array();
@@ -77463,7 +77171,6 @@ var DrawPageMarkNode = /*#__PURE__*/function (_DrawCombineNode) {
           dPageMarkNodes.push(newMarkNode);
           hoEditorFactory.drawPageTree.updateDrawPage(dPage.pageIndex);
         }
-        //     dPage.drawDomLevel.stage.update();
       } else {
         var dArea = hoEditorFactory.drawPageTree.getMainRootArea(this);
         if (!dArea) return;
@@ -77493,25 +77200,17 @@ var DrawPageMarkNode = /*#__PURE__*/function (_DrawCombineNode) {
       var newMarkNode = DrawPageMarkNode.paintMarkNode(this._hoEditorFactoryID, this._node, dArea, _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_18__/* .HeaderFooterType */ .pi.hftUnkown);
       dArea.addChild(newMarkNode);
       _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_19__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawPageTree.updateDrawPage(dArea.index);
-      //     dPage.drawDomLevel.stage.update();
       dPageMarkNodes.push(newMarkNode);
     }
   }, {
     key: "repaintPageMarkNodes",
     value: function repaintPageMarkNodes(dArea, type) {
-      // const [index,rootNodes]= this.getSubDocIndex(dArea.index,type);
-      var strPath = dArea.rootPath;
-      // const arrNodes = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.getSubDocPageMarkNodes(
-      //   strPath
-      // );
-      // for (let i = arrNodes.length - 1; i >= 0; i--) {
       var aNode = this.node;
       this.removePageMarkDrawNode(aNode, dArea);
       var dPageMarkNode = DrawPageMarkNode.paintMarkNode(this._hoEditorFactoryID, aNode, dArea, type);
       var dPageMarkNodes = this.node.drawPageMarkNodes;
       dPageMarkNodes.push(dPageMarkNode);
       dArea.addChild(dPageMarkNode);
-      // }
     }
   }, {
     key: "removePageMarkDrawNode",
@@ -78159,6 +77858,9 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
         if (pageRestHeight < _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_15__/* .gDefaultRowHeight */ .dT) {
           break;
         }
+        if (pageRestHeight < this._table.drawTable.getRowStartLineMaxHeight(r)) {
+          break;
+        }
         //开始行需要判断是否存在上一个未绘制完成的表格
         if (r === this._startRow && index > 0 && !bStartRowFinished) {
           rowRestHeight = Math.max(this._table.drawTable.getRowRestHeight(index - 1, this._startRow), _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_15__/* .gDefaultRowHeight */ .dT);
@@ -78240,7 +77942,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
           break;
         }
       }
-      //如果某个单元格的合并多行，且当前页最后一行不是单元格的最后合并行，则需要绘制此单元格 
+      //如果某个单元格的合并多行，且当前页最后一行不是单元格的最后合并行，则需要绘制此单元格
       this.paintLastLineMergeCrossCell(this._endRow, rowPaintHeight, tableRestHeight);
       this._dHeight = totalHeight;
       var y = this._dTop;
@@ -78794,6 +78496,10 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
           this.removeDrawCellAfterRow(r);
           break;
         }
+        if (pageRestHeight < this._table.drawTable.getRowStartLineMaxHeight(r)) {
+          this.removeDrawCellAfterRow(r);
+          break;
+        }
         var rowFinished = true; //行是否绘制完成
         var isEmptyRow = true; //是否绘制了一个单元格
         for (var c = 0; c < this._table.colCount; c++) {
@@ -80755,12 +80461,6 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
       if (this._table.rowInfos[r].rowProperty.isSpecifyHeight) {
         dHeight = rowPorpertyHeight;
       }
-      // if (this._table.rowInfos[r].heightFixed) {
-      //   return;
-      // }
-      // let drawPageTable: DrawPageTable | undefined = undefined;
-      //2023-09-04注释 该属性没用
-      //if (!this._table.rowInfos[r].heightFixed) {
       for (var c = 0; c < this._table.colCount; c++) {
         var aCell = this._table.rows[r][c];
         if (aCell && aCell.cellProperty.align == _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_15__/* .VAlign */ .TR.vabottom) {
@@ -80768,13 +80468,6 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
         }
         if (aCell && aCell.rowSpan === 1 && aCell.drawCell.dHeight > dHeight) {
           dHeight = aCell.drawCell.dHeight;
-          // let nextValue = aCell.drawCell.drawPageCells.values().next();
-          // while (!nextValue.done) {
-          //   drawPageTable = nextValue.value.parent as DrawPageTable;
-          // }
-          // drawPageTable =
-          //   aCell.drawCell.drawPageCells[aCell.drawCell.drawPageCells.length - 1]
-          //     .drawPageTable;
         } else if (!aCell) {
           var _this$_table$getMainC = this._table.getMainCell(r, c),
             _this$_table$getMainC2 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$_table$getMainC, 3),
@@ -80782,7 +80475,6 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
             mr = _this$_table$getMainC2[1],
             mc = _this$_table$getMainC2[2];
           if (mr + mainCell.rowSpan - 1 === r && mc === c) {
-            var cell = mainCell;
             var aHeight = mainCell.drawCell.dHeight;
             for (var row = r - 1; row >= mr; row--) {
               aHeight -= this.table.rowInfos[row].rowHeight;
@@ -80793,36 +80485,22 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
           }
         }
       }
-      //}
       if (dHeight !== this._table.rowInfos[r].rowHeight) {
-        //2023-09-04注释 该属性没用
-        //if (!this._table.rowInfos[r].heightFixed) {
         if (this._table.rowInfos[r].rowProperty.isSpecifyHeight) {
-          if (dHeight > rowPorpertyHeight) this._table.rowInfos[r].rowHeight = rowPorpertyHeight;else this._table.rowInfos[r].rowHeight = dHeight;
-        } else this._table.rowInfos[r].rowHeight = dHeight;
-        //}
+          if (dHeight > rowPorpertyHeight) {
+            this._table.rowInfos[r].rowHeight = rowPorpertyHeight;
+          } else {
+            this._table.rowInfos[r].rowHeight = dHeight;
+          }
+        } else {
+          this._table.rowInfos[r].rowHeight = dHeight;
+        }
         for (var _c = 0; _c < bottonAlignCell.length; _c++) {
           if (bottonAlignCell[_c]) {
             bottonAlignCell[_c].drawCell.needUpdate = true;
           }
         }
       }
-      // for (let c = 0; c < this._table.colCount; c++) {
-      //   const aCell = this._table.rows[r][c];
-      //   if (aCell) {
-      //     aCell.drawCell.dHeight = dHeight;
-      //   } else {
-      //     const [mainCell, mr, mc] = this._table.getMainCell(r, c);
-      //     let drawCellHeight = 0;
-      //     for (let i = mr, end = mr + mainCell.rowSpan - 1; i <= end; i++) {
-      //       drawCellHeight += this._table.rowInfos[i].rowHeight;
-      //     }
-      //     mainCell.drawCell.dHeight = drawCellHeight;
-      //   }
-      // }
-      // if (!drawPageTable) {
-      //   throw new Error("错误的绘制，无法返回单元格所在页的表格信息");
-      // }
       return dHeight;
     }
   }, {
@@ -81417,6 +81095,67 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
     get: function get() {
       return this._dHeight;
     }
+    /**
+    *
+    * @param r
+    * @returns 获取指定行r中所有列中第一行的最大行高
+    */
+  }, {
+    key: "getRowStartLineMaxHeight",
+    value: function getRowStartLineMaxHeight(r) {
+      var startRow = -1;
+      var endRow = -1;
+      var inSameRow = true;
+      //判断所有行的起始行是否一样   并且结束行也是否一样
+      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 (aHeight > maxRowHeight) {
+            maxRowHeight = aHeight;
+          }
+        }
+      }
+      return maxRowHeight;
+    }
+  }, {
+    key: "isFirstRowCanFit",
+    value: function isFirstRowCanFit(restHeight) {
+      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],
+        headHeight = _this$table$getHeadRo2[1];
+      var startRow = headCount;
+      if (headCount < 0) {
+        startRow = 0;
+      }
+      if (this.table.rowCount > headCount && headHeight + this.getRowStartLineMaxHeight(startRow) > restHeight) {
+        return false;
+      }
+      return true;
+    }
   }]);
   return DrawTable;
 }(_DrawRect__WEBPACK_IMPORTED_MODULE_21__/* .DrawRect */ .t);
@@ -85162,12 +84901,9 @@ var DrawTree = /*#__PURE__*/function () {
   }, {
     key: "onTick",
     value: function onTick(e) {
-      // if(!(e as any).paused) {
-      // 	console.log("Paused:", (e as any).paused, (e as any).delta);
       if (this._activePage && this._activePage.drawSelectLevel && this._activePage.drawSelectLevel.stage) {
         this._activePage.drawSelectLevel.stage.update(e);
       }
-      // }
     }
   }, {
     key: "deleteDLines",
@@ -85427,11 +85163,6 @@ var DrawTree = /*#__PURE__*/function () {
       var paraNode = dline.paragraphNode;
       var node = startNode;
       var aEndPath = endPath;
-      // let  npEnd = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.findNodePositionByPath(endPath);
-      // if (!npEnd.node) {
-      //   throw new Error(`错误的绘制节点${endPath}`);
-      // }
-      // const endParaNode=HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeParaNode(npEnd.node);
       var hoeditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       var paraInfos = hoeditorFactory.docTree.getPathParagraphLastPath(endPath);
       var endParaNode = paraInfos[0];
@@ -85461,14 +85192,12 @@ var DrawTree = /*#__PURE__*/function () {
           }
           dline = node.drawlines[0];
           paraNode = node;
-          // inLineIndex = -1;
           if (node === npEnd.node) {
             break;
           }
         } else if (node instanceof TableNode/* TableNode */.Fh) {
           node.placeDNodeAfterDrawLine(paraNode, dline, aEndPath);
           dline = node.drawTable;
-          // inLineIndex = 0;
         } else {
           //放置时不包含第一个节点
           if (dline instanceof DrawTable/* DrawTable */.t) {
@@ -85484,11 +85213,7 @@ var DrawTree = /*#__PURE__*/function () {
           if (NodePosition/* NodePosition */.F.treePathCompare(aEndPath, hoeditorFactory.docTree.getNodeLastPath(node)) <= 0) {
             break;
           }
-          // if (node === npEnd.node) {
-          // break;
-          // }
         }
-
         var nextNode = node.nextSibling();
         if (!nextNode) {
           if (node instanceof MarkNode/* MarkNode */.j) {
@@ -85499,10 +85224,7 @@ var DrawTree = /*#__PURE__*/function () {
         }
         node = nextNode;
         startChildIndex = 0;
-        // dline = paraNode.getLastDrawline();
-        // dline = dline.paragraphNode.getLastDrawline();
       }
-
       if (dline instanceof DrawLine/* DrawLine */.a) {
         dline.fitLines();
         dline.paragraphNode.updateDrawLineStyle();
@@ -85521,7 +85243,8 @@ var DrawTree = /*#__PURE__*/function () {
       var aParagraph = paragraph;
       while (aParagraph) {
         //如paragraph在表格内更新表格高度
-        var area = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.getParentRectNode(aParagraph);
+        var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+        var area = hoEditorFactory.docTree.getParentRectNode(aParagraph);
         if (area && area instanceof CellNode/* CellNode */.D) {
           aParagraph = this.updateDrawAreaHeight(area);
           if (aParagraph) {
@@ -85541,10 +85264,6 @@ var DrawTree = /*#__PURE__*/function () {
         var canChangeHeight = true;
         var aCell = area;
         aCell.drawCell.updateHeight();
-        // const lastParagraph =
-        //   aCell.drawCell.drawLines[aCell.drawCell.drawLines.length - 1]
-        //     .paragraphNode;
-        // aCell.drawCell.docHeight = lastParagraph.dTop + lastParagraph.dHeight;
         var _aCell$table$getCellI = aCell.table.getCellInfos(aCell),
           _aCell$table$getCellI2 = (0,slicedToArray/* default */.Z)(_aCell$table$getCellI, 2),
           r = _aCell$table$getCellI2[0],
@@ -85576,11 +85295,6 @@ var DrawTree = /*#__PURE__*/function () {
       var aEndPath = endPath;
       var tables = new Array();
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
-      // let  npEnd = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.findNodePositionByPath(endPath);
-      // if (!npEnd.node) {
-      //   throw new Error(`错误的绘制节点${endPath}`);
-      // }
-      // const endParaNode=hoEditorFactory.docTree.getNodeParaNode(npEnd.node);
       var paraInfos = hoEditorFactory.docTree.getPathParagraphLastPath(endPath);
       var endParaNode = paraInfos[0];
       var paraEndPath = paraInfos[1];
@@ -85643,35 +85357,16 @@ var DrawTree = /*#__PURE__*/function () {
               }
             }
           }
-          if (NodePosition/* NodePosition */.F.treePathCompare(aEndPath, hoEditorFactory.docTree.getNodeLastPath(node)) <= 0) break;
-          // if (node === npEnd.node) {
-          // break;
-          // }
+          if (NodePosition/* NodePosition */.F.treePathCompare(aEndPath, hoEditorFactory.docTree.getNodeLastPath(node)) <= 0) {
+            break;
+          }
         }
-        // dline = paraNode.getLastDrawline();
-        // dline = dline.paragraphNode.getLastDrawline();
       }
-
       if (dline instanceof DrawLine/* DrawLine */.a) {
         dline.fitLines();
         dline.paragraphNode.updateDrawLineStyle();
       }
       this.updateTablesdHeight(tables);
-      // const arr = aEndPath.split("/");
-      // const endIndex = parseInt(arr[arr.length - 1]);
-      // if (node instanceof ParagraphNode) {
-      //     (node as ParagraphNode).placeDNodeAfterDline(dlines, dline);
-      // } else {
-      //   node?.placeDNode2DrawLine(
-      //     dlines,
-      //     paraNode,
-      //     dline,
-      //     index,
-      //     0,
-      //     endIndex
-      //   );
-      // }
-      // paraNode.getLastDline().update();
       endParaNode.dTop = this.getParagraphStartTop(endParaNode);
       endParaNode.updateDrawInfos();
       var lastParagraph = this.updateDrawAreaPos(endParaNode);
@@ -85695,19 +85390,6 @@ var DrawTree = /*#__PURE__*/function () {
           aline.parent.removeChild(aline);
         }
       }
-      // const npEnd = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.findNodePositionByPath(endPath);
-      // if (!npEnd.node) {
-      //   throw new Error(`错误的绘制节点${endPath}`);
-      // } else {
-      //   let aNode: BaseNode | null = npEnd.node;
-      //   while (aNode && aNode !== dline.paragraphNode) {
-      //     if (aNode instanceof ParagraphNode) {
-      //       this.clearDrawParagraph(aNode as ParagraphNode);
-      //     } else if (aNode instanceof TableNode) {
-      //       (aNode as TableNode).drawTable.clearAllDrawLines();
-      //     }
-      //     aNode = aNode.previousLeaf();
-      //   }
       if (dline instanceof DrawLine/* DrawLine */.a) {
         var paragraphNode = this.clearDrawParagraphAfterDline(dline.paragraphNode, dline, istartLineIndex, beforeChangePath);
         if (dline.drawItems[istartLineIndex] instanceof DrawTextNode/* DrawTextNode */.v) {
@@ -85719,52 +85401,6 @@ var DrawTree = /*#__PURE__*/function () {
       var lastParagraph = this.updateDrawAreaPos(dline.paragraphNode);
       this.updateDrawTreeHeight(lastParagraph);
     }
-    // /**
-    //  *
-    //  * @param drawLine 当前行
-    //  * @returns 返回当前行的下一个行。
-    //  */
-    // public getNextDrawLine(
-    //   adomRange: DomRange,
-    //   drawLine: DrawLine | DrawTable
-    // ): [Array<DrawLine | DrawTable> | null, DrawLine | null] {
-    //   const [dcell, droots] = this.getDrawRootsByPath(
-    //     drawLine.paragraphNode.getNodePath()
-    //   );
-    //   let retRoots: Array<DrawLine | DrawTable> | null = null;
-    //   let dNextLine: DrawLine | DrawTable | null = null;
-    //   const index = droots.indexOf(drawLine);
-    //   if (index === droots.length - 1) {
-    //     if (dcell) {
-    //       const childNodes = dcell.cell.table.childNodes;
-    //       const cellIndex = childNodes.indexOf(dcell.cell);
-    //       if (cellIndex === childNodes.length - 1) {
-    //         return this.getNextDrawLine(adomRange, dcell.cell.table.drawTable);
-    //       } else {
-    //         const dNextCell = (dcell.cell.table.childNodes[
-    //           cellIndex + 1
-    //         ] as CellNode).drawCell;
-    //         retRoots = dNextCell.drawLines;
-    //         dNextLine = dNextCell.drawLines[0];
-    //         while (dNextLine instanceof DrawTable) {
-    //           retRoots = ((dNextLine as DrawTable).table
-    //             .childNodes[0] as CellNode).drawCell.drawLines;
-    //           dNextLine = retRoots[0];
-    //         }
-    //         return [retRoots, dNextLine];
-    //       }
-    //     }
-    //     return [null, null];
-    //   }
-    //   dNextLine = droots[index + 1];
-    //   retRoots = droots;
-    //   while (dNextLine instanceof DrawTable) {
-    //     retRoots = ((dNextLine as DrawTable).table.childNodes[0] as CellNode)
-    //       .drawCell.drawLines;
-    //     dNextLine = retRoots[0];
-    //   }
-    //   return [retRoots, dNextLine];
-    // }
     /**
      * @author xyl
      * @param path 绘制路径
@@ -85884,12 +85520,6 @@ var DrawTree = /*#__PURE__*/function () {
     value: function onDocChanged(e) {
       //查找绘制前的绘制节点
       //绘制结束位置
-      // const endPara = hoEditorFactory.docTree.getNodeParaNode(npEnd.node);
-      // // const endPath = hoEditorFactory.docTree.getParaNodeLastPath(endPara);
-      // // const npEnd = hoEditorFactory.docTree.findNodePositionByPath(endPath);
-      // if (!npEnd.node) {
-      //   throw new Error(`错误的绘制节点${e.afterChangePath}`);
-      // }
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       try {
         //console.time("文档change事件");
@@ -85911,9 +85541,6 @@ var DrawTree = /*#__PURE__*/function () {
         if (startDrawPage) {
           startPageNo = startDrawPage.pageIndex;
         }
-        // const dlines = nextDrawLineInfos[0];
-        // const dline = nextDrawLineInfos[1];
-        // const inLineIndex = nextDrawLineInfos[2];
         var nextDrawNodeInfos = this.getNextDrawNode(e.beforeChangePath);
         var node = nextDrawNodeInfos[0];
         var startChildIndex = nextDrawNodeInfos[1];
@@ -85947,11 +85574,6 @@ var DrawTree = /*#__PURE__*/function () {
           // inLineIndex,
           node, startChildIndex + 1, e.afterChangePath);
           var endIndex = alines.indexOf(dendDrawLine);
-          // if (hoEditorFactory.isUseDrawingOptimization) {
-          //   endIndex = alines.length - 1;
-          // }
-          // if (paragraphNode.parentNode === null) {
-          // const darea = this.getDrawA(dline);
           if (e.repaintImmediate) {
             if (!dArea) {
               return false;
@@ -85964,21 +85586,7 @@ var DrawTree = /*#__PURE__*/function () {
             if (dCell) {
               this.updateDrawFormular(dCell.cell);
             }
-            // if (dArea.rootPath == "main") {
-            //   console.log("开始");
-            //   let type = "";
-            //   for (let i = 0; i < alines.length; i++) {
-            //     if (alines[i] instanceof DrawLine) {
-            //       type = "行";
-            //     } else {
-            //       type = "表格";
-            //     }
-            //     console.log(i, type, alines[i].y, alines[i].dHeight, alines[i].dTop);
-            //   }
-            //   console.log("结束");
-            // }
           }
-          // }
         } else if (e.action === DocTree/* DocAction */.gk.daModifyStyle) {
           if (e.oldDrawLines.length <= 0) {
             return false;
@@ -85998,8 +85606,6 @@ var DrawTree = /*#__PURE__*/function () {
           e.beforeChangePath, e.afterChangePath, e.needUpdateParaStyle);
           if (e.repaintImmediate) {
             dline = e.redrawStartPositon.drawRoots[e.redrawStartPositon.index];
-            // dendDrawLine =
-            //   e.redrawStartPositon.drawRoots[e.redrawStartPositon.index];
             var _mainArea = hoEditorFactory.drawPageTree.getMainRootArea(startUpdateLine);
             if (!_mainArea) return false;
             _mainArea.changed = true;
@@ -86008,19 +85614,6 @@ var DrawTree = /*#__PURE__*/function () {
               drawTop = 0;
             }
             hoEditorFactory.drawPageTree.update(_mainArea, e.redrawStartPositon.drawRoots, drawTop, e.redrawStartPositon.index, e.redrawStartPositon.drawRoots.length - 1);
-            // if (mainArea.rootPath == "main") {
-            //   console.log("开始");
-            //   let type = "";
-            //   for (let i = 0; i < e.redrawStartPositon.drawRoots.length; i++) {
-            //     if (e.redrawStartPositon.drawRoots[i] instanceof DrawLine) {
-            //       type = "行";
-            //     } else {
-            //       type = "表格";
-            //     }
-            //     console.log(i, type, e.redrawStartPositon.drawRoots[i].y, e.redrawStartPositon.drawRoots[i].dHeight, e.redrawStartPositon.drawRoots[i].dTop);
-            //   }
-            //   console.log("结束");
-            // }
           }
         } else if (e.action === DocTree/* DocAction */.gk.daParaStyleChange) {
           if (e.oldDrawLines.length <= 0) {
@@ -86066,21 +85659,6 @@ var DrawTree = /*#__PURE__*/function () {
           }
           var startDeleteLine = e.oldDrawTreeLines[0] instanceof DrawTable/* DrawTable */.t ? e.oldDrawTreeLines[0].drawPageTables[0] : e.oldDrawTreeLines[0];
           startUpdateLine = this.getDlineRootDrawNode(startDeleteLine);
-          // if (inLineIndex === -1 && dline instanceof DrawTable) {
-          //   this.deleteDLines(dlines, iStartLineIndex, iendLineIndex);
-          //   if (dlines.length === 0) {
-          //     if (dCell) {
-          //       dCell.clear();
-          //     } else {
-          //       const roots = hoEditorFactory.docTree.getPathRoots(
-          //         e.afterChangePath
-          //       );
-          //       if (roots) {
-          //         this.buildDrawTree(roots, dlines);
-          //       }
-          //     }
-          //   }
-          // } else {
           var _tables = this.deleteDLines(e.oldDrawTreeLines, iStartLineIndex, iendLineIndex);
           if (iStartLineIndex !== 0) {
             paragraphNode = this.clearDrawParagraphAfterDline(dline.paragraphNode, dline, inLineIndex, e.beforeChangePath);
@@ -86088,24 +85666,11 @@ var DrawTree = /*#__PURE__*/function () {
             startChildIndex = -1;
           }
           if (dline instanceof DrawLine/* DrawLine */.a) dline.fitLines();
-          // }
-          // if (
-          //   node instanceof ParagraphNode &&
-          //   node.drootNodes.indexOf((node as ParagraphNode).drawlines[0]) >= 0
-          // ) {
-          //   (node as ParagraphNode).dTop = this.getParagraphStartTop(
-          //     node as ParagraphNode
-          //   );
-          //   (node as ParagraphNode).updateDrawInfos();
-          // } else {
           //后续行未删除部分，添加到当前行的尾部
           if (node && !(node instanceof ParagraphNode/* ParagraphNode */.C)) {
-            var endLine = this.drawDocInsert(paragraphNode, lineIndex,
-            // inLineIndex,
-            node, startChildIndex + 1, e.afterChangePath);
+            var endLine = this.drawDocInsert(paragraphNode, lineIndex, node, startChildIndex + 1, e.afterChangePath);
             if (endLine instanceof DrawLine/* DrawLine */.a) endLine.fitLines();
           }
-          // }
           paragraphNode.updateDrawLineStyle();
           paragraphNode.updateDrawInfos();
           this.updateDrawAreaPos(paragraphNode);
@@ -86121,10 +85686,7 @@ var DrawTree = /*#__PURE__*/function () {
           }
           if (e.repaintImmediate) {
             var _mainArea3 = dArea;
-            if (dline.parent)
-              // dendDrawLine =
-              //   e.redrawStartPositon.drawRoots[e.redrawStartPositon.index];
-              _mainArea3 = hoEditorFactory.drawPageTree.getMainRootArea(startUpdateLine);else if (dArea) {
+            if (dline.parent) _mainArea3 = hoEditorFactory.drawPageTree.getMainRootArea(startUpdateLine);else if (dArea) {
               _mainArea3 = hoEditorFactory.drawPageTree.getMainRootArea(dArea);
             }
             if (_mainArea3) {
@@ -86139,13 +85701,6 @@ var DrawTree = /*#__PURE__*/function () {
               this.updateDrawFormular(dCell.cell);
             }
           }
-          // if (
-          //   e.redrawEndPositon &&
-          //   e.redrawEndPositon.drawRoots &&
-          //   e.redrawEndPositon.drawRoots.length > 0
-          // ) {
-          //   dendDrawLine = e.redrawEndPositon.drawRoots[e.redrawEndPositon.index];
-          // }
         } else if (e.action === DocTree/* DocAction */.gk.daInsertParagraphBeforeTab) {
           if (dCell) {
             dCell.needUpdate = true;
@@ -86246,9 +85801,6 @@ var DrawTree = /*#__PURE__*/function () {
             //toDo 需要修改所有区域的高度
             var lastParagraph = this.updateDrawAreaPos(paragraphNode);
             this.updateDrawTreeHeight(lastParagraph);
-            var _endIndex = 0;
-            // if (paragraphNode.parentNode === null) {
-            // const darea = this.getDrawA(dline);
             if (e.repaintImmediate) {
               if (!dArea) {
                 return false;
@@ -86278,9 +85830,6 @@ var DrawTree = /*#__PURE__*/function () {
             //toDo 需要修改所有区域的高度
             var _lastParagraph = this.updateDrawAreaPos(paragraphNode);
             this.updateDrawTreeHeight(_lastParagraph);
-            var _endIndex2 = 0;
-            // if (paragraphNode.parentNode === null) {
-            // const darea = this.getDrawA(dline);
             if (e.repaintImmediate) {
               if (!dArea) {
                 return false;
@@ -86293,67 +85842,6 @@ var DrawTree = /*#__PURE__*/function () {
             }
           }
         }
-        // if (dCell) {
-        //   //如果表格高度改变 将在isCellRowHeightChanged中递归（需要考虑表格套表格）触发重绘
-        //   const [
-        //     changed,
-        //     needRePaint,
-        //   ] = dCell.cell.table.drawTable.isCellRowHeightChanged(dCell.cell);
-        //   if (!changed) {
-        //     const dPartCell = dCell.getDrawPageCellByPageIndex(startPageNo);
-        //     const startIndex =
-        //       dPartCell && dPartCell.startPgDline ? dPartCell.startPgDline : 0;
-        //     let iRedrawEnd = dline.paragraphNode.drootNodes.indexOf(dendDrawLine);
-        //     iRedrawEnd = iRedrawEnd >= startIndex ? iRedrawEnd : startIndex;
-        //     hoEditorFactory.redrawManger.addRedrawRange(
-        //       dCell,
-        //       startPageNo,
-        //       dCell.drawLines,
-        //       startIndex,
-        //       iRedrawEnd,
-        //       dCell.drawLines.length - 1,
-        //       e.afterChangePath
-        //     );
-        //   }
-        // } else
-        // {
-        //   let pParagraphNode = hoEditorFactory.docTree.getParentRectNode(
-        //     dline.paragraphNode
-        //   );
-        //   let dParent: DrawLine | DrawTable = dline;
-        //   while (pParagraphNode && pParagraphNode instanceof CellNode) {
-        //     dParent = pParagraphNode.table.drawTable;
-        //     pParagraphNode = hoEditorFactory.docTree.getParentRectNode(
-        //       pParagraphNode.table
-        //     );
-        //   }
-        //   dline = dParent;
-        //   let iRedrawStart = dline.paragraphNode.drootNodes.indexOf(dline);
-        //   let iRedrawEnd = dline.paragraphNode.drootNodes.indexOf(dendDrawLine);
-        //   iRedrawStart = iRedrawStart >= 0 ? iRedrawStart : 0;
-        //   while (iRedrawStart > 0) {
-        //     if (dline instanceof DrawTable) {
-        //       const dPartTable = dline.getDrawTableByPage(startPageNo);
-        //       if (dPartTable && dPartTable.stage) {
-        //         break;
-        //       }
-        //     } else if (dline.stage) {
-        //       break;
-        //     }
-        //     iRedrawStart--;
-        //     dline = dline.paragraphNode.drootNodes[iRedrawStart];
-        //   }
-        //   iRedrawEnd = iRedrawEnd >= iRedrawStart ? iRedrawEnd : iRedrawStart;
-        //   hoEditorFactory.redrawManger.addRedrawRange(
-        //     dCell,
-        //     startPageNo,
-        //     dline.paragraphNode.drootNodes,
-        //     iRedrawStart,
-        //     iRedrawEnd,
-        //     dline.paragraphNode.drootNodes.length - 1,
-        //     e.afterChangePath
-        //   );
-        // }
       } finally {
         this._inChanging = false;
       }
@@ -86373,7 +85861,6 @@ var DrawTree = /*#__PURE__*/function () {
           }
         }
       }
-      //console.timeEnd("文档change事件");
       return true;
     }
   }, {
@@ -86381,290 +85868,6 @@ var DrawTree = /*#__PURE__*/function () {
     value: function onDocChanging(e) {
       return true;
     }
-    //#region 添加批注（旧逻辑）
-    // public drawComments() {
-    //   const comments = this.commentsMap;
-    //   let i = 0;
-    //   comments.forEach((value) => {
-    //     i++;
-    //     if (i > 2) {
-    //       return;
-    //     }
-    //     const endDrawNode = value.eNode.drawNodes[0];
-    //     const dline = this.getDrawLineByDNode(
-    //       endDrawNode
-    //     ); // 末尾标记节点所在行
-    //     const stagePos = dline.localToGlobal(endDrawNode.x, endDrawNode.y); // 末尾标记节点的stage坐标
-    //     const spX = stagePos.x / 2;
-    //     const spY = stagePos.y / 2;
-    //     //const commentY = spY;
-    //     if (dline.stage) {
-    //       this.removeComment(dline, value);
-    //       const path = value.eNode.getNodePath();
-    //       if (i === 1) {
-    //         this.drawComment(dline, value, spX, spY, spY);
-    //       }
-    //       if (i === 2) {
-    //         this.repaint(dline, value, path, spX, spY);
-    //       }
-    //     }
-    //   });
-    // }
-    // public removeComment(dline: DrawLine | DrawTable, comment: Comment) {
-    //   for (let i = dline.stage.children.length - 1; i >= 3; i--) {
-    //     const child = dline.stage.children[i];
-    //     if (child.name === comment.id) {
-    //       dline.stage.children.splice(i, 1);
-    //     }
-    //   }
-    //   dline.stage.update();
-    // }
-    // public repaint(
-    //   dline: DrawLine | DrawTable,
-    //   comment: Comment,
-    //   nPath: string,
-    //   spX: number,
-    //   spY: number
-    // ) {
-    //   const comments = this.commentsMap;
-    //   const topComments = new Array<Comment>();
-    //   const bottomComments = new Array<Comment>();
-    //   const tempArr = new Array<Comment>();
-    //   const getStagePos = (comment: Comment) => {
-    //     const endDrawNode = comment.eNode.drawNodes[0];
-    //     const dline = this.getDrawLineByDNode(
-    //       endDrawNode
-    //     ); // 末尾标记节点所在行
-    //     const stagePos = dline.localToGlobal(endDrawNode.x, endDrawNode.y);
-    //     //let y = 0;
-    //     // for (let i = 3; i < dline.stage.children.length; i++) {
-    //     //   const child = dline.stage.children[i];
-    //     //   if (child instanceof createjs.Container && child.name === comment.id) {
-    //     //     y = child.y;
-    //     //   }
-    //     // }
-    //     //return [dline, stagePos.x / 2, stagePos.y / 2];
-    //     return [dline, stagePos.x / 2, stagePos.y / 2];
-    //   };
-    //   let commentY = spY;
-    //   comments.forEach((value) => {
-    //     if (value.id !== comment.id) {
-    //       tempArr.push(value);
-    //     }
-    //   });
-    //   tempArr.forEach((value) => {
-    //     const aPath = value.eNode.getNodePath();
-    //     const result = NodePosition.treePathCompare(nPath, aPath);
-    //     if (result > 0) {
-    //       topComments.push(value);
-    //     } else {
-    //       bottomComments.push(value);
-    //     }
-    //   });
-    //   if (topComments.length > 0) {
-    //     let maxValue = getStagePos(topComments[0])[2] as number;
-    //     let lHeight = topComments[0].lineHeight;
-    //     for (let i = 1; i < topComments.length; i++) {
-    //       const stageY = getStagePos(topComments[i])[2] as number;
-    //       if (stageY > maxValue) {
-    //         maxValue = stageY;
-    //         lHeight = topComments[i].lineHeight;
-    //       }
-    //     }
-    //     if (maxValue + lHeight + 5 > spY) {
-    //       commentY = maxValue + lHeight + 5;
-    //     }
-    //   }
-    //   this.drawComment(dline, comment, spX, spY, commentY);
-    //   if (bottomComments.length > 0) {
-    //     const repaintComment = (commentObj: Comment, commentY: number) => {
-    //       const drawLine = getStagePos(commentObj)[0] as DrawLine | DrawTable;
-    //       const nodeX = getStagePos(commentObj)[1] as number;
-    //       const nodeY = getStagePos(commentObj)[2] as number;
-    //       const arrIndex = bottomComments.indexOf(commentObj);
-    //       bottomComments.splice(arrIndex, 1);
-    //       if (commentY + commentObj.lineHeight + 5 > nodeY) {
-    //         commentY = commentY + commentObj.lineHeight + 5;
-    //       } else {
-    //         commentY = nodeY;
-    //       }
-    //       this.removeComment(drawLine, commentObj);
-    //       this.drawComment(drawLine, commentObj, nodeX, nodeY, commentY);
-    //       if (bottomComments.length > 0) {
-    //         let minValue = getStagePos(bottomComments[0])[2] as number;
-    //         let tempComment = bottomComments[0];
-    //         for (let j = 1; j < bottomComments.length; j++) {
-    //           const stageY = getStagePos(bottomComments[j])[2] as number;
-    //           if (stageY < minValue) {
-    //             minValue = stageY;
-    //             tempComment = bottomComments[j];
-    //           }
-    //         }
-    //         repaintComment(tempComment, commentY);
-    //       }
-    //     };
-    //     let minValue = getStagePos(bottomComments[0])[2] as number;
-    //     let tempComment = bottomComments[0];
-    //     for (let i = 1; i < bottomComments.length; i++) {
-    //       const stageY = getStagePos(bottomComments[i])[2] as number;
-    //       if (stageY < minValue) {
-    //         minValue = stageY;
-    //         tempComment = bottomComments[i];
-    //       }
-    //     }
-    //     repaintComment(tempComment, commentY);
-    //   }
-    // }
-    // public drawComment(
-    //   dline: DrawLine | DrawTable,
-    //   comment: Comment,
-    //   nodeX: number,
-    //   nodeY: number,
-    //   commentY: number
-    // ) {
-    //   const docWidth =
-    //     hoEditorFactory.pageProperty.widthPixes -
-    //     hoEditorFactory.pageProperty.rightMarginPixes;
-    //   const commentWidth =
-    //     hoEditorFactory.pageProperty.rightMarginPixes - 15;
-    //   const container = new createjs.Container();
-    //   container.x = docWidth + 15;
-    //   container.y = commentY - comment.lineHeight / 2;
-    //   container.name = comment.id;
-    //   let nameTextShape: DrawSimpleText | null = null;
-    //   let dateTextShape: DrawSimpleText | null = null;
-    //   let commentTextShape: DrawSimpleText | null = null;
-    //   // const creator = hoEditorFactory.docTree.userHistories[
-    //   //   comment.creatorIndex
-    //   // ];
-    //   // 批注人
-    //   nameTextShape = new DrawSimpleText(
-    //     comment.userName,
-    //     "12px 微软雅黑",
-    //     "#000"
-    //   );
-    //   nameTextShape.lineHeight = 20;
-    //   nameTextShape.name = "creator";
-    //   nameTextShape.x = 10;
-    //   nameTextShape.y = 10;
-    //   nameTextShape.alpha = 1;
-    //   // 批注时间
-    //   dateTextShape = new DrawSimpleText(comment.date, "12px 微软雅黑", "#333");
-    //   dateTextShape.lineHeight = 20;
-    //   dateTextShape.name = "time";
-    //   dateTextShape.x = nameTextShape.getMeasuredWidth() + 30;
-    //   dateTextShape.y = 10;
-    //   dateTextShape.alpha = 1;
-    //   // 批注内容
-    //   const commentArr = comment.commentTextWarp(commentWidth, comment.text);
-    //   const text = commentArr[0] as string;
-    //   commentTextShape = new DrawSimpleText(text, "12px 微软雅黑", "#666");
-    //   commentTextShape.lineWidth = commentWidth - 25;
-    //   commentTextShape.lineHeight = 20;
-    //   commentTextShape.name = "text";
-    //   commentTextShape.x = 10;
-    //   commentTextShape.y = dateTextShape.y + dateTextShape.getMeasuredHeight();
-    //   commentTextShape.alpha = 1;
-    //   //背景
-    //   const backShape = new createjs.Shape();
-    //   backShape.graphics
-    //     .setStrokeDash([4, 1], 0)
-    //     .setStrokeStyle(1)
-    //     .beginStroke("rgba(255, 0, 0, 1)")
-    //     .beginFill("#ffe5e5")
-    //     .drawRoundRect(0, 0, commentWidth - 20, comment.lineHeight, 5);
-    //   backShape.name = "back";
-    //   backShape.alpha = 0.5;
-    //   backShape.cache(0, 0, commentWidth - 20, comment.lineHeight, 5);
-    //   //横线
-    //   const horizontalLine = new createjs.Shape();
-    //   horizontalLine.graphics
-    //     .setStrokeDash([4, 1], 0)
-    //     .setStrokeStyle(1)
-    //     .beginStroke("rgba(255, 0, 0, 1)")
-    //     .moveTo(nodeX, nodeY)
-    //     .lineTo(docWidth, nodeY);
-    //   horizontalLine.name = comment.id;
-    //   horizontalLine.alpha = 0.5;
-    //   //指向线
-    //   const guideLine = new createjs.Shape();
-    //   guideLine.graphics
-    //     .setStrokeDash([4, 1], 0)
-    //     .setStrokeStyle(1)
-    //     .beginStroke("rgba(255, 0, 0, 1)")
-    //     .moveTo(docWidth, nodeY)
-    //     .lineTo(docWidth + 15, commentY - comment.lineHeight / 4);
-    //   guideLine.name = comment.id;
-    //   guideLine.alpha = 0.5;
-    //   container.uncache();
-    //   container.addChild(backShape);
-    //   container.addChild(nameTextShape);
-    //   container.addChild(dateTextShape);
-    //   container.addChild(commentTextShape);
-    //   backShape.addEventListener("mousedown", (e: any) =>
-    //     this.onMouseDown(e, comment)
-    //   );
-    //   dline.stage.addChild(horizontalLine);
-    //   dline.stage.addChild(guideLine);
-    //   dline.stage.addChild(container);
-    //   dline.stage.update();
-    // }
-    // public onMouseDown(e: any, comment: Comment) {
-    //   this.curOnSelectedComment = comment;
-    //   e.target.alpha = 1;
-    //   const endDrawNode = comment.eNode.drawNodes[0];
-    //   const dline = this.getDrawLineByDNode(
-    //     endDrawNode
-    //   ); // 末尾标记节点所在行
-    //   for (let i = 3; i < dline.stage.children.length; i++) {
-    //     const child = dline.stage.children[i];
-    //     if (child instanceof createjs.Shape && child.name === comment.id) {
-    //       child.alpha = 1;
-    //     }
-    //   }
-    //   // dline.update();
-    //   dline.stage.update();
-    // }
-    //#endregion
-    // /**
-    //  * 根据路径,返回drawHeader实例
-    //  * @param spath
-    //  */
-    // public getHeaderByPath(spath: string): DrawHeader {
-    //   const arr = spath.split("/");
-    //   const index = parseInt(arr[1]);
-    //   if (index > this.headerDNodes.length - 1) {
-    //     //新的页眉,添加新的数据
-    //     this.headerDNodes.push(new Array<DrawLine | DrawTable>());
-    //     this.buildDrawTree(`${gHeaderPath}/${index}`);
-    //   }
-    //   const path = `${arr[0]}/${arr[1]}`;
-    //   let item = this._headers.get(path);
-    //   if (!item) {
-    //     item = new DrawHeader(path); //, this.headerDNodes[index]);
-    //     this._headers.set(path, item);
-    //   }
-    //   return item;
-    // }
-    // /**
-    //  * 根据路径,返回DrawFooter实例
-    //  * @param spath
-    //  */
-    // public getFooterByPath(spath: string): DrawFooter {
-    //   const arr = spath.split("/");
-    //   const index = parseInt(arr[1]);
-    //   if (index > this.footerDNodes.length - 1) {
-    //     this.footerDNodes.push(new Array<DrawLine | DrawTable>());
-    //     this.buildDrawTree(`${gFooterPath}/${index}`);
-    //   }
-    //   const path = `${arr[0]}/${arr[1]}`;
-    //   let item = this._footers.get(path);
-    //   if (!item) {
-    //     item = new DrawFooter(path); //, this.footerDNodes[index]);
-    //     this._footers.set(path, item);
-    //   }
-    //   return item;
-    // }
   }, {
     key: "onSelectChanged",
     value: function onSelectChanged(e) {
@@ -86672,31 +85875,14 @@ var DrawTree = /*#__PURE__*/function () {
       if (e.newRange.startPath === "" || e.newRange.endPath === "") {
         return false;
       }
-      // if (this._inChanging) {
-      //   setTimeout(() => {
-      //     this.onSelectChanged(e);
-      //   }, 200);
-      // }
-      var startNP = hoEditorFactory.docTree.findNodePositionByPath(e.newRange.startPath);
       var endNp = hoEditorFactory.docTree.findNodePositionByPath(e.newRange.endPath);
       var pStartPoint = StagePosition/* StagePosition */.M.getStagePosByPath(this._hoEditorFactoryID, e.newRange.startPath);
-      // if (pStartPoint.dline instanceof DrawLine && !pStartPoint.dline.stage) {
-      //   setTimeout(() => {
-      //     this.onSelectChanged(e);
-      //   }, 200);
-      // }
       var pEndPoint;
       if (e.newRange.endPath === e.newRange.startPath) {
         pEndPoint = pStartPoint;
       } else {
         pEndPoint = StagePosition/* StagePosition */.M.getStagePosByPath(this._hoEditorFactoryID, e.newRange.endPath);
       }
-      // if (pStartPoint.dline instanceof DrawLine && !pEndPoint.dline.stage) {
-      //   setTimeout(() => {
-      //     this.onSelectChanged(e);
-      //   }, 200);
-      // }
-      //this._selectRange.clearAllSelectShape;
       this._selectRange.spStart = pStartPoint;
       this._selectRange.spEnd = pEndPoint;
       this.drawSelectRange();
@@ -86910,38 +86096,6 @@ var DrawTree = /*#__PURE__*/function () {
       }
       return [droots, path];
     }
-    // /**
-    //  *
-    //  * @param pageNo 页码
-    //  * @returns 返回指定页对应的页眉文档路径
-    //  */
-    // public getPageHeaderPath(pageNo: number): string {
-    //   let ret = "";
-    //   const dNodes = this.getHeaderDNodes(pageNo);
-    //   if (dNodes) {
-    //     const index = this._headerChildNodes.indexOf(dNodes);
-    //     if (index >= 0) {
-    //       ret = `${gHeaderPath}/${index}`;
-    //     }
-    //   }
-    //   return ret;
-    // }
-    // /**
-    //  *
-    //  * @param pageNo 页码
-    //  * @returns 返回指定页对应的页脚文档路径
-    //  */
-    // public getPageFooterPath(pageNo: number): string {
-    //   let ret = "";
-    //   const dNodes = this.getFooterDNodes(pageNo);
-    //   if (dNodes) {
-    //     const index = this._footerChildNodes.indexOf(dNodes);
-    //     if (index >= 0) {
-    //       ret = `${gFooterPath}/${index}`;
-    //     }
-    //   }
-    //   return ret;
-    // }
     /**
      * @author xyl
      * @param dPage  绘制页
@@ -86981,12 +86135,6 @@ var DrawTree = /*#__PURE__*/function () {
         if (lineIndex === 0) {
           selectStart = dLine.paragraphNode.getNodePath();
         } else {
-          //取上一行的最后一个绘制点
-          // console.log("line", lineIndex);
-          // console.log(
-          //   "length",
-          //   dLine.paragraphNode.drawlines[lineIndex - 1].drawItems.length
-          // );
           var dNode = dLine.paragraphNode.drawlines[lineIndex - 1].drawItems[dLine.paragraphNode.drawlines[lineIndex - 1].drawItems.length - 1];
           if ((0,IDrawInfos/* instanceOfIDrawInfos */.r)(dNode)) {
             var node = dNode.node;
@@ -87036,16 +86184,6 @@ var DrawTree = /*#__PURE__*/function () {
           dPage = hoEditorFactory.drawPageTree.getDrawPageByDNode(dPageTable);
         }
       }
-      //   const drawPageTable = (dNode as DrawTable).drawPageTables.values().next()
-      //     .value;
-      //   if (drawPageTable instanceof DrawPageTable) {
-      //     dNode = drawPageTable;
-      //     const [dPage, x, y, aHeight] = drawPageTable.getPageTableStartPos();
-      //     this._caret.height = aHeight;
-      //     if (dPage.drawSelectLevel)
-      //     return;
-      //   }
-      // }
       var dline = this.getDrawLineByDNode(dNode);
       dPage = hoEditorFactory.drawPageTree.getDrawPageByDNode(dline);
       if (strPath.startsWith(DocTree/* gHeaderPath */.Yh) || strPath.startsWith(DocTree/* gFooterPath */.LE)) {
@@ -87091,7 +86229,6 @@ var DrawTree = /*#__PURE__*/function () {
       } else {
         this._caretTimeOutCount += 1;
         if (this._caretTimeOutCount > 5) {
-          // this.rebuildAllDrawLine();
           this._caretTimeOutCount = 0;
           return;
         } else setTimeout(function () {
@@ -87130,13 +86267,11 @@ var DrawTree = /*#__PURE__*/function () {
   }, {
     key: "moveCaretToDitem",
     value: function moveCaretToDitem(dPage, dLine, index) {
-      // this._caret.visible = true;
       var dParent = dLine.parent;
       while (dParent && !(dParent instanceof DrawArea/* DrawArea */.l)) {
         dParent = dParent.parent;
       }
       if (!dParent || !(dParent instanceof DrawArea/* DrawArea */.l)) {
-        // throw new Error(`错误的光标位置`);
         return;
       }
       var dPlace = dParent;
@@ -87155,7 +86290,6 @@ var DrawTree = /*#__PURE__*/function () {
             dest.x += dLine.dWidth / 2;
           }
         }
-        //this._caret.dLine = dLine;
         this._caret.height = dLine.dHeight + dLine.paragraphNode.combineParagraph.lineSpace;
         // 只读模式
         if (this._paintStatus !== PaintState.psReadOnly) {
@@ -87180,18 +86314,7 @@ var DrawTree = /*#__PURE__*/function () {
             }
           }
           var _dest = dLine.localToLocal(x + dNode.dWidth + aCharSpace - 1, 0, dPage.drawDocContainer);
-          // console.log(`dNode坐标x=${ dNode.x}宽度=${(dNode as DrawInfos).dWidth} 空白=${ (dNode as DrawInfos).charSpace}  y=${dLine.y} ` );
-          // console.log(`dNode的变换后的坐标x=${dest.x}  y=${dest.y}` );
           this._caret.height = dLine.dHeight + dLine.paragraphNode.combineParagraph.lineSpace;
-          // this._caret.dLine = dLine;
-          // if (dNode instanceof DrawTextNode) {
-          //   this._caret.height =
-          //     dNode.dHeight * dLine.paragraphNode.combineParagraph.lineSpace +
-          //     dLine.paragraphNode.combineParagraph.lineSpace;
-          // } else {
-          //   this._caret.height =
-          //     dLine.dHeight + dLine.paragraphNode.combineParagraph.lineSpace;
-          // }
           if (this._paintStatus !== PaintState.psReadOnly) {
             if (dNode instanceof DrawSignNode/* DrawSignNode */.V) {
               this._caret.setStagePosition(_dest.x - dNode.dWidth, _dest.y);
@@ -87311,38 +86434,9 @@ var DrawTree = /*#__PURE__*/function () {
   }, {
     key: "clearAllPage",
     value: function clearAllPage() {
-      // this._activePage = null;
       for (var i = 0; i < this._drawPages.length; i++) {
         this._drawPages[i].clear();
-        // if (this._paintStatus === PaintState.psPreview) {
-        //   const dpage = this._drawPages[i];
-        //   if (dpage && dpage.drawDomLevel && dpage.drawSelectLevel) {
-        //     if (
-        //       this.paintStatus !== PaintState.psPreview
-        //     ) {
-        //       dpage.drawSelectLevel.stage = new createjs.StageGL(
-        //         dpage.drawSelectLevel.selectCanvas,
-        //         {
-        //           transparent: true,
-        //         }
-        //       );
-        //       dpage.drawDomLevel.stage = new createjs.StageGL(
-        //         dpage.drawDomLevel.canvas
-        //       );
-        //       (dpage.drawDomLevel.stage as any).setClearColor("#ffffff");
-        //     } else {
-        //       dpage.drawSelectLevel.stage = new createjs.Stage(
-        //         dpage.drawSelectLevel.selectCanvas
-        //       );
-        //       dpage.drawDomLevel.stage = new createjs.Stage(
-        //         dpage.drawDomLevel.canvas
-        //       );
-        //     }
-        //     dpage.init(dpage.drawDomLevel, dpage.drawSelectLevel);
-        //   }
-        // }
       }
-
       this._drawPages.length = 0;
     }
     // 清理绘制树
@@ -87427,27 +86521,10 @@ var DrawTree = /*#__PURE__*/function () {
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID); // const [dCell, dlines] = this.getDrawRootsByPath(strPath);
-              // if (!dlines) {
-              //   console.log("无法根据文档路径找到绘制树:" + strPath);
-              //   return;
-              // }
+              hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
               pageIndex = 0;
               this.clearDrawContainer(dlines);
               this.initAreaFirstNode(nodes, dlines);
-              // const np = hoEditorFactory.docTree.findNodePositionByPath(strPath);
-              // if (np) {
-              //   if (!np.node) {
-              //     console.log("无法根据文档路径找到文档树:" + strPath);
-              //     return;
-              //   } else
-              // (nodes[0] as ParagraphNode).node2DrawNode();
-              // const strPath = nodes[0].getNodePath();
-              // const drawArea = hoEditorFactory.drawPageTree.getFirstDrawArea(
-              //   strPath
-              // );
-              // dlines.push((nodes[0] as ParagraphNode).drawlines[0]);
-              // drawArea.addChild((nodes[0] as ParagraphNode).drawlines[0]);
               dcChangeEvent = new NodeChangeEvent/* NodeChangeEvent */.G(this._hoEditorFactoryID, DocTree/* DocAction */.gk.daInsert, nodes[0].getNodePath(),
               //"main/0",
               hoEditorFactory.docTree.getNodeLastPath(nodes[nodes.length - 1]));
@@ -87463,15 +86540,7 @@ var DrawTree = /*#__PURE__*/function () {
         return _buildDrawTree.apply(this, arguments);
       }
       return buildDrawTree;
-    }() // public fullRePaint() {
-    //   return;
-    // }
-    // public updateByRange() {
-    //   return;
-    // }
-    // public updateDrawtreeRange(range: DomRange): void {
-    //   return;
-    // }
+    }()
     /**
      * @author xyl
      * @param nodePath 树节点路径
@@ -87510,10 +86579,6 @@ var DrawTree = /*#__PURE__*/function () {
     value: function getDNodeByPath(strPath) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       var np = hoEditorFactory.docTree.findNodePositionByPath(strPath);
-      // const roots= this.getDrawRootsByPath(dPath);
-      // const darr = dPath.split("/");
-      // let istart=1;
-      // let proots: createjs.DisplayObject[]|null =roots;
       if (np && np.node) {
         if (np.childIndex >= 0) {
           if (np.node instanceof TextNode/* TextNode */.R) {
@@ -87577,78 +86642,6 @@ var DrawTree = /*#__PURE__*/function () {
       }
       return ret;
     }
-    // public updateDrawTree(range: DomRange): boolean {
-    //   return false;
-    // }
-    // //是否能放入此方框
-    // public canFit(
-    //   drawObj: createjs.DisplayObject,
-    //   x: number,
-    //   y: number,
-    //   arect: createjs.Rectangle
-    // ): boolean {
-    //   const abound = drawObj.getBounds();
-    //   return arect.contains(x, y, abound.width, abound.height);
-    // }
-    // //放入方框
-    // public addToRect(
-    //   drawObj: createjs.DisplayObject,
-    //   x: number,
-    //   y: number,
-    //   arect: createjs.Rectangle
-    // ): createjs.Rectangle {
-    //   const abound = drawObj.getBounds();
-    //   return arect.union(
-    //     new createjs.Rectangle(x, y, abound.width, abound.height)
-    //   );
-    // }
-    // public getClickedPosition(
-    //   dPage: DrawPage,
-    //   stage: createjs.Stage,
-    //   x: number,
-    //   y: number,
-    //   stageX: number,
-    //   stageY: number
-    // ) {
-    //   const roots = this.getDrawNodesByPos(dPage, x, y);
-    //   if (!roots) {
-    //     return;
-    //   } else if (roots.length === 0) {
-    //     return;
-    //   } else {
-    //     const dLine = roots[roots.length - 1];
-    //     let arect: createjs.Rectangle;
-    //     if (dLine.dTop + dLine.dHeight < y) {
-    //       if (dLine.drawItems.length > 0) {
-    //         arect = dLine.drawItems[dLine.drawItems.length - 1].getBounds();
-    //         stageX = arect.x + arect.width + 1;
-    //         stageY = arect.y;
-    //       } else {
-    //         arect = dLine.getBounds();
-    //         stageX = arect.x;
-    //         stageY = arect.y;
-    //       }
-    //     } else {
-    //       const dobj = stage.getObjectUnderPoint(stageX, stageY, 0);
-    //       arect = dobj.getBounds();
-    //       stageX = arect.x + arect.width + 1;
-    //       stageY = arect.y;
-    //     }
-    //   }
-    // }
-    //  public paintItem(obj:BaseNode , pos: PaintPosition ): PaintPosition{
-    //  }
-    //   //完全重绘
-    //  public fullDraw(): void {
-    //    createjs.Ticker.paused=true;
-    //     // this.clearAllPage();
-    //     // let pageIndex=0;
-    //     let dPage= this.drawPages[pageIndex];
-    //     let paintPosition= new PaintPosition()
-    //     for (let i=0;i<this.__docTree.nodes.length;i++){
-    //       this.paintItem(this.__docTree.nodes[i])
-    //     }
-    //   }
     //激活页
   }, {
     key: "getLevel",
@@ -87664,27 +86657,6 @@ var DrawTree = /*#__PURE__*/function () {
       } while (pnode !== null);
       return iret;
     }
-    // public addNewParagraph(dNode: DrawParagraph): DrawParagraph{
-    //    let pdNode= dNode.parentDNode;
-    //    let ret: DrawParagraph;
-    //    }
-    // }
-    // /**
-    //  * @author xyl
-    //  * @param startPath 重绘起始位置
-    //  * @param endPath  //重绘结束位置
-    //  * @returns 获取重绘范围
-    //  */
-    // public   updateRedrawRange(startPath: NodePath,endPath: NodePath){
-    //   if (!this._redrawRange){
-    //     const start= new PaintPosition(this,startPath);
-    //     const end= new PaintPosition(this,endPath);
-    //     this._redrawRange=new PaintRange(this,start,end);
-    //   } else {
-    //     this._redrawRange.startPos.dPath=startPath;
-    //     this._redrawRange.endPos.dPath=endPath
-    //   }
-    // }
   }, {
     key: "getDrawLineByDNode",
     value: function getDrawLineByDNode(dNode) {
@@ -87701,7 +86673,6 @@ var DrawTree = /*#__PURE__*/function () {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       var dLine = hoEditorFactory.docTree.getNodeParaNode(dNode.node).getLastDrawline();
       return dLine;
-      //  throw new Error(`未找到路径${((dNode as unknown) as  DrawInfos).node.getNodePath()}的绘制行`)
     }
     /**
      * @author xyl
@@ -87732,27 +86703,7 @@ var DrawTree = /*#__PURE__*/function () {
       var hoeditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       var prevPara = hoeditorFactory.docTree.getSameRectPrevParanode(paraNode);
       var dTop = 0;
-      // const pNode = paraNode.parentNode;
       if (!prevPara || hoeditorFactory.drawTree.paintStatus != PaintState.psDesign && prevPara.customProperty && prevPara.customProperty.hidden == "true") {
-        // if (pNode) {
-        //   if (
-        //     pNode instanceof CellNode &&
-        //     (pNode as CellNode).childNodes.length > 0
-        //   ) {
-        //     const cell = pNode as CellNode;
-        //     const rowIndex = cell.childNodes.indexOf();
-        //     dTop = cell.table.rowInfos[rowIndex].rowBaseDTop;
-        //   } else if (pNode instanceof TextInputFieldNode) {
-        //     const snode = pNode as TextInputFieldNode;
-        //     //TODO:后面添加属性后这里再做更新
-        //     const lineindex = 0;
-        //     dTop = 0;
-        //   } else {
-        //     throw new Error(
-        //       "错误的文档结构，文档与区域节点，需要以段落为起始节点"
-        //     );
-        //   }
-        // }
         dTop = paraNode.combineParagraph.topMarginPixes;
       }
       //存在上一个同区域段落节点
@@ -87790,9 +86741,6 @@ var DrawTree = /*#__PURE__*/function () {
           } else {
             //页的起始段茖
             var dpageIndex = pageNo;
-            // if (!paraNode.rootPath.startsWith(gMainPath) && this._activePage) {
-            //   dpageIndex = this._activePage.pageIndex;
-            // }
             return new PagePaintPosition/* PagePaintPosition */.O(this._hoEditorFactoryID, dpageIndex, paraNode.combineParagraph.leftMarginPixes, paraNode.combineParagraph.topMarginPixes);
           }
         } else {
@@ -87830,8 +86778,6 @@ var DrawTree = /*#__PURE__*/function () {
     key: "addPage",
     value: function addPage() {
       var dpage = new DrawPage(this._hoEditorFactoryID, this._drawPages.length //,
-      //HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree,
-      //this
       );
 
       this._drawPages.push(dpage);
@@ -87851,14 +86797,6 @@ var DrawTree = /*#__PURE__*/function () {
         //将拉置排序
         var aRange = this._selectRange.normalize();
         this._caret.visible = false;
-        // const [dStartCell, startRoots] = this.getDrawRootsByPath(
-        //   aRange.spStart.path
-        // );
-        // const [dEndCell, endRoots] = this.getDrawRootsByPath(
-        //   aRange.spEnd.path
-        // );
-        // const istart = roots.indexOf(aRange.spStart.dline);
-        // const iend = roots.indexOf(aRange.spEnd.dline);
         aRange.clearAllSelectShape();
         if (aRange.spStart.path.indexOf('-') > 0 || aRange.spEnd.path.indexOf('-') > 0) {
           return;
@@ -87871,22 +86809,14 @@ var DrawTree = /*#__PURE__*/function () {
           return;
         }
         var arrDrawDlines = new SelectRange/* SelectRange */.E(this._hoEditorFactoryID).getRangeDrawLines(aRange.spStart.path, aRange.spEnd.path, false);
-        // const adomRange = new DomRange(
-        //   this._hoEditorFactory,
-        //   aRange.spStart.path,
-        //   aRange.spEnd.path
-        // );
         var bInSameRect = NodePosition/* NodePosition */.F.pathInSameRect(this._hoEditorFactoryID, aRange.spStart.path, aRange.spEnd.path);
         //选区变化后，删除不在选区内的绘制块内容
-        // const shapeMap = aRange.clearNotInRangeShape(aRange, istart, iend);
         var dPage = aRange.spStart.page;
         var dStartDline = aRange.spStart.dline;
         var istart = 0;
-        if (dStartDline instanceof DrawLine/* DrawLine */.a) istart = arrDrawDlines.indexOf(dStartDline);
-        // const [dcell, droots] = this.getDrawRootsByPath(aRange.spStart.path);
-        // let arrDrawDlines: Array<DrawLine | DrawTable> = new Array<
-        //   DrawLine | DrawTable
-        // >();
+        if (dStartDline instanceof DrawLine/* DrawLine */.a) {
+          istart = arrDrawDlines.indexOf(dStartDline);
+        }
         for (var i = istart; i < arrDrawDlines.length; i++) {
           var left = 0;
           var dnextDline = arrDrawDlines[i];
@@ -87895,7 +86825,6 @@ var DrawTree = /*#__PURE__*/function () {
           }
           var right = 1 + dnextDline.paragraphNode.combineParagraph.charSpace;
           dPage = hoeditorfacotry.drawPageTree.getDrawPageByDNode(dnextDline);
-          // const idItemStart = nextRoots.indexOf(dnextDline);
           //处理开始行的部分选中
           if (dnextDline === aRange.spStart.dline && aRange.spStart.index >= 0) {
             var ditem = dnextDline.drawItems[aRange.spStart.index];
@@ -87907,7 +86836,6 @@ var DrawTree = /*#__PURE__*/function () {
               left = ditem.x + ditem.dWidth + dnextDline.charSpace;
             }
           }
-          // if (!dPage) dPage = this.getDrawPageByDomStage(dnextDline.stage);
           //处理结束行的部分选中
           if (dnextDline === aRange.spEnd.dline) {
             if (aRange.spEnd.index >= 0) {
@@ -87928,16 +86856,6 @@ var DrawTree = /*#__PURE__*/function () {
               right = _ditem2.x + _ditem2.dWidth + dnextDline.charSpace;
             }
           }
-          // if (shapeMap.has(i) && shapeMap.get(i)) {
-          //   const shape = shapeMap.get(i);
-          //   if (shape) {
-          //     shape.startIndex = idItemStart;
-          //     shape.endIndex = idItemEnd;
-          //     if (shape.bChanged && dPage && dPage.drawSelectLevel) {
-          //       shape.updateShape();
-          //     }
-          //   }
-          // } else {
           if (dPage && dPage.selectContainer) {
             var shape = new DrawSelect(this._hoEditorFactoryID, dPage.pageIndex, dnextDline, left, right, bInSameRect, aRange.spStart.dline.paragraphNode.parentNode, aRange.spEnd.dline.paragraphNode.parentNode, "blue");
             shape.name = "select";
@@ -87948,27 +86866,12 @@ var DrawTree = /*#__PURE__*/function () {
             }
             this.selectRange.addSelectShape(shape);
           }
-          // }
-          // if (dnextDline === aRange.spEnd.dline) {
-          //   break;
-          // }
-          // const oldDline: DrawLine | DrawTable = dnextDline;
         }
-
         for (var j = dPages.length - 1; j >= 0; j--) {
           var aPage = dPages[j];
           if (aPage && aPage.drawSelectLevel && aPage.drawSelectLevel.stage) aPage.drawSelectLevel.stage.update();
         }
       }
-      //function
-      // public insertNode;
-      // public updateNode;x
-      // public addNode;
-      // public selectNode
-      // public getNextSibling;
-      // public getPrevSibling;
-      // public removeNode;
-      // public draw;
     }
   }, {
     key: "drawMultiCustomRange",
@@ -88026,7 +86929,6 @@ var DrawTree = /*#__PURE__*/function () {
                 left = ditem.x + ditem.dWidth + dnextDline.charSpace;
               }
             }
-            // if (!dPage) dPage = this.getDrawPageByDomStage(dnextDline.stage);
             //处理结束行的部分选中
             if (dnextDline === aRange.spEnd.dline) {
               if (aRange.spEnd.index >= 0) {
@@ -88050,8 +86952,6 @@ var DrawTree = /*#__PURE__*/function () {
             var color = hoeditorfacotry.option.getColorByLevel(15);
             if (dPage && dPage.selectContainer) {
               var shape = new DrawSelect(this._hoEditorFactoryID, dPage.pageIndex, dnextDline, left, right, bInSameRect, aRange.spStart.dline.paragraphNode.parentNode, aRange.spEnd.dline.paragraphNode.parentNode, color, true);
-              //shape.name = "select";
-              //shape.alpha = 0.3;
               dPage.selectContainer.addChild(shape);
               if (dPages.indexOf(dPage) < 0) {
                 dPages.push(dPage);
@@ -88065,15 +86965,6 @@ var DrawTree = /*#__PURE__*/function () {
           if (aPage && aPage.drawSelectLevel && aPage.drawSelectLevel.stage) aPage.drawSelectLevel.stage.update();
         }
       }
-      //function
-      // public insertNode;
-      // public updateNode;x
-      // public addNode;
-      // public selectNode
-      // public getNextSibling;
-      // public getPrevSibling;
-      // public removeNode;
-      // public draw;
     }
   }, {
     key: "insertDline",
@@ -88141,126 +87032,6 @@ var DrawTree = /*#__PURE__*/function () {
         }
       }, listDrawLineByPathRange);
     })
-    /*
-    public addEventForNode(dline: DrawLine, node: BaseNode) {
-      const drawSelectLevel = (this.activePage
-        ?.drawSelectLevel as unknown) as DrawSelectLevel;
-      if (node instanceof RadioAndCheckBoxNode) {
-        if (drawSelectLevel) {
-          if (drawSelectLevel.shapesColor.get(node.id)) {
-            return;
-          }
-        }
-      }
-      this.drawBackcolor(dline, node);
-    }
-        public drawBackcolor(dline: DrawLine, node: BaseNode) {
-      const drawSelectLevel = (this.activePage
-        ?.drawSelectLevel as unknown) as DrawSelectLevel;
-      const dPage = this.activePage;
-      const drawDomLevel = (this.activePage
-        ?.drawDomLevel as unknown) as DrawDomLevel;
-      const bColor = new createjs.Shape();
-      if (drawSelectLevel && drawDomLevel && dPage) {
-        if (node instanceof RadioAndCheckBoxNode) {
-          const drawNode = node.drawNodes[0] as DrawRadioAndCheckBox;
-          const stagePt = dPage.drawMainDoc.localToGlobal(drawNode.x, dline.y);
-          const localPt = drawSelectLevel.stage.globalToLocal(
-            stagePt.x,
-            stagePt.y
-          );
-          bColor.y = localPt.y;
-          bColor.graphics
-            .beginFill("#ADD8E6")
-            .drawRect(
-              localPt.x,
-              dline.dHeight / 4,
-              drawNode.dWidth,
-              drawNode.dHeight
-            );
-          bColor.alpha = 0.01;
-          drawSelectLevel.stage.addChild(bColor);
-          drawSelectLevel.shapesColor.set(node.id, bColor);
-          // bColor.on("click", (aevent: any) => {
-          //   if (aevent.nativeEvent.button === 0) {
-          //     const nodeClickEvent = new NodeClickEvent(node, "click");
-          //     HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.nodeClick(nodeClickEvent);
-          //   }
-          // });
-        }
-        const mouseOverEvent = new NodeMouseOverEvent(node, bColor);
-        //this.nodeMouseOver(mouseOverEvent);
-        const mouseOutEvent = new NodeMouseOutEvent(node, bColor);
-        this.onMouseOut(mouseOutEvent);
-      }
-    }
-        public onMouseOver(e: NodeMouseOverEvent): boolean {
-      e.selectShape.on("mouseover", (aevent: any) => {
-        if (e.node instanceof RadioAndCheckBoxNode) {
-          const drawSelectLevel = (this.activePage
-            ?.drawSelectLevel as unknown) as DrawSelectLevel;
-          const node = e.node;
-          aevent.target.alpha = 0.4;
-          const boxsMap = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.radioAndCheckBoxsMap;
-          if (boxsMap.size > 1) {
-            boxsMap.forEach((value, key) => {
-              if (
-                value.id !== node.id &&
-                node.controlStyle === value.controlStyle &&
-                node.groupName === value.groupName &&
-                node.groupName.length > 0
-              ) {
-                const shape = drawSelectLevel.shapesColor.get(value.id);
-                if (shape && shape.alpha !== 0.4) {
-                  shape.alpha = 0.4;
-                }
-              }
-            });
-          }
-        }
-      });
-      return true;
-    }
-        public onMouseOut(e: NodeMouseOutEvent): boolean {
-      e.selectShape.on("mouseout", (aevent: any) => {
-        if (e.node instanceof RadioAndCheckBoxNode) {
-          const drawSelectLevel = (this.activePage
-            ?.drawSelectLevel as unknown) as DrawSelectLevel;
-          const radioAndCheckBoxsMap = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree
-            .radioAndCheckBoxsMap;
-          aevent.target.alpha = 0.01;
-          if (radioAndCheckBoxsMap.size > 1) {
-            drawSelectLevel.shapesColor.forEach((value, key) => {
-              if (value.alpha !== 0.01) {
-                value.alpha = 0.01;
-              }
-            });
-          }
-        }
-      });
-      return true;
-    }
-        public repaintSelectShape() {
-      const drawSelectLevel = (this.activePage
-        ?.drawSelectLevel as unknown) as DrawSelectLevel;
-      const selectShapes = drawSelectLevel?.shapesColor;
-      const boxsMap = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.radioAndCheckBoxsMap;
-      if (selectShapes) {
-        if (selectShapes.size > 0) {
-          selectShapes.forEach((value, key) => {
-            selectShapes.delete(key);
-            this.activePage?.drawSelectLevel?.stage.removeChild(value);
-          });
-        }
-        boxsMap.forEach((value, key) => {
-          const path = value.getNodePath();
-          const dline = this.getDlineByPath(path);
-          if (dline) this.drawBackcolor(dline, value);
-        });
-      }
-    }
-        
-    */
   }, {
     key: "updateDlineLeftTop",
     value: function updateDlineLeftTop(hoEditorFactory, dline) {
@@ -88307,9 +87078,7 @@ var DrawTree = /*#__PURE__*/function () {
           _dline3.drawPageTables[0].y = hoEditorFactory.firstPageStartTop;
         } else {
           _dline3.dTop = hoEditorFactory.firstPageStartTop;
-          // dline.y = hoEditorFactory.firstPageStartTop;
         }
-
         this.updateDlineLeftTop(hoEditorFactory, _dline3);
       }
     }
@@ -88353,8 +87122,6 @@ var DrawTree = /*#__PURE__*/function () {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               moveCaret = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : true;
-              // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawPageTree.clear;
-              // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawPageTree.initDoc();
               hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
               if (hoEditorFactory.firstPageStartTop > 0) {
                 this.drawPages[0].storeDrawHeader.visible = false;
@@ -88603,7 +87370,6 @@ var DrawTree = /*#__PURE__*/function () {
     key: "updatePageCountNodes",
     value: function updatePageCountNodes() {
       var _this4 = this;
-      // const pageCount = this.drawPages.length;
       var hoeditfactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       this.pageCountNodes.forEach(function (value, key) {
         value.drawNodes[0].updatePaint();
@@ -88613,66 +87379,14 @@ var DrawTree = /*#__PURE__*/function () {
             hoeditfactory.subDocManger.updateAllSameSubDoc(dArea.index, dArea.hftType, false, false);
           }
         }
-        // value.text = this.drawPages.length.toStri
-        // const strText = value.getPageNumText(pageCount, false);
-        // (value.drawNodes[0] as DrawPageCountNode).updatePageCount(strText);
-        // if (value.rootPath.startsWith("main")) {
-        //   if (value.drawNodes[0].stage) {
-        //     const dPage = this.getDrawPageByDomStage(value.drawNodes[0].stage);
-        //     // this.removePageMarkDrawNode(value);
-        //     // if (dPage) this.drawAPageMark(dPage, value);
-        //   }
-        // } else {
-        //   HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).subDocManger.updateAPageMark(value);
-        // }
       });
-      // this.pageNumNodes.forEach((value, key) => {
-      //   const drawNode = value.drawNodes[0];
-      //   const drawPage = this.getDrawPageByDomStage(drawNode.stage);
-      //   if (drawPage) {
-      //     if (value.rootPath.startsWith("main")) {
-      //       this.drawAPageMark(value);
-      //     } else {
-      //       HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).subDocManger.updateAPageMark(value);
-      //     }
-      //   }
-      // });
     }
-    // public removeaPageMark(pageMarkNode: PageNumNode | PageCountNode) {
-    //   const path = pageMarkNode.getNodePath();
-    //   if (path.startsWith("main")) {
-    //     this.removePageMarkDrawNode(pageMarkNode);
-    //   } else {
-    //     HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).subDocManger.removeAPageMark(pageMarkNode);
-    //   }
-    // }
-    // private drawAPageMark(
-    //   dPage: DrawPage,
-    //   pageMarkNode: PageNumNode | PageCountNode
-    // ) {
-    //   //this.removePageMarkDrawNode(pageMarkNode);
-    //   // const dNode = pageMarkNode.drawNodes[0];
-    //   if (dPage && dPage.drawDomLevel) {
-    //     const dPageMarkNode = DrawPageMarkNode.paintMarkNode(
-    //       this._hoEditorFactory,
-    //       pageMarkNode,
-    //       dPage,
-    //       dPage.drawMainDoc
-    //     );
-    //     this._drawPageMarks.push(dPageMarkNode);
-    //     dPage.drawDomLevel.stage.addChild(dPageMarkNode);
-    //     dPage.drawDomLevel.stage.update();
-    //     // dNode.stage.update();
-    //   }
-    // }
   }, {
     key: "repaintPageMarkNodes",
     value: function repaintPageMarkNodes(dPage, strPath) {
       var arrNodes = this.getSubDocPageMarkNodes(strPath);
       for (var i = arrNodes.length - 1; i >= 0; i--) {
         arrNodes[i].drawNodes[0].updatePaint();
-        // this.removePageMarkDrawNode(arrNodes[i]);
-        // this.drawAPageMark(dPage, arrNodes[i]);
       }
     }
   }, {
@@ -88691,23 +87405,6 @@ var DrawTree = /*#__PURE__*/function () {
       });
       return ret;
     }
-    // public removeaPageMark(pageMarkNode: PageNumNode | PageCountNode) {
-    //   const path = pageMarkNode.getNodePath();
-    //   if (path.startsWith("main")) {
-    //     this.removePageMarkDrawNode(pageMarkNode);
-    //   } else {
-    //     HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).subDocManger.removeADrawPageMark(pageMarkNode);
-    //   }
-    // }
-    // public removePageMarkDrawNode(pageMarkNode: PageNumNode | PageCountNode) {
-    //   for (let i = pageMarkNode.length - 1; i >= 0; i--) {
-    //     const dNode = this._drawPageMarks[i];
-    //     if (dNode.node == pageMarkNode) {
-    //       dNode.stage.removeChild(dNode);
-    //       this._drawPageMarks.splice(i, 1);
-    //     }
-    //   }
-    // }
   }, {
     key: "clear",
     value: function clear(dlines) {
@@ -88729,11 +87426,11 @@ var DrawTree = /*#__PURE__*/function () {
           dline.uncache();
           for (var _i2 = 0; _i2 < dline.drawItems.length - 1; _i2++) {
             dline.drawItems[_i2].removeAllEventListeners();
-            if (dline.drawItems[_i2] instanceof DrawContainer/* DrawContainer */.H) dline.drawItems[_i2].removeAllChildren();
+            if (dline.drawItems[_i2] instanceof DrawContainer/* DrawContainer */.H) {
+              dline.drawItems[_i2].removeAllChildren();
+            }
             dline.drawItems[_i2].drawItems.length = 0;
-            // this.removeChild(this._drawItems[i]);
           }
-
           dline.removeAllChildren();
           dline.drawItems.length = 0;
         }
@@ -88766,21 +87463,6 @@ var DrawTree = /*#__PURE__*/function () {
       this._pageNumNodes = new Map();
       this._pageCountNodes = new Map();
       this._errorsMap = new Map();
-      // this._drawPageMarks = [];
-      // const drawObjet = this.getDNodeByPath("main/0");
-      // if (drawObjet instanceof DrawTable) {
-      //   const drawPageTable = drawObjet.getDrawTableByPageIndex(
-      //     0
-      //   ) as DrawPageTable;
-      //   if (drawPageTable) {
-      //     drawPageTable.stage.children.splice(
-      //       3,
-      //       drawPageTable.stage.children.length - 1
-      //     );
-      //   }
-      // } else {
-      //   drawObjet.stage.children.splice(3, drawObjet.stage.children.length - 1); //去掉画的批注
-      // }
       this._drawPages.splice(0, this._drawPages.length);
       if (this._drawPageCount) {
         this._drawPageCount.count = 0;
@@ -88810,9 +87492,6 @@ var DrawTree = /*#__PURE__*/function () {
           for (var c = 0; c < tb.colCount; c++) {
             var cell = tb.rows[r][c];
             if (cell && cell.drawCell.needUpdate) {
-              // const lastDline =
-              //   cell.drawCell.drawLines[cell.drawCell.drawLines.length - 1];
-              // cell.drawCell.docHeight = lastDline.dHeight + lastDline.dTop;
               cell.drawCell.updateHeight();
               var row = r;
               if (cell.rowSpan > 1) {
@@ -88838,9 +87517,7 @@ var DrawTree = /*#__PURE__*/function () {
         _hoEditorFactory$subD2 = (0,slicedToArray/* default */.Z)(_hoEditorFactory$subD, 2),
         headerIndex = _hoEditorFactory$subD2[0],
         dRoots = _hoEditorFactory$subD2[1];
-      //  const dAreaIndex=hoEditorFactory.subDocManger.getHeaderIndexByRoots(dRoots);
       hoEditorFactory.subDocManger.copySubDocToPages(hoEditorFactory.drawPageTree.drawHeaders[headerIndex], pageIndex, SubDocManger/* HeaderFooterType */.pi.hftHead);
-      // this.subDocManger.paintSubDoc(pageIndex, HeaderFooterType.hftHead);
     }
   }, {
     key: "paintFooter",
@@ -88850,9 +87527,7 @@ var DrawTree = /*#__PURE__*/function () {
         _hoEditorFactory$subD4 = (0,slicedToArray/* default */.Z)(_hoEditorFactory$subD3, 2),
         footerIndex = _hoEditorFactory$subD4[0],
         dRoots = _hoEditorFactory$subD4[1];
-      // const dAreaIndex=hoEditorFactory.subDocManger.getFooterIndexByRoots(dRoots);
       hoEditorFactory.subDocManger.copySubDocToPages(hoEditorFactory.drawPageTree.drawFooters[footerIndex], pageIndex, SubDocManger/* HeaderFooterType */.pi.hftFoot);
-      // this.subDocManger.paintSubDoc(pageIndex, HeaderFooterType.hftFoot);
     }
   }, {
     key: "updateDrawFormular",
@@ -88862,7 +87537,6 @@ var DrawTree = /*#__PURE__*/function () {
         var pnode = value.getParentCell();
         if (cell.table == pnode.table) {
           if (value.formularType === TableFormula/* FormularType */.a.ftSum || value.formularType === TableFormula/* FormularType */.a.ftFormular || value.formularType === TableFormula/* FormularType */.a.ftBMI || value.formularType === TableFormula/* FormularType */.a.ftLaborProcess || value.formularType === TableFormula/* FormularType */.a.ftExpectedBirthDate || value.formularType === TableFormula/* FormularType */.a.ftPregnantWeeks || value.formularType === TableFormula/* FormularType */.a.ftScoreMapping || value.formularType === TableFormula/* FormularType */.a.ftBodySurfaceArea || value.formularType === TableFormula/* FormularType */.a.ftCalcDays || value.formularType === TableFormula/* FormularType */.a.ftCalcTime || value.formularType === TableFormula/* FormularType */.a.ftIdealWeight || value.formularType === TableFormula/* FormularType */.a.ftISS) {
-            //const str = value.formulaStr;
             value.updateResult();
             value.getParentCell().drawCell.needUpdate = true;
             isNeedUpdate = true;
@@ -169823,7 +168497,7 @@ var map = {
 	"./dateDialog/DateDialog.vue": 14581,
 	"./delimiter/Delimiter.vue": 93230,
 	"./expressionForm/ExpressionForm.vue": 30852,
-	"./findReplace/FindReplace.vue": 98064,
+	"./findReplace/FindReplace.vue": 33693,
 	"./gestation/Gestation.vue": 20329,
 	"./hoprint/HoPrint.vue": 79228,
 	"./listsource/ListSource.vue": 30685,
@@ -208189,7 +206863,6 @@ var DrawSelectLevel = /*#__PURE__*/function () {
       if (hoeditorfactory.drawTree.selectRange.beginRangeSelect && (parseInt(aevent.nativeEvent.buttons) && 1) === 1) {
         var _hoeditorfactory$draw2;
         if ((_hoeditorfactory$draw2 = hoeditorfactory.drawTree.activePage) !== null && _hoeditorfactory$draw2 !== void 0 && _hoeditorfactory$draw2.activeDrawRect.rootPath.startsWith(DocTree/* gMainPath */.d9) && hoeditorfactory.drawTree.activePage !== dPage) {
-          // hoeditorfactory.drawTree.activePage?.drawSelectLevel?.stage.update();
           hoeditorfactory.drawTree.activePage = dPage;
         }
         var endPos = hoeditorfactory.drawTree.getStagePosition(dPage, dPage.activeDrawRect, aevent.stageX, aevent.stageY);
@@ -210476,7 +209149,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.166');
+/* harmony default export */ var version = ('3.1.167');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(84531);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -211587,7 +210260,6 @@ var DrawPageTable = __webpack_require__(15694);
 
 
 
-
 
 
 var NeedDrawPageInfo = /*#__PURE__*/function () {
@@ -211921,21 +210593,12 @@ var DrawPageTree = /*#__PURE__*/function () {
             if (drawArea.allowAcrossPage) restHeight = drawArea.maxHeight - dTop;
           }
           // 判断是否已经满页
-          if (dline instanceof DrawTable/* DrawTable */.t && restHeight < hoEditorFactory.defaultLineHeight || dline instanceof DrawLine/* DrawLine */.a && restHeight < dline.dHeight && dTop > 0) {
+          if (dline instanceof DrawTable/* DrawTable */.t && (restHeight < hoEditorFactory.defaultLineHeight || !dline.isFirstRowCanFit(restHeight)) || dline instanceof DrawLine/* DrawLine */.a && restHeight < dline.dHeight && dTop > 0) {
             if (dline instanceof DrawLine/* DrawLine */.a && restHeight >= hoEditorFactory.defaultLineHeight) {
               if (drawArea.contains(dline)) {
                 drawArea.removeChild(dline);
               }
             }
-            // bIsFull = true;
-            // if (drawArea instanceof DrawPageCell) {
-            //   // const mainArea= this.getMainRootArea(drawArea);
-            //   // if (mainArea){
-            //   //   const nextArea= this.getNextDrawArea(mainArea);
-            //   //  hoEditorFactory.drawTree.getDrawRootsByPath(drawArea.cell.table.getNodePath());
-            //   //   this.update(mainArea,,)
-            //   // }
-            // }
             if (drawArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$) {
               //当前已经満页，绘制批注页码等信息
               this.afterAreaFinishPaint(drawArea);
@@ -211956,15 +210619,9 @@ var DrawPageTree = /*#__PURE__*/function () {
               if (drawArea.allowAcrossPage) {
                 restHeight = drawArea.maxHeight - dTop;
               }
-              /*绘制优化
-              //if (!isNew && hoEditorFactory.isUseDrawingOptimization) {
-              if (hoEditorFactory.isUseDrawingOptimization) {
-                break;
-                            }
-              */
             }
           }
-          //当前行不会触发满页,正常绘制 
+          //当前行不会触发满页,正常绘制
           var _dobj = dRoots[nextLine];
           var cbParagraph = _dobj.paragraphNode.combineParagraph;
           if (_dobj instanceof DrawTable/* DrawTable */.t) {
@@ -211990,8 +210647,6 @@ var DrawPageTree = /*#__PURE__*/function () {
                 if (drawArea.allowAcrossPage) restHeight = drawArea.maxHeight - dTop;
                 if (restHeight < TableNode/* gDefaultRowHeight */.dT && drawArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$) {
                   drawArea.endDline = nextLine - 1;
-                  // drawArea.stage.update();
-                  // this.updateDrawPage(drawArea.pageIndex);
                   this._startNeedUpdatePage = Math.min(drawArea.pageIndex, this._startNeedUpdatePage === -1 ? 99999 : this._startNeedUpdatePage);
                   this._endNeedUpdatePage = Math.max(drawArea.pageIndex, this._endNeedUpdatePage);
                   pageIsFull.set(drawArea.index, true);
@@ -212014,7 +210669,6 @@ var DrawPageTree = /*#__PURE__*/function () {
                   if (drawArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$) {
                     this._startNeedUpdatePage = Math.min(drawArea.pageIndex, this._startNeedUpdatePage === -1 ? 99999 : this._startNeedUpdatePage);
                     this._endNeedUpdatePage = Math.max(drawArea.pageIndex, this._endNeedUpdatePage);
-                    // drawArea.stage.update();
                     drawArea = this.getNextDrawArea(drawArea)[0];
                     dTop = 0;
                     if (drawArea.allowAcrossPage) {
@@ -212031,12 +210685,10 @@ var DrawPageTree = /*#__PURE__*/function () {
               restHeight -= cbParagraph.lineSpace;
             }
           } else {
-            //普通行绘制,检查是否满页，満页后需要新起一页绘制  
+            //普通行绘制,检查是否满页，満页后需要新起一页绘制
             if (_dobj.dHeight > restHeight && dTop > 0) {
               if (drawArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$) {
                 drawArea.endDline = nextLine - 1;
-                // drawArea.stage.update();
-                // this.updateDrawPage(drawArea.pageIndex);
                 this._startNeedUpdatePage = Math.min(drawArea.pageIndex, this._startNeedUpdatePage === -1 ? 99999 : this._startNeedUpdatePage);
                 this._endNeedUpdatePage = Math.max(drawArea.pageIndex, this._endNeedUpdatePage);
                 pageIsFull.set(drawArea.index, true);
@@ -212054,7 +210706,6 @@ var DrawPageTree = /*#__PURE__*/function () {
               }
               drawArea.addChild(_dobj);
               _dobj.y = dTop;
-              // dobj.x = cbParagraph.leftMarginPixes;
             }
             //修改下一行的绘制起始位置
             dTop = _dobj.y + _dobj.dHeight + _dobj.paragraphNode.combineParagraph.lineSpace;
@@ -212063,9 +210714,6 @@ var DrawPageTree = /*#__PURE__*/function () {
           }
           if (nextLine >= endLine) break;else nextLine += 1;
         }
-        // if (mainArea.stage) {
-        //   mainArea.stage.update();
-        // }
         var mainIndex = Math.min(nextLine, endLine, startUpdateLine);
         //绘制完成，清理多出来的绘制页
         if (drawArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$ && mainIndex === dRoots.length - 1) {
@@ -212075,7 +210723,6 @@ var DrawPageTree = /*#__PURE__*/function () {
           this._drawMainDocs.splice(areaIndex + 1, this._drawMainDocs.length);
           hoEditorFactory.drawTree.drawPageCount.count = hoEditorFactory.drawTree.drawPages.length;
           this.afterAreaFinishPaint(drawArea);
-          // drawArea.stage.update();
           this._startNeedUpdatePage = Math.min(drawArea.pageIndex, this._startNeedUpdatePage === -1 ? 99999 : this._startNeedUpdatePage);
           this._endNeedUpdatePage = Math.max(drawArea.pageIndex, this._endNeedUpdatePage);
           if (hoEditorFactory.drawTree.drawPages.length !== this._oldPageCount) {
@@ -212084,23 +210731,6 @@ var DrawPageTree = /*#__PURE__*/function () {
           }
           return;
         }
-        //页眉页脚绘制完毕
-        //2023-12-28日注释 处理首行有日期更新重叠
-        // if (
-        //   drawArea === mainArea &&
-        //   nextLine === this.drawMainDocs.length - 1 &&
-        //   startUpdateLine === nextLine
-        // ) {
-        //   this.afterAreaFinishPaint(drawArea);
-        //   this._startNeedUpdatePage = Math.min(drawArea.index, this._startNeedUpdatePage === -1 ? 99999 : this._startNeedUpdatePage);
-        //   this._endNeedUpdatePage = Math.max(drawArea.index, this._endNeedUpdatePage);
-        //   if (hoEditorFactory.drawTree.drawPages.length !== this._oldPageCount) {
-        //     this._oldPageCount = 0;
-        //     hoEditorFactory.drawTree.updatePageCountNodes();
-        //   }
-        //   // drawArea.stage.update();
-        //   return;
-        // }
         var dobj = dRoots[mainIndex];
         var startDrawLine;
         var redrawPostion = hoEditorFactory.drawTree.getDlineDrawRootLists(dobj)[0];
@@ -212134,22 +210764,12 @@ var DrawPageTree = /*#__PURE__*/function () {
         //对于新插入的内容绘制完成后（一直到最后一个插入的段落结束），后续的段落需要进行移动位置，则调用update 
         this.update(mainArea, dMainRoots, drawTop, mainIndex, mainIndex, true);
       } finally {
-        // const iendDraw= hoEditorFactory.drawTree.inViewPages[hoEditorFactory.drawTree.inViewPages.length-1];
-        // const istartDraw=hoEditorFactory.drawTree.inViewPages[0];
-        // for (let i = iendDraw; i >= istartDraw; i--) {
         hoEditorFactory.drawTree.inViewPages.forEach(function (i) {
           _this.updateDrawPage(i);
         });
-        // }
-        // for (let i = this._endNeedUpdatePage; i >= this._startNeedUpdatePage; i--) {
-        //   this.updateDrawPage(i);
-        // }
         this._startNeedUpdatePage = -1;
         this._endNeedUpdatePage = -1;
       }
-      // if (HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.paintStatus === PaintState.psReview) {
-      //   drawArea.drawComments();
-      // }
     }
   }, {
     key: "paintDrawPageCell",
@@ -212212,33 +210832,14 @@ var DrawPageTree = /*#__PURE__*/function () {
             nextLine += 1;
             continue;
           }
-          if (dline instanceof DrawTable/* DrawTable */.t && restHeight < hoEditorFactory.defaultLineHeight || dline instanceof DrawLine/* DrawLine */.a && restHeight < dline.dHeight) {
+          if (dline instanceof DrawTable/* DrawTable */.t && (restHeight < hoEditorFactory.defaultLineHeight || !dline.isFirstRowCanFit(restHeight)) || dline instanceof DrawLine/* DrawLine */.a && restHeight < dline.dHeight) {
             if (dline instanceof DrawLine/* DrawLine */.a && restHeight >= hoEditorFactory.defaultLineHeight) {
               if (drawArea.contains(dline)) {
                 drawArea.removeChild(dline);
               }
             }
             bIsFull = true;
-            // if (drawArea instanceof DrawPageCell) {
-            //   // const mainArea= this.getMainRootArea(drawArea);
-            //   // if (mainArea){
-            //   //   const nextArea= this.getNextDrawArea(mainArea);
-            //   //   hoEditorFactory.drawTree.getDrawRootsByPath(drawArea.cell.table.getNodePath());
-            //   //   this.update(mainArea,,)
-            //   // }
-            // }
-            // if (drawArea instanceof DrawPageMainDoc) {
-            //   this.afterAreaFinishPaint(drawArea);
-            //   if (drawArea.stage) {
-            //     this.updateStage(drawArea.stage);
-            //   }
-            //   drawArea = this.getNextDrawArea(drawArea);
-            //   dTop = 0;
-            //   if (drawArea.allowAcrossPage)
-            //     restHeight = drawArea.maxHeight - dTop;
-            // }
           }
-
           var _dobj2 = dRoots[nextLine];
           var cbParagraph = _dobj2.paragraphNode.combineParagraph;
           if (_dobj2 instanceof DrawTable/* DrawTable */.t) {
@@ -212291,49 +210892,14 @@ var DrawPageTree = /*#__PURE__*/function () {
             if (nextLine > startLine || nextLine === startLine && !drawArea.contains(_dobj2)) {
               drawArea.addChild(_dobj2);
               _dobj2.y = dTop;
-              //dobj.x = cbParagraph.leftMarginPixes;
             }
-
             dTop = _dobj2.y + _dobj2.dHeight + _dobj2.paragraphNode.combineParagraph.lineSpace;
             if (drawArea.allowAcrossPage && mainArea.allowAcrossPage) restHeight = drawArea.maxHeight - dTop;
           }
           if (nextLine >= endLine) break;else nextLine += 1;
         }
-        // if (mainArea.stage) {
-        //   mainArea.stage.update();
-        // }
         var mainIndex = Math.min(nextLine, endLine, startUpdateLine);
         //正文绘制完毕 最后一行不需要执行更新
-        // if (
-        //   drawArea instanceof DrawPageMainDoc &&
-        //   mainIndex === dRoots.length - 1
-        // ) {
-        //   const areaIndex = this._drawMainDocs.indexOf(drawArea);
-        //   this._drawMainDocs.splice(areaIndex + 1, this._drawMainDocs.length);
-        //   hoEditorFactory.drawTree.drawPages.splice(
-        //     areaIndex + 1,
-        //     this._drawMainDocs.length
-        //   );
-        //   this.afterAreaFinishPaint(drawArea);
-        //   if (drawArea.stage) {
-        //     // drawArea.stage.update();
-        //     this.updateStage(drawArea.stage);
-        //   }
-        //   return;
-        // }
-        // //页眉页脚绘制完毕
-        // if (
-        //   drawArea === mainArea &&
-        //   nextLine === this.drawMainDocs.length - 1 &&
-        //   startUpdateLine === nextLine
-        // ) {
-        //   this.afterAreaFinishPaint(drawArea);
-        //   if (drawArea.stage) {
-        //     this.updateStage(drawArea.stage);
-        //     // drawArea.stage.update();
-        //   }
-        //   return;
-        // }
         var dobj = dRoots[mainIndex];
         var startDrawLine;
         var redrawPostion = hoEditorFactory.drawTree.getDlineDrawRootLists(dobj)[0];
@@ -212358,7 +210924,9 @@ var DrawPageTree = /*#__PURE__*/function () {
           startDrawLine = dobj;
         }
         var drawTop = startDrawLine.y;
-        if (startDrawLine instanceof DrawPageTable/* DrawPageTable */.ox && !mainArea.contains(startDrawLine)) drawTop = 0;
+        if (startDrawLine instanceof DrawPageTable/* DrawPageTable */.ox && !mainArea.contains(startDrawLine)) {
+          drawTop = 0;
+        }
         this.update(mainArea, dMainRoots, drawTop, mainIndex, mainIndex);
       } finally {
         if (hoEditorFactory.drawTree.drawPages.length !== pageCount) {
@@ -212376,8 +210944,6 @@ var DrawPageTree = /*#__PURE__*/function () {
       if (!drawArea) {
         return;
       }
-      var startPaintWithUpdate = this._startNeedUpdatePage === -1 && this._endNeedUpdatePage === -1;
-      var imaxViewPage = Math.max.apply(Math, (0,esm_toConsumableArray/* default */.Z)(hoEditorFactory.drawTree.inViewPages).concat([this._drawMainDocs.length - 1]));
       try {
         if (this._oldPageCount === 0) {
           this._oldPageCount = hoEditorFactory.drawTree.drawPages.length;
@@ -212466,54 +211032,12 @@ var DrawPageTree = /*#__PURE__*/function () {
         if (this._oldPageCount !== hoEditorFactory.drawTree.drawPages.length) {
           hoEditorFactory.drawTree.updatePageCountNodes();
         }
-        // if (startPaintWithUpdate) {
-        // for (let i = this._endNeedUpdatePage; i >= this._startNeedUpdatePage; i--) {
-        //   this.updateDrawPage(i);
-        // }
-        // const iendDraw= hoEditorFactory.drawTree.inViewPages[hoEditorFactory.drawTree.inViewPages.length-1];
-        // const istartDraw=hoEditorFactory.drawTree.inViewPages[0];
-        // for (let i = iendDraw; i >= istartDraw; i--) {
-        //   this.updateDrawPage(i);
-        // }
-        // this._startNeedUpdatePage = -1;
-        // this._endNeedUpdatePage = -1;
         if (!callFromPaint) {
           hoEditorFactory.drawTree.inViewPages.forEach(function (i) {
             _this2.updateDrawPage(i);
           });
         }
-        // }
       }
-      // if (hoEditorFactory.drawTree.paintStatus === PaintState.psReview) {
-      //   drawArea.drawComments();
-      // }
-      // if (drawArea) {
-      //   const areaIndex=
-      //   for (let i = startLine + 1; i <= endLine; i++) {
-      //     if (restHeight < hoEditorFactory.defaultLineHeight) {
-      //       drawArea = this.getNextDarea(drawArea);
-      //       dTop = drawArea.docHeight;
-      //       restHeight = drawArea.maxHeight - dTop;
-      //     }
-      //     const dobj = dRoots[i];
-      //     const cbParagraph = dobj.paragraphNode.combineParagraph;
-      //     if (dobj instanceof DrawTable) {
-      //       for (let j = 0; j < dobj.drawPageTables.length; j++) {
-      //         const dPageTable = dobj.drawPageTables[j];
-      //         dPageTable.update(drawArea);
-      //       }
-      //     } else {
-      //       if (dobj.dHeight > restHeight && dTop > 0) {
-      //         drawArea = this.getNextDarea(drawArea);
-      //         dTop = 0;
-      //         restHeight = drawArea.maxHeight - dTop;
-      //       }
-      //       drawArea.addChild(dobj);
-      //       dobj.y = dTop;
-      //       dobj.x = cbParagraph.leftMarginPixes;
-      //     }
-      //   }
-      // }
     }
   }, {
     key: "calcMainDocPosition",
@@ -241191,7 +239715,7 @@ var HoFooter_component = (0,componentNormalizer/* default */.Z)(
 // EXTERNAL MODULE: ./src/components/controls/ControlModal.vue + 3 modules
 var ControlModal = __webpack_require__(10597);
 // EXTERNAL MODULE: ./src/components/controls/findReplace/FindReplace.vue + 5 modules
-var FindReplace = __webpack_require__(98064);
+var FindReplace = __webpack_require__(33693);
 ;// CONCATENATED MODULE: ./src/components/controls/findReplace/index.ts
 
 /* harmony default export */ var findReplace = (FindReplace["default"]);