hoeditor-web 3.1.206 → 3.1.208

package/lib/hoeditor.umd.js

@@ -110085,8 +110085,8 @@ var staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(44114);
-// EXTERNAL MODULE: ./src/editor/dom/treeNode/ImageNode.ts + 1 modules
-var ImageNode = __webpack_require__(55133);
+// EXTERNAL MODULE: ./src/editor/dom/treeNode/ImageNode.ts
+var ImageNode = __webpack_require__(82655);
 // EXTERNAL MODULE: ./src/HOEditorFactorys.ts
 var HOEditorFactorys = __webpack_require__(57703);
 // EXTERNAL MODULE: ./src/components/controls/colorPicker/HoColorPickers.vue + 5 modules
@@ -110734,8 +110734,8 @@ var es_json_stringify = __webpack_require__(33110);
 var esnext_iterator_constructor = __webpack_require__(98992);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/esnext.iterator.for-each.js
 var esnext_iterator_for_each = __webpack_require__(3949);
-// EXTERNAL MODULE: ./src/editor/dom/treeNode/ImageNode.ts + 1 modules
-var ImageNode = __webpack_require__(55133);
+// EXTERNAL MODULE: ./src/editor/dom/treeNode/ImageNode.ts
+var ImageNode = __webpack_require__(82655);
 // EXTERNAL MODULE: ./src/HOEditorFactorys.ts
 var HOEditorFactorys = __webpack_require__(57703);
 // EXTERNAL MODULE: ./src/components/controls/colorPicker/HoColorPickers.vue + 5 modules
@@ -117303,7 +117303,7 @@ class SubDocManger {
 /* harmony import */ var _treeNode_MedicalExpressionNode__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(14851);
 /* harmony import */ var _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(65018);
 /* harmony import */ var _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(39885);
-/* harmony import */ var _treeNode_ImageNode__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(55133);
+/* harmony import */ var _treeNode_ImageNode__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(82655);
 /* harmony import */ var _treeNode_BarcodeNode__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(30942);
 /* harmony import */ var _treeNode_QrcodeNode__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(33498);
 /* harmony import */ var _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(30486);
@@ -120525,10 +120525,6 @@ class DocController {
     const startPath = domRange.startPath;
     const endPath = domRange.endPath;
     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 +120543,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 +128081,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 +128173,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]) {
@@ -130526,253 +130507,59 @@ class GestationNode extends _ControlNode__WEBPACK_IMPORTED_MODULE_7__/* .Control
 
 /***/ }),
 
