fix: temporarily fix scroll position

Author: Rui-Sun

packages/vtable/src/core/BaseTable.ts

@@ -503,16 +503,16 @@ export abstract class BaseTable extends EventTarget implements BaseTableAPI {
         ? typeof limitMinWidth === 'number'
           ? limitMinWidth
           : limitMinWidth
-            ? 10
-            : 0
+          ? 10
+          : 0
         : 10;
     internalProps.limitMinHeight =
       limitMinHeight !== null && limitMinHeight !== undefined
         ? typeof limitMinHeight === 'number'
           ? limitMinHeight
           : limitMinHeight
-            ? 10
-            : 0
+          ? 10
+          : 0
         : 10;
     // 生成scenegraph
     // this._vDataSet = new DataSet();
@@ -1488,12 +1488,12 @@ export abstract class BaseTable extends EventTarget implements BaseTableAPI {
     //   : this.defaultColWidth;
     if (this.isRowHeader(col, 0) || this.isCornerHeader(col, 0)) {
       return Array.isArray(this.defaultHeaderColWidth)
-        ? (this.defaultHeaderColWidth[col] ?? this.defaultColWidth)
+        ? this.defaultHeaderColWidth[col] ?? this.defaultColWidth
         : this.defaultHeaderColWidth;
     } else if (this.isRightFrozenColumn(col, this.columnHeaderLevelCount)) {
       if (this.isPivotTable()) {
         return Array.isArray(this.defaultHeaderColWidth)
-          ? (this.defaultHeaderColWidth[this.rowHeaderLevelCount - this.rightFrozenColCount] ?? this.defaultColWidth)
+          ? this.defaultHeaderColWidth[this.rowHeaderLevelCount - this.rightFrozenColCount] ?? this.defaultColWidth
           : this.defaultHeaderColWidth;
       }
       return this.defaultColWidth;
@@ -1504,15 +1504,15 @@ export abstract class BaseTable extends EventTarget implements BaseTableAPI {
   getDefaultRowHeight(row: number) {
     if (this.isColumnHeader(0, row) || this.isCornerHeader(0, row) || this.isSeriesNumberInHeader(0, row)) {
       return Array.isArray(this.defaultHeaderRowHeight)
-        ? (this.defaultHeaderRowHeight[row] ?? this.internalProps.defaultRowHeight)
+        ? this.defaultHeaderRowHeight[row] ?? this.internalProps.defaultRowHeight
         : this.defaultHeaderRowHeight;
     }
     if (this.isBottomFrozenRow(row)) {
       //底部冻结行默认取用了表头的行高  但针对非表头数据冻结的情况这里可能不妥
       return Array.isArray(this.defaultHeaderRowHeight)
-        ? (this.defaultHeaderRowHeight[
+        ? this.defaultHeaderRowHeight[
             this.columnHeaderLevelCount > 0 ? this.columnHeaderLevelCount - this.bottomFrozenRowCount : 0
-          ] ?? this.internalProps.defaultRowHeight)
+          ] ?? this.internalProps.defaultRowHeight
         : this.defaultHeaderRowHeight;
     }
     return this.internalProps.defaultRowHeight;
@@ -2814,16 +2814,16 @@ export abstract class BaseTable extends EventTarget implements BaseTableAPI {
         ? typeof limitMinWidth === 'number'
           ? limitMinWidth
           : limitMinWidth
-            ? 10
-            : 0
+          ? 10
+          : 0
         : 10;
     internalProps.limitMinHeight =
       limitMinHeight !== null && limitMinHeight !== undefined
         ? typeof limitMinHeight === 'number'
           ? limitMinHeight
           : limitMinHeight
-            ? 10
-            : 0
+          ? 10
+          : 0
         : 10;
     // 生成scenegraph
     // this._vDataSet = new DataSet();
@@ -4991,7 +4991,8 @@ export abstract class BaseTable extends EventTarget implements BaseTableAPI {
     }
     if (isValid(cellAddr.row) && cellAddr.row >= this.frozenRowCount) {
       const frozenHeight = this.getFrozenRowsHeight();
-      const top = this.getRowsHeight(0, cellAddr.row - 1);
+      // const top = this.getRowsHeight(0, cellAddr.row - 1);
+      const top = this.internalProps._rowHeightsMap.getSumInRange(0, cellAddr.row - 1);
       this.scrollTop = Math.min(top - frozenHeight, this.getAllRowsHeight() - drawRange.height);
     }
     this.render();

packages/vtable/src/core/animation.ts

@@ -78,14 +78,12 @@ export class TableAnimationManager {
 
     const to = {
       x: isNumber(col) ? left - this.table.getFrozenColsWidth() : this.table.scrollLeft,
-      y: isNumber(row) ? top - this.table.getFrozenRowsHeight() : this.table.scrollTop
+      y: isNumber(row) ? top - this.table.getFrozenRowsHeight() : this.table.scrollTop,
+      targetCol: colInt ?? -1,
+      targetRow: rowInt ?? -1
     };
-    const duration = !isBoolean(animationOption) ? (animationOption?.duration ?? 3000) : animationOption ? 3000 : 0;
-    const easing = !isBoolean(animationOption)
-      ? (animationOption?.easing ?? 'linear')
-      : animationOption
-        ? 'linear'
-        : '';
+    const duration = !isBoolean(animationOption) ? animationOption?.duration ?? 3000 : animationOption ? 3000 : 0;
+    const easing = !isBoolean(animationOption) ? animationOption?.easing ?? 'linear' : animationOption ? 'linear' : '';
 
     const animation = new Animate(Generator.GenAutoIncrementId(), this.timeline).bind(this.tempGraphic).play(
       new Animateaaa(from, to, duration, easing, {