@antv/s2-vue 1.1.0 → 1.2.0-alpha.1

package/dist/style.min.css

@@ -1 +1 @@
-.antv-s2-tooltip-operator{color:#000000a6;font-size:12px;line-height:32px;background:#f9f9f9;padding:0 12px;border:0;cursor:pointer}.antv-s2-tooltip-operator .ant-dropdown-trigger,.antv-s2-tooltip-operator-dropdown{padding:0 6px 0 0}.antv-s2-tooltip-operator-menus.ant-menu-vertical.ant-menu{font-size:12px;line-height:32px;color:#000000a6;border:0;margin:0 -12px}.antv-s2-tooltip-operator-menus.ant-menu-vertical.ant-menu .ant-menu-item{height:30px}.antv-s2-tooltip-operator-menus.ant-menu-vertical.ant-menu .ant-menu-item:not(:last-child){margin:0}.antv-s2-tooltip-operator-menus.ant-menu-vertical.ant-menu .ant-menu-submenu>.ant-menu-submenu-title{height:30px}.antv-s2-tooltip-operator-menus.ant-menu-vertical.ant-menu .ant-menu-submenu>.ant-menu-submenu-title .ant-menu-submenu-arrow{color:#000000a6}.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-dropdown-menu-item,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-dropdown-menu-item,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-menu-item,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-menu-item{font-size:12px;line-height:32px;padding:0 12px;color:#000000a6;border:0;margin:0}.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-dropdown-menu-submenu .ant-menu-submenu-title,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-dropdown-menu-submenu .ant-menu-submenu-title,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-dropdown-menu-submenu-vertical .ant-menu-submenu-title,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-dropdown-menu-submenu-vertical .ant-menu-submenu-title,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-menu-submenu .ant-menu-submenu-title,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-menu-submenu .ant-menu-submenu-title,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-menu-submenu-vertical .ant-menu-submenu-title,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-menu-submenu-vertical .ant-menu-submenu-title{padding:0 12px;font-size:12px;line-height:32px;color:#000000a6;margin:0}.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-dropdown-menu-submenu .ant-menu-submenu-title .ant-dropdown-menu-title-content,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-dropdown-menu-submenu .ant-menu-submenu-title .ant-dropdown-menu-title-content,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-dropdown-menu-submenu-vertical .ant-menu-submenu-title .ant-dropdown-menu-title-content,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-dropdown-menu-submenu-vertical .ant-menu-submenu-title .ant-dropdown-menu-title-content,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-menu-submenu .ant-menu-submenu-title .ant-dropdown-menu-title-content,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-menu-submenu .ant-menu-submenu-title .ant-dropdown-menu-title-content,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-menu-submenu-vertical .ant-menu-submenu-title .ant-dropdown-menu-title-content,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-menu-submenu-vertical .ant-menu-submenu-title .ant-dropdown-menu-title-content,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-dropdown-menu-submenu .ant-menu-submenu-title .ant-menu-title-content,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-dropdown-menu-submenu .ant-menu-submenu-title .ant-menu-title-content,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-dropdown-menu-submenu-vertical .ant-menu-submenu-title .ant-menu-title-content,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-dropdown-menu-submenu-vertical .ant-menu-submenu-title .ant-menu-title-content,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-menu-submenu .ant-menu-submenu-title .ant-menu-title-content,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-menu-submenu .ant-menu-submenu-title .ant-menu-title-content,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-menu-submenu-vertical .ant-menu-submenu-title .ant-menu-title-content,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-menu-submenu-vertical .ant-menu-submenu-title .ant-menu-title-content{margin-right:12px}.antv-s2-tooltip-operator-submenu-popup .ant-dropdown-menu-item,.antv-s2-tooltip-operator-submenu-popup .ant-menu-item{font-size:12px;line-height:32px;padding:0 12px;color:#000000a6}.antv-s2-tooltip-operator-submenu-popup .ant-menu-vertical .ant-menu-item{margin:0;height:30px;line-height:32px}.antv-s2-tooltip-operator-submenu-popup .ant-menu-vertical .ant-menu-item:not(:last-child){margin:0}.antv-s2-tooltip-operator-icon{vertical-align:middle;margin-right:4px}.antv-s2-tooltip-operator-icon svg{width:12px;height:12px}.antv-s2-tooltip-container{position:fixed;user-select:text;min-width:200px;max-width:640px;max-height:100vh;overflow:auto;z-index:1024;display:inline-block;background:rgba(255,255,255,.96);border-radius:2px;box-shadow:0 1px 4px #0003;font-size:12px;font-family:Roboto,PingFang SC,Chinese Quote,BlinkMacSystemFont,Segoe UI,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif}.antv-s2-tooltip-container-hide{opacity:0;visibility:hidden;pointer-events:none}.antv-s2-tooltip-container-hide *{transition:none}.antv-s2-tooltip-container-show{opacity:1;visibility:visible;pointer-events:all}.antv-s2-tooltip-tips,.antv-s2-tooltip-name{padding:12px;line-height:16px;overflow-wrap:break-word;color:#000000d9}.antv-s2-tooltip-tips{padding:4px 12px;color:#00000073}.antv-s2-tooltip-infos{padding:4px 12px;line-height:20px;color:#00000073;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:2;display:-webkit-box;-webkit-box-orient:vertical;overflow-wrap:break-word;background:rgba(249,249,249,.96);border-radius:0 0 2px 2px;background-color:#f9f9f9}.antv-s2-tooltip-summary{line-height:20px;color:#000000a6;overflow:hidden;padding:12px}.antv-s2-tooltip-summary-item{display:flex}.antv-s2-tooltip-summary-key{margin-right:20px}.antv-s2-tooltip-summary-val{flex:1;text-align:right;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.antv-s2-tooltip-interpretation{color:#000000a6;overflow:hidden;padding:12px}.antv-s2-tooltip-interpretation+.antv-s2-tooltip-head-info-list{border-top:1px solid #e9e9e9}.antv-s2-tooltip-interpretation .antv-s2-tooltip-interpretation-head{margin-bottom:12px}.antv-s2-tooltip-interpretation .antv-s2-tooltip-interpretation-head .antv-s2-tooltip-interpretation-icon{width:14px;height:14px}.antv-s2-tooltip-interpretation .antv-s2-tooltip-interpretation-head .antv-s2-tooltip-interpretation-name{color:#000}.antv-s2-tooltip-head-info-list{color:#a2a2a2;padding:12px 12px 4px;line-height:20px}.antv-s2-tooltip-bold,.antv-s2-tooltip-selected{font-weight:700}.antv-s2-tooltip-selected{margin-right:5px}.antv-s2-tooltip-highlight{color:#000000d9}.antv-s2-tooltip-detail-list{padding:2px 12px 8px}.antv-s2-tooltip-detail-list .antv-s2-tooltip-detail-item{color:#000000a6;overflow:hidden;margin:4px 0;display:flex;justify-content:space-around;align-items:center}.antv-s2-tooltip-detail-list .antv-s2-tooltip-detail-item-key{margin-right:20px}.antv-s2-tooltip-detail-list .antv-s2-tooltip-detail-item-val{flex:1;text-align:right;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.ant-dropdown-menu-item.operation-item{font-size:12px}.antv-s2-spin.ant-spin-nested-loading,.antv-s2-spin>.ant-spin-container{height:100%}.antv-s2-wrapper{padding:0;margin:0;display:flex;flex-direction:column;height:100%}.antv-s2-container{overflow:auto;flex:1 1 auto}.antv-s2-container canvas{display:block}.antv-s2-pagination{display:flex;align-items:center;z-index:1024}.antv-s2-pagination-count{margin-left:12px;text-overflow:ellipsis;white-space:nowrap;max-width:64px}.s2-drill-down[data-v-6eb1ccd0]{width:260px;min-height:20px;position:relative}.s2-drill-down-header[data-v-6eb1ccd0]{display:flex;height:32px;font-size:14px;padding:0 16px;margin-top:16px}.s2-drill-down-header button[data-v-6eb1ccd0]{position:absolute;right:0;top:-4px;font-size:12px;color:#1890ff;letter-spacing:-.2px;line-height:20px}.s2-drill-down-search[data-v-6eb1ccd0]{height:24px;width:228px!important;margin:0 16px;border:1px solid rgba(0,0,0,.15);border-radius:2px;background-color:#fff}.s2-drill-down-search input[data-v-6eb1ccd0],.s2-drill-down-search span[data-v-6eb1ccd0]{font-size:12px}.s2-drill-down-menu[data-v-6eb1ccd0]{max-height:314px;overflow-y:auto;overflow-x:hidden}.s2-drill-down-menu-item[data-v-6eb1ccd0]{height:32px!important;line-height:32px!important;font-size:12px;opacity:.65}.s2-drill-down-menu-item span[data-v-6eb1ccd0]:last-child{line-height:32px}.s2-drill-down-menu-item svg[data-v-6eb1ccd0]{margin-right:8px}.s2-drill-down-empty[data-v-6eb1ccd0]{padding:18px 18px 0;font-size:12px}
+.antv-s2-tooltip-operator{color:#000000a6;font-size:12px;line-height:32px;background:#f9f9f9;padding:0 12px;border:0;cursor:pointer}.antv-s2-tooltip-operator .ant-dropdown-trigger,.antv-s2-tooltip-operator-dropdown{padding:0 6px 0 0}.antv-s2-tooltip-operator-menus.ant-menu-vertical.ant-menu{font-size:12px;line-height:32px;color:#000000a6;border:0;margin:0 -12px}.antv-s2-tooltip-operator-menus.ant-menu-vertical.ant-menu .ant-menu-item{height:30px}.antv-s2-tooltip-operator-menus.ant-menu-vertical.ant-menu .ant-menu-item:not(:last-child){margin:0}.antv-s2-tooltip-operator-menus.ant-menu-vertical.ant-menu .ant-menu-submenu>.ant-menu-submenu-title{height:30px}.antv-s2-tooltip-operator-menus.ant-menu-vertical.ant-menu .ant-menu-submenu>.ant-menu-submenu-title .ant-menu-submenu-arrow{color:#000000a6}.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-dropdown-menu-item,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-dropdown-menu-item,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-menu-item,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-menu-item{font-size:12px;line-height:32px;padding:0 12px;color:#000000a6;border:0;margin:0}.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-dropdown-menu-submenu .ant-menu-submenu-title,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-dropdown-menu-submenu .ant-menu-submenu-title,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-dropdown-menu-submenu-vertical .ant-menu-submenu-title,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-dropdown-menu-submenu-vertical .ant-menu-submenu-title,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-menu-submenu .ant-menu-submenu-title,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-menu-submenu .ant-menu-submenu-title,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-menu-submenu-vertical .ant-menu-submenu-title,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-menu-submenu-vertical .ant-menu-submenu-title{padding:0 12px;font-size:12px;line-height:32px;color:#000000a6;margin:0}.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-dropdown-menu-submenu .ant-menu-submenu-title .ant-dropdown-menu-title-content,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-dropdown-menu-submenu .ant-menu-submenu-title .ant-dropdown-menu-title-content,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-dropdown-menu-submenu-vertical .ant-menu-submenu-title .ant-dropdown-menu-title-content,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-dropdown-menu-submenu-vertical .ant-menu-submenu-title .ant-dropdown-menu-title-content,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-menu-submenu .ant-menu-submenu-title .ant-dropdown-menu-title-content,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-menu-submenu .ant-menu-submenu-title .ant-dropdown-menu-title-content,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-menu-submenu-vertical .ant-menu-submenu-title .ant-dropdown-menu-title-content,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-menu-submenu-vertical .ant-menu-submenu-title .ant-dropdown-menu-title-content,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-dropdown-menu-submenu .ant-menu-submenu-title .ant-menu-title-content,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-dropdown-menu-submenu .ant-menu-submenu-title .ant-menu-title-content,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-dropdown-menu-submenu-vertical .ant-menu-submenu-title .ant-menu-title-content,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-dropdown-menu-submenu-vertical .ant-menu-submenu-title .ant-menu-title-content,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-menu-submenu .ant-menu-submenu-title .ant-menu-title-content,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-menu-submenu .ant-menu-submenu-title .ant-menu-title-content,.antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-menu-submenu-vertical .ant-menu-submenu-title .ant-menu-title-content,.antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-menu-submenu-vertical .ant-menu-submenu-title .ant-menu-title-content{margin-right:12px}.antv-s2-tooltip-operator-submenu-popup .ant-dropdown-menu-item,.antv-s2-tooltip-operator-submenu-popup .ant-menu-item{font-size:12px;line-height:32px;padding:0 12px;color:#000000a6}.antv-s2-tooltip-operator-submenu-popup .ant-menu-vertical .ant-menu-item{margin:0;height:30px;line-height:32px}.antv-s2-tooltip-operator-submenu-popup .ant-menu-vertical .ant-menu-item:not(:last-child){margin:0}.antv-s2-tooltip-operator-icon{vertical-align:middle;margin-right:4px}.antv-s2-tooltip-operator-icon svg{width:12px;height:12px}.antv-s2-tooltip-container{position:fixed;user-select:text;min-width:200px;max-width:640px;max-height:100vh;overflow:auto;z-index:1024;display:inline-block;background:rgba(255,255,255,.96);border-radius:2px;box-shadow:0 1px 4px #0003;font-size:12px;font-family:Roboto,PingFang SC,Chinese Quote,BlinkMacSystemFont,Segoe UI,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif}.antv-s2-tooltip-container-hide{opacity:0;visibility:hidden;pointer-events:none}.antv-s2-tooltip-container-hide *{transition:none}.antv-s2-tooltip-container-show{opacity:1;visibility:visible;pointer-events:all}.antv-s2-tooltip-tips,.antv-s2-tooltip-name{padding:12px;line-height:16px;overflow-wrap:break-word;color:#000000d9}.antv-s2-tooltip-description{padding:0 12px 12px;line-height:16px;overflow-wrap:break-word;color:#000000a6}.antv-s2-tooltip-tips{padding:4px 12px;color:#00000073}.antv-s2-tooltip-infos{padding:4px 12px;line-height:20px;color:#00000073;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:2;display:-webkit-box;-webkit-box-orient:vertical;overflow-wrap:break-word;background:rgba(249,249,249,.96);border-radius:0 0 2px 2px;background-color:#f9f9f9}.antv-s2-tooltip-summary{line-height:20px;color:#000000a6;overflow:hidden;padding:12px}.antv-s2-tooltip-summary-item{display:flex}.antv-s2-tooltip-summary-key{margin-right:20px}.antv-s2-tooltip-summary-val{flex:1;text-align:right;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.antv-s2-tooltip-interpretation{color:#000000a6;overflow:hidden;padding:12px}.antv-s2-tooltip-interpretation+.antv-s2-tooltip-head-info-list{border-top:1px solid #e9e9e9}.antv-s2-tooltip-interpretation .antv-s2-tooltip-interpretation-head{margin-bottom:12px}.antv-s2-tooltip-interpretation .antv-s2-tooltip-interpretation-head .antv-s2-tooltip-interpretation-icon{width:14px;height:14px}.antv-s2-tooltip-interpretation .antv-s2-tooltip-interpretation-head .antv-s2-tooltip-interpretation-name{color:#000}.antv-s2-tooltip-head-info-list{color:#a2a2a2;padding:12px 12px 4px;line-height:20px}.antv-s2-tooltip-bold,.antv-s2-tooltip-selected{font-weight:700}.antv-s2-tooltip-selected{margin-right:5px}.antv-s2-tooltip-highlight{color:#000000d9}.antv-s2-tooltip-detail-list{padding:2px 12px 8px}.antv-s2-tooltip-detail-list .antv-s2-tooltip-detail-item{color:#000000a6;overflow:hidden;margin:4px 0;display:flex;justify-content:space-around;align-items:center}.antv-s2-tooltip-detail-list .antv-s2-tooltip-detail-item-key{margin-right:20px}.antv-s2-tooltip-detail-list .antv-s2-tooltip-detail-item-val{flex:1;text-align:right;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.ant-dropdown-menu-item.operation-item{font-size:12px}.antv-s2-spin.ant-spin-nested-loading,.antv-s2-spin>.ant-spin-container{height:100%}.antv-s2-wrapper{padding:0;margin:0;display:flex;flex-direction:column;height:100%}.antv-s2-container{overflow:auto;flex:1 1 auto}.antv-s2-container canvas{display:block}.antv-s2-pagination{display:flex;align-items:center;z-index:1024}.antv-s2-pagination-count{margin-left:12px;text-overflow:ellipsis;white-space:nowrap;max-width:64px}.s2-drill-down[data-v-6eb1ccd0]{width:260px;min-height:20px;position:relative}.s2-drill-down-header[data-v-6eb1ccd0]{display:flex;height:32px;font-size:14px;padding:0 16px;margin-top:16px}.s2-drill-down-header button[data-v-6eb1ccd0]{position:absolute;right:0;top:-4px;font-size:12px;color:#1890ff;letter-spacing:-.2px;line-height:20px}.s2-drill-down-search[data-v-6eb1ccd0]{height:24px;width:228px!important;margin:0 16px;border:1px solid rgba(0,0,0,.15);border-radius:2px;background-color:#fff}.s2-drill-down-search input[data-v-6eb1ccd0],.s2-drill-down-search span[data-v-6eb1ccd0]{font-size:12px}.s2-drill-down-menu[data-v-6eb1ccd0]{max-height:314px;overflow-y:auto;overflow-x:hidden}.s2-drill-down-menu-item[data-v-6eb1ccd0]{height:32px!important;line-height:32px!important;font-size:12px;opacity:.65}.s2-drill-down-menu-item span[data-v-6eb1ccd0]:last-child{line-height:32px}.s2-drill-down-menu-item svg[data-v-6eb1ccd0]{margin-right:8px}.s2-drill-down-empty[data-v-6eb1ccd0]{padding:18px 18px 0;font-size:12px}

package/esm/index.d.ts

@@ -18,6 +18,7 @@ import EE from '@antv/event-emitter';
 import { Event as Event_2 } from '@antv/g-canvas';
 import { ExtractPropTypes } from 'vue';
 import type { GEvent } from '@antv/s2';
+import { GM } from '@antv/g-gesture';
 import { Group } from '@antv/g-canvas';
 import { HiddenColumnsInfo } from '@antv/s2';
 import type { IElement } from '@antv/g-canvas';
@@ -67,6 +68,12 @@ declare interface Background {
     color?: string;
 }
 
+declare interface BarTheme {
+    intervalPadding?: number;
+    fill?: string;
+    opacity?: number;
+}
+
 declare abstract class BaseBBox implements BBox {
     protected spreadsheet: SpreadSheet_2;
     protected facet: BaseFacet;
@@ -268,6 +275,9 @@ declare interface BaseDrillDownComponentProps<DataSet = BaseDataSet> {
 declare abstract class BaseEvent {
     spreadsheet: SpreadSheet_2;
     constructor(spreadsheet: SpreadSheet_2);
+    getCellAppendInfo<T extends Record<string, any> = CellAppendInfo>(eventTarget: Event_2['target']): T;
+    isLinkFieldText: (eventTarget: Event_2['target']) => boolean;
+    reset(): void;
     abstract bindEvents(): void;
 }
 
@@ -451,6 +461,7 @@ declare abstract class BaseFacet {
      * @protected
      */
     protected dynamicRenderCell(): void;
+    private putMergedCellsGroupToFront;
     private emitScrollEvent;
     protected onAfterScroll: DebouncedFunc<() => void>;
     protected saveInitColumnLeafNodes(columnNodes?: Node_2_2[]): void;
@@ -1002,7 +1013,7 @@ declare interface BaseTooltipConfig<T = TooltipContentType> {
     renderTooltip?: (spreadsheet: SpreadSheet_2) => BaseTooltip;
     adjustPosition?: (positionInfo: TooltipPositionInfo) => TooltipPosition;
     getContainer?: () => HTMLElement;
-    className?: string;
+    className?: string | string[];
     style?: CSS_2.Properties;
 }
 
@@ -1036,6 +1047,11 @@ declare interface CalcTotals {
 
 declare type CanvasEventHandler = (event: Event_2) => void;
 
+declare interface CellAppendInfo<T = Node_2_2> extends Partial<ResizeInfo_2> {
+    isLinkFieldText?: boolean;
+    cellData?: T;
+}
+
 declare enum CellBorderPosition {
     TOP = "TOP",
     BOTTOM = "BOTTOM",
@@ -1051,9 +1067,6 @@ declare interface CellCfg {
     valuesCfg?: {
         originalValueField?: string;
         widthPercent?: number[];
-        conditions?: {
-            text: Condition;
-        };
     };
 }
 
@@ -1108,8 +1121,8 @@ declare enum CellTypes {
 
 declare class ColCell extends HeaderCell {
     protected headerConfig: ColHeaderConfig;
-    /** 文字区域（含icon）绘制起始坐标 */
-    protected textAreaPosition: Point;
+    /** 文字绘制起始坐标 */
+    protected textPosition: Point;
     get cellType(): CellTypes;
     protected initCell(): void;
     protected drawBackgroundShape(): void;
@@ -1129,17 +1142,22 @@ declare class ColCell extends HeaderCell {
         y: number;
     };
     protected drawVerticalResizeArea(): void;
-    private drawResizeArea;
+    protected drawResizeArea(): void;
     protected drawHorizontalBorder(): void;
     protected drawVerticalBorder(dir: CellBorderPosition): void;
     protected drawBorders(): void;
     protected hasHiddenColumnCell(): boolean;
-    private getExpandIconTheme;
-    private addExpandColumnSplitLine;
-    private addExpandColumnIconShapes;
-    private addExpandColumnIcon;
-    private getExpandColumnIconConfig;
-    private isLastColumn;
+    protected getExpandIconTheme(): IconTheme;
+    protected addExpandColumnSplitLine(): void;
+    protected addExpandColumnIconShapes(): void;
+    protected addExpandColumnIcon(): void;
+    protected getExpandColumnIconConfig(): {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    };
+    protected isLastColumn(): boolean;
 }
 
 declare interface ColCfg {
@@ -1188,7 +1206,7 @@ declare type CollapsedRowsType_2 = {
  * One field can hold a condition
  */
 declare interface Condition {
-    field: string | RegExp;
+    field?: string | RegExp;
     mapping: MappingFunction;
 }
 
@@ -1217,19 +1235,19 @@ declare class CornerCell extends HeaderCell {
     /**
      * 绘制折叠展开的icon
      */
-    private drawTreeIcon;
-    private drawBackgroundShape;
+    protected drawTreeIcon(): void;
+    protected drawBackgroundShape(): void;
     /**
      * Render cell horizontalBorder border
-     * @private
+     * @protected
      */
     protected drawBorderShape(): void;
-    private isLastRowCornerCell;
-    private getResizeAreaEffect;
-    private drawResizeArea;
-    private showTreeIcon;
+    protected isLastRowCornerCell(): boolean;
+    protected getResizeAreaEffect(): ResizeAreaEffect.Field | ResizeAreaEffect.Tree | ResizeAreaEffect.Series;
+    protected drawResizeArea(): void;
+    protected showTreeIcon(): boolean;
     protected getIconPosition(): Point;
-    private getTreeIconWidth;
+    protected getTreeIconWidth(): number;
     protected getTextStyle(): TextTheme;
     protected getMaxTextWidth(): number;
     protected getTextPosition(): Point;
@@ -1333,7 +1351,7 @@ declare class DataCell_2 extends BaseCell<ViewMeta_2> {
     protected drawConditionIconShapes(): void;
     /**
      * Draw interval condition shape
-     * @private
+     * @protected
      */
     protected drawConditionIntervalShape(): void;
     getBackgroundColor(): {
@@ -1352,10 +1370,10 @@ declare class DataCell_2 extends BaseCell<ViewMeta_2> {
      * Draw interactive color
      */
     protected drawInteractiveBgShape(): void;
-    private changeRowColSelectState;
+    protected changeRowColSelectState(indexType: ViewMetaIndexType): void;
     /**
      * Render cell border controlled by verticalBorder & horizontalBorder
-     * @private
+     * @protected
      */
     protected drawBorderShape(): void;
     /**
@@ -1949,8 +1967,7 @@ declare type Margin = Padding;
  */
 declare class MergedCell extends DataCell_2 {
     cells: S2CellType[];
-    isPartiallyVisible: boolean;
-    constructor(spreadsheet: SpreadSheet_2, cells: S2CellType[], meta?: ViewMeta_2, isPartiallyVisible?: boolean);
+    constructor(spreadsheet: SpreadSheet_2, cells: S2CellType[], meta?: ViewMeta_2);
     handleRestOptions(...[cells]: [S2CellType[]]): void;
     get cellType(): CellTypes;
     update(): void;
@@ -1985,12 +2002,14 @@ declare type MiniChartData = BaseChartData | BulletValue;
 
 declare interface MiniChartTheme {
     line?: LineTheme;
+    bar?: BarTheme;
     bullet?: BulletTheme;
 }
 
 /** mini 图类型 */
 declare enum MiniChartTypes {
     Line = "line",
+    Bar = "bar",
     Bullet = "bullet"
 }
 
@@ -2566,6 +2585,7 @@ declare class RootInteraction {
     constructor(spreadsheet: SpreadSheet_2);
     destroy(): void;
     reset(): void;
+    private onTriggerInteractionsResetEffect;
     setState(interactionStateInfo: InteractionStateInfo): void;
     getState(): InteractionStateInfo;
     setInteractedCells(cell: S2CellType): void;
@@ -2614,15 +2634,15 @@ declare class RootInteraction {
 
 declare class RowCell extends HeaderCell {
     protected headerConfig: RowHeaderConfig;
-    private gm;
+    protected gm: GM;
     get cellType(): CellTypes;
     destroy(): void;
     protected initCell(): void;
     protected drawBackgroundShape(): void;
     protected drawInteractiveBgShape(): void;
-    private showTreeIcon;
-    private showTreeLeafNodeAlignDot;
-    private getParentTreeIconCfg;
+    protected showTreeIcon(): boolean;
+    protected showTreeLeafNodeAlignDot(): boolean;
+    protected getParentTreeIconCfg(): any;
     protected drawTreeIcon(): void;
     protected drawTreeLeafNodeAlignDot(): void;
     protected drawTextShape(): void;
@@ -2639,9 +2659,14 @@ declare class RowCell extends HeaderCell {
         y: any;
     };
     protected getMaxTextWidth(): number;
-    private getTextArea;
+    protected getTextArea(): {
+        x: number;
+        width: number;
+        y: number;
+        height: number;
+    };
     protected getTextPosition(): Point;
-    private getIconYPosition;
+    protected getIconYPosition(): number;
 }
 
 declare type RowCellCollapseTreeRowsType = {
@@ -3796,6 +3821,7 @@ declare abstract class SpreadSheet_2 extends EE {
     backgroundGroup: IGroup;
     panelGroup: IGroup;
     panelScrollGroup: PanelScrollGroup;
+    mergedCellsGroup: IGroup;
     frozenRowGroup: FrozenGroup_2;
     frozenColGroup: FrozenGroup_2;
     frozenTrailingRowGroup: FrozenGroup_2;
@@ -3869,13 +3895,8 @@ declare abstract class SpreadSheet_2 extends EE {
     setOptions(options: Partial<S2Options_2>): void;
     render(reloadData?: boolean, options?: S2RenderOptions_2): void;
     destroy(): void;
-    /**
-     * Update theme config, if the {@param type} is exists, re-use it,
-     * otherwise create new one {@see theme}
-     * @param type string
-     * @param theme
-     */
     setThemeCfg(themeCfg?: ThemeCfg_2): void;
+    setTheme(theme: S2Theme): void;
     /**
      * Update pagination config which store in {@see options}
      * @param pagination
@@ -4286,6 +4307,7 @@ declare type TooltipData = {
     interpretation?: TooltipInterpretationOptions;
     colIndex?: number;
     rowIndex?: number;
+    description?: string;
 };
 
 declare type TooltipDataItem = Record<string, any>;
@@ -4432,4 +4454,6 @@ declare interface ViewMeta_2 {
     [key: string]: unknown;
 }
 
+declare type ViewMetaIndexType = keyof Pick<ViewMeta_2, 'colIndex' | 'rowIndex'>;
+
 export { }