-/***/ 55133:
+/***/ 82655:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-
-// EXPORTS
-__webpack_require__.d(__webpack_exports__, {
-  K: function() { return /* binding */ ImageNode; }
-});
-
-// EXTERNAL MODULE: ./src/i18n/index.ts + 1 modules
-var i18n = __webpack_require__(49850);
-// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/defineProperty.js + 2 modules
-var defineProperty = __webpack_require__(32356);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
-var es_array_push = __webpack_require__(44114);
-// EXTERNAL MODULE: ./src/yuki-createjs/index.ts
-var yuki_createjs = __webpack_require__(56419);
-// EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawCombineNode.ts
-var DrawCombineNode = __webpack_require__(10431);
-// EXTERNAL MODULE: ./src/editor/draw/DrawResize.ts
-var DrawResize = __webpack_require__(36883);
-// EXTERNAL MODULE: ./src/HOEditorFactorys.ts
-var HOEditorFactorys = __webpack_require__(57703);
-// EXTERNAL MODULE: ./src/editor/SubDocManger.ts
-var SubDocManger = __webpack_require__(63942);
-// EXTERNAL MODULE: ./src/editor/events/NodeChangeEvent.ts
-var NodeChangeEvent = __webpack_require__(3530);
-// EXTERNAL MODULE: ./src/editor/dom/DocTree.ts
-var DocTree = __webpack_require__(86247);
-// EXTERNAL MODULE: ./src/editor/draw/SelectRange.ts
-var SelectRange = __webpack_require__(49576);
-;// ./src/editor/draw/drawNode/DrawImageNode.ts
-
-/*
- * @Author: your name
- * @Date: 2020-11-11 11:04:19
- * @LastEditTime: 2024-02-04 10:59:15
- * @LastEditors: liyanan 2441631434@qq.com
- * @Description: In User Settings Edit
- * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawImageNode.ts
- */
-
-
-
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   K: function() { return /* binding */ ImageNode; }
+/* harmony export */ });
+/* harmony import */ var _i18n__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(49850);
+/* 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 _editor_draw_drawNode_DrawImageNode__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(90479);
+/* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(29269);
+/* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(90900);
 
 
 
 
 
-class DrawImageNode extends DrawCombineNode/* DrawCombineNode */.A {
-  constructor(hoeditfactoryID, rootPath, node, index, imagePath, dWidth, dHeight,
-  //scaleX: number,
-  //scaleY: number
-  markImagePath) {
-    super(hoeditfactoryID, rootPath, node, index);
-    (0,defineProperty/* default */.A)(this, "_imagePath", void 0);
-    (0,defineProperty/* default */.A)(this, "_markImagePath", void 0);
-    (0,defineProperty/* default */.A)(this, "_scaleX", void 0);
-    (0,defineProperty/* default */.A)(this, "_scaleY", void 0);
-    (0,defineProperty/* default */.A)(this, "_imageY", void 0);
-    (0,defineProperty/* default */.A)(this, "_drawResize", void 0);
-    (0,defineProperty/* default */.A)(this, "_id", void 0);
-    (0,defineProperty/* default */.A)(this, "_bitMap", void 0);
-    const hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(hoeditfactoryID);
-    const bounds = hoEditorFactory.vueController.getMainBounds(dWidth, dHeight);
-    this.dWidth = Number(bounds.imageWidth);
-    this.dHeight = Number(bounds.imageHeight);
-    this._imagePath = imagePath;
-    this._markImagePath = markImagePath;
-    this._imageY = -this.dHeight;
-    this.insertImage();
-    this._drawResize = new DrawResize/* DrawResize */.z(hoeditfactoryID, this.node, this, this._imageY);
-  }
-  get markImagePath() {
-    return this._markImagePath;
-  }
-  get imagePath() {
-    return this._imagePath;
-  }
-  get drawResize() {
-    return this._drawResize;
-  }
-  insertImage() {
-    const drawNode = this;
-    const image = new Image();
-    // const markImage = new Image();
-    // let markImageBitmap!: createjs.Bitmap;
-    image.src = this.imagePath;
-    this._bitMap = new createjs.Bitmap(image);
-    const hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(drawNode.node.hoEditorFactoryID);
-    this._bitMap.y = this._imageY;
-    this._bitMap.x = 0;
-    this._bitMap.name = this.node.id;
-    this._bitMap.setBounds(0, 0, drawNode.dWidth, drawNode.dHeight);
-    hoEditorFactory.loadImageCount++;
-    this.addChild(this._bitMap);
-    image.onload = () => {
-      const hitWidth = image.naturalWidth !== 0 ? image.naturalWidth : image.width;
-      const hitHeight = image.naturalHeight !== 0 ? image.naturalHeight : image.height;
-      this._bitMap.setTransform(0, drawNode._imageY, drawNode.dWidth / hitWidth, drawNode.dHeight / hitHeight);
-      this._bitMap.setBounds(0, 0, image.naturalWidth, image.naturalHeight);
-      const hitArea = new createjs.Shape();
-      hitArea.graphics.beginFill('#000').drawRect(0, 0, hitWidth, hitHeight);
-      this._bitMap.hitArea = hitArea;
-      // 压缩页眉中的图片
-      if (this.node.rootPath.includes('header') || this.node.rootPath.includes('footer')) {
-        const canvas = document.createElement('canvas');
-        const ctx = canvas.getContext('2d');
-        canvas.width = this.dWidth * 2;
-        canvas.height = this.dHeight * 2;
-        canvas.style.width = this.dWidth + 'px';
-        canvas.style.height = this.dHeight + 'px';
-        ctx.clearRect(0, 0, canvas.width, canvas.height);
-        ctx.fillStyle = '#FFFFFF';
-        ctx.fillRect(0, 0, canvas.width, canvas.height);
-        ctx.drawImage(image, 0, 0, canvas.width, canvas.height);
-        const base64 = canvas.toDataURL('image/jpeg', 0.92);
-        if (base64 < this.node.imageDataBase64String) {
-          this.node.imageDataBase64String = base64;
-        }
-      }
-      this.updateSign();
-      hoEditorFactory.loadImageCount--;
-    };
-    if (this.markImagePath != '') {
-      this.insertMarkImage();
-    }
-    image.onerror = () => {
-      hoEditorFactory.loadImageCount--;
-      if (!drawNode.node.isBackFill) {
-        const path = this.node.previousLeaf().getNodePath();
-        hoEditorFactory.docTree.deleteNode(this.node);
-        const changeEvent = new NodeChangeEvent/* NodeChangeEvent */.b(this._hoEditorFactoryID, DocTree/* DocAction */.LC.daModifyStyle, path, path);
-        changeEvent.oldEndPath = path;
-        changeEvent.afterChangePath = path;
-        changeEvent.oldDrawLines = new SelectRange/* SelectRange */.u(this._hoEditorFactoryID).getRangeDrawLines(path, path, true, true);
-        hoEditorFactory.docTree.change(changeEvent);
-      }
-    };
-  }
-  insertMarkImage() {
-    const drawNode = this;
-    const hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(drawNode.node.hoEditorFactoryID);
-    const markImage = new Image();
-    let markImageBitmap;
-    markImage.src = this.markImagePath;
-    hoEditorFactory.loadImageCount++;
-    markImageBitmap = new createjs.Bitmap(markImage);
-    //markImageBitmap.y = this._imageY;
-    //markImageBitmap.x = 0;
-    markImageBitmap.name = this.node.id;
-    markImageBitmap.setBounds(0, 0, drawNode.dWidth, drawNode.dHeight);
-    drawNode.addChild(markImageBitmap);
-    //hoEditorFactory.loadImageCount++;
-    markImage.onload = () => {
-      markImageBitmap.x = 0;
-      markImageBitmap.y = 0;
-      const hitWidth = markImage.naturalWidth !== 0 ? markImage.naturalWidth : markImage.width;
-      const hitHeight = markImage.naturalHeight !== 0 ? markImage.naturalHeight : markImage.height;
-      markImageBitmap.setTransform(0, drawNode._imageY, drawNode.dWidth / hitWidth, drawNode.dHeight / hitHeight);
-      const hitArea = new createjs.Shape();
-      hitArea.graphics.beginFill('#000000').drawRect(0, 0, hitWidth, hitHeight);
-      this.updateSign();
-      hoEditorFactory.loadImageCount--;
-    };
-    markImage.onerror = () => {
-      hoEditorFactory.loadImageCount--;
-      const path = this.node.previousLeaf().getNodePath();
-      hoEditorFactory.docTree.deleteNode(this.node);
-      const changeEvent = new NodeChangeEvent/* NodeChangeEvent */.b(this._hoEditorFactoryID, DocTree/* DocAction */.LC.daModifyStyle, path, path);
-      changeEvent.oldEndPath = path;
-      changeEvent.afterChangePath = path;
-      changeEvent.oldDrawLines = new SelectRange/* SelectRange */.u(this._hoEditorFactoryID).getRangeDrawLines(path, path, true, true);
-      hoEditorFactory.docTree.change(changeEvent);
-    };
-  }
-  updateSign() {
-    const hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this.node.hoEditorFactoryID);
-    const dArea = hoEditorFactory.drawPageTree.getMainRootArea(this);
-    if (dArea && hoEditorFactory.drawTree.drawPages[dArea.index]) {
-      const atype = hoEditorFactory.subDocManger.getHeaderFooterType(this.node.getNodePath());
-      if (atype === SubDocManger/* HeaderFooterType */.lr.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
-        hoEditorFactory.subDocManger.updateAllSameSubDoc(dArea.index, atype, false, false);
-      } else {
-        if (atype === SubDocManger/* HeaderFooterType */.lr.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
-          hoEditorFactory.subDocManger.updateAllSameSubDoc(dArea.index, atype, false, false);
-        }
-      }
-      hoEditorFactory.drawPageTree.updateDrawPage(dArea.index);
-    }
-  }
-  clone() {
-    const aConTainer = new createjs.Container();
-    const bitMap = this._bitMap.clone();
-    bitMap.name = this.node.id;
-    if (this._cloneProps) {
-      this._cloneProps(aConTainer);
-    }
-    aConTainer.removeAllChildren();
-    aConTainer.addChild(bitMap);
-    return aConTainer;
-  }
-}
-// EXTERNAL MODULE: ./src/editor/dom/treeNode/BaseNode.ts
-var BaseNode = __webpack_require__(29269);
-;// ./src/editor/dom/treeNode/ImageNode.ts
-
-
-
-
-class ImageNode extends BaseNode/* BaseNode */.Yp {
+class ImageNode extends _BaseNode__WEBPACK_IMPORTED_MODULE_4__/* .BaseNode */ .Yp {
   // 内部标识符
   constructor(hoEditorFactoryID, rootNodes, pNode, nodeType, id, imageDataBase64String, width, height,
   //scaleX?: number,
   //scaleY?: number,
   options, markImage, imageJson) {
     super(hoEditorFactoryID, rootNodes, pNode, nodeType);
-    (0,defineProperty/* default */.A)(this, "_id", 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, "_id", void 0);
     //编号ID
-    (0,defineProperty/* default */.A)(this, "_dataId", 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, "_dataId", void 0);
     // dataId
-    (0,defineProperty/* default */.A)(this, "_width", 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, "_width", void 0);
     //节点宽
-    (0,defineProperty/* default */.A)(this, "_height", 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, "_height", void 0);
     //节点高
-    (0,defineProperty/* default */.A)(this, "_scaleX", 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, "_scaleX", void 0);
     //图片X轴缩放比例
-    (0,defineProperty/* default */.A)(this, "_scaleY", 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, "_scaleY", void 0);
     //图片Y轴缩放比例
-    (0,defineProperty/* default */.A)(this, "_imageDataBase64String", 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, "_imageDataBase64String", void 0);
     //图片base64码 原图
-    (0,defineProperty/* default */.A)(this, "_isFormula", 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, "_isFormula", void 0);
     //是否是计算公式
-    (0,defineProperty/* default */.A)(this, "_remark", 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, "_remark", void 0);
     //扩展字段
-    (0,defineProperty/* default */.A)(this, "_markImage", 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, "_markImage", void 0);
     // 修改层
-    (0,defineProperty/* default */.A)(this, "_imageJson", 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, "_imageJson", void 0);
     // 修改层json信息
-    (0,defineProperty/* default */.A)(this, "_isBackFill", 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, "_isBackFill", void 0);
     //是否是回填的
-    (0,defineProperty/* default */.A)(this, "_innerIdentifier", 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, "_innerIdentifier", void 0);
     this._id = id;
     this._dataId = id;
-    this._width = width;
-    this._height = height;
     this._imageDataBase64String = imageDataBase64String;
     this._remark = "";
     this._isFormula = options !== null && options !== void 0 && options.isFormula ? options.isFormula : false;
@@ -130782,6 +130569,11 @@ class ImageNode extends BaseNode/* BaseNode */.Yp {
     this.innerIdentifier = (options === null || options === void 0 ? void 0 : options.innerIdentifier) || '';
     //this._scaleX = scaleX ? scaleX : 1;
     //this._scaleY = scaleY ? scaleY : 1;
+    if (this.parentNode && this.parentNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_5__/* .CellNode */ .H) {
+      // height -= 10;
+    }
+    this._width = width;
+    this._height = height;
     this.node2DrawNodeRange(0, 0);
   }
   get hoEditorFactoryID() {
@@ -130901,7 +130693,7 @@ class ImageNode extends BaseNode/* BaseNode */.Yp {
   //根据可放置的宽度，将普通组件转换成绘制组件
   node2DrawNodeRange(startIndex, endIndex) {
     this._drawNodes.length = 0;
-    const dNode = new DrawImageNode(this._hoEditorFactoryID, this._rootPath, this, 0, this.imageDataBase64String, this.width, this.height,
+    const dNode = new _editor_draw_drawNode_DrawImageNode__WEBPACK_IMPORTED_MODULE_3__/* .DrawImageNode */ .I(this._hoEditorFactoryID, this._rootPath, this, 0, this.imageDataBase64String, this.width, this.height,
     //this.scaleX,
     //this.scaleY
     this.markImage);
@@ -130942,7 +130734,7 @@ class ImageNode extends BaseNode/* BaseNode */.Yp {
     //const scaleX = drawImageNode.children[0].scaleX;
     //const scaleY = drawImageNode.children[0].scaleY;
     const retObj = {
-      nodeType: BaseNode/* NodeType */.Z6[this.nodeType],
+      nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_4__/* .NodeType */ .Z6[this.nodeType],
       imageType: "Image",
       id: this.id,
       dataId: this.dataId,
@@ -130989,7 +130781,7 @@ class ImageNode extends BaseNode/* BaseNode */.Yp {
     const isFormula = json.isFormula == true || json.isFormula === "true" ? true : false;
     const isBackFill = json.isBackFill == true || json.isBackFill === "true" ? true : false;
     const innerIdentifier = json.innerIdentifier || '';
-    return new ImageNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, BaseNode/* NodeType */.Z6.ntImage, json.id, json.imageDataBase64String, width, height,
+    return new ImageNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_4__/* .NodeType */ .Z6.ntImage, json.id, json.imageDataBase64String, width, height,
     //scaleX,
     //scaleY,
     {
@@ -130999,7 +130791,7 @@ class ImageNode extends BaseNode/* BaseNode */.Yp {
     }, json.markImage, json.imageJson);
   }
   getTagNameCn() {
-    return /*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.344",null,"图片");
+    return /*#__PURE__*/(0,_i18n__WEBPACK_IMPORTED_MODULE_0__/* .i18nHelper */ .p)("04-001-009-EMR.3.3.344",null,"图片");
   }
 }
 
@@ -138266,8 +138058,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;
@@ -138283,7 +138073,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) {
@@ -143503,11 +143292,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");
@@ -143532,6 +143321,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) => {
@@ -144019,6 +143819,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;
@@ -144051,24 +143873,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) {
@@ -144107,11 +143918,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 {
           //单个对象
@@ -144132,7 +143938,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 == '')) {
@@ -144155,15 +143960,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);
@@ -144173,7 +143971,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;
@@ -144189,7 +143986,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) {
@@ -144201,7 +143997,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;
     }
@@ -144216,9 +144011,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;
@@ -146908,7 +146700,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
     let nextDline = startIndex;
     let dRestHeight = Infinity;
     if (this.allowAcrossPage) dRestHeight = this._maxHeight - dTop;
-    this._endDline = startIndex;
+    this.endDline = startIndex;
     while (nextDline < dlines.length) {
       const dline = dlines[nextDline];
       const hidden = dline.paragraphNode.customProperty.hidden;
@@ -146918,7 +146710,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
         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;
@@ -146946,13 +146738,12 @@ 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) {
         const dTable = dline;
         let dPrevTable = null;
@@ -146980,6 +146771,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
         2:  当前绘制表格高度超过了区域剩余高度
         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) {
             const newTop = dTable.drawUpdate(this, dPrevTable, dTop, dRestHeight);
@@ -147016,7 +146808,7 @@ 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;
@@ -147031,7 +146823,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
         // if (dTable.drawPageTables.length > 0) {
         // }
         //如果当前表格未绘制完成，需要在下一页继续绘制、
-        this._endDline = nextDline;
+        this.endDline = nextDline;
         nextDline += 1;
         continue;
       } else {
@@ -147041,9 +146833,9 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
         //   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;
@@ -147070,7 +146862,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;
         }
@@ -147093,35 +146885,12 @@ 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);
     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;
@@ -147134,7 +146903,6 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
         mark = true;
         continue;
       }
-      // const pagePos = hoEditorFactory.drawTree.getDrawLinePagePos(dline);
       if (dline instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_7__/* .DrawTable */ .n) {
         const dTable = dline;
         if (dTable.getHeadHeight() + _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_12__/* .gDefaultRowHeight */ .ip > restHeight || !dTable.isFirstRowCanFit(restHeight)) {
@@ -147154,60 +146922,20 @@ 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;
+          // const nextArea = this.getNextDrawArea();
+          this.endDline = nextDline - 1;
+          if (this.endDline == -1) {
+            this.endDline = -2;
           }
           isFull = true;
           this._docHeight -= aTop;
@@ -147218,7 +146946,7 @@ class DrawArea extends _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_6__/* .DrawRe
           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;
@@ -148169,11 +147897,13 @@ class DrawBarcodeNode extends _DrawCombineNode__WEBPACK_IMPORTED_MODULE_1__/* .D
 /* 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 _yuki_createjs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(56419);
 /* harmony import */ var _yuki_createjs__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_yuki_createjs__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var _IDrawInfos__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(78139);
+/* harmony import */ var _IDrawInfos__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(78139);
 /* harmony import */ var _DrawPageCell__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(51613);
 /* harmony import */ var _DrawRect__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(60030);
 /* harmony import */ var _editor_dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(40504);
 /* harmony import */ var _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(10432);
+/* harmony import */ var _DrawImageNode__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(90479);
+
 
 
 
@@ -148272,7 +148002,7 @@ class DrawCell extends _DrawRect__WEBPACK_IMPORTED_MODULE_7__/* .DrawRect */ .N
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A)(this, "_needUpdate", void 0);
     this._node = cellNode;
     this._hoEditorFactoryID = hoEditorFactoryID;
-    this._discriminator = _IDrawInfos__WEBPACK_IMPORTED_MODULE_10__/* .gDrawIntfID */ .c;
+    this._discriminator = _IDrawInfos__WEBPACK_IMPORTED_MODULE_11__/* .gDrawIntfID */ .c;
     this._cell = cellNode;
     this._dHeight = dHeight;
     this._dWidth = dWidth;
@@ -148366,18 +148096,24 @@ 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;
+        const drawLines = this._cell.drawCell.drawLines;
+        if (drawLines.length == 1 && drawLines[0].children.length == 1 && drawLines[0].children[0] instanceof _DrawImageNode__WEBPACK_IMPORTED_MODULE_10__/* .DrawImageNode */ .I) {
+          // ---去掉靠上对齐时候顶上1像素留白导致单元格插入的图片卡死问题---
+          valignTop = 0;
+        } else {
+          valignTop = 1;
+        }
+      } 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;
       }
     }
@@ -149085,6 +148821,197 @@ class DrawDownListNode extends _DrawCombineNode__WEBPACK_IMPORTED_MODULE_3__/* .
 
 /***/ }),
 
