@visactor/vtable 1.19.1-alpha.1 → 1.19.1

package/cjs/core/BaseTable.d.ts

@@ -171,6 +171,7 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     _setRowHeight(row: number, height: number, clearCache?: boolean): void;
     setRowHeight(row: number, height: number): void;
     getRowsHeight(startRow: number, endRow: number): number;
+    _getRangeSizeForContainerFit(start: number, end: number, totalSize: number, type?: 'col' | 'row'): number;
     getColWidthDefined(col: number): string | number;
     getColWidthDefinedNumber(col: number): number;
     isAutoRowHeight(row?: number): boolean;

package/cjs/core/BaseTable.js

@@ -43,7 +43,7 @@ class BaseTable extends EventTarget_1.EventTarget {
     }
     constructor(container, options = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
-        if (super(), this.showFrozenIcon = !0, this.version = "1.19.1-alpha.1", this.id = `VTable${Date.now()}`, 
+        if (super(), this.showFrozenIcon = !0, this.version = "1.19.1", this.id = `VTable${Date.now()}`, 
         this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = (0, util_1.throttle2)(this.render.bind(this), 200), 
         "node" === env_1.Env.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, 
         container = container.container ? container.container : null), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
@@ -488,13 +488,14 @@ class BaseTable extends EventTarget_1.EventTarget {
         if (null != cachedColWidth) return cachedColWidth;
         const cachedLowerColWidth = this._colRangeWidthsMap.get(`$${startCol}$${endCol - 1}`);
         if (null != cachedLowerColWidth) {
-            const addWidth = cachedLowerColWidth + this.getColWidth(endCol);
-            return startCol >= 0 && endCol >= 0 && !Number.isNaN(addWidth) && this._colRangeWidthsMap.set(`$${startCol}$${endCol}`, Math.round(addWidth)), 
+            let addWidth = cachedLowerColWidth + this.getColWidth(endCol);
+            return this.rightFrozenColCount > 0 && endCol === this.colCount - this.rightFrozenColCount && (addWidth = this._getRangeSizeForContainerFit(startCol, endCol, addWidth, "col")), 
+            startCol >= 0 && endCol >= 0 && !Number.isNaN(addWidth) && this._colRangeWidthsMap.set(`$${startCol}$${endCol}`, Math.round(addWidth)), 
             Math.round(addWidth);
         }
         let w = 0;
         for (let col = startCol; col <= endCol; col++) w += this.getColWidth(col);
-        return startCol >= 0 && endCol >= 0 && this._colRangeWidthsMap.set(`$${startCol}$${endCol}`, Math.round(w)), 
+        return w = this._getRangeSizeForContainerFit(startCol, endCol, w, "col"), startCol >= 0 && endCol >= 0 && this._colRangeWidthsMap.set(`$${startCol}$${endCol}`, Math.round(w)), 
         Math.round(w);
     }
     getRowHeight(row) {
@@ -543,12 +544,43 @@ class BaseTable extends EventTarget_1.EventTarget {
             }
             h = this.rowHeightsMap.getSumInRange(startRow, endRow);
         } else {
+            const bottomFrozenStartRow = this.rowCount - this.bottomFrozenRowCount;
             for (let i = startRow; i < Math.min(endRow + 1, this.columnHeaderLevelCount); i++) h += this.getRowHeight(i);
-            endRow >= this.columnHeaderLevelCount && (h += this.defaultRowHeight * (Math.min(endRow, this.rowCount - this.bottomFrozenRowCount - 1) - Math.max(this.columnHeaderLevelCount, startRow) + 1));
-            for (let i = this.rowCount - this.bottomFrozenRowCount; i < endRow + 1; i++) h += this.getRowHeight(i);
+            endRow >= this.columnHeaderLevelCount && (h += this.defaultRowHeight * (Math.min(endRow, bottomFrozenStartRow - 1) - Math.max(this.columnHeaderLevelCount, startRow) + 1));
+            let currentBottomFrozenRowsHeight = 0;
+            for (let i = bottomFrozenStartRow; i < endRow + 1; i++) currentBottomFrozenRowsHeight += this.getRowHeight(i);
+            h = this._getRangeSizeForContainerFit(startRow, endRow, h + currentBottomFrozenRowsHeight, "row");
         }
         return Math.round(h);
     }
+    _getRangeSizeForContainerFit(start, end, totalSize, type = "col") {
+        var _a;
+        if (!isFinite(start) || !isFinite(end)) return totalSize;
+        const keyMap = "col" === type ? {
+            totalCount: "colCount",
+            frozenCount: "rightFrozenColCount",
+            fitType: "width",
+            tableSize: "tableNoFrameWidth",
+            getSize: "getColWidth"
+        } : {
+            totalCount: "rowCount",
+            frozenCount: "bottomFrozenRowCount",
+            fitType: "height",
+            tableSize: "tableNoFrameHeight",
+            getSize: "getRowHeight"
+        }, tableSize = this[keyMap.tableSize];
+        if (totalSize >= tableSize) return totalSize;
+        const frozenStart = this[keyMap.totalCount] - this[keyMap.frozenCount];
+        if (!isFinite(this[keyMap.totalCount]) || this[keyMap.frozenCount] <= 0 || frozenStart < 0) return totalSize;
+        if (start > frozenStart || end < frozenStart || start === end || !(null === (_a = this.containerFit) || void 0 === _a ? void 0 : _a[keyMap.fitType])) return totalSize;
+        const last = this[keyMap.totalCount] - 1;
+        let size = tableSize;
+        if (start > 0) for (let i = 0; i < start; i++) if (size -= this[keyMap.getSize](i), 
+        size <= 0) return totalSize;
+        if (end !== last) for (let i = end + 1; i <= last; i++) if (size -= this[keyMap.getSize](i), 
+        size <= 0) return totalSize;
+        return size;
+    }
     getColWidthDefined(col) {
         var _a;
         const {layoutMap: layoutMap} = this.internalProps;
@@ -998,7 +1030,8 @@ class BaseTable extends EventTarget_1.EventTarget {
         return 0;
     }
     getDrawRange() {
-        const width = Math.min(this.tableNoFrameWidth, this.getAllColsWidth()), height = Math.min(this.tableNoFrameHeight, this.getAllRowsHeight());
+        var _a, _b;
+        const width = (null === (_a = this.containerFit) || void 0 === _a ? void 0 : _a.width) ? this.tableNoFrameWidth : Math.min(this.tableNoFrameWidth, this.getAllColsWidth()), height = (null === (_b = this.containerFit) || void 0 === _b ? void 0 : _b.height) ? this.tableNoFrameHeight : Math.min(this.tableNoFrameHeight, this.getAllRowsHeight());
         return new Rect_1.Rect(this.tableX, this.tableY, width, height);
     }
     _getMouseAbstractPoint(evt) {