@visactor/vtable 1.22.5-alpha.1 → 1.22.5-alpha.2

package/cjs/ts-types/theme.d.ts

@@ -126,16 +126,16 @@ export interface ITableThemeDefine {
     axisStyle?: {
         defaultAxisStyle?: Omit<ICellAxisOption, 'type' | 'domain' | 'range' | 'orient' | '__ticksForVTable'>;
         leftAxisStyle?: Omit<ICellAxisOption, 'type' | 'domain' | 'range' | 'orient' | '__ticksForVTable'> & {
-            cellPaddingLeft: number;
+            cellPaddingLeft?: number;
         };
         rightAxisStyle?: Omit<ICellAxisOption, 'type' | 'domain' | 'range' | 'orient' | '__ticksForVTable'> & {
-            cellPaddingRight: number;
+            cellPaddingRight?: number;
         };
         topAxisStyle?: Omit<ICellAxisOption, 'type' | 'domain' | 'range' | 'orient' | '__ticksForVTable'> & {
-            cellPaddingTop: number;
+            cellPaddingTop?: number;
         };
         bottomAxisStyle?: Omit<ICellAxisOption, 'type' | 'domain' | 'range' | 'orient' | '__ticksForVTable'> & {
-            cellPaddingBottom: number;
+            cellPaddingBottom?: number;
         };
     };
     checkboxStyle?: CheckboxStyle;

package/cjs/ts-types/theme.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/ts-types/theme.ts"],"names":[],"mappings":"","file":"theme.js","sourcesContent":["/* eslint-disable sort-imports */\nimport type { ColorsDef, LineDashsDef, LineWidthsDef, LineWidthsPropertyDefine, LineDashsPropertyDefine } from '.';\nimport type { ButtonStyle, CheckboxStyle, ITextStyleOption, RadioStyle, SwitchStyle } from './column/style';\nimport type { ColorPropertyDefine, ColorsPropertyDefine } from './style-define';\nimport type { ICellAxisOption } from './component/axis';\nimport type { PopTipAttributes } from './../vrender';\n// ****** Custom Theme *******\nexport type PartialTableThemeDefine = Partial<ITableThemeDefine>;\nexport type ThemeStyle = ITextStyleOption & {\n  hover?: Omit<InteractionStyle, 'cellBorderColor' | 'cellBorderLineWidth'>; //鼠标hover到某个单元格\n  select?: {\n    inlineRowBgColor?: ColorPropertyDefine; //交互所在整行的背景颜色\n    inlineColumnBgColor?: ColorPropertyDefine; //交互所在整列的背景颜色\n    cellBgColor?: ColorPropertyDefine; //交互所在单元格的背景颜色\n  };\n  frameStyle?: FrameStyle;\n};\nexport type InteractionStyle = {\n  cellBorderColor?: ColorsPropertyDefine; //交互所在单元格的边框颜色\n  cellBorderLineWidth?: LineWidthsPropertyDefine;\n  // cellBorderLineDash?:LineDashsPropertyDefine,//用到的场景应该不多\n  cellBgColor?: ColorPropertyDefine; //交互所在单元格的背景颜色\n  // inlineRowBorderColor?: ColorsPropertyDefine,//交互所在整行的边框颜色\n  inlineRowBgColor?: ColorPropertyDefine; //交互所在整行的背景颜色\n  // inlineColBorderColor?: ColorsPropertyDefine,//交互所在整列的边框颜色\n  inlineColumnBgColor?: ColorPropertyDefine; //交互所在整列的背景颜色\n  // headerHighlightBorderColor?:ColorPropertyDefine,//表头底部高亮线\n};\nexport type FrameStyle = {\n  borderColor?: ColorsDef;\n  borderLineWidth?: LineWidthsDef;\n  borderLineDash?: LineDashsDef;\n  innerBorder?: boolean;\n};\nexport type TableFrameStyle = FrameStyle & {\n  shadowBlur?: number; //阴影宽度\n  shadowOffsetX?: number; //x方向偏移\n  shadowOffsetY?: number; //Y方向偏移\n  shadowColor?: string; //阴影颜色\n  cornerRadius?: number | [number, number, number, number]; //边框圆角半径\n};\nexport type menuStyle = {\n  color?: string;\n  highlightColor?: string;\n  fontSize?: number;\n  fontFamily?: string;\n  highlightFontSize?: number;\n  highlightFontFamily?: string;\n  hoverBgColor?: string;\n};\nexport type ScrollStyle = {\n  /**滚动条滚动的颜色 */\n  scrollRailColor?: string;\n  /**滚动条滑块的颜色 */\n  scrollSliderColor?: string;\n  /**滚动条滑块的圆角半径 */\n  scrollSliderCornerRadius?: number;\n  /**滚动条宽度大小 */\n  width?: number;\n  /**滚动条是否可见  'always' | 'scrolling' | 'none' | 'focus',常驻|滚动时|不显示|聚焦在画布上时 。默认'scrolling'*/\n  visible?: 'always' | 'scrolling' | 'none' | 'focus';\n  horizontalVisible?: 'always' | 'scrolling' | 'none' | 'focus';\n  verticalVisible?: 'always' | 'scrolling' | 'none' | 'focus';\n  /*** 悬浮与容器上，还是独立于容器外 */\n  hoverOn?: boolean;\n  /** 是否显示到容器的边缘 尽管内容没有撑满的情况下 默认false */\n  barToSide?: boolean;\n  /** 横向滚动条 padding */\n  horizontalPadding?: number | [number, number, number, number];\n  /** 竖向滚动条 padding */\n  verticalPadding?: number | [number, number, number, number];\n  ignoreFrozenCols?: boolean; // 忽略所有冻结列宽度，默认false\n};\n/**\n * 气泡框，按钮的的解释信息\n */\nexport type TooltipStyle = {\n  fontFamily?: string;\n  fontSize?: number;\n  color?: string;\n  padding?: number[];\n  bgColor?: string;\n  maxWidth?: number;\n  maxHeight?: number;\n  /** !目前未实现该逻辑。触发行为：hover or click */\n  // trigger?: string | string[];\n  /**气泡框位置，可选 top left right bottom */\n  // placement?: Placement;\n};\nexport interface ITableThemeDefine {\n  /** 表格绘制范围外的canvas上填充的颜色 */\n  underlayBackgroundColor?: string;\n  // selectionBgColor?: ColorPropertyDefine; //多选单元格背景色 手动设置的多选 非框选\n  defaultStyle?: ThemeStyle;\n  cornerHeaderStyle?: ThemeStyle; //角头样式\n  cornerRightTopCellStyle?: ThemeStyle; // 右上角占位单元格样式\n  cornerLeftBottomCellStyle?: ThemeStyle; // 左下角占位单元格样式\n  cornerRightBottomCellStyle?: ThemeStyle; // 右下角占位单元格样式\n  rightFrozenStyle?: ThemeStyle; // 右侧冻结单元格样式\n  bottomFrozenStyle?: ThemeStyle; // 下部冻结单元格样式\n  headerStyle?: ThemeStyle;\n  rowHeaderStyle?: ThemeStyle;\n  bodyStyle?: ThemeStyle;\n  groupTitleStyle?: ThemeStyle;\n  frameStyle?: TableFrameStyle;\n  //列调整宽度的直线\n  columnResize?: {\n    visibleOnHover?: boolean; //是否在hover时显示\n    lineColor?: ColorPropertyDefine; //上面线的颜色\n    bgColor?: ColorPropertyDefine; //背景线的颜色\n    lineWidth?: number; //上面线的宽度\n    width?: number; //背景线的宽度\n    resizeHotSpotSize?: number; //响应调整行高列宽交互行为热区的大小\n    labelVisible?: boolean; //是否显示label\n    labelColor?: string; //label的颜色\n    labelFontSize?: number; //label的字体大小\n    labelFontFamily?: string; //label的字体\n    labelBackgroundFill?: string; //label的背景填充\n    labelBackgroundCornerRadius?: number; //label的背景圆角\n  };\n  //拖拽表格换位分割线的样式\n  dragHeaderSplitLine?: {\n    lineColor: ColorPropertyDefine; //上面线的颜色\n    lineWidth: number; //上面线的宽度\n    shadowBlockColor?: string; //拖拽时阴影区域的颜色\n  };\n  //冻结列后面的效果\n  frozenColumnLine?: {\n    shadow?: {\n      //默认效果 会有阴影配置\n      width: number; //阴影整体宽度\n      startColor: string; //开始颜色\n      endColor: string; //结束颜色\n      /**滚动条是否可见  'always' | 'scrolling' | 'none' | 'focus',常驻|滚动时|不显示|聚焦在画布上时 。默认'scrolling'*/\n      visible?: 'always' | 'scrolling';\n    };\n    /** TODO  暂未生效 */\n    border?: {\n      //有些需求要两种效果 这里配置滚动前的边框效果（实现方式是两条线叠加产生），滚动后按上面的阴影效果\n      lineColor: ColorPropertyDefine; //上面线的颜色\n      bgColor?: ColorPropertyDefine; //背景线的颜色\n      lineWidth: number; //上面线的宽度\n      width?: number; //背景线的宽度\n    };\n  };\n\n  // menuStyle?: menuStyle;\n  scrollStyle?: ScrollStyle;\n  tooltipStyle?: TooltipStyle;\n  // selectHeaderHighlight?: boolean;\n  /** 选择框样式 */\n  selectionStyle?: //Omit<InteractionStyle, 'inlineRowBgColor' | 'inlineColumnBgColor'>; //鼠标点击到某个单元格\n  {\n    cellBorderColor?: string; //边框颜色\n    cellBorderLineWidth?: number; //边框线宽度\n    cellBgColor?: string; //选择框背景颜色\n    inlineRowBgColor?: string; //交互所在整行的背景颜色\n    inlineColumnBgColor?: string; //交互所在整列的背景颜色\n    selectionFillMode?: 'overlay' | 'replace'; //选择框填充模式，overlay表示选择框背景色覆盖在表格上（需要配饰透明度），replace表示背景色替换原有单元格的背景色\n    dynamicUpdateSelectionSize?: boolean; // 选择框大小随滚动动态变化，用于冻结并且背景透明的场景，默认false，开启后性能会有一定影响\n  };\n\n  // style for axis\n  axisStyle?: {\n    defaultAxisStyle?: Omit<ICellAxisOption, 'type' | 'domain' | 'range' | 'orient' | '__ticksForVTable'>;\n    leftAxisStyle?: Omit<ICellAxisOption, 'type' | 'domain' | 'range' | 'orient' | '__ticksForVTable'> & {\n      cellPaddingLeft: number;\n    };\n    rightAxisStyle?: Omit<ICellAxisOption, 'type' | 'domain' | 'range' | 'orient' | '__ticksForVTable'> & {\n      cellPaddingRight: number;\n    };\n    topAxisStyle?: Omit<ICellAxisOption, 'type' | 'domain' | 'range' | 'orient' | '__ticksForVTable'> & {\n      cellPaddingTop: number;\n    };\n    bottomAxisStyle?: Omit<ICellAxisOption, 'type' | 'domain' | 'range' | 'orient' | '__ticksForVTable'> & {\n      cellPaddingBottom: number;\n    };\n  };\n\n  checkboxStyle?: CheckboxStyle;\n  radioStyle?: RadioStyle;\n  switchStyle?: SwitchStyle;\n  buttonStyle?: ButtonStyle;\n\n  // style for text pop tip\n  textPopTipStyle?: PopTipAttributes;\n\n  // senior config for fs\n  // 表格四侧单元格，靠近边缘的border是否需要再绘制；如配置false的话，当表格左侧frame未设置情况下左侧单元格不显示左边框，其他方向同理\n  cellInnerBorder?: boolean;\n  // cell border clip direction\n  cellBorderClipDirection?: 'top-left' | 'bottom-right'; // default is 'top-left'\n  // text offset, hack for fs\n  _contentOffset?: number;\n  /** 内部功能性按钮图标颜色及尺寸配置 */\n  functionalIconsStyle?: {\n    sort_color?: string;\n    sort_color_opacity?: string;\n    sort_color_2?: string;\n    sort_color_opacity_2?: string;\n    sort_size?: number;\n    sort_size_2?: number;\n    frozen_color?: string;\n    frozen_color_opacity?: string;\n    frozen_color_2?: string;\n    frozen_color_opacity_2?: string;\n    frozen_size?: number;\n    frozen_size_2?: number;\n    collapse_color?: string;\n    collapse_color_opacity?: string;\n    collapse_size?: number;\n    collapse_size_2?: number;\n    expand_color?: string;\n    expand_color_opacity?: string;\n    expand_size?: number;\n    expand_size_2?: number;\n    dragReorder_color?: string;\n    dragReorder_color_opacity?: string;\n    dragReorder_size?: number;\n  };\n}\n\nexport type RequiredTableThemeDefine = Required<ITableThemeDefine>;\n"]}
+{"version":3,"sources":["../src/ts-types/theme.ts"],"names":[],"mappings":"","file":"theme.js","sourcesContent":["/* eslint-disable sort-imports */\nimport type { ColorsDef, LineDashsDef, LineWidthsDef, LineWidthsPropertyDefine, LineDashsPropertyDefine } from '.';\nimport type { ButtonStyle, CheckboxStyle, ITextStyleOption, RadioStyle, SwitchStyle } from './column/style';\nimport type { ColorPropertyDefine, ColorsPropertyDefine } from './style-define';\nimport type { ICellAxisOption } from './component/axis';\nimport type { PopTipAttributes } from './../vrender';\n// ****** Custom Theme *******\nexport type PartialTableThemeDefine = Partial<ITableThemeDefine>;\nexport type ThemeStyle = ITextStyleOption & {\n  hover?: Omit<InteractionStyle, 'cellBorderColor' | 'cellBorderLineWidth'>; //鼠标hover到某个单元格\n  select?: {\n    inlineRowBgColor?: ColorPropertyDefine; //交互所在整行的背景颜色\n    inlineColumnBgColor?: ColorPropertyDefine; //交互所在整列的背景颜色\n    cellBgColor?: ColorPropertyDefine; //交互所在单元格的背景颜色\n  };\n  frameStyle?: FrameStyle;\n};\nexport type InteractionStyle = {\n  cellBorderColor?: ColorsPropertyDefine; //交互所在单元格的边框颜色\n  cellBorderLineWidth?: LineWidthsPropertyDefine;\n  // cellBorderLineDash?:LineDashsPropertyDefine,//用到的场景应该不多\n  cellBgColor?: ColorPropertyDefine; //交互所在单元格的背景颜色\n  // inlineRowBorderColor?: ColorsPropertyDefine,//交互所在整行的边框颜色\n  inlineRowBgColor?: ColorPropertyDefine; //交互所在整行的背景颜色\n  // inlineColBorderColor?: ColorsPropertyDefine,//交互所在整列的边框颜色\n  inlineColumnBgColor?: ColorPropertyDefine; //交互所在整列的背景颜色\n  // headerHighlightBorderColor?:ColorPropertyDefine,//表头底部高亮线\n};\nexport type FrameStyle = {\n  borderColor?: ColorsDef;\n  borderLineWidth?: LineWidthsDef;\n  borderLineDash?: LineDashsDef;\n  innerBorder?: boolean;\n};\nexport type TableFrameStyle = FrameStyle & {\n  shadowBlur?: number; //阴影宽度\n  shadowOffsetX?: number; //x方向偏移\n  shadowOffsetY?: number; //Y方向偏移\n  shadowColor?: string; //阴影颜色\n  cornerRadius?: number | [number, number, number, number]; //边框圆角半径\n};\nexport type menuStyle = {\n  color?: string;\n  highlightColor?: string;\n  fontSize?: number;\n  fontFamily?: string;\n  highlightFontSize?: number;\n  highlightFontFamily?: string;\n  hoverBgColor?: string;\n};\nexport type ScrollStyle = {\n  /**滚动条滚动的颜色 */\n  scrollRailColor?: string;\n  /**滚动条滑块的颜色 */\n  scrollSliderColor?: string;\n  /**滚动条滑块的圆角半径 */\n  scrollSliderCornerRadius?: number;\n  /**滚动条宽度大小 */\n  width?: number;\n  /**滚动条是否可见  'always' | 'scrolling' | 'none' | 'focus',常驻|滚动时|不显示|聚焦在画布上时 。默认'scrolling'*/\n  visible?: 'always' | 'scrolling' | 'none' | 'focus';\n  horizontalVisible?: 'always' | 'scrolling' | 'none' | 'focus';\n  verticalVisible?: 'always' | 'scrolling' | 'none' | 'focus';\n  /*** 悬浮与容器上，还是独立于容器外 */\n  hoverOn?: boolean;\n  /** 是否显示到容器的边缘 尽管内容没有撑满的情况下 默认false */\n  barToSide?: boolean;\n  /** 横向滚动条 padding */\n  horizontalPadding?: number | [number, number, number, number];\n  /** 竖向滚动条 padding */\n  verticalPadding?: number | [number, number, number, number];\n  ignoreFrozenCols?: boolean; // 忽略所有冻结列宽度，默认false\n};\n/**\n * 气泡框，按钮的的解释信息\n */\nexport type TooltipStyle = {\n  fontFamily?: string;\n  fontSize?: number;\n  color?: string;\n  padding?: number[];\n  bgColor?: string;\n  maxWidth?: number;\n  maxHeight?: number;\n  /** !目前未实现该逻辑。触发行为：hover or click */\n  // trigger?: string | string[];\n  /**气泡框位置，可选 top left right bottom */\n  // placement?: Placement;\n};\nexport interface ITableThemeDefine {\n  /** 表格绘制范围外的canvas上填充的颜色 */\n  underlayBackgroundColor?: string;\n  // selectionBgColor?: ColorPropertyDefine; //多选单元格背景色 手动设置的多选 非框选\n  defaultStyle?: ThemeStyle;\n  cornerHeaderStyle?: ThemeStyle; //角头样式\n  cornerRightTopCellStyle?: ThemeStyle; // 右上角占位单元格样式\n  cornerLeftBottomCellStyle?: ThemeStyle; // 左下角占位单元格样式\n  cornerRightBottomCellStyle?: ThemeStyle; // 右下角占位单元格样式\n  rightFrozenStyle?: ThemeStyle; // 右侧冻结单元格样式\n  bottomFrozenStyle?: ThemeStyle; // 下部冻结单元格样式\n  headerStyle?: ThemeStyle;\n  rowHeaderStyle?: ThemeStyle;\n  bodyStyle?: ThemeStyle;\n  groupTitleStyle?: ThemeStyle;\n  frameStyle?: TableFrameStyle;\n  //列调整宽度的直线\n  columnResize?: {\n    visibleOnHover?: boolean; //是否在hover时显示\n    lineColor?: ColorPropertyDefine; //上面线的颜色\n    bgColor?: ColorPropertyDefine; //背景线的颜色\n    lineWidth?: number; //上面线的宽度\n    width?: number; //背景线的宽度\n    resizeHotSpotSize?: number; //响应调整行高列宽交互行为热区的大小\n    labelVisible?: boolean; //是否显示label\n    labelColor?: string; //label的颜色\n    labelFontSize?: number; //label的字体大小\n    labelFontFamily?: string; //label的字体\n    labelBackgroundFill?: string; //label的背景填充\n    labelBackgroundCornerRadius?: number; //label的背景圆角\n  };\n  //拖拽表格换位分割线的样式\n  dragHeaderSplitLine?: {\n    lineColor: ColorPropertyDefine; //上面线的颜色\n    lineWidth: number; //上面线的宽度\n    shadowBlockColor?: string; //拖拽时阴影区域的颜色\n  };\n  //冻结列后面的效果\n  frozenColumnLine?: {\n    shadow?: {\n      //默认效果 会有阴影配置\n      width: number; //阴影整体宽度\n      startColor: string; //开始颜色\n      endColor: string; //结束颜色\n      /**滚动条是否可见  'always' | 'scrolling' | 'none' | 'focus',常驻|滚动时|不显示|聚焦在画布上时 。默认'scrolling'*/\n      visible?: 'always' | 'scrolling';\n    };\n    /** TODO  暂未生效 */\n    border?: {\n      //有些需求要两种效果 这里配置滚动前的边框效果（实现方式是两条线叠加产生），滚动后按上面的阴影效果\n      lineColor: ColorPropertyDefine; //上面线的颜色\n      bgColor?: ColorPropertyDefine; //背景线的颜色\n      lineWidth: number; //上面线的宽度\n      width?: number; //背景线的宽度\n    };\n  };\n\n  // menuStyle?: menuStyle;\n  scrollStyle?: ScrollStyle;\n  tooltipStyle?: TooltipStyle;\n  // selectHeaderHighlight?: boolean;\n  /** 选择框样式 */\n  selectionStyle?: //Omit<InteractionStyle, 'inlineRowBgColor' | 'inlineColumnBgColor'>; //鼠标点击到某个单元格\n  {\n    cellBorderColor?: string; //边框颜色\n    cellBorderLineWidth?: number; //边框线宽度\n    cellBgColor?: string; //选择框背景颜色\n    inlineRowBgColor?: string; //交互所在整行的背景颜色\n    inlineColumnBgColor?: string; //交互所在整列的背景颜色\n    selectionFillMode?: 'overlay' | 'replace'; //选择框填充模式，overlay表示选择框背景色覆盖在表格上（需要配饰透明度），replace表示背景色替换原有单元格的背景色\n    dynamicUpdateSelectionSize?: boolean; // 选择框大小随滚动动态变化，用于冻结并且背景透明的场景，默认false，开启后性能会有一定影响\n  };\n\n  // style for axis\n  axisStyle?: {\n    defaultAxisStyle?: Omit<ICellAxisOption, 'type' | 'domain' | 'range' | 'orient' | '__ticksForVTable'>;\n    leftAxisStyle?: Omit<ICellAxisOption, 'type' | 'domain' | 'range' | 'orient' | '__ticksForVTable'> & {\n      cellPaddingLeft?: number;\n    };\n    rightAxisStyle?: Omit<ICellAxisOption, 'type' | 'domain' | 'range' | 'orient' | '__ticksForVTable'> & {\n      cellPaddingRight?: number;\n    };\n    topAxisStyle?: Omit<ICellAxisOption, 'type' | 'domain' | 'range' | 'orient' | '__ticksForVTable'> & {\n      cellPaddingTop?: number;\n    };\n    bottomAxisStyle?: Omit<ICellAxisOption, 'type' | 'domain' | 'range' | 'orient' | '__ticksForVTable'> & {\n      cellPaddingBottom?: number;\n    };\n  };\n\n  checkboxStyle?: CheckboxStyle;\n  radioStyle?: RadioStyle;\n  switchStyle?: SwitchStyle;\n  buttonStyle?: ButtonStyle;\n\n  // style for text pop tip\n  textPopTipStyle?: PopTipAttributes;\n\n  // senior config for fs\n  // 表格四侧单元格，靠近边缘的border是否需要再绘制；如配置false的话，当表格左侧frame未设置情况下左侧单元格不显示左边框，其他方向同理\n  cellInnerBorder?: boolean;\n  // cell border clip direction\n  cellBorderClipDirection?: 'top-left' | 'bottom-right'; // default is 'top-left'\n  // text offset, hack for fs\n  _contentOffset?: number;\n  /** 内部功能性按钮图标颜色及尺寸配置 */\n  functionalIconsStyle?: {\n    sort_color?: string;\n    sort_color_opacity?: string;\n    sort_color_2?: string;\n    sort_color_opacity_2?: string;\n    sort_size?: number;\n    sort_size_2?: number;\n    frozen_color?: string;\n    frozen_color_opacity?: string;\n    frozen_color_2?: string;\n    frozen_color_opacity_2?: string;\n    frozen_size?: number;\n    frozen_size_2?: number;\n    collapse_color?: string;\n    collapse_color_opacity?: string;\n    collapse_size?: number;\n    collapse_size_2?: number;\n    expand_color?: string;\n    expand_color_opacity?: string;\n    expand_size?: number;\n    expand_size_2?: number;\n    dragReorder_color?: string;\n    dragReorder_color_opacity?: string;\n    dragReorder_size?: number;\n  };\n}\n\nexport type RequiredTableThemeDefine = Required<ITableThemeDefine>;\n"]}

package/cjs/vrender.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/vrender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qEAA0D;AAC1D,kCAAgC;AAChC,yDAAwH;AACxH,yDAqBgC;AAIhC,IAAI,QAAQ,GAAG,KAAK,CAAC;AACrB,SAAgB,kBAAkB;IAChC,IAAI,QAAQ,EAAE;QACZ,OAAO;KACR;IACD,QAAQ,GAAG,IAAI,CAAC;IAEhB,IAAA,+BAAgB,GAAE,CAAC;IAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;QAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;KAC3B;SAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;QACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;KACxB;IACD,IAAA,0BAAW,GAAE,CAAC;IAGd,IAAA,6BAAc,GAAE,CAAC;IAEjB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IAIf,IAAA,2BAAY,GAAE,CAAC;IAEf,IAAA,+BAAgB,GAAE,CAAC;IACnB,IAAA,iCAAkB,GAAE,CAAC;IACrB,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,uCAAwB,GAAE,CAAC;IAE3B,IAAA,+BAAU,GAAE,CAAC;IAEb,IAAA,uCAAwB,GAAE,CAAC;AAC7B,CAAC;AAnCD,gDAmCC;AAOD,yDAAuC;AACvC,yDAAuC;AACvC,+DAA6C;AAC7C,4DAA0C","file":"vrender.js","sourcesContent":["import { loadPoptip } from '@visactor/vrender-components';\nimport '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule, registerFlexLayoutPlugin } from '@visactor/vrender-core';\nimport {\n  loadBrowserEnv,\n  loadNodeEnv,\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\n// export const version = \"1.22.5-alpha.1\";\n\nlet registed = false;\nexport function registerForVrender() {\n  if (registed) {\n    return;\n  }\n  registed = true;\n  // 注册内置组件\n  preLoadAllModule();\n\n  if (isBrowserEnv()) {\n    loadBrowserEnv(container);\n  } else if (isNodeEnv()) {\n    loadNodeEnv(container);\n  }\n  registerArc();\n  // registerArc3d();\n  // registerArea();\n  registerCircle();\n  // registerGlyph();\n  registerGroup();\n  registerImage();\n  registerLine();\n  // registerPath();\n  // registerPolygon();\n  // registerPyramid3d();\n  registerRect();\n  // registerRect3d();\n  registerRichtext();\n  registerShadowRoot();\n  registerSymbol();\n  registerText();\n  registerFlexLayoutPlugin();\n  // registerWrapText();\n  loadPoptip();\n\n  registerFlexLayoutPlugin();\n}\n\nexport type { Direction } from '@visactor/vrender-core';\nexport type { State } from '@visactor/vrender-components';\n// export { GroupFadeIn } from '@visactor/vrender-core';\n// export { GroupFadeOut } from '@visactor/vrender-core';\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\nexport * from '@visactor/vrender-components';\nexport * from '@visactor/vrender-animate';\n"]}
+{"version":3,"sources":["../src/vrender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qEAA0D;AAC1D,kCAAgC;AAChC,yDAAwH;AACxH,yDAqBgC;AAIhC,IAAI,QAAQ,GAAG,KAAK,CAAC;AACrB,SAAgB,kBAAkB;IAChC,IAAI,QAAQ,EAAE;QACZ,OAAO;KACR;IACD,QAAQ,GAAG,IAAI,CAAC;IAEhB,IAAA,+BAAgB,GAAE,CAAC;IAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;QAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;KAC3B;SAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;QACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;KACxB;IACD,IAAA,0BAAW,GAAE,CAAC;IAGd,IAAA,6BAAc,GAAE,CAAC;IAEjB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IAIf,IAAA,2BAAY,GAAE,CAAC;IAEf,IAAA,+BAAgB,GAAE,CAAC;IACnB,IAAA,iCAAkB,GAAE,CAAC;IACrB,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,uCAAwB,GAAE,CAAC;IAE3B,IAAA,+BAAU,GAAE,CAAC;IAEb,IAAA,uCAAwB,GAAE,CAAC;AAC7B,CAAC;AAnCD,gDAmCC;AAOD,yDAAuC;AACvC,yDAAuC;AACvC,+DAA6C;AAC7C,4DAA0C","file":"vrender.js","sourcesContent":["import { loadPoptip } from '@visactor/vrender-components';\nimport '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule, registerFlexLayoutPlugin } from '@visactor/vrender-core';\nimport {\n  loadBrowserEnv,\n  loadNodeEnv,\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\n// export const version = \"1.22.5-alpha.2\";\n\nlet registed = false;\nexport function registerForVrender() {\n  if (registed) {\n    return;\n  }\n  registed = true;\n  // 注册内置组件\n  preLoadAllModule();\n\n  if (isBrowserEnv()) {\n    loadBrowserEnv(container);\n  } else if (isNodeEnv()) {\n    loadNodeEnv(container);\n  }\n  registerArc();\n  // registerArc3d();\n  // registerArea();\n  registerCircle();\n  // registerGlyph();\n  registerGroup();\n  registerImage();\n  registerLine();\n  // registerPath();\n  // registerPolygon();\n  // registerPyramid3d();\n  registerRect();\n  // registerRect3d();\n  registerRichtext();\n  registerShadowRoot();\n  registerSymbol();\n  registerText();\n  registerFlexLayoutPlugin();\n  // registerWrapText();\n  loadPoptip();\n\n  registerFlexLayoutPlugin();\n}\n\nexport type { Direction } from '@visactor/vrender-core';\nexport type { State } from '@visactor/vrender-components';\n// export { GroupFadeIn } from '@visactor/vrender-core';\n// export { GroupFadeOut } from '@visactor/vrender-core';\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\nexport * from '@visactor/vrender-components';\nexport * from '@visactor/vrender-animate';\n"]}

package/dist/vtable.js

@@ -49030,6 +49030,10 @@
                         else {
                             if (hideTooltip) {
                                 chartInstanceListColumnByColumnDirection[col][i].hideTooltip();
+                                chartInstanceListColumnByColumnDirection[col][i].setDimensionIndex(dimensionValueOrXValue, {
+                                    tooltip: false,
+                                    showTooltipOption: { x: canvasXY.x, y: absolutePosition.top + 3, activeType: 'dimension' }
+                                });
                             }
                             else {
                                 chartInstanceListColumnByColumnDirection[col][i].setDimensionIndex(dimensionValueOrXValue, {
@@ -49122,6 +49126,10 @@
                         else {
                             if (hideTooltip) {
                                 chartInstanceListRowByRowDirection[row][i].hideTooltip();
+                                chartInstanceListRowByRowDirection[row][i].setDimensionIndex(dimensionValueOrXValue, {
+                                    tooltip: false,
+                                    showTooltipOption: { x: absolutePosition.left + 3, y: canvasXY.y, activeType: 'dimension' }
+                                });
                             }
                             else {
                                 chartInstanceListRowByRowDirection[row][i].setDimensionIndex(dimensionValueOrXValue, {
@@ -49388,6 +49396,11 @@
                 row === layout.columnHeaderLevelCount - 1 &&
                 col >= layout.rowHeaderLevelCount &&
                 col < layout.colCount - layout.rightFrozenColCount) {
+                const indicatorKey = layout.getIndicatorKey(col, row);
+                const indicatorInfo = layout.getIndicatorInfo(indicatorKey);
+                if (!indicatorInfo?.hasTwoIndicatorAxes) {
+                    return;
+                }
                 const axisRange = getRange('top', col, row + 1, col, layout.columnHeaderLevelCount - 1, col, row, 1, layout);
                 if (!axisRange) {
                     return;
@@ -49590,14 +49603,19 @@
             else if (col === layout.colCount - layout.rightFrozenColCount &&
                 row >= layout.columnHeaderLevelCount &&
                 row < layout.rowCount - layout.bottomFrozenRowCount) {
+                const indicatorKey = layout.getIndicatorKey(col, row);
+                const indicatorInfo = layout.getIndicatorInfo(indicatorKey);
+                if (!indicatorInfo?.hasTwoIndicatorAxes) {
+                    return;
+                }
+                const { axisOption, chartType } = getAxisOption(col - 1, row, 'right', layout);
                 const axisRange = getRange('right', col - 1, row, layout.rowHeaderLevelCount - 1, row, col, row, 1, layout);
-                const { chartType } = getAxisOption(col - 1, row, 'right', layout);
                 if (!axisRange) {
                     return;
                 }
                 const chartCellStyle = layout._table._getCellStyle(col - 1, row);
                 const bodyChartCellPadding = getQuadProps(getProp('padding', chartCellStyle, col - 1, row, layout._table));
-                const { range, ticks, axisOption, index, targetTicks, targetRange, theme } = axisRange;
+                const { range, ticks, index, targetTicks, targetRange, theme } = axisRange;
                 if (isNumber$4(axisOption?.min)) {
                     range.min = axisOption.min;
                     if (range.min > 0) {
@@ -49715,7 +49733,7 @@
         const axisOption = layout._table.pivotChartAxes.find(axisOption => {
             return axisOption.orient === orient;
         }) ?? {};
-        if (!axisOption.labelHoverOnAxis) {
+        if (axisOption && !axisOption.labelHoverOnAxis) {
             axisOption.labelHoverOnAxis = layout._table.options.chartDimensionLinkage?.labelHoverOnAxis?.[orient];
         }
         const { isZeroAlign, isTickAlign } = checkZeroAlign(spec, orient, layout);
@@ -49784,7 +49802,7 @@
             }
             return null;
         }
-        let defaultKey = indicatorKeys?.[seriesId];
+        let defaultKey = indicatorKeys?.[seriesId] ?? indicatorKeys?.[0];
         if (isArray$7(defaultKey)) {
             defaultKey = defaultKey[0];
         }
@@ -50091,6 +50109,9 @@
         chartInstance;
         activeChartInstance;
         activeChartInstanceHoverOnMark = null;
+        justShowMarkTooltip = undefined;
+        justShowMarkTooltipTimer = Date.now();
+        delayRunDimensionHoverTimer = undefined;
         cacheCanvas;
         isShareChartSpec;
         constructor(isShareChartSpec, params) {
@@ -50233,41 +50254,114 @@
                             }
                         }
                         else {
-                            let hideTooltip = false;
+                            let justShowMarkTooltip = true;
                             const preMark = this.activeChartInstanceHoverOnMark;
+                            const prev_justShowMarkTooltip = this.justShowMarkTooltip;
                             if (params.mark && params.datum && !Array.isArray(params.datum)) {
                                 this.activeChartInstanceHoverOnMark = params.mark;
-                                hideTooltip = true;
+                                justShowMarkTooltip = true;
                             }
                             else {
                                 this.activeChartInstanceHoverOnMark = null;
+                                justShowMarkTooltip = false;
+                            }
+                            this.justShowMarkTooltip = justShowMarkTooltip;
+                            let delayRunDimensionHover = false;
+                            if (prev_justShowMarkTooltip === true && justShowMarkTooltip === false) {
+                                this.justShowMarkTooltipTimer = Date.now();
+                                delayRunDimensionHover = true;
+                            }
+                            else if (prev_justShowMarkTooltip === false && justShowMarkTooltip === false) {
+                                if (Date.now() - this.justShowMarkTooltipTimer < 100) {
+                                    delayRunDimensionHover = true;
+                                }
+                                else {
+                                    delayRunDimensionHover = false;
+                                }
+                            }
+                            else if (prev_justShowMarkTooltip === false && justShowMarkTooltip === true) {
+                                delayRunDimensionHover = false;
+                                clearTimeout(this.delayRunDimensionHoverTimer);
+                                this.delayRunDimensionHoverTimer = undefined;
+                            }
+                            else if (prev_justShowMarkTooltip === true && justShowMarkTooltip === true) {
+                                delayRunDimensionHover = false;
+                                clearTimeout(this.delayRunDimensionHoverTimer);
+                                this.delayRunDimensionHoverTimer = undefined;
                             }
                             if (params.action === 'enter' || preMark !== this.activeChartInstanceHoverOnMark) {
                                 const dimensionValue = dimensionInfo.value;
                                 const indicatorsAsCol = table.options.indicatorsAsCol;
+                                if (!delayRunDimensionHover) {
+                                    if (indicatorsAsCol) {
+                                        generateChartInstanceListByRowDirection(row, dimensionValue, null, canvasXY, table, justShowMarkTooltip, false);
+                                    }
+                                    else {
+                                        generateChartInstanceListByColumnDirection(col, dimensionValue, null, canvasXY, table, justShowMarkTooltip, false);
+                                    }
+                                }
+                                else {
+                                    clearTimeout(this.delayRunDimensionHoverTimer);
+                                    this.delayRunDimensionHoverTimer = setTimeout(() => {
+                                        if (indicatorsAsCol) {
+                                            generateChartInstanceListByRowDirection(row, dimensionValue, null, canvasXY, table, justShowMarkTooltip, false);
+                                        }
+                                        else {
+                                            generateChartInstanceListByColumnDirection(col, dimensionValue, null, canvasXY, table, justShowMarkTooltip, false);
+                                        }
+                                    }, 100);
+                                }
                                 if (indicatorsAsCol) {
                                     const series = dimensionInfo.data[0].series;
-                                    const width = series.getYAxisHelper().getBandwidth(0);
-                                    const y = series.valueToPositionY(dimensionValue);
+                                    const width = this.attribute.spec.type === 'histogram' ||
+                                        this.attribute.spec.type === 'boxPlot' ||
+                                        series.type === 'line' ||
+                                        series.type === 'area'
+                                        ? 0
+                                        : series.getYAxisHelper().getBandwidth(0);
+                                    let y = series.valueToPositionY(dimensionValue);
                                     const axisConfig = getAxisConfigInPivotChart(table.rowHeaderLevelCount - 1, row, table.internalProps.layoutMap);
+                                    let hoverOnLabelValue = yValue;
+                                    if (this.attribute.spec.type === 'histogram') {
+                                        const { series, datum } = dimensionInfo.data[0];
+                                        if (datum.length > 0) {
+                                            const rangeStartValue = datum[0][series.fieldY[0]];
+                                            const rangeEndValue = datum[0][series.fieldY2];
+                                            hoverOnLabelValue = rangeStartValue + ' ~ ' + rangeEndValue;
+                                            y = (series.valueToPositionY(rangeStartValue) + series.valueToPositionY(rangeEndValue)) / 2;
+                                        }
+                                    }
                                     if (axisConfig.labelHoverOnAxis) {
                                         table.scenegraph
                                             .getCell(table.rowHeaderLevelCount - 1, row)
-                                            .firstChild.showLabelHoverOnAxis(y + (series.type === 'line' || series.type === 'area' ? 0 : width / 2), yValue);
+                                            .firstChild.showLabelHoverOnAxis(y + (series.type === 'line' || series.type === 'area' ? 0 : width / 2), hoverOnLabelValue);
                                     }
-                                    generateChartInstanceListByRowDirection(row, dimensionValue, null, canvasXY, table, hideTooltip, false);
                                 }
                                 else {
                                     const series = dimensionInfo.data[0].series;
-                                    const width = series.getXAxisHelper().getBandwidth(0);
-                                    const x = series.valueToPositionX(dimensionValue);
+                                    const width = this.attribute.spec.type === 'histogram' ||
+                                        this.attribute.spec.type === 'boxPlot' ||
+                                        series.type === 'line' ||
+                                        series.type === 'area'
+                                        ? 0
+                                        : series.getXAxisHelper().getBandwidth(0);
+                                    let x = series.valueToPositionX(dimensionValue);
                                     const axisConfig = getAxisConfigInPivotChart(col, table.rowCount - table.bottomFrozenRowCount, table.internalProps.layoutMap);
+                                    let hoverOnLabelValue = dimensionValue;
+                                    if (this.attribute.spec.type === 'histogram') {
+                                        const { series, datum } = dimensionInfo.data[0];
+                                        if (datum.length > 0) {
+                                            const rangeStartValue = datum[0][series.fieldX[0]];
+                                            const rangeEndValue = datum[0][series.fieldX2];
+                                            hoverOnLabelValue = rangeStartValue + ' ~ ' + rangeEndValue;
+                                            x = (series.valueToPositionX(rangeStartValue) + series.valueToPositionX(rangeEndValue)) / 2;
+                                        }
+                                    }
                                     if (axisConfig.labelHoverOnAxis) {
                                         table.scenegraph
                                             .getCell(col, table.rowCount - table.bottomFrozenRowCount)
-                                            .firstChild.showLabelHoverOnAxis(x + (series.type === 'line' || series.type === 'area' ? 0 : width / 2), dimensionValue);
+                                            .firstChild.showLabelHoverOnAxis(x + width / 2, hoverOnLabelValue);
                                     }
-                                    generateChartInstanceListByColumnDirection(col, dimensionValue, null, canvasXY, table, hideTooltip, false);
                                 }
                             }
                         }
@@ -50279,6 +50373,10 @@
         static temp = 1;
         deactivate(table, { releaseChartInstance = true, releaseColumnChartInstance = true, releaseRowChartInstance = true } = {}) {
             this.activeChartInstanceHoverOnMark = null;
+            this.justShowMarkTooltip = undefined;
+            this.justShowMarkTooltipTimer = Date.now();
+            clearTimeout(this.delayRunDimensionHoverTimer);
+            this.delayRunDimensionHoverTimer = undefined;
             if (releaseChartInstance) {
                 this.activeChartInstance?.updateViewBox({
                     x1: -1000,
@@ -56732,7 +56830,8 @@
         const table = scenegraph.table;
         if (table.isPivotChart()) {
             const preSelectItemsCount = table._selectedDataItemsInChart.length;
-            if ((datum === null || datum?.length === 0 || Object.keys(datum).length === 0) && preSelectItemsCount === 0) {
+            if ((datum === null || datum === undefined || datum?.length === 0 || Object.keys(datum).length === 0) &&
+                preSelectItemsCount === 0) {
                 return;
             }
             const newSelectedDataItemsInChart = [];
@@ -69858,7 +69957,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.22.5-alpha.1";
+        version = "1.22.5-alpha.2";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -74743,6 +74842,15 @@
             const rowPath = layout.getRowKeysPath(col, row);
             const domain = data[rowPath ?? ''];
             const { axisOption, isPercent, chartType } = getAxisOption(col, row, 'left', layout);
+            if (axisOption?.zero &&
+                domain &&
+                !Array.isArray(domain) &&
+                isValid$3(domain.min) &&
+                isValid$3(domain.max) &&
+                (axisOption?.zero || domain.min === domain.max)) {
+                domain.min = Math.min(domain.min, 0);
+                domain.max = Math.max(domain.max, 0);
+            }
             axes.push(merge$1({
                 domain: axisOption?.type === 'linear' && !Array.isArray(domain) ? undefined : Array.from(domain ?? []),
                 range: axisOption?.type === 'linear' && !Array.isArray(domain) ? domain : undefined,
@@ -74813,6 +74921,15 @@
             const colPath = layout.getColKeysPath(col, row);
             const domain = data?.[colPath ?? ''] ?? [];
             const { axisOption, isPercent, chartType } = getAxisOption(col, row, 'bottom', layout);
+            if (axisOption?.zero &&
+                domain &&
+                !Array.isArray(domain) &&
+                isValid$3(domain.min) &&
+                isValid$3(domain.max) &&
+                (axisOption?.zero || domain.min === domain.max)) {
+                domain.min = Math.min(domain.min, 0);
+                domain.max = Math.max(domain.max, 0);
+            }
             axes.push(merge$1({
                 domain: axisOption?.type === 'linear' && !Array.isArray(domain) ? undefined : Array.from(domain ?? []),
                 range: axisOption?.type === 'linear' && !Array.isArray(domain) ? domain : undefined,
@@ -85720,7 +85837,8 @@
             this.fullRowDimensionKeys = this.fullRowDimensionKeys.concat(this.rowDimensionKeys);
             this.resetRowHeaderLevelCount();
             if (this._table.isPivotChart()) {
-                this.hasTwoIndicatorAxes = this.indicatorsDefine.some((indicatorObject) => {
+                this.hasTwoIndicatorAxes = false;
+                this.indicatorsDefine.forEach((indicatorObject) => {
                     if (indicatorObject.chartSpec &&
                         indicatorObject.chartSpec.series &&
                         indicatorObject.chartSpec.series.length > 1) {
@@ -85732,9 +85850,58 @@
                                 }
                                 return true;
                             })) {
+                            indicatorObject.hasTwoIndicatorAxes = true;
+                            this.hasTwoIndicatorAxes = true;
                             return true;
                         }
                     }
+                    indicatorObject.hasTwoIndicatorAxes = false;
+                    return false;
+                });
+                this.indicatorsDefine.forEach((indicatorObject) => {
+                    if (indicatorObject.hasTwoIndicatorAxes) {
+                        return false;
+                    }
+                    if (indicatorObject.chartSpec) {
+                        const axes = indicatorObject.chartSpec.axes ?? this._table.pivotChartAxes ?? [];
+                        if (this.indicatorsAsCol) {
+                            const topAxis = axes.find((axis) => {
+                                if (axis.orient === 'top' && axis.visible !== false) {
+                                    return true;
+                                }
+                                return false;
+                            });
+                            const bottomAxis = axes.find((axis) => {
+                                if (axis.orient === 'bottom' && axis.visible !== false) {
+                                    return true;
+                                }
+                                return false;
+                            });
+                            if (topAxis && bottomAxis) {
+                                indicatorObject.hasTwoIndicatorAxes = true;
+                                return true;
+                            }
+                        }
+                        else {
+                            const leftAxis = axes.find((axis) => {
+                                if (axis.orient === 'left' && axis.visible !== false) {
+                                    return true;
+                                }
+                                return false;
+                            });
+                            const rightAxis = axes.find((axis) => {
+                                if (axis.orient === 'right' && axis.visible !== false) {
+                                    return true;
+                                }
+                                return false;
+                            });
+                            if (leftAxis && rightAxis) {
+                                indicatorObject.hasTwoIndicatorAxes = true;
+                                return true;
+                            }
+                        }
+                    }
+                    indicatorObject.hasTwoIndicatorAxes = false;
                     return false;
                 });
             }
@@ -88446,7 +88613,9 @@
                             ? chartSpec.type === 'histogram'
                                 ? chartSpec.x2Field
                                 : chartSpec.xField ?? chartSpec?.series?.[0]?.xField
-                            : chartSpec.yField ?? chartSpec?.series?.[0]?.yField;
+                            : chartSpec.type === 'histogram'
+                                ? chartSpec.y2Field
+                                : chartSpec.yField ?? chartSpec?.series?.[0]?.yField;
                     if (dimensionKey) {
                         return dimensionKey;
                     }
@@ -93444,7 +93613,9 @@
                             collectValuesBy[indicatorDefine.indicatorKey] = {
                                 by: columnKeys,
                                 range: true,
-                                sumBy: indicatorSpec?.stack && rowKeys.concat(indicatorSpec?.yField)
+                                sumBy: indicatorSpec.type === 'histogram'
+                                    ? rowKeys.concat(indicatorSpec?.yField, indicatorSpec?.y2Field)
+                                    : indicatorSpec?.stack && rowKeys.concat(indicatorSpec?.yField)
                             };
                         }
                         if (indicatorSpec.series) {
@@ -93474,7 +93645,11 @@
                             });
                         }
                         else {
-                            const yField = typeof indicatorSpec.yField === 'string' ? indicatorSpec.yField : indicatorSpec.yField[0];
+                            const yField = indicatorSpec.type === 'histogram'
+                                ? indicatorSpec.y2Field
+                                : typeof indicatorSpec.yField === 'string'
+                                    ? indicatorSpec.yField
+                                    : indicatorSpec.yField[0];
                             collectValuesBy[yField] = {
                                 by: rowKeys,
                                 type: indicatorSpec.direction === 'horizontal' ? 'yField' : undefined,
@@ -93484,14 +93659,14 @@
                             indicatorSpec?.stack !== false &&
                                 (indicatorSpec?.type === 'bar' || indicatorSpec?.type === 'area') &&
                                 (indicatorSpec.stack = true);
-                            const xField = indicatorSpec.type === 'histogram'
-                                ? indicatorSpec.x2Field
-                                : indicatorSpec.xField ?? indicatorSpec.maxField;
+                            const xField = indicatorSpec.xField ?? indicatorSpec.maxField;
                             collectValuesBy[xField] = {
                                 by: columnKeys,
                                 type: indicatorSpec.direction === 'horizontal' ? 'xField' : undefined,
                                 range: hasLinearAxis(indicatorSpec, this._axes, indicatorSpec.direction === 'horizontal', true),
-                                sumBy: indicatorSpec.stack && rowKeys.concat(indicatorSpec?.yField),
+                                sumBy: indicatorSpec.type === 'histogram'
+                                    ? rowKeys.concat(indicatorSpec?.yField, indicatorSpec?.y2Field)
+                                    : indicatorSpec.stack && rowKeys.concat(indicatorSpec?.yField),
                                 sortBy: indicatorSpec.direction !== 'horizontal' ? indicatorSpec?.data?.fields?.[xField]?.domain : undefined,
                                 extendRange: parseMarkLineGetExtendRange(indicatorSpec.markLine),
                                 considerFields: indicatorSpec?.type === 'boxPlot'
@@ -94503,7 +94678,7 @@
     }
 
     registerForVrender();
-    const version = "1.22.5-alpha.1";
+    const version = "1.22.5-alpha.2";
     function getIcons() {
         return get$2();
     }