+/***/ 90479:
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   I: function() { return /* binding */ DrawImageNode; }
+/* 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 _yuki_createjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(56419);
+/* harmony import */ var _yuki_createjs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_yuki_createjs__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _DrawCombineNode__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(10431);
+/* harmony import */ var _DrawResize__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(36883);
+/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(57703);
+/* harmony import */ var _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(63942);
+/* harmony import */ var _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(3530);
+/* harmony import */ var _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(86247);
+/* harmony import */ var _SelectRange__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(49576);
+
+/*
+ * @Author: your name
+ * @Date: 2020-11-11 11:04:19
+ * @LastEditTime: 2024-02-04 10:59:15
+ * @LastEditors: liyanan 2441631434@qq.com
+ * @Description: In User Settings Edit
+ * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawImageNode.ts
+ */
+
+
+
+
+
+
+
+
+class DrawImageNode extends _DrawCombineNode__WEBPACK_IMPORTED_MODULE_2__/* .DrawCombineNode */ .A {
+  constructor(hoeditfactoryID, rootPath, node, index, imagePath, dWidth, dHeight,
+  //scaleX: number,
+  //scaleY: number
+  markImagePath) {
+    super(hoeditfactoryID, rootPath, node, index);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A)(this, "_imagePath", 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, "_markImagePath", 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, "_scaleX", 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, "_scaleY", 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, "_imageY", 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, "_drawResize", 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, "_id", 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, "_bitMap", void 0);
+    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_4__/* .HOEditorFactorys */ .O.instance().getFactory(hoeditfactoryID);
+    const bounds = hoEditorFactory.vueController.getMainBounds(dWidth, dHeight);
+    this.dWidth = Number(bounds.imageWidth);
+    this.dHeight = Number(bounds.imageHeight);
+    this._imagePath = imagePath;
+    this._markImagePath = markImagePath;
+    this._imageY = -this.dHeight;
+    this.insertImage();
+    this._drawResize = new _DrawResize__WEBPACK_IMPORTED_MODULE_3__/* .DrawResize */ .z(hoeditfactoryID, this.node, this, this._imageY);
+  }
+  get markImagePath() {
+    return this._markImagePath;
+  }
+  get imagePath() {
+    return this._imagePath;
+  }
+  get drawResize() {
+    return this._drawResize;
+  }
+  insertImage() {
+    const drawNode = this;
+    const image = new Image();
+    // const markImage = new Image();
+    // let markImageBitmap!: createjs.Bitmap;
+    image.src = this.imagePath;
+    this._bitMap = new createjs.Bitmap(image);
+    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_4__/* .HOEditorFactorys */ .O.instance().getFactory(drawNode.node.hoEditorFactoryID);
+    this._bitMap.y = this._imageY;
+    this._bitMap.x = 0;
+    this._bitMap.name = this.node.id;
+    this._bitMap.setBounds(0, 0, drawNode.dWidth, drawNode.dHeight);
+    hoEditorFactory.loadImageCount++;
+    this.addChild(this._bitMap);
+    image.onload = () => {
+      const hitWidth = image.naturalWidth !== 0 ? image.naturalWidth : image.width;
+      const hitHeight = image.naturalHeight !== 0 ? image.naturalHeight : image.height;
+      this._bitMap.setTransform(0, drawNode._imageY, drawNode.dWidth / hitWidth, drawNode.dHeight / hitHeight);
+      this._bitMap.setBounds(0, 0, image.naturalWidth, image.naturalHeight);
+      const hitArea = new createjs.Shape();
+      hitArea.graphics.beginFill('#000').drawRect(0, 0, hitWidth, hitHeight);
+      this._bitMap.hitArea = hitArea;
+      // 压缩页眉中的图片
+      if (this.node.rootPath.includes('header') || this.node.rootPath.includes('footer')) {
+        const canvas = document.createElement('canvas');
+        const ctx = canvas.getContext('2d');
+        canvas.width = this.dWidth * 2;
+        canvas.height = this.dHeight * 2;
+        canvas.style.width = this.dWidth + 'px';
+        canvas.style.height = this.dHeight + 'px';
+        ctx.clearRect(0, 0, canvas.width, canvas.height);
+        ctx.fillStyle = '#FFFFFF';
+        ctx.fillRect(0, 0, canvas.width, canvas.height);
+        ctx.drawImage(image, 0, 0, canvas.width, canvas.height);
+        const base64 = canvas.toDataURL('image/jpeg', 0.92);
+        if (base64 < this.node.imageDataBase64String) {
+          this.node.imageDataBase64String = base64;
+        }
+      }
+      this.updateSign();
+      hoEditorFactory.loadImageCount--;
+    };
+    if (this.markImagePath != '') {
+      this.insertMarkImage();
+    }
+    image.onerror = () => {
+      hoEditorFactory.loadImageCount--;
+      if (!drawNode.node.isBackFill) {
+        const path = this.node.previousLeaf().getNodePath();
+        hoEditorFactory.docTree.deleteNode(this.node);
+        const changeEvent = new _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_6__/* .NodeChangeEvent */ .b(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_7__/* .DocAction */ .LC.daModifyStyle, path, path);
+        changeEvent.oldEndPath = path;
+        changeEvent.afterChangePath = path;
+        changeEvent.oldDrawLines = new _SelectRange__WEBPACK_IMPORTED_MODULE_8__/* .SelectRange */ .u(this._hoEditorFactoryID).getRangeDrawLines(path, path, true, true);
+        hoEditorFactory.docTree.change(changeEvent);
+      }
+    };
+  }
+  insertMarkImage() {
+    const drawNode = this;
+    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_4__/* .HOEditorFactorys */ .O.instance().getFactory(drawNode.node.hoEditorFactoryID);
+    const markImage = new Image();
+    let markImageBitmap;
+    markImage.src = this.markImagePath;
+    hoEditorFactory.loadImageCount++;
+    markImageBitmap = new createjs.Bitmap(markImage);
+    //markImageBitmap.y = this._imageY;
+    //markImageBitmap.x = 0;
+    markImageBitmap.name = this.node.id;
+    markImageBitmap.setBounds(0, 0, drawNode.dWidth, drawNode.dHeight);
+    drawNode.addChild(markImageBitmap);
+    //hoEditorFactory.loadImageCount++;
+    markImage.onload = () => {
+      markImageBitmap.x = 0;
+      markImageBitmap.y = 0;
+      const hitWidth = markImage.naturalWidth !== 0 ? markImage.naturalWidth : markImage.width;
+      const hitHeight = markImage.naturalHeight !== 0 ? markImage.naturalHeight : markImage.height;
+      markImageBitmap.setTransform(0, drawNode._imageY, drawNode.dWidth / hitWidth, drawNode.dHeight / hitHeight);
+      const hitArea = new createjs.Shape();
+      hitArea.graphics.beginFill('#000000').drawRect(0, 0, hitWidth, hitHeight);
+      this.updateSign();
+      hoEditorFactory.loadImageCount--;
+    };
+    markImage.onerror = () => {
+      hoEditorFactory.loadImageCount--;
+      const path = this.node.previousLeaf().getNodePath();
+      hoEditorFactory.docTree.deleteNode(this.node);
+      const changeEvent = new _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_6__/* .NodeChangeEvent */ .b(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_7__/* .DocAction */ .LC.daModifyStyle, path, path);
+      changeEvent.oldEndPath = path;
+      changeEvent.afterChangePath = path;
+      changeEvent.oldDrawLines = new _SelectRange__WEBPACK_IMPORTED_MODULE_8__/* .SelectRange */ .u(this._hoEditorFactoryID).getRangeDrawLines(path, path, true, true);
+      hoEditorFactory.docTree.change(changeEvent);
+    };
+  }
+  updateSign() {
+    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_4__/* .HOEditorFactorys */ .O.instance().getFactory(this.node.hoEditorFactoryID);
+    const dArea = hoEditorFactory.drawPageTree.getMainRootArea(this);
+    if (dArea && hoEditorFactory.drawTree.drawPages[dArea.index]) {
+      const atype = hoEditorFactory.subDocManger.getHeaderFooterType(this.node.getNodePath());
+      if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_5__/* .HeaderFooterType */ .lr.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
+        hoEditorFactory.subDocManger.updateAllSameSubDoc(dArea.index, atype, false, false);
+      } else {
+        if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_5__/* .HeaderFooterType */ .lr.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
+          hoEditorFactory.subDocManger.updateAllSameSubDoc(dArea.index, atype, false, false);
+        }
+      }
+      hoEditorFactory.drawPageTree.updateDrawPage(dArea.index);
+    }
+  }
+  clone() {
+    const aConTainer = new createjs.Container();
+    const bitMap = this._bitMap.clone();
+    bitMap.name = this.node.id;
+    if (this._cloneProps) {
+      this._cloneProps(aConTainer);
+    }
+    aConTainer.removeAllChildren();
+    aConTainer.addChild(bitMap);
+    return aConTainer;
+  }
+}
+
+/***/ }),
+
 /***/ 51389:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
