@visactor/vtable 0.19.1 → 0.19.2-alpha.0

package/dist/vtable.js

@@ -35240,9 +35240,8 @@
                     dx: hierarchyOffset,
                     x
                 };
-                const oldText = textMark.attribute.text;
                 textMark.setAttributes(cellTheme.text ? Object.assign({}, cellTheme.text, attribute) : attribute);
-                if (!oldText && textMark.attribute.text) {
+                if (textMark.attribute.text) {
                     const textBaseline = cellTheme.text.textBaseline;
                     const height = cellHeight - (padding[0] + padding[2]);
                     let y = 0;
@@ -37215,7 +37214,9 @@
             let height = 0;
             let renderDefault = false;
             let enableCellPadding = false;
-            if (table.isHeader(col, row) || table.getBodyColumnDefine(col, row)?.mergeCell) {
+            if (table.isHeader(col, row) ||
+                table.getBodyColumnDefine(col, row)?.mergeCell ||
+                table.hasCustomMerge()) {
                 const cellRange = table.getCellRange(col, row);
                 spanRow = cellRange.end.row - cellRange.start.row + 1;
             }
@@ -37301,7 +37302,9 @@
         }
         let spanRow = 1;
         let endCol = col;
-        if (table.isHeader(col, row) || table.getBodyColumnDefine(col, row)?.mergeCell) {
+        if (table.isHeader(col, row) ||
+            table.getBodyColumnDefine(col, row)?.mergeCell ||
+            table.hasCustomMerge()) {
             const cellRange = table.getCellRange(col, row);
             spanRow = cellRange.end.row - cellRange.start.row + 1;
             col = cellRange.start.col;
@@ -40327,7 +40330,9 @@
             let width = 0;
             let renderDefault = false;
             let enableCellPadding = false;
-            if (table.isHeader(col, row) || table.getBodyColumnDefine(col, row)?.mergeCell) {
+            if (table.isHeader(col, row) ||
+                table.getBodyColumnDefine(col, row)?.mergeCell ||
+                table.hasCustomMerge()) {
                 const cellRange = table.getCellRange(col, row);
                 spanCol = cellRange.end.col - cellRange.start.col + 1;
             }
@@ -40396,7 +40401,9 @@
             });
         }
         let spanCol = 1;
-        if (table.isHeader(col, row) || table.getBodyColumnDefine(col, row)?.mergeCell) {
+        if (table.isHeader(col, row) ||
+            table.getBodyColumnDefine(col, row)?.mergeCell ||
+            table.hasCustomMerge()) {
             const cellRange = table.getCellRange(col, row);
             spanCol = cellRange.end.col - cellRange.start.col + 1;
         }
@@ -51714,7 +51721,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.19.1";
+        version = "0.19.2-alpha.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -52139,6 +52146,9 @@
             return 'grid';
         }
         getColsWidth(startCol, endCol) {
+            if (startCol > endCol) {
+                return 0;
+            }
             startCol = Math.max(startCol, 0);
             endCol = Math.min(endCol, (this.colCount ?? Infinity) - 1);
             const cachedColWidth = this._colRangeWidthsMap.get(`$${startCol}$${endCol}`);
@@ -52193,6 +52203,9 @@
             }
         }
         getRowsHeight(startRow, endRow) {
+            if (startRow > endRow) {
+                return 0;
+            }
             startRow = Math.max(startRow, 0);
             endRow = Math.min(endRow, (this.rowCount ?? Infinity) - 1);
             let h = 0;
@@ -52445,27 +52458,40 @@
             return rect;
         }
         getCellsRect(startCol, startRow, endCol, endRow) {
-            const isFrozenStartCell = this.isFrozenCell(startCol, startRow);
-            const isFrozenEndCell = this.isFrozenCell(endCol, endRow);
             let absoluteLeft = this.getColsWidth(0, startCol - 1) || 0;
             let width = this.getColsWidth(startCol, endCol);
-            if (isFrozenStartCell?.col) {
-                const scrollLeft = this.scrollLeft;
-                absoluteLeft += scrollLeft;
-                if (!isFrozenEndCell?.col) {
-                    width -= scrollLeft;
-                    width = Math.max(width, this.getColsWidth(startCol, this.frozenColCount - 1));
-                }
+            const scrollLeft = this.scrollLeft;
+            if (this.isLeftFrozenColumn(startCol) && this.isRightFrozenColumn(endCol)) {
+                width = this.tableNoFrameWidth - (this.getColsWidth(startCol + 1, this.colCount - 1) ?? 0) - absoluteLeft;
             }
-            const absoluteTop = this.getRowsHeight(0, startRow - 1);
+            else if (this.isLeftFrozenColumn(startCol) && !this.isLeftFrozenColumn(endCol)) {
+                width = Math.max(width - scrollLeft, this.getColsWidth(startCol, this.frozenColCount - 1));
+            }
+            else if (!this.isRightFrozenColumn(startCol) && this.isRightFrozenColumn(endCol)) {
+                absoluteLeft = Math.min(absoluteLeft - scrollLeft, this.tableNoFrameWidth - this.getRightFrozenColsWidth());
+                width = this.tableNoFrameWidth - (this.getColsWidth(startCol + 1, this.colCount - 1) ?? 0) - absoluteLeft;
+            }
+            else if (this.isRightFrozenColumn(startCol)) {
+                absoluteLeft = this.tableNoFrameWidth - (this.getColsWidth(startCol, this.colCount - 1) ?? 0);
+            }
+            else ;
+            let absoluteTop = this.getRowsHeight(0, startRow - 1);
             let height = this.getRowsHeight(startRow, endRow);
-            if (isFrozenStartCell?.row) {
-                const scrollTop = this.scrollTop;
-                if (!isFrozenEndCell?.row) {
-                    height -= scrollTop;
-                    height = Math.max(height, this.getRowsHeight(startRow, this.frozenRowCount - 1));
-                }
+            const scrollTop = this.scrollTop;
+            if (this.isTopFrozenRow(startRow) && this.isBottomFrozenRow(endRow)) {
+                height = this.tableNoFrameHeight - (this.getRowsHeight(startRow + 1, this.rowCount - 1) ?? 0) - absoluteTop;
             }
+            else if (this.isTopFrozenRow(startRow) && !this.isTopFrozenRow(endRow)) {
+                height = Math.max(height - scrollTop, this.getRowsHeight(startRow, this.frozenRowCount - 1));
+            }
+            else if (!this.isBottomFrozenRow(startRow) && this.isBottomFrozenRow(endRow)) {
+                absoluteTop = Math.min(absoluteTop - scrollTop, this.tableNoFrameHeight - this.getBottomFrozenRowsHeight());
+                height = this.tableNoFrameHeight - (this.getRowsHeight(startRow + 1, this.rowCount - 1) ?? 0) - absoluteTop;
+            }
+            else if (this.isBottomFrozenRow(startRow)) {
+                absoluteTop = this.tableNoFrameHeight - (this.getRowsHeight(startRow, this.rowCount - 1) ?? 0);
+            }
+            else ;
             return new Rect$1(Math.round(absoluteLeft), Math.round(absoluteTop), Math.round(width), Math.round(height));
         }
         getCellsRectWidth(startCol, startRow, endCol, endRow) {
@@ -53244,6 +53270,9 @@
             }
             return this.internalProps.layoutMap.getCellRange(col, row);
         }
+        hasCustomMerge() {
+            return !!this.internalProps.customMergeCell;
+        }
         getCustomMerge(col, row) {
             if (this.internalProps.customMergeCell) {
                 const customMerge = this.internalProps.customMergeCell(col, row, this);
@@ -63114,7 +63143,7 @@
     }
 
     registerForVrender();
-    const version = "0.19.1";
+    const version = "0.19.2-alpha.0";
     function getIcons() {
         return get$1();
     }