@antv/s2-vue 1.6.0-alpha.1 → 1.6.1

package/esm/index.d.ts

@@ -3,7 +3,7 @@ import { BaseTooltip } from '@antv/s2';
 import type { BBox } from '@antv/g-canvas';
 import { Canvas } from '@antv/g-canvas';
 import { CellMeta } from '@antv/s2';
-import { CellScrollPosition } from '@antv/s2';
+import type { CellScrollPosition } from '@antv/s2';
 import { CollapsedRowsType } from '@antv/s2';
 import { ComponentCustomProps } from 'vue';
 import { ComponentOptionsMixin } from 'vue';
@@ -24,7 +24,7 @@ import { Group } from '@antv/g-canvas';
 import { HiddenColumnsInfo } from '@antv/s2';
 import type { IElement } from '@antv/g-canvas';
 import { IGroup } from '@antv/g-canvas';
-import type { IShape } from '@antv/g-canvas';
+import { IShape } from '@antv/g-canvas';
 import { LayoutResult } from '@antv/s2';
 import { MemoizedFunction } from 'lodash';
 import { Node as Node_2 } from '@antv/s2';
@@ -41,6 +41,7 @@ import { S2DataConfig } from '@antv/s2';
 import { S2MountContainer } from '@antv/s2';
 import { S2Options } from '@antv/s2';
 import { S2RenderOptions } from '@antv/s2';
+import { ScrollOffset } from '@antv/s2';
 import { ShallowRef } from 'vue';
 import { Shape } from '@antv/g-canvas';
 import { ShapeAttrs } from '@antv/g-canvas';
@@ -68,11 +69,6 @@ declare enum Aggregation {
     AVG = "AVG"
 }
 
-declare interface AreaRange {
-    start: number;
-    width: number;
-}
-
 declare interface Background {
     opacity?: number;
     color?: string;
@@ -134,6 +130,7 @@ declare abstract class BaseCell<T extends SimpleBBox> extends Group {
         };
     };
     getActualText(): string;
+    isTextOverflowing(): boolean;
     getFieldValue(): string;
     /**
      * in case there are more params to be handled
@@ -158,6 +155,7 @@ declare abstract class BaseCell<T extends SimpleBBox> extends Group {
     protected abstract getTextPosition(): Point;
     protected abstract findFieldCondition(conditions: Condition[]): Condition;
     protected abstract mappingValue(condition: Condition): MappingResult;
+    protected shouldInit(): boolean;
     getStyle<K extends keyof S2Theme = keyof CellThemes>(name?: K): DefaultCellTheme | S2Theme[K];
     protected getResizeAreaStyle(): ResizeArea;
     protected shouldDrawResizeAreaByType(type: keyof ResizeInteractionOptions, cell: S2CellType_2): boolean | ((cell: S2CellType_2<ViewMeta_2>) => boolean) | ResizeType | ((resizeInfo: ResizeInfo_2) => boolean);
@@ -179,6 +177,8 @@ declare abstract class BaseCell<T extends SimpleBBox> extends Group {
     };
     protected drawTextShape(): void;
     protected drawLinkFieldShape(showLinkFieldShape: boolean, linkFillColor: string): void;
+    protected getLinkFieldStyle(): string;
+    protected drawLinkField(meta: Node_2_2 | ViewMeta_2): void;
     updateByState(stateName: InteractionStateName, cell: S2CellType_2): void;
     protected getInteractiveBorderShapeStyle<T>(style: T & number): {
         x: number;
@@ -198,6 +198,10 @@ declare abstract class BaseCell<T extends SimpleBBox> extends Group {
     get cellConditions(): Conditions;
     drawConditionIconShapes(): void;
     getTextConditionFill(textStyle: TextTheme): string;
+    protected getCrossBackgroundColor(rowIndex: number): {
+        backgroundColorOpacity: number;
+        backgroundColor: string;
+    };
 }
 
 declare interface BaseChartData {
@@ -221,10 +225,10 @@ declare abstract class BaseDataSet_2 {
     meta: Meta[];
     originData: DataType_2[];
     totalData: DataType_2[];
-    indexesData: DataType_2[][] | DataType_2[];
+    indexesData: Record<string, DataType_2[][] | DataType_2[]>;
     sortParams: SortParams_2;
     filterParams: FilterParam[];
-    protected spreadsheet: SpreadSheet_2;
+    spreadsheet: SpreadSheet_2;
     constructor(spreadsheet: SpreadSheet_2);
     protected displayData: DataType_2[];
     /**
@@ -247,7 +251,10 @@ declare abstract class BaseDataSet_2 {
      */
     getFieldDescription(field: string): string;
     setDataCfg(dataCfg: S2DataConfig_2): void;
+    processMeta(meta: Meta[], defaultExtraFieldText: string): Meta[];
     getDisplayDataSet(): DataType_2[];
+    isEmpty(): boolean;
+    getEmptyViewIndexes(): Indexes;
     getValueRangeByField(field: string): ValueRange;
     /** ******************NEED IMPLEMENT BY USER CASE************************ */
     /**
@@ -272,7 +279,7 @@ declare abstract class BaseDataSet_2 {
      * @param field current dimensions
      * @param query dimension value query
      */
-    abstract getDimensionValues(field: string, query?: DataType_2): string[];
+    abstract getDimensionValues(field: string, query?: Query): string[];
     /**
      * In most cases, this function to get the specific
      * cross data cell data
@@ -280,15 +287,17 @@ declare abstract class BaseDataSet_2 {
      */
     abstract getCellData(params: CellDataParams): DataType_2;
     /**
-     * To get a row or column cells data;
-     * if query is empty, return all data
+     * 获取符合 query 的所有单元格数据，如果 query 为空，返回空数组
      * @param query
-     * @param isTotals
-     * @param isRow
-     * @param drillDownFields
+     * @param params 默认获取符合 query 的所有数据，包括小计总计等汇总数据；
+     *               如果只希望获取明细数据，请使用 { queryType: QueryDataType.DetailOnly }
      */
-    abstract getMultiData(query: DataType_2, isTotals?: boolean, isRow?: boolean, drillDownFields?: string[]): DataType_2[];
+    abstract getMultiData(query: Query, params?: MultiDataParams): Data_2[];
     moreThanOneValue(): boolean;
+    /**
+     * get a row cells data including cell
+     */
+    abstract getRowData(cellMeta: CellMeta_2 | ViewMeta_2 | Node): RowData;
 }
 
 declare interface BaseDrillDownComponentProps<DataSet = BaseDataSet> {
@@ -336,7 +345,8 @@ declare abstract class BaseFacet {
     centerFrame: Frame;
     gridInfo: GridInfo;
     protected abstract doLayout(): LayoutResult_2;
-    abstract getViewCellHeights(layoutResult: LayoutResult_2): ViewCellHeights;
+    abstract getContentHeight(): number;
+    abstract getViewCellHeights(layoutResult?: LayoutResult_2): ViewCellHeights;
     protected scrollFrameId: ReturnType<typeof requestAnimationFrame>;
     get scrollBarTheme(): ScrollBarTheme;
     get scrollBarSize(): number;
@@ -370,12 +380,11 @@ declare abstract class BaseFacet {
         width: number;
         height: number;
     };
-    getContentHeight(): number;
     updateScrollOffset(offsetConfig: OffsetConfig): void;
     getPaginationScrollY(): number;
     destroy(): void;
-    setScrollOffset: (scrollOffset: ScrollOffset) => void;
-    getScrollOffset: () => ScrollOffset;
+    setScrollOffset: (scrollOffset: ScrollOffset_2) => void;
+    getScrollOffset: () => ScrollOffset_2;
     emitPaginationEvent: () => void;
     private unbindEvents;
     clipPanelGroup: () => void;
@@ -402,12 +411,12 @@ declare abstract class BaseFacet {
     scrollImmediately: (offsetConfig?: OffsetConfig) => void;
     /**
      *
-     * @param skipScrollEvent 如为true则不触发S2Event.GLOBAL_SCROLL
+     * @param skipScrollEvent 不触发 S2Event.GLOBAL_SCROLL
      */
     startScroll: (skipScrollEvent?: boolean) => void;
     getRendererHeight: () => number;
     private getAdjustedScrollOffset;
-    renderRowScrollBar: (rowScrollX: number) => void;
+    renderRowScrollBar: (rowHeaderScrollX: number) => void;
     getValidScrollBarOffset: (offset: number, maxOffset: number) => number;
     renderHScrollBar: (width: number, realWidth: number, scrollX: number) => void;
     private getScrollbarPosition;
@@ -444,6 +453,7 @@ declare abstract class BaseFacet {
     private stopScrollChainingIfNeeded;
     private stopScrollChaining;
     onWheel: (event: WheelEvent) => void;
+    protected panelScrollGroupClip(scrollX: number, scrollY: number): void;
     protected clip(scrollX: number, scrollY: number): void;
     /**
      * Translate panelGroup, rowHeader, cornerHeader, columnHeader ect
@@ -475,6 +485,7 @@ declare abstract class BaseFacet {
      * 5. series number header
      */
     protected renderHeaders(): void;
+    protected getRowHeaderCfg(): RowHeaderConfig;
     protected getRowHeader(): RowHeader;
     protected getColHeader(): ColHeader;
     protected getCornerHeader(): CornerHeader;
@@ -496,6 +507,22 @@ declare abstract class BaseFacet {
     protected onAfterScroll: DebouncedFunc<() => void>;
     protected saveInitColumnLeafNodes(columnNodes?: Node_2_2[]): void;
     getHiddenColumnsInfo(columnNode: Node_2_2): HiddenColumnsInfo_2 | null;
+    getCornerNodes(): Node_2_2[];
+}
+
+declare class BaseFrozenRowHeader extends RowHeader {
+    scrollGroup: IGroup;
+    frozenHeadGroup: IGroup;
+    constructor(cfg: RowHeaderConfig);
+    protected rowCellInRectXDir(item: Node_2_2): boolean;
+    protected rowCellInRectYDir(item: Node_2_2): boolean;
+    protected rowCellInRect(item: Node_2_2): boolean;
+    protected getCellGroup(item: Node_2_2): IGroup;
+    protected offset(): void;
+    clip(): void;
+    isFrozenRow(node: Node_2_2): boolean;
+    getFrozenFirstRowHeight(): number;
+    clear(): void;
 }
 
 /**
@@ -506,6 +533,7 @@ declare abstract class BaseFacet {
 declare abstract class BaseHeader<T extends BaseHeaderConfig> extends Group {
     protected headerConfig: T;
     protected constructor(cfg: T);
+    getConfig(): T;
     /**
      * 清空热区，为重绘做准备，防止热区重复渲染
      * @param type 当前重绘的header类型
@@ -521,10 +549,10 @@ declare abstract class BaseHeader<T extends BaseHeaderConfig> extends Group {
     onScrollXY(scrollX: number, scrollY: number, type: string): void;
     /**
      * Only call when hRowScrollBar scrolls
-     * @param rowScrollX  hRowScrollbar horizontal offset
+     * @param rowHeaderScrollX  hRowScrollbar horizontal offset
      * @param type
      */
-    onRowScrollX(rowScrollX: number, type: string): void;
+    onRowScrollX(rowHeaderScrollX: number, type: string): void;
     protected abstract layout(): any;
     protected abstract offset(): any;
     protected abstract clip(): any;
@@ -570,6 +598,7 @@ declare interface BaseNodeConfig {
     isSubTotals?: boolean;
     isCollapsed?: boolean;
     isGrandTotals?: boolean;
+    isTotalRoot?: boolean;
     hierarchy?: Hierarchy;
     isPivotMode?: boolean;
     seriesNumberWidth?: number;
@@ -586,9 +615,53 @@ declare interface BaseNodeConfig {
     height?: number;
     padding?: number;
     children?: Node_2_2[];
+    hiddenColumnsInfo?: HiddenColumnsInfo_2 | null;
     extra?: Record<string, any>;
 }
 
+declare class BaseRowCell extends HeaderCell {
+    protected headerConfig: RowHeaderConfig;
+    protected gm: GM;
+    get cellType(): CellTypes;
+    destroy(): void;
+    protected initCell(): void;
+    getBackgroundColor(): {
+        backgroundColor: string;
+        backgroundColorOpacity: number;
+    };
+    /**
+     * 绘制hover悬停，刷选的外框
+     */
+    protected drawInteractiveBorderShape(): void;
+    protected drawInteractiveBgShape(): void;
+    protected showTreeIcon(): boolean;
+    protected showTreeLeafNodeAlignDot(): boolean;
+    protected getParentTreeIconCfg(): any;
+    protected drawTreeIcon(): void;
+    protected drawTreeLeafNodeAlignDot(): void;
+    protected isBolderText(): boolean;
+    protected drawTextShape(): void;
+    protected drawRectBorder(): void;
+    protected getResizeClipAreaBBox(): SimpleBBox;
+    protected drawResizeAreaInLeaf(): void;
+    protected getContentIndent(): number;
+    protected getTextIndent(): number;
+    protected isTreeLevel(): any;
+    protected getIconPosition(): {
+        x: any;
+        y: any;
+    };
+    protected getMaxTextWidth(): number;
+    protected getTextArea(): SimpleBBox;
+    protected getAdjustTextAreaHeight(textArea: SimpleBBox, scrollY: number, viewportHeight: number): number;
+    protected calculateTextY({ textArea, adjustTextAreaHeight, }: {
+        textArea: SimpleBBox;
+        adjustTextAreaHeight: number;
+    }): number;
+    protected getTextPosition(): Point;
+    protected getIconYPosition(): number;
+}
+
 export declare const BaseSheet: DefineComponent<    {
 sheetType: PropType<SheetType>;
 dataCfg: PropType<S2DataConfig>;
@@ -649,7 +722,7 @@ id: number;
 isCollapsed: boolean;
 node: Node_2;
 }) => void;
-rowCellScroll: (position: CellScrollPosition) => void;
+rowCellScroll: (position: Required<ScrollOffset>) => void;
 colCellHover: (data: TargetCellInfo) => void;
 colCellClick: (data: TargetCellInfo) => void;
 colCellDoubleClick: (data: TargetCellInfo) => void;
@@ -667,6 +740,7 @@ dataCellMouseMove: (data: TargetCellInfo) => void;
 dataCellTrendIconClick: (meta: ViewMeta) => void;
 dataCellBrushSelection: (brushRangeDataCells: DataCell[]) => void;
 dataCellSelectMove: (metas: CellMeta[]) => void;
+dataCellEditEnd: (meta: ViewMeta) => void;
 cornerCellHover: (data: TargetCellInfo) => void;
 cornerCellClick: (data: TargetCellInfo) => void;
 cornerCellDoubleClick: (data: TargetCellInfo) => void;
@@ -695,7 +769,7 @@ pageCount: number;
 total: number;
 current: number;
 }) => void;
-layoutCellScroll: (position: CellScrollPosition) => void;
+layoutCellScroll: (position: Required<ScrollOffset>) => void;
 layoutCollapseRows: (data: CollapsedRowsType) => void;
 layoutAfterCollapseRows: (data: CollapsedRowsType) => void;
 collapseRowsAll: (hierarchyCollapse: boolean) => void;
@@ -747,7 +821,7 @@ linkFieldJump: (data: {
 key: string;
 record: Data;
 }) => void;
-scroll: (position: CellScrollPosition) => void;
+scroll: (position: Required<ScrollOffset>) => void;
 layoutAfterRealDataCellRender: (options: {
 add: [number, number][];
 remove: [number, number][];
@@ -784,7 +858,6 @@ onSpreadsheet: PropType<(container: S2MountContainer, dataCfg: S2DataConfig, opt
 onGetSpreadSheet: PropType<(spreadsheet: SpreadSheet) => void>;
 onMounted: PropType<(spreadsheet: SpreadSheet) => void>;
 }>> & {
-onMounted?: (spreadsheet: SpreadSheet) => any;
 onSheetUpdate?: (params: S2RenderOptions) => any;
 onRowCellHover?: (data: TargetCellInfo) => any;
 onRowCellClick?: (data: TargetCellInfo) => any;
@@ -798,7 +871,7 @@ id: number;
 isCollapsed: boolean;
 node: Node_2;
 }) => any;
-onRowCellScroll?: (position: CellScrollPosition) => any;
+onRowCellScroll?: (position: Required<ScrollOffset>) => any;
 onColCellHover?: (data: TargetCellInfo) => any;
 onColCellClick?: (data: TargetCellInfo) => any;
 onColCellDoubleClick?: (data: TargetCellInfo) => any;
@@ -816,6 +889,7 @@ onDataCellMouseMove?: (data: TargetCellInfo) => any;
 onDataCellTrendIconClick?: (meta: ViewMeta) => any;
 onDataCellBrushSelection?: (brushRangeDataCells: DataCell[]) => any;
 onDataCellSelectMove?: (metas: CellMeta[]) => any;
+onDataCellEditEnd?: (meta: ViewMeta) => any;
 onCornerCellHover?: (data: TargetCellInfo) => any;
 onCornerCellClick?: (data: TargetCellInfo) => any;
 onCornerCellDoubleClick?: (data: TargetCellInfo) => any;
@@ -844,7 +918,7 @@ pageCount: number;
 total: number;
 current: number;
 }) => any;
-onLayoutCellScroll?: (position: CellScrollPosition) => any;
+onLayoutCellScroll?: (position: Required<ScrollOffset>) => any;
 onLayoutCollapseRows?: (data: CollapsedRowsType) => any;
 onLayoutAfterCollapseRows?: (data: CollapsedRowsType) => any;
 onCollapseRowsAll?: (hierarchyCollapse: boolean) => any;
@@ -855,6 +929,7 @@ hiddenColumnsDetail: HiddenColumnsInfo[];
 }) => any;
 onBeforeRender?: () => any;
 onAfterRender?: () => any;
