hoeditor-web 3.1.207 → 3.1.209

package/lib/hoeditor.umd.js

@@ -99645,7 +99645,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /***/ }),
 
-/***/ 91934:
+/***/ 68738:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -99659,7 +99659,7 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ./src/i18n/index.ts + 1 modules
 var i18n = __webpack_require__(49850);
-;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/selectDialog/SelectDialog.vue?vue&type=template&id=04d2d7a4
+;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/selectDialog/SelectDialog.vue?vue&type=template&id=6f69b467
 
 var render = function render() {
   var _vm = this,
@@ -99827,7 +99827,15 @@ var render = function render() {
       },
       expression: "readType"
     }
-  }, [_vm._v(/*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.222", null, "自动回填"))])], 1), _c('li', {
+  }, [_vm._v(/*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.222", null, "自动回填"))]), _c('a-checkbox', {
+    model: {
+      value: _vm.toText,
+      callback: function ($$v) {
+        _vm.toText = $$v;
+      },
+      expression: "toText"
+    }
+  }, [_vm._v("转换到文本域")])], 1), _c('li', {
     staticClass: "control-item"
   }, [_c('span', {
     staticClass: "label"
@@ -100082,10 +100090,12 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// ./src/components/controls/selectDialog/SelectDialog.vue?vue&type=template&id=04d2d7a4
+;// ./src/components/controls/selectDialog/SelectDialog.vue?vue&type=template&id=6f69b467
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(44114);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
+var es_json_stringify = __webpack_require__(33110);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.exec.js
 var es_regexp_exec = __webpack_require__(27495);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
@@ -100108,6 +100118,8 @@ var DownListNode = __webpack_require__(82400);
 var HOEditorFactorys = __webpack_require__(57703);
 // EXTERNAL MODULE: ./src/plugins/type.ts
 var type = __webpack_require__(53861);
+// EXTERNAL MODULE: ./src/editor/dom/treeNode/TextInputFieldNode.ts + 1 modules
+var TextInputFieldNode = __webpack_require__(65018);
 ;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[19].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/selectDialog/SelectDialog.vue?vue&type=script&lang=js
 
 
@@ -100126,6 +100138,9 @@ var type = __webpack_require__(53861);
 
 
 
+
+
+
 
 
 
@@ -100154,6 +100169,7 @@ var type = __webpack_require__(53861);
       dataMetaIdentifier: '',
       identifierFormat: '',
       readType: false,
+      toText: false,
       keyValue: '',
       customProperty: {},
       errorArr: [],
@@ -100457,6 +100473,60 @@ var type = __webpack_require__(53861);
         this.vueController.insertDownList('add', params, list);
       } else if (this.controlStatus === 'update') {
         this.clearWatchProps();
+        if (this.toText) {
+          const downListProperty = new TextInputFieldNode/* DownListProperty */.ic();
+          downListProperty.allowMultiSelected = this.allowMultiSelect;
+          downListProperty.splitCharacter = ",";
+          downListProperty.isMultiLinesDisplay = this.false;
+          downListProperty.mutexSelect = this.mutexSelect;
+          downListProperty.usePrefix = this.usePrefix;
+          downListProperty.selectPrefix = this.selectPrefix;
+          downListProperty.unSelectPrefix = this.unSelectPrefix;
+          downListProperty.listItems = JSON.stringify(list);
+          const toTextParams = {
+            inputFieldType: 1,
+            id: this.id,
+            labelText: this.name,
+            text: this.text,
+            name: this.name,
+            tipText: this.tipText,
+            isTipText: false,
+            readOnlyStatus: 1,
+            fixedWidth: 0,
+            isCentered: false,
+            canModifyContent: true,
+            isAllowDelete: this.isAllowDelete,
+            enableGlobalColor: false,
+            downListProperty: downListProperty,
+            customProperty: this.customProperty,
+            alignWithBlocked: false,
+            innerIdentifier: this.innerIdentifier,
+            //内部标识符
+            dataMetaIdentifier: this.dataMetaIdentifier,
+            //数据元标识符
+            identifierFormat: this.identifierFormat,
+            //标识格式
+            readType: this.readType,
+            readTypeBool: this.readType ? 1 : 0,
+            keyValue: keyValue.join(','),
+            value: value.join(','),
+            insCheckSyncUpdateList: false,
+            hideDuringPrint: false,
+            notReplaceElement: false,
+            includesKeyword: JSON.stringify([]),
+            // 元素包含关键字
+            valueArea: JSON.stringify([]) // 元素值域范围
+          };
+          const downlistNode = this.getSelectNode();
+          if (downlistNode) {
+            this.vueController.deleteNode(downlistNode);
+            this.$nextTick(() => {
+              this.vueController.insertTextInputField("add", toTextParams);
+              this.$nextTick(() => this.handleClose());
+            });
+            return;
+          }
+        }
         this.modifyProps.value = params.value;
         this.modifyProps.keyValue = params.keyValue;
         this.modifyProps['customProperty'] = this.customProperty;
@@ -100480,10 +100550,10 @@ var type = __webpack_require__(53861);
 
 /* harmony default export */ var selectDialog_SelectDialogvue_type_script_lang_js = (SelectDialogvue_type_script_lang_js);
 
-;// ./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/selectDialog/SelectDialog.vue?vue&type=style&index=0&id=04d2d7a4&prod&lang=less
+;// ./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/selectDialog/SelectDialog.vue?vue&type=style&index=0&id=6f69b467&prod&lang=less
 // extracted by mini-css-extract-plugin
 
-;// ./src/components/controls/selectDialog/SelectDialog.vue?vue&type=style&index=0&id=04d2d7a4&prod&lang=less
+;// ./src/components/controls/selectDialog/SelectDialog.vue?vue&type=style&index=0&id=6f69b467&prod&lang=less
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(81656);
@@ -106137,7 +106207,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /***/ }),
 
-/***/ 68707:
+/***/ 95044:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -106151,7 +106221,7 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ./src/i18n/index.ts + 1 modules
 var i18n = __webpack_require__(49850);
