@visactor/vtable 0.19.1 → 0.19.2-alpha.0

package/cjs/core/BaseTable.d.ts

@@ -290,6 +290,7 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     getRecordStartRowByRecordIndex(index: number): number;
     _getHeaderCellBySortState(sortState: SortState): CellAddress | undefined;
     getCellRange(col: number, row: number): CellRange;
+    hasCustomMerge(): boolean;
     getCustomMerge(col: number, row: number): import("../ts-types").CustomMerge;
     isCellRangeEqual(col: number, row: number, targetCol: number, targetRow: number): boolean;
     _getLayoutCellId(col: number, row: number): LayoutObjectId;

package/cjs/core/BaseTable.js

@@ -45,7 +45,7 @@ class BaseTable extends EventTarget_1.EventTarget {
     }
     constructor(container, options = {}) {
         var _a, _b, _c, _d, _e, _f, _g;
-        if (super(), this.showFrozenIcon = !0, this.version = "0.19.1", this.id = `VTable${Date.now()}`, 
+        if (super(), this.showFrozenIcon = !0, this.version = "0.19.2-alpha.0", this.id = `VTable${Date.now()}`, 
         this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = (0, util_1.throttle2)(this.render.bind(this), 200), 
         !container && "node" !== options.mode) throw new Error("vtable's container is undefined");
         const {frozenColCount: frozenColCount = 0, defaultRowHeight: defaultRowHeight = 40, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth = 80, defaultHeaderColWidth: defaultHeaderColWidth, widthMode: widthMode = "standard", heightMode: heightMode = "standard", autoFillWidth: autoFillWidth = !1, autoFillHeight: autoFillHeight = !1, keyboardOptions: keyboardOptions, eventOptions: eventOptions, columnResizeMode: columnResizeMode, dragHeaderMode: dragHeaderMode, showFrozenIcon: showFrozenIcon, allowFrozenColCount: allowFrozenColCount, padding: padding, hover: hover, menu: menu, select: click, customRender: customRender, pixelRatio: pixelRatio = pixel_ratio_1.defaultPixelRatio, renderChartAsync: renderChartAsync, renderChartAsyncBatchCount: renderChartAsyncBatchCount, mode: mode, modeParams: modeParams, canvasWidth: canvasWidth, canvasHeight: canvasHeight, overscrollBehavior: overscrollBehavior, limitMinWidth: limitMinWidth} = options;
@@ -324,6 +324,7 @@ class BaseTable extends EventTarget_1.EventTarget {
     }
     getColsWidth(startCol, endCol) {
         var _a;
+        if (startCol > endCol) return 0;
         startCol = Math.max(startCol, 0), endCol = Math.min(endCol, (null !== (_a = this.colCount) && void 0 !== _a ? _a : 1 / 0) - 1);
         const cachedColWidth = this._colRangeWidthsMap.get(`$${startCol}$${endCol}`);
         if (null != cachedColWidth) return cachedColWidth;
@@ -352,6 +353,7 @@ class BaseTable extends EventTarget_1.EventTarget {
     }
     getRowsHeight(startRow, endRow) {
         var _a;
+        if (startRow > endRow) return 0;
         startRow = Math.max(startRow, 0), endRow = Math.min(endRow, (null !== (_a = this.rowCount) && void 0 !== _a ? _a : 1 / 0) - 1);
         let h = 0;
         if ("standard" === this.heightMode && !this.autoFillHeight && this.internalProps.layoutMap && endRow >= this.columnHeaderLevelCount && !this.bottomFrozenRowCount && !this.hasAutoImageColumn()) {
@@ -478,21 +480,16 @@ class BaseTable extends EventTarget_1.EventTarget {
         return rect.top = targetTop, rect.bottom = targetBottom, rect;
     }
     getCellsRect(startCol, startRow, endCol, endRow) {
-        const isFrozenStartCell = this.isFrozenCell(startCol, startRow), isFrozenEndCell = this.isFrozenCell(endCol, endRow);
+        var _a, _b, _c, _d, _e, _f;
         let absoluteLeft = this.getColsWidth(0, startCol - 1) || 0, width = this.getColsWidth(startCol, endCol);
-        if (null == isFrozenStartCell ? void 0 : isFrozenStartCell.col) {
-            const scrollLeft = this.scrollLeft;
-            absoluteLeft += scrollLeft, (null == isFrozenEndCell ? void 0 : isFrozenEndCell.col) || (width -= scrollLeft, 
-            width = Math.max(width, this.getColsWidth(startCol, this.frozenColCount - 1)));
-        }
-        const absoluteTop = this.getRowsHeight(0, startRow - 1);
-        let height = this.getRowsHeight(startRow, endRow);
-        if (null == isFrozenStartCell ? void 0 : isFrozenStartCell.row) {
-            const scrollTop = this.scrollTop;
-            (null == isFrozenEndCell ? void 0 : isFrozenEndCell.row) || (height -= scrollTop, 
-            height = Math.max(height, this.getRowsHeight(startRow, this.frozenRowCount - 1)));
-        }
-        return new Rect_1.Rect(Math.round(absoluteLeft), Math.round(absoluteTop), Math.round(width), Math.round(height));
+        const scrollLeft = this.scrollLeft;
+        this.isLeftFrozenColumn(startCol) && this.isRightFrozenColumn(endCol) ? width = this.tableNoFrameWidth - (null !== (_a = this.getColsWidth(startCol + 1, this.colCount - 1)) && void 0 !== _a ? _a : 0) - absoluteLeft : this.isLeftFrozenColumn(startCol) && !this.isLeftFrozenColumn(endCol) ? width = Math.max(width - scrollLeft, this.getColsWidth(startCol, this.frozenColCount - 1)) : !this.isRightFrozenColumn(startCol) && this.isRightFrozenColumn(endCol) ? (absoluteLeft = Math.min(absoluteLeft - scrollLeft, this.tableNoFrameWidth - this.getRightFrozenColsWidth()), 
+        width = this.tableNoFrameWidth - (null !== (_b = this.getColsWidth(startCol + 1, this.colCount - 1)) && void 0 !== _b ? _b : 0) - absoluteLeft) : this.isRightFrozenColumn(startCol) && (absoluteLeft = this.tableNoFrameWidth - (null !== (_c = this.getColsWidth(startCol, this.colCount - 1)) && void 0 !== _c ? _c : 0));
+        let absoluteTop = this.getRowsHeight(0, startRow - 1), height = this.getRowsHeight(startRow, endRow);
+        const scrollTop = this.scrollTop;
+        return this.isTopFrozenRow(startRow) && this.isBottomFrozenRow(endRow) ? height = this.tableNoFrameHeight - (null !== (_d = this.getRowsHeight(startRow + 1, this.rowCount - 1)) && void 0 !== _d ? _d : 0) - absoluteTop : this.isTopFrozenRow(startRow) && !this.isTopFrozenRow(endRow) ? height = Math.max(height - scrollTop, this.getRowsHeight(startRow, this.frozenRowCount - 1)) : !this.isBottomFrozenRow(startRow) && this.isBottomFrozenRow(endRow) ? (absoluteTop = Math.min(absoluteTop - scrollTop, this.tableNoFrameHeight - this.getBottomFrozenRowsHeight()), 
+        height = this.tableNoFrameHeight - (null !== (_e = this.getRowsHeight(startRow + 1, this.rowCount - 1)) && void 0 !== _e ? _e : 0) - absoluteTop) : this.isBottomFrozenRow(startRow) && (absoluteTop = this.tableNoFrameHeight - (null !== (_f = this.getRowsHeight(startRow, this.rowCount - 1)) && void 0 !== _f ? _f : 0)), 
+        new Rect_1.Rect(Math.round(absoluteLeft), Math.round(absoluteTop), Math.round(width), Math.round(height));
     }
     getCellsRectWidth(startCol, startRow, endCol, endRow) {
         const isFrozenStartCell = this.isFrozenCell(startCol, startRow), isFrozenEndCell = this.isFrozenCell(endCol, endRow);
@@ -1024,6 +1021,9 @@ class BaseTable extends EventTarget_1.EventTarget {
         }
         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);