@@ -150316,81 +150243,45 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
     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() {
@@ -150399,25 +150290,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
@@ -150485,36 +150363,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;
       }
@@ -150584,11 +150443,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) {
@@ -150816,9 +150673,10 @@ 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) {
@@ -152246,9 +152104,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);
@@ -152268,7 +152123,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;
       }
@@ -152276,7 +152133,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;
@@ -152291,7 +152147,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;
       }
@@ -154093,8 +153949,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);
@@ -154229,40 +154088,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) {
@@ -154595,7 +154431,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;
     }
@@ -223222,14 +223057,14 @@ 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.206');
+/* harmony default export */ var entry_lib_version = ('3.1.208');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var entry_lib_PoperTipText = __webpack_require__(89316);
 ;// ./src/components/controls/poperTipText/index.ts
 
 /* harmony default export */ var entry_lib_poperTipText = (entry_lib_PoperTipText["default"]);
-// EXTERNAL MODULE: ./src/editor/dom/treeNode/ImageNode.ts + 1 modules
-var entry_lib_ImageNode = __webpack_require__(55133);
+// EXTERNAL MODULE: ./src/editor/dom/treeNode/ImageNode.ts
+var entry_lib_ImageNode = __webpack_require__(82655);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/TableNode.ts
 var entry_lib_TableNode = __webpack_require__(30486);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/TextBorderNode.ts + 1 modules
