Skip to content

fix: 5020 scrollToRow ，滚动到的位置不对 #5026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zhiaiing wants to merge 1 commit into from
Closed

fix: 5020 scrollToRow ，滚动到的位置不对 #5026

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions packages/vtable/src/core/BaseTable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ importStyle();
export abstract class BaseTable extends EventTarget implements BaseTableAPI {
internalProps: IBaseTableProtected;
showFrozenIcon = true;
private _scrollToRowCorrectTimer: ReturnType<typeof setTimeout> | null = null;
padding: { top: number; left: number; right: number; bottom: number };
globalDropDownMenu?: MenuListItem[] | ((args: { row: number; col: number; table: BaseTableAPI }) => MenuListItem[]);
//画布绘制单元格的区域 不包括整体边框frame，所以比canvas的width和height要小一点（canvas的width包括了frame）
Expand Down Expand Up @@ -2614,6 +2615,10 @@ export abstract class BaseTable extends EventTarget implements BaseTableAPI {
if (this.isReleased) {
return;
}
if (this._scrollToRowCorrectTimer) {
clearTimeout(this._scrollToRowCorrectTimer);
this._scrollToRowCorrectTimer = null;
}
internalProps.tooltipHandler?.release?.();
internalProps.menuHandler?.release?.();

Expand Down Expand Up @@ -4989,13 +4994,37 @@ export abstract class BaseTable extends EventTarget implements BaseTableAPI {
return undefined;
}

private _scheduleScrollToRowCorrect(row: number, delay = 0) {
this._scrollToRowCorrectTimer = setTimeout(() => {
const drawRange = this.getDrawRange();
const frozenHeight = this.getFrozenRowsHeight();
const targetScrollTop = Math.max(
0,
Math.min(this.getRowsHeight(0, row - 1) - frozenHeight, this.getAllRowsHeight() - drawRange.height)
);
if (targetScrollTop !== this.scrollTop) {
return;
}
this.scrollTop = targetScrollTop;
}, delay);
}

// anmiation
scrollToRow(row: number, animationOption?: ITableAnimationOption | boolean) {
if (!isNumber(row) || this.rowCount <= 0) {
return;
}
const targetRow = Math.min(Math.max(Math.floor(row), 0), this.rowCount - 1);
if (!animationOption) {
this.scrollToCell({ row });
this.scrollToCell({ row: targetRow });
this._scheduleScrollToRowCorrect(targetRow);
return;
}
this.animationManager.scrollTo({ row }, animationOption);
const duration = !isBoolean(animationOption) ? animationOption?.duration ?? 3000 : 3000;
this.animationManager.scrollTo({ row: targetRow }, animationOption);
this._scrollToRowCorrectTimer = setTimeout(() => {
this.scrollToRow(targetRow, false);
}, duration);
}
scrollToCol(col: number, animationOption?: ITableAnimationOption | boolean) {
if (!animationOption) {
Expand Down