k-vtable 1.0.36 → 1.0.37

package/cjs/core/BaseTable.js

@@ -45,7 +45,7 @@ class BaseTable extends EventTarget_1.EventTarget {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
         if (super(), this.showFrozenIcon = !0, this._scrollToRowCorrectTimer = null, this._tableBorderWidth_left = 0, 
         this._tableBorderWidth_right = 0, this._tableBorderWidth_top = 0, this._tableBorderWidth_bottom = 0, 
-        this.version = "1.0.36", this.id = `VTable${Date.now()}`, this.isReleased = !1, 
+        this.version = "1.0.37", this.id = `VTable${Date.now()}`, this.isReleased = !1, 
         this._chartEventMap = {}, this.throttleInvalidate = (0, util_1.throttle2)(this.render.bind(this), 200), 
         "undefined" != typeof window) {
             const g = window;
@@ -903,7 +903,8 @@ class BaseTable extends EventTarget_1.EventTarget {
         return count;
     }
     getBodyVisibleCellRange() {
-        const {scrollTop: scrollTop, scrollLeft: scrollLeft} = this, frozenRowsHeight = this.getFrozenRowsHeight(), frozenColsContentWidth = this.getFrozenColsContentWidth(), frozenColsOffset = this.getFrozenColsOffset(), bottomFrozenRowsHeight = this.getBottomFrozenRowsHeight(), rightFrozenColsWidth = this.getRightFrozenColsWidth(), {row: rowStart} = this.getRowAt(scrollTop + frozenRowsHeight + 1), {col: colStart} = this.getColAt(scrollLeft + frozenColsContentWidth + 1), rowEnd = this.getAllRowsHeight() > this.tableNoFrameHeight ? this.getRowAt(scrollTop + this.tableNoFrameHeight - 1 - bottomFrozenRowsHeight).row : this.rowCount - 1, colEnd = this.getAllColsWidth() > this.tableNoFrameWidth ? this.getColAt(scrollLeft + frozenColsOffset + this.tableNoFrameWidth - 1 - rightFrozenColsWidth).col : this.colCount - 1;
+        var _a, _b, _c, _d;
+        const {scrollTop: scrollTop, scrollLeft: scrollLeft} = this, frozenColsContentWidth = this.getFrozenColsContentWidth(), frozenColsOffset = this.getFrozenColsOffset(), bottomFrozenRowsHeight = this.getBottomFrozenRowsHeight(), rightFrozenColsWidth = this.getRightFrozenColsWidth(), rowStart = Math.max(null !== (_b = null === (_a = this.getTargetRowAt(scrollTop + 1)) || void 0 === _a ? void 0 : _a.row) && void 0 !== _b ? _b : -1, this.frozenRowCount), {col: colStart} = this.getColAt(scrollLeft + frozenColsContentWidth + 1), rowEnd = this.getAllRowsHeight() > this.tableNoFrameHeight ? Math.max(null !== (_d = null === (_c = this.getTargetRowAt(scrollTop + this.tableNoFrameHeight - 1 - bottomFrozenRowsHeight)) || void 0 === _c ? void 0 : _c.row) && void 0 !== _d ? _d : -1, rowStart) : this.rowCount - 1, colEnd = this.getAllColsWidth() > this.tableNoFrameWidth ? this.getColAt(scrollLeft + frozenColsOffset + this.tableNoFrameWidth - 1 - rightFrozenColsWidth).col : this.colCount - 1;
         return colEnd < 0 || rowEnd < 0 ? null : {
             rowStart: rowStart,
             colStart: colStart,
@@ -912,7 +913,8 @@ class BaseTable extends EventTarget_1.EventTarget {
         };
     }
     getBodyVisibleRowRange(start_deltaY = 0, end_deltaY = 0) {
-        const {scrollTop: scrollTop} = this, frozenRowsHeight = this.getFrozenRowsHeight(), bottomFrozenRowsHeight = this.getBottomFrozenRowsHeight(), {row: rowStart} = this.getRowAt(scrollTop + frozenRowsHeight + 1 + start_deltaY), rowEnd = this.getAllRowsHeight() > this.tableNoFrameHeight ? this.getRowAt(scrollTop + this.tableNoFrameHeight - 1 - bottomFrozenRowsHeight + end_deltaY).row : this.rowCount - 1;
+        var _a, _b, _c, _d;
+        const {scrollTop: scrollTop} = this, bottomFrozenRowsHeight = this.getBottomFrozenRowsHeight(), rowStart = Math.max(null !== (_b = null === (_a = this.getTargetRowAt(scrollTop + 1 + start_deltaY)) || void 0 === _a ? void 0 : _a.row) && void 0 !== _b ? _b : -1, this.frozenRowCount), rowEnd = this.getAllRowsHeight() > this.tableNoFrameHeight ? Math.max(null !== (_d = null === (_c = this.getTargetRowAt(scrollTop + this.tableNoFrameHeight - 1 - bottomFrozenRowsHeight + end_deltaY)) || void 0 === _c ? void 0 : _c.row) && void 0 !== _d ? _d : -1, rowStart) : this.rowCount - 1;
         return rowEnd < 0 ? null : {
             rowStart: rowStart,
             rowEnd: rowEnd
@@ -2192,16 +2194,16 @@ class BaseTable extends EventTarget_1.EventTarget {
     }
     scrollToRow(row, animationOption) {
         var _a;
-        const targetRow = Math.min(Math.max(Math.floor(row), 0), this.rowCount - 1);
+        const targetRow = Math.min(Math.max(row, 0), this.rowCount - 1), targetRowInt = Math.floor(targetRow);
         if (this.clearCorrectTimer(), !animationOption) return this.scrollToCell({
-            row: targetRow
-        }), void this._scheduleScrollToRowCorrect(targetRow);
+            row: targetRowInt
+        }), void this._scheduleScrollToRowCorrect(targetRowInt);
         const duration = (0, vutils_1.isBoolean)(animationOption) ? 3e3 : null !== (_a = null == animationOption ? void 0 : animationOption.duration) && void 0 !== _a ? _a : 3e3;
         this.animationManager.scrollTo({
             row: targetRow
-        }, animationOption), this._scrollToRowCorrectTimer = setTimeout((() => {
-            this.scrollToRow(targetRow, !1);
-        }), duration);
+        }, animationOption), targetRowInt === targetRow && (this._scrollToRowCorrectTimer = setTimeout((() => {
+            this.scrollToRow(targetRowInt, !1);
+        }), duration));
     }
     scrollToCol(col, animationOption) {
         animationOption ? this.animationManager.scrollTo({