k-vtable 1.0.33 → 1.0.34

package/cjs/core/BaseTable.d.ts

@@ -27,6 +27,7 @@ import { PluginManager } from '../plugins/plugin-manager';
 export declare abstract class BaseTable extends EventTarget implements BaseTableAPI {
     internalProps: IBaseTableProtected;
     showFrozenIcon: boolean;
+    _scrollToRowCorrectTimer: ReturnType<typeof setTimeout> | null;
     padding: {
         top: number;
         left: number;
@@ -457,6 +458,7 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     disableScroll(): void;
     enableScroll(): void;
     getGroupTitleLevel(col: number, row: number): number | undefined;
+    private _scheduleScrollToRowCorrect;
     scrollToRow(row: number, animationOption?: ITableAnimationOption | boolean): void;
     scrollToCol(col: number, animationOption?: ITableAnimationOption | boolean): void;
     scrollToCell(cellAddr: {

package/cjs/core/BaseTable.js

@@ -43,12 +43,12 @@ 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, _u, _v, _w, _x, _y, _z;
-        if (super(), this.showFrozenIcon = !0, this._tableBorderWidth_left = 0, this._tableBorderWidth_right = 0, 
-        this._tableBorderWidth_top = 0, this._tableBorderWidth_bottom = 0, this.version = "1.0.33", 
-        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");
+        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.34", 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");
         this.pluginManager = new plugin_manager_1.PluginManager(this, options), this.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.BEFORE_INIT, {
             options: options,
             container: container
@@ -952,6 +952,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;
         const internalProps = this.internalProps;
         if (this.isReleased) return;
+        this._scrollToRowCorrectTimer && (clearTimeout(this._scrollToRowCorrectTimer), this._scrollToRowCorrectTimer = null), 
         null === (_b = null === (_a = internalProps.tooltipHandler) || void 0 === _a ? void 0 : _a.release) || void 0 === _b || _b.call(_a), 
         null === (_d = null === (_c = internalProps.menuHandler) || void 0 === _c ? void 0 : _c.release) || void 0 === _d || _d.call(_c), 
         null === (_e = super.release) || void 0 === _e || _e.call(this), this.pluginManager.release(), 
@@ -2074,12 +2075,25 @@ class BaseTable extends EventTarget_1.EventTarget {
         this.eventManager.enableScroll();
     }
     getGroupTitleLevel(col, row) {}
+    _scheduleScrollToRowCorrect(row, delay = 0) {
+        this._scrollToRowCorrectTimer = setTimeout((() => {
+            const drawRange = this.getDrawRange(), frozenHeight = this.getFrozenRowsHeight(), targetScrollTop = Math.max(0, Math.min(this.getRowsHeight(0, row) - frozenHeight, this.getAllRowsHeight() - drawRange.height));
+            targetScrollTop !== this.scrollTop && (this.scrollTop = targetScrollTop);
+        }), delay);
+    }
     scrollToRow(row, animationOption) {
-        animationOption ? this.animationManager.scrollTo({
-            row: row
-        }, animationOption) : this.scrollToCell({
-            row: row
-        });
+        var _a;
+        if (!(0, vutils_1.isNumber)(row) || this.rowCount <= 0) return;
+        const targetRow = Math.min(Math.max(Math.floor(row), 0), this.rowCount - 1);
+        if (!animationOption) return this.scrollToCell({
+            row: targetRow
+        }), void this._scheduleScrollToRowCorrect(targetRow);
+        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);
     }
     scrollToCol(col, animationOption) {
         animationOption ? this.animationManager.scrollTo({