@visactor/vchart 2.0.22-alpha.4 → 2.0.22

package/cjs/series/scatter/scatter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/scatter/scatter.ts"],"names":[],"mappings":"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","file":"scatter.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport { PREFIX } from '../../constant/base';\nimport type { DataView } from '@visactor/vdataset';\nimport type { Datum, ScaleType, VisualType, IScatterInvalidType } from '../../typings';\nimport type { IScatterSeriesSpec, ScatterAppearPreset } from './interface';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport { isNil, isValid, isObject, isFunction, isString, isArray, isNumber, isNumeric } from '@visactor/vutils';\nimport { AttributeLevel } from '../../constant/attribute';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';\nimport { STATE_VALUE_ENUM } from '../../compile/mark/interface';\nimport {\n  SCATTER_DEFAULT_RANGE_SHAPE,\n  SCATTER_DEFAULT_RANGE_SIZE,\n  SCATTER_DEFAULT_SHAPE,\n  SCATTER_DEFAULT_SHAPE_SCALE_TYPE,\n  SCATTER_DEFAULT_SIZE,\n  SCATTER_DEFAULT_SIZE_SCALE_TYPE\n} from '../../constant/scatter';\nimport { animationConfig, shouldMarkDoMorph, userAnimationConfig } from '../../animation/utils';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport { registerScatterAnimation } from './animation';\nimport { registerSymbolMark } from '../../mark/symbol';\nimport { scatterSeriesMark } from './constant';\nimport { Factory } from '../../core/factory';\nimport type { ILabelMark, IMark, IMarkGraphic, ISymbolMark } from '../../mark/interface';\nimport { ScatterSeriesSpecTransformer } from './scatter-transformer';\nimport { getGroupAnimationParams } from '../util/utils';\nimport { registerCartesianLinearAxis, registerCartesianBandAxis } from '../../component/axis/cartesian';\nimport { scatter } from '../../theme/builtin/common/series/scatter';\n\nexport class ScatterSeries<T extends IScatterSeriesSpec = IScatterSeriesSpec> extends CartesianSeries<T> {\n  static readonly type: string = SeriesTypeEnum.scatter;\n  type = SeriesTypeEnum.scatter;\n\n  static readonly mark: SeriesMarkMap = scatterSeriesMark;\n  static readonly builtInTheme = { scatter };\n  static readonly transformerConstructor = ScatterSeriesSpecTransformer as any;\n  readonly transformerConstructor = ScatterSeriesSpecTransformer;\n\n  private _symbolMark: ISymbolMark;\n  private _labelMark: ILabelMark;\n\n  private _size: IScatterSeriesSpec['size'];\n  private _sizeField: string;\n  private _shape: IScatterSeriesSpec['shape'];\n  private _shapeField: string;\n\n  protected _invalidType: IScatterInvalidType = 'zero';\n\n  setAttrFromSpec() {\n    super.setAttrFromSpec();\n\n    // size\n    this._size = this._spec.size;\n    this._sizeField = this._spec.sizeField;\n    // shape\n    this._shape = this._spec.shape;\n    this._shapeField = this._spec.shapeField;\n  }\n\n  private _getSeriesAttribute<T>(\n    field: string,\n    spec: VisualType<T>,\n    {\n      defaultScaleType,\n      defaultRange\n    }: {\n      defaultScaleType: ScaleType;\n      defaultRange: T[];\n    },\n    key: string\n  ): VisualType<T> {\n    // 若sizeSpec是函数\n    if (isFunction(spec)) {\n      return spec;\n    }\n\n    if (isArray(spec)) {\n      if (isNil(field)) {\n        this._option?.onError(`${key}Field is required.`);\n        return spec;\n      }\n\n      if (defaultScaleType !== 'ordinal' && (spec as any[]).length > 2) {\n        this._option?.onError(`${key} length is invalid, specify up to 2 ${key}s.`);\n        return spec;\n      }\n      const scaleName = `${PREFIX}_series_scatter_${this.id}_scale_${key}`;\n      this._option.globalScale.registerModelScale({\n        id: scaleName,\n        type: defaultScaleType,\n        domain: [\n          {\n            dataId: this._rawData.name,\n            fields: [field]\n          }\n        ],\n        range: spec\n      });\n      return {\n        scale: scaleName,\n        field\n      };\n    }\n\n    // 若sizeSpec是对象\n    if (isObject(spec)) {\n      if (isNil(field)) {\n        this._option?.onError(`${key}Field is required.`);\n        return spec;\n      }\n      const scaleName = `${PREFIX}_series_scatter_${this.id}_scale_${key}`;\n      const visualSpec = {\n        id: scaleName,\n        type: defaultScaleType,\n        domain: [\n          {\n            dataId: this._rawData.name,\n            fields: [field]\n          }\n        ],\n        range: defaultRange,\n        ...spec\n      };\n\n      this._option.globalScale.registerModelScale(visualSpec);\n      return {\n        scale: visualSpec.id,\n        field\n      };\n    }\n\n    // 其余情况报错\n    this._option?.onError(`${key} attribute is invalid.`);\n    return spec;\n  }\n\n  /**\n   * 计算sizeScale\n   * @param field 数据对应字段\n   * @param sizeSpec size配置\n   */\n  private getSizeAttribute(field: string, sizeSpec: IScatterSeriesSpec['size']): VisualType<number> {\n    // 若sizeSpec不存在\n    if (isNil(sizeSpec)) {\n      // Tips: spec会被theme配置merge, 所以Spec没配置, 不一定会触发这里.\n      return SCATTER_DEFAULT_SIZE;\n    }\n\n    // 若sizeSpec是数值\n    if (isNumber(sizeSpec)) {\n      return sizeSpec;\n    }\n\n    // 若sizeSpec是字符串中的数值\n    if (isString(sizeSpec) && isNumeric(sizeSpec)) {\n      return parseFloat(sizeSpec);\n    }\n\n    return this._getSeriesAttribute<number>(\n      field,\n      sizeSpec as VisualType<number>,\n      {\n        defaultScaleType: SCATTER_DEFAULT_SIZE_SCALE_TYPE,\n        defaultRange: SCATTER_DEFAULT_RANGE_SIZE\n      },\n      'size'\n    );\n  }\n\n  /**\n   * 计算shapeScale\n   * @param field 数据对应字段\n   * @param shapeSpec shape配置\n   */\n  private getShapeAttribute(field: string, shapeSpec: IScatterSeriesSpec['shape']): VisualType<string> {\n    // 若shapeSpec不存在\n    if (isNil(shapeSpec)) {\n      // Tips: spec会被theme配置merge, 所以Spec没配置, 不一定会触发这里.\n      return SCATTER_DEFAULT_SHAPE;\n    }\n\n    // 若shapeSpec是字符串\n    if (isString(shapeSpec)) {\n      return shapeSpec;\n    }\n\n    return this._getSeriesAttribute<string>(\n      field,\n      shapeSpec as VisualType<string>,\n      {\n        defaultScaleType: SCATTER_DEFAULT_SHAPE_SCALE_TYPE,\n        defaultRange: SCATTER_DEFAULT_RANGE_SHAPE\n      },\n      'shape'\n    );\n  }\n\n  /**\n   * 初始化Mark\n   */\n  initMark(): void {\n    this._symbolMark = this._createMark(\n      ScatterSeries.mark.point,\n      {\n        groupKey: this._seriesField,\n        isSeriesMark: true\n      },\n      {\n        morph: shouldMarkDoMorph(this._spec, ScatterSeries.mark.point.name),\n        morphElementKey: this.getDimensionField()[0]\n      }\n    ) as ISymbolMark;\n  }\n\n  /**\n   * 初始化散点图各类Mark的Style\n   */\n  initMarkStyle(): void {\n    this.initSymbolMarkStyle();\n  }\n\n  /**\n   * 初始化动画\n   */\n  initAnimation(): void {\n    const animationParams = getGroupAnimationParams(this);\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<ScatterAppearPreset>)?.preset;\n    this._symbolMark.setAnimationConfig(\n      animationConfig(\n        Factory.getAnimationInKey('scatter')?.({}, appearPreset),\n        userAnimationConfig(SeriesMarkNameEnum.point, this._spec, this._markAttributeContext),\n        animationParams\n      )\n    );\n  }\n\n  /**\n   * 初始化SymbolMark\n   */\n  private initSymbolMarkStyle(): void {\n    const symbolMark = this._symbolMark;\n    if (!symbolMark) {\n      return;\n    }\n\n    if (this._invalidType !== 'zero') {\n      this.setMarkStyle(symbolMark, {\n        visible: this._getInvalidDefined.bind(this)\n      });\n    }\n\n    this.setMarkStyle(\n      symbolMark,\n      {\n        x: this.dataToPositionX.bind(this),\n        y: this.dataToPositionY.bind(this),\n        z: this._fieldZ ? this.dataToPositionZ.bind(this) : null,\n        fill: this.getColorAttribute(),\n        size: isNumber(this._size) || isFunction(this._size) ? this._size : SCATTER_DEFAULT_SIZE,\n        symbolType: isString(this._shape) || isFunction(this._shape) ? this._shape : SCATTER_DEFAULT_SHAPE\n      },\n      STATE_VALUE_ENUM.STATE_NORMAL,\n      AttributeLevel.Series\n    );\n\n    if (isValid(this._sizeField) || isValid(this._size)) {\n      this.setMarkStyle(\n        symbolMark,\n        {\n          size: this.getSizeAttribute(this._sizeField, this._size) as VisualType<number>\n        },\n        STATE_VALUE_ENUM.STATE_NORMAL,\n        AttributeLevel.User_Mark\n      );\n    }\n\n    if (isValid(this._shapeField) || isValid(this._shape)) {\n      this.setMarkStyle(\n        symbolMark,\n        {\n          symbolType: this.getShapeAttribute(this._shapeField, this._shape) as VisualType<string>\n        },\n        STATE_VALUE_ENUM.STATE_NORMAL,\n        AttributeLevel.User_Mark\n      );\n    }\n  }\n\n  protected initTooltip() {\n    super.initTooltip();\n\n    this._symbolMark && this._tooltipHelper.activeTriggerSet.mark.add(this._symbolMark);\n  }\n\n  viewDataStatisticsUpdate(d: DataView) {\n    super.viewDataStatisticsUpdate(d);\n    const fields = [this.getDimensionField()[0], this.getStackValueField()];\n    const allValid = fields.every(field => field && this.getViewDataStatistics()?.latestData?.[field]?.allValid);\n    if (this._invalidType === 'zero' || allValid) {\n      this.setMarkStyle(this._symbolMark, { visible: true }, 'normal', AttributeLevel.Series);\n    } else {\n      this.setMarkStyle(\n        this._symbolMark,\n        { visible: this._getInvalidDefined.bind(this) },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n\n    // if has produce, reCompile encode to set attribute to product\n    if (this._symbolMark.getProduct()) {\n      this._symbolMark.compileEncode();\n    }\n  }\n\n  /**\n   * 初始化LabelMark\n   */\n  initLabelMarkStyle(labelMark?: ILabelMark): void {\n    if (!labelMark) {\n      return;\n    }\n    this._labelMark = labelMark;\n    this.setMarkStyle(\n      labelMark,\n      {\n        fill: this.getColorAttribute(),\n        text: (datum: Datum) => {\n          return datum[this.getStackValueField()];\n        },\n        z: this._fieldZ ? this.dataToPositionZ.bind(this) : null\n      },\n      STATE_VALUE_ENUM.STATE_NORMAL,\n      AttributeLevel.Series\n    );\n    if (this._invalidType !== 'zero') {\n      this.setMarkStyle(\n        labelMark,\n        {\n          visible: this._getInvalidDefined.bind(this)\n        },\n        STATE_VALUE_ENUM.STATE_NORMAL,\n        AttributeLevel.Series\n      );\n    }\n  }\n\n  /**\n   * 处理缩放\n   */\n  handleZoom(e: any) {\n    this.getMarksWithoutRoot().forEach(mark => {\n      if (!mark) {\n        return;\n      }\n      const graphics = mark.getGraphics();\n\n      if (!graphics || !graphics.length) {\n        return;\n      }\n\n      graphics.forEach((graphicItem: IMarkGraphic, i: number) => {\n        const datum = graphicItem?.context?.data?.[0];\n        const newPosition = this.dataToPosition(datum);\n        if (newPosition && graphicItem) {\n          graphicItem.translateTo(newPosition.x, newPosition.y);\n        }\n      });\n    });\n\n    const vgrammarLabel = this._labelMark?.getComponent()?.getProduct();\n\n    if (vgrammarLabel) {\n      (vgrammarLabel as any).evaluate(null, null);\n    }\n  }\n\n  handlePan(e: any) {\n    // TODO 现在处理好像一模一样\n    this.handleZoom(e);\n  }\n\n  getDefaultShapeType() {\n    return 'circle';\n  }\n\n  getActiveMarks(): IMark[] {\n    return [this._symbolMark];\n  }\n}\n\nexport const registerScatterSeries = () => {\n  registerSymbolMark();\n  registerScatterAnimation();\n  registerCartesianBandAxis();\n  registerCartesianLinearAxis();\n  Factory.registerSeries(ScatterSeries.type, ScatterSeries);\n};\n"]}
+{"version":3,"sources":["../src/series/scatter/scatter.ts"],"names":[],"mappings":"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","file":"scatter.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport { PREFIX } from '../../constant/base';\nimport type { DataView } from '@visactor/vdataset';\nimport type { Datum, ScaleType, VisualType, IScatterInvalidType } from '../../typings';\nimport type { IScatterSeriesSpec, ScatterAppearPreset } from './interface';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport { isNil, isValid, isObject, isFunction, isString, isArray, isNumber, isNumeric, Matrix } from '@visactor/vutils';\nimport { AttributeLevel } from '../../constant/attribute';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';\nimport { STATE_VALUE_ENUM } from '../../compile/mark/interface';\nimport {\n  SCATTER_DEFAULT_RANGE_SHAPE,\n  SCATTER_DEFAULT_RANGE_SIZE,\n  SCATTER_DEFAULT_SHAPE,\n  SCATTER_DEFAULT_SHAPE_SCALE_TYPE,\n  SCATTER_DEFAULT_SIZE,\n  SCATTER_DEFAULT_SIZE_SCALE_TYPE\n} from '../../constant/scatter';\nimport { animationConfig, shouldMarkDoMorph, userAnimationConfig } from '../../animation/utils';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport { registerScatterAnimation } from './animation';\nimport { registerSymbolMark } from '../../mark/symbol';\nimport { scatterSeriesMark } from './constant';\nimport { Factory } from '../../core/factory';\nimport type { ILabelMark, IMark, IMarkGraphic, ISymbolMark } from '../../mark/interface';\nimport { ScatterSeriesSpecTransformer } from './scatter-transformer';\nimport { getGroupAnimationParams } from '../util/utils';\nimport { registerCartesianLinearAxis, registerCartesianBandAxis } from '../../component/axis/cartesian';\nimport { scatter } from '../../theme/builtin/common/series/scatter';\n\nexport class ScatterSeries<T extends IScatterSeriesSpec = IScatterSeriesSpec> extends CartesianSeries<T> {\n  static readonly type: string = SeriesTypeEnum.scatter;\n  type = SeriesTypeEnum.scatter;\n\n  static readonly mark: SeriesMarkMap = scatterSeriesMark;\n  static readonly builtInTheme = { scatter };\n  static readonly transformerConstructor = ScatterSeriesSpecTransformer as any;\n  readonly transformerConstructor = ScatterSeriesSpecTransformer;\n\n  private _symbolMark: ISymbolMark;\n  private _labelMark: ILabelMark;\n\n  private _size: IScatterSeriesSpec['size'];\n  private _sizeField: string;\n  private _shape: IScatterSeriesSpec['shape'];\n  private _shapeField: string;\n\n  protected _invalidType: IScatterInvalidType = 'zero';\n\n  setAttrFromSpec() {\n    super.setAttrFromSpec();\n\n    // size\n    this._size = this._spec.size;\n    this._sizeField = this._spec.sizeField;\n    // shape\n    this._shape = this._spec.shape;\n    this._shapeField = this._spec.shapeField;\n  }\n\n  private _getSeriesAttribute<T>(\n    field: string,\n    spec: VisualType<T>,\n    {\n      defaultScaleType,\n      defaultRange\n    }: {\n      defaultScaleType: ScaleType;\n      defaultRange: T[];\n    },\n    key: string\n  ): VisualType<T> {\n    // 若sizeSpec是函数\n    if (isFunction(spec)) {\n      return spec;\n    }\n\n    if (isArray(spec)) {\n      if (isNil(field)) {\n        this._option?.onError(`${key}Field is required.`);\n        return spec;\n      }\n\n      if (defaultScaleType !== 'ordinal' && (spec as any[]).length > 2) {\n        this._option?.onError(`${key} length is invalid, specify up to 2 ${key}s.`);\n        return spec;\n      }\n      const scaleName = `${PREFIX}_series_scatter_${this.id}_scale_${key}`;\n      this._option.globalScale.registerModelScale({\n        id: scaleName,\n        type: defaultScaleType,\n        domain: [\n          {\n            dataId: this._rawData.name,\n            fields: [field]\n          }\n        ],\n        range: spec\n      });\n      return {\n        scale: scaleName,\n        field\n      };\n    }\n\n    // 若sizeSpec是对象\n    if (isObject(spec)) {\n      if (isNil(field)) {\n        this._option?.onError(`${key}Field is required.`);\n        return spec;\n      }\n      const scaleName = `${PREFIX}_series_scatter_${this.id}_scale_${key}`;\n      const visualSpec = {\n        id: scaleName,\n        type: defaultScaleType,\n        domain: [\n          {\n            dataId: this._rawData.name,\n            fields: [field]\n          }\n        ],\n        range: defaultRange,\n        ...spec\n      };\n\n      this._option.globalScale.registerModelScale(visualSpec);\n      return {\n        scale: visualSpec.id,\n        field\n      };\n    }\n\n    // 其余情况报错\n    this._option?.onError(`${key} attribute is invalid.`);\n    return spec;\n  }\n\n  /**\n   * 计算sizeScale\n   * @param field 数据对应字段\n   * @param sizeSpec size配置\n   */\n  private getSizeAttribute(field: string, sizeSpec: IScatterSeriesSpec['size']): VisualType<number> {\n    // 若sizeSpec不存在\n    if (isNil(sizeSpec)) {\n      // Tips: spec会被theme配置merge, 所以Spec没配置, 不一定会触发这里.\n      return SCATTER_DEFAULT_SIZE;\n    }\n\n    // 若sizeSpec是数值\n    if (isNumber(sizeSpec)) {\n      return sizeSpec;\n    }\n\n    // 若sizeSpec是字符串中的数值\n    if (isString(sizeSpec) && isNumeric(sizeSpec)) {\n      return parseFloat(sizeSpec);\n    }\n\n    return this._getSeriesAttribute<number>(\n      field,\n      sizeSpec as VisualType<number>,\n      {\n        defaultScaleType: SCATTER_DEFAULT_SIZE_SCALE_TYPE,\n        defaultRange: SCATTER_DEFAULT_RANGE_SIZE\n      },\n      'size'\n    );\n  }\n\n  /**\n   * 计算shapeScale\n   * @param field 数据对应字段\n   * @param shapeSpec shape配置\n   */\n  private getShapeAttribute(field: string, shapeSpec: IScatterSeriesSpec['shape']): VisualType<string> {\n    // 若shapeSpec不存在\n    if (isNil(shapeSpec)) {\n      // Tips: spec会被theme配置merge, 所以Spec没配置, 不一定会触发这里.\n      return SCATTER_DEFAULT_SHAPE;\n    }\n\n    // 若shapeSpec是字符串\n    if (isString(shapeSpec)) {\n      return shapeSpec;\n    }\n\n    return this._getSeriesAttribute<string>(\n      field,\n      shapeSpec as VisualType<string>,\n      {\n        defaultScaleType: SCATTER_DEFAULT_SHAPE_SCALE_TYPE,\n        defaultRange: SCATTER_DEFAULT_RANGE_SHAPE\n      },\n      'shape'\n    );\n  }\n\n  /**\n   * 初始化Mark\n   */\n  initMark(): void {\n    this._symbolMark = this._createMark(\n      ScatterSeries.mark.point,\n      {\n        groupKey: this._seriesField,\n        isSeriesMark: true\n      },\n      {\n        morph: shouldMarkDoMorph(this._spec, ScatterSeries.mark.point.name),\n        morphElementKey: this.getDimensionField()[0]\n      }\n    ) as ISymbolMark;\n  }\n\n  /**\n   * 初始化散点图各类Mark的Style\n   */\n  initMarkStyle(): void {\n    this.initSymbolMarkStyle();\n  }\n\n  /**\n   * 初始化动画\n   */\n  initAnimation(): void {\n    const animationParams = getGroupAnimationParams(this);\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<ScatterAppearPreset>)?.preset;\n    this._symbolMark.setAnimationConfig(\n      animationConfig(\n        Factory.getAnimationInKey('scatter')?.({}, appearPreset),\n        userAnimationConfig(SeriesMarkNameEnum.point, this._spec, this._markAttributeContext),\n        animationParams\n      )\n    );\n  }\n\n  /**\n   * 初始化SymbolMark\n   */\n  private initSymbolMarkStyle(): void {\n    const symbolMark = this._symbolMark;\n    if (!symbolMark) {\n      return;\n    }\n\n    if (this._invalidType !== 'zero') {\n      this.setMarkStyle(symbolMark, {\n        visible: this._getInvalidDefined.bind(this)\n      });\n    }\n\n    this.setMarkStyle(\n      symbolMark,\n      {\n        x: this.dataToPositionX.bind(this),\n        y: this.dataToPositionY.bind(this),\n        z: this._fieldZ ? this.dataToPositionZ.bind(this) : null,\n        fill: this.getColorAttribute(),\n        size: isNumber(this._size) || isFunction(this._size) ? this._size : SCATTER_DEFAULT_SIZE,\n        symbolType: isString(this._shape) || isFunction(this._shape) ? this._shape : SCATTER_DEFAULT_SHAPE\n      },\n      STATE_VALUE_ENUM.STATE_NORMAL,\n      AttributeLevel.Series\n    );\n\n    if (isValid(this._sizeField) || isValid(this._size)) {\n      this.setMarkStyle(\n        symbolMark,\n        {\n          size: this.getSizeAttribute(this._sizeField, this._size) as VisualType<number>\n        },\n        STATE_VALUE_ENUM.STATE_NORMAL,\n        AttributeLevel.User_Mark\n      );\n    }\n\n    if (isValid(this._shapeField) || isValid(this._shape)) {\n      this.setMarkStyle(\n        symbolMark,\n        {\n          symbolType: this.getShapeAttribute(this._shapeField, this._shape) as VisualType<string>\n        },\n        STATE_VALUE_ENUM.STATE_NORMAL,\n        AttributeLevel.User_Mark\n      );\n    }\n  }\n\n  protected initTooltip() {\n    super.initTooltip();\n\n    this._symbolMark && this._tooltipHelper.activeTriggerSet.mark.add(this._symbolMark);\n  }\n\n  viewDataStatisticsUpdate(d: DataView) {\n    super.viewDataStatisticsUpdate(d);\n    const fields = [this.getDimensionField()[0], this.getStackValueField()];\n    const allValid = fields.every(field => field && this.getViewDataStatistics()?.latestData?.[field]?.allValid);\n    if (this._invalidType === 'zero' || allValid) {\n      this.setMarkStyle(this._symbolMark, { visible: true }, 'normal', AttributeLevel.Series);\n    } else {\n      this.setMarkStyle(\n        this._symbolMark,\n        { visible: this._getInvalidDefined.bind(this) },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n\n    // if has produce, reCompile encode to set attribute to product\n    if (this._symbolMark.getProduct()) {\n      this._symbolMark.compileEncode();\n    }\n  }\n\n  /**\n   * 初始化LabelMark\n   */\n  initLabelMarkStyle(labelMark?: ILabelMark): void {\n    if (!labelMark) {\n      return;\n    }\n    this._labelMark = labelMark;\n    this.setMarkStyle(\n      labelMark,\n      {\n        fill: this.getColorAttribute(),\n        text: (datum: Datum) => {\n          return datum[this.getStackValueField()];\n        },\n        z: this._fieldZ ? this.dataToPositionZ.bind(this) : null\n      },\n      STATE_VALUE_ENUM.STATE_NORMAL,\n      AttributeLevel.Series\n    );\n    if (this._invalidType !== 'zero') {\n      this.setMarkStyle(\n        labelMark,\n        {\n          visible: this._getInvalidDefined.bind(this)\n        },\n        STATE_VALUE_ENUM.STATE_NORMAL,\n        AttributeLevel.Series\n      );\n    }\n  }\n\n  /**\n   * 处理缩放\n   */\n  handleZoom(e: any) {\n    this.getMarksWithoutRoot().forEach(mark => {\n      if (!mark) {\n        return;\n      }\n      const graphics = mark.getGraphics();\n\n      if (!graphics || !graphics.length) {\n        return;\n      }\n\n      graphics.forEach((graphicItem: IMarkGraphic, i: number) => {\n        const datum = graphicItem?.context?.data?.[0];\n        const newPosition = this.dataToPosition(datum);\n        if (newPosition && graphicItem) {\n          graphicItem.translateTo(newPosition.x, newPosition.y);\n        }\n      });\n    });\n\n    const labelComponent = this._labelMark?.getComponent();\n\n    if (labelComponent?.renderInner) {\n      labelComponent.renderInner();\n    }\n    const vgrammarLabel = labelComponent?.getComponent?.();\n    if (vgrammarLabel?.evaluate) {\n      (vgrammarLabel as any).evaluate(null, null);\n    }\n\n    // 标签跟随地图\n    const labelGroup = labelComponent?.getProduct?.();\n    if (labelGroup && e?.scale && e?.scaleCenter) {\n      if (!labelGroup.attribute?.postMatrix) {\n        labelGroup.setAttributes({\n          postMatrix: new Matrix()\n        });\n      }\n      labelGroup.scale(e.scale, e.scale, e.scaleCenter);\n    }\n  }\n\n  handlePan(e: any) {\n    // TODO 现在处理好像一模一样\n    this.handleZoom(e);\n  }\n\n  getDefaultShapeType() {\n    return 'circle';\n  }\n\n  getActiveMarks(): IMark[] {\n    return [this._symbolMark];\n  }\n}\n\nexport const registerScatterSeries = () => {\n  registerSymbolMark();\n  registerScatterAnimation();\n  registerCartesianBandAxis();\n  registerCartesianLinearAxis();\n  Factory.registerSeries(ScatterSeries.type, ScatterSeries);\n};\n"]}