@@ -224552,21 +224387,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;
@@ -224574,23 +224409,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;
     }
@@ -224598,18 +224426,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;
@@ -224623,7 +224441,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);
@@ -224636,8 +224454,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);
@@ -224652,7 +224473,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) {
@@ -224703,7 +224526,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);
@@ -224721,7 +224546,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) {
@@ -224769,7 +224598,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;
       }
@@ -224812,12 +224643,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 
@@ -234958,6 +234791,10 @@ class entry_lib_VueController {
       maxHeight = hoEditorFactory.pageProperty.heightPixes - hoEditorFactory.drawTree.caret.Y - hoEditorFactory.pageProperty.bottomMarginPixes - 30;
       if (isInTable && scell) {
         maxWidth = scell.drawCell.dWidth - 10;
+        const rowInfos = scell.table.rowInfos[scell.table.rows.indexOf(scell.row)];
+        if (rowInfos.rowProperty.isSpecifyHeight) {
+          maxHeight = rowInfos.rowHeight - 10;
+        }
       }
       const dLine = hoEditorFactory.drawTree.getDrawLineByDNode(npStart.node.drawNodes[0]);
       if (dLine.children && dLine.children.length > 0) {
@@ -237147,18 +236984,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);
                 }
               });
             }
@@ -237170,23 +237009,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;
@@ -240110,8 +239950,27 @@ class entry_lib_VueController {
     };
     const hoEditorFactory = entry_lib_HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
     const firstPageMainDoc = hoEditorFactory.drawTree.drawPages[0].drawMainDoc;
