@visactor/vchart 2.0.22-alpha.4 → 2.0.22

package/cjs/component/interface/theme.d.ts

@@ -11,7 +11,7 @@ import type { IMarkLineTheme } from '../marker/mark-line/interface';
 import type { IMarkPointTheme } from '../marker/mark-point/interface';
 import type { IPlayerTheme } from '../player/interface';
 import type { ITitleTheme } from '../title/interface';
-import type { ITooltipTheme } from '../tooltip/interface';
+import type { ITooltipSpec, ITooltipTheme } from '../tooltip/interface';
 import type { ComponentTypeEnum } from './type';
 import type { ITotalLabelTheme } from '../label/interface';
 import type { IPoptipTheme } from '../poptip/interface';
@@ -37,7 +37,7 @@ export interface IComponentTheme {
     [ComponentTypeEnum.markPoint]?: IMarkPointTheme;
     [ComponentTypeEnum.polarMarkPoint]?: IMarkPointTheme;
     [ComponentTypeEnum.geoMarkPoint]?: IMarkPointTheme;
-    [ComponentTypeEnum.tooltip]?: ITooltipTheme<string | IColorKey>;
+    [ComponentTypeEnum.tooltip]?: ITooltipTheme<string | IColorKey> & Partial<Pick<ITooltipSpec, 'visible' | 'activeType' | 'mark' | 'dimension' | 'group' | 'trigger' | 'triggerOff' | 'showDelay' | 'hideTimer' | 'lockAfterClick' | 'renderMode' | 'confine' | 'className' | 'parentElement' | 'enterable' | 'throttleInterval'>>;
     [ComponentTypeEnum.crosshair]?: ICrosshairTheme;
     [ComponentTypeEnum.dataZoom]?: IDataZoomTheme;
     [ComponentTypeEnum.scrollBar]?: IScrollBarTheme;

package/cjs/component/interface/theme.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/interface/theme.ts"],"names":[],"mappings":"","file":"theme.js","sourcesContent":["import type { IAxisCommonTheme } from '../axis/interface';\nimport type { IBrushTheme } from '../brush/interface';\nimport type { ICrosshairTheme } from '../crosshair/interface';\nimport type { IDataZoomTheme } from '../data-zoom/data-zoom/interface';\nimport type { IScrollBarTheme } from '../data-zoom/scroll-bar/interface';\nimport type { IIndicatorTheme } from '../indicator/interface';\nimport type { IDiscreteLegendTheme } from '../legend/discrete/interface';\nimport type { IColorLegendTheme, ISizeLegendTheme } from '../legend/continuous/interface';\nimport type { IMarkAreaTheme } from '../marker/mark-area/interface';\nimport type { IMarkLineTheme } from '../marker/mark-line/interface';\nimport type { IMarkPointTheme } from '../marker/mark-point/interface';\nimport type { IPlayerTheme } from '../player/interface';\nimport type { ITitleTheme } from '../title/interface';\nimport type { ITooltipTheme } from '../tooltip/interface';\nimport type { ComponentTypeEnum } from './type';\nimport type { ITotalLabelTheme } from '../label/interface';\nimport type { IPoptipTheme } from '../poptip/interface';\nimport type { IColorKey } from '../../theme/color-scheme/interface';\nimport type { Direction, IOrientType } from '../../typings';\nimport type { ICartesianAxisCommonTheme } from '../axis/cartesian/interface/theme';\nimport type { IPolarAxisCommonTheme } from '../axis/polar/interface/theme';\n\nexport interface IComponentTheme {\n  /**\n   * 通用坐标轴配置\n   */\n  axis?: IAxisCommonTheme;\n  /**\n   * 离散轴的通用配置\n   */\n  axisBand?: IAxisCommonTheme;\n  /**\n   * 连续轴的通用配置\n   */\n  axisLinear?: IAxisCommonTheme;\n  /**\n   * 笛卡尔坐标系下 x 轴的配置\n   */\n  axisX?: ICartesianAxisCommonTheme;\n  /**\n   * 笛卡尔坐标系下 y 轴配置\n   */\n  axisY?: ICartesianAxisCommonTheme;\n  /**\n   * 极坐标系下半径轴配置\n   */\n  axisRadius?: IPolarAxisCommonTheme;\n  /**\n   * 极坐标系下角度轴配置\n   */\n  axisAngle?: IPolarAxisCommonTheme;\n  /**\n   * 离散图例配置\n   */\n  [ComponentTypeEnum.discreteLegend]?: IDiscreteLegendTheme;\n  /**\n   * 连续颜色图例配置\n   */\n  [ComponentTypeEnum.colorLegend]?: IColorLegendTheme;\n  /**\n   * 连续尺寸图例配置\n   */\n  [ComponentTypeEnum.sizeLegend]?: ISizeLegendTheme;\n  /**\n   * markLine 标记配置\n   */\n  [ComponentTypeEnum.markLine]?: IMarkLineTheme;\n  [ComponentTypeEnum.polarMarkLine]?: IMarkLineTheme;\n  /**\n   * markArea 标记配置\n   */\n  [ComponentTypeEnum.markArea]?: IMarkAreaTheme;\n  [ComponentTypeEnum.polarMarkArea]?: IMarkAreaTheme;\n  /**\n   * markPoint 标记配置\n   */\n  [ComponentTypeEnum.markPoint]?: IMarkPointTheme;\n  [ComponentTypeEnum.polarMarkPoint]?: IMarkPointTheme;\n  [ComponentTypeEnum.geoMarkPoint]?: IMarkPointTheme;\n  /**\n   * tooltip 组件配置\n   */\n  [ComponentTypeEnum.tooltip]?: ITooltipTheme<string | IColorKey>;\n  /**\n   * crosshair 配置\n   */\n  [ComponentTypeEnum.crosshair]?: ICrosshairTheme;\n  /**\n   * dataZoom 配置\n   */\n  [ComponentTypeEnum.dataZoom]?: IDataZoomTheme;\n  /**\n   * scrollbar 滚动条配置\n   */\n  [ComponentTypeEnum.scrollBar]?: IScrollBarTheme;\n  /**\n   * 指标卡组件配置\n   */\n  [ComponentTypeEnum.indicator]?: IIndicatorTheme;\n  /**\n   * 播放器配置\n   */\n  [ComponentTypeEnum.player]?: IPlayerTheme;\n  /**\n   * 框选配置\n   */\n  [ComponentTypeEnum.brush]?: IBrushTheme;\n  /**\n   * 图表标题配置\n   */\n  [ComponentTypeEnum.title]?: ITitleTheme;\n  /**\n   * 省略文本配置\n   */\n  [ComponentTypeEnum.poptip]?: IPoptipTheme;\n  /**\n   * 堆叠总计标签配置\n   * @since 1.3.0\n   */\n  [ComponentTypeEnum.totalLabel]?: ITotalLabelTheme;\n  [key: string]: any;\n}\n\n/** 区分方向的组件主题类型 */\nexport type ComponentThemeWithDirection<\n  T extends {\n    orient?: IOrientType;\n  }\n> = T /* 通用主题，留作兼容 */ & {\n  orient?: IOrientType;\n  /** 横向主题 */\n  [Direction.horizontal]?: Omit<T, 'orient'>;\n  /** 纵向主题 */\n  [Direction.vertical]?: Omit<T, 'orient'>;\n};\n"]}
+{"version":3,"sources":["../src/component/interface/theme.ts"],"names":[],"mappings":"","file":"theme.js","sourcesContent":["import type { IAxisCommonTheme } from '../axis/interface';\nimport type { IBrushTheme } from '../brush/interface';\nimport type { ICrosshairTheme } from '../crosshair/interface';\nimport type { IDataZoomTheme } from '../data-zoom/data-zoom/interface';\nimport type { IScrollBarTheme } from '../data-zoom/scroll-bar/interface';\nimport type { IIndicatorTheme } from '../indicator/interface';\nimport type { IDiscreteLegendTheme } from '../legend/discrete/interface';\nimport type { IColorLegendTheme, ISizeLegendTheme } from '../legend/continuous/interface';\nimport type { IMarkAreaTheme } from '../marker/mark-area/interface';\nimport type { IMarkLineTheme } from '../marker/mark-line/interface';\nimport type { IMarkPointTheme } from '../marker/mark-point/interface';\nimport type { IPlayerTheme } from '../player/interface';\nimport type { ITitleTheme } from '../title/interface';\nimport type { ITooltipSpec, ITooltipTheme } from '../tooltip/interface';\nimport type { ComponentTypeEnum } from './type';\nimport type { ITotalLabelTheme } from '../label/interface';\nimport type { IPoptipTheme } from '../poptip/interface';\nimport type { IColorKey } from '../../theme/color-scheme/interface';\nimport type { Direction, IOrientType } from '../../typings';\nimport type { ICartesianAxisCommonTheme } from '../axis/cartesian/interface/theme';\nimport type { IPolarAxisCommonTheme } from '../axis/polar/interface/theme';\n\nexport interface IComponentTheme {\n  /**\n   * 通用坐标轴配置\n   */\n  axis?: IAxisCommonTheme;\n  /**\n   * 离散轴的通用配置\n   */\n  axisBand?: IAxisCommonTheme;\n  /**\n   * 连续轴的通用配置\n   */\n  axisLinear?: IAxisCommonTheme;\n  /**\n   * 笛卡尔坐标系下 x 轴的配置\n   */\n  axisX?: ICartesianAxisCommonTheme;\n  /**\n   * 笛卡尔坐标系下 y 轴配置\n   */\n  axisY?: ICartesianAxisCommonTheme;\n  /**\n   * 极坐标系下半径轴配置\n   */\n  axisRadius?: IPolarAxisCommonTheme;\n  /**\n   * 极坐标系下角度轴配置\n   */\n  axisAngle?: IPolarAxisCommonTheme;\n  /**\n   * 离散图例配置\n   */\n  [ComponentTypeEnum.discreteLegend]?: IDiscreteLegendTheme;\n  /**\n   * 连续颜色图例配置\n   */\n  [ComponentTypeEnum.colorLegend]?: IColorLegendTheme;\n  /**\n   * 连续尺寸图例配置\n   */\n  [ComponentTypeEnum.sizeLegend]?: ISizeLegendTheme;\n  /**\n   * markLine 标记配置\n   */\n  [ComponentTypeEnum.markLine]?: IMarkLineTheme;\n  [ComponentTypeEnum.polarMarkLine]?: IMarkLineTheme;\n  /**\n   * markArea 标记配置\n   */\n  [ComponentTypeEnum.markArea]?: IMarkAreaTheme;\n  [ComponentTypeEnum.polarMarkArea]?: IMarkAreaTheme;\n  /**\n   * markPoint 标记配置\n   */\n  [ComponentTypeEnum.markPoint]?: IMarkPointTheme;\n  [ComponentTypeEnum.polarMarkPoint]?: IMarkPointTheme;\n  [ComponentTypeEnum.geoMarkPoint]?: IMarkPointTheme;\n  /**\n   * tooltip 组件配置\n   */\n  [ComponentTypeEnum.tooltip]?: ITooltipTheme<string | IColorKey> &\n    Partial<\n      Pick<\n        ITooltipSpec,\n        | 'visible'\n        | 'activeType'\n        | 'mark'\n        | 'dimension'\n        | 'group'\n        | 'trigger'\n        | 'triggerOff'\n        | 'showDelay'\n        | 'hideTimer'\n        | 'lockAfterClick'\n        | 'renderMode'\n        | 'confine'\n        | 'className'\n        | 'parentElement'\n        | 'enterable'\n        | 'throttleInterval'\n      >\n    >;\n  /**\n   * crosshair 配置\n   */\n  [ComponentTypeEnum.crosshair]?: ICrosshairTheme;\n  /**\n   * dataZoom 配置\n   */\n  [ComponentTypeEnum.dataZoom]?: IDataZoomTheme;\n  /**\n   * scrollbar 滚动条配置\n   */\n  [ComponentTypeEnum.scrollBar]?: IScrollBarTheme;\n  /**\n   * 指标卡组件配置\n   */\n  [ComponentTypeEnum.indicator]?: IIndicatorTheme;\n  /**\n   * 播放器配置\n   */\n  [ComponentTypeEnum.player]?: IPlayerTheme;\n  /**\n   * 框选配置\n   */\n  [ComponentTypeEnum.brush]?: IBrushTheme;\n  /**\n   * 图表标题配置\n   */\n  [ComponentTypeEnum.title]?: ITitleTheme;\n  /**\n   * 省略文本配置\n   */\n  [ComponentTypeEnum.poptip]?: IPoptipTheme;\n  /**\n   * 堆叠总计标签配置\n   * @since 1.3.0\n   */\n  [ComponentTypeEnum.totalLabel]?: ITotalLabelTheme;\n  [key: string]: any;\n}\n\n/** 区分方向的组件主题类型 */\nexport type ComponentThemeWithDirection<\n  T extends {\n    orient?: IOrientType;\n  }\n> = T /* 通用主题，留作兼容 */ & {\n  orient?: IOrientType;\n  /** 横向主题 */\n  [Direction.horizontal]?: Omit<T, 'orient'>;\n  /** 纵向主题 */\n  [Direction.vertical]?: Omit<T, 'orient'>;\n};\n"]}

package/cjs/component/tooltip/tooltip-transformer.js

@@ -4,22 +4,24 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.TooltipSpecTransformer = void 0;
 
-const vrender_core_1 = require("@visactor/vrender-core"), util_1 = require("../../util"), base_1 = require("../base"), constant_1 = require("./constant"), common_1 = require("./utils/common"), vutils_extension_1 = require("@visactor/vutils-extension");
+const vrender_core_1 = require("@visactor/vrender-core"), util_1 = require("../../util"), base_1 = require("../base"), constant_1 = require("./constant"), common_1 = require("./utils/common"), vutils_extension_1 = require("@visactor/vutils-extension"), TOOLTIP_STYLE_THEME_KEYS = [ "panel", "shape", "titleLabel", "keyLabel", "valueLabel", "spaceRow", "maxContentHeight", "align" ];
 
 class TooltipSpecTransformer extends base_1.BaseComponentSpecTransformer {
     _shouldMergeThemeToSpec() {
         return !1;
     }
     _initTheme(spec, chartSpec) {
-        var _a, _b, _c;
-        const {spec: newSpec, theme: theme} = super._initTheme(spec, chartSpec);
-        return newSpec.style = (0, vutils_extension_1.mergeSpec)({}, this._theme, newSpec.style), 
-        newSpec.offset = (0, vutils_extension_1.mergeSpec)({}, theme.offset, spec.offset), 
-        newSpec.transitionDuration = null !== (_a = spec.transitionDuration) && void 0 !== _a ? _a : theme.transitionDuration, 
-        newSpec.trigger = null !== (_b = spec.trigger) && void 0 !== _b ? _b : theme.trigger, 
-        newSpec.triggerOff = null !== (_c = spec.triggerOff) && void 0 !== _c ? _c : theme.triggerOff, 
+        const {spec: newSpec, theme: theme} = super._initTheme(spec, chartSpec), themeStyle = (0, 
+        vutils_extension_1.mergeSpec)({}, ...TOOLTIP_STYLE_THEME_KEYS.map((key => void 0 !== (null == theme ? void 0 : theme[key]) ? {
+            [key]: theme[key]
+        } : void 0)), null == theme ? void 0 : theme.style), themeSpec = (0, vutils_extension_1.mergeSpec)({}, theme);
+        TOOLTIP_STYLE_THEME_KEYS.forEach((key => {
+            delete themeSpec[key];
+        })), delete themeSpec.style;
+        const mergedSpec = (0, vutils_extension_1.mergeSpec)({}, themeSpec, newSpec);
+        return mergedSpec.style = (0, vutils_extension_1.mergeSpec)({}, themeStyle, mergedSpec.style), 
         {
-            spec: newSpec,
+            spec: mergedSpec,
             theme: theme
         };
     }

package/cjs/component/tooltip/tooltip-transformer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/tooltip-transformer.ts"],"names":[],"mappings":";;;AAAA,yDAAiD;AAEjD,qCAA8F;AAC9F,kCAAuD;AACvD,yCAAmD;AACnD,2CAA4D;AAC5D,iEAAuD;AAEvD,MAAa,sBAAuB,SAAQ,mCAAiC;IACjE,uBAAuB;QAC/B,OAAO,KAAK,CAAC;IACf,CAAC;IAES,UAAU,CAAC,IAAS,EAAE,SAAc;;QAC5C,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAGnE,OAAO,CAAC,KAAK,GAAG,IAAA,4BAAS,EAAC,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QAC1D,OAAO,CAAC,MAAM,GAAG,IAAA,4BAAS,EAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1D,OAAO,CAAC,kBAAkB,GAAG,MAAA,IAAI,CAAC,kBAAkB,mCAAI,KAAK,CAAC,kBAAkB,CAAC;QAGjF,OAAO,CAAC,OAAO,GAAG,MAAA,IAAI,CAAC,OAAO,mCAAI,KAAK,CAAC,OAAO,CAAC;QAChD,OAAO,CAAC,UAAU,GAAG,MAAA,IAAI,CAAC,UAAU,mCAAI,KAAK,CAAC,UAAU,CAAC;QAEzD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAClC,CAAC;IAES,+BAA+B,CAAC,IAAS,EAAE,SAAc,EAAE,aAA8B;;QACjG,KAAK,CAAC,+BAA+B,CAAC,IAAI,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;QAEtE,IAAI,CAAC,OAAO,GAAG,MAAA,IAAI,CAAC,OAAO,mCAAI,IAAI,CAAC;QACpC,IAAI,CAAC,UAAU,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU;YACb,MAAA,IAAI,CAAC,UAAU,mCAEf,CAAC,IAAA,wBAAiB,EAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAA,oBAAa,EAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAClG,IAAI,CAAC,OAAO,GAAG,MAAA,IAAI,CAAC,OAAO,mCAAI,OAAO,CAAC;QACvC,IAAI,CAAC,SAAS,GAAG,MAAA,IAAI,CAAC,SAAS,mCAAI,gCAAqB,CAAC;QACzD,IAAI,CAAC,SAAS,GAAG,MAAA,IAAI,CAAC,SAAS,mCAAI,KAAK,CAAC;QACzC,IAAI,CAAC,kBAAkB,GAAG,MAAA,IAAI,CAAC,kBAAkB,mCAAI,GAAG,CAAC;QACzD,IAAI,CAAC,OAAO,GAAG,MAAA,IAAI,CAAC,OAAO,mCAAI,IAAI,CAAC,UAAU,KAAK,QAAQ,CAAC;QAE5D,IAAI,IAAA,cAAO,EAAC,IAAI,CAAC,aAAa,CAAC,EAAE;YAC/B,IAAI,IAAA,eAAQ,EAAC,IAAI,CAAC,aAAa,CAAC,EAAE;gBAChC,IAAI,CAAC,aAAa,GAAG,sBAAO,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;aACjE;SACF;aAAM,IAAI,IAAA,oBAAa,EAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC3C,IAAI,CAAC,aAAa,GAAG,kBAAW,aAAX,kBAAW,uBAAX,kBAAW,CAAE,IAAI,CAAC;SACxC;IACH,CAAC;CACF;AA3CD,wDA2CC","file":"tooltip-transformer.js","sourcesContent":["import { vglobal } from '@visactor/vrender-core';\nimport type { IChartSpecInfo } from '../../chart/interface';\nimport { domDocument, isMiniAppLikeMode, isString, isTrueBrowser, isValid } from '../../util';\nimport { BaseComponentSpecTransformer } from '../base';\nimport { TOOLTIP_EL_CLASS_NAME } from './constant';\nimport { getTooltipActualActiveType } from './utils/common';\nimport { mergeSpec } from '@visactor/vutils-extension';\n\nexport class TooltipSpecTransformer extends BaseComponentSpecTransformer<any> {\n  protected _shouldMergeThemeToSpec() {\n    return false;\n  }\n\n  protected _initTheme(spec: any, chartSpec: any): { spec: any; theme: any } {\n    const { spec: newSpec, theme } = super._initTheme(spec, chartSpec);\n\n    // 合并样式和配置\n    newSpec.style = mergeSpec({}, this._theme, newSpec.style);\n    newSpec.offset = mergeSpec({}, theme.offset, spec.offset);\n    newSpec.transitionDuration = spec.transitionDuration ?? theme.transitionDuration;\n\n    // 合并交互相关配置\n    newSpec.trigger = spec.trigger ?? theme.trigger;\n    newSpec.triggerOff = spec.triggerOff ?? theme.triggerOff;\n\n    return { spec: newSpec, theme };\n  }\n\n  protected _transformSpecAfterMergingTheme(spec: any, chartSpec: any, chartSpecInfo?: IChartSpecInfo) {\n    super._transformSpecAfterMergingTheme(spec, chartSpec, chartSpecInfo);\n\n    spec.visible = spec.visible ?? true;\n    spec.activeType = getTooltipActualActiveType(spec);\n    spec.renderMode =\n      spec.renderMode ??\n      // 小程序或非浏览器环境下，默认使用canvas渲染\n      (isMiniAppLikeMode(this._option.mode) || !isTrueBrowser(this._option.mode) ? 'canvas' : 'html');\n    spec.trigger = spec.trigger ?? 'hover';\n    spec.className = spec.className ?? TOOLTIP_EL_CLASS_NAME;\n    spec.enterable = spec.enterable ?? false;\n    spec.transitionDuration = spec.transitionDuration ?? 150;\n    spec.confine = spec.confine ?? spec.renderMode === 'canvas';\n\n    if (isValid(spec.parentElement)) {\n      if (isString(spec.parentElement)) {\n        spec.parentElement = vglobal.getElementById(spec.parentElement);\n      }\n    } else if (isTrueBrowser(this._option.mode)) {\n      spec.parentElement = domDocument?.body;\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/component/tooltip/tooltip-transformer.ts"],"names":[],"mappings":"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","file":"tooltip-transformer.js","sourcesContent":["import { vglobal } from '@visactor/vrender-core';\nimport type { IChartSpecInfo } from '../../chart/interface';\nimport { domDocument, isMiniAppLikeMode, isString, isTrueBrowser, isValid } from '../../util';\nimport { BaseComponentSpecTransformer } from '../base';\nimport { TOOLTIP_EL_CLASS_NAME } from './constant';\nimport { getTooltipActualActiveType } from './utils/common';\nimport { mergeSpec } from '@visactor/vutils-extension';\n\nconst TOOLTIP_STYLE_THEME_KEYS = [\n  'panel',\n  'shape',\n  'titleLabel',\n  'keyLabel',\n  'valueLabel',\n  'spaceRow',\n  'maxContentHeight',\n  'align'\n] as const;\n\nexport class TooltipSpecTransformer extends BaseComponentSpecTransformer<any> {\n  protected _shouldMergeThemeToSpec() {\n    return false;\n  }\n\n  protected _initTheme(spec: any, chartSpec: any): { spec: any; theme: any } {\n    const { spec: newSpec, theme } = super._initTheme(spec, chartSpec);\n    const themeStyle = mergeSpec(\n      {},\n      ...TOOLTIP_STYLE_THEME_KEYS.map(key => (theme?.[key] !== undefined ? { [key]: theme[key] } : undefined)),\n      theme?.style\n    );\n    const themeSpec = mergeSpec({}, theme);\n\n    TOOLTIP_STYLE_THEME_KEYS.forEach(key => {\n      delete themeSpec[key];\n    });\n    delete themeSpec.style;\n\n    const mergedSpec = mergeSpec({}, themeSpec, newSpec);\n\n    // 合并样式配置\n    mergedSpec.style = mergeSpec({}, themeStyle, mergedSpec.style);\n\n    return { spec: mergedSpec, theme };\n  }\n\n  protected _transformSpecAfterMergingTheme(spec: any, chartSpec: any, chartSpecInfo?: IChartSpecInfo) {\n    super._transformSpecAfterMergingTheme(spec, chartSpec, chartSpecInfo);\n\n    spec.visible = spec.visible ?? true;\n    spec.activeType = getTooltipActualActiveType(spec);\n    spec.renderMode =\n      spec.renderMode ??\n      // 小程序或非浏览器环境下，默认使用canvas渲染\n      (isMiniAppLikeMode(this._option.mode) || !isTrueBrowser(this._option.mode) ? 'canvas' : 'html');\n    spec.trigger = spec.trigger ?? 'hover';\n    spec.className = spec.className ?? TOOLTIP_EL_CLASS_NAME;\n    spec.enterable = spec.enterable ?? false;\n    spec.transitionDuration = spec.transitionDuration ?? 150;\n    spec.confine = spec.confine ?? spec.renderMode === 'canvas';\n\n    if (isValid(spec.parentElement)) {\n      if (isString(spec.parentElement)) {\n        spec.parentElement = vglobal.getElementById(spec.parentElement);\n      }\n    } else if (isTrueBrowser(this._option.mode)) {\n      spec.parentElement = domDocument?.body;\n    }\n  }\n}\n"]}

package/cjs/core/index.d.ts

@@ -1,7 +1,7 @@
 import { VChart } from './vchart';
 import { Factory } from './factory';
 export { VChart, Factory };
-export declare const version = "2.0.21";
+export declare const version = "2.0.22";
 export type { IVChart } from './interface';
 export type { IStateSpec, StateValueType } from '../compile/mark';
 export type { IRegion } from '../region/interface';

package/cjs/core/index.js

@@ -35,7 +35,7 @@ Object.defineProperty(exports, "Factory", {
     get: function() {
         return factory_1.Factory;
     }
-}), exports.version = "2.0.21", __exportStar(require("../event/interface"), exports), 
+}), exports.version = "2.0.22", __exportStar(require("../event/interface"), exports), 
 __exportStar(require("../theme/interface"), exports), __exportStar(require("../model/interface"), exports), 
 __exportStar(require("./interface"), exports), __exportStar(require("../typings"), exports), 
 __exportStar(require("../constant/base"), exports), __exportStar(require("../constant/data"), exports), 
@@ -199,4 +199,4 @@ Object.defineProperty(exports, "measureText", {
         return text_1.measureText;
     }
 });
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/cjs/core/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAIA,qCAAkC;AAGzB,uFAHA,eAAM,OAGA;AAFf,uCAAoC;AAEnB,wFAFR,iBAAO,OAEQ;AAGX,QAAA,OAAO,GAAG,QAAQ,CAAC;AAOhC,qDAAmC;AACnC,qDAAmC;AACnC,qDAAmC;AAEnC,8CAA4B;AAC5B,6CAA2B;AAI3B,mDAAiC;AACjC,mDAAiC;AACjC,qDAAmC;AACnC,mDAAuD;AAA9C,2GAAA,cAAc,OAAA;AACvB,iDAAoD;AAA3C,4GAAA,cAAc,OAAA;AACvB,uDAA6D;AAApD,6GAAA,gBAAgB,OAAA;AACzB,2CAA+C;AAAtC,mGAAA,UAAU,OAAA;AAKnB,wDAAsC;AACtC,oDAAkC;AAGlC,qDAAmC;AAGnC,iDAA+B;AAG/B,uDAUgC;AAT9B,uGAAA,OAAO,OAAA;AACP,2GAAA,WAAW,OAAA;AACX,8GAAA,cAAc,OAAA;AACd,0GAAA,UAAU,OAAA;AACV,yGAAA,SAAS,OAAA;AACT,0GAAA,UAAU,OAAA;AACV,0GAAA,UAAU,OAAA;AACV,0GAAA,UAAU,OAAA;AACV,4GAAA,YAAY,OAAA;AAEd,6DAAsE;AAA7D,+GAAA,YAAY,OAAA;AAAE,8GAAA,WAAW,OAAA;AAGlC,gDAA8B;AAC9B,uCAAmD;AAA1C,2GAAA,kBAAkB,OAAA;AAC3B,0CAAgD;AAAvC,mGAAA,WAAW,OAAA;AACpB,6CAAmG;AAA1F,yHAAA,6BAA6B,OAAA;AAAE,4HAAA,gCAAgC,OAAA;AACxE,oDAAmD;AAA1C,gGAAA,MAAM,OAAA;AACf,uCAAqC;AAA5B,6FAAA,IAAI,OAAA;AACb,qCAA2C;AAAlC,mGAAA,WAAW,OAAA","file":"index.js","sourcesContent":["/**\n * @description The core module of VChart, containing the necessary interfaces for using VChart.\n */\n\nimport { VChart } from './vchart';\nimport { Factory } from './factory';\n\nexport { VChart, Factory };\n\n// export the version\nexport const version = \"2.0.21\";\n\n// export necessary types\nexport type { IVChart } from './interface';\nexport type { IStateSpec, StateValueType } from '../compile/mark';\nexport type { IRegion } from '../region/interface';\n\nexport * from '../event/interface';\nexport * from '../theme/interface';\nexport * from '../model/interface';\n\nexport * from './interface';\nexport * from '../typings';\nexport type { IMarkGraphic, IGraphicContext } from '../mark/interface/';\n\n// some constants\nexport * from '../constant/base';\nexport * from '../constant/data';\nexport * from '../constant/layout';\nexport { AttributeLevel } from '../constant/attribute';\nexport { TransformLevel } from '../data/initialize';\nexport { STATE_VALUE_ENUM } from '../compile/mark/interface';\nexport { ChartEvent } from '../constant/event';\n\n/**\n * spec\n */\nexport * from '../typings/spec/index';\nexport * from '../typings/visual';\n\n// tooltip\nexport * from '../typings/tooltip';\n\n// theme\nexport * from '../theme/index';\n\n// vrender\nexport {\n  vglobal,\n  createGroup,\n  createRichText,\n  createText,\n  createArc,\n  createArea,\n  createRect,\n  createLine,\n  createSymbol\n} from '@visactor/vrender-core';\nexport { ManualTicker, StreamLight } from '@visactor/vrender-animate';\n\n// utils\nexport * from '../util/space';\nexport { transformToGraphic } from '../util/style';\nexport { getSpecInfo } from '../component/util';\nexport { registerDataSetInstanceParser, registerDataSetInstanceTransform } from '../data/register';\nexport { lookup } from '../data/transforms/lookup';\nexport { warn } from '../util/debug';\nexport { measureText } from '../util/text';\n"]}
+{"version":3,"sources":["../src/core/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAIA,qCAAkC;AAGzB,uFAHA,eAAM,OAGA;AAFf,uCAAoC;AAEnB,wFAFR,iBAAO,OAEQ;AAGX,QAAA,OAAO,GAAG,QAAQ,CAAC;AAOhC,qDAAmC;AACnC,qDAAmC;AACnC,qDAAmC;AAEnC,8CAA4B;AAC5B,6CAA2B;AAI3B,mDAAiC;AACjC,mDAAiC;AACjC,qDAAmC;AACnC,mDAAuD;AAA9C,2GAAA,cAAc,OAAA;AACvB,iDAAoD;AAA3C,4GAAA,cAAc,OAAA;AACvB,uDAA6D;AAApD,6GAAA,gBAAgB,OAAA;AACzB,2CAA+C;AAAtC,mGAAA,UAAU,OAAA;AAKnB,wDAAsC;AACtC,oDAAkC;AAGlC,qDAAmC;AAGnC,iDAA+B;AAG/B,uDAUgC;AAT9B,uGAAA,OAAO,OAAA;AACP,2GAAA,WAAW,OAAA;AACX,8GAAA,cAAc,OAAA;AACd,0GAAA,UAAU,OAAA;AACV,yGAAA,SAAS,OAAA;AACT,0GAAA,UAAU,OAAA;AACV,0GAAA,UAAU,OAAA;AACV,0GAAA,UAAU,OAAA;AACV,4GAAA,YAAY,OAAA;AAEd,6DAAsE;AAA7D,+GAAA,YAAY,OAAA;AAAE,8GAAA,WAAW,OAAA;AAGlC,gDAA8B;AAC9B,uCAAmD;AAA1C,2GAAA,kBAAkB,OAAA;AAC3B,0CAAgD;AAAvC,mGAAA,WAAW,OAAA;AACpB,6CAAmG;AAA1F,yHAAA,6BAA6B,OAAA;AAAE,4HAAA,gCAAgC,OAAA;AACxE,oDAAmD;AAA1C,gGAAA,MAAM,OAAA;AACf,uCAAqC;AAA5B,6FAAA,IAAI,OAAA;AACb,qCAA2C;AAAlC,mGAAA,WAAW,OAAA","file":"index.js","sourcesContent":["/**\n * @description The core module of VChart, containing the necessary interfaces for using VChart.\n */\n\nimport { VChart } from './vchart';\nimport { Factory } from './factory';\n\nexport { VChart, Factory };\n\n// export the version\nexport const version = \"2.0.22\";\n\n// export necessary types\nexport type { IVChart } from './interface';\nexport type { IStateSpec, StateValueType } from '../compile/mark';\nexport type { IRegion } from '../region/interface';\n\nexport * from '../event/interface';\nexport * from '../theme/interface';\nexport * from '../model/interface';\n\nexport * from './interface';\nexport * from '../typings';\nexport type { IMarkGraphic, IGraphicContext } from '../mark/interface/';\n\n// some constants\nexport * from '../constant/base';\nexport * from '../constant/data';\nexport * from '../constant/layout';\nexport { AttributeLevel } from '../constant/attribute';\nexport { TransformLevel } from '../data/initialize';\nexport { STATE_VALUE_ENUM } from '../compile/mark/interface';\nexport { ChartEvent } from '../constant/event';\n\n/**\n * spec\n */\nexport * from '../typings/spec/index';\nexport * from '../typings/visual';\n\n// tooltip\nexport * from '../typings/tooltip';\n\n// theme\nexport * from '../theme/index';\n\n// vrender\nexport {\n  vglobal,\n  createGroup,\n  createRichText,\n  createText,\n  createArc,\n  createArea,\n  createRect,\n  createLine,\n  createSymbol\n} from '@visactor/vrender-core';\nexport { ManualTicker, StreamLight } from '@visactor/vrender-animate';\n\n// utils\nexport * from '../util/space';\nexport { transformToGraphic } from '../util/style';\nexport { getSpecInfo } from '../component/util';\nexport { registerDataSetInstanceParser, registerDataSetInstanceTransform } from '../data/register';\nexport { lookup } from '../data/transforms/lookup';\nexport { warn } from '../util/debug';\nexport { measureText } from '../util/text';\n"]}

package/cjs/core/instance-manager.js

@@ -28,4 +28,4 @@ class InstanceManager {
 }
 
 exports.InstanceManager = InstanceManager, InstanceManager.instances = new Map;
-//# sourceMappingURL=instance-manager.js.map
+//# sourceMappingURL=instance-manager.js.map

package/cjs/core/vchart.js

@@ -307,7 +307,7 @@ class VChart {
         if (updateResult.reMake && (this._releaseData(), this._initDataSet(), null === (_a = this._chart) || void 0 === _a || _a.release(), 
         this._chart = null), updateResult.reTransformSpec && (this._chartSpecTransformer = null), 
         updateResult.changeTheme ? (this._setCurrentTheme(), this._setFontFamilyTheme(this.getTheme("fontFamily"))) : updateResult.changeBackground && (null === (_b = this._compiler) || void 0 === _b || _b.setBackground(this._getBackground())), 
-        updateResult.reMake ? (null === (_c = this._compiler) || void 0 === _c || _c.releaseGrammar(), 
+        updateResult.reMake ? (null === (_c = this._compiler) || void 0 === _c || _c.releaseGrammar(!0), 
         this._userEvents.forEach((e => {
             var _a;
             return null === (_a = this._event) || void 0 === _a ? void 0 : _a.on(e.eType, e.query, e.handler);
@@ -737,8 +737,9 @@ class VChart {
         this._option.layout = layout, null === (_a = this._chart) || void 0 === _a || _a.setLayout(layout);
     }
     reLayout() {
-        var _a;
-        this._chart.resetLayoutItemTag(), null === (_a = this._chart) || void 0 === _a || _a.setLayoutTag(!0);
+        var _a, _b, _c;
+        null === (_a = this._chart) || void 0 === _a || _a.resetLayoutItemTag(), null === (_b = this._chart) || void 0 === _b || _b.setLayoutTag(!0, null, !1), 
+        null === (_c = this._compiler) || void 0 === _c || _c.render();
     }
     getCompiler() {
         return this._compiler;