package/esm/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/esm/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/esm/component/tooltip/tooltip-transformer.js

@@ -10,19 +10,22 @@ import { getTooltipActualActiveType } from "./utils/common";
 
 import { mergeSpec } from "@visactor/vutils-extension";
 
+const TOOLTIP_STYLE_THEME_KEYS = [ "panel", "shape", "titleLabel", "keyLabel", "valueLabel", "spaceRow", "maxContentHeight", "align" ];
+
 export class TooltipSpecTransformer extends BaseComponentSpecTransformer {
     _shouldMergeThemeToSpec() {
         return !1;
     }
     _initTheme(spec, chartSpec) {
-        var _a, _b, _c;
-        const {spec: newSpec, theme: theme} = super._initTheme(spec, chartSpec);
-        return newSpec.style = mergeSpec({}, this._theme, newSpec.style), newSpec.offset = 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, 
-        {
-            spec: newSpec,
+        const {spec: newSpec, theme: theme} = super._initTheme(spec, chartSpec), themeStyle = 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 = mergeSpec({}, theme);
+        TOOLTIP_STYLE_THEME_KEYS.forEach((key => {
+            delete themeSpec[key];
+        })), delete themeSpec.style;
+        const mergedSpec = mergeSpec({}, themeSpec, newSpec);
+        return mergedSpec.style = mergeSpec({}, themeStyle, mergedSpec.style), {
+            spec: mergedSpec,
             theme: theme
         };
     }

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

@@ -1 +1 @@
-{"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\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/esm/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/esm/core/index.js

@@ -4,7 +4,7 @@ import { Factory } from "./factory";
 
 export { VChart, Factory };
 
-export const version = "2.0.21";
+export const version = "2.0.22";
 
 export * from "../event/interface";
 
@@ -55,4 +55,4 @@ export { lookup } from "../data/transforms/lookup";
 export { warn } from "../util/debug";
 
 export { measureText } from "../util/text";
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/esm/core/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAG3B,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC;AAOhC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AAEnC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAI3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAK/C,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAGlC,cAAc,oBAAoB,CAAC;AAGnC,cAAc,gBAAgB,CAAC;AAG/B,OAAO,EACL,OAAO,EACP,WAAW,EACX,cAAc,EACd,UAAU,EACV,SAAS,EACT,UAAU,EACV,UAAU,EACV,UAAU,EACV,YAAY,EACb,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGtE,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,6BAA6B,EAAE,gCAAgC,EAAE,MAAM,kBAAkB,CAAC;AACnG,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC","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,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAG3B,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC;AAOhC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AAEnC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAI3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAK/C,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAGlC,cAAc,oBAAoB,CAAC;AAGnC,cAAc,gBAAgB,CAAC;AAG/B,OAAO,EACL,OAAO,EACP,WAAW,EACX,cAAc,EACd,UAAU,EACV,SAAS,EACT,UAAU,EACV,UAAU,EACV,UAAU,EACV,YAAY,EACb,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGtE,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,6BAA6B,EAAE,gCAAgC,EAAE,MAAM,kBAAkB,CAAC;AACnG,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC","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/esm/core/instance-manager.js

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

package/esm/core/vchart.js

@@ -380,7 +380,7 @@ export 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);
@@ -806,8 +806,9 @@ export 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;