hoeditor-web 3.1.205 → 3.1.207

package/lib/hoeditor.umd.js

@@ -130732,11 +130732,14 @@ class DrawImageNode extends DrawCombineNode/* DrawCombineNode */.A {
 }
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/BaseNode.ts
 var BaseNode = __webpack_require__(29269);
+// EXTERNAL MODULE: ./src/editor/dom/treeNode/CellNode.ts
+var CellNode = __webpack_require__(90900);
 ;// ./src/editor/dom/treeNode/ImageNode.ts
 
 
 
 
+
 class ImageNode extends BaseNode/* BaseNode */.Yp {
   // 内部标识符
   constructor(hoEditorFactoryID, rootNodes, pNode, nodeType, id, imageDataBase64String, width, height,
@@ -130771,8 +130774,6 @@ class ImageNode extends BaseNode/* BaseNode */.Yp {
     (0,defineProperty/* 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 +130783,17 @@ 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/* 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;
+        }
+      }
+    }
+    this._width = width;
+    this._height = height;
     this.node2DrawNodeRange(0, 0);
   }
   get hoEditorFactoryID() {
@@ -136909,7 +136921,7 @@ class TableFormula extends _ControlNode__WEBPACK_IMPORTED_MODULE_27__/* .Control
     const arr = this._formulaStr.split(':');
     const table = this.getParentCell().table;
     let totalOk = false;
-    let total = "0";
+    let total = '';
     if (arr.length == 2) {
       const [istartRow, istartCol] = this.getRowColByCellAdress(arr[0]);
       const [iEndRow, iEndCol] = this.getRowColByCellAdress(arr[1]);
@@ -136981,7 +136993,7 @@ class TableFormula extends _ControlNode__WEBPACK_IMPORTED_MODULE_27__/* .Control
         }
       }
     }
-    if (total == '0') {
+    if (total === "") {
       total = ' ';
     }
     if (totalOk) return '' + total;
@@ -144209,7 +144221,7 @@ class TextInputFieldNode extends BaseCombineNode/* BaseCombineNode */.h {
       const childFields = [];
       for (let c = 0; c < temp.childNodes.length; c++) {
         const childNode = temp.childNodes[c];
-        if (childNode instanceof TextInputFieldNode || childNode instanceof SignNode/* SignNode */.u) {
+        if (childNode instanceof TextInputFieldNode || childNode instanceof DateTimeNode/* DateTimeNode */.Y || childNode instanceof SignNode/* SignNode */.u) {
           childFields.push(childNode);
         }
       }
@@ -223222,7 +223234,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.205');
+/* harmony default export */ var entry_lib_version = ('3.1.207');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var entry_lib_PoperTipText = __webpack_require__(89316);
 ;// ./src/components/controls/poperTipText/index.ts
@@ -234958,6 +234970,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 - 20;
+        }
       }
       const dLine = hoEditorFactory.drawTree.getDrawLineByDNode(npStart.node.drawNodes[0]);
       if (dLine.children && dLine.children.length > 0) {
@@ -240110,8 +240126,24 @@ 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 - 20;
+    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) {
+          mathHeight = rowInfos.rowHeight - 20;
+        }
+        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),