-;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableFormula.vue?vue&type=template&id=22ffd471
+;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableFormula.vue?vue&type=template&id=1d194886
 
 var render = function render() {
   var _vm = this,
@@ -106764,7 +106834,7 @@ var staticRenderFns = [function () {
   }, [_c('span', [_vm._v(/*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.254", null, "单元格编号"))]), _vm._v(":")]);
 }];
 
-;// ./src/components/controls/table/TableFormula.vue?vue&type=template&id=22ffd471
+;// ./src/components/controls/table/TableFormula.vue?vue&type=template&id=1d194886
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(44114);
@@ -106871,7 +106941,9 @@ var HoColorPicker = __webpack_require__(53071);
         iss: [/*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.256", null, "计算ISS的一般原则：本法把人体分为6个区域，ISS是身体3个最严重损伤区域的最高AIS值的平方和。ISS=AIS1²+AIS2²+AIS3²"), /*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.255", null, "示例：a1,a2,a3,a4,a5,a6")],
         curveChart: [
         // "视力曲线图（Visual Acuity Curve）是眼科检查中常用的一种工具，用于评估和记录不同距离或不同条件下的视力情况。通过绘制视力曲线图，医生可以直观地了解患者的视力变化，从而帮助诊断和治疗各种眼部疾病。",
-        "横轴（X轴）: 通常表示距离，单位可以是米（m）或英尺（ft）, 值域区间为(+2.00 到 -5.00, 每单元格间隔为0.5)", "纵轴（Y轴）: 表示视力，通常以最小分辨角对数表示。值域区间为(0.0到1.5之间, 每单元格间隔为0.1)", "单元格编号：（a1:a3表示从a1到a3的连续单元格）"]
+        // "横轴（X轴）: 通常表示距离，单位可以是米（m）或英尺（ft）, 值域区间为(+2.00 到 -5.00, 每单元格间隔为0.5)",
+        // "纵轴（Y轴）: 表示视力，通常以最小分辨角对数表示。值域区间为(0.0到1.5之间, 每单元格间隔为0.1)",
+        "单元格编号：（a1:a3表示从a1到a3的连续单元格）"]
       },
       bodySurfaceAreaWeight: '',
       startDateCode: '',
@@ -107036,7 +107108,9 @@ var HoColorPicker = __webpack_require__(53071);
           this.vueController.lockCell(this.curve);
         }
         setTimeout(() => {
-          this.vueController.insertTableFormula(this.curve.codeY.toLocaleLowerCase(), this.isHideZero, TableFormula/* FormularType */.D.ftCurveChart, this.curve);
+          this.curve.codeX = this.curve.codeX.toLocaleLowerCase();
+          this.curve.codeY = this.curve.codeY.toLocaleLowerCase();
+          this.vueController.insertTableFormula(this.curve.codeY, this.isHideZero, TableFormula/* FormularType */.D.ftCurveChart, this.curve);
         }, 100);
       }
       this.handleClose();
@@ -107061,10 +107135,10 @@ var HoColorPicker = __webpack_require__(53071);
 
 /* harmony default export */ var table_TableFormulavue_type_script_lang_js = (TableFormulavue_type_script_lang_js);
 
-;// ./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/table/TableFormula.vue?vue&type=style&index=0&id=22ffd471&prod&lang=less
+;// ./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/table/TableFormula.vue?vue&type=style&index=0&id=1d194886&prod&lang=less
 // extracted by mini-css-extract-plugin
 
-;// ./src/components/controls/table/TableFormula.vue?vue&type=style&index=0&id=22ffd471&prod&lang=less
+;// ./src/components/controls/table/TableFormula.vue?vue&type=style&index=0&id=1d194886&prod&lang=less
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(81656);
@@ -120514,21 +120588,25 @@ class DocController {
    */
   insertComment(text, curDomRange, source) {
     const domRange = curDomRange.normalize();
+    const npEnd = domRange.npEnd.node;
     if (!domRange.npStart.node) {
       throw _events_Exception__WEBPACK_IMPORTED_MODULE_42__/* .Exception */ .W.NodeNotFound();
     }
-    if (!domRange.npEnd.node) {
+    if (!npEnd) {
       throw _events_Exception__WEBPACK_IMPORTED_MODULE_42__/* .Exception */ .W.NodeNotFound();
     }
     const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_67__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
     const commentID = hoEditorFactory.gernerateCode.generateID('C');
     const startPath = domRange.startPath;
-    const endPath = domRange.endPath;
+    let endPath = domRange.endPath;
+    // 插入批注时候如果选区在空文本域内，取文本域结尾MarkNode路径作为endPath 把标记节点放在文本域外面避免文本域结构被破坏
+    if (npEnd && npEnd instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_37__/* .MarkNode */ .y && npEnd.MarkNodeType == _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_37__/* .MarkNodeType */ .g.mtContent) {
+      const nextLeafNode = npEnd.nextLeaf();
+      if (nextLeafNode) {
+        endPath = nextLeafNode.getNodePath();
+      }
+    }
     const ePNode = hoEditorFactory.docTree.getParentNode(endPath); //结束节点的父节点
-    // const eStyleIndex =
-    //   domRange.npEnd.node instanceof TextNode
-    //     ? domRange.npEnd.node.styleIndex
-    //     : 0;
     const endNode = new _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_37__/* .MarkNode */ .y(this._hoEditorFactoryID, domRange.npStart.roots, ePNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_15__/* .NodeType */ .Z6.ntMark, commentID, 0, _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_37__/* .MarkNodeType */ .g.mtEnd);
     endNode.MarkNodeType = _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_37__/* .MarkNodeType */ .g.mtEnd;
     endNode.isReadOnly = true;
@@ -120547,15 +120625,6 @@ class DocController {
     hoEditorFactory.undoService.begin();
     hoEditorFactory.undoService.add(new _undoRedo_NodeStyleUndoUnit__WEBPACK_IMPORTED_MODULE_24__/* .NodeStyleUndoUnit */ ._(this._hoEditorFactoryID, startPath, endPath, new _undoRedo_NodeStyleUndoUnit__WEBPACK_IMPORTED_MODULE_24__/* .Operate */ .l('insertComment', commentID)));
     hoEditorFactory.undoService.commit();
-    // const newEndpath = endNode.getNodePath();
-    // const newRange = new DomRange(
-    //   this._hoEditorFactoryID,
-    //   newEndpath,
-    //   newEndpath
-    // );
-    // const cgEvent = new SelectionChangeEvent(newRange, newRange); //选中范围变化事件
-    // hoEditorFactory.docTree.selectChange(cgEvent);
-    // hoEditorFactory.docTree.curDomRange = newRange;
   }
   /**
    * 删除批注
@@ -128094,7 +128163,6 @@ class CellNode extends _RectNode__WEBPACK_IMPORTED_MODULE_22__/* .RectNode */ .P
     this._colSpan = colSpan;
     this._table = pNode;
     this._row = row;
-    //this._valign = VAlign.vatop;
     this._cellProperty = cellProperty;
     this.cell2DrawNode(r, c);
   }
@@ -128187,11 +128255,6 @@ class CellNode extends _RectNode__WEBPACK_IMPORTED_MODULE_22__/* .RectNode */ .P
     this.clearDrawNodes(0, this.drawNodes.length - 1);
   }
   cell2DrawNodeRange(r, c) {
-    // let dHeight = 0;
-    // let dWidth = 0;
-    // const [r, c] = this._table.getCellInfos(this);
-    // const dLeft = this._table.colInfos[c].dLeft;
-    // const dTop = this._table.rowInfos[r].rowBaseDTop;
     let aWidth = 0;
     for (let i = c; i <= c + this._colSpan - 1; i++) {
       if (this._table.colInfos[i]) {
@@ -130784,13 +130847,7 @@ class ImageNode extends BaseNode/* BaseNode */.Yp {
     //this._scaleX = scaleX ? scaleX : 1;
     //this._scaleY = scaleY ? scaleY : 1;
     if (this.parentNode && this.parentNode instanceof CellNode/* CellNode */.H) {
-      const rowInfos = this.parentNode.table.rowInfos[this.parentNode.table.rows.indexOf(this.parentNode.row)];
-      if (rowInfos.rowProperty.isSpecifyHeight) {
-        let rowHeight = rowInfos.rowHeight - 10;
-        if (height > rowHeight) {
-          height = rowHeight;
-        }
-      }
+      // height -= 10;
     }
     this._width = width;
     this._height = height;
@@ -138278,8 +138335,6 @@ class TableNode extends _RectNode__WEBPACK_IMPORTED_MODULE_17__/* .RectNode */ .
             mainCell.drawCell.needUpdate = true;
             rowsSpanChangedCell.push(mainCell);
           }
-          //this.cellsMerge(mr, mc, mainCell.rowSpan, mainCell.colSpan);
-          //set_ColSpan
         }
       }
       c -= 1;
@@ -138295,7 +138350,6 @@ class TableNode extends _RectNode__WEBPACK_IMPORTED_MODULE_17__/* .RectNode */ .
       rowProperty.withFormula = copyRowProperty.withFormula;
       const rowsInfo = new RowInfos(this, rowProperty);
       rowsInfo.rowHeight = this._rowInfos[copyIndex].rowHeight;
-      //rowsInfo.heightFixed = this._rowInfos[copyIndex].heightFixed;
       this._rowInfos.splice(r + i, 0, rowsInfo);
       c = 0;
       while (c < this._colCount) {
@@ -143515,11 +143569,11 @@ class TextInputFieldNode extends BaseCombineNode/* BaseCombineNode */.h {
     this._childNodes2.length = 0;
     const hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
     const curStyleIndex = hoEditorFactory.docTree.curStyleIndex;
-    const cbStyle = hoEditorFactory.docTree.styles[curStyleIndex].combineStyle;
-    const dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
-    const istart = Math.max(startIndex, 0);
-    const iend = Math.min(endIndex, this.text.length - 1);
-    const astyle = hoEditorFactory.docTree.styles[0];
+    // const cbStyle = hoEditorFactory.docTree.styles[curStyleIndex].combineStyle;
+    // const dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
+    // const istart = Math.max(startIndex, 0);
+    // const iend = Math.min(endIndex, this.text.length - 1);
+    // const astyle = hoEditorFactory.docTree.styles[0];
     const index = curStyleIndex;
     // if (this.enableGlobalColor) {
     //   index = astyle.changeStyleString("fontBackColor", "transparent");
@@ -143544,6 +143598,17 @@ class TextInputFieldNode extends BaseCombineNode/* BaseCombineNode */.h {
       }
       this._childNodes.splice(1, 0, new TextNode/* TextNode */.E(this._hoEditorFactoryID, this.rootNodes, this, BaseNode/* NodeType */.Z6.ntText, this.text, index));
     }
+    // if(this.name == '现病史' || this.name == "请输入") {
+    //     console.log("++++++");
+    //     console.log(this.childNodes2);
+    //     console.log(this.childNodes);
+    //     console.log("++++++");
+    // } else if(this.name == "辅助检查结果") {
+    //     console.log("------");
+    //     console.log(this.childNodes2);
+    //     console.log(this.childNodes);
+    //     console.log("------");
+    // }
   }
   clearDrawNodes(startIndex, endIndex) {
     this.childNodes.forEach((value, index) => {
@@ -143880,26 +143945,28 @@ class TextInputFieldNode extends BaseCombineNode/* BaseCombineNode */.h {
           break;
         }
       }
-      if (childArray.length > 0) {
-        if (childArray[0].nodeType === 'ntMark' && childArray[0].type === 0) {
-          if (childArray[childArray.length - 1].nodeType !== 'ntMark') {
-            childArray.splice(0, 1);
-          }
-          if (childArray[childArray.length - 1].nodeType === 'ntMark' && childArray[childArray.length - 1].type !== 2) {
-            childArray.splice(childArray.length - 1, 1);
-            childArray.splice(0, 1);
-          }
-        }
-        if (childArray[childArray.length - 1].nodeType === 'ntMark' && childArray[childArray.length - 1].type === 2) {
-          if (childArray[0].nodeType !== 'ntMark') {
-            childArray.splice(childArray.length - 1, 1);
-          }
-          if (childArray[0].nodeType === 'ntMark' && childArray[0].type !== 0) {
-            childArray.splice(childArray.length - 1, 1);
-            childArray.splice(0, 1);
-          }
-        }
-      }
+
+      // if (childArray.length > 0) {
+      //     console.log(childArray);
+      //     if (childArray[0].nodeType === 'ntMark' && childArray[0].type === 0) {
+      //         if (childArray[childArray.length - 1].nodeType !== 'ntMark') {
+      //             childArray.splice(0, 1);
+      //         }
+      //         if (childArray[childArray.length - 1].nodeType === 'ntMark' && childArray[childArray.length - 1].type !== 2) {
+      //             childArray.splice(childArray.length - 1, 1);
+      //             childArray.splice(0, 1);
+      //         }
+      //     }
+      //     if (childArray[childArray.length - 1].nodeType === 'ntMark' && childArray[childArray.length - 1].type === 2) {
+      //         if (childArray[0].nodeType !== 'ntMark') {
+      //             childArray.splice(childArray.length - 1, 1);
+      //         }
+      //         if (childArray[0].nodeType === 'ntMark' && childArray[0].type !== 0) {
+      //             childArray.splice(childArray.length - 1, 1);
+      //             childArray.splice(0, 1);
+      //         }
+      //     }
+      // }
     }
     let childNodes = {};
     if (isCopy) {
@@ -144031,6 +144098,28 @@ class TextInputFieldNode extends BaseCombineNode/* BaseCombineNode */.h {
   }
   static json2Node(hoEditorFactoryID, json, rootNodes, pNode, isPaste, isClearSign) {
     const hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(hoEditorFactoryID);
+    // 兼容处理 批注内容删除时候 空文本域第二个节点丢失和类型错误问题
+    // if(json.name == '现病史') {
+    //     console.log(json);
+    // }
+    // if(json.childNodes && Array.isArray(json.childNodes.node)) {
+    //     const nodes = json.childNodes.node;
+    //     if(nodes.length == 2 && nodes[0].nodeType == 'ntMark' && nodes[0].type == 0 && nodes[1].nodeType == 'ntMark' && nodes[1].type == 2) {
+    //         json.childNodes.node = [nodes[0], {
+    //             nodeType: 'ntMark',
+    //             type: "1",
+    //             text: json.name,
+    //             styleIndex: nodes[0].styleIndex
+    //         }, nodes[1]];
+    //     } else if(nodes.length == 3 && nodes[1].nodeType == 'ntMark' && nodes[1].type == 2 && nodes[2].nodeType == 'ntMark' && nodes[2].type == 2) {
+    //         json.childNodes.node = [nodes[0], {
+    //             nodeType: nodes[0].nodeType,
+    //             type: "1",
+    //             text: json.name,
+    //             styleIndex: nodes[0].styleIndex
+    //         }, nodes[2]];
+    //     }
+    // }
     let eachCount = 0;
     let isErrorValid = false;
     delete json.nodeType;
@@ -144063,24 +144152,13 @@ class TextInputFieldNode extends BaseCombineNode/* BaseCombineNode */.h {
     json.valueArea = !json.valueArea ? "[]" : json.valueArea;
     json.isElementLink = !json.isElementLink ? false : json.isElementLink;
     const temp = new TextInputFieldNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, BaseNode/* NodeType */.Z6.ntField, json);
-    // this.insertChild
     if (json.childNodes) {
       const nodes = new Array();
       const getChildNodes = item => {
-        // eachCount++;
-        // if(json.name === '1-1') {
-        //     console.time(`1-1---${eachCount}`);
-        // };
         if (Array.isArray(item)) {
           //数组
           for (let i = 0; i < item.length; i++) {
-            // if(json.name === '1-1' && item[i].name) {
-            //     console.time(`----${i}----1-1----${item[i].name}`);
-            // };
             const node = hoEditorFactory.structureConvert.convertNode(item[i], rootNodes, temp, undefined, undefined, isClearSign);
-            // if(json.name === '1-1' && item[i].name) {
-            //     console.timeEnd(`----${i}----1-1----${item[i].name}`);
-            // };
             if (node) {
               if (node instanceof TextNode/* TextNode */.E) {
                 if (node.text.length > [...node.text].length) {
@@ -144119,11 +144197,6 @@ class TextInputFieldNode extends BaseCombineNode/* BaseCombineNode */.h {
             if (node instanceof MarkNode/* MarkNode */.y && node.MarkNodeType === MarkNode/* MarkNodeType */.g.mtEnd && node.text.substring(0, 1) === 'C') {
               hoEditorFactory.structureConvert._markNodes.push(node);
             }
-            // if (node instanceof SignNode &&
-            //     ((node.imgSrc != "" && ((hoEditorFactory.superiorSigns.length > 0 && hoEditorFactory.superiorSigns.includes((node.customProperty as any).bce01)) || hoEditorFactory.forbidEditBeforeSign))
-            //         || hoEditorFactory.lockContent)) {
-            //     hoEditorFactory.structureConvert._superiorSign[0] = node;
-            // }
           }
         } else {
           //单个对象
@@ -144144,7 +144217,6 @@ class TextInputFieldNode extends BaseCombineNode/* BaseCombineNode */.h {
                 }
               }
             } else {
-              //nodes.push(node);
               if (isClearSign) {
                 if (node instanceof SignNode/* SignNode */.u) {
                   if (node.isTemplate && !(node.number == 0 && node.type == 0 && node.name == '')) {
@@ -144167,15 +144239,8 @@ class TextInputFieldNode extends BaseCombineNode/* BaseCombineNode */.h {
           if (node instanceof MarkNode/* MarkNode */.y && node.MarkNodeType === MarkNode/* MarkNodeType */.g.mtEnd && node.text.substring(0, 1) === 'C') {
             hoEditorFactory.structureConvert._markNodes.push(node);
           }
-          // if (node instanceof SignNode &&
-          //     ((node.imgSrc != "" && ((hoEditorFactory.superiorSigns.length > 0 && hoEditorFactory.superiorSigns.includes((node.customProperty as any).bce01)) || hoEditorFactory.forbidEditBeforeSign))
-          //         || hoEditorFactory.lockContent)) {
-          //     hoEditorFactory.structureConvert._superiorSign[0] = node;
-          // }
         }
-        // if(json.name === '1-1') console.timeEnd(`1-1---${eachCount}`);
       };
-      // if(json.name === '1-1') console.time("1-1--0");
       if (isPaste) {
         if (json.childNodes.item) {
           getChildNodes(json.childNodes.item);
@@ -144185,7 +144250,6 @@ class TextInputFieldNode extends BaseCombineNode/* BaseCombineNode */.h {
       } else if (json.childNodes.node) {
         getChildNodes(json.childNodes.node);
       }
-      // if(json.name === '1-1') console.timeEnd("1-1--0");
       if (nodes.length > 0) {
         if (nodes[0] instanceof MarkNode/* MarkNode */.y) {
           temp.childNodes.length = 0;
@@ -144201,7 +144265,6 @@ class TextInputFieldNode extends BaseCombineNode/* BaseCombineNode */.h {
         }
       }
     }
-    //if (hoEditorFactory.drawTree.paintStatus === PaintState.psDesign) {
     const sChildNode = temp.childNodes[0];
     const eChildNode = temp.childNodes[temp.childNodes.length - 1];
     if (!(sChildNode instanceof MarkNode/* MarkNode */.y) || sChildNode instanceof MarkNode/* MarkNode */.y && sChildNode.MarkNodeType !== MarkNode/* MarkNodeType */.g.mtStart) {
@@ -144213,7 +144276,6 @@ class TextInputFieldNode extends BaseCombineNode/* BaseCombineNode */.h {
     if (temp.childNodes.length > 3 && temp.childNodes[1] instanceof MarkNode/* MarkNode */.y && temp.childNodes[1].MarkNodeType == MarkNode/* MarkNodeType */.g.mtContent) {
       temp.childNodes.splice(1, 1);
     }
-    //}
     if (temp.childNodes[1] instanceof TableFormula/* TableFormula */.d) {
       return temp;
     }
@@ -144228,9 +144290,6 @@ class TextInputFieldNode extends BaseCombineNode/* BaseCombineNode */.h {
       if (childFields.length === 0 && !isErrorValid) {
         //不嵌套 用text
         const fieldText = temp.getFieldText();
-        // if (temp.text === fieldText && temp.text.indexOf("\n") > 0) {
-        //     temp.text = temp.text.replaceAll("\n", "");
-        // }
         if (temp.text !== fieldText && (temp.inputFieldType == 0 || temp.inputFieldType == 1 && temp.readType == 1)) {
           temp.childNodes.splice(1, temp.childNodes.length - 2);
           const styleIndex = temp.childNodes[0].styleIndex;
@@ -146607,22 +146666,27 @@ class StagePosition {
 /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var core_js_modules_esnext_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(98992);
 /* harmony import */ var core_js_modules_esnext_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_esnext_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var core_js_modules_esnext_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(3949);
-/* harmony import */ var core_js_modules_esnext_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_esnext_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(62953);
-/* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var _DrawLine__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(39222);
-/* harmony import */ var _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(60030);
-/* harmony import */ var _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(49542);
-/* harmony import */ var _drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(87523);
-/* harmony import */ var _yuki_createjs__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(56419);
-/* harmony import */ var _yuki_createjs__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(_yuki_createjs__WEBPACK_IMPORTED_MODULE_9__);
-/* harmony import */ var _editor_dom_NodePosition__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(53714);
-/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(57703);
-/* harmony import */ var _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(30486);
-/* harmony import */ var _drawNode_DrawPageCell__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(51613);
-/* harmony import */ var _components_common_comment__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(73514);
-/* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(58382);
+/* harmony import */ var core_js_modules_esnext_iterator_filter_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(54520);
+/* harmony import */ var core_js_modules_esnext_iterator_filter_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_esnext_iterator_filter_js__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var core_js_modules_esnext_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(3949);
+/* harmony import */ var core_js_modules_esnext_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_esnext_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(62953);
+/* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var _DrawLine__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(39222);
+/* harmony import */ var _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(60030);
+/* harmony import */ var _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(49542);
+/* harmony import */ var _drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(87523);
+/* harmony import */ var _yuki_createjs__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(56419);
+/* harmony import */ var _yuki_createjs__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(_yuki_createjs__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var _editor_dom_NodePosition__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(53714);
+/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(57703);
+/* harmony import */ var _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(30486);
+/* harmony import */ var _drawNode_DrawPageCell__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(51613);
+/* harmony import */ var _components_common_comment__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(73514);
+/* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(58382);
+/* harmony import */ var _types_EditorType__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(27195);
+
+
 
 
 
@@ -146639,7 +146703,7 @@ class StagePosition {
 
 
 
-class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRect */ .N {
+class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_7__/* .DrawRect */ .N {
   // public get startDline(): number {
   //   return this._startDline;
   // }
@@ -146762,12 +146826,12 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
   }
   get bottomDline() {
     if (!this._bottomDline) {
-      const dRoots = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID).drawTree.getDrawRootsByPath(this._rootPath)[1];
+      const dRoots = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID).drawTree.getDrawRootsByPath(this._rootPath)[1];
       const dline = dRoots[this._endDline];
-      if (dline instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_7__/* .DrawTable */ .n) {
+      if (dline instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_8__/* .DrawTable */ .n) {
         const dPageTable = dline.getDrawTableByPageIndex(this._index);
         if (dPageTable) this._bottomDline = dPageTable;
-      } else if (dline instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_5__/* .DrawLine */ .D) {
+      } else if (dline instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_6__/* .DrawLine */ .D) {
         this._bottomDline = dline;
       }
     }
@@ -146806,7 +146870,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
     // if (this._startDline >= this.drawR) {
     //   return true;
     // }
-    if (this._lastDrawLine instanceof _drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_8__/* .DrawPageTable */ .Yt) {
+    if (this._lastDrawLine instanceof _drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_9__/* .DrawPageTable */ .Yt) {
       ret = this._lastDrawLine.endRow === this._lastDrawLine.table.rowCount - 1 && this._lastDrawLine.isEndRowFinished();
     } else {
       ret = true;
@@ -146840,8 +146904,8 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
     let bottom = 0;
     let top = 99999;
     for (let i = 0; i < ditems.length; i++) {
-      if (ditems[i] instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_5__/* .DrawLine */ .D || ditems[i] instanceof _drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_8__/* .DrawPageTable */ .Yt || ditems[i] instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_7__/* .DrawTable */ .n) {
-        if (ditems[i] instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_7__/* .DrawTable */ .n) {
+      if (ditems[i] instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_6__/* .DrawLine */ .D || ditems[i] instanceof _drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_9__/* .DrawPageTable */ .Yt || ditems[i] instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_8__/* .DrawTable */ .n) {
+        if (ditems[i] instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_8__/* .DrawTable */ .n) {
           dLine = ditems[i].drawPageTables.values().next().value;
         } else {
           dLine = ditems[i];
@@ -146877,7 +146941,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
    * @returns 根据绘制坐标，行高 判断能否摆放下当前行。
    */
   canFit(dtop, dHeight) {
-    if (dtop + dHeight > this._maxHeight && dtop > 0) {
+    if (dtop + dHeight > this.maxHeight && dtop > 0) {
       return false;
     }
     return true;
@@ -146888,7 +146952,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
   paintBackground() {
     if (!this._background) this._background = new createjs.Shape();
     this._background.graphics.clear();
-    this._background.graphics.drawRect(-this.x, 0, _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID).pageProperty.widthPixes, Math.max(this.docHeight, this._dHeight)).closePath();
+    this._background.graphics.drawRect(-this.x, 0, _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID).pageProperty.widthPixes, Math.max(this.docHeight, this._dHeight)).closePath();
     this.addChildAt(this._background, 0);
     this.setChildIndex(this._background, 0);
   }
@@ -146903,7 +146967,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
     if (this._allowAcrossPage) return;
     if (!this._mask) this._mask = new createjs.Shape();
     this._mask.graphics.clear();
-    this._mask.graphics.drawRect(-this.x, 0, _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID).pageProperty.widthPixes, aheight + 1).closePath();
+    this._mask.graphics.drawRect(-this.x, 0, _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID).pageProperty.widthPixes, aheight + 1).closePath();
     //遮罩不是当前容器的Child
     this._mask.x = this.x;
     this._mask.y = this.y;
@@ -146916,33 +146980,33 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
     let bFinishedPaint = true;
     let isFull = false;
     let ret = startIndex;
-    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
+    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
     let nextDline = startIndex;
     let dRestHeight = Infinity;
-    if (this.allowAcrossPage) dRestHeight = this._maxHeight - dTop;
-    this._endDline = startIndex;
+    if (this.allowAcrossPage) dRestHeight = this.maxHeight - dTop;
+    this.endDline = startIndex;
     while (nextDline < dlines.length) {
       const dline = dlines[nextDline];
       const hidden = dline.paragraphNode.customProperty.hidden;
-      if (hoEditorFactory.drawTree.paintStatus !== _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__/* .PaintState */ .ak.psDesign && hidden && hidden.toString() === "true") {
-        if (dline instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_5__/* .DrawLine */ .D) this.setHidden(dline);
+      if (hoEditorFactory.drawTree.paintStatus !== _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_16__/* .PaintState */ .ak.psDesign && hidden && hidden.toString() === "true") {
+        if (dline instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_6__/* .DrawLine */ .D) this.setHidden(dline);
         nextDline += 1;
         continue;
       }
       if (dline.paragraphNode.printAsSinglePage && dline.paragraphNode.drawlines[0] === dline && dTop > 0) {
-        this._endDline = nextDline - 1;
+        this.endDline = nextDline - 1;
         this.clearOverDitem(dlines, nextDline);
         isFull = true;
         bFinishedPaint = false;
         break;
       }
-      if (dline instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_7__/* .DrawTable */ .n && dRestHeight < hoEditorFactory.defaultLineHeight || dline instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_5__/* .DrawLine */ .D && dRestHeight < dline.dHeight && dTop > 0) {
-        if (dline instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_5__/* .DrawLine */ .D && dRestHeight >= hoEditorFactory.defaultLineHeight) {
+      if (dline instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_8__/* .DrawTable */ .n && dRestHeight < hoEditorFactory.defaultLineHeight || dline instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_6__/* .DrawLine */ .D && dRestHeight < dline.dHeight && dTop > 0) {
+        if (dline instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_6__/* .DrawLine */ .D && dRestHeight >= hoEditorFactory.defaultLineHeight) {
           if (this.contains(dline)) {
             this.removeChild(dline);
           }
         }
-        if (dline instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_7__/* .DrawTable */ .n) {
+        if (dline instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_8__/* .DrawTable */ .n) {
           let index = -1;
           for (let i = dline.drawPageTables.length - 1; i >= 0; i--) {
             if (this.contains(dline.drawPageTables[i])) {
@@ -146958,20 +147022,19 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
             dline.drawPageTables.splice(index, dline.drawPageTables.length);
           }
         }
-        this._endDline = nextDline - 1;
+        this.endDline = nextDline - 1;
         this.clearOverDitem(dlines, nextDline);
         isFull = true;
         bFinishedPaint = false;
         break;
       }
-      // const pagePos = hoEditorFactory.drawTree.getDrawLinePagePos(dline);
-      if (dline instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_7__/* .DrawTable */ .n) {
+      if (dline instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_8__/* .DrawTable */ .n) {
         const dTable = dline;
         let dPrevTable = null;
         let startChildIndex = 0;
         const dHeadHeight = dTable.getHeadHeight();
         let dPageTable = dTable.getDrawTableByParentArea(this);
-        if (dHeadHeight + _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_12__/* .gDefaultRowHeight */ .ip > dRestHeight || !dTable.isFirstRowCanFit(dRestHeight)) {
+        if (dHeadHeight + _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_13__/* .gDefaultRowHeight */ .ip > dRestHeight || !dTable.isFirstRowCanFit(dRestHeight)) {
           if (dPageTable) {
             dPageTable.parent.removeChild(dPageTable);
           }
@@ -146993,7 +147056,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
         3: 当前表格不是表格的最后绘制表格，且剩余高度大于一行
         */
         if (dPageTable) {
-          if (dTable.needUpdate || dPageTable.dHeight - dRestHeight > _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_12__/* .gDefaultRowHeight */ .ip || dTable.drawPageTables.indexOf(dPageTable) < dTable.drawPageTables.length - 1 && restHeight > dPageTable.dHeight + hoEditorFactory.defaultLineHeight) {
+          if (dTable.needUpdate || dPageTable.dHeight - dRestHeight > _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_13__/* .gDefaultRowHeight */ .ip || dTable.drawPageTables.indexOf(dPageTable) < dTable.drawPageTables.length - 1 && restHeight > dPageTable.dHeight + hoEditorFactory.defaultLineHeight) {
             const newTop = dTable.drawUpdate(this, dPrevTable, dTop, dRestHeight);
             dTop = newTop;
           } else {
@@ -147028,53 +147091,59 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
           }
         }
         if (dPageTable && (dPageTable.endRow < dPageTable.table.rowCount - 1 || !dPageTable.isEndRowFinished())) {
-          this._endDline = nextDline;
+          this.endDline = nextDline;
           if (dPageTable) this.lastDrawLine = dPageTable;
           isFull = true;
           bFinishedPaint = false;
           this.clearOverDitem(dlines, nextDline + 1);
           break;
         }
-        // dTop += dTable.paragraphNode.combineParagraph.lineSpace;
         if (this.allowAcrossPage) dRestHeight = this._maxHeight - dTop;
         this._docHeight = dTop;
         this._usedHeight = dTop;
-        // const index = this.dTable.update(this, dTop, dRestHeight);
-        // if (dTable.drawPageTables.length > 0) {
-        // }
         //如果当前表格未绘制完成，需要在下一页继续绘制、
-        this._endDline = nextDline;
+        this.endDline = nextDline;
         nextDline += 1;
         continue;
       } else {
         //页摆放不下，
-        // const lheight = dTop +
-        //   dline.dHeight + dline.paragraphNode.combineParagraph.lineSpace;
-        //   console.log(lheight)
         const canfit = this.canFit(dTop, dline.dHeight);
         if (!canfit && this._allowAcrossPage) {
-          this._endDline = nextDline - 1;
-          if (this._endDline == -1) {
-            this._endDline = -2;
+          this.endDline = nextDline - 1;
+          if (this.endDline == -1) {
+            this.endDline = -2;
           }
           this.clearOverDitem(dlines, nextDline);
           isFull = true;
           bFinishedPaint = false;
           break;
         } else {
-          if (!this.contains(dline)) this.addChild(dline);
+          if (!this.contains(dline)) {
+            if (hoEditorFactory.fixTableImage && this instanceof _drawNode_DrawPageCell__WEBPACK_IMPORTED_MODULE_14__/* .DrawPageCell */ .M) {
+              this.addChildAt(dline, 0);
+            } else {
+              this.addChild(dline);
+            }
+          }
+          ;
           if (this.numChildren == 1) {
             this.topDline = dline;
           }
           const cbParagraph = dline.paragraphNode.combineParagraph;
-          // dline.x = cbParagraph.leftMarginPixes;
           dline.visible = canfit;
           if (nextDline === startIndex) {
             dTop += cbParagraph.topMarginPixes;
           }
           dline.y = dTop;
-          if (!this._allowAcrossPage && nextDline === dlines.length - 1 && dline instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_5__/* .DrawLine */ .D && dline.drawItems.length == 0) {
+          if (!this._allowAcrossPage && nextDline === dlines.length - 1 && dline instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_6__/* .DrawLine */ .D && dline.drawItems.length == 0) {
             dTop += 0;
+          } else if (hoEditorFactory.fixTableImage && dline instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_6__/* .DrawLine */ .D && dline.drawItems.length) {
+            const imageList = dline.drawItems.filter(item => item.node && item.node.nodeType === _types_EditorType__WEBPACK_IMPORTED_MODULE_17__/* .NodeType */ .Z6.ntImage);
+            if (imageList.length) {
+              dTop += dline.dHeight;
+            } else {
+              dTop += dline.dHeight + dline.paragraphNode.combineParagraph.lineSpace;
+            }
           } else {
             dTop += dline.dHeight + dline.paragraphNode.combineParagraph.lineSpace;
           }
@@ -147082,7 +147151,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
           this._docHeight = dTop;
           this._usedHeight = dTop;
           this._lastDrawLine = dline;
-          this._endDline = nextDline;
+          this.endDline = nextDline;
           ret += 1;
           nextDline += 1;
         }
@@ -147091,8 +147160,6 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
     this.paintFrontGround();
     this.paintBackground();
     return bFinishedPaint;
-    // drawPage.repaint();
-    // return [ret, isFull];
   }
   /**
    *
@@ -147104,52 +147171,28 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
    */
   paintArea(dlines, startIndex, aTop //顶点
   ) {
-    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
-    // if (this.rootPath.startsWith("header")) {
-    //   console.log("drawheader.paintArea");
-    // } else if (this.rootPath.startsWith("footer")) {
-    //   console.log("drawfooter.paintArea");
-    // } else {
-    //   console.log("drawMainDoc.paintArea");
-    // }
-    // let isFull = false;
-    // this.clearAfter(drawPage, dlines, startIndex);
+    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
     this._docHeight = aTop;
-    // if (aTop === 0) {
-    //   this._startDline = startIndex;
-    // }
     let ret = startIndex;
     let isFull = false;
-    // const dlineIter = this.listDrawLineByPathRange(
-    //   startIndex,
-    //   dlines.length - 1
-    // );
     let nextDline = startIndex;
     let dTop = aTop;
     this._changed = true;
-    // if (this.drawLines.length > 0 && startIndex > 0) {
-    //   dTop =
-    //     this.drawLines[this.drawLines.length - 1].dTop +
-    //     this.drawLines[this.drawLines.length - 1].dHeight +
-    //     this.drawLines[this.drawLines.length - 1].paragraphNode.combineParagraph
-    //       .lineSpace;
-    // }
     let restHeight = Infinity;
     if (this.allowAcrossPage) restHeight = this.maxHeight - dTop;
     let mark = false;
     while (nextDline < dlines.length) {
       const dline = dlines[nextDline];
       const hidden = dline.paragraphNode.customProperty.hidden;
-      if (hoEditorFactory.drawTree.paintStatus !== _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__/* .PaintState */ .ak.psDesign && hidden && hidden.toString() === "true") {
-        if (dline instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_5__/* .DrawLine */ .D) this.setHidden(dline);
+      if (hoEditorFactory.drawTree.paintStatus !== _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_16__/* .PaintState */ .ak.psDesign && hidden && hidden.toString() === "true") {
+        if (dline instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_6__/* .DrawLine */ .D) this.setHidden(dline);
         nextDline += 1;
         mark = true;
         continue;
       }
-      // const pagePos = hoEditorFactory.drawTree.getDrawLinePagePos(dline);
-      if (dline instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_7__/* .DrawTable */ .n) {
+      if (dline instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_8__/* .DrawTable */ .n) {
         const dTable = dline;
-        if (dTable.getHeadHeight() + _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_12__/* .gDefaultRowHeight */ .ip > restHeight || !dTable.isFirstRowCanFit(restHeight)) {
+        if (dTable.getHeadHeight() + _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_13__/* .gDefaultRowHeight */ .ip > restHeight || !dTable.isFirstRowCanFit(restHeight)) {
           isFull = true;
           this.clearOverDitem(dlines, nextDline);
           return [isFull, dTop, restHeight];
@@ -147166,71 +147209,35 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
         if (dTable.isFinishedPaint()) {
           nextDline += 1;
         } else {
-          this._endDline = nextDline;
+          this.endDline = nextDline;
           isFull = true;
           if (dPageTable) this._docHeight = dTop + dPageTable.dHeight;
-          //  + dline.paragraphNode.combineParagraph.lineSpace;
           this.clearOverDitem(dlines, nextDline + 1);
           break;
         }
-        // else {
-        //   const dPageTable = dTable.getDrawTableByParentArea(this);
-        //   if (!dPageTable) {
-        //     const [
-        //       nextArea,
-        //       nextPageIndex,
-        //       nextTop,
-        //       nextRestHeight,
-        //     ] = dTable.update(this, dTop, restHeight);
-        //     return nextArea.paintArea(
-        //       dlines,
-        //       nextPageIndex,
-        //       nextDline + 1,
-        //       nextTop
-        //     );
-        //   } else {
-        //     const [
-        //       nextArea,
-        //       nextPageIndex,
-        //       nextTop,
-        //       nextRestHeight,
-        //     ] = dPageTable.update(
-        //       this,
-        //       pageIndex,
-        //       dTop,
-        //       restHeight,
-        //       dPageTable.startRow
-        //     );
-        //     return nextArea.paintArea(
-        //       dlines,
-        //       nextPageIndex,
-        //       nextDline + 1,
-        //       nextTop
-        //     );
-        //   }
-        // }
       } else {
         //页摆放不下，
-        // const lheight = dTop +
-        //   dline.dHeight + dline.paragraphNode.combineParagraph.lineSpace;
-        //   console.log(lheight)
         const canfit = this.canFit(dTop, dline.dHeight);
-        if (!canfit && (dTop > 0 || this instanceof _drawNode_DrawPageCell__WEBPACK_IMPORTED_MODULE_13__/* .DrawPageCell */ .M) && this._allowAcrossPage) {
-          const nextArea = this.getNextDrawArea();
-          this._endDline = nextDline - 1;
-          if (this._endDline == -1) {
-            this._endDline = -2;
+        if (!canfit && (dTop > 0 || this instanceof _drawNode_DrawPageCell__WEBPACK_IMPORTED_MODULE_14__/* .DrawPageCell */ .M) && this._allowAcrossPage) {
+          // const nextArea = this.getNextDrawArea();
+          this.endDline = nextDline - 1;
+          if (this.endDline == -1) {
+            this.endDline = -2;
           }
           isFull = true;
           this._docHeight -= aTop;
           // this.clearOverDitem(dlines, nextDline);
           return [isFull, dTop, restHeight];
         } else {
-          this.addChild(dline);
+          if (hoEditorFactory.fixTableImage && this instanceof _drawNode_DrawPageCell__WEBPACK_IMPORTED_MODULE_14__/* .DrawPageCell */ .M) {
+            this.addChildAt(dline, 0);
+          } else {
+            this.addChild(dline);
+          }
           if (this.numChildren == 1) {
             this.topDline = dline;
           }
-          this._endDline = nextDline;
+          this.endDline = nextDline;
           const cbParagraph = dline.paragraphNode.combineParagraph;
           //dline.x = cbParagraph.leftMarginPixes;
           dline.visible = canfit;
@@ -147238,8 +147245,15 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
             dTop += cbParagraph.topMarginPixes;
           }
           dline.y = dTop;
-          if (nextDline === dlines.length - 1 && dline instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_5__/* .DrawLine */ .D && dline.drawItems.length == 0) {
+          if (nextDline === dlines.length - 1 && dline instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_6__/* .DrawLine */ .D && dline.drawItems.length == 0) {
             dTop += 0;
+          } else if (hoEditorFactory.fixTableImage && dline instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_6__/* .DrawLine */ .D && dline.drawItems.length) {
+            const imageList = dline.drawItems.filter(item => item && item.nodeType === _types_EditorType__WEBPACK_IMPORTED_MODULE_17__/* .NodeType */ .Z6.ntImage);
+            if (imageList.length) {
+              dTop += dline.dHeight;
+            } else {
+              dTop += dline.dHeight + dline.paragraphNode.combineParagraph.lineSpace;
+            }
           } else {
             dTop += dline.dHeight + dline.paragraphNode.combineParagraph.lineSpace;
           }
@@ -147252,10 +147266,10 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
         }
       }
     }
-    this._docHeight -= aTop;
+    this.docHeight -= aTop;
     this.paintFrontGround();
     this.paintBackground();
-    if (mark && dlines.length > 0 && dlines[0].parent instanceof _drawNode_DrawPageCell__WEBPACK_IMPORTED_MODULE_13__/* .DrawPageCell */ .M) {
+    if (mark && dlines.length > 0 && dlines[0].parent instanceof _drawNode_DrawPageCell__WEBPACK_IMPORTED_MODULE_14__/* .DrawPageCell */ .M) {
       dlines[0].parent.cell.drawCell.needUpdate = true;
       hoEditorFactory.docTree.redrawHiddenParas.push(dlines[0].parent.cell.table);
     }
@@ -147281,14 +147295,14 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
   // }
   getFirstDline() {
     let mainStartRedrawline = 0;
-    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
+    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
     while (mainStartRedrawline < this.children.length) {
-      if (this.children[mainStartRedrawline] instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_5__/* .DrawLine */ .D || this.children[mainStartRedrawline] instanceof _drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_8__/* .DrawPageTable */ .Yt) break;else mainStartRedrawline += 1;
+      if (this.children[mainStartRedrawline] instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_6__/* .DrawLine */ .D || this.children[mainStartRedrawline] instanceof _drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_9__/* .DrawPageTable */ .Yt) break;else mainStartRedrawline += 1;
     }
     const dStartDline = this.children[mainStartRedrawline];
-    if (dStartDline instanceof _drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_8__/* .DrawPageTable */ .Yt) {
+    if (dStartDline instanceof _drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_9__/* .DrawPageTable */ .Yt) {
       mainStartRedrawline = hoEditorFactory.drawTree.mainDNodes.indexOf(dStartDline.table.drawTable);
-    } else if (dStartDline instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_5__/* .DrawLine */ .D) {
+    } else if (dStartDline instanceof _DrawLine__WEBPACK_IMPORTED_MODULE_6__/* .DrawLine */ .D) {
       mainStartRedrawline = hoEditorFactory.drawTree.mainDNodes.indexOf(dStartDline);
     }
     return mainStartRedrawline;
@@ -147296,7 +147310,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
   clearOverDitem(dRoots, start) {
     for (let i = start; i < dRoots.length; i++) {
       const dFirstItem = dRoots[i];
-      if (dFirstItem instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_7__/* .DrawTable */ .n) {
+      if (dFirstItem instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_8__/* .DrawTable */ .n) {
         const dPageTable = dFirstItem.drawPageTables[0];
         if (this.contains(dPageTable)) {
           this.removeChild(dPageTable);
@@ -147313,7 +147327,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
     }
   }
   drawComments() {
-    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
+    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
     hoEditorFactory.commentParams.repaint++;
     return;
     const comments = new Map();
@@ -147351,7 +147365,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
       const dline = hoEditorFactory.drawTree.getDrawLineByDNode(endDrawNode); // 末尾标记节点所在行
       const stagePos = dline.localToGlobal(endDrawNode.x, endDrawNode.y); // 末尾标记节点的stage坐标
       const localPos = this.globalToLocal(stagePos.x, stagePos.y); // 末尾标记节点的stage坐标
-      const spX = dline.parent instanceof _drawNode_DrawPageCell__WEBPACK_IMPORTED_MODULE_13__/* .DrawPageCell */ .M ? localPos.x : endDrawNode.x;
+      const spX = dline.parent instanceof _drawNode_DrawPageCell__WEBPACK_IMPORTED_MODULE_14__/* .DrawPageCell */ .M ? localPos.x : endDrawNode.x;
       const spY = localPos.y;
       this.removeComment(value);
       const path = value.eNode.getNodePath();
@@ -147379,10 +147393,10 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
         }
       }
     }
-    _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID).drawPageTree.updateDrawPage(this.index);
+    _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID).drawPageTree.updateDrawPage(this.index);
   }
   repaint(comment, nPath, spX, spY) {
-    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
+    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
     const comments = this.areaComments;
     const topComments = new Array();
     const bottomComments = new Array();
@@ -147405,7 +147419,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
     });
     tempArr.forEach(value => {
       const aPath = value.eNode.getNodePath();
-      const result = _editor_dom_NodePosition__WEBPACK_IMPORTED_MODULE_10__/* .NodePosition */ .C.treePathCompare(nPath, aPath);
+      const result = _editor_dom_NodePosition__WEBPACK_IMPORTED_MODULE_11__/* .NodePosition */ .C.treePathCompare(nPath, aPath);
       if (result > 0) {
         topComments.push(value);
       } else {
@@ -147476,7 +147490,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
     }
   }
   drawComment(comment, nodeX, nodeY, commentY) {
-    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
+    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
     const docWidth = this.docWidth;
     const commentWidth = hoEditorFactory.pageProperty.rightMarginPixes - 15;
     const container = new createjs.Container();
@@ -147550,7 +147564,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
     }
   }
   onMouseDown(e, comment) {
-    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
+    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
     hoEditorFactory.drawTree.curOnSelectedComment = comment;
     e.target.alpha = 1;
     for (let i = 0; i < this.children.length; i++) {
@@ -147562,7 +147576,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
         if (hoEditorFactory.reviewJson.editComment !== false || hoEditorFactory.reviewJson.deleteComment !== false) {
           setTimeout(() => {
             if (hoEditorFactory.drawTree.activePage) {
-              _components_common_comment__WEBPACK_IMPORTED_MODULE_14__/* .hoCreateComment */ .h.open({
+              _components_common_comment__WEBPACK_IMPORTED_MODULE_15__/* .hoCreateComment */ .h.open({
                 x: child.x,
                 y: child.y + hoEditorFactory.drawTree.activePage.drawMainDoc.y,
                 width: 0,
@@ -147583,7 +147597,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
     hoEditorFactory.drawPageTree.updateDrawPage(this.index);
   }
   drawEditRecords(comment, nodeX, nodeY, commentY) {
-    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
+    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
     const commentWidth = hoEditorFactory.pageProperty.rightMarginPixes - 15;
     const docWidth = this.docWidth;
     const container = new createjs.Container();
@@ -147629,7 +147643,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
     hoEditorFactory.drawPageTree.updateDrawPage(this.index);
   }
   repaintRecored(comments, comment, nPath, spX, spY) {
-    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
+    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
     const topComments = new Array();
     const bottomComments = new Array();
     const tempArr = new Array();
@@ -147651,7 +147665,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
     });
     tempArr.forEach(value => {
       const aPath = value.eNode.getNodePath();
-      const result = _editor_dom_NodePosition__WEBPACK_IMPORTED_MODULE_10__/* .NodePosition */ .C.treePathCompare(nPath, aPath);
+      const result = _editor_dom_NodePosition__WEBPACK_IMPORTED_MODULE_11__/* .NodePosition */ .C.treePathCompare(nPath, aPath);
       if (result > 0) {
         topComments.push(value);
       } else {
@@ -148378,18 +148392,19 @@ class DrawCell extends _DrawRect__WEBPACK_IMPORTED_MODULE_7__/* .DrawRect */ .N
     return null;
   }
   paintCell(dParent, dTop, dHeight, maxHeight, startDline) {
-    // let ret = 0;
     const [aleft, awidth] = this._cell.getLeftWidth();
     this._dWidth = awidth;
     let valignTop = 0;
     if (startDline === 0) {
       const aHeight = this._cell.drawCell.calcCellHeight();
-      const cellMaxHeigth = Math.min(maxHeight, aHeight);
+      const cellMaxHeight = Math.min(maxHeight, aHeight);
       if (this._cell.cellProperty.align === _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_9__/* .VAlign */ .gy.vatop) {
-        valignTop = 1;
-      } else if (this._cell.cellProperty.align === _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_9__/* .VAlign */ .gy.vacenter && cellMaxHeigth > this._cell.drawCell.docHeight) {
-        valignTop = (cellMaxHeigth - this._cell.drawCell.docHeight) / 2;
+        // ---去掉靠上对齐时候顶上1像素留白导致单元格插入的图片卡死问题---
+        valignTop = 0;
+      } else if (this._cell.cellProperty.align === _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_9__/* .VAlign */ .gy.vacenter && cellMaxHeight > this._cell.drawCell.docHeight) {
+        valignTop = (cellMaxHeight - this._cell.drawCell.docHeight) / 2;
       } else if (this._cell.cellProperty.align === _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_9__/* .VAlign */ .gy.vabottom && aHeight > this._cell.drawCell.docHeight) {
+        // aHeight不准确影响靠下对齐判断
         valignTop = aHeight - this._cell.drawCell.docHeight;
       }
     }
@@ -150273,8 +150288,9 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
     return ret;
   }
   updateDHeight() {
-    const innerBottom = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._cell.hoEditorFactoryID).unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[1] * 10, true);
-    const innerTop = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._cell.hoEditorFactoryID).unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[0] * 10, true);
+    const hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._cell.hoEditorFactoryID);
+    const innerBottom = hoEditorFactory.unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[1] * 10, true);
+    const innerTop = hoEditorFactory.unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[0] * 10, true);
     const index = this.cell.drawCell.drawPageCells.indexOf(this);
     let docHeight = 0;
     if (index == 0 || index == this.cell.drawCell.drawPageCells.length - 1) {
@@ -150316,6 +150332,7 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
     (0,defineProperty/* default */.A)(this, "_bottomLine", void 0);
     (0,defineProperty/* default */.A)(this, "_leftLine", void 0);
     (0,defineProperty/* default */.A)(this, "_rightLine", void 0);
+    (0,defineProperty/* default */.A)(this, "backColor", void 0);
     //实现接口部分
     (0,defineProperty/* default */.A)(this, "_node", void 0);
     (0,defineProperty/* default */.A)(this, "_discriminator", void 0);
@@ -150323,86 +150340,52 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
     // this._crossShape = null;
     this._backImg = new createjs.Shape();
     this._backImg.name = "backImg";
+    this.backColor = new createjs.Shape();
+    this.backColor.name = "backColor";
     this._topLine = new createjs.Shape();
     this._bottomLine = new createjs.Shape();
     this._leftLine = new createjs.Shape();
     this._rightLine = new createjs.Shape();
     this._touchArea = new createjs.Shape();
-    // this._pageIndex = pageIndex;
-    // this._dPage = dPage;
     this._node = cellNode;
     this._cell = cellNode;
     this._startDline = startLine;
     this._endDline = startLine;
     this._dWidth = dWidth;
     this._maxHeight = dMaxHeight;
-    // ((this as unknown) as DrawInfos).dWidth = dWidth;
     this._dHeight = dHeight;
-    // ((this as unknown) as DrawInfos).dHeight = dWidth;
     this._discriminator = IDrawInfos/* gDrawIntfID */.c;
-    //this._marker = new createjs.Shape();
-    // this._topBorder = new createjs.Rectangle(dLeft, dTop, dWidth, 2);
-    // this._leftBorder = new createjs.Rectangle(dLeft, dTop, 2, dHeight);
-    // this._rightBorder = new createjs.Rectangle(
-    //   dLeft + dWidth - 2,
-    //   dTop,canjustRowHeight
-    //   2,
-    //   dHeight
-    // );
-    // this._bottomBorder = new createjs.Rectangle(
-    //   dLeft,
-    //   dTop + dHeight - 2,
-    //   dWidth,
-    //   2
-    // );
     let innerTop = 0;
+    const hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
     if (this._cell.drawCell.drawPageCells.length == 0) {
-      innerTop = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._cell.hoEditorFactoryID).unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[0] * 10, true);
+      innerTop = hoEditorFactory.unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[0] * 10, true);
+    }
+    if (paintImidiate === undefined || paintImidiate) {
+      this.paintArea(this._cell.drawCell.drawLines, startLine, innerTop);
     }
-    if (paintImidiate === undefined || paintImidiate) this.paintArea(this._cell.drawCell.drawLines, startLine, innerTop);
     const rowIndex = this._cell.table.rows.indexOf(this._cell.row);
     const colIndex = this._cell.row.indexOf(this._cell);
     this._valignTop = innerTop;
-    // let maxWidth = 0;
-    // let maxHeight = 0;
-    // if (colIndex + this._cell.colSpan - 1 === this._cell.table.colCount - 1) {
-    //   maxWidth = -1;
-    // } else {
-    //   maxWidth =
-    //     this._dWidth +
-    //     this._cell.table.colInfos[colIndex + this._cell.colSpan - 1].colWidth -
-    //     10;
-    // }
-    // if (rowIndex + this._cell.rowSpan - 1 === this._cell.table.rowCount - 1) {
-    //   maxHeight = -1;
-    // } else {
-    //   maxHeight =
-    //     this._dHeight +
-    //     this._cell.table.rowInfos[rowIndex + this._cell.rowSpan - 1].rowHeight -
-    //     gLineHeight;
-    // }
     /**
      * 表格较多时此处占用内存较大 待优化
      */
-    const hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
-    if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState */.ak.psEdit && (this.cell.table.tableProperty.canAdjustRowHeight || this.cell.table.tableProperty.canAdjustRowWidth) || hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState */.ak.psDesign) {
+    const {
+      canAdjustRowHeight,
+      canAdjustRowWidth
+    } = this._cell.table.tableProperty;
+    const paintStatus = hoEditorFactory.drawTree.paintStatus;
+    if (paintStatus === DrawTree/* PaintState */.ak.psEdit && (canAdjustRowHeight || canAdjustRowWidth) || paintStatus === DrawTree/* PaintState */.ak.psDesign) {
       this._ResizeObj = new ResizeDrawTableObj(this._hoEditorFactoryID, this._cell, this._touchArea, rowIndex, colIndex);
     }
     // this.paintBackground();
     // this.paintFrontGround();
   }
-  // public get restHeight() {
-  //   return this._maxHeight - this._docHeight;
-  // }
   get dWidth() {
     return this._dWidth;
   }
   set dWidth(value) {
     if (value !== this._dWidth) {
       this._dWidth = value;
-      // this._topBorder.width = value;
-      // this._bottomBorder.width = value;
-      // this._rightBorder.x = this._dLeft + this._dWidth - 2;
     }
   }
   get dHeight() {
@@ -150411,25 +150394,12 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
   set dHeight(value) {
     if (value !== this._dHeight) {
       this._dHeight = value;
-      // this._leftBorder.height = value;
-      // this._rightBorder.height = value;
-      // this._bottomBorder.y = this._dTop + this._dHeight - 2;
     }
   }
   updateCrossShap() {
     if (this._cell.cellProperty.obliqueSplitLine === TableProperty/* ObliqueSplitLine */.ST.None) {
-      // if (this._crossShape && this.contains(this._crossShape)) {
-      //   this.removeChild(this._crossShape);
-      // }
-      // this._crossShape = null;
       return;
     } else {
-      // if (!this._crossShape) {
-      //   this._crossShape = new createjs.Shape();
-      // }
-      // this._crossShape.graphics.clear();
-      // this._crossShape.x = 0;
-      // this._crossShape.y = 0;
       this._backImg.graphics.clear().setStrokeStyle(1);
       this._backImg.graphics.beginStroke("#000000");
       /*表格边框与边编码，角的编码是0、1、2、3 边的编码是ABCD
@@ -150497,36 +150467,17 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
       }
       this._backImg.graphics.endStroke();
     }
-    // if (this._crossShape && !this.contains(this._crossShape)) {
-    //   this.addChildAt(this._crossShape, 1);
-    // }
   }
   isFinishedPaint() {
     let ret = false;
     const index = this._endDline;
-    // if (this._drawLines.length === 0) {
-    //   return true;
-    // }
     if (this._startDline >= this.cell.drawCell.drawLines.length || index == -1) {
       return true;
     }
-    // if (this._lastDrawLine instanceof DrawPageTable) {
-    //   index = this._cell.drawCell.drawLines.indexOf(
-    //     (this._lastDrawLine as DrawPageTable).table.drawTable
-    //   );
-    // } else {
-    //   index = this._cell.drawCell.drawLines.indexOf(
-    //     this._lastDrawLine as DrawLine
-    //   );
-    // }
     if (index == this._cell.drawCell.drawLines.length - 1) {
       const endDline = this._cell.drawCell.drawLines[index];
       if (endDline instanceof DrawPageTable/* DrawPageTable */.Yt) {
         ret = endDline.isEndRowFinished();
-        // (this
-        //   ._lastDrawLine as DrawPageTable).table.drawTable.isFinishedPaint(
-        //   this.drawPageTable.pageIndex
-        // );
       } else {
         ret = true;
       }
@@ -150596,11 +150547,9 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
     }
   }
   startPaintBackGround() {
-    //this._backImg.uncache();
     this._backImg.graphics.clear();
   }
   endPaintBackGround(newHeight) {
-    //this._backImg.cache(-1, -1, this._dWidth + 1, newHeight + 1);
     this._backImg.graphics.endStroke();
   }
   paintMarker(color) {
@@ -150648,7 +150597,10 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
       const printGridLines = this._cell.cellProperty.printGridLines;
       const gridLineDisplay = this._cell.cellProperty.gridLineDisplay;
       const gridLinesColor = this._cell.cellProperty.gridLinesColor;
-      if (printGridLines || !printGridLines && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState */.ak.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState */.ak.psPrint) {
+      const gridLinesStyle = this._cell.cellProperty.gridLinesStyle;
+      const paintStatus = hoEditorFactory.drawTree.paintStatus;
+      let isDash = printGridLines && gridLinesStyle !== TableProperty/* GridLinesStyle */.dE.solid || !printGridLines && paintStatus !== DrawTree/* PaintState */.ak.psPreview && paintStatus !== DrawTree/* PaintState */.ak.psPrint;
+      if (printGridLines || !printGridLines && paintStatus !== DrawTree/* PaintState */.ak.psPreview && paintStatus !== DrawTree/* PaintState */.ak.psPrint) {
         if (gridLineDisplay[0]) {
           //上边框
           let topCell = null;
@@ -150658,7 +150610,7 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
           if (r == 0 || this.dTop == 0 || r > 0 && topCell && !topCell.cellProperty.gridLineDisplay[1]) {
             this._topLine.name = "topLine";
             this._topLine.graphics.beginStroke(gridLinesColor[0]);
-            if (printGridLines && this.cell.cellProperty.gridLinesStyle !== TableProperty/* GridLinesStyle */.dE.solid || !printGridLines && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState */.ak.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState */.ak.psPrint) {
+            if (isDash) {
               this._topLine.graphics.setStrokeDash([2, 2]);
             } else {
               this._topLine.graphics.setStrokeStyle(1, 0, 0, undefined, true);
@@ -150666,7 +150618,7 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
             this._topLine.graphics.moveTo(x, y).lineTo(x + dWidth, y);
             this._topLine.graphics.endStroke();
             if (!this.children.includes(this._topLine)) {
-              this.addChild(this._topLine);
+              this.addChildAt(this._topLine, this.children.length - 1);
             }
           }
         } else {
@@ -150695,7 +150647,7 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
           //下边框
           this._bottomLine.name = "bottomLine";
           this._bottomLine.graphics.beginStroke(gridLinesColor[1]);
-          if (printGridLines && this.cell.cellProperty.gridLinesStyle !== TableProperty/* GridLinesStyle */.dE.solid || !printGridLines && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState */.ak.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState */.ak.psPrint) {
+          if (isDash) {
             this._bottomLine.graphics.setStrokeDash([2, 2]);
           } else {
             this._bottomLine.graphics.setStrokeStyle(1, 0, 0, undefined, true);
@@ -150703,7 +150655,7 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
           this._bottomLine.graphics.moveTo(x, y + height).lineTo(x + dWidth, y + height);
           this._bottomLine.graphics.endStroke();
           if (!this.children.includes(this._bottomLine)) {
-            this.addChild(this._bottomLine);
+            this.addChildAt(this._bottomLine, this.children.length - 1);
           }
         } else {
           if (r < this.cell.table.rowCount - 1) {
@@ -150736,7 +150688,7 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
           if (c == 0 || c > 0 && leftCell && !leftCell.cellProperty.gridLineDisplay[3]) {
             this._leftLine.name = "leftLine";
             this._leftLine.graphics.beginStroke(gridLinesColor[2]);
-            if (printGridLines && this.cell.cellProperty.gridLinesStyle !== TableProperty/* GridLinesStyle */.dE.solid || !printGridLines && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState */.ak.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState */.ak.psPrint) {
+            if (isDash) {
               this._leftLine.graphics.setStrokeDash([2, 2]);
             } else {
               this._leftLine.graphics.setStrokeStyle(1, 0, 0, undefined, true);
@@ -150744,7 +150696,7 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
             this._leftLine.graphics.moveTo(x, y).lineTo(x, y + height);
             this._leftLine.graphics.endStroke();
             if (!this.children.includes(this._leftLine)) {
-              this.addChild(this._leftLine);
+              this.addChildAt(this._leftLine, this.children.length - 1);
             }
           }
         } else {
@@ -150776,7 +150728,7 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
           //右边框
           this._rightLine.name = "rightLine";
           this._rightLine.graphics.beginStroke(gridLinesColor[3]);
-          if (printGridLines && this.cell.cellProperty.gridLinesStyle !== TableProperty/* GridLinesStyle */.dE.solid || !printGridLines && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState */.ak.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState */.ak.psPrint) {
+          if (isDash) {
             this._rightLine.graphics.setStrokeDash([2, 2]);
           } else {
             this._rightLine.graphics.setStrokeStyle(1, 0, 0, undefined, true);
@@ -150784,7 +150736,7 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
           this._rightLine.graphics.moveTo(x + dWidth, y).lineTo(x + dWidth, y + height);
           this._rightLine.graphics.endStroke();
           if (!this.children.includes(this._rightLine)) {
-            this.addChild(this._rightLine);
+            this.addChildAt(this._rightLine, this.children.length - 1);
           }
         } else {
           if (c < this.cell.table.colCount - 1 && c > 0) {
@@ -150813,6 +150765,20 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
         }
       }
     }
+    // this.paintBackColor(true)
+  }
+  paintBackColor(draw) {
+    const hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this.hoEditorFactoryID);
+    this.backColor.graphics.clear();
+    this.backColor.alpha = 0.5;
+    if (draw && hoEditorFactory.drawTree.paintStatus != DrawTree/* PaintState */.ak.psPrint && hoEditorFactory.drawTree.paintStatus != DrawTree/* PaintState */.ak.psPreview) {
+      this.backColor.graphics.beginFill('#f00').drawRect(0, 0, this._dWidth, this._dHeight);
+      if (this.children.includes(this.backColor)) {
+        this.setChildIndex(this.backColor, 0);
+      } else {
+        this.addChildAt(this.backColor, 0);
+      }
+    }
   }
   paintCellBackground(newHeight, r, c) {
     this._backImg.x = 0;
@@ -150828,32 +150794,32 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
       this.setChildIndex(this._backImg, 0);
     }
     this.paintCellBorders(newHeight, r, c);
-    if (this._cell.needPaintLineGrid()) this.paintLineGrid();
+    if (this._cell.needPaintLineGrid()) {
+      this.paintLineGrid();
+    }
     this.setBounds(0, 0, this._dWidth, newHeight);
-    // this._backImg.cache(0, 0, this._dWidth, newHeight);
   }
   paintLineGrid() {
-    if (this._cell.drawCell.drawLines.length == 0) {
+    const drawLines = this._cell.drawCell.drawLines;
+    if (drawLines.length == 0) {
       return;
     }
-    let dHeight = this._cell.drawCell.drawLines[0].dHeight;
-    if (this._cell.drawCell.drawLines.length == 1 && this._cell.drawCell.drawLines[0] instanceof DrawLine/* DrawLine */.D && this._cell.drawCell.drawLines[0].drawItems.length == 0) {
-      dHeight = this._cell.drawCell.drawLines[0].adjustDHeight(dHeight) + this._cell.drawCell.drawLines[0].paragraphNode.combineParagraph.topMarginPixes;
+    let dHeight = drawLines[0].dHeight;
+    if (drawLines.length == 1 && drawLines[0] instanceof DrawLine/* DrawLine */.D && drawLines[0].drawItems.length == 0) {
+      dHeight = drawLines[0].adjustDHeight(dHeight) + drawLines[0].paragraphNode.combineParagraph.topMarginPixes;
     }
-    dHeight += this._cell.drawCell.drawLines[0].paragraphNode.combineParagraph.lineSpace;
+    dHeight += drawLines[0].paragraphNode.combineParagraph.lineSpace;
     const halfHeight = Math.ceil(dHeight / 2);
     let totalHeight = 0;
     for (let i = this.startDline; i < this._endDline; i++) {
-      const dline = this._cell.drawCell.drawLines[i];
+      const dline = drawLines[i];
       let count = 1;
       if (dline instanceof DrawLine/* DrawLine */.D) {
         if (dline.dHeight > dHeight) {
           count = Math.ceil(dline.dHeight / dHeight);
         }
         totalHeight += count * dHeight;
-        if (this.dHeight - totalHeight > halfHeight) this._backImg.graphics.beginStroke("#000").setStrokeStyle(1)
-        //.drawRect(0,Math.ceil(totalHeight) - 0.5,this._dWidth,1)
-        .moveTo(0, Math.ceil(totalHeight) - 0.5).lineTo(this._dWidth, Math.ceil(totalHeight) - 0.5);
+        if (this.dHeight - totalHeight > halfHeight) this._backImg.graphics.beginStroke("#000").setStrokeStyle(1).moveTo(0, Math.ceil(totalHeight) - 0.5).lineTo(this._dWidth, Math.ceil(totalHeight) - 0.5);
       }
     }
     while (totalHeight < this.dHeight + dHeight) {
@@ -150896,21 +150862,6 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
     } else if (this._cell.cellProperty.align == TableProperty/* VAlign */.gy.vabottom) {
       const [newValignTop, rowHeightArr] = this.calcValignTop(newHeight);
       if (rowHeightArr) {
-        // const getPlace=(dTop:number,dPageCellIndex: number,dHeight:number):[number,number]=>{
-        //   let index=0;
-        //   let newTop=dTop;
-        //   let rowHeight=0;
-        //   for (let i=0;i<topArr.length;i++ ){
-        //     if (dTop+dHeight<topArr[i]){
-        //       index=i;
-        //       break;
-        //     }
-        //     else {
-        //       newTop-=topArr[i]
-        //     }
-        //   }
-        //   return [index,newTop]
-        // }
         if (newValignTop != this._valignTop) {
           this._valignTop = newValignTop;
           const childCount = this._cell.drawCell.drawLines.length;
@@ -150933,7 +150884,6 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
               dObj.y = cellrestHeight - dObj.dHeight - dObj.paragraphNode.combineParagraph.lineSpace;
               cellrestHeight = dObj.y;
               dPageCell.addChild(dObj);
-              // const [pageCellIndex,newTop]=getPlace(dTop,index,dObj.dHeight);
             }
           }
         }
@@ -150941,17 +150891,18 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
     }
   }
   getPagePaintPosition() {
-    const paraNode = this._cell.childNodes[0].combineParagraph;
-    const dleft = paraNode.leftMarginPixes;
-    const dTop = paraNode.topMarginPixes;
     const dPage = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID).drawPageTree.getDrawPageByDNode(this._drawPageTable);
     if (!dPage) {
       throw new Error("表格绘制还未准备好");
     }
+    const paraNode = this._cell.childNodes[0].combineParagraph;
+    const dleft = paraNode.leftMarginPixes;
+    const dTop = paraNode.topMarginPixes;
     return new PagePaintPosition/* PagePaintPosition */.z(this._hoEditorFactoryID, dPage.pageIndex, dleft, dTop);
   }
   calcValignTop(restHeight) {
     const index = this.cell.drawCell.drawPageCells.indexOf(this);
+    const drawCell = this._cell.drawCell;
     let innerTop = 0;
     let toparr = new Array();
     let pageHeight = 0;
@@ -150965,9 +150916,9 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
       valignTop = innerTop;
     } else if (this._cell.cellProperty.align === TableProperty/* VAlign */.gy.vacenter) {
       [drawTreeHeight, pageHeight, toparr] = this.calcCellHeight(restHeight);
-      //2024-01-02改 
-      if (pageHeight > this._cell.drawCell.docHeight && this.dHeight - this._cell.drawCell.docHeight > 2) {
-        valignTop = (pageHeight - (this._cell.drawCell.docHeight + 2)) / 2;
+      //2024-01-02改
+      if (pageHeight > drawCell.docHeight && this.dHeight - drawCell.docHeight > 2) {
+        valignTop = (pageHeight - (drawCell.docHeight + 2)) / 2;
       }
     } else if (this._cell.cellProperty.align === TableProperty/* VAlign */.gy.vabottom) {
       [drawTreeHeight, pageHeight, toparr] = this.calcCellHeight(restHeight);
@@ -150981,12 +150932,12 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
       for (let r = 0; r < pageTableIndex; r++) {
         prevDocHeight += toparr[r][1];
       }
-      if (drawTreeHeight > this._cell.drawCell.docHeight) {
-        //valignTop = pageHeight - Math.max(0, (this._cell.drawCell.docHeight - restRowHeight - innerBottom - prevDocHeight));
-        if (this._cell.drawCell.docHeight <= 13) {
-          valignTop = pageHeight - Math.max(0, this._cell.drawCell.docHeight - restRowHeight - innerBottom - prevDocHeight) - 5;
+      if (drawTreeHeight > drawCell.docHeight) {
+        //valignTop = pageHeight - Math.max(0, (drawCell.docHeight - restRowHeight - innerBottom - prevDocHeight));
+        if (drawCell.docHeight <= 13) {
+          valignTop = pageHeight - Math.max(0, drawCell.docHeight - restRowHeight - innerBottom - prevDocHeight) - 5;
         } else {
-          valignTop = pageHeight - Math.max(0, this._cell.drawCell.docHeight - restRowHeight - innerBottom - prevDocHeight);
+          valignTop = pageHeight - Math.max(0, drawCell.docHeight - restRowHeight - innerBottom - prevDocHeight);
         }
       }
     }
@@ -150998,13 +150949,9 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
       valignTop = this.calcValignTop(restHeight)[0];
       this._valignTop = valignTop;
     }
-    // if (startIndex === 0) {
-    //    valignTop=this.calcValignTop();
-    //    this._valignTop=valignTop;
-    // }
     this._startDline = startIndex < -1 ? 0 : startIndex;
     const ret = super.update(prevDrawArea, dlines, this._startDline, valignTop, restHeight);
-    this._docHeight = Math.max(0, this._docHeight - valignTop);
+    this.docHeight = Math.max(0, this.docHeight - valignTop);
     this.updateDHeight();
     return ret;
     // this.updateTouchArea(this._dHeight);
@@ -151019,7 +150966,7 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
   calcCellHeight(restHeight) {
     const [row, c] = this._cell.table.getCellInfos(this._cell);
     let ret = 0;
-    const hoeditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._cell.hoEditorFactoryID);
+    // const hoeditorFactory = HOEditorFactorys.instance().getFactory(this._cell.hoEditorFactoryID);
     let dTopArr = new Array();
     let pageHeight = 0;
     if (this._cell.cellProperty.align == TableProperty/* VAlign */.gy.vabottom) {
@@ -151036,11 +150983,9 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
         dTopArr.push([0, 0]);
         for (let r = row, count = this._cell.rowSpan + row - 1; r <= count; r++) {
           const dTable = this._cell.table.drawTable.drawPageTables[i];
-          //if (dTable.parent&&dTable.parent.contains(dTable) ){ 
           const rowInfos = dTable.partRowHeights.get(r);
           if (rowInfos) {
             dTopArr[index][0] += rowInfos.rowHeight;
-            // }
           }
           const partCell = this._cell.drawCell.getDrawPageCell(dTable);
           if (partCell) {
@@ -151520,7 +151465,7 @@ class DrawPageTable extends _DrawRect__WEBPACK_IMPORTED_MODULE_12__/* .DrawRect
     }
     const partCell = cell.drawCell.getDrawPageCell(this);
     if (partCell) {
-      const oldHeight = partCell.dHeight;
+      //   const oldHeight = partCell.dHeight;
       partCell.dHeight = newHeight;
       partCell.afterHeightChanged(newHeight);
       if (partCell.cell.rowSpan > 1) {
@@ -151531,7 +151476,9 @@ class DrawPageTable extends _DrawRect__WEBPACK_IMPORTED_MODULE_12__/* .DrawRect
           this.updatePartCell(partCell.cell.drawCell.drawPageCells[i], dPrevPartCell, relR, relC, startChildIndex);
           dPrevPartCell = partCell.cell.drawCell.drawPageCells[i];
           startChildIndex = dPrevPartCell.endDline;
-          if (dPrevPartCell.isEndLineFinished()) startChildIndex = dPrevPartCell.endDline + 1;
+          if (dPrevPartCell.isEndLineFinished()) {
+            startChildIndex = dPrevPartCell.endDline + 1;
+          }
         }
       }
       this.paintCellBorder(partCell, relR, relC, newHeight);
@@ -151562,84 +151509,12 @@ class DrawPageTable extends _DrawRect__WEBPACK_IMPORTED_MODULE_12__/* .DrawRect
         } else {
           cell = mainCell;
         }
-        // if (
-        //   (mr <= r && mr + mainCell.rowSpan - 1 >= r && mc === j) ||
-        //   r === this._endRow
-        // ) {
-        //   cell = mainCell;
-        //   for (let row = mr + mainCell.rowSpan - 1; row >= Math.max(this.startRow, mr); row--) {
-        //     if (row == r) continue;
-        //     const preRowHeight = this._partRowHeights.get(row);
-        //     if (preRowHeight) {
-        //       newHeight += preRowHeight.rowHeight;
-        //     }
-        //   }
-        // }
       }
       if (cell) {
         this.updatePartCellHeight(cell, relR, relC, r, aHeight, false);
       }
     }
   }
-  // if (cell) {
-  //   endj = relC + cell.colSpan;
-  //   const partCell = cell.drawCell.getDrawPageCell(this);
-  //   // if (!partCell) {
-  //   //   const dPartTable = this._table.drawTable.getDrawTableByParentArea(
-  //   //     pageIndex
-  //   //   );
-  //   //   if (dPartTable) {
-  //   //     const [aleft, awidth] = cell.getLeftWidth();
-  //   //     const dTop = cell.table.drawTable.getParentHeadHeight();
-  //   //     const maxHeight =
-  //   //       cell.table.hoEditorFactory.drawPageTree.getMainDoc(pageIndex)
-  //   //         .maxHeight - dTop;
-  //   //     let startLine = 0;
-  //   //     const prevCell = cell.drawCell.getDrawPageCellByPageIndex(
-  //   //       pageIndex - 1
-  //   //     );
-  //   //     if (prevCell) {
-  //   //       if (prevCell.lastDrawLine instanceof DrawPageTable) {
-  //   //         startLine = prevCell.cell.drawCell.drawLines.indexOf(
-  //   //           prevCell.lastDrawLine._table.drawTable
-  //   //         );
-  //   //       } else {
-  //   //         startLine = prevCell.cell.drawCell.drawLines.indexOf(
-  //   //           prevCell.lastDrawLine
-  //   //         );
-  //   //       }
-  //   //       if (prevCell.isEndLineFinished()) startLine += 1;
-  //   //     }
-  //   //     partCell = new DrawPageCell(
-  //   //       this._table.hoEditorFactory,
-  //   //       dPartTable,
-  //   //       cell,
-  //   //       aleft,
-  //   //       dTop,
-  //   //       awidth,
-  //   //       newHeight,
-  //   //       pageIndex,
-  //   //       startLine,
-  //   //       maxHeight
-  //   //     );
-  //   //   }
-  //   // }
-  //   if (partCell) {
-  //     partCell.dHeight = newHeight;
-  //     if (partCell.cell.rowSpan > 1) {
-  //       let index = partCell.cell.drawCell.drawPageCells.indexOf(partCell) - 1;
-  //       let dPrevPartCell: DrawPageCell | null = null;
-  //       let startChildIndex = 0;
-  //       for (let i = 0; i <= index; i++) {
-  //         this.updatePartCell(partCell.cell.drawCell.drawPageCells[i], dPrevPartCell, relR, relC, startChildIndex);
-  //         dPrevPartCell = partCell.cell.drawCell.drawPageCells[i];
-  //         startChildIndex = dPrevPartCell.endDline;
-  //         if (dPrevPartCell.isEndLineFinished())
-  //           startChildIndex = dPrevPartCell.endDline + 1;
-  //       }
-  //     }
-  //     this.paintCellBorder(partCell, relR, relC, newHeight);
-  //   } this.updatePartCellHeight(cell,relR,relC,r,aHeight,false);
   paintCellBorder(partCell, r, c, newHeight) {
     partCell.startPaintBackGround();
     const colInfo = this._table.colInfos[c];
@@ -152215,21 +152090,8 @@ class DrawPageTable extends _DrawRect__WEBPACK_IMPORTED_MODULE_12__/* .DrawRect
         //同一行的合并列只绘制一次
         if (cell && mc === c && (mr === r || r === this.startRow)) {
           if (cell.rowSpan > 1) {
-            // for (let j = mr + 1; j < mr + cell.rowSpan; j++) {
-            //   cellRestHeight += this._table.rowInfos[j].rowHeight;
-            // }
             cellRestHeight = Math.min(cell.drawCell.getCellRestHeight(0), pageRestHeight);
           }
-          const destCell = cell.drawCell.copyPaintCell(this, r, aTop);
-          // if (destCell) {
-          //   destCell.paintCellBackground(destCell.dHeight, mr, mc);
-          //   //  destCell.updateTouchArea(newHeight);}
-          // }
-          // if (this.stage){
-          //   const dPage= this._table.hoEditorFactory.drawTree.getDrawPageByDomStage(this.stage);
-          //   if (dPage){}
-          // }
-          // cell.drawCell.copyPaintCell(this.dPage.pageIndex, this, aTop);
         }
       }
       aTop += this._table.drawTable.drawPageTables[0].getPartRowHeight(r);
@@ -152258,9 +152120,6 @@ class DrawPageTable extends _DrawRect__WEBPACK_IMPORTED_MODULE_12__/* .DrawRect
    */
   drawUpdate(prevdPageTable, dRestHeight) {
     const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_9__/* .HOEditorFactorys */ .O.instance().getFactory(this.table.hoEditorFactoryID);
-    // if (this.table.tableProperty.fixedOnePage) {
-    //   dRestHeight = Infinity;
-    // }
     let pageRestHeight = dRestHeight;
     let rowTop = 0;
     const index = this._table.drawTable.drawPageTables.indexOf(this);
@@ -152280,7 +152139,9 @@ class DrawPageTable extends _DrawRect__WEBPACK_IMPORTED_MODULE_12__/* .DrawRect
     let startRow = this._startRow;
     let bStartRowFinished = true;
     if (prevdPageTable) {
-      if (prevdPageTable.isEndRowFinished()) startRow = prevdPageTable._endRow + 1;else {
+      if (prevdPageTable.isEndRowFinished()) {
+        startRow = prevdPageTable._endRow + 1;
+      } else {
         startRow = prevdPageTable._endRow;
         bStartRowFinished = false;
       }
@@ -152288,7 +152149,6 @@ class DrawPageTable extends _DrawRect__WEBPACK_IMPORTED_MODULE_12__/* .DrawRect
     }
     this._startRow = startRow;
     let rowRestHeight = 0;
-    const oldEndRow = this._endRow;
     let bRowHeightChanged = false;
     let rowHeight = 0;
     this._endRow = this._startRow;
@@ -152303,7 +152163,7 @@ class DrawPageTable extends _DrawRect__WEBPACK_IMPORTED_MODULE_12__/* .DrawRect
         this.removeDrawCellAfterRow(r);
         break;
       }
-      if (pageRestHeight < this._table.drawTable.getRowStartLineMaxHeight(r)) {
+      if (pageRestHeight <= this._table.drawTable.getRowStartLineMaxHeight(r)) {
         this.removeDrawCellAfterRow(r);
         break;
       }
@@ -154105,8 +153965,11 @@ class DrawTable extends _DrawRect__WEBPACK_IMPORTED_MODULE_10__/* .DrawRect */ .
     let rowTop = 0;
     let isEndRowFinished = false;
     if (dPageTable) {
-      // }
-      if (bNewTable) dPageTable.paint(dTop, dParent, dRestHeight);else dPageTable.drawUpdate(prevdPageTable, dRestHeight);
+      if (bNewTable) {
+        dPageTable.paint(dTop, dParent, dRestHeight);
+      } else {
+        dPageTable.drawUpdate(prevdPageTable, dRestHeight);
+      }
       isEndRowFinished = dPageTable.isEndRowFinished();
       if (dPageTable.endRow === this._table.rowCount - 1 && isEndRowFinished) {
         const index = this.drawPageTables.indexOf(dPageTable);
@@ -154241,40 +154104,17 @@ class DrawTable extends _DrawRect__WEBPACK_IMPORTED_MODULE_10__/* .DrawRect */ .
   paintTable(dParent, dTop, restHeight, startRow) {
     const dHeight = 0;
     this._table.getLeftWidth();
-    if (this.getHeadHeight() + _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID).defaultLineHeight > restHeight) {
+    const headHeight = this.getHeadHeight();
+    const defaultLineHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID).defaultLineHeight;
+    if (headHeight + defaultLineHeight > restHeight) {
       return null;
     }
-    // if (this._drawPageTables.size > 0) {
-    //   const prevDPageTable = this.getDrawTableByParentArea(drawPage.pageIndex - 1);
-    //   if (prevDPageTable) {
-    //     if (prevDPageTable.isEndRowFinished()) {
-    //       startRow = prevDPageTable.endRow + 1;
-    //     } else {
-    //       startRow = prevDPageTable.endRow;
-    //     }
-    //   }
-    // }
     const aWidth = this.dWidth;
-    // if (this._drawPageTables.size>0){
-    //   const prevPageTable=this.getDrawTableByParentArea(pageIndex-1);
-    //   if (prevPageTable){
-    //     if (prevPageTable.isEndRowFinished())
-    //       startRow= prevPageTable.endRow+1
-    //     else startRow= prevPageTable.endRow;
-    //   }
-    // }
-    // -
-    // this._paragraphNode.combineParagraph.leftMarginPixes -
-    // this._paragraphNode.combineParagraph.rightMarginPixes;
     const dPageTable = new _DrawPageTable__WEBPACK_IMPORTED_MODULE_9__/* .DrawPageTable */ .Yt(this._rootPath, this._table, dParent, this._drawPageTables.length, dTop, aWidth, restHeight, this._paragraphNode);
     dPageTable.startRow = startRow;
     this._drawPageTables.push(dPageTable);
     dPageTable.paint(0, dParent, restHeight);
     return dPageTable;
-    // if (dPageTable.endRow < this._table.rowCount || !dPageTable.isEndRowFinished()) {
-    //   return this.paintPage(dParent, pageIndex + 1, 0, dParent.maxHeight)
-    // }
-    // return dTop + dPageTable.dHeight;
   }
   getCellRowHeight(cell, r) {
     if (r > this._table.rowCount - 1 || r < 0) {
@@ -154607,7 +154447,6 @@ class DrawTable extends _DrawRect__WEBPACK_IMPORTED_MODULE_10__/* .DrawRect */ .
     if (headCount < 0) {
       startRow = 0;
     }
-    // console.log('----', this.table.rowCount, headCount, headHeight, restHeight, startRow, this.getRowStartLineMaxHeight(startRow))
     if (this.table.rowCount > headCount && headHeight + this.getRowStartLineMaxHeight(startRow) > restHeight) {
       return false;
     }
@@ -154686,29 +154525,33 @@ class DrawTableFormular extends DrawSimpleNode {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   t: function() { return /* binding */ DrawTableFormularChart; }
 /* harmony export */ });
-/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(32356);
-/* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(44114);
-/* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var core_js_modules_es_array_unshift_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(13609);
-/* harmony import */ var core_js_modules_es_array_unshift_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_unshift_js__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(27495);
-/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(25440);
-/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var core_js_modules_esnext_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(98992);
-/* harmony import */ var core_js_modules_esnext_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_esnext_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var core_js_modules_esnext_iterator_filter_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(54520);
-/* harmony import */ var core_js_modules_esnext_iterator_filter_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_esnext_iterator_filter_js__WEBPACK_IMPORTED_MODULE_6__);
-/* harmony import */ var core_js_modules_esnext_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(3949);
-/* harmony import */ var core_js_modules_esnext_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_esnext_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_7__);
-/* harmony import */ var core_js_modules_esnext_iterator_map_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(81454);
-/* harmony import */ var core_js_modules_esnext_iterator_map_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_esnext_iterator_map_js__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(62953);
-/* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_9__);
-/* harmony import */ var _yuki_createjs__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(56419);
-/* harmony import */ var _yuki_createjs__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(_yuki_createjs__WEBPACK_IMPORTED_MODULE_10__);
-/* harmony import */ var _types_EditorType__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(27195);
-/* harmony import */ var _DrawCombineNode__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(10431);
+/* harmony import */ var ant_design_vue_es_message_style__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(21902);
+/* harmony import */ var ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(40233);
+/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(32356);
+/* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(44114);
+/* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var core_js_modules_es_array_unshift_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(13609);
+/* harmony import */ var core_js_modules_es_array_unshift_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_unshift_js__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(27495);
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(25440);
+/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var core_js_modules_esnext_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(98992);
+/* harmony import */ var core_js_modules_esnext_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_esnext_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var core_js_modules_esnext_iterator_filter_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(54520);
+/* harmony import */ var core_js_modules_esnext_iterator_filter_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_esnext_iterator_filter_js__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var core_js_modules_esnext_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(3949);
+/* harmony import */ var core_js_modules_esnext_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_esnext_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var core_js_modules_esnext_iterator_map_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(81454);
+/* harmony import */ var core_js_modules_esnext_iterator_map_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_esnext_iterator_map_js__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(62953);
+/* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var _yuki_createjs__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(56419);
+/* harmony import */ var _yuki_createjs__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(_yuki_createjs__WEBPACK_IMPORTED_MODULE_11__);
+/* harmony import */ var _types_EditorType__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(27195);
+/* harmony import */ var _DrawCombineNode__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(10431);
+
+
 
 
 
@@ -154722,15 +154565,15 @@ class DrawTableFormular extends DrawSimpleNode {
 
 
 
-class DrawTableFormularChart extends _DrawCombineNode__WEBPACK_IMPORTED_MODULE_12__/* .DrawCombineNode */ .A {
+class DrawTableFormularChart extends _DrawCombineNode__WEBPACK_IMPORTED_MODULE_13__/* .DrawCombineNode */ .A {
   constructor(hoEditfactoryId, rootPath, node) {
     super(hoEditfactoryId, rootPath, node, 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A)(this, "dNode", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A)(this, "hoEditfactoryId", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A)(this, "formularProperty", null);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A)(this, "dNode", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A)(this, "hoEditfactoryId", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A)(this, "formularProperty", null);
     this.dNode = node;
     this.hoEditfactoryId = hoEditfactoryId;
-    if (node.formularType == _types_EditorType__WEBPACK_IMPORTED_MODULE_11__/* .FormularType */ .Dd.ftCurveChart) {
+    if (node.formularType == _types_EditorType__WEBPACK_IMPORTED_MODULE_12__/* .FormularType */ .Dd.ftCurveChart) {
       var _node$formularPropert;
       this.dWidth = Number((_node$formularPropert = node.formularProperty) === null || _node$formularPropert === void 0 ? void 0 : _node$formularPropert.width) || 100;
       // this.dHeight = Number(node.formularProperty?.height) || 100;
@@ -154751,10 +154594,26 @@ class DrawTableFormularChart extends _DrawCombineNode__WEBPACK_IMPORTED_MODULE_1
             const cell = table.rows[r][c];
             if (cell) {
               notAllowEdit = cell.cellProperty.notAllowEdit || false;
-              const text = cell.getCellText() || '';
+              let text = cell.getCellText();
               if (notAllowEdit) {
                 list.push(text);
               } else {
+                if (this.formularProperty && text) {
+                  if (text > this.formularProperty.max) {
+                    var _cell$drawCell$drawPa;
+                    text = '';
+                    (_cell$drawCell$drawPa = cell.drawCell.drawPageCells[0]) === null || _cell$drawCell$drawPa === void 0 || _cell$drawCell$drawPa.paintBackColor(true);
+                    ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .A.error(`曲线图设置的最大值为${this.formularProperty.max}`);
+                  } else if (text < this.formularProperty.min) {
+                    var _cell$drawCell$drawPa2;
+                    text = '';
+                    (_cell$drawCell$drawPa2 = cell.drawCell.drawPageCells[0]) === null || _cell$drawCell$drawPa2 === void 0 || _cell$drawCell$drawPa2.paintBackColor(true);
+                    ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .A.error(`曲线图设置的最小值为${this.formularProperty.min}`);
+                  } else {
+                    var _cell$drawCell$drawPa3;
+                    (_cell$drawCell$drawPa3 = cell.drawCell.drawPageCells[0]) === null || _cell$drawCell$drawPa3 === void 0 || _cell$drawCell$drawPa3.paintBackColor(false);
+                  }
+                }
                 list.push(text.replace(/\+|-/g, ''));
               }
             }
@@ -154779,6 +154638,7 @@ class DrawTableFormularChart extends _DrawCombineNode__WEBPACK_IMPORTED_MODULE_1
       this.dWidth = currentCell.drawCell.dWidth - 30;
       const xInfo = this.getCell(currentCell.table, xArr);
       const yInfo = this.getCell(currentCell.table, yArr);
+      // currentCell.table.update();
       let xAxis = [];
       let yAxis = [];
       let valueList = [];
@@ -156643,7 +156503,7 @@ class EditorController {
       if (!e || !e.clipboardData) {
         return;
       }
-      const result = hoeditorfactory.editController.canIsEdit(hoeditorfactory);
+      const result = hoeditorfactory.editController.canIsEdit(hoeditorfactory, 'paste');
       if (result) {
         hoeditorfactory.editController.editKeyPaste(e.clipboardData);
       }
@@ -167736,7 +167596,7 @@ var map = {
 	"./printstyle/PrintLineStyle.vue": 27705,
 	"./qrCode/QrCode.vue": 13633,
 	"./radioCheckBox/RadioCheckbox.vue": 97008,
-	"./selectDialog/SelectDialog.vue": 91934,
+	"./selectDialog/SelectDialog.vue": 68738,
 	"./sign/Sign.vue": 69914,
 	"./slider/Slider.vue": 46839,
 	"./specialChars/HoSpecialChars.vue": 33336,
@@ -167746,7 +167606,7 @@ var map = {
 	"./table/TableColProperty.vue": 81078,
 	"./table/TableForm.vue": 35121,
 	"./table/TableFormTree.vue": 75295,
-	"./table/TableFormula.vue": 68707,
+	"./table/TableFormula.vue": 95044,
 	"./table/TableProperty.vue": 65356,
 	"./table/TableRowProperty.vue": 51653,
 	"./textDialog/TextBorderDialog.vue": 80713,
@@ -223234,7 +223094,7 @@ var entry_lib_TextNode = __webpack_require__(32083);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var entry_lib_ParagraphNode = __webpack_require__(40504);
 ;// ./src/components/version.ts
-/* harmony default export */ var entry_lib_version = ('3.1.207');
+/* harmony default export */ var entry_lib_version = ('3.1.209');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var entry_lib_PoperTipText = __webpack_require__(89316);
 ;// ./src/components/controls/poperTipText/index.ts
@@ -224564,21 +224424,21 @@ class entry_lib_DrawPageTree {
     const aline = dRoots[startLine];
     let dLine;
     let dTop = 0;
-    let mainDTop = 0;
-    //if (!hoEditorFactory.isUseDrawingOptimization) {
     if (aline instanceof entry_lib_DrawTable/* DrawTable */.n) {
       //表格在绘制时，只取最后一个分页表格，
       if (aline.drawPageTables.length > 0) {
         dLine = aline.drawPageTables[aline.drawPageTables.length - 1];
       } else {
-        //表格还未开始绘制，无起始行 
+        //表格还未开始绘制，无起始行
         dLine = null;
         if (startLine > 0) {
           const prevLine = dRoots[startLine - 1];
           let prevDObj;
           if (prevLine instanceof entry_lib_DrawTable/* DrawTable */.n) {
             prevDObj = prevLine.drawPageTables[prevLine.drawPageTables.length - 1];
-          } else prevDObj = prevLine;
+          } else {
+            prevDObj = prevLine;
+          }
           const prevArea = this.getMainRootArea(prevDObj);
           if (prevArea === drawArea) {
             dTop = prevDObj.y + prevDObj.dHeight + prevDObj.paragraphNode.combineParagraph.lineSpace;
@@ -224586,23 +224446,16 @@ class entry_lib_DrawPageTree {
               dTop -= prevDObj.paragraphNode.combineParagraph.lineSpace;
             }
           }
-          // } else {
-          //   dTop =
-          //     prevLine.y +
-          //     prevLine.dHeight +
-          //     prevLine.paragraphNode.combineParagraph.lineSpace;
-          //   if (drawArea.allowAcrossPage) restHeight = drawArea.maxHeight - dTop;
-          // }
         }
       }
     } else {
       dLine = aline;
       dTop = aline.y;
     }
-    //}
     //----------------结束定位绘制起始行，绘制起始位置--------------------------
-    if (drawArea.allowAcrossPage) restHeight = drawArea.maxHeight - dTop;
-    // let drawArea = this.getMainRootArea(dLine);
+    if (drawArea.allowAcrossPage) {
+      restHeight = drawArea.maxHeight - dTop;
+    }
     if (!drawArea) {
       return;
     }
@@ -224610,18 +224463,8 @@ class entry_lib_DrawPageTree {
     if (!mainArea) {
       return;
     }
-    /*绘制优化
-    if (hoEditorFactory.isUseDrawingOptimization
-      && drawArea instanceof DrawPageMainDoc
-      && dRoots.length > 1) {
-      startLine = this.calcStartLine(drawArea);
-      endLine = dRoots.length - 1;
-      startUpdateLine = endLine;
-            drawArea.removeAllChildren();
-    }
-    */
     let nextLine = startLine;
-    //用于判断是否页已经満页的map 
+    //用于判断是否页已经満页的map
     let pageIsFull = new Map();
     try {
       this._startNeedUpdatePage = -1;
@@ -224635,7 +224478,7 @@ class entry_lib_DrawPageTree {
           nextLine += 1;
           continue;
         }
-        //如果需要新起一页，则新起一页
+        // 需要新起一页
         if (dline.paragraphNode.printAsSinglePage && dline.paragraphNode.drawlines[0] === dline && dTop > 0 && drawArea instanceof entry_lib_DrawPageMainDoc/* DrawPageMainDoc */.L) {
           this._startNeedUpdatePage = Math.min(drawArea.pageIndex, this._startNeedUpdatePage === -1 ? 99999 : this._startNeedUpdatePage);
           this._endNeedUpdatePage = Math.max(drawArea.pageIndex, this._endNeedUpdatePage);
@@ -224648,8 +224491,11 @@ class entry_lib_DrawPageTree {
           }
           drawArea = this.getNextDrawArea(drawArea, true)[0];
           dTop = 0;
-          if (drawArea.allowAcrossPage) restHeight = drawArea.maxHeight - dTop;
+          if (drawArea.allowAcrossPage) {
+            restHeight = drawArea.maxHeight - dTop;
+          }
         }
+        // 需要更新页眉
         if (dline.paragraphNode.forceChangeHeader && dline.paragraphNode.drawlines[0] === dline && dTop > 0 && drawArea instanceof entry_lib_DrawPageMainDoc/* DrawPageMainDoc */.L) {
           this._startNeedUpdatePage = Math.min(drawArea.pageIndex, this._startNeedUpdatePage === -1 ? 99999 : this._startNeedUpdatePage);
           this._endNeedUpdatePage = Math.max(drawArea.pageIndex, this._endNeedUpdatePage);
@@ -224664,7 +224510,9 @@ class entry_lib_DrawPageTree {
               hoEditorFactory.subDocManger.updateSubDocPageIndexByPath(drawArea.pageIndex, dline.paragraphNode.docId);
             }
           }
-          if (drawArea.allowAcrossPage) restHeight = drawArea.maxHeight - dTop;
+          if (drawArea.allowAcrossPage) {
+            restHeight = drawArea.maxHeight - dTop;
+          }
         }
         // 判断是否已经满页
         if (dline instanceof entry_lib_DrawTable/* DrawTable */.n && (restHeight < hoEditorFactory.defaultLineHeight || !dline.isFirstRowCanFit(restHeight)) || dline instanceof entry_lib_DrawLine/* DrawLine */.D && restHeight < dline.dHeight && dTop > 0) {
@@ -224715,7 +224563,9 @@ class entry_lib_DrawPageTree {
                 }
                 dTop = 0;
               }
-              if (drawArea.allowAcrossPage) restHeight = drawArea.maxHeight - dTop;
+              if (drawArea.allowAcrossPage) {
+                restHeight = drawArea.maxHeight - dTop;
+              }
               if (restHeight < entry_lib_TableNode/* gDefaultRowHeight */.ip && drawArea instanceof entry_lib_DrawPageMainDoc/* DrawPageMainDoc */.L) {
                 drawArea.endDline = nextLine - 1;
                 this._startNeedUpdatePage = Math.min(drawArea.pageIndex, this._startNeedUpdatePage === -1 ? 99999 : this._startNeedUpdatePage);
@@ -224733,7 +224583,11 @@ class entry_lib_DrawPageTree {
                   drawArea.topDline = dPageTable;
                 }
                 dTop = dPageTable.y + dPageTable.dHeight;
-                if (drawArea.allowAcrossPage) restHeight = drawArea.maxHeight - dTop;else mainArea.docHeight = dTop;
+                if (drawArea.allowAcrossPage) {
+                  restHeight = drawArea.maxHeight - dTop;
+                } else {
+                  mainArea.docHeight = dTop;
+                }
               }
               bFinishedPaint = dobj.isFinishedPaint();
               if (!bFinishedPaint) {
@@ -224781,7 +224635,9 @@ class entry_lib_DrawPageTree {
           //修改下一行的绘制起始位置
           dTop = dobj.y + dobj.dHeight + dobj.paragraphNode.combineParagraph.lineSpace;
           mainArea.docHeight = dTop;
-          if (drawArea.allowAcrossPage) restHeight = drawArea.maxHeight - dTop;
+          if (drawArea.allowAcrossPage) {
+            restHeight = drawArea.maxHeight - dTop;
+          }
         }
         if (nextLine >= endLine) break;else nextLine += 1;
       }
@@ -224824,12 +224680,14 @@ class entry_lib_DrawPageTree {
         const dPageTable = dobj.getDrawTableByPageIndex(mainArea.index);
         if (dPageTable) {
           startDrawLine = dPageTable;
-        } else startDrawLine = dobj.drawPageTables[0];
+        } else {
+          startDrawLine = dobj.drawPageTables[0];
+        }
       } else {
         startDrawLine = dobj;
       }
       let drawTop = startDrawLine.y;
-      if (startDrawLine instanceof entry_lib_DrawPageTable/* DrawPageTable */.Yt && !mainArea.contains(startDrawLine) && startDrawLine instanceof entry_lib_DrawPageTable/* DrawPageTable */.Yt && startDrawLine.table.drawTable.drawPageTables.indexOf(startDrawLine) > 0) {
+      if (startDrawLine instanceof entry_lib_DrawPageTable/* DrawPageTable */.Yt && !mainArea.contains(startDrawLine) && startDrawLine.table.drawTable.drawPageTables.indexOf(startDrawLine) > 0) {
         drawTop = 0;
       }
       //对于新插入的内容绘制完成后（一直到最后一个插入的段落结束），后续的段落需要进行移动位置，则调用update 
@@ -225112,14 +224970,6 @@ class entry_lib_DrawPageTree {
     let headerIndex = hoEditorFactory.subDocManger.getHeaderIndexByRoots(headerNodes);
     let footerIndex = hoEditorFactory.subDocManger.getFooterIndexByRoots(footerNodes);
     ;
-    // if (singlePage) {
-    //   if (this._drawHeaders.length > index && this._drawHeaders[headerIndex]) {
-    //     headerIndex = index
-    //   }
-    //   if (this._drawFooters.length > index && this._drawFooters[footerIndex]) {
-    //     footerIndex = index
-    //   }
-    // }
     const dHeader = this._drawHeaders[headerIndex];
     const headerActualHeight = dHeader ? dHeader.actualHeight + hoEditorFactory.pageProperty.headerYPixes : 0;
     const dFooter = this._drawFooters[footerIndex];
@@ -225130,38 +224980,12 @@ class entry_lib_DrawPageTree {
     }
     const dhheight = Math.max(hoEditorFactory.pageProperty.topMarginPixes, headerActualHeight);
     const dfheight = Math.max(hoEditorFactory.pageProperty.bottomMarginPixes, footerActualHeight);
-    // console.log(dhheight);
-    // if (path.startsWith('header') || path.startsWith('footer')) {
     //根据页眉，页脚高度重新设置正文位置和高度
     dMainDoc.x = hoEditorFactory.pageProperty.leftMarginPixes;
     dMainDoc.y = dhheight;
     dMainDoc.maxHeight = hoEditorFactory.pageProperty.heightPixes - dhheight - dfheight;
     dMainDoc.dHeight = hoEditorFactory.pageProperty.heightPixes - dhheight - dfheight;
     //TODO:正文重新绘制，还可能创建新的页面，等其他操作 this._domLevel.drawMainDoc.paintArea();
-    // }
-    // if (path.startsWith('footer')) {
-    //  this._drawFooter.dTop =
-    //   hoEditorFactory.pageProperty.heightPixes - dfheight;
-    //  this._drawFooter.y =  this._drawFooter.dTop;
-    // this._drawHeader.paintMask(
-    //   Math.max(
-    //     Math.min(
-    //       this._drawHeader.docHeight,
-    //       this._drawHeader.maxHeight
-    //     ),
-    //     this._drawHeader.dHeight
-    //   )
-    // );
-    //  this._drawFooter.paintMask(
-    //   Math.max(
-    //     Math.min(
-    //        this._drawFooter.docHeight,
-    //        this._drawFooter.maxHeight
-    //     ),
-    //      this._drawFooter.dHeight
-    //   )
-    // );
-    // }
   }
   getMainRootArea(dobj) {
     let pNode = dobj;
@@ -225186,7 +225010,9 @@ class entry_lib_DrawPageTree {
     } else {
       const arr = path.split("/");
       let index = 0;
-      if (arr.length > 1 && !isNaN(parseInt(arr[1]))) index = parseInt(arr[1]);
+      if (arr.length > 1 && !isNaN(parseInt(arr[1]))) {
+        index = parseInt(arr[1]);
+      }
       if (path.startsWith("header")) {
         return this._drawHeaders[index];
       } else if (path.startsWith("footer")) {
@@ -225291,34 +225117,22 @@ class entry_lib_DrawPageTree {
   updatePageWidthHeight() {
     const hoEditorFactory = entry_lib_HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
     const widthPixes = hoEditorFactory.pageProperty.widthPixes;
-    // if (hoEditorFactory.pageProperty.printDirection === PrintDirection.vertical)
-    //   widthPixes = hoEditorFactory.pageProperty.heightPixes;
     const docWidth = widthPixes - hoEditorFactory.pageProperty.leftMarginPixes - hoEditorFactory.pageProperty.rightMarginPixes;
     for (let i = 0; i < this._drawHeaders.length; i++) {
       const area = this._drawHeaders[i];
-      // area.dWidth = widthPixes;
-      // area.maxWidth = widthPixes;
       if (area) area.docWidth = docWidth;
     }
     for (let i = 0; i < this.drawFooters.length; i++) {
       const area = this.drawFooters[i];
-      // area.dWidth = widthPixes;
-      //area.maxWidth = widthPixes;
       if (area) area.docWidth = docWidth;
     }
     for (let i = 0; i < hoEditorFactory.drawTree.drawPages.length; i++) {
       const dPage = hoEditorFactory.drawTree.drawPages[i];
-      // dPage.storeDrawFooter.dWidth = widthPixes;
-      // dPage.storeDrawFooter.maxWidth = widthPixes;
       dPage.storeDrawFooter.docWidth = docWidth;
-      // dPage.storeDrawHeader.dWidth = widthPixes;
-      // dPage.storeDrawHeader.maxWidth = widthPixes;
       dPage.storeDrawHeader.docWidth = docWidth;
     }
     for (let i = 0; i < this._drawMainDocs.length; i++) {
       const area = this._drawMainDocs[i];
-      // area.dWidth = widthPixes;
-      // area.maxWidth = widthPixes;
       if (area) area.docWidth = docWidth;
     }
   }
@@ -234972,7 +234786,7 @@ class entry_lib_VueController {
         maxWidth = scell.drawCell.dWidth - 10;
         const rowInfos = scell.table.rowInfos[scell.table.rows.indexOf(scell.row)];
         if (rowInfos.rowProperty.isSpecifyHeight) {
-          maxHeight = rowInfos.rowHeight - 20;
+          maxHeight = rowInfos.rowHeight - 10;
         }
       }
       const dLine = hoEditorFactory.drawTree.getDrawLineByDNode(npStart.node.drawNodes[0]);
@@ -237163,18 +236977,20 @@ class entry_lib_VueController {
             notReplaceElement: node.notReplaceElement,
             keyValue: '',
             value: '',
-            verifyTipList: []
+            verifyValueTip: [],
+            verifyKeywordTip: []
           };
           if (!(node instanceof entry_lib_TextInputFieldNode/* TextInputFieldNode */.IM)) {
             elementObj.controlType = node.type;
           } else {
-            let verifyTipList = [];
+            let verifyValueTip = [];
+            let verifyKeywordTip = [];
             let includesKeyword = node.includesKeyword ? JSON.parse(node.includesKeyword) : [];
             let valueArea = node.valueArea ? JSON.parse(node.valueArea) : [];
             if (includesKeyword.length > 0) {
               includesKeyword.forEach(keyword => {
                 if (node.text.includes(keyword.text)) {
-                  verifyTipList.push(keyword.tip);
+                  verifyKeywordTip.push(keyword.tip);
                 }
               });
             }
@@ -237186,23 +237002,24 @@ class entry_lib_VueController {
                 if (!isNaN(nodeValue)) {
                   if (!isNaN(min) && !isNaN(max)) {
                     if (nodeValue >= min && nodeValue <= max) {
-                      verifyTipList.push(value.tip);
+                      verifyValueTip.push(value.tip);
                     }
                   }
                   if (!isNaN(min) && isNaN(max)) {
                     if (nodeValue < min) {
-                      verifyTipList.push(value.tip);
+                      verifyValueTip.push(value.tip);
                     }
                   }
                   if (isNaN(min) && !isNaN(max)) {
                     if (nodeValue > max) {
-                      verifyTipList.push(value.tip);
+                      verifyValueTip.push(value.tip);
                     }
                   }
                 }
               });
             }
-            elementObj.verifyTipList = verifyTipList;
+            elementObj.verifyKeywordTip = verifyKeywordTip;
+            elementObj.verifyValueTip = verifyValueTip;
           }
           if (node instanceof entry_lib_TextInputFieldNode/* TextInputFieldNode */.IM && node.inputFieldType == 1 || node instanceof entry_lib_DownListNode/* DownListNode */.dS) {
             elementObj.keyValue = node.keyValue;
@@ -240127,7 +239944,7 @@ class entry_lib_VueController {
     const hoEditorFactory = entry_lib_HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
     const firstPageMainDoc = hoEditorFactory.drawTree.drawPages[0].drawMainDoc;
     let mathWidth = hoEditorFactory.pageProperty.widthPixes - hoEditorFactory.pageProperty.leftMarginPixes - hoEditorFactory.pageProperty.rightMarginPixes;
-    let mathHeight = hoEditorFactory.pageProperty.heightPixes - hoEditorFactory.pageProperty.topMarginPixes - hoEditorFactory.pageProperty.bottomMarginPixes - 20;
+    let mathHeight = hoEditorFactory.pageProperty.heightPixes - hoEditorFactory.pageProperty.topMarginPixes - hoEditorFactory.pageProperty.bottomMarginPixes - 30;
     const curDomRange = hoEditorFactory.docTree.curDomRange.normalize();
     const npStart = curDomRange.npStart;
     if (npStart && npStart.node) {
@@ -240136,7 +239953,10 @@ class entry_lib_VueController {
         mathWidth = scell.drawCell.dWidth - 10;
         const rowInfos = scell.table.rowInfos[scell.table.rows.indexOf(scell.row)];
         if (rowInfos.rowProperty.isSpecifyHeight) {
-          mathHeight = rowInfos.rowHeight - 20;
+          let height = rowInfos.rowHeight - 10;
+          if (mathHeight > height) {
+            mathHeight = height;
+          }
         }
         const colInfos = scell.table.colInfos[scell.row.indexOf(scell)];
         if (colInfos.colProperty.isSpecifyWidth) {
@@ -241874,10 +241694,32 @@ class entry_lib_EditController {
     }
     hoEditorFactory.docController.parseNodeData(nodes);
   }
+  isEdit(hoEditorFactory, node, curDomRange) {
+    var _node$parentNode, _node$parentNode2;
+    let result = true;
+    if ((node === null || node === void 0 ? void 0 : node.parentNode) == null) {
+      result = false;
+    } else if (node && node.nodeType == 0 && !((node === null || node === void 0 ? void 0 : node.parentNode) instanceof entry_lib_TextInputFieldNode/* TextInputFieldNode */.IM)) {
+      result = false;
+    } else if (node instanceof entry_lib_MarkNode/* MarkNode */.y && node.MarkNodeType == 2 && (((_node$parentNode = node.parentNode) === null || _node$parentNode === void 0 ? void 0 : _node$parentNode.parentNode) == null || ((_node$parentNode2 = node.parentNode) === null || _node$parentNode2 === void 0 ? void 0 : _node$parentNode2.parentNode) instanceof entry_lib_CellNode/* CellNode */.H)) {
+      result = false;
+    }
+    if (!hoEditorFactory.allowEditCellInForm && node) {
+      const parentNode = hoEditorFactory.vueController.getParentCellNode(node);
+      if (node instanceof entry_lib_DateTimeNode/* DateTimeNode */.Y || node instanceof entry_lib_SignNode/* SignNode */.u || node instanceof entry_lib_DownListNode/* DownListNode */.dS || node instanceof entry_lib_FigureNode) {
+        if (curDomRange.startPath == curDomRange.endPath) {
+          result = false;
+        }
+      } else if (parentNode instanceof entry_lib_CellNode/* CellNode */.H && !(node instanceof entry_lib_SignNode/* SignNode */.u || node.parentNode instanceof entry_lib_TextInputFieldNode/* TextInputFieldNode */.IM)) {
+        result = false;
+      }
+    }
+    return result;
+  }
   /**
    * @returns 表单模式下只可修改元素内容，或者插入签名，判断当前操作是否可以执行 true可以插入 false不可插入
    */
-  canIsEdit(hoEditorFactory) {
+  canIsEdit(hoEditorFactory, source) {
     let result = true;
     if (hoEditorFactory.drawTree.paintStatus === entry_lib_DrawTree/* PaintState */.ak.psDesign) {
       return result;
@@ -241909,33 +241751,14 @@ class entry_lib_EditController {
         return false;
       }
     }
-    if (hoEditorFactory.isUseForm && enode) {
-      var _enode$parentNode, _enode$parentNode2;
-      //const endPath = _curDomRange.normalize().endPath;
-      //const node = hoEditorFactory.docTree.findNodePositionByPath(endPath).node;
-      if ((snode === null || snode === void 0 ? void 0 : snode.parentNode) == null || (snode === null || snode === void 0 ? void 0 : snode.parentNode) == null) {
-        result = false;
-      }
-      if (enode && enode.nodeType == 0 && !((enode === null || enode === void 0 ? void 0 : enode.parentNode) instanceof entry_lib_TextInputFieldNode/* TextInputFieldNode */.IM)) {
-        result = false;
-      }
-      if (enode instanceof entry_lib_MarkNode/* MarkNode */.y && enode.MarkNodeType == 2 && (((_enode$parentNode = enode.parentNode) === null || _enode$parentNode === void 0 ? void 0 : _enode$parentNode.parentNode) == null || ((_enode$parentNode2 = enode.parentNode) === null || _enode$parentNode2 === void 0 ? void 0 : _enode$parentNode2.parentNode) instanceof entry_lib_CellNode/* CellNode */.H)) {
-        result = false;
-      }
-      // if(curDomRange.startPath ==  curDomRange.endPath) {
-      //     if (enode instanceof TextNode && !(enode?.parentNode instanceof TextInputFieldNode)) {
-      //         result = false;
-      //     }
-      // }
-      if (!hoEditorFactory.allowEditCellInForm) {
-        const parentNode = hoEditorFactory.vueController.getParentCellNode(enode);
-        if (enode instanceof entry_lib_DateTimeNode/* DateTimeNode */.Y || enode instanceof entry_lib_DownListNode/* DownListNode */.dS || enode instanceof entry_lib_FigureNode) {
-          if (curDomRange.startPath == curDomRange.endPath) {
-            result = false;
-          }
-        } else if (parentNode instanceof entry_lib_CellNode/* CellNode */.H && !(enode instanceof entry_lib_SignNode/* SignNode */.u || enode.parentNode instanceof entry_lib_TextInputFieldNode/* TextInputFieldNode */.IM)) {
-          result = false;
-        }
+    if (hoEditorFactory.isUseForm) {
+      // 无选区 只判断结束节点 有选区需要判断首尾节点
+      if (curDomRange.startPath == curDomRange.endPath) {
+        result = this.isEdit(hoEditorFactory, enode, curDomRange);
+      } else {
+        let sResult = this.isEdit(hoEditorFactory, snode, curDomRange);
+        let eResult = this.isEdit(hoEditorFactory, enode, curDomRange);
+        result = sResult && eResult;
       }
     }
     if (result) {
@@ -251167,7 +250990,7 @@ var entry_lib_DocController = __webpack_require__(5011);
 
 
 class entry_lib_HOEditorFactory {
-  // 点击元素是否触发click事件
+  // 修复表格图片卡死问题
   /**
    * Getter hoLocalStorage
    * @return {HoLocalStorage}
@@ -251414,6 +251237,8 @@ class entry_lib_HOEditorFactory {
     (0,entry_lib_esm_defineProperty/* default */.A)(this, "fixTableInTextInput", false);
     // 修复新增页在文本域中插入的表格问题
     (0,entry_lib_esm_defineProperty/* default */.A)(this, "emitClickEvent", false);
+    // 点击元素是否触发click事件
+    (0,entry_lib_esm_defineProperty/* default */.A)(this, "fixTableImage", false);
     this._hoEditorFactoryId = id;
   }
   get defaultLineHeight() {