-    const mathWidth = hoEditorFactory.pageProperty.widthPixes - hoEditorFactory.pageProperty.leftMarginPixes - hoEditorFactory.pageProperty.rightMarginPixes;
-    const mathHeight = hoEditorFactory.pageProperty.heightPixes - hoEditorFactory.pageProperty.topMarginPixes - hoEditorFactory.pageProperty.bottomMarginPixes - 20;
+    let mathWidth = hoEditorFactory.pageProperty.widthPixes - hoEditorFactory.pageProperty.leftMarginPixes - hoEditorFactory.pageProperty.rightMarginPixes;
+    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) {
+      const [isInTable, table, scell, ecell] = curDomRange.inSameTableCell();
+      if (isInTable && scell) {
+        mathWidth = scell.drawCell.dWidth - 10;
+        const rowInfos = scell.table.rowInfos[scell.table.rows.indexOf(scell.row)];
+        if (rowInfos.rowProperty.isSpecifyHeight) {
+          let height = rowInfos.rowHeight - 10;
+          if (mathHeight > height) {
+            mathHeight = height;
+          }
+        }
+        const colInfos = scell.table.colInfos[scell.row.indexOf(scell)];
+        if (colInfos.colProperty.isSpecifyWidth) {
+          mathWidth = colInfos.colWidth - 10;
+        }
+      }
+    }
     bounds = {
       width: Math.max(mathWidth, firstPageMainDoc.docWidth),
       height: Math.min(firstPageMainDoc.dHeight, mathHeight),