+onMounted?: (spreadsheet: SpreadSheet) => any;
 onDestroy?: () => any;
 onLayoutResize?: (params: ResizeParams) => any;
 onLayoutResizeSeriesWidth?: (params: ResizeParams) => any;
@@ -895,7 +970,7 @@ onLinkFieldJump?: (data: {
 key: string;
 record: Data;
 }) => any;
-onScroll?: (position: CellScrollPosition) => any;
+onScroll?: (position: Required<ScrollOffset>) => any;
 onLayoutAfterRealDataCellRender?: (options: {
 add: [number, number][];
 remove: [number, number][];
@@ -917,9 +992,9 @@ showPagination: boolean | {
 onShowSizeChange?: (pageSize: number) => void;
 onChange?: (current: number) => void;
 };
-}>;
+}, {}>;
 
-declare interface BaseSheetComponentProps<PartialDrillDown = unknown, Header = unknown, Options = S2Options<TooltipContentType, Pagination>> {
+declare interface BaseSheetComponentProps<PartialDrillDown = unknown, Header = unknown, Options = S2Options<TooltipContentType, Pagination>, OverrideShowPagination = false> {
     sheetType?: SheetType;
     spreadsheet?: (container: S2MountContainer, dataCfg: S2DataConfig, options: Options) => SpreadSheet;
     dataCfg: S2DataConfig;
@@ -927,10 +1002,7 @@ declare interface BaseSheetComponentProps<PartialDrillDown = unknown, Header = u
     loading?: boolean;
     partDrillDown?: PartialDrillDown;
     adaptive?: Adaptive;
-    showPagination?: boolean | {
-        onShowSizeChange?: (pageSize: number) => void;
-        onChange?: (current: number) => void;
-    };
+    showPagination?: ShowPagination<OverrideShowPagination, Options>;
     themeCfg?: ThemeCfg;
     header?: Header;
     /** @deprecated 1.29.0 已废弃, 请使用 onMounted 代替 */
@@ -967,6 +1039,7 @@ declare interface BaseSheetComponentProps<PartialDrillDown = unknown, Header = u
     onDataCellTrendIconClick?: (meta: ViewMeta) => void;
     onDataCellBrushSelection?: (brushRangeDataCells: DataCell[]) => void;
     onDataCellSelectMove?: (metas: CellMeta[]) => void;
+    onDataCellEditEnd?: (meta: ViewMeta) => void;
     onCornerCellHover?: (data: TargetCellInfo) => void;
     onCornerCellClick?: (data: TargetCellInfo) => void;
     onCornerCellDoubleClick?: (data: TargetCellInfo) => void;
@@ -1122,7 +1195,7 @@ declare interface BulletValue {
 
 declare interface CalcTotals {
     aggregation?: Aggregation;
-    calcFunc?: (query: DataType_2, arr: DataType_2[]) => number;
+    calcFunc?: (query: Query, arr: DataType_2[]) => number;
 }
 
 declare type CanvasEventHandler = (event: Event_2) => void;
@@ -1154,10 +1227,11 @@ declare interface CellCfg {
 declare type CellCustomWidth = number | ((node: Node_2_2) => number);
 
 declare interface CellDataParams {
-    query: DataType_2;
+    query: Query;
     isTotals?: boolean;
     rowNode?: Node_2_2;
     isRow?: boolean;
+    totalStatus?: TotalStatus;
 }
 
 declare interface CellMeta_2 {
@@ -1165,6 +1239,7 @@ declare interface CellMeta_2 {
     colIndex: number;
     rowIndex: number;
     type: CellTypes;
+    rowQuery?: Record<string, any>;
     [key: string]: unknown;
 }
 
@@ -1176,10 +1251,7 @@ declare interface CellScrollOffset {
     offsetY: number;
 }
 
-declare interface CellScrollPosition_2 {
-    scrollX: number;
-    scrollY: number;
-}
+declare type CellScrollPosition_2 = Required<ScrollOffset_2>;
 
 declare interface CellTheme {
     crossBackgroundColor?: string;
@@ -1195,6 +1267,8 @@ declare interface CellTheme {
     interactionState?: InteractionState;
     miniBarChartHeight?: number;
     miniBarChartFillColor?: string;
+    /** 单元格边线虚线 */
+    borderDash?: number[];
 }
 
 declare type CellThemes = {
@@ -1244,20 +1318,16 @@ declare class ColCell extends HeaderCell {
     protected getExpandIconTheme(): IconTheme;
     protected addExpandColumnSplitLine(): void;
     protected addExpandColumnIconShapes(): void;
-    protected addExpandColumnIcon(): void;
-    protected getExpandColumnIconConfig(): {
+    protected addExpandColumnIcons(): void;
+    private addExpandColumnIcon;
+    protected getExpandColumnIconConfig(isLastColumn: boolean): {
         x: number;
         y: number;
         width: number;
         height: number;
     };
     protected isLastColumn(): boolean;
-    /**
-     * 计算文本位置时候需要，留给后代根据情况（固定列）覆盖
-     * @param viewport
-     * @returns viewport
-     */
-    protected handleViewport(viewport: AreaRange): AreaRange;
+    protected isAllDisplaySiblingNodeHidden(): HiddenColumnsInfo_2;
 }
 
 declare interface ColCfg {
@@ -1286,7 +1356,7 @@ declare class ColHeader extends BaseHeader<ColHeaderConfig> {
     clear(): void;
     protected getCellInstance(item: Node_2_2, spreadsheet: SpreadSheet_2, headerConfig: ColHeaderConfig): ColCell;
     protected getCellGroup(node: Node_2_2): IGroup;
-    protected isColCellInRect(item: Node_2_2): boolean;
+    protected isColCellInRect(node: Node_2_2): boolean;
     protected layout(): void;
     protected offset(): void;
 }
@@ -1327,6 +1397,7 @@ declare interface Conditions {
 
 declare class CornerBBox extends BaseBBox {
     calculateBBox(): void;
+    private getCornerBBoxOriginalHeight;
     private getCornerBBoxHeight;
     private getCornerBBoxWidth;
     private adjustCornerBBoxWidth;
@@ -1337,7 +1408,6 @@ declare class CornerCell extends HeaderCell {
     protected isBolderText(): boolean;
     cornerType: CornerNodeType;
     get cellType(): CellTypes;
-    update(): void;
     protected initCell(): void;
     /**
      * @deprecated 已废弃, 请使用 drawTextShape
@@ -1381,6 +1451,7 @@ declare class CornerHeader extends BaseHeader<CornerHeaderConfig> {
      */
     static getCornerHeader(panelBBox: PanelBBox, cornerBBox: CornerBBox, seriesNumberWidth: number, cfg: SpreadSheetFacetCfg, layoutResult: LayoutResult_2, s2: SpreadSheet_2): CornerHeader;
     static getCornerNodes(position: Point, width: number, height: number, rows: string[], columns: string[], rowsHierarchy: Hierarchy, colsHierarchy: Hierarchy, dataSet: BaseDataSet_2, seriesNumberWidth: number, s2: SpreadSheet_2): Node_2_2[];
+    static getTreeCornerText(s2: SpreadSheet_2): string;
     constructor(cfg: CornerHeaderConfig);
     /**
      *  Make cornerHeader scroll with hScrollBar
@@ -1392,6 +1463,7 @@ declare class CornerHeader extends BaseHeader<CornerHeaderConfig> {
     protected renderCells(): void;
     protected offset(): void;
     protected clip(): void;
+    getNodes(): Node_2_2[];
 }
 
 declare type CornerHeaderCallback = (parent: S2CellType_2, spreadsheet: SpreadSheet_2, ...restOptions: unknown[]) => void;
@@ -1457,6 +1529,7 @@ declare class DataCell_2 extends BaseCell<ViewMeta_2> {
     protected handleHover(cells: CellMeta_2[]): void;
     update(): void;
     setMeta(viewMeta: ViewMeta_2): void;
+    protected drawTextShape(): void;
     protected initCell(): void;
     /**
      * 获取默认字体颜色：根据字段标记背景颜色，设置字体颜色
@@ -1650,6 +1723,7 @@ declare class EventController {
     s2EventHandlers: S2EventHandler[];
     domEventListeners: EventListener_2[];
     isCanvasEffect: boolean;
+    canvasMousemoveEvent: Event_2;
     constructor(spreadsheet: SpreadSheet_2);
     get canvasContainer(): Canvas;
     get isAutoResetSheetStyle(): boolean;
@@ -1658,6 +1732,7 @@ declare class EventController {
     private onKeyboardCopy;
     private onKeyboardEsc;
     private resetSheetStyle;
+    private isMouseEvent;
     private isMouseOnTheCanvasContainer;
     private getContainerRect;
     private isMouseOnTheTooltip;
@@ -1807,9 +1882,18 @@ declare class GuiIcon extends Group {
     static type: string;
     iconImageShape: Shape.Image;
     constructor(cfg: GuiIconCfg);
-    private getImage;
-    hasSupportSuffix: (image: string) => boolean;
+    getImage(name: string, cacheKey: string, fill?: string): Promise<HTMLImageElement>;
+    /**
+     * 1. https://xxx.svg
+     * 2. http://xxx.svg
+     * 3. //xxx.svg
+     */
+    isOnlineLink: (src: string) => boolean;
     private render;
+    setImageAttrs(attrs: Partial<{
+        name: string;
+        fill: string;
+    }>): void;
 }
 
 declare interface GuiIconCfg extends ShapeAttrs {
@@ -1820,6 +1904,7 @@ declare class HdAdapter {
     private viewport;
     private devicePixelRatioMedia;
     private spreadsheet;
+    private isDevicePixelRatioChange;
     constructor(spreadsheet: SpreadSheet_2);
     init: () => void;
     destroy: () => void;
@@ -1827,6 +1912,11 @@ declare class HdAdapter {
     private removeDevicePixelRatioListener;
     private initDeviceZoomListener;
     private removeDeviceZoomListener;
+    /**
+     * DPR 改变也会触发 visualViewport 的 resize 事件, 预期是只监听双指缩放, 所以这里规避掉
+     * @see https://github.com/antvis/S2/issues/2072
+     */
+    private renderByZoomScaleWithoutResizeEffect;
     private renderByDevicePixelRatioChanged;
     private renderByDevicePixelRatio;
     private renderByZoomScale;
@@ -1864,8 +1954,9 @@ declare abstract class HeaderCell extends BaseCell<Node_2_2> {
     protected actionIcons: GuiIcon[];
     protected hasDefaultHiddenIcon: boolean;
     protected abstract isBolderText(): boolean;
-    protected handleRestOptions(...[headerConfig]: [BaseHeaderConfig]): void;
+    protected handleRestOptions(...[headerConfig]: [BaseHeaderConfig, unknown]): void;
     protected initCell(): void;
+    getTreeIcon(): GuiIcon;
     protected getInteractiveBorderShapeStyle(border: number): {
         x: number;
         y: number;
@@ -1895,6 +1986,10 @@ declare abstract class HeaderCell extends BaseCell<Node_2_2> {
         backgroundColor: string;
         backgroundColorOpacity: number;
     };
+    protected getBackgroundColorByCondition(backgroundColor: string, backgroundColorOpacity: number): {
+        backgroundColor: string;
+        backgroundColorOpacity: number;
+    };
     toggleActionIcon(id: string): void;
     update(): void;
     updateByState(stateName: InteractionStateName): void;
@@ -1975,14 +2070,21 @@ declare interface IconTheme {
     margin?: Margin;
 }
 
-declare type Indexes = [number, number, number, number];
+declare type Indexes = [number?, number?, number?, number?];
+
+declare interface InteractionCellHighlight {
+    rowHeader?: boolean;
+    colHeader?: boolean;
+    currentRow?: boolean;
+    currentCol?: boolean;
+}
 
 declare type InteractionConstructor = new (spreadsheet: SpreadSheet_2) => BaseEvent;
 
 declare interface InteractionOptions {
     linkFields?: string[] | ((meta: Node_2_2 | ViewMeta_2) => boolean);
     selectedCellsSpotlight?: boolean;
-    hoverHighlight?: boolean;
+    hoverHighlight?: boolean | InteractionCellHighlight;
     hoverFocus?: boolean | HoverFocusOptions;
     enableCopy?: boolean;
     copyWithFormat?: boolean;
@@ -1997,8 +2099,9 @@ declare interface InteractionOptions {
     selectedCellMove?: boolean;
     scrollbarPosition?: ScrollbarPositionType;
     eventListenerOptions?: boolean | AddEventListenerOptions;
-    selectedCellHighlight?: boolean;
+    selectedCellHighlight?: boolean | InteractionCellHighlight;
     overscrollBehavior?: 'auto' | 'none' | 'contain';
+    hoverAfterScroll?: boolean;
     /** ***********CUSTOM INTERACTION HOOKS**************** */
     customInteractions?: CustomInteraction[];
 }
@@ -2020,6 +2123,7 @@ declare interface InteractionStateInfo {
 declare enum InteractionStateName {
     ALL_SELECTED = "allSelected",
     SELECTED = "selected",
+    BRUSH_SELECTED = "brushSelected",
     UNSELECTED = "unselected",
     HOVER = "hover",
     HOVER_FOCUS = "hoverFocus",
@@ -2120,7 +2224,7 @@ declare interface LineTheme {
 
 declare type MappingDataItemCallback = (valueField: string, data: DataItem) => Record<string, string | number> | DataItem;
 
-declare type MappingFunction = (fieldValue: number | string, data: Record<string, any>) => MappingResult;
+declare type MappingFunction = (fieldValue: number | string, data: Record<string, any>) => MappingResult | null | undefined;
 
 declare interface MappingResult extends ValueRange {
     icon?: string;
@@ -2160,6 +2264,8 @@ declare class MergedCell extends DataCell_2 {
     drawTextShape(): void;
 }
 
+declare type MergedCellCallback = (spreadsheet: SpreadSheet_2, cells: S2CellType_2[], meta?: ViewMeta_2) => MergedCell;
+
 /**
  * the index of rows or columns.
  */
@@ -2211,12 +2317,16 @@ declare interface MultiData<T = SimpleDataItem[][] | MiniChartData> {
     [key: string]: unknown;
 }
 
+declare interface MultiDataParams {
+    drillDownFields?: string[];
+    queryType?: QueryDataType;
+}
+
 /**
  * Node for cornerHeader, colHeader, rowHeader
  */
 declare class Node_2_2 {
     isTotalMeasure: boolean;
-    config: BaseNodeConfig;
     constructor(cfg: BaseNodeConfig);
     /**
      * Get node's field path
@@ -2294,13 +2404,27 @@ declare class Node_2_2 {
     cornerType?: CornerNodeType;
     isGrandTotals?: boolean;
     isSubTotals?: boolean;
+    isTotalRoot?: boolean;
+    /**
+     * @deprecated 已废弃, 该属性只记录相邻一级的隐藏信息，将会在未来版本中移除
+     */
+    hiddenChildNodeInfo?: HiddenColumnsInfo_2 | null;
+    extra?: Record<string, any>;
     [key: string]: any;
     static rootNode(): Node_2_2;
-    toJSON(): Omit_2<this, "spreadsheet" | "config" | "parent" | "hierarchy">;
+    toJSON(): Omit_2<this, "parent" | "hierarchy" | "spreadsheet" | "config">;
     getHeadLeafChild(): Node_2_2;
+    /**
+     * 获取树状模式下，当前节点以及其所有子节点的高度总和
+     * */
+    getTotalHeightForTreeHierarchy(): number;
 }
 
 declare interface OffsetConfig {
+    rowHeaderOffsetX?: {
+        value: number | undefined;
+        animate?: boolean;
+    };
     offsetX?: {
         value: number | undefined;
         animate?: boolean;
@@ -2440,7 +2564,7 @@ id: number;
 isCollapsed: boolean;
 node: Node_2;
 }) => void;
-rowCellScroll: (position: CellScrollPosition) => void;
+rowCellScroll: (position: Required<ScrollOffset>) => void;
 colCellHover: (data: TargetCellInfo) => void;
 colCellClick: (data: TargetCellInfo) => void;
 colCellDoubleClick: (data: TargetCellInfo) => void;
@@ -2458,6 +2582,7 @@ dataCellMouseMove: (data: TargetCellInfo) => void;
 dataCellTrendIconClick: (meta: ViewMeta) => void;
 dataCellBrushSelection: (brushRangeDataCells: DataCell[]) => void;
 dataCellSelectMove: (metas: CellMeta[]) => void;
+dataCellEditEnd: (meta: ViewMeta) => void;
 cornerCellHover: (data: TargetCellInfo) => void;
 cornerCellClick: (data: TargetCellInfo) => void;
 cornerCellDoubleClick: (data: TargetCellInfo) => void;
@@ -2486,7 +2611,7 @@ pageCount: number;
 total: number;
 current: number;
 }) => void;
-layoutCellScroll: (position: CellScrollPosition) => void;
+layoutCellScroll: (position: Required<ScrollOffset>) => void;
 layoutCollapseRows: (data: CollapsedRowsType) => void;
 layoutAfterCollapseRows: (data: CollapsedRowsType) => void;
 collapseRowsAll: (hierarchyCollapse: boolean) => void;
@@ -2538,7 +2663,7 @@ linkFieldJump: (data: {
 key: string;
 record: Data;
 }) => void;
-scroll: (position: CellScrollPosition) => void;
+scroll: (position: Required<ScrollOffset>) => void;
 layoutAfterRealDataCellRender: (options: {
 add: [number, number][];
 remove: [number, number][];
@@ -2575,7 +2700,6 @@ onSpreadsheet: PropType<(container: S2MountContainer, dataCfg: S2DataConfig, opt
 onGetSpreadSheet: PropType<(spreadsheet: SpreadSheet) => void>;
 onMounted: PropType<(spreadsheet: SpreadSheet) => void>;
 }>> & {
-onMounted?: (spreadsheet: SpreadSheet) => any;
 onSheetUpdate?: (params: S2RenderOptions) => any;
 onRowCellHover?: (data: TargetCellInfo) => any;
 onRowCellClick?: (data: TargetCellInfo) => any;
@@ -2589,7 +2713,7 @@ id: number;
 isCollapsed: boolean;
 node: Node_2;
 }) => any;
-onRowCellScroll?: (position: CellScrollPosition) => any;
+onRowCellScroll?: (position: Required<ScrollOffset>) => any;
 onColCellHover?: (data: TargetCellInfo) => any;
 onColCellClick?: (data: TargetCellInfo) => any;
 onColCellDoubleClick?: (data: TargetCellInfo) => any;
@@ -2607,6 +2731,7 @@ onDataCellMouseMove?: (data: TargetCellInfo) => any;
 onDataCellTrendIconClick?: (meta: ViewMeta) => any;
 onDataCellBrushSelection?: (brushRangeDataCells: DataCell[]) => any;
 onDataCellSelectMove?: (metas: CellMeta[]) => any;
+onDataCellEditEnd?: (meta: ViewMeta) => any;
 onCornerCellHover?: (data: TargetCellInfo) => any;
 onCornerCellClick?: (data: TargetCellInfo) => any;
 onCornerCellDoubleClick?: (data: TargetCellInfo) => any;
@@ -2635,7 +2760,7 @@ pageCount: number;
 total: number;
 current: number;
 }) => any;
-onLayoutCellScroll?: (position: CellScrollPosition) => any;
+onLayoutCellScroll?: (position: Required<ScrollOffset>) => any;
 onLayoutCollapseRows?: (data: CollapsedRowsType) => any;
 onLayoutAfterCollapseRows?: (data: CollapsedRowsType) => any;
 onCollapseRowsAll?: (hierarchyCollapse: boolean) => any;
@@ -2646,6 +2771,7 @@ hiddenColumnsDetail: HiddenColumnsInfo[];
 }) => any;
 onBeforeRender?: () => any;
 onAfterRender?: () => any;
+onMounted?: (spreadsheet: SpreadSheet) => any;
 onDestroy?: () => any;
 onLayoutResize?: (params: ResizeParams) => any;
 onLayoutResizeSeriesWidth?: (params: ResizeParams) => any;
@@ -2686,7 +2812,7 @@ onLinkFieldJump?: (data: {
 key: string;
 record: Data;
 }) => any;
-onScroll?: (position: CellScrollPosition) => any;
+onScroll?: (position: Required<ScrollOffset>) => any;
 onLayoutAfterRealDataCellRender?: (options: {
 add: [number, number][];
 remove: [number, number][];
@@ -2708,7 +2834,7 @@ showPagination: boolean | {
 onShowSizeChange?: (pageSize: number) => void;
 onChange?: (current: number) => void;
 };
-}>;
+}, {}>;
 
 declare interface PointObject {
     x: number;
@@ -2720,6 +2846,13 @@ declare interface PropOption<T = any> {
     default?: T;
 }
 
+declare type Query = Record<string, any>;
+
+declare enum QueryDataType {
+    All = "all",
+    DetailOnly = "detailOnly"
+}
+
 declare interface RangeColors {
     good: string;
     satisfactory: string;
@@ -2825,7 +2958,7 @@ declare class RootInteraction {
     isHoverState(): boolean;
     isActiveCell(cell: S2CellType_2): boolean;
     isSelectedCell(cell: S2CellType_2): boolean;
-    getCells(): CellMeta_2[];
+    getCells(cellType?: CellTypes[]): CellMeta_2[];
     getActiveCells(): S2CellType_2[];
     clearStyleIndependent(): void;
     getPanelGroupAllUnSelectedDataCells(): DataCell_2[];
@@ -2856,45 +2989,30 @@ declare class RootInteraction {
     clearHoverTimer(): void;
     setHoverTimer(timer: number): void;
     getHoverTimer(): number;
+    getSelectedCellHighlight(): InteractionCellHighlight;
+    getHoverAfterScroll(): boolean;
+    getHoverHighlight(): InteractionCellHighlight;
+    getBrushSelection(): BrushSelection;
 }
 
-declare class RowCell extends HeaderCell {
-    protected headerConfig: RowHeaderConfig;
-    protected gm: GM;
-    get cellType(): CellTypes;
-    destroy(): void;
-    protected initCell(): void;
+/**
+ * Adapting the frozen first row for cells pivot table
+ */
+declare class RowCell extends BaseRowCell {
     /**
-     * 绘制hover悬停，刷选的外框
+     * To indicate whether the current node is a frozen node
+     *
+     * PS: It is a specific config for the cell node, so it should not be extended in the headerConfig.
      */
-    protected drawInteractiveBorderShape(): void;
-    protected drawInteractiveBgShape(): void;
-    protected showTreeIcon(): boolean;
-    protected showTreeLeafNodeAlignDot(): boolean;
-    protected getParentTreeIconCfg(): any;
-    protected drawTreeIcon(): void;
-    protected drawTreeLeafNodeAlignDot(): void;
-    protected isBolderText(): boolean;
-    protected drawTextShape(): void;
-    protected drawLinkFieldShape(): void;
-    protected drawRectBorder(): void;
-    protected drawResizeAreaInLeaf(): void;
-    protected getContentIndent(): number;
-    protected getTextIndent(): number;
-    protected isTreeLevel(): any;
-    protected getIconPosition(): {
-        x: any;
-        y: any;
-    };
-    protected getMaxTextWidth(): number;
-    protected getTextArea(): {
-        x: number;
-        width: number;
-        y: number;
-        height: number;
-    };
-    protected getTextPosition(): Point;
-    protected getIconYPosition(): number;
+    protected frozenRowCell: boolean;
+    protected handleRestOptions(...[headerConfig, ...options]: [BaseHeaderConfig, boolean]): void;
+    protected getAdjustTextAreaHeight(textArea: SimpleBBox, scrollY: number, viewportHeight: number): number;
+    protected calculateTextY({ textArea, adjustTextAreaHeight, }: {
+        textArea: SimpleBBox;
+        adjustTextAreaHeight: number;
+    }): number;
+    protected getResizeClipAreaBBox(): SimpleBBox;
+    private getFrozenFirstRowHeight;
 }
 
 declare type RowCellCollapseTreeRowsType = {
@@ -2913,6 +3031,8 @@ declare interface RowCfg {
     treeRowsWidth?: number;
 }
 
+declare type RowData = Data_2 | DataType_2;
+
 /**
  * Row Header for SpreadSheet
  */
@@ -2920,6 +3040,10 @@ declare class RowHeader extends BaseHeader<RowHeaderConfig> {
     private gm;
     constructor(cfg: RowHeaderConfig);
     destroy(): void;
+    protected rowCellInRect(item: Node_2_2): boolean;
+    createCellInstance(node: Node_2_2): RowCell;
+    protected getCellGroup(node: Node_2_2): IGroup;
+    protected getCustomRowCell(): CellCallback<RowHeaderConfig>;
     protected layout(): void;
     protected offset(): void;
     protected clip(): void;
@@ -2959,6 +3083,7 @@ declare interface S2BasicOptions<T = TooltipContentType_2, P = Pagination_2, Ico
     cornerCell?: CellCallback<CornerHeaderConfig>;
     rowCell?: CellCallback<RowHeaderConfig>;
     colCell?: CellCallback<ColHeaderConfig>;
+    mergedCell?: MergedCellCallback;
     frame?: FrameCallback;
     cornerHeader?: CornerHeaderCallback;
     /** ***********CUSTOM LIFECYCLE HOOKS**************** */
@@ -2971,7 +3096,7 @@ declare interface S2BasicOptions<T = TooltipContentType_2, P = Pagination_2, Ico
     mappingDisplayDataItem?: MappingDataItemCallback;
 }
 
-declare type S2CellType_2<T extends SimpleBBox = ViewMeta_2> = DataCell_2 | HeaderCell | ColCell | CornerCell | RowCell | MergedCell | BaseCell<T>;
+declare type S2CellType_2<T extends SimpleBBox = ViewMeta_2> = DataCell_2 | HeaderCell | ColCell | CornerCell | RowCell | BaseRowCell | MergedCell | BaseCell<T>;
 
 declare interface S2DataConfig_2 {
     data: Data_2[];
@@ -3093,6 +3218,7 @@ declare interface S2Options_2<T = TooltipContentType_2, P = Pagination_2, Icon =
 }
 
 declare interface S2PivotSheetOptions {
+    frozenFirstRow?: boolean;
 }
 
 declare interface S2RenderOptions_2 {
@@ -3203,10 +3329,10 @@ declare interface ScrollBarTheme {
     lineCap?: ShapeAttrs['lineCap'];
 }
 
-declare interface ScrollOffset {
+declare interface ScrollOffset_2 {
     scrollX?: number;
     scrollY?: number;
-    hRowScrollX?: number;
+    rowHeaderScrollX?: number;
 }
 
 declare interface ScrollSpeedRatio {
@@ -3221,9 +3347,7 @@ declare interface SelectHeaderCellInfo {
     isMultiSelection?: boolean;
 }
 
-declare class SeriesNumberHeader extends BaseHeader<BaseHeaderConfig> {
-    private backgroundShape;
-    private leftBorderShape;
+declare class SeriesNumberHeader extends BaseFrozenRowHeader {
     /**
      * Get seriesNumber header by config
      * @param viewportBBox
@@ -3232,19 +3356,18 @@ declare class SeriesNumberHeader extends BaseHeader<BaseHeaderConfig> {
      * @param spreadsheet
      * @param cornerWidth
      */
-    static getSeriesNumberHeader(viewportBBox: PanelBBox, seriesNumberWidth: number, leafNodes: Node_2_2[], spreadsheet: SpreadSheet_2, cornerWidth: number): SeriesNumberHeader;
-    constructor(cfg: BaseHeaderConfig);
-    clip(): void;
-    layout(): void;
-    protected offset(): void;
-    private addBackGround;
-    private addBorder;
-    private getStyle;
-    private addText;
-    private getTextPadding;
+    static getSeriesNumberHeader({ viewportBBox, seriesNumberWidth, leafNodes, spreadsheet, cornerWidth, }: {
+        viewportBBox: PanelBBox;
+        seriesNumberWidth: number;
+        leafNodes: Node_2_2[];
+        spreadsheet: SpreadSheet_2;
+        cornerWidth: number;
+    }): SeriesNumberHeader;
+    createCellInstance(node: Node_2_2): RowCell;
+    protected getCustomRowCell(): any;
 }
 
-export declare const SheetComponent: DefineComponent<GetInitProps<SheetComponentProps, "onMounted" | "sheetType" | "spreadsheet" | "options" | "loading" | "partDrillDown" | "adaptive" | "showPagination" | "themeCfg" | "header" | "getSpreadSheet" | "onSheetUpdate" | "onRowCellHover" | "onRowCellClick" | "onRowCellDoubleClick" | "onRowCellContextMenu" | "onRowCellMouseDown" | "onRowCellMouseUp" | "onRowCellMouseMove" | "onRowCellCollapseTreeRows" | "onRowCellScroll" | "onColCellHover" | "onColCellClick" | "onColCellDoubleClick" | "onColCellContextMenu" | "onColCellMouseDown" | "onColCellMouseUp" | "onColCellMouseMove" | "onDataCellHover" | "onDataCellClick" | "onDataCellDoubleClick" | "onDataCellContextMenu" | "onDataCellMouseDown" | "onDataCellMouseUp" | "onDataCellMouseMove" | "onDataCellTrendIconClick" | "onDataCellBrushSelection" | "onDataCellSelectMove" | "onCornerCellHover" | "onCornerCellClick" | "onCornerCellDoubleClick" | "onCornerCellContextMenu" | "onCornerCellMouseDown" | "onCornerCellMouseUp" | "onCornerCellMouseMove" | "onMergedCellsHover" | "onMergedCellsClick" | "onMergedCellsDoubleClick" | "onMergedCellsContextMenu" | "onMergedCellsMouseDown" | "onMergedCellsMouseUp" | "onMergedCellsMouseMove" | "onRangeSort" | "onRangeSorted" | "onRangeFilter" | "onRangeFiltered" | "onLayoutAfterHeaderLayout" | "onLayoutPagination" | "onLayoutCellScroll" | "onLayoutCollapseRows" | "onLayoutAfterCollapseRows" | "onCollapseRowsAll" | "onLayoutColsExpanded" | "onLayoutColsHidden" | "onBeforeRender" | "onAfterRender" | "onDestroy" | "onLayoutResize" | "onLayoutResizeSeriesWidth" | "onLayoutResizeRowWidth" | "onLayoutResizeRowHeight" | "onLayoutResizeColWidth" | "onLayoutResizeColHeight" | "onLayoutResizeTreeWidth" | "onLayoutResizeMouseDown" | "onLayoutResizeMouseUp" | "onLayoutResizeMouseMove" | "onKeyBoardDown" | "onKeyBoardUp" | "onCopied" | "onActionIconHover" | "onActionIconHoverOff" | "onActionIconClick" | "onContextMenu" | "onClick" | "onHover" | "onDoubleClick" | "onMouseHover" | "onMouseUp" | "onMouseDown" | "onMouseMove" | "onSelected" | "onReset" | "onLinkFieldJump" | "onScroll" | "onLayoutAfterRealDataCellRender" | "onRowCellBrushSelection" | "onColCellBrushSelection">, {
+export declare const SheetComponent: DefineComponent<GetInitProps<SheetComponentProps, "sheetType" | "spreadsheet" | "options" | "loading" | "partDrillDown" | "adaptive" | "showPagination" | "themeCfg" | "header" | "getSpreadSheet" | "onSheetUpdate" | "onRowCellHover" | "onRowCellClick" | "onRowCellDoubleClick" | "onRowCellContextMenu" | "onRowCellMouseDown" | "onRowCellMouseUp" | "onRowCellMouseMove" | "onRowCellCollapseTreeRows" | "onRowCellScroll" | "onColCellHover" | "onColCellClick" | "onColCellDoubleClick" | "onColCellContextMenu" | "onColCellMouseDown" | "onColCellMouseUp" | "onColCellMouseMove" | "onDataCellHover" | "onDataCellClick" | "onDataCellDoubleClick" | "onDataCellContextMenu" | "onDataCellMouseDown" | "onDataCellMouseUp" | "onDataCellMouseMove" | "onDataCellTrendIconClick" | "onDataCellBrushSelection" | "onDataCellSelectMove" | "onDataCellEditEnd" | "onCornerCellHover" | "onCornerCellClick" | "onCornerCellDoubleClick" | "onCornerCellContextMenu" | "onCornerCellMouseDown" | "onCornerCellMouseUp" | "onCornerCellMouseMove" | "onMergedCellsHover" | "onMergedCellsClick" | "onMergedCellsDoubleClick" | "onMergedCellsContextMenu" | "onMergedCellsMouseDown" | "onMergedCellsMouseUp" | "onMergedCellsMouseMove" | "onRangeSort" | "onRangeSorted" | "onRangeFilter" | "onRangeFiltered" | "onLayoutAfterHeaderLayout" | "onLayoutPagination" | "onLayoutCellScroll" | "onLayoutCollapseRows" | "onLayoutAfterCollapseRows" | "onCollapseRowsAll" | "onLayoutColsExpanded" | "onLayoutColsHidden" | "onBeforeRender" | "onAfterRender" | "onMounted" | "onDestroy" | "onLayoutResize" | "onLayoutResizeSeriesWidth" | "onLayoutResizeRowWidth" | "onLayoutResizeRowHeight" | "onLayoutResizeColWidth" | "onLayoutResizeColHeight" | "onLayoutResizeTreeWidth" | "onLayoutResizeMouseDown" | "onLayoutResizeMouseUp" | "onLayoutResizeMouseMove" | "onKeyBoardDown" | "onKeyBoardUp" | "onCopied" | "onActionIconHover" | "onActionIconHoverOff" | "onActionIconClick" | "onContextMenu" | "onClick" | "onHover" | "onDoubleClick" | "onMouseHover" | "onMouseUp" | "onMouseDown" | "onMouseMove" | "onSelected" | "onReset" | "onLinkFieldJump" | "onScroll" | "onLayoutAfterRealDataCellRender" | "onRowCellBrushSelection" | "onColCellBrushSelection">, {
 s2Ref: ShallowRef<SheetExpose>;
 sheetType: ComputedRef<DefineComponent<    {
 sheetType: PropType<SheetType>;
@@ -3293,7 +3416,7 @@ id: number;
 isCollapsed: boolean;
 node: Node_2_2;
 }) => void;
-rowCellScroll: (position: CellScrollPosition_2) => void;
+rowCellScroll: (position: Required<ScrollOffset_2>) => void;
 colCellHover: (data: TargetCellInfo_2) => void;
 colCellClick: (data: TargetCellInfo_2) => void;
 colCellDoubleClick: (data: TargetCellInfo_2) => void;
@@ -3311,6 +3434,7 @@ dataCellMouseMove: (data: TargetCellInfo_2) => void;
 dataCellTrendIconClick: (meta: ViewMeta_2) => void;
 dataCellBrushSelection: (brushRangeDataCells: DataCell_2[]) => void;
 dataCellSelectMove: (metas: CellMeta_2[]) => void;
+dataCellEditEnd: (meta: ViewMeta_2) => void;
 cornerCellHover: (data: TargetCellInfo_2) => void;
 cornerCellClick: (data: TargetCellInfo_2) => void;
 cornerCellDoubleClick: (data: TargetCellInfo_2) => void;
@@ -3339,7 +3463,7 @@ pageCount: number;
 total: number;
 current: number;
 }) => void;
-layoutCellScroll: (position: CellScrollPosition_2) => void;
+layoutCellScroll: (position: Required<ScrollOffset_2>) => void;
 layoutCollapseRows: (data: CollapsedRowsType_2) => void;
 layoutAfterCollapseRows: (data: CollapsedRowsType_2) => void;
 collapseRowsAll: (hierarchyCollapse: boolean) => void;
@@ -3391,7 +3515,7 @@ linkFieldJump: (data: {
 key: string;
 record: Data_2;
 }) => void;
-scroll: (position: CellScrollPosition_2) => void;
+scroll: (position: Required<ScrollOffset_2>) => void;
 layoutAfterRealDataCellRender: (options: {
 add: [number, number][];
 remove: [number, number][];
@@ -3428,7 +3552,6 @@ onSpreadsheet: PropType<(container: S2MountContainer_2, dataCfg: S2DataConfig_2,
 onGetSpreadSheet: PropType<(spreadsheet: SpreadSheet_2) => void>;
 onMounted: PropType<(spreadsheet: SpreadSheet_2) => void>;
 }>> & {
-onMounted?: (spreadsheet: SpreadSheet_2) => any;
 onSheetUpdate?: (params: S2RenderOptions_2) => any;
 onRowCellHover?: (data: TargetCellInfo_2) => any;
 onRowCellClick?: (data: TargetCellInfo_2) => any;
@@ -3442,7 +3565,7 @@ id: number;
 isCollapsed: boolean;
 node: Node_2_2;
 }) => any;
-onRowCellScroll?: (position: CellScrollPosition_2) => any;
+onRowCellScroll?: (position: Required<ScrollOffset_2>) => any;
 onColCellHover?: (data: TargetCellInfo_2) => any;
 onColCellClick?: (data: TargetCellInfo_2) => any;
 onColCellDoubleClick?: (data: TargetCellInfo_2) => any;
@@ -3460,6 +3583,7 @@ onDataCellMouseMove?: (data: TargetCellInfo_2) => any;
 onDataCellTrendIconClick?: (meta: ViewMeta_2) => any;
 onDataCellBrushSelection?: (brushRangeDataCells: DataCell_2[]) => any;
 onDataCellSelectMove?: (metas: CellMeta_2[]) => any;
+onDataCellEditEnd?: (meta: ViewMeta_2) => any;
 onCornerCellHover?: (data: TargetCellInfo_2) => any;
 onCornerCellClick?: (data: TargetCellInfo_2) => any;
 onCornerCellDoubleClick?: (data: TargetCellInfo_2) => any;
@@ -3488,7 +3612,7 @@ pageCount: number;
 total: number;
 current: number;
 }) => any;
-onLayoutCellScroll?: (position: CellScrollPosition_2) => any;
+onLayoutCellScroll?: (position: Required<ScrollOffset_2>) => any;
 onLayoutCollapseRows?: (data: CollapsedRowsType_2) => any;
 onLayoutAfterCollapseRows?: (data: CollapsedRowsType_2) => any;
 onCollapseRowsAll?: (hierarchyCollapse: boolean) => any;
@@ -3499,6 +3623,7 @@ hiddenColumnsDetail: HiddenColumnsInfo_2[];
 }) => any;
 onBeforeRender?: () => any;
 onAfterRender?: () => any;
+onMounted?: (spreadsheet: SpreadSheet_2) => any;
 onDestroy?: () => any;
 onLayoutResize?: (params: ResizeParams_2) => any;
 onLayoutResizeSeriesWidth?: (params: ResizeParams_2) => any;
@@ -3539,7 +3664,7 @@ onLinkFieldJump?: (data: {
 key: string;
 record: Data_2;
 }) => any;
-onScroll?: (position: CellScrollPosition_2) => any;
+onScroll?: (position: Required<ScrollOffset_2>) => any;
 onLayoutAfterRealDataCellRender?: (options: {
 add: [number, number][];
 remove: [number, number][];
@@ -3561,7 +3686,7 @@ showPagination: boolean | {
 onShowSizeChange?: (pageSize: number) => void;
 onChange?: (current: number) => void;
 };
-}> | DefineComponent<GetInitProps<SheetComponentProps, "onMounted" | "sheetType" | "spreadsheet" | "options" | "loading" | "partDrillDown" | "adaptive" | "showPagination" | "themeCfg" | "header" | "getSpreadSheet" | "onSheetUpdate" | "onRowCellHover" | "onRowCellClick" | "onRowCellDoubleClick" | "onRowCellContextMenu" | "onRowCellMouseDown" | "onRowCellMouseUp" | "onRowCellMouseMove" | "onRowCellCollapseTreeRows" | "onRowCellScroll" | "onColCellHover" | "onColCellClick" | "onColCellDoubleClick" | "onColCellContextMenu" | "onColCellMouseDown" | "onColCellMouseUp" | "onColCellMouseMove" | "onDataCellHover" | "onDataCellClick" | "onDataCellDoubleClick" | "onDataCellContextMenu" | "onDataCellMouseDown" | "onDataCellMouseUp" | "onDataCellMouseMove" | "onDataCellTrendIconClick" | "onDataCellBrushSelection" | "onDataCellSelectMove" | "onCornerCellHover" | "onCornerCellClick" | "onCornerCellDoubleClick" | "onCornerCellContextMenu" | "onCornerCellMouseDown" | "onCornerCellMouseUp" | "onCornerCellMouseMove" | "onMergedCellsHover" | "onMergedCellsClick" | "onMergedCellsDoubleClick" | "onMergedCellsContextMenu" | "onMergedCellsMouseDown" | "onMergedCellsMouseUp" | "onMergedCellsMouseMove" | "onRangeSort" | "onRangeSorted" | "onRangeFilter" | "onRangeFiltered" | "onLayoutAfterHeaderLayout" | "onLayoutPagination" | "onLayoutCellScroll" | "onLayoutCollapseRows" | "onLayoutAfterCollapseRows" | "onCollapseRowsAll" | "onLayoutColsExpanded" | "onLayoutColsHidden" | "onBeforeRender" | "onAfterRender" | "onDestroy" | "onLayoutResize" | "onLayoutResizeSeriesWidth" | "onLayoutResizeRowWidth" | "onLayoutResizeRowHeight" | "onLayoutResizeColWidth" | "onLayoutResizeColHeight" | "onLayoutResizeTreeWidth" | "onLayoutResizeMouseDown" | "onLayoutResizeMouseUp" | "onLayoutResizeMouseMove" | "onKeyBoardDown" | "onKeyBoardUp" | "onCopied" | "onActionIconHover" | "onActionIconHoverOff" | "onActionIconClick" | "onContextMenu" | "onClick" | "onHover" | "onDoubleClick" | "onMouseHover" | "onMouseUp" | "onMouseDown" | "onMouseMove" | "onSelected" | "onReset" | "onLinkFieldJump" | "onScroll" | "onLayoutAfterRealDataCellRender" | "onRowCellBrushSelection" | "onColCellBrushSelection">, {
+}, {}> | DefineComponent<GetInitProps<SheetComponentProps, "sheetType" | "spreadsheet" | "options" | "loading" | "partDrillDown" | "adaptive" | "showPagination" | "themeCfg" | "header" | "getSpreadSheet" | "onSheetUpdate" | "onRowCellHover" | "onRowCellClick" | "onRowCellDoubleClick" | "onRowCellContextMenu" | "onRowCellMouseDown" | "onRowCellMouseUp" | "onRowCellMouseMove" | "onRowCellCollapseTreeRows" | "onRowCellScroll" | "onColCellHover" | "onColCellClick" | "onColCellDoubleClick" | "onColCellContextMenu" | "onColCellMouseDown" | "onColCellMouseUp" | "onColCellMouseMove" | "onDataCellHover" | "onDataCellClick" | "onDataCellDoubleClick" | "onDataCellContextMenu" | "onDataCellMouseDown" | "onDataCellMouseUp" | "onDataCellMouseMove" | "onDataCellTrendIconClick" | "onDataCellBrushSelection" | "onDataCellSelectMove" | "onDataCellEditEnd" | "onCornerCellHover" | "onCornerCellClick" | "onCornerCellDoubleClick" | "onCornerCellContextMenu" | "onCornerCellMouseDown" | "onCornerCellMouseUp" | "onCornerCellMouseMove" | "onMergedCellsHover" | "onMergedCellsClick" | "onMergedCellsDoubleClick" | "onMergedCellsContextMenu" | "onMergedCellsMouseDown" | "onMergedCellsMouseUp" | "onMergedCellsMouseMove" | "onRangeSort" | "onRangeSorted" | "onRangeFilter" | "onRangeFiltered" | "onLayoutAfterHeaderLayout" | "onLayoutPagination" | "onLayoutCellScroll" | "onLayoutCollapseRows" | "onLayoutAfterCollapseRows" | "onCollapseRowsAll" | "onLayoutColsExpanded" | "onLayoutColsHidden" | "onBeforeRender" | "onAfterRender" | "onMounted" | "onDestroy" | "onLayoutResize" | "onLayoutResizeSeriesWidth" | "onLayoutResizeRowWidth" | "onLayoutResizeRowHeight" | "onLayoutResizeColWidth" | "onLayoutResizeColHeight" | "onLayoutResizeTreeWidth" | "onLayoutResizeMouseDown" | "onLayoutResizeMouseUp" | "onLayoutResizeMouseMove" | "onKeyBoardDown" | "onKeyBoardUp" | "onCopied" | "onActionIconHover" | "onActionIconHoverOff" | "onActionIconClick" | "onContextMenu" | "onClick" | "onHover" | "onDoubleClick" | "onMouseHover" | "onMouseUp" | "onMouseDown" | "onMouseMove" | "onSelected" | "onReset" | "onLinkFieldJump" | "onScroll" | "onLayoutAfterRealDataCellRender" | "onRowCellBrushSelection" | "onColCellBrushSelection">, {
 s2Ref: ShallowRef<SheetExpose>;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
 spreadsheet: (container: S2MountContainer_2, dataCfg: S2DataConfig_2, options: S2Options_2<TooltipContentType_2, Pagination_2, string | Element, string>) => SpreadSheet_2;
@@ -3579,7 +3704,7 @@ id: number;
 isCollapsed: boolean;
 node: Node_2_2;
 }) => void;
-rowCellScroll: (position: CellScrollPosition_2) => void;
+rowCellScroll: (position: Required<ScrollOffset_2>) => void;
 colCellHover: (data: TargetCellInfo_2) => void;
 colCellClick: (data: TargetCellInfo_2) => void;
 colCellDoubleClick: (data: TargetCellInfo_2) => void;
@@ -3597,6 +3722,7 @@ dataCellMouseMove: (data: TargetCellInfo_2) => void;
 dataCellTrendIconClick: (meta: ViewMeta_2) => void;
 dataCellBrushSelection: (brushRangeDataCells: DataCell_2[]) => void;
 dataCellSelectMove: (metas: CellMeta_2[]) => void;
+dataCellEditEnd: (meta: ViewMeta_2) => void;
 cornerCellHover: (data: TargetCellInfo_2) => void;
 cornerCellClick: (data: TargetCellInfo_2) => void;
 cornerCellDoubleClick: (data: TargetCellInfo_2) => void;
@@ -3625,7 +3751,7 @@ pageCount: number;
 total: number;
 current: number;
 }) => void;
-layoutCellScroll: (position: CellScrollPosition_2) => void;
+layoutCellScroll: (position: Required<ScrollOffset_2>) => void;
 layoutCollapseRows: (data: CollapsedRowsType_2) => void;
 layoutAfterCollapseRows: (data: CollapsedRowsType_2) => void;
 collapseRowsAll: (hierarchyCollapse: boolean) => void;
@@ -3677,7 +3803,7 @@ linkFieldJump: (data: {
 key: string;
 record: Data_2;
 }) => void;
-scroll: (position: CellScrollPosition_2) => void;
+scroll: (position: Required<ScrollOffset_2>) => void;
 layoutAfterRealDataCellRender: (options: {
 add: [number, number][];
 remove: [number, number][];
@@ -3685,8 +3811,7 @@ spreadsheet: SpreadSheet_2;
 }) => void;
 rowCellBrushSelection: (event: default_2) => void;
 colCellBrushSelection: (event: default_2) => void;
-}, string, VNodeProps & AllowedComponentProps & ComponentCustomProps, Readonly<ExtractPropTypes<GetInitProps<SheetComponentProps, "onMounted" | "sheetType" | "spreadsheet" | "options" | "loading" | "partDrillDown" | "adaptive" | "showPagination" | "themeCfg" | "header" | "getSpreadSheet" | "onSheetUpdate" | "onRowCellHover" | "onRowCellClick" | "onRowCellDoubleClick" | "onRowCellContextMenu" | "onRowCellMouseDown" | "onRowCellMouseUp" | "onRowCellMouseMove" | "onRowCellCollapseTreeRows" | "onRowCellScroll" | "onColCellHover" | "onColCellClick" | "onColCellDoubleClick" | "onColCellContextMenu" | "onColCellMouseDown" | "onColCellMouseUp" | "onColCellMouseMove" | "onDataCellHover" | "onDataCellClick" | "onDataCellDoubleClick" | "onDataCellContextMenu" | "onDataCellMouseDown" | "onDataCellMouseUp" | "onDataCellMouseMove" | "onDataCellTrendIconClick" | "onDataCellBrushSelection" | "onDataCellSelectMove" | "onCornerCellHover" | "onCornerCellClick" | "onCornerCellDoubleClick" | "onCornerCellContextMenu" | "onCornerCellMouseDown" | "onCornerCellMouseUp" | "onCornerCellMouseMove" | "onMergedCellsHover" | "onMergedCellsClick" | "onMergedCellsDoubleClick" | "onMergedCellsContextMenu" | "onMergedCellsMouseDown" | "onMergedCellsMouseUp" | "onMergedCellsMouseMove" | "onRangeSort" | "onRangeSorted" | "onRangeFilter" | "onRangeFiltered" | "onLayoutAfterHeaderLayout" | "onLayoutPagination" | "onLayoutCellScroll" | "onLayoutCollapseRows" | "onLayoutAfterCollapseRows" | "onCollapseRowsAll" | "onLayoutColsExpanded" | "onLayoutColsHidden" | "onBeforeRender" | "onAfterRender" | "onDestroy" | "onLayoutResize" | "onLayoutResizeSeriesWidth" | "onLayoutResizeRowWidth" | "onLayoutResizeRowHeight" | "onLayoutResizeColWidth" | "onLayoutResizeColHeight" | "onLayoutResizeTreeWidth" | "onLayoutResizeMouseDown" | "onLayoutResizeMouseUp" | "onLayoutResizeMouseMove" | "onKeyBoardDown" | "onKeyBoardUp" | "onCopied" | "onActionIconHover" | "onActionIconHoverOff" | "onActionIconClick" | "onContextMenu" | "onClick" | "onHover" | "onDoubleClick" | "onMouseHover" | "onMouseUp" | "onMouseDown" | "onMouseMove" | "onSelected" | "onReset" | "onLinkFieldJump" | "onScroll" | "onLayoutAfterRealDataCellRender" | "onRowCellBrushSelection" | "onColCellBrushSelection">>> & {
-onMounted?: (spreadsheet: SpreadSheet_2) => any;
+}, string, VNodeProps & AllowedComponentProps & ComponentCustomProps, Readonly<ExtractPropTypes<GetInitProps<SheetComponentProps, "sheetType" | "spreadsheet" | "options" | "loading" | "partDrillDown" | "adaptive" | "showPagination" | "themeCfg" | "header" | "getSpreadSheet" | "onSheetUpdate" | "onRowCellHover" | "onRowCellClick" | "onRowCellDoubleClick" | "onRowCellContextMenu" | "onRowCellMouseDown" | "onRowCellMouseUp" | "onRowCellMouseMove" | "onRowCellCollapseTreeRows" | "onRowCellScroll" | "onColCellHover" | "onColCellClick" | "onColCellDoubleClick" | "onColCellContextMenu" | "onColCellMouseDown" | "onColCellMouseUp" | "onColCellMouseMove" | "onDataCellHover" | "onDataCellClick" | "onDataCellDoubleClick" | "onDataCellContextMenu" | "onDataCellMouseDown" | "onDataCellMouseUp" | "onDataCellMouseMove" | "onDataCellTrendIconClick" | "onDataCellBrushSelection" | "onDataCellSelectMove" | "onDataCellEditEnd" | "onCornerCellHover" | "onCornerCellClick" | "onCornerCellDoubleClick" | "onCornerCellContextMenu" | "onCornerCellMouseDown" | "onCornerCellMouseUp" | "onCornerCellMouseMove" | "onMergedCellsHover" | "onMergedCellsClick" | "onMergedCellsDoubleClick" | "onMergedCellsContextMenu" | "onMergedCellsMouseDown" | "onMergedCellsMouseUp" | "onMergedCellsMouseMove" | "onRangeSort" | "onRangeSorted" | "onRangeFilter" | "onRangeFiltered" | "onLayoutAfterHeaderLayout" | "onLayoutPagination" | "onLayoutCellScroll" | "onLayoutCollapseRows" | "onLayoutAfterCollapseRows" | "onCollapseRowsAll" | "onLayoutColsExpanded" | "onLayoutColsHidden" | "onBeforeRender" | "onAfterRender" | "onMounted" | "onDestroy" | "onLayoutResize" | "onLayoutResizeSeriesWidth" | "onLayoutResizeRowWidth" | "onLayoutResizeRowHeight" | "onLayoutResizeColWidth" | "onLayoutResizeColHeight" | "onLayoutResizeTreeWidth" | "onLayoutResizeMouseDown" | "onLayoutResizeMouseUp" | "onLayoutResizeMouseMove" | "onKeyBoardDown" | "onKeyBoardUp" | "onCopied" | "onActionIconHover" | "onActionIconHoverOff" | "onActionIconClick" | "onContextMenu" | "onClick" | "onHover" | "onDoubleClick" | "onMouseHover" | "onMouseUp" | "onMouseDown" | "onMouseMove" | "onSelected" | "onReset" | "onLinkFieldJump" | "onScroll" | "onLayoutAfterRealDataCellRender" | "onRowCellBrushSelection" | "onColCellBrushSelection">>> & {
 onSheetUpdate?: (params: S2RenderOptions_2) => any;
 onRowCellHover?: (data: TargetCellInfo_2) => any;
 onRowCellClick?: (data: TargetCellInfo_2) => any;
@@ -3700,7 +3825,7 @@ id: number;
 isCollapsed: boolean;
 node: Node_2_2;
 }) => any;
-onRowCellScroll?: (position: CellScrollPosition_2) => any;
+onRowCellScroll?: (position: Required<ScrollOffset_2>) => any;
 onColCellHover?: (data: TargetCellInfo_2) => any;
 onColCellClick?: (data: TargetCellInfo_2) => any;
 onColCellDoubleClick?: (data: TargetCellInfo_2) => any;
@@ -3718,6 +3843,7 @@ onDataCellMouseMove?: (data: TargetCellInfo_2) => any;
 onDataCellTrendIconClick?: (meta: ViewMeta_2) => any;
 onDataCellBrushSelection?: (brushRangeDataCells: DataCell_2[]) => any;
 onDataCellSelectMove?: (metas: CellMeta_2[]) => any;
+onDataCellEditEnd?: (meta: ViewMeta_2) => any;
 onCornerCellHover?: (data: TargetCellInfo_2) => any;
 onCornerCellClick?: (data: TargetCellInfo_2) => any;
 onCornerCellDoubleClick?: (data: TargetCellInfo_2) => any;
@@ -3746,7 +3872,7 @@ pageCount: number;
 total: number;
 current: number;
 }) => any;
-onLayoutCellScroll?: (position: CellScrollPosition_2) => any;
+onLayoutCellScroll?: (position: Required<ScrollOffset_2>) => any;
 onLayoutCollapseRows?: (data: CollapsedRowsType_2) => any;
 onLayoutAfterCollapseRows?: (data: CollapsedRowsType_2) => any;
 onCollapseRowsAll?: (hierarchyCollapse: boolean) => any;
@@ -3757,6 +3883,7 @@ hiddenColumnsDetail: HiddenColumnsInfo_2[];
 }) => any;
 onBeforeRender?: () => any;
 onAfterRender?: () => any;
+onMounted?: (spreadsheet: SpreadSheet_2) => any;
 onDestroy?: () => any;
 onLayoutResize?: (params: ResizeParams_2) => any;
 onLayoutResizeSeriesWidth?: (params: ResizeParams_2) => any;
@@ -3797,7 +3924,7 @@ onLinkFieldJump?: (data: {
 key: string;
 record: Data_2;
 }) => any;
-onScroll?: (position: CellScrollPosition_2) => any;
+onScroll?: (position: Required<ScrollOffset_2>) => any;
 onLayoutAfterRealDataCellRender?: (options: {
 add: [number, number][];
 remove: [number, number][];
@@ -3807,7 +3934,7 @@ onRowCellBrushSelection?: (event: default_2) => any;
 onColCellBrushSelection?: (event: default_2) => any;
 onSpreadsheet?: (container: S2MountContainer_2, dataCfg: S2DataConfig_2, options: S2Options_2<TooltipContentType_2, Pagination_2, string | Element, string>) => any;
 onGetSpreadSheet?: (spreadsheet: SpreadSheet_2) => any;
-}, {}>>;
+}, {}, {}>>;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
 spreadsheet: (container: S2MountContainer_2, dataCfg: S2DataConfig_2, options: S2Options_2<TooltipContentType_2, Pagination_2, string | Element, string>) => SpreadSheet_2;
 getSpreadSheet: (spreadsheet: SpreadSheet_2) => void;
@@ -3824,7 +3951,7 @@ id: number;
 isCollapsed: boolean;
 node: Node_2_2;
 }) => void;
-rowCellScroll: (position: CellScrollPosition_2) => void;
+rowCellScroll: (position: Required<ScrollOffset_2>) => void;
 colCellHover: (data: TargetCellInfo_2) => void;
 colCellClick: (data: TargetCellInfo_2) => void;
 colCellDoubleClick: (data: TargetCellInfo_2) => void;
@@ -3842,6 +3969,7 @@ dataCellMouseMove: (data: TargetCellInfo_2) => void;
 dataCellTrendIconClick: (meta: ViewMeta_2) => void;
 dataCellBrushSelection: (brushRangeDataCells: DataCell_2[]) => void;
 dataCellSelectMove: (metas: CellMeta_2[]) => void;
+dataCellEditEnd: (meta: ViewMeta_2) => void;
 cornerCellHover: (data: TargetCellInfo_2) => void;
 cornerCellClick: (data: TargetCellInfo_2) => void;
 cornerCellDoubleClick: (data: TargetCellInfo_2) => void;
@@ -3870,7 +3998,7 @@ pageCount: number;
 total: number;
 current: number;
 }) => void;
-layoutCellScroll: (position: CellScrollPosition_2) => void;
+layoutCellScroll: (position: Required<ScrollOffset_2>) => void;
 layoutCollapseRows: (data: CollapsedRowsType_2) => void;
 layoutAfterCollapseRows: (data: CollapsedRowsType_2) => void;
 collapseRowsAll: (hierarchyCollapse: boolean) => void;
@@ -3922,7 +4050,7 @@ linkFieldJump: (data: {
 key: string;
 record: Data_2;
 }) => void;
-scroll: (position: CellScrollPosition_2) => void;
+scroll: (position: Required<ScrollOffset_2>) => void;
 layoutAfterRealDataCellRender: (options: {
 add: [number, number][];
 remove: [number, number][];
@@ -3930,8 +4058,7 @@ spreadsheet: SpreadSheet_2;
 }) => void;
 rowCellBrushSelection: (event: default_2) => void;
 colCellBrushSelection: (event: default_2) => void;
-}, string, VNodeProps & AllowedComponentProps & ComponentCustomProps, Readonly<ExtractPropTypes<GetInitProps<SheetComponentProps, "onMounted" | "sheetType" | "spreadsheet" | "options" | "loading" | "partDrillDown" | "adaptive" | "showPagination" | "themeCfg" | "header" | "getSpreadSheet" | "onSheetUpdate" | "onRowCellHover" | "onRowCellClick" | "onRowCellDoubleClick" | "onRowCellContextMenu" | "onRowCellMouseDown" | "onRowCellMouseUp" | "onRowCellMouseMove" | "onRowCellCollapseTreeRows" | "onRowCellScroll" | "onColCellHover" | "onColCellClick" | "onColCellDoubleClick" | "onColCellContextMenu" | "onColCellMouseDown" | "onColCellMouseUp" | "onColCellMouseMove" | "onDataCellHover" | "onDataCellClick" | "onDataCellDoubleClick" | "onDataCellContextMenu" | "onDataCellMouseDown" | "onDataCellMouseUp" | "onDataCellMouseMove" | "onDataCellTrendIconClick" | "onDataCellBrushSelection" | "onDataCellSelectMove" | "onCornerCellHover" | "onCornerCellClick" | "onCornerCellDoubleClick" | "onCornerCellContextMenu" | "onCornerCellMouseDown" | "onCornerCellMouseUp" | "onCornerCellMouseMove" | "onMergedCellsHover" | "onMergedCellsClick" | "onMergedCellsDoubleClick" | "onMergedCellsContextMenu" | "onMergedCellsMouseDown" | "onMergedCellsMouseUp" | "onMergedCellsMouseMove" | "onRangeSort" | "onRangeSorted" | "onRangeFilter" | "onRangeFiltered" | "onLayoutAfterHeaderLayout" | "onLayoutPagination" | "onLayoutCellScroll" | "onLayoutCollapseRows" | "onLayoutAfterCollapseRows" | "onCollapseRowsAll" | "onLayoutColsExpanded" | "onLayoutColsHidden" | "onBeforeRender" | "onAfterRender" | "onDestroy" | "onLayoutResize" | "onLayoutResizeSeriesWidth" | "onLayoutResizeRowWidth" | "onLayoutResizeRowHeight" | "onLayoutResizeColWidth" | "onLayoutResizeColHeight" | "onLayoutResizeTreeWidth" | "onLayoutResizeMouseDown" | "onLayoutResizeMouseUp" | "onLayoutResizeMouseMove" | "onKeyBoardDown" | "onKeyBoardUp" | "onCopied" | "onActionIconHover" | "onActionIconHoverOff" | "onActionIconClick" | "onContextMenu" | "onClick" | "onHover" | "onDoubleClick" | "onMouseHover" | "onMouseUp" | "onMouseDown" | "onMouseMove" | "onSelected" | "onReset" | "onLinkFieldJump" | "onScroll" | "onLayoutAfterRealDataCellRender" | "onRowCellBrushSelection" | "onColCellBrushSelection">>> & {
-onMounted?: (spreadsheet: SpreadSheet_2) => any;
+}, string, VNodeProps & AllowedComponentProps & ComponentCustomProps, Readonly<ExtractPropTypes<GetInitProps<SheetComponentProps, "sheetType" | "spreadsheet" | "options" | "loading" | "partDrillDown" | "adaptive" | "showPagination" | "themeCfg" | "header" | "getSpreadSheet" | "onSheetUpdate" | "onRowCellHover" | "onRowCellClick" | "onRowCellDoubleClick" | "onRowCellContextMenu" | "onRowCellMouseDown" | "onRowCellMouseUp" | "onRowCellMouseMove" | "onRowCellCollapseTreeRows" | "onRowCellScroll" | "onColCellHover" | "onColCellClick" | "onColCellDoubleClick" | "onColCellContextMenu" | "onColCellMouseDown" | "onColCellMouseUp" | "onColCellMouseMove" | "onDataCellHover" | "onDataCellClick" | "onDataCellDoubleClick" | "onDataCellContextMenu" | "onDataCellMouseDown" | "onDataCellMouseUp" | "onDataCellMouseMove" | "onDataCellTrendIconClick" | "onDataCellBrushSelection" | "onDataCellSelectMove" | "onDataCellEditEnd" | "onCornerCellHover" | "onCornerCellClick" | "onCornerCellDoubleClick" | "onCornerCellContextMenu" | "onCornerCellMouseDown" | "onCornerCellMouseUp" | "onCornerCellMouseMove" | "onMergedCellsHover" | "onMergedCellsClick" | "onMergedCellsDoubleClick" | "onMergedCellsContextMenu" | "onMergedCellsMouseDown" | "onMergedCellsMouseUp" | "onMergedCellsMouseMove" | "onRangeSort" | "onRangeSorted" | "onRangeFilter" | "onRangeFiltered" | "onLayoutAfterHeaderLayout" | "onLayoutPagination" | "onLayoutCellScroll" | "onLayoutCollapseRows" | "onLayoutAfterCollapseRows" | "onCollapseRowsAll" | "onLayoutColsExpanded" | "onLayoutColsHidden" | "onBeforeRender" | "onAfterRender" | "onMounted" | "onDestroy" | "onLayoutResize" | "onLayoutResizeSeriesWidth" | "onLayoutResizeRowWidth" | "onLayoutResizeRowHeight" | "onLayoutResizeColWidth" | "onLayoutResizeColHeight" | "onLayoutResizeTreeWidth" | "onLayoutResizeMouseDown" | "onLayoutResizeMouseUp" | "onLayoutResizeMouseMove" | "onKeyBoardDown" | "onKeyBoardUp" | "onCopied" | "onActionIconHover" | "onActionIconHoverOff" | "onActionIconClick" | "onContextMenu" | "onClick" | "onHover" | "onDoubleClick" | "onMouseHover" | "onMouseUp" | "onMouseDown" | "onMouseMove" | "onSelected" | "onReset" | "onLinkFieldJump" | "onScroll" | "onLayoutAfterRealDataCellRender" | "onRowCellBrushSelection" | "onColCellBrushSelection">>> & {
 onSheetUpdate?: (params: S2RenderOptions_2) => any;
 onRowCellHover?: (data: TargetCellInfo_2) => any;
 onRowCellClick?: (data: TargetCellInfo_2) => any;
@@ -3945,7 +4072,7 @@ id: number;
 isCollapsed: boolean;
 node: Node_2_2;
 }) => any;
-onRowCellScroll?: (position: CellScrollPosition_2) => any;
+onRowCellScroll?: (position: Required<ScrollOffset_2>) => any;
 onColCellHover?: (data: TargetCellInfo_2) => any;
 onColCellClick?: (data: TargetCellInfo_2) => any;
 onColCellDoubleClick?: (data: TargetCellInfo_2) => any;
@@ -3963,6 +4090,7 @@ onDataCellMouseMove?: (data: TargetCellInfo_2) => any;
 onDataCellTrendIconClick?: (meta: ViewMeta_2) => any;
 onDataCellBrushSelection?: (brushRangeDataCells: DataCell_2[]) => any;
 onDataCellSelectMove?: (metas: CellMeta_2[]) => any;
+onDataCellEditEnd?: (meta: ViewMeta_2) => any;
 onCornerCellHover?: (data: TargetCellInfo_2) => any;
 onCornerCellClick?: (data: TargetCellInfo_2) => any;
 onCornerCellDoubleClick?: (data: TargetCellInfo_2) => any;
@@ -3991,7 +4119,7 @@ pageCount: number;
 total: number;
 current: number;
 }) => any;
-onLayoutCellScroll?: (position: CellScrollPosition_2) => any;
+onLayoutCellScroll?: (position: Required<ScrollOffset_2>) => any;
 onLayoutCollapseRows?: (data: CollapsedRowsType_2) => any;
 onLayoutAfterCollapseRows?: (data: CollapsedRowsType_2) => any;
 onCollapseRowsAll?: (hierarchyCollapse: boolean) => any;
@@ -4002,6 +4130,7 @@ hiddenColumnsDetail: HiddenColumnsInfo_2[];
 }) => any;
 onBeforeRender?: () => any;
 onAfterRender?: () => any;
+onMounted?: (spreadsheet: SpreadSheet_2) => any;
 onDestroy?: () => any;
 onLayoutResize?: (params: ResizeParams_2) => any;
 onLayoutResizeSeriesWidth?: (params: ResizeParams_2) => any;
@@ -4042,7 +4171,7 @@ onLinkFieldJump?: (data: {
 key: string;
 record: Data_2;
 }) => any;
-onScroll?: (position: CellScrollPosition_2) => any;
+onScroll?: (position: Required<ScrollOffset_2>) => any;
 onLayoutAfterRealDataCellRender?: (options: {
 add: [number, number][];
 remove: [number, number][];
@@ -4052,7 +4181,7 @@ onRowCellBrushSelection?: (event: default_2) => any;
 onColCellBrushSelection?: (event: default_2) => any;
 onSpreadsheet?: (container: S2MountContainer_2, dataCfg: S2DataConfig_2, options: S2Options_2<TooltipContentType_2, Pagination_2, string | Element, string>) => any;
 onGetSpreadSheet?: (spreadsheet: SpreadSheet_2) => any;
-}, {}>;
+}, {}, {}>;
 
 declare type SheetComponentOptions = S2Options<TooltipContentType, Pagination & PaginationProps>;
 
@@ -4067,6 +4196,18 @@ declare type SheetType = 'pivot' | 'table' | 'gridAnalysis' | 'strategy' | 'edit
 /** render callback */
 declare type SheetUpdateCallback = (params: S2RenderOptions) => S2RenderOptions;
 
+declare type ShowPagination<OverrideShowPagination, Options> = OverrideShowPagination extends true ? Options extends {
+    pagination?: {
+        onShowSizeChange?: unknown;
+        onChange?: unknown;
+    };
+} ? boolean | Pick<Options['pagination'], 'onShowSizeChange' | 'onChange'> : _ShowPagination : _ShowPagination;
+
+declare type _ShowPagination = boolean | {
+    onShowSizeChange?: (pageSize: number) => void;
+    onChange?: (current: number) => void;
+};
+
 declare type SimpleDataItem = string | number;
 
 declare interface Sort {
@@ -4111,6 +4252,8 @@ declare interface SplitLine {
         left: string;
         right: string;
     };
+    /** 分割线虚线 */
+    borderDash?: number[];
 }
 
 declare abstract class SpreadSheet_2 extends EE {
@@ -4191,7 +4334,7 @@ declare abstract class SpreadSheet_2 extends EE {
     abstract clearDrillDownData(rowNodeId?: string, preventRender?: boolean): void;
     abstract handleGroupSort(event: Event_2, meta: Node_2_2): void;
     showTooltip<T = TooltipContentType_2>(showOptions: TooltipShowOptions<T>): void;
-    showTooltipWithInfo(event: Event_2 | MouseEvent, data: TooltipData[], options?: TooltipOptions): void;
+    showTooltipWithInfo(event: Event_2 | MouseEvent, cellInfos: TooltipData[], options?: TooltipOptions): void;
     hideTooltip(): void;
     destroyTooltip(): void;
     registerIcons(): void;
@@ -4200,10 +4343,17 @@ declare abstract class SpreadSheet_2 extends EE {
      * Group sort params kept in {@see store} and
      * Priority: group sort > advanced sort
      * @param dataCfg
-     * @param reset reset: true, 直接使用用户传入的 DataCfg ，不再与上次数据进行合并
+     * @param reset 是否使用传入的 dataCfg 重置已保存的 dataCfg
+     *
+     * @example setDataCfg(dataCfg, true) 直接使用传入的 DataCfg，不再与上次数据进行合并
      */
-    setDataCfg(dataCfg: S2DataConfig_2, reset?: boolean): void;
+    setDataCfg<T extends boolean = false>(dataCfg: T extends true ? S2DataConfig_2 : Partial<S2DataConfig_2>, reset?: T): void;
     setOptions(options: Partial<S2Options_2>, reset?: boolean): void;
+    /**
+     * 配置都是 merge 操作, 但是隐藏列配置比较特殊, 变更时, 应该是全量覆盖, 而不应该是合并
+     * https://github.com/antvis/S2/issues/2495
+     */
+    private resetHiddenColumnsDetailInfoIfNeeded;
     render(reloadData?: boolean, options?: S2RenderOptions_2): void;
     destroy(): void;
     setThemeCfg(themeCfg?: ThemeCfg_2): void;
@@ -4251,6 +4401,7 @@ declare abstract class SpreadSheet_2 extends EE {
      */
     updateScrollOffset(offsetConfig: OffsetConfig): void;
     getTooltipDataItemMappingCallback(): MappingDataItemCallback;
+    protected isCellType(cell?: Event_2['target']): boolean;
     getCell<T extends S2CellType_2 = S2CellType_2>(target: Event_2['target']): T;
     getCellType(target: Event_2['target']): CellTypes;
     /**
@@ -4271,7 +4422,11 @@ declare abstract class SpreadSheet_2 extends EE {
     protected updateContainerStyle(): void;
     protected initPanelGroupChildren(): void;
     getInitColumnLeafNodes(): Node_2_2[];
+    /**
+     * @deprecated 已废弃, 请使用 clearInitColumnLeafNodes
+     */
     clearColumnLeafNodes(): void;
+    clearInitColumnLeafNodes(): void;
     private initHiddenColumnsDetail;
     private clearCanvasEvent;
     /**
@@ -4335,14 +4490,14 @@ declare class Store {
 declare interface StoreKey {
     scrollX: number;
     scrollY: number;
-    hRowScrollX: number;
+    rowHeaderScrollX: number;
     sortParam: SortParam;
     drillDownIdPathMap: Map<string, number[][]>;
     drillDownNode: Node_2_2;
     drillItemsNum: number;
     drillDownFieldInLevel: PartDrillDownFieldInLevel[];
     interactionStateInfo: InteractionStateInfo;
-    originalDataCfg: S2DataConfig_2;
+    originalDataCfg: Partial<S2DataConfig_2>;
     panelBBox: BBox;
     activeResizeArea: Group;
     valueRanges: ValueRanges;
@@ -4375,7 +4530,7 @@ declare interface Style {
     device?: 'pc' | 'mobile';
 }
 
-export declare const TableSheet: DefineComponent<GetInitProps<SheetComponentProps, "onMounted" | "sheetType" | "spreadsheet" | "options" | "loading" | "partDrillDown" | "adaptive" | "showPagination" | "themeCfg" | "header" | "getSpreadSheet" | "onSheetUpdate" | "onRowCellHover" | "onRowCellClick" | "onRowCellDoubleClick" | "onRowCellContextMenu" | "onRowCellMouseDown" | "onRowCellMouseUp" | "onRowCellMouseMove" | "onRowCellCollapseTreeRows" | "onRowCellScroll" | "onColCellHover" | "onColCellClick" | "onColCellDoubleClick" | "onColCellContextMenu" | "onColCellMouseDown" | "onColCellMouseUp" | "onColCellMouseMove" | "onDataCellHover" | "onDataCellClick" | "onDataCellDoubleClick" | "onDataCellContextMenu" | "onDataCellMouseDown" | "onDataCellMouseUp" | "onDataCellMouseMove" | "onDataCellTrendIconClick" | "onDataCellBrushSelection" | "onDataCellSelectMove" | "onCornerCellHover" | "onCornerCellClick" | "onCornerCellDoubleClick" | "onCornerCellContextMenu" | "onCornerCellMouseDown" | "onCornerCellMouseUp" | "onCornerCellMouseMove" | "onMergedCellsHover" | "onMergedCellsClick" | "onMergedCellsDoubleClick" | "onMergedCellsContextMenu" | "onMergedCellsMouseDown" | "onMergedCellsMouseUp" | "onMergedCellsMouseMove" | "onRangeSort" | "onRangeSorted" | "onRangeFilter" | "onRangeFiltered" | "onLayoutAfterHeaderLayout" | "onLayoutPagination" | "onLayoutCellScroll" | "onLayoutCollapseRows" | "onLayoutAfterCollapseRows" | "onCollapseRowsAll" | "onLayoutColsExpanded" | "onLayoutColsHidden" | "onBeforeRender" | "onAfterRender" | "onDestroy" | "onLayoutResize" | "onLayoutResizeSeriesWidth" | "onLayoutResizeRowWidth" | "onLayoutResizeRowHeight" | "onLayoutResizeColWidth" | "onLayoutResizeColHeight" | "onLayoutResizeTreeWidth" | "onLayoutResizeMouseDown" | "onLayoutResizeMouseUp" | "onLayoutResizeMouseMove" | "onKeyBoardDown" | "onKeyBoardUp" | "onCopied" | "onActionIconHover" | "onActionIconHoverOff" | "onActionIconClick" | "onContextMenu" | "onClick" | "onHover" | "onDoubleClick" | "onMouseHover" | "onMouseUp" | "onMouseDown" | "onMouseMove" | "onSelected" | "onReset" | "onLinkFieldJump" | "onScroll" | "onLayoutAfterRealDataCellRender" | "onRowCellBrushSelection" | "onColCellBrushSelection">, {
+export declare const TableSheet: DefineComponent<GetInitProps<SheetComponentProps, "sheetType" | "spreadsheet" | "options" | "loading" | "partDrillDown" | "adaptive" | "showPagination" | "themeCfg" | "header" | "getSpreadSheet" | "onSheetUpdate" | "onRowCellHover" | "onRowCellClick" | "onRowCellDoubleClick" | "onRowCellContextMenu" | "onRowCellMouseDown" | "onRowCellMouseUp" | "onRowCellMouseMove" | "onRowCellCollapseTreeRows" | "onRowCellScroll" | "onColCellHover" | "onColCellClick" | "onColCellDoubleClick" | "onColCellContextMenu" | "onColCellMouseDown" | "onColCellMouseUp" | "onColCellMouseMove" | "onDataCellHover" | "onDataCellClick" | "onDataCellDoubleClick" | "onDataCellContextMenu" | "onDataCellMouseDown" | "onDataCellMouseUp" | "onDataCellMouseMove" | "onDataCellTrendIconClick" | "onDataCellBrushSelection" | "onDataCellSelectMove" | "onDataCellEditEnd" | "onCornerCellHover" | "onCornerCellClick" | "onCornerCellDoubleClick" | "onCornerCellContextMenu" | "onCornerCellMouseDown" | "onCornerCellMouseUp" | "onCornerCellMouseMove" | "onMergedCellsHover" | "onMergedCellsClick" | "onMergedCellsDoubleClick" | "onMergedCellsContextMenu" | "onMergedCellsMouseDown" | "onMergedCellsMouseUp" | "onMergedCellsMouseMove" | "onRangeSort" | "onRangeSorted" | "onRangeFilter" | "onRangeFiltered" | "onLayoutAfterHeaderLayout" | "onLayoutPagination" | "onLayoutCellScroll" | "onLayoutCollapseRows" | "onLayoutAfterCollapseRows" | "onCollapseRowsAll" | "onLayoutColsExpanded" | "onLayoutColsHidden" | "onBeforeRender" | "onAfterRender" | "onMounted" | "onDestroy" | "onLayoutResize" | "onLayoutResizeSeriesWidth" | "onLayoutResizeRowWidth" | "onLayoutResizeRowHeight" | "onLayoutResizeColWidth" | "onLayoutResizeColHeight" | "onLayoutResizeTreeWidth" | "onLayoutResizeMouseDown" | "onLayoutResizeMouseUp" | "onLayoutResizeMouseMove" | "onKeyBoardDown" | "onKeyBoardUp" | "onCopied" | "onActionIconHover" | "onActionIconHoverOff" | "onActionIconClick" | "onContextMenu" | "onClick" | "onHover" | "onDoubleClick" | "onMouseHover" | "onMouseUp" | "onMouseDown" | "onMouseMove" | "onSelected" | "onReset" | "onLinkFieldJump" | "onScroll" | "onLayoutAfterRealDataCellRender" | "onRowCellBrushSelection" | "onColCellBrushSelection">, {
 s2Ref: ShallowRef<SheetExpose>;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
 spreadsheet: (container: S2MountContainer_2, dataCfg: S2DataConfig_2, options: S2Options_2<TooltipContentType_2, Pagination_2, string | Element, string>) => SpreadSheet_2;
@@ -4393,7 +4548,7 @@ id: number;
 isCollapsed: boolean;
 node: Node_2_2;
 }) => void;
-rowCellScroll: (position: CellScrollPosition_2) => void;
+rowCellScroll: (position: Required<ScrollOffset_2>) => void;
 colCellHover: (data: TargetCellInfo_2) => void;
 colCellClick: (data: TargetCellInfo_2) => void;
 colCellDoubleClick: (data: TargetCellInfo_2) => void;
@@ -4411,6 +4566,7 @@ dataCellMouseMove: (data: TargetCellInfo_2) => void;
 dataCellTrendIconClick: (meta: ViewMeta_2) => void;
 dataCellBrushSelection: (brushRangeDataCells: DataCell_2[]) => void;
 dataCellSelectMove: (metas: CellMeta_2[]) => void;
+dataCellEditEnd: (meta: ViewMeta_2) => void;
 cornerCellHover: (data: TargetCellInfo_2) => void;
 cornerCellClick: (data: TargetCellInfo_2) => void;
 cornerCellDoubleClick: (data: TargetCellInfo_2) => void;
@@ -4439,7 +4595,7 @@ pageCount: number;
 total: number;
 current: number;
 }) => void;
-layoutCellScroll: (position: CellScrollPosition_2) => void;
+layoutCellScroll: (position: Required<ScrollOffset_2>) => void;
 layoutCollapseRows: (data: CollapsedRowsType_2) => void;
 layoutAfterCollapseRows: (data: CollapsedRowsType_2) => void;
 collapseRowsAll: (hierarchyCollapse: boolean) => void;
@@ -4491,7 +4647,7 @@ linkFieldJump: (data: {
 key: string;
 record: Data_2;
 }) => void;
-scroll: (position: CellScrollPosition_2) => void;
+scroll: (position: Required<ScrollOffset_2>) => void;
 layoutAfterRealDataCellRender: (options: {
 add: [number, number][];
 remove: [number, number][];
@@ -4499,8 +4655,7 @@ spreadsheet: SpreadSheet_2;
 }) => void;
 rowCellBrushSelection: (event: default_2) => void;
 colCellBrushSelection: (event: default_2) => void;
-}, string, VNodeProps & AllowedComponentProps & ComponentCustomProps, Readonly<ExtractPropTypes<GetInitProps<SheetComponentProps, "onMounted" | "sheetType" | "spreadsheet" | "options" | "loading" | "partDrillDown" | "adaptive" | "showPagination" | "themeCfg" | "header" | "getSpreadSheet" | "onSheetUpdate" | "onRowCellHover" | "onRowCellClick" | "onRowCellDoubleClick" | "onRowCellContextMenu" | "onRowCellMouseDown" | "onRowCellMouseUp" | "onRowCellMouseMove" | "onRowCellCollapseTreeRows" | "onRowCellScroll" | "onColCellHover" | "onColCellClick" | "onColCellDoubleClick" | "onColCellContextMenu" | "onColCellMouseDown" | "onColCellMouseUp" | "onColCellMouseMove" | "onDataCellHover" | "onDataCellClick" | "onDataCellDoubleClick" | "onDataCellContextMenu" | "onDataCellMouseDown" | "onDataCellMouseUp" | "onDataCellMouseMove" | "onDataCellTrendIconClick" | "onDataCellBrushSelection" | "onDataCellSelectMove" | "onCornerCellHover" | "onCornerCellClick" | "onCornerCellDoubleClick" | "onCornerCellContextMenu" | "onCornerCellMouseDown" | "onCornerCellMouseUp" | "onCornerCellMouseMove" | "onMergedCellsHover" | "onMergedCellsClick" | "onMergedCellsDoubleClick" | "onMergedCellsContextMenu" | "onMergedCellsMouseDown" | "onMergedCellsMouseUp" | "onMergedCellsMouseMove" | "onRangeSort" | "onRangeSorted" | "onRangeFilter" | "onRangeFiltered" | "onLayoutAfterHeaderLayout" | "onLayoutPagination" | "onLayoutCellScroll" | "onLayoutCollapseRows" | "onLayoutAfterCollapseRows" | "onCollapseRowsAll" | "onLayoutColsExpanded" | "onLayoutColsHidden" | "onBeforeRender" | "onAfterRender" | "onDestroy" | "onLayoutResize" | "onLayoutResizeSeriesWidth" | "onLayoutResizeRowWidth" | "onLayoutResizeRowHeight" | "onLayoutResizeColWidth" | "onLayoutResizeColHeight" | "onLayoutResizeTreeWidth" | "onLayoutResizeMouseDown" | "onLayoutResizeMouseUp" | "onLayoutResizeMouseMove" | "onKeyBoardDown" | "onKeyBoardUp" | "onCopied" | "onActionIconHover" | "onActionIconHoverOff" | "onActionIconClick" | "onContextMenu" | "onClick" | "onHover" | "onDoubleClick" | "onMouseHover" | "onMouseUp" | "onMouseDown" | "onMouseMove" | "onSelected" | "onReset" | "onLinkFieldJump" | "onScroll" | "onLayoutAfterRealDataCellRender" | "onRowCellBrushSelection" | "onColCellBrushSelection">>> & {
-onMounted?: (spreadsheet: SpreadSheet_2) => any;
+}, string, VNodeProps & AllowedComponentProps & ComponentCustomProps, Readonly<ExtractPropTypes<GetInitProps<SheetComponentProps, "sheetType" | "spreadsheet" | "options" | "loading" | "partDrillDown" | "adaptive" | "showPagination" | "themeCfg" | "header" | "getSpreadSheet" | "onSheetUpdate" | "onRowCellHover" | "onRowCellClick" | "onRowCellDoubleClick" | "onRowCellContextMenu" | "onRowCellMouseDown" | "onRowCellMouseUp" | "onRowCellMouseMove" | "onRowCellCollapseTreeRows" | "onRowCellScroll" | "onColCellHover" | "onColCellClick" | "onColCellDoubleClick" | "onColCellContextMenu" | "onColCellMouseDown" | "onColCellMouseUp" | "onColCellMouseMove" | "onDataCellHover" | "onDataCellClick" | "onDataCellDoubleClick" | "onDataCellContextMenu" | "onDataCellMouseDown" | "onDataCellMouseUp" | "onDataCellMouseMove" | "onDataCellTrendIconClick" | "onDataCellBrushSelection" | "onDataCellSelectMove" | "onDataCellEditEnd" | "onCornerCellHover" | "onCornerCellClick" | "onCornerCellDoubleClick" | "onCornerCellContextMenu" | "onCornerCellMouseDown" | "onCornerCellMouseUp" | "onCornerCellMouseMove" | "onMergedCellsHover" | "onMergedCellsClick" | "onMergedCellsDoubleClick" | "onMergedCellsContextMenu" | "onMergedCellsMouseDown" | "onMergedCellsMouseUp" | "onMergedCellsMouseMove" | "onRangeSort" | "onRangeSorted" | "onRangeFilter" | "onRangeFiltered" | "onLayoutAfterHeaderLayout" | "onLayoutPagination" | "onLayoutCellScroll" | "onLayoutCollapseRows" | "onLayoutAfterCollapseRows" | "onCollapseRowsAll" | "onLayoutColsExpanded" | "onLayoutColsHidden" | "onBeforeRender" | "onAfterRender" | "onMounted" | "onDestroy" | "onLayoutResize" | "onLayoutResizeSeriesWidth" | "onLayoutResizeRowWidth" | "onLayoutResizeRowHeight" | "onLayoutResizeColWidth" | "onLayoutResizeColHeight" | "onLayoutResizeTreeWidth" | "onLayoutResizeMouseDown" | "onLayoutResizeMouseUp" | "onLayoutResizeMouseMove" | "onKeyBoardDown" | "onKeyBoardUp" | "onCopied" | "onActionIconHover" | "onActionIconHoverOff" | "onActionIconClick" | "onContextMenu" | "onClick" | "onHover" | "onDoubleClick" | "onMouseHover" | "onMouseUp" | "onMouseDown" | "onMouseMove" | "onSelected" | "onReset" | "onLinkFieldJump" | "onScroll" | "onLayoutAfterRealDataCellRender" | "onRowCellBrushSelection" | "onColCellBrushSelection">>> & {
 onSheetUpdate?: (params: S2RenderOptions_2) => any;
 onRowCellHover?: (data: TargetCellInfo_2) => any;
 onRowCellClick?: (data: TargetCellInfo_2) => any;
@@ -4514,7 +4669,7 @@ id: number;
 isCollapsed: boolean;
 node: Node_2_2;
 }) => any;
-onRowCellScroll?: (position: CellScrollPosition_2) => any;
+onRowCellScroll?: (position: Required<ScrollOffset_2>) => any;
 onColCellHover?: (data: TargetCellInfo_2) => any;
 onColCellClick?: (data: TargetCellInfo_2) => any;
 onColCellDoubleClick?: (data: TargetCellInfo_2) => any;
@@ -4532,6 +4687,7 @@ onDataCellMouseMove?: (data: TargetCellInfo_2) => any;
 onDataCellTrendIconClick?: (meta: ViewMeta_2) => any;
 onDataCellBrushSelection?: (brushRangeDataCells: DataCell_2[]) => any;
 onDataCellSelectMove?: (metas: CellMeta_2[]) => any;
+onDataCellEditEnd?: (meta: ViewMeta_2) => any;
 onCornerCellHover?: (data: TargetCellInfo_2) => any;
 onCornerCellClick?: (data: TargetCellInfo_2) => any;
 onCornerCellDoubleClick?: (data: TargetCellInfo_2) => any;
@@ -4560,7 +4716,7 @@ pageCount: number;
 total: number;
 current: number;
 }) => any;
-onLayoutCellScroll?: (position: CellScrollPosition_2) => any;
+onLayoutCellScroll?: (position: Required<ScrollOffset_2>) => any;
 onLayoutCollapseRows?: (data: CollapsedRowsType_2) => any;
 onLayoutAfterCollapseRows?: (data: CollapsedRowsType_2) => any;
 onCollapseRowsAll?: (hierarchyCollapse: boolean) => any;
@@ -4571,6 +4727,7 @@ hiddenColumnsDetail: HiddenColumnsInfo_2[];
 }) => any;
 onBeforeRender?: () => any;
 onAfterRender?: () => any;
+onMounted?: (spreadsheet: SpreadSheet_2) => any;
 onDestroy?: () => any;
 onLayoutResize?: (params: ResizeParams_2) => any;
 onLayoutResizeSeriesWidth?: (params: ResizeParams_2) => any;
@@ -4611,7 +4768,7 @@ onLinkFieldJump?: (data: {
 key: string;
 record: Data_2;
 }) => any;
-onScroll?: (position: CellScrollPosition_2) => any;
+onScroll?: (position: Required<ScrollOffset_2>) => any;
 onLayoutAfterRealDataCellRender?: (options: {
 add: [number, number][];
 remove: [number, number][];
@@ -4621,7 +4778,7 @@ onRowCellBrushSelection?: (event: default_2) => any;
 onColCellBrushSelection?: (event: default_2) => any;
 onSpreadsheet?: (container: S2MountContainer_2, dataCfg: S2DataConfig_2, options: S2Options_2<TooltipContentType_2, Pagination_2, string | Element, string>) => any;
 onGetSpreadSheet?: (spreadsheet: SpreadSheet_2) => any;
-}, {}>;
+}, {}, {}>;
 
 declare interface TargetCellInfo_2 {
     target: S2CellType_2;
@@ -4638,7 +4795,7 @@ declare interface TextAlignCfg {
 
 declare type TextBaseline = 'top' | 'middle' | 'bottom';
 
-declare interface TextTheme extends TextAlignCfg {
+declare interface TextTheme extends TextAlignCfg, Pick<ShapeAttrs, 'fontStyle' | 'fontVariant'> {
     fontFamily?: string;
     fontSize?: number;
     fontWeight?: number | 'normal' | 'bold' | 'bolder' | 'lighter';
@@ -4730,6 +4887,7 @@ declare interface TooltipOptions<Icon = Element | string, Text = string> {
     onlyMenu?: boolean;
     enableFormat?: boolean;
     forceRender?: boolean;
+    data?: TooltipData;
 }
 
 declare interface TooltipPosition {
@@ -4752,11 +4910,14 @@ declare type TooltipShowOptions<T = TooltipContentType_2, Icon = Element | strin
 };
 
 declare interface TooltipSummaryOptions {
-    name: string;
-    value: number | string;
+    name: string | null;
     selectedData: TooltipDataItem[];
+    value: TooltipSummaryOptionsValue;
+    originValue?: TooltipSummaryOptionsValue;
 }
 
+declare type TooltipSummaryOptionsValue = number | string | undefined | null;
+
 declare interface Total {
     /** 是否显示总计 */
     showGrandTotals: boolean;
@@ -4775,6 +4936,10 @@ declare interface Total {
     reverseSubLayout: boolean;
     label?: string;
     subLabel?: string;
+    /** 总计分组维度 */
+    totalsGroupDimensions?: string[];
+    /** 小计分组维度 */
+    subTotalsGroupDimensions?: string[];
 }
 
 /**
@@ -4787,6 +4952,13 @@ declare interface Totals {
     col?: Partial<Total>;
 }
 
+declare interface TotalStatus {
+    isRowTotal: boolean;
+    isRowSubTotal: boolean;
+    isColTotal: boolean;
+    isColSubTotal: boolean;
+}
+
 export declare const useExpose: (expose: (exposed?: Record<string, any>) => void) => ShallowRef<SheetExpose>;
 
 declare interface ValueRange {
@@ -4796,6 +4968,8 @@ declare interface ValueRange {
 
 declare type ValueRanges = Record<string, ValueRange>;
 
+export declare const version = "@antv/s2-vue-v1.6.1";
+
 declare interface ViewCellHeights {
     getCellOffsetY: (index: number) => number;
     getTotalHeight: () => number;
@@ -4819,15 +4993,15 @@ declare interface ViewMeta_2 {
     valueField: string;
     fieldValue: DataItem;
     isTotals?: boolean;
-    rowQuery?: Record<string, any>;
-    colQuery?: Record<string, any>;
+    rowQuery?: Query;
+    colQuery?: Query;
     rowId?: string;
     colId?: string;
     field?: string;
     isFrozenCorner?: boolean;
     label?: string;
     value?: string | number;
-    query?: Record<string, any>;
+    query?: Query;
     [key: string]: unknown;
 }