@visactor/vchart 1.3.0-beta.8 → 1.3.0

package/cjs/mark/base/base-mark.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/base/base-mark.ts"],"names":[],"mappings":"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","file":"base-mark.js","sourcesContent":["import type { IStateInfo, IAttributeOpt, IModelMarkAttributeContext } from '../../compile/mark/interface';\nimport { radians } from '../../util/math';\nimport type { BaseSeries } from '../../series/base/base-series';\nimport type {\n  Datum,\n  IMarkSpec,\n  ConvertToMarkStyleSpec,\n  GradientStop,\n  IVisual,\n  IVisualScale,\n  IVisualSpecStyle,\n  ICommonSpec,\n  FunctionType,\n  IThresholdStyle\n} from '../../typings';\n\nimport { isBoolean, isFunction, isNil, isValid, merge, Color, createScaleWithSpec, isNumber } from '../../util';\nimport type {\n  IMarkRaw,\n  IMarkStateStyle,\n  IMarkStyle,\n  IMark,\n  IMarkOption,\n  StyleConvert,\n  VisualScaleType,\n  MarkInputStyle\n} from '../interface';\nimport { AttributeLevel, GradientType, DEFAULT_GRADIENT_CONFIG } from '../../constant';\nimport { isValidScaleType, ThresholdScale } from '@visactor/vscale';\nimport type { DataView } from '@visactor/vdataset';\nimport { computeActualDataScheme, getDataScheme } from '../../theme/color-scheme/util';\nimport type { ISeries, SeriesTypeEnum } from '../../series/interface';\nimport { CompilableMark } from '../../compile/mark/compilable-mark';\nimport type { StateValueType } from '../../compile/mark';\n\nexport type ExChannelCall = (\n  key: string | number | symbol,\n  datum: Datum,\n  states: StateValueType,\n  opt: unknown,\n  baseValue: unknown\n) => unknown;\n\nexport class BaseMark<T extends ICommonSpec> extends CompilableMark implements IMarkRaw<T> {\n  declare stateStyle: IMarkStateStyle<T>;\n\n  protected declare _option: IMarkOption;\n\n  protected _attributeContext: IModelMarkAttributeContext;\n\n  /** by _unCompileChannel, some channel need add default channel to make sure update available */\n  _extensionChannel: {\n    [key: string | number | symbol]: string[];\n  } = {};\n  /** same as _extensionChannel. when compute channel, add extension channel effect */\n  _computeExChannel: {\n    [key: string | number | symbol]: ExChannelCall;\n  } = {};\n\n  constructor(name: string, option: IMarkOption) {\n    super(option, name, option.model);\n    // 这里的上下文多数情况下与 mark 是什么是没有关系的，与mark的使用者，也就是series，component有的逻辑有关。\n    this._attributeContext = option.attributeContext;\n    option.map?.set(this.id, this as unknown as IMark);\n  }\n\n  created(): void {\n    this._initStyle();\n  }\n\n  /**\n   * 外部调用，根据 spec 初始化 style（如果由 IModel 派生类调用，请使用 IModel.initMarkStyleWithSpec）\n   * @param spec\n   * @param key\n   * @returns\n   */\n  initStyleWithSpec(spec: IMarkSpec<T>, key?: string) {\n    if (!spec) {\n      return;\n    }\n\n    if (isValid(spec.id)) {\n      this._userId = spec.id;\n    }\n\n    // interactive\n    if (isBoolean(spec.interactive)) {\n      this._interactive = spec.interactive;\n    }\n    // zIndex\n    if (isValid(spec.zIndex)) {\n      this.setZIndex(spec.zIndex);\n    }\n    // visible\n    if (isBoolean(spec.visible)) {\n      this.setVisible(spec.visible);\n    }\n    // style\n    this._initSpecStyle(spec, this.stateStyle, key);\n  }\n\n  convertAngleToRadian(styleConverter: StyleConvert<number>): StyleConvert<any> {\n    // 用户传入的angle配置，需要做一层转换\n    if (isNumber(styleConverter)) {\n      return radians(styleConverter) as StyleConvert<any>;\n    } else if ((styleConverter as VisualScaleType).scale) {\n      const range = (styleConverter as VisualScaleType).scale.range();\n\n      (styleConverter as VisualScaleType).scale.range(range.map(radians));\n\n      return styleConverter as StyleConvert<any>;\n    } else if (typeof styleConverter === 'function') {\n      return ((item: any, ctx: any, opt: IAttributeOpt, source?: DataView) => {\n        return radians((styleConverter as FunctionType<number>)(item, ctx, opt, source));\n      }) as StyleConvert<any>;\n    }\n\n    return styleConverter;\n  }\n\n  isUserLevel(level: number) {\n    return [AttributeLevel.User_Mark, AttributeLevel.User_Series, AttributeLevel.User_Chart].includes(level);\n  }\n\n  /**\n   * 由外部series调用，设置markStyle的接口（如果由 IModel 派生类调用，请使用 IModel.setMarkStyle）\n   * @param style\n   * @param level\n   * @param state\n   */\n  setStyle<U extends keyof T>(\n    style: Partial<IMarkStyle<T>>,\n    state: StateValueType = 'normal',\n    level: number = 0,\n    stateStyle = this.stateStyle\n  ): void {\n    if (isNil(style)) {\n      return;\n    }\n    style = this._filterStyle(style, state, level, stateStyle);\n\n    if (stateStyle[state] === undefined) {\n      stateStyle[state] = {};\n    }\n\n    const isUserLevel = this.isUserLevel(level);\n\n    Object.keys(style).forEach((attr: string) => {\n      let attrStyle = style[attr] as MarkInputStyle<T[U]>;\n      if (isNil(attrStyle)) {\n        return;\n      }\n\n      attrStyle = this._filterAttribute(attr as any, attrStyle, state, level, isUserLevel, stateStyle);\n\n      this.setAttribute(attr as any, attrStyle, state, level, stateStyle);\n    });\n  }\n\n  getStyle(key: string, state: StateValueType = 'normal'): any {\n    return this.stateStyle[state][key]?.style;\n  }\n\n  /** 过滤用户传来的 style 对象 */\n  protected _filterStyle(\n    style: Partial<IMarkStyle<T>>,\n    state: StateValueType,\n    level: number,\n    stateStyle = this.stateStyle\n  ): Partial<IMarkStyle<T>> {\n    return style;\n  }\n\n  /** 过滤单个 attribute */\n  protected _filterAttribute<U extends keyof T>(\n    attr: U,\n    style: MarkInputStyle<T[U]>,\n    state: StateValueType,\n    level: number,\n    isUserLevel: boolean,\n    stateStyle = this.stateStyle\n  ): StyleConvert<T[U]> {\n    let newStyle = this._styleConvert(style);\n    if (isUserLevel && attr === 'angle') {\n      newStyle = this.convertAngleToRadian(newStyle as StyleConvert<number>);\n    }\n    return newStyle;\n  }\n\n  /**\n   * TODO: 没有外部调用\n   * 设置mark样式所参考的图元\n   */\n  setReferer<U extends keyof T>(mark: IMarkRaw<T>, styleKey?: U, state?: StateValueType, stateStyle = this.stateStyle) {\n    if (!mark) {\n      return;\n    }\n    if (styleKey && state) {\n      const style = stateStyle[state] ?? { [styleKey]: {} };\n      stateStyle[state][styleKey] = {\n        ...(style[styleKey] as unknown as any),\n        ...{ referer: mark }\n      };\n      return;\n    }\n\n    Object.entries(stateStyle).forEach(([state, style]) => {\n      Object.entries(style).forEach(([styleKey, style]) => {\n        stateStyle[state][styleKey].referer = mark;\n      });\n    });\n  }\n\n  setPostProcess<U extends keyof T>(key: U, postProcessFunc: any, state: StateValueType = 'normal') {\n    if (this.stateStyle[state]?.[key]) {\n      this.stateStyle[state][key].postProcess = postProcessFunc;\n    }\n  }\n\n  getAttribute<U extends keyof T>(key: U, datum: Datum, state: StateValueType = 'normal', opt?: IAttributeOpt) {\n    return this._computeAttribute(key, datum, state, opt);\n  }\n\n  setAttribute<U extends keyof T>(\n    attr: U,\n    style: MarkInputStyle<T[U]>,\n    state: StateValueType = 'normal',\n    level: number = 0,\n    stateStyle = this.stateStyle\n  ) {\n    if (stateStyle[state] === undefined) {\n      stateStyle[state] = {};\n    }\n\n    if (stateStyle[state][attr] === undefined) {\n      // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n      // @ts-ignore\n      stateStyle[state][attr] = {\n        level,\n        style,\n        referer: undefined\n      };\n    }\n    const attrLevel = stateStyle[state][attr]?.level;\n    if (isValid(attrLevel) && attrLevel <= level) {\n      merge(stateStyle[state][attr], { style, level });\n    }\n\n    // some attr has extension channel in VChart to make some effect\n    if (state !== 'normal') {\n      if (attr in this._extensionChannel) {\n        this._extensionChannel[attr].forEach(key => {\n          if (stateStyle[state][key] === undefined) {\n            // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n            // @ts-ignore\n            stateStyle[state][key as keyof T] = stateStyle.normal[key];\n          }\n        });\n      }\n    }\n  }\n\n  /**\n   * 与 vgrammar 默认值一致的样式可以不设置默认值或设置为undefined, 减少encode属性\n   */\n  protected _getDefaultStyle() {\n    return {\n      visible: true,\n      // mark的层级应该在mark层 不在encode属性层\n      // zIndex: LayoutZIndex.Mark,\n      x: 0,\n      y: 0\n    } as IMarkStyle<T>;\n  }\n\n  // /**\n  //  * 获取该 mark 不支持的图形属性，由子类覆写\n  //  * @returns\n  //  */\n  // protected getIgnoreAttributes(): string[] {\n  //   return [];\n  // }\n\n  protected _styleConvert<U extends keyof T>(style?: MarkInputStyle<T[U]>): StyleConvert<T[U]> | undefined {\n    if (!style) {\n      return style as undefined;\n    }\n    // visual spec 转换为 scale 类型的mark style\n    if (isValidScaleType((style as IVisualSpecStyle<unknown, T[U]>).type) || (style as IVisualScale).scale) {\n      // const _style = style as IVisual<T[U]>;\n      const scale = createScaleWithSpec(style as IVisual<T[U]>, {\n        globalScale: this._option.globalScale,\n        dataStatistics: this._option.dataStatistics\n      });\n      if (scale) {\n        return {\n          scale,\n          field: (style as IVisual<T[U]>).field,\n          changeDomain: (style as IVisualScale).changeDomain\n        };\n      }\n    }\n    return style as StyleConvert<T[U]>;\n  }\n\n  protected _computeAttribute<U extends keyof T>(key: U, datum: Datum, state: StateValueType, opt: IAttributeOpt) {\n    let stateStyle;\n    if (!this.stateStyle[state]?.[key]) {\n      stateStyle = this.stateStyle.normal[key];\n    } else {\n      stateStyle = this.stateStyle[state][key];\n    }\n    let baseValue = this._computeStateAttribute(stateStyle, key, datum, state, opt);\n\n    if (isFunction(stateStyle?.postProcess)) {\n      baseValue = stateStyle.postProcess(baseValue, datum, this._attributeContext, opt, this.getDataView());\n    }\n    // add effect to base\n    if (key in this._computeExChannel) {\n      return this._computeExChannel[key](key, datum, state, opt, baseValue);\n    }\n    return baseValue;\n  }\n\n  protected _computeStateAttribute<U extends keyof T>(\n    stateStyle: any,\n    key: U,\n    datum: Datum,\n    state: StateValueType,\n    opt: IAttributeOpt\n  ) {\n    if (!stateStyle) {\n      return;\n    }\n    if (stateStyle.referer) {\n      return stateStyle.referer.getAttribute(key, datum, state, opt);\n    }\n    if (typeof stateStyle.style === 'function') {\n      return stateStyle.style(datum, this._attributeContext, opt, this.getDataView());\n    }\n\n    if (GradientType.includes(stateStyle.style.gradient)) {\n      // 渐变色处理，支持各个属性回调\n      return this._computeGradientAttr(stateStyle.style, datum, opt);\n    }\n\n    if (stateStyle.style.type === 'threshold') {\n      // 按阈值着色处理\n      return this._computeThresholdAttr(stateStyle.style);\n    }\n\n    if (isValidScaleType(stateStyle.style.scale?.type)) {\n      return stateStyle.style.scale.scale(datum[stateStyle.style.field]);\n    }\n\n    return stateStyle.style;\n  }\n\n  private _initStyle(): void {\n    const defaultStyle = this._getDefaultStyle();\n    this.setStyle(defaultStyle, 'normal', 0);\n  }\n\n  private _initSpecStyle(spec: IMarkSpec<T>, stateStyle: IMarkStateStyle<T>, key?: string) {\n    // style\n    if (spec.style) {\n      this.setStyle(spec.style, 'normal', AttributeLevel.User_Mark, stateStyle);\n    }\n    const state = spec.state;\n    if (state) {\n      Object.keys(state).forEach(key => {\n        const stateTemp = state[key];\n        if ('style' in stateTemp) {\n          const style = stateTemp.style;\n          let stateInfo: IStateInfo = { stateValue: key };\n          if ('level' in stateTemp) {\n            stateInfo.level = stateTemp.level as number;\n          }\n          if ('filter' in stateTemp) {\n            if (isFunction(stateTemp.filter)) {\n              stateInfo = {\n                filter: stateTemp.filter as (datum: any, options: Record<string, any>) => boolean,\n                ...stateInfo\n              };\n            } else {\n              stateInfo = { ...stateTemp.filter, ...stateInfo };\n            }\n          }\n          this.state.addStateInfo(stateInfo);\n          this.setStyle(style as ConvertToMarkStyleSpec<T>, key, AttributeLevel.User_Mark, stateStyle);\n        } else {\n          this.setStyle(stateTemp, key, AttributeLevel.User_Mark, stateStyle);\n        }\n      });\n    }\n  }\n\n  private _computeGradientAttr(gradientStyle: any, data: Datum, opt: IAttributeOpt) {\n    const { gradient, scale, field, ...rest } = gradientStyle;\n    const markData = this.getDataView();\n    let colorScale = scale;\n    let colorField = field;\n    if ((!scale || !field) && this.model.modelType === 'series') {\n      // 目前只有series有这个属性\n      const { scale: globalColorScale, field: globalField } = (this.model as BaseSeries<any>).getColorAttribute();\n      if (!scale) {\n        // 获取全局的 colorScale\n        colorScale = globalColorScale;\n      }\n      if (!colorField) {\n        colorField = globalField;\n      }\n    }\n\n    const themeColor = computeActualDataScheme(\n      getDataScheme(\n        this.model.getOption()?.getTheme()?.colorScheme,\n        this.model.modelType === 'series' ? (this.model.type as SeriesTypeEnum) : undefined\n      ),\n      (this.model as ISeries).getDefaultColorDomain()\n    );\n    const computeStyle: any = {};\n    // 默认配置处理\n    const mergedStyle = {\n      ...DEFAULT_GRADIENT_CONFIG[gradient],\n      ...rest\n    };\n    Object.keys(mergedStyle).forEach(key => {\n      const value = mergedStyle[key];\n      if (key === 'stops') {\n        computeStyle.stops = value.map((stop: GradientStop) => {\n          const { opacity, color, offset } = stop;\n          let computeColor = color ?? colorScale?.scale(data[colorField]);\n          if (isFunction(color)) {\n            computeColor = color(data, this._attributeContext, opt, markData);\n          }\n\n          if (isValid(opacity)) {\n            computeColor = Color.SetOpacity(computeColor as string, opacity);\n          }\n\n          return {\n            offset: isFunction(offset) ? offset(data, this._attributeContext, opt, markData) : offset,\n            color: computeColor || themeColor[0]\n          };\n        });\n      } else if (isFunction(value)) {\n        computeStyle[key] = value(data, this._attributeContext, opt, markData);\n      } else {\n        computeStyle[key] = value;\n      }\n    });\n\n    computeStyle.gradient = gradient;\n\n    return computeStyle;\n  }\n\n  private _computeThresholdAttr(thresholdStyle: IThresholdStyle) {\n    const scale = new ThresholdScale().domain(thresholdStyle.domain).range(thresholdStyle.range);\n    return scale.scale(this.getDataView().latestData[0].value);\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/base/base-mark.ts"],"names":[],"mappings":"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","file":"base-mark.js","sourcesContent":["import type { IStateInfo, IAttributeOpt, IModelMarkAttributeContext } from '../../compile/mark/interface';\nimport { radians } from '../../util/math';\nimport type { BaseSeries } from '../../series/base/base-series';\nimport type {\n  Datum,\n  IMarkSpec,\n  ConvertToMarkStyleSpec,\n  GradientStop,\n  IVisual,\n  IVisualScale,\n  IVisualSpecStyle,\n  ICommonSpec,\n  FunctionType,\n  IThresholdStyle\n} from '../../typings';\n\nimport { isBoolean, isFunction, isNil, isValid, mergeSpec, Color, createScaleWithSpec, isNumber } from '../../util';\nimport type {\n  IMarkRaw,\n  IMarkStateStyle,\n  IMarkStyle,\n  IMark,\n  IMarkOption,\n  StyleConvert,\n  VisualScaleType,\n  MarkInputStyle\n} from '../interface';\nimport { AttributeLevel, GradientType, DEFAULT_GRADIENT_CONFIG } from '../../constant';\nimport { isValidScaleType, ThresholdScale } from '@visactor/vscale';\nimport type { DataView } from '@visactor/vdataset';\nimport { computeActualDataScheme, getDataScheme } from '../../theme/color-scheme/util';\nimport type { ISeries, SeriesTypeEnum } from '../../series/interface';\nimport { CompilableMark } from '../../compile/mark/compilable-mark';\nimport type { StateValueType } from '../../compile/mark';\n\nexport type ExChannelCall = (\n  key: string | number | symbol,\n  datum: Datum,\n  states: StateValueType,\n  opt: unknown,\n  baseValue: unknown\n) => unknown;\n\nexport class BaseMark<T extends ICommonSpec> extends CompilableMark implements IMarkRaw<T> {\n  declare stateStyle: IMarkStateStyle<T>;\n\n  protected declare _option: IMarkOption;\n\n  protected _attributeContext: IModelMarkAttributeContext;\n\n  /** by _unCompileChannel, some channel need add default channel to make sure update available */\n  _extensionChannel: {\n    [key: string | number | symbol]: string[];\n  } = {};\n  /** same as _extensionChannel. when compute channel, add extension channel effect */\n  _computeExChannel: {\n    [key: string | number | symbol]: ExChannelCall;\n  } = {};\n\n  constructor(name: string, option: IMarkOption) {\n    super(option, name, option.model);\n    // 这里的上下文多数情况下与 mark 是什么是没有关系的，与mark的使用者，也就是series，component有的逻辑有关。\n    this._attributeContext = option.attributeContext;\n    option.map?.set(this.id, this as unknown as IMark);\n  }\n\n  created(): void {\n    this._initStyle();\n  }\n\n  /**\n   * 外部调用，根据 spec 初始化 style（如果由 IModel 派生类调用，请使用 IModel.initMarkStyleWithSpec）\n   * @param spec\n   * @param key\n   * @returns\n   */\n  initStyleWithSpec(spec: IMarkSpec<T>, key?: string) {\n    if (!spec) {\n      return;\n    }\n\n    if (isValid(spec.id)) {\n      this._userId = spec.id;\n    }\n\n    // interactive\n    if (isBoolean(spec.interactive)) {\n      this._interactive = spec.interactive;\n    }\n    // zIndex\n    if (isValid(spec.zIndex)) {\n      this.setZIndex(spec.zIndex);\n    }\n    // visible\n    if (isBoolean(spec.visible)) {\n      this.setVisible(spec.visible);\n    }\n    // style\n    this._initSpecStyle(spec, this.stateStyle, key);\n  }\n\n  convertAngleToRadian(styleConverter: StyleConvert<number>): StyleConvert<any> {\n    // 用户传入的angle配置，需要做一层转换\n    if (isNumber(styleConverter)) {\n      return radians(styleConverter) as StyleConvert<any>;\n    } else if ((styleConverter as VisualScaleType).scale) {\n      const range = (styleConverter as VisualScaleType).scale.range();\n\n      (styleConverter as VisualScaleType).scale.range(range.map(radians));\n\n      return styleConverter as StyleConvert<any>;\n    } else if (typeof styleConverter === 'function') {\n      return ((item: any, ctx: any, opt: IAttributeOpt, source?: DataView) => {\n        return radians((styleConverter as FunctionType<number>)(item, ctx, opt, source));\n      }) as StyleConvert<any>;\n    }\n\n    return styleConverter;\n  }\n\n  isUserLevel(level: number) {\n    return [AttributeLevel.User_Mark, AttributeLevel.User_Series, AttributeLevel.User_Chart].includes(level);\n  }\n\n  /**\n   * 由外部series调用，设置markStyle的接口（如果由 IModel 派生类调用，请使用 IModel.setMarkStyle）\n   * @param style\n   * @param level\n   * @param state\n   */\n  setStyle<U extends keyof T>(\n    style: Partial<IMarkStyle<T>>,\n    state: StateValueType = 'normal',\n    level: number = 0,\n    stateStyle = this.stateStyle\n  ): void {\n    if (isNil(style)) {\n      return;\n    }\n    style = this._filterStyle(style, state, level, stateStyle);\n\n    if (stateStyle[state] === undefined) {\n      stateStyle[state] = {};\n    }\n\n    const isUserLevel = this.isUserLevel(level);\n\n    Object.keys(style).forEach((attr: string) => {\n      let attrStyle = style[attr] as MarkInputStyle<T[U]>;\n      if (isNil(attrStyle)) {\n        return;\n      }\n\n      attrStyle = this._filterAttribute(attr as any, attrStyle, state, level, isUserLevel, stateStyle);\n\n      this.setAttribute(attr as any, attrStyle, state, level, stateStyle);\n    });\n  }\n\n  getStyle(key: string, state: StateValueType = 'normal'): any {\n    return this.stateStyle[state][key]?.style;\n  }\n\n  /** 过滤用户传来的 style 对象 */\n  protected _filterStyle(\n    style: Partial<IMarkStyle<T>>,\n    state: StateValueType,\n    level: number,\n    stateStyle = this.stateStyle\n  ): Partial<IMarkStyle<T>> {\n    return style;\n  }\n\n  /** 过滤单个 attribute */\n  protected _filterAttribute<U extends keyof T>(\n    attr: U,\n    style: MarkInputStyle<T[U]>,\n    state: StateValueType,\n    level: number,\n    isUserLevel: boolean,\n    stateStyle = this.stateStyle\n  ): StyleConvert<T[U]> {\n    let newStyle = this._styleConvert(style);\n    if (isUserLevel && attr === 'angle') {\n      newStyle = this.convertAngleToRadian(newStyle as StyleConvert<number>);\n    }\n    return newStyle;\n  }\n\n  /**\n   * TODO: 没有外部调用\n   * 设置mark样式所参考的图元\n   */\n  setReferer<U extends keyof T>(mark: IMarkRaw<T>, styleKey?: U, state?: StateValueType, stateStyle = this.stateStyle) {\n    if (!mark) {\n      return;\n    }\n    if (styleKey && state) {\n      const style = stateStyle[state] ?? { [styleKey]: {} };\n      stateStyle[state][styleKey] = {\n        ...(style[styleKey] as unknown as any),\n        ...{ referer: mark }\n      };\n      return;\n    }\n\n    Object.entries(stateStyle).forEach(([state, style]) => {\n      Object.entries(style).forEach(([styleKey, style]) => {\n        stateStyle[state][styleKey].referer = mark;\n      });\n    });\n  }\n\n  setPostProcess<U extends keyof T>(key: U, postProcessFunc: any, state: StateValueType = 'normal') {\n    if (this.stateStyle[state]?.[key]) {\n      this.stateStyle[state][key].postProcess = postProcessFunc;\n    }\n  }\n\n  getAttribute<U extends keyof T>(key: U, datum: Datum, state: StateValueType = 'normal', opt?: IAttributeOpt) {\n    return this._computeAttribute(key, datum, state, opt);\n  }\n\n  setAttribute<U extends keyof T>(\n    attr: U,\n    style: MarkInputStyle<T[U]>,\n    state: StateValueType = 'normal',\n    level: number = 0,\n    stateStyle = this.stateStyle\n  ) {\n    if (stateStyle[state] === undefined) {\n      stateStyle[state] = {};\n    }\n\n    if (stateStyle[state][attr] === undefined) {\n      // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n      // @ts-ignore\n      stateStyle[state][attr] = {\n        level,\n        style,\n        referer: undefined\n      };\n    }\n    const attrLevel = stateStyle[state][attr]?.level;\n    if (isValid(attrLevel) && attrLevel <= level) {\n      mergeSpec(stateStyle[state][attr], { style, level });\n    }\n\n    // some attr has extension channel in VChart to make some effect\n    if (state !== 'normal') {\n      if (attr in this._extensionChannel) {\n        this._extensionChannel[attr].forEach(key => {\n          if (stateStyle[state][key] === undefined) {\n            // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n            // @ts-ignore\n            stateStyle[state][key as keyof T] = stateStyle.normal[key];\n          }\n        });\n      }\n    }\n  }\n\n  /**\n   * 与 vgrammar 默认值一致的样式可以不设置默认值或设置为undefined, 减少encode属性\n   */\n  protected _getDefaultStyle() {\n    return {\n      visible: true,\n      // mark的层级应该在mark层 不在encode属性层\n      // zIndex: LayoutZIndex.Mark,\n      x: 0,\n      y: 0\n    } as IMarkStyle<T>;\n  }\n\n  // /**\n  //  * 获取该 mark 不支持的图形属性，由子类覆写\n  //  * @returns\n  //  */\n  // protected getIgnoreAttributes(): string[] {\n  //   return [];\n  // }\n\n  protected _styleConvert<U extends keyof T>(style?: MarkInputStyle<T[U]>): StyleConvert<T[U]> | undefined {\n    if (!style) {\n      return style as undefined;\n    }\n    // visual spec 转换为 scale 类型的mark style\n    if (isValidScaleType((style as IVisualSpecStyle<unknown, T[U]>).type) || (style as IVisualScale).scale) {\n      // const _style = style as IVisual<T[U]>;\n      const scale = createScaleWithSpec(style as IVisual<T[U]>, {\n        globalScale: this._option.globalScale,\n        dataStatistics: this._option.dataStatistics\n      });\n      if (scale) {\n        return {\n          scale,\n          field: (style as IVisual<T[U]>).field,\n          changeDomain: (style as IVisualScale).changeDomain\n        };\n      }\n    }\n    return style as StyleConvert<T[U]>;\n  }\n\n  protected _computeAttribute<U extends keyof T>(key: U, datum: Datum, state: StateValueType, opt: IAttributeOpt) {\n    let stateStyle = this.stateStyle[state]?.[key];\n    if (!stateStyle) {\n      stateStyle = this.stateStyle.normal[key];\n    }\n    let baseValue = this._computeStateAttribute(stateStyle, key, datum, state, opt);\n\n    if (isFunction(stateStyle?.postProcess)) {\n      baseValue = stateStyle.postProcess(baseValue, datum, this._attributeContext, opt, this.getDataView());\n    }\n    // add effect to base\n    if (key in this._computeExChannel) {\n      return this._computeExChannel[key](key, datum, state, opt, baseValue);\n    }\n    return baseValue;\n  }\n\n  protected _computeStateAttribute<U extends keyof T>(\n    stateStyle: any,\n    key: U,\n    datum: Datum,\n    state: StateValueType,\n    opt: IAttributeOpt\n  ) {\n    if (!stateStyle) {\n      return undefined;\n    }\n    if (stateStyle.referer) {\n      return stateStyle.referer.getAttribute(key, datum, state, opt);\n    }\n    if (typeof stateStyle.style === 'function') {\n      return stateStyle.style(datum, this._attributeContext, opt, this.getDataView());\n    }\n\n    if (GradientType.includes(stateStyle.style.gradient)) {\n      // 渐变色处理，支持各个属性回调\n      return this._computeGradientAttr(stateStyle.style, datum, opt);\n    }\n\n    if (['outerBorder', 'innerBorder'].includes(key as string)) {\n      // 内外描边处理，支持各个属性回调\n      return this._computeBorderAttr(stateStyle.style, datum, opt);\n    }\n\n    if (stateStyle.style.type === 'threshold') {\n      // 按阈值着色处理\n      return this._computeThresholdAttr(stateStyle.style);\n    }\n\n    if (isValidScaleType(stateStyle.style.scale?.type)) {\n      return stateStyle.style.scale.scale(datum[stateStyle.style.field]);\n    }\n\n    return stateStyle.style;\n  }\n\n  private _initStyle(): void {\n    const defaultStyle = this._getDefaultStyle();\n    this.setStyle(defaultStyle, 'normal', 0);\n  }\n\n  private _initSpecStyle(spec: IMarkSpec<T>, stateStyle: IMarkStateStyle<T>, key?: string) {\n    // style\n    if (spec.style) {\n      this.setStyle(spec.style, 'normal', AttributeLevel.User_Mark, stateStyle);\n    }\n    const state = spec.state;\n    if (state) {\n      Object.keys(state).forEach(key => {\n        const stateTemp = state[key];\n        if ('style' in stateTemp) {\n          const style = stateTemp.style;\n          let stateInfo: IStateInfo = { stateValue: key };\n          if ('level' in stateTemp) {\n            stateInfo.level = stateTemp.level as number;\n          }\n          if ('filter' in stateTemp) {\n            if (isFunction(stateTemp.filter)) {\n              stateInfo = {\n                filter: stateTemp.filter as (datum: any, options: Record<string, any>) => boolean,\n                ...stateInfo\n              };\n            } else {\n              stateInfo = { ...stateTemp.filter, ...stateInfo };\n            }\n          }\n          this.state.addStateInfo(stateInfo);\n          this.setStyle(style as ConvertToMarkStyleSpec<T>, key, AttributeLevel.User_Mark, stateStyle);\n        } else {\n          this.setStyle(stateTemp, key, AttributeLevel.User_Mark, stateStyle);\n        }\n      });\n    }\n  }\n\n  private _computeGradientAttr(gradientStyle: any, data: Datum, opt: IAttributeOpt) {\n    const { gradient, scale, field, ...rest } = gradientStyle;\n    const markData = this.getDataView();\n    let colorScale = scale;\n    let colorField = field;\n    if ((!scale || !field) && this.model.modelType === 'series') {\n      // 目前只有series有这个属性\n      const { scale: globalColorScale, field: globalField } = (this.model as BaseSeries<any>).getColorAttribute();\n      if (!scale) {\n        // 获取全局的 colorScale\n        colorScale = globalColorScale;\n      }\n      if (!colorField) {\n        colorField = globalField;\n      }\n    }\n\n    const themeColor = computeActualDataScheme(\n      getDataScheme(\n        this.model.getOption()?.getTheme()?.colorScheme,\n        this.model.modelType === 'series' ? (this.model.type as SeriesTypeEnum) : undefined\n      ),\n      (this.model as ISeries).getDefaultColorDomain()\n    );\n    const computeStyle: any = {};\n    // 默认配置处理\n    const mergedStyle = {\n      ...DEFAULT_GRADIENT_CONFIG[gradient],\n      ...rest\n    };\n    Object.keys(mergedStyle).forEach(key => {\n      const value = mergedStyle[key];\n      if (key === 'stops') {\n        computeStyle.stops = value.map((stop: GradientStop) => {\n          const { opacity, color, offset } = stop;\n          let computeColor = color ?? colorScale?.scale(data[colorField]);\n          if (isFunction(color)) {\n            computeColor = color(data, this._attributeContext, opt, markData);\n          }\n\n          if (isValid(opacity)) {\n            computeColor = Color.SetOpacity(computeColor as string, opacity);\n          }\n\n          return {\n            offset: isFunction(offset) ? offset(data, this._attributeContext, opt, markData) : offset,\n            color: computeColor || themeColor[0]\n          };\n        });\n      } else if (isFunction(value)) {\n        computeStyle[key] = value(data, this._attributeContext, opt, markData);\n      } else {\n        computeStyle[key] = value;\n      }\n    });\n\n    computeStyle.gradient = gradient;\n\n    return computeStyle;\n  }\n\n  private _computeBorderAttr(borderStyle: any, data: Datum, opt: IAttributeOpt) {\n    const { scale, field, ...mergedStyle } = borderStyle;\n\n    const computeStyle: any = {};\n\n    Object.keys(mergedStyle).forEach(key => {\n      const value = mergedStyle[key];\n      if (isFunction(value)) {\n        computeStyle[key] = value(data, this._attributeContext, opt, this.getDataView());\n      } else {\n        computeStyle[key] = value;\n      }\n    });\n    if (!('stroke' in computeStyle)) {\n      const themeColor = computeActualDataScheme(\n        getDataScheme(\n          this.model.getOption()?.getTheme()?.colorScheme,\n          this.model.modelType === 'series' ? (this.model.type as SeriesTypeEnum) : undefined\n        ),\n        (this.model as ISeries).getDefaultColorDomain()\n      );\n      let colorScale = scale;\n      let colorField = field;\n      if ((!scale || !field) && this.model.modelType === 'series') {\n        // 目前只有series有这个属性\n        const { scale: globalColorScale, field: globalField } = (this.model as BaseSeries<any>).getColorAttribute();\n        if (!scale) {\n          // 获取全局的 colorScale\n          colorScale = globalColorScale;\n        }\n        if (!colorField) {\n          colorField = globalField;\n        }\n        computeStyle.stroke = colorScale?.scale(data[colorField]) || themeColor[0];\n      }\n    } else if (GradientType.includes(mergedStyle.stroke?.gradient)) {\n      computeStyle.stroke = this._computeGradientAttr(mergedStyle.stroke, data, opt);\n    }\n    return computeStyle;\n  }\n\n  private _computeThresholdAttr(thresholdStyle: IThresholdStyle) {\n    const scale = new ThresholdScale().domain(thresholdStyle.domain).range(thresholdStyle.range);\n    return scale.scale(this.getDataView().latestData[0].value);\n  }\n}\n"]}

package/cjs/mark/mark-set/index.d.ts

@@ -1,6 +1,7 @@
 import type { IMark } from '../interface';
 export interface IMarkInfo {
     styleWithSeriesField?: boolean;
+    name?: string;
 }
 export declare class MarkSet {
     protected _children: IMark[];

package/cjs/mark/mark-set/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/mark-set/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["import { array, isNil, merge } from '@visactor/vutils';\nimport type { IMark } from '../interface';\n\n/** 跟随 mark 一起存储的信息 */\nexport interface IMarkInfo {\n  /** 样式和 seriesField 有关 */\n  styleWithSeriesField?: boolean;\n}\n\nexport class MarkSet {\n  protected _children: IMark[] = [];\n  protected _markNameMap: Record<string, IMark> = {};\n  getMarkNameMap() {\n    return this._markNameMap;\n  }\n\n  protected readonly _infoMap = new Map<IMark, IMarkInfo>();\n  static readonly defaultMarkInfo: IMarkInfo = {};\n\n  addMark(mark?: IMark, markInfo?: IMarkInfo) {\n    if (isNil(mark)) {\n      return;\n    }\n    this._children.push(mark);\n    this._markNameMap[mark.name] = mark;\n    this._infoMap.set(mark, merge({}, MarkSet.defaultMarkInfo, markInfo));\n  }\n\n  removeMark(markName: string): void {\n    const index = this._children.findIndex(m => m.name === markName);\n    if (index >= 0) {\n      this._infoMap.delete(this._children[index]);\n      delete this._markNameMap[markName];\n      this._children.splice(index, 1);\n    }\n  }\n  clear() {\n    this._children = [];\n    this._markNameMap = {};\n    this._infoMap.clear();\n  }\n\n  forEach(callbackfn: (value: IMark, index: number, array: IMark[]) => void) {\n    this._children.forEach(callbackfn);\n  }\n\n  includes(mark: IMark, fromIndex?: number) {\n    return this._children.includes(mark, fromIndex);\n  }\n\n  get(key: number | string) {\n    if (!isNaN(Number(key))) {\n      return this._children[key];\n    }\n    return this._markNameMap[key];\n  }\n\n  getMarks() {\n    return [...this._children];\n  }\n\n  getMarksInType(type: string | string[]): IMark[] {\n    const types = array(type);\n    return this._children.filter(m => types.includes(m.type));\n  }\n\n  getMarkInId(markId: number): IMark | undefined {\n    return this._children.find(m => m.id === markId);\n  }\n\n  /**\n   * 获取满足某 info 的所有 mark\n   * @param info\n   * @returns\n   */\n  getMarkWithInfo(info: Partial<IMarkInfo>) {\n    return this._children.find(mark => {\n      return Object.keys(info).every(key => info[key] === this._infoMap.get(mark)[key]);\n    });\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/mark-set/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["import { array, isNil, merge } from '@visactor/vutils';\nimport type { IMark } from '../interface';\n\n/** 跟随 mark 一起存储的信息 */\nexport interface IMarkInfo {\n  /** 样式和 seriesField 有关 */\n  styleWithSeriesField?: boolean;\n  /** mark name */\n  name?: string;\n}\n\nexport class MarkSet {\n  protected _children: IMark[] = [];\n  protected _markNameMap: Record<string, IMark> = {};\n  getMarkNameMap() {\n    return this._markNameMap;\n  }\n\n  protected readonly _infoMap = new Map<IMark, IMarkInfo>();\n  static readonly defaultMarkInfo: IMarkInfo = {};\n\n  addMark(mark?: IMark, markInfo?: IMarkInfo) {\n    if (isNil(mark)) {\n      return;\n    }\n    this._children.push(mark);\n    this._markNameMap[mark.name] = mark;\n    this._infoMap.set(mark, merge({}, MarkSet.defaultMarkInfo, markInfo));\n  }\n\n  removeMark(markName: string): void {\n    const index = this._children.findIndex(m => m.name === markName);\n    if (index >= 0) {\n      this._infoMap.delete(this._children[index]);\n      delete this._markNameMap[markName];\n      this._children.splice(index, 1);\n    }\n  }\n  clear() {\n    this._children = [];\n    this._markNameMap = {};\n    this._infoMap.clear();\n  }\n\n  forEach(callbackfn: (value: IMark, index: number, array: IMark[]) => void) {\n    this._children.forEach(callbackfn);\n  }\n\n  includes(mark: IMark, fromIndex?: number) {\n    return this._children.includes(mark, fromIndex);\n  }\n\n  get(key: number | string) {\n    if (!isNaN(Number(key))) {\n      return this._children[key];\n    }\n    return this._markNameMap[key];\n  }\n\n  getMarks() {\n    return [...this._children];\n  }\n\n  getMarksInType(type: string | string[]): IMark[] {\n    const types = array(type);\n    return this._children.filter(m => types.includes(m.type));\n  }\n\n  getMarkInId(markId: number): IMark | undefined {\n    return this._children.find(m => m.id === markId);\n  }\n\n  /**\n   * 获取满足某 info 的所有 mark\n   * @param info\n   * @returns\n   */\n  getMarkWithInfo(info: Partial<IMarkInfo>) {\n    return this._children.find(mark => {\n      return Object.keys(info).every(key => info[key] === this._infoMap.get(mark)[key]);\n    });\n  }\n}\n"]}

package/cjs/mark/symbol.js

@@ -10,7 +10,7 @@ class BaseSymbolMark extends base_mark_1.BaseMark {
     _getDefaultStyle() {
         return Object.assign(Object.assign({}, super._getDefaultStyle()), {
             size: 1,
-            shape: typings_1.ShapeTypeEnum.circle,
+            symbolType: typings_1.ShapeTypeEnum.circle,
             fill: void 0,
             lineWidth: 0
         });

package/cjs/mark/symbol.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/symbol.ts"],"names":[],"mappings":";;;AAAA,wCAA2C;AAE3C,gDAA4C;AAG5C,2CAA2C;AAI3C,MAAa,cAA0C,SAAQ,oBAAW;IAC9D,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,IAAI,EAAE,CAAC,EACP,KAAK,EAAE,uBAAa,CAAC,MAAM,EAC3B,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAA6B,CAAC;IACvC,CAAC;CACF;AAXD,wCAWC;AAED,MAAa,UAAW,SAAQ,cAA+B;IAA/D;;QAEW,SAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAClC,CAAC;;AAHD,gCAGC;AAFiB,eAAI,GAAG,wBAAY,CAAC,MAAM,CAAC","file":"symbol.js","sourcesContent":["import { ShapeTypeEnum } from '../typings';\nimport type { ISymbolMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\n\nexport type ISymbolMark = IMarkRaw<ISymbolMarkSpec>;\n\nexport class BaseSymbolMark<T extends ISymbolMarkSpec> extends BaseMark<T> {\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ISymbolMarkSpec> = {\n      ...super._getDefaultStyle(),\n      size: 1,\n      shape: ShapeTypeEnum.circle,\n      fill: undefined,\n      lineWidth: 0\n    };\n    return defaultStyle as IMarkStyle<T>;\n  }\n}\n\nexport class SymbolMark extends BaseSymbolMark<ISymbolMarkSpec> implements ISymbolMark {\n  static readonly type = MarkTypeEnum.symbol;\n  readonly type = SymbolMark.type;\n}\n"]}
+{"version":3,"sources":["../src/mark/symbol.ts"],"names":[],"mappings":";;;AAAA,wCAA2C;AAE3C,gDAA4C;AAG5C,2CAA2C;AAI3C,MAAa,cAA0C,SAAQ,oBAAW;IAC9D,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,IAAI,EAAE,CAAC,EACP,UAAU,EAAE,uBAAa,CAAC,MAAM,EAChC,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAA6B,CAAC;IACvC,CAAC;CACF;AAXD,wCAWC;AAED,MAAa,UAAW,SAAQ,cAA+B;IAA/D;;QAEW,SAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAClC,CAAC;;AAHD,gCAGC;AAFiB,eAAI,GAAG,wBAAY,CAAC,MAAM,CAAC","file":"symbol.js","sourcesContent":["import { ShapeTypeEnum } from '../typings';\nimport type { ISymbolMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\n\nexport type ISymbolMark = IMarkRaw<ISymbolMarkSpec>;\n\nexport class BaseSymbolMark<T extends ISymbolMarkSpec> extends BaseMark<T> {\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ISymbolMarkSpec> = {\n      ...super._getDefaultStyle(),\n      size: 1,\n      symbolType: ShapeTypeEnum.circle,\n      fill: undefined,\n      lineWidth: 0\n    };\n    return defaultStyle as IMarkStyle<T>;\n  }\n}\n\nexport class SymbolMark extends BaseSymbolMark<ISymbolMarkSpec> implements ISymbolMark {\n  static readonly type = MarkTypeEnum.symbol;\n  readonly type = SymbolMark.type;\n}\n"]}

package/cjs/model/base-model.js

@@ -111,13 +111,13 @@ class BaseModel extends layout_item_1.LayoutItem {
         const {mark: markThemeByType, markByName: markThemeByName} = globalTheme;
         this.getMarkInfoList().forEach((({type: type, name: name}) => {
             var _a, _b;
-            this._theme[name] = (0, vutils_1.merge)({}, null !== (_a = null == markThemeByType ? void 0 : markThemeByType[(0, 
+            this._theme[name] = (0, util_1.mergeSpec)({}, null !== (_a = null == markThemeByType ? void 0 : markThemeByType[(0, 
             vutils_1.array)(type)[0]]) && void 0 !== _a ? _a : {}, null !== (_b = null == markThemeByName ? void 0 : markThemeByName[name]) && void 0 !== _b ? _b : {}, this._theme[name]);
         }));
     }
     _mergeThemeToSpec() {
         const chartSpec = this.getChart().getSpec();
-        this._spec = (0, vutils_1.merge)({}, this._theme, this._getDefaultSpecFromChart(chartSpec), this._originalSpec);
+        this._spec = (0, util_1.mergeSpec)({}, this._theme, this._getDefaultSpecFromChart(chartSpec), this._originalSpec);
     }
     _getDefaultSpecFromChart(chartSpec) {
         return {};

package/cjs/model/base-model.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/model/base-model.ts"],"names":[],"mappings":"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","file":"base-model.js","sourcesContent":["import { createID, isValid, cloneDeepSpec, preprocessSpecOrTheme } from '../util';\nimport { Event } from '../event/event';\nimport type { IEvent } from '../event/interface';\nimport { LayoutItem } from './layout-item';\nimport type {\n  IEffect,\n  IModel,\n  IModelInitOption,\n  IModelOption,\n  IModelRenderOption,\n  IModelEvaluateOption,\n  IModelSpec,\n  ILayoutRect,\n  IModelMarkInfo\n} from './interface';\nimport type { CoordinateType } from '../typings/coordinate';\nimport type { IMark, IMarkOption, IMarkRaw, IMarkStyle, MarkTypeEnum } from '../mark/interface';\nimport type { Datum, StateValueType, ConvertToMarkStyleSpec, ICommonSpec, StringOrNumber, IRect } from '../typings';\nimport type { ITooltipHelper } from './tooltip-helper';\nimport type { CompilableData } from '../compile/data/compilable-data';\nimport { ModelStateManager } from './model-state-manager';\nimport { PREFIX } from '../constant';\nimport type { IElement, IGroupMark, IMark as IVGrammarMark } from '@visactor/vgrammar';\nimport { array, isEqual, isNil, merge } from '@visactor/vutils';\nimport { Factory } from '../core/factory';\nimport type { SeriesTypeEnum } from '../series/interface';\nimport { MarkSet } from '../mark/mark-set';\n\nexport abstract class BaseModel<T extends IModelSpec> extends LayoutItem<T> implements IModel {\n  readonly type: string = 'null';\n  readonly modelType: string = 'null';\n\n  readonly id;\n\n  userId: StringOrNumber | undefined = undefined;\n\n  // 事件\n  readonly event: IEvent;\n\n  // 副作用\n  readonly effect: IEffect;\n\n  // 数据\n  protected _data: CompilableData = null;\n  getData() {\n    return this._data;\n  }\n\n  protected _specIndex: number = 0;\n  getSpecIndex() {\n    return this._specIndex;\n  }\n\n  readonly specKey: string = '';\n\n  protected _originalSpec: any;\n\n  protected declare _option: IModelOption;\n  getOption() {\n    return this._option;\n  }\n\n  protected _sceneNodeMap: Map<string, IElement>;\n\n  protected _marks: MarkSet = new MarkSet();\n  getMarks(): IMark[] {\n    return this._marks?.getMarks() ?? [];\n  }\n  getMarkNameMap() {\n    return this._marks?.getMarkNameMap();\n  }\n  getMarkSet() {\n    return this._marks;\n  }\n  getMarkInfoList(): IModelMarkInfo[] {\n    return this.getMarks().map(mark => ({\n      type: mark.type as MarkTypeEnum,\n      name: mark.name\n    }));\n  }\n\n  getChart() {\n    return this._option.getChart();\n  }\n\n  /** 状态管理器 */\n  state: ModelStateManager;\n  getState() {\n    return this.state._stateMap;\n  }\n\n  protected _theme?: any; // 非全局 theme，是对应于具体 model 的 theme 对象\n\n  /** for layout diff */\n  protected _lastLayoutRect: ILayoutRect = null;\n\n  protected _tooltipHelper: ITooltipHelper | undefined;\n  get tooltipHelper() {\n    return this._tooltipHelper;\n  }\n\n  // TODO: 有些hack,这个tag是为了避免布局逻辑中，轴的数据变化，又由数据变化触发重新布局\n  protected _isLayout: boolean = true;\n\n  constructor(spec: T, option: IModelOption) {\n    super(option);\n    this.id = createID();\n    this._originalSpec = spec;\n    this._spec = cloneDeepSpec(spec);\n    this.userId = spec.id;\n    this._specIndex = option.specIndex ?? 0;\n    this.specKey = option.specKey ?? '';\n    this.effect = {};\n    this.event = new Event(option.eventDispatcher, option.mode);\n    option.map?.set(this.id, this);\n    this._sceneNodeMap = new Map();\n    this.state = new ModelStateManager({\n      ...option,\n      stateKeyToSignalName: this.stateKeyToSignalName.bind(this)\n    });\n  }\n  coordinate?: CoordinateType;\n\n  protected _releaseEvent() {\n    this.event.release();\n  }\n\n  created() {\n    this._initTheme();\n    this.setAttrFromSpec();\n  }\n\n  updateState(newState: Record<string, unknown>) {\n    return this.state.updateState(newState);\n  }\n\n  init(option: IModelInitOption) {\n    // do nothing\n  }\n\n  afterInit() {\n    // do nothing\n  }\n\n  onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect, ctx: any): void {\n    super.onLayoutStart(layoutRect, viewRect, ctx);\n    this._isLayout = true;\n  }\n  onLayoutEnd(ctx: any): void {\n    // diff layoutRect\n    const layoutRect = this.getLayoutRect();\n    if (this._forceLayoutTag || !isEqual(this._lastLayoutRect, layoutRect)) {\n      this.updateLayoutAttribute();\n    }\n    this._forceLayoutTag = false;\n    this.getMarks().forEach(m => m.updateLayoutState(true, true));\n    this._isLayout = false;\n  }\n\n  protected _forceLayout() {\n    if (this._isLayout) {\n      return;\n    }\n    this._forceLayoutTag = true;\n    this._option.globalInstance.getChart()?.setLayoutTag(true);\n  }\n\n  onEvaluateEnd(ctx: IModelEvaluateOption) {\n    // do nothing\n  }\n  abstract onRender(ctx: IModelRenderOption): void;\n\n  onDataUpdate() {\n    // do nothing\n  }\n\n  release() {\n    this._releaseEvent();\n    this._originalSpec = {};\n    this._spec = undefined;\n    this.getMarks().forEach(m => m.release());\n    this.state.release();\n    this._data?.release();\n    this._data = this._specIndex = this._sceneNodeMap = null;\n    this._marks.clear();\n    super.release();\n  }\n\n  updateSpec(spec: any) {\n    this._originalSpec = spec;\n    this._spec = cloneDeepSpec(spec);\n    const result = {\n      change: false,\n      reMake: false,\n      reMakeData: false,\n      reRender: false,\n      reSize: false,\n      reCompile: false\n    };\n    return result;\n  }\n\n  reInit(theme?: any) {\n    this._initTheme(theme);\n    this.setAttrFromSpec();\n  }\n\n  protected _initTheme(theme?: any) {\n    this._theme = theme;\n\n    this._mergeMarkTheme();\n  }\n\n  /** 将全局的 mark theme 合并进 model theme */\n  protected _mergeMarkTheme() {\n    const globalTheme = this._option.getTheme?.();\n    if (isNil(globalTheme) || isNil(this._theme)) {\n      return;\n    }\n\n    const { mark: markThemeByType, markByName: markThemeByName } = globalTheme;\n    this.getMarkInfoList().forEach(({ type, name }) => {\n      this._theme[name] = merge(\n        {},\n        markThemeByType?.[array(type)[0]] ?? {},\n        markThemeByName?.[name] ?? {},\n        this._theme[name]\n      );\n    });\n  }\n\n  /** 将 theme merge 到 spec 中 */\n  protected _mergeThemeToSpec() {\n    const chartSpec = this.getChart().getSpec();\n    this._spec = merge({}, this._theme, this._getDefaultSpecFromChart(chartSpec), this._originalSpec);\n  }\n\n  /** 从 chart spec 提取配置作为 model 的默认 spec 配置 */\n  protected _getDefaultSpecFromChart(chartSpec: any): Partial<T> {\n    return {};\n  }\n\n  /** 对 spec 进行遍历和转换 */\n  protected _preprocessSpec(obj?: any): any {\n    if (!arguments.length) {\n      obj = this._spec;\n    }\n\n    const newObj = preprocessSpecOrTheme(\n      obj,\n      this._option.getTheme?.()?.colorScheme,\n      this.modelType === 'series' ? (this.type as SeriesTypeEnum) : undefined\n    );\n\n    if (!arguments.length) {\n      this._spec = newObj;\n    }\n    return newObj;\n  }\n\n  setCurrentTheme(theme: any, noRender?: boolean) {\n    // do nothing\n  }\n\n  updateLayoutAttribute() {\n    // do nothing\n  }\n\n  setAttrFromSpec() {\n    super.setAttrFromSpec(this._spec, this._option.getChartViewRect());\n  }\n\n  /** mark style 内部转换逻辑，override 使用 */\n  protected _convertMarkStyle<T extends ICommonSpec = ICommonSpec>(\n    style: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>\n  ): Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>> {\n    const newStyle: any = { ...style };\n    return newStyle;\n  }\n\n  setMarkStyle<T extends ICommonSpec>(\n    mark: IMarkRaw<T>,\n    style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n    state?: StateValueType,\n    level?: number\n  ) {\n    if (!isValid(mark) || !isValid(style)) {\n      return;\n    }\n    mark.setStyle(this._convertMarkStyle(style), state, level);\n  }\n\n  initMarkStyleWithSpec(mark?: IMark, spec?: any, key?: string) {\n    if (!isValid(mark) || !isValid(spec)) {\n      return;\n    }\n    const { style, state } = spec;\n    const newSpec = { ...spec };\n\n    if (style) {\n      newSpec.style = this._convertMarkStyle(style);\n    }\n    if (state) {\n      newSpec.state = {};\n      Object.keys(state).forEach(key => {\n        newSpec.state[key] = this._convertMarkStyle(state[key]);\n      });\n    }\n    mark.initStyleWithSpec(newSpec, key);\n  }\n\n  protected stateKeyToSignalName(key: string, opt?: string) {\n    let name = `${PREFIX}_${this.modelType}_${this.type}_${this.id}_${key}`;\n    opt && (name += `_${opt}`);\n    return name;\n  }\n\n  compileData() {\n    this._data?.compile();\n  }\n\n  compileMarks(group?: string | IGroupMark) {\n    this.getMarks().forEach(m => {\n      m.compile({ group });\n    });\n  }\n\n  compileSignal() {\n    this.state?.compile();\n  }\n\n  bindSceneNode(node: IElement) {\n    this._sceneNodeMap.set(node.mark.id(), node as IElement);\n  }\n\n  getSceneNodes() {\n    return Array.from(this._sceneNodeMap.values());\n  }\n\n  getSceneNodeMarks() {\n    return this.getSceneNodes().map(node => node.mark as IVGrammarMark);\n  }\n\n  protected _createMark<T extends IMark>(markInfo: IModelMarkInfo, option: Partial<IMarkOption> = {}): T {\n    const { type, name } = markInfo;\n    const m = Factory.createMark(type as any, name, {\n      model: this,\n      map: this._option.map,\n      getCompiler: this.getCompiler,\n      globalScale: this._option.globalScale,\n      ...option\n    }) as T;\n    m?.created();\n    return m;\n  }\n\n  /**\n   * 数据唯一ID\n   * 根据自身动画数据匹配需求设置返回值。\n   * 默认返回 undefined 时，根据 VGrammar 默认数据 ID 进行索引和匹配。\n   */\n  protected _getDataIdKey(): string | ((datum: Datum) => string) | undefined {\n    return undefined;\n  }\n}\n"]}
+{"version":3,"sources":["../src/model/base-model.ts"],"names":[],"mappings":"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","file":"base-model.js","sourcesContent":["import { createID, isValid, cloneDeepSpec, preprocessSpecOrTheme, mergeSpec } from '../util';\nimport { Event } from '../event/event';\nimport type { IEvent } from '../event/interface';\nimport { LayoutItem } from './layout-item';\nimport type {\n  IEffect,\n  IModel,\n  IModelInitOption,\n  IModelOption,\n  IModelRenderOption,\n  IModelEvaluateOption,\n  IModelSpec,\n  ILayoutRect,\n  IModelMarkInfo\n} from './interface';\nimport type { CoordinateType } from '../typings/coordinate';\nimport type { IMark, IMarkOption, IMarkRaw, IMarkStyle, MarkTypeEnum } from '../mark/interface';\nimport type { Datum, StateValueType, ConvertToMarkStyleSpec, ICommonSpec, StringOrNumber, IRect } from '../typings';\nimport type { ITooltipHelper } from './tooltip-helper';\nimport type { CompilableData } from '../compile/data/compilable-data';\nimport { ModelStateManager } from './model-state-manager';\nimport { PREFIX } from '../constant';\nimport type { IElement, IGroupMark, IMark as IVGrammarMark } from '@visactor/vgrammar';\nimport { array, isEqual, isNil } from '@visactor/vutils';\nimport { Factory } from '../core/factory';\nimport type { SeriesTypeEnum } from '../series/interface';\nimport { MarkSet } from '../mark/mark-set';\n\nexport abstract class BaseModel<T extends IModelSpec> extends LayoutItem<T> implements IModel {\n  readonly type: string = 'null';\n  readonly modelType: string = 'null';\n\n  readonly id;\n\n  userId: StringOrNumber | undefined = undefined;\n\n  // 事件\n  readonly event: IEvent;\n\n  // 副作用\n  readonly effect: IEffect;\n\n  // 数据\n  protected _data: CompilableData = null;\n  getData() {\n    return this._data;\n  }\n\n  protected _specIndex: number = 0;\n  getSpecIndex() {\n    return this._specIndex;\n  }\n\n  readonly specKey: string = '';\n\n  protected _originalSpec: any;\n\n  protected declare _option: IModelOption;\n  getOption() {\n    return this._option;\n  }\n\n  protected _sceneNodeMap: Map<string, IElement>;\n\n  protected _marks: MarkSet = new MarkSet();\n  getMarks(): IMark[] {\n    return this._marks?.getMarks() ?? [];\n  }\n  getMarkNameMap() {\n    return this._marks?.getMarkNameMap();\n  }\n  getMarkSet() {\n    return this._marks;\n  }\n  getMarkInfoList(): IModelMarkInfo[] {\n    return this.getMarks().map(mark => ({\n      type: mark.type as MarkTypeEnum,\n      name: mark.name\n    }));\n  }\n\n  getChart() {\n    return this._option.getChart();\n  }\n\n  /** 状态管理器 */\n  state: ModelStateManager;\n  getState() {\n    return this.state._stateMap;\n  }\n\n  protected _theme?: any; // 非全局 theme，是对应于具体 model 的 theme 对象\n\n  /** for layout diff */\n  protected _lastLayoutRect: ILayoutRect = null;\n\n  protected _tooltipHelper: ITooltipHelper | undefined;\n  get tooltipHelper() {\n    return this._tooltipHelper;\n  }\n\n  // TODO: 有些hack,这个tag是为了避免布局逻辑中，轴的数据变化，又由数据变化触发重新布局\n  protected _isLayout: boolean = true;\n\n  constructor(spec: T, option: IModelOption) {\n    super(option);\n    this.id = createID();\n    this._originalSpec = spec;\n    this._spec = cloneDeepSpec(spec);\n    this.userId = spec.id;\n    this._specIndex = option.specIndex ?? 0;\n    this.specKey = option.specKey ?? '';\n    this.effect = {};\n    this.event = new Event(option.eventDispatcher, option.mode);\n    option.map?.set(this.id, this);\n    this._sceneNodeMap = new Map();\n    this.state = new ModelStateManager({\n      ...option,\n      stateKeyToSignalName: this.stateKeyToSignalName.bind(this)\n    });\n  }\n  coordinate?: CoordinateType;\n\n  protected _releaseEvent() {\n    this.event.release();\n  }\n\n  created() {\n    this._initTheme();\n    this.setAttrFromSpec();\n  }\n\n  updateState(newState: Record<string, unknown>) {\n    return this.state.updateState(newState);\n  }\n\n  init(option: IModelInitOption) {\n    // do nothing\n  }\n\n  afterInit() {\n    // do nothing\n  }\n\n  onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect, ctx: any): void {\n    super.onLayoutStart(layoutRect, viewRect, ctx);\n    this._isLayout = true;\n  }\n  onLayoutEnd(ctx: any): void {\n    // diff layoutRect\n    const layoutRect = this.getLayoutRect();\n    if (this._forceLayoutTag || !isEqual(this._lastLayoutRect, layoutRect)) {\n      this.updateLayoutAttribute();\n    }\n    this._forceLayoutTag = false;\n    this.getMarks().forEach(m => m.updateLayoutState(true, true));\n    this._isLayout = false;\n  }\n\n  protected _forceLayout() {\n    if (this._isLayout) {\n      return;\n    }\n    this._forceLayoutTag = true;\n    this._option.globalInstance.getChart()?.setLayoutTag(true);\n  }\n\n  onEvaluateEnd(ctx: IModelEvaluateOption) {\n    // do nothing\n  }\n  abstract onRender(ctx: IModelRenderOption): void;\n\n  onDataUpdate() {\n    // do nothing\n  }\n\n  release() {\n    this._releaseEvent();\n    this._originalSpec = {};\n    this._spec = undefined;\n    this.getMarks().forEach(m => m.release());\n    this.state.release();\n    this._data?.release();\n    this._data = this._specIndex = this._sceneNodeMap = null;\n    this._marks.clear();\n    super.release();\n  }\n\n  updateSpec(spec: any) {\n    this._originalSpec = spec;\n    this._spec = cloneDeepSpec(spec);\n    const result = {\n      change: false,\n      reMake: false,\n      reMakeData: false,\n      reRender: false,\n      reSize: false,\n      reCompile: false\n    };\n    return result;\n  }\n\n  reInit(theme?: any) {\n    this._initTheme(theme);\n    this.setAttrFromSpec();\n  }\n\n  protected _initTheme(theme?: any) {\n    this._theme = theme;\n\n    this._mergeMarkTheme();\n  }\n\n  /** 将全局的 mark theme 合并进 model theme */\n  protected _mergeMarkTheme() {\n    const globalTheme = this._option.getTheme?.();\n    if (isNil(globalTheme) || isNil(this._theme)) {\n      return;\n    }\n\n    const { mark: markThemeByType, markByName: markThemeByName } = globalTheme;\n    this.getMarkInfoList().forEach(({ type, name }) => {\n      this._theme[name] = mergeSpec(\n        {},\n        markThemeByType?.[array(type)[0]] ?? {},\n        markThemeByName?.[name] ?? {},\n        this._theme[name]\n      );\n    });\n  }\n\n  /** 将 theme merge 到 spec 中 */\n  protected _mergeThemeToSpec() {\n    const chartSpec = this.getChart().getSpec();\n    this._spec = mergeSpec({}, this._theme, this._getDefaultSpecFromChart(chartSpec), this._originalSpec);\n  }\n\n  /** 从 chart spec 提取配置作为 model 的默认 spec 配置 */\n  protected _getDefaultSpecFromChart(chartSpec: any): Partial<T> {\n    return {};\n  }\n\n  /** 对 spec 进行遍历和转换 */\n  protected _preprocessSpec(obj?: any): any {\n    if (!arguments.length) {\n      obj = this._spec;\n    }\n\n    const newObj = preprocessSpecOrTheme(\n      obj,\n      this._option.getTheme?.()?.colorScheme,\n      this.modelType === 'series' ? (this.type as SeriesTypeEnum) : undefined\n    );\n\n    if (!arguments.length) {\n      this._spec = newObj;\n    }\n    return newObj;\n  }\n\n  setCurrentTheme(theme: any, noRender?: boolean) {\n    // do nothing\n  }\n\n  updateLayoutAttribute() {\n    // do nothing\n  }\n\n  setAttrFromSpec() {\n    super.setAttrFromSpec(this._spec, this._option.getChartViewRect());\n  }\n\n  /** mark style 内部转换逻辑，override 使用 */\n  protected _convertMarkStyle<T extends ICommonSpec = ICommonSpec>(\n    style: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>\n  ): Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>> {\n    const newStyle: any = { ...style };\n    return newStyle;\n  }\n\n  setMarkStyle<T extends ICommonSpec>(\n    mark: IMarkRaw<T>,\n    style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n    state?: StateValueType,\n    level?: number\n  ) {\n    if (!isValid(mark) || !isValid(style)) {\n      return;\n    }\n    mark.setStyle(this._convertMarkStyle(style), state, level);\n  }\n\n  initMarkStyleWithSpec(mark?: IMark, spec?: any, key?: string) {\n    if (!isValid(mark) || !isValid(spec)) {\n      return;\n    }\n    const { style, state } = spec;\n    const newSpec = { ...spec };\n\n    if (style) {\n      newSpec.style = this._convertMarkStyle(style);\n    }\n    if (state) {\n      newSpec.state = {};\n      Object.keys(state).forEach(key => {\n        newSpec.state[key] = this._convertMarkStyle(state[key]);\n      });\n    }\n    mark.initStyleWithSpec(newSpec, key);\n  }\n\n  protected stateKeyToSignalName(key: string, opt?: string) {\n    let name = `${PREFIX}_${this.modelType}_${this.type}_${this.id}_${key}`;\n    opt && (name += `_${opt}`);\n    return name;\n  }\n\n  compileData() {\n    this._data?.compile();\n  }\n\n  compileMarks(group?: string | IGroupMark) {\n    this.getMarks().forEach(m => {\n      m.compile({ group });\n    });\n  }\n\n  compileSignal() {\n    this.state?.compile();\n  }\n\n  bindSceneNode(node: IElement) {\n    this._sceneNodeMap.set(node.mark.id(), node as IElement);\n  }\n\n  getSceneNodes() {\n    return Array.from(this._sceneNodeMap.values());\n  }\n\n  getSceneNodeMarks() {\n    return this.getSceneNodes().map(node => node.mark as IVGrammarMark);\n  }\n\n  protected _createMark<T extends IMark>(markInfo: IModelMarkInfo, option: Partial<IMarkOption> = {}): T {\n    const { type, name } = markInfo;\n    const m = Factory.createMark(type as any, name, {\n      model: this,\n      map: this._option.map,\n      getCompiler: this.getCompiler,\n      globalScale: this._option.globalScale,\n      ...option\n    }) as T;\n    m?.created();\n    return m;\n  }\n\n  /**\n   * 数据唯一ID\n   * 根据自身动画数据匹配需求设置返回值。\n   * 默认返回 undefined 时，根据 VGrammar 默认数据 ID 进行索引和匹配。\n   */\n  protected _getDataIdKey(): string | ((datum: Datum) => string) | undefined {\n    return undefined;\n  }\n}\n"]}

package/cjs/model/interface.d.ts

@@ -142,7 +142,7 @@ export interface IModel extends ICompilable, ILayoutItem {
     onEvaluateEnd: (ctx: IModelEvaluateOption) => void;
     onRender: (ctx: IModelRenderOption) => void;
     onDataUpdate: () => void;
-    updateSpec: (spec: any) => IUpdateSpecResult;
+    updateSpec: (spec: any, totalSpec?: any) => IUpdateSpecResult;
     getSpec?: () => any;
     getSpecIndex: () => number;
     setCurrentTheme: (theme: any, noRender?: boolean) => void;

package/cjs/model/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/model/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\nimport type { DataSet } from '@visactor/vdataset';\nimport type { IEvent, IEventDispatcher } from '../event/interface';\nimport type { IMark, IMarkRaw, IMarkStyle, MarkTypeEnum } from '../mark/interface';\nimport type { RenderMode } from '../typings/spec/common';\nimport type { VChart } from '../vchart-all';\nimport type { IData, IElement, IMark as IVGrammarMark } from '@visactor/vgrammar';\nimport type {\n  IOrientType,\n  IPoint,\n  IGroupMarkSpec,\n  ConvertToMarkStyleSpec,\n  CoordinateType,\n  ICommonSpec,\n  IRect,\n  StringOrNumber\n} from '../typings';\nimport type { ITheme } from '../theme';\nimport type { StateValueType } from '../typings/spec';\nimport type { ITooltipHelper } from './tooltip-helper';\nimport type { ModelStateManager } from './model-state-manager';\nimport type { ICompilable, ICompilableInitOption } from '../compile/interface';\nimport type { ICompilableData } from '../compile/data';\nimport type { IGlobalScale } from '../scale/interface';\nimport type { IChart } from '../chart/interface';\n\nexport type ILayoutNumber = number | IPercent | ((layoutRect: ILayoutRect) => number) | IPercentOffset;\n\nexport interface ILayoutPoint {\n  x: number;\n  y: number;\n}\n\nexport interface ILayoutRectLevel {\n  width: number;\n  height: number;\n}\nexport interface ILayoutRect {\n  width: number;\n  height: number;\n}\n\nexport type IPercent = `${number}%`;\n\nexport type IPercentOffset = { percent?: number; offset?: number };\n\nexport type ILayoutPercent = IPercent | number;\n\n/**\n * 相对布局和绝对布局\n * 在相对布局结束后进行二次的绝对布局\n * 绝对布局会只根据 chart 进行相对处理\n */\n\ntype ILayoutType = 'region-relative' | 'region' | 'normal' | 'absolute' | 'normal-inline';\n\nexport type ILayoutOrientPadding = {\n  left?: ILayoutNumber;\n  right?: ILayoutNumber;\n  top?: ILayoutNumber;\n  bottom?: ILayoutNumber;\n};\n\n/** 布局 padding的配置 */\nexport type ILayoutPaddingSpec = ILayoutOrientPadding | ILayoutNumber | ILayoutNumber[];\n\n/**\n * 因为这些元素都会继承到各个模块，所以这里统一有前缀避免语意冲突\n */\nexport interface ILayoutItem {\n  /**\n   * 标记这个布局Item的方向（left->right, right->left, top->bottom, bottom->top）\n   */\n  directionStr?: 'l2r' | 'r2l' | 't2b' | 'b2t';\n  layoutClip: boolean;\n  layoutType: ILayoutType;\n  layoutBindRegionID: number | number[];\n  layoutOrient: IOrientType;\n\n  layoutPaddingLeft: number;\n  layoutPaddingTop: number;\n  layoutPaddingRight: number;\n  layoutPaddingBottom: number;\n\n  layoutOffsetX: number;\n  layoutOffsetY: number;\n\n  // 越大越先处理\n  layoutLevel: number;\n\n  layoutZIndex: number;\n  chartLayoutRect: ILayoutRect;\n\n  /** 是否可见 */\n  getVisible: () => boolean;\n\n  /** 是否自动缩进 */\n  getAutoIndent: () => boolean;\n  getLayoutStartPoint: () => ILayoutPoint;\n  getLayoutRect: () => ILayoutRect;\n  getLastComputeOutBounds: () => IBoundsLike;\n\n  /**\n   * 更新元素布局的 layoutRect 大小，用来更新指定布局空间\n   */\n  setLayoutRect: (rect: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRectLevel>) => void;\n  /**\n   * 基于元素内部逻辑计算占位空间，rect表示可用空间\n   */\n  computeBoundsInRect: (rect: ILayoutRect) => ILayoutRect;\n  /**\n   * 更新元素布局的起始点位置\n   */\n  setLayoutStartPosition: (pos: Partial<IPoint>) => void;\n  /**\n   * 更新绝对布局元素的位置信息\n   */\n  absoluteLayoutInRect: (rect: IRect) => void;\n  /**\n   * 元素内部布局信息更新\n   */\n  updateLayoutAttribute: () => void;\n}\n\nexport interface ILayoutItemSpec {\n  /** 当前模块的布局类型，配置为 absolute 的话，当前元素会以图表左上角为原点进行绝对布局 */\n  layoutType?: ILayoutType;\n  /**\n   * 布局顺序等级，等级越大的，越优先布局\n   * 比如顶部同时有标题和图例的场景，期望标题先放在顶部，然后放置图例。\n   */\n  layoutLevel?: number;\n\n  // 基础的布局配置\n  /** 模块布局位置 */\n  orient?: IOrientType;\n  /** 模块的布局间距 */\n  padding?: ILayoutPaddingSpec;\n  /** 是否按照 orient 自动修改 padding，隐藏位于外侧的 padding。目前只在组件上生效 */\n  noOuterPadding?: boolean;\n  /** 模块的布局大小：宽度 */\n  width?: ILayoutNumber;\n  /** 模块的布局最大宽度 */\n  maxWidth?: ILayoutNumber;\n  /** 模块的布局最小宽度 */\n  minWidth?: ILayoutNumber;\n  /** 模块的布局大小：高度 */\n  height?: ILayoutNumber;\n  /** 模块的布局最大高度 */\n  maxHeight?: ILayoutNumber;\n  /** 模块的布局最小高度 */\n  minHeight?: ILayoutNumber;\n  /** 模块的布局位置偏移：X */\n  offsetX?: ILayoutNumber;\n  /** 模块的布局位置偏移：Y */\n  offsetY?: ILayoutNumber;\n\n  /** 模块的展示层级，当2个模块重叠时，层级较大的展示在上方 */\n  zIndex?: number;\n  /** 模块是否裁剪超出布局区域外的绘图内容 */\n  clip?: boolean;\n\n  // 绝对布局下的对齐设置\n\n  /** 模块绝对布局下，与图表左侧的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  left?: ILayoutNumber;\n  /** 模块绝对布局下，与图表右侧的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  right?: ILayoutNumber;\n  /** 模块绝对布局下，与图表顶部的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  top?: ILayoutNumber;\n  /** 模块绝对布局下，与图表底部的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  bottom?: ILayoutNumber;\n  /** 模块绝对布局下，元素将放置在图表的正中间。注意仅在 layoutType === 'absolute' 时生效，同时将忽略 padding 属性  */\n  center?: boolean;\n}\n\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelInitOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelLayoutOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelEvaluateOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelRenderOption {}\n\nexport interface IEffect {\n  [key: string]: (e?: any) => any;\n}\n\nexport interface IMarkTreeGroup extends Partial<IMarkStyle<IGroupMarkSpec>> {\n  // 必须要有名字\n  type: 'group';\n  name: string;\n  marks: (IMarkTreeGroup | IMark)[];\n  // TODO: 这里要不要支持复杂场景，有图形组合的场景，用自定义mark？\n  // from?: IData;\n}\n\nexport type IMarkTree = IMarkTreeGroup | IMark | (IMarkTreeGroup | IMark)[];\n\nexport interface IUpdateSpecResult {\n  change: boolean;\n  reMake: boolean;\n  reMakeData?: boolean;\n  reRender?: boolean;\n  reSize?: boolean;\n  // TODO: compile 的判断应不应该出现在这里?\n  reCompile?: boolean;\n}\n\nexport interface IModelProduct {\n  srData: IData;\n}\n\nexport interface IModel extends ICompilable, ILayoutItem {\n  readonly modelType: string;\n  readonly type: string;\n  readonly specKey: string;\n\n  readonly id: number;\n\n  readonly userId?: StringOrNumber;\n\n  // 事件\n  readonly event: IEvent;\n\n  // 副作用\n  readonly effect: IEffect;\n\n  // state如果绑定到mark的更新？\n  // 组件的 mark 要怎么样描述，才能正确的基于组件状态进行样式更新？\n  // 方案1: 组件的 state 关联到 mark 的状态。\n  // 方案2: 组件设置 mark 属性，mark自身属性变化时，自己去更新。\n  // react state\n  readonly state: ModelStateManager;\n  getState: () => ModelStateManager['_stateMap'];\n\n  coordinate?: CoordinateType;\n\n  // 初始化参数\n  getOption: () => IModelOption;\n\n  getMarks: () => IMark[];\n  getMarkNameMap: () => Record<string, IMark>;\n  getMarkInfoList: () => IModelMarkInfo[];\n\n  getData: () => ICompilableData;\n\n  getChart: () => IChart;\n\n  //生命周期\n  // 创建模块自身内容，设置自身属性\n  created: () => void;\n  // 用来处理与其他图表模块的联系\n  init: (option: IModelInitOption) => void;\n  // updateSpec 或者切换主题后，根据新 spec 执行的初始化过程\n  reInit: (theme?: any) => void;\n\n  onLayoutStart: (layoutRect: IRect, viewRect: ILayoutRect, ctx: IModelLayoutOption) => void;\n  onLayoutEnd: (ctx: IModelLayoutOption) => void;\n  onEvaluateEnd: (ctx: IModelEvaluateOption) => void;\n  onRender: (ctx: IModelRenderOption) => void;\n  onDataUpdate: () => void;\n\n  updateSpec: (spec: any) => IUpdateSpecResult;\n  getSpec?: () => any;\n  getSpecIndex: () => number;\n\n  setCurrentTheme: (theme: any, noRender?: boolean) => void;\n\n  setMarkStyle: <T extends ICommonSpec>(\n    mark?: IMarkRaw<T>,\n    style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n    state?: StateValueType,\n    level?: number\n  ) => void;\n\n  initMarkStyleWithSpec: (mark?: IMark, spec?: any, key?: string) => void;\n\n  // tooltip\n  tooltipHelper: ITooltipHelper;\n\n  /** 绑定场景结点 */\n  bindSceneNode: (node: IElement) => void;\n  /** 获取场景结点 */\n  getSceneNodes: () => IElement[];\n  /** 获取场景结点对应 mark */\n  getSceneNodeMarks: () => IVGrammarMark[];\n}\n\nexport interface IModelOption extends ICompilableInitOption {\n  eventDispatcher: IEventDispatcher;\n  dataSet: DataSet;\n  map: Map<StringOrNumber, IModel | IMark>;\n  mode: RenderMode;\n  globalInstance: VChart;\n  specIndex?: number;\n  specKey?: string;\n\n  getTheme?: () => ITheme;\n\n  getChartLayoutRect: () => IRect;\n  getChartViewRect: () => ILayoutRect;\n\n  getChart: () => IChart;\n\n  globalScale: IGlobalScale;\n  animation: boolean;\n  /**\n   * 错误消息回调函数\n   */\n  onError: (...args: any[]) => void;\n}\n\nexport interface IModelConstructor {\n  new (ctx: IModelOption): IModel;\n}\n\nexport type ILayoutModelState = ModelStateManager['_stateMap'];\n\n// TODO: 补充model共有配置\nexport type IModelSpec = ILayoutItemSpec & { id?: StringOrNumber };\n\nexport interface IModelMarkInfo {\n  /** mark 类型 */\n  type: MarkTypeEnum | string | (MarkTypeEnum | string)[];\n  /** mark 名称 */\n  name: string;\n}\n"]}
+{"version":3,"sources":["../src/model/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\nimport type { DataSet } from '@visactor/vdataset';\nimport type { IEvent, IEventDispatcher } from '../event/interface';\nimport type { IMark, IMarkRaw, IMarkStyle, MarkTypeEnum } from '../mark/interface';\nimport type { RenderMode } from '../typings/spec/common';\nimport type { VChart } from '../vchart-all';\nimport type { IData, IElement, IMark as IVGrammarMark } from '@visactor/vgrammar';\nimport type {\n  IOrientType,\n  IPoint,\n  IGroupMarkSpec,\n  ConvertToMarkStyleSpec,\n  CoordinateType,\n  ICommonSpec,\n  IRect,\n  StringOrNumber\n} from '../typings';\nimport type { ITheme } from '../theme';\nimport type { StateValueType } from '../typings/spec';\nimport type { ITooltipHelper } from './tooltip-helper';\nimport type { ModelStateManager } from './model-state-manager';\nimport type { ICompilable, ICompilableInitOption } from '../compile/interface';\nimport type { ICompilableData } from '../compile/data';\nimport type { IGlobalScale } from '../scale/interface';\nimport type { IChart } from '../chart/interface';\n\nexport type ILayoutNumber = number | IPercent | ((layoutRect: ILayoutRect) => number) | IPercentOffset;\n\nexport interface ILayoutPoint {\n  x: number;\n  y: number;\n}\n\nexport interface ILayoutRectLevel {\n  width: number;\n  height: number;\n}\nexport interface ILayoutRect {\n  width: number;\n  height: number;\n}\n\nexport type IPercent = `${number}%`;\n\nexport type IPercentOffset = { percent?: number; offset?: number };\n\nexport type ILayoutPercent = IPercent | number;\n\n/**\n * 相对布局和绝对布局\n * 在相对布局结束后进行二次的绝对布局\n * 绝对布局会只根据 chart 进行相对处理\n */\n\ntype ILayoutType = 'region-relative' | 'region' | 'normal' | 'absolute' | 'normal-inline';\n\nexport type ILayoutOrientPadding = {\n  left?: ILayoutNumber;\n  right?: ILayoutNumber;\n  top?: ILayoutNumber;\n  bottom?: ILayoutNumber;\n};\n\n/** 布局 padding的配置 */\nexport type ILayoutPaddingSpec = ILayoutOrientPadding | ILayoutNumber | ILayoutNumber[];\n\n/**\n * 因为这些元素都会继承到各个模块，所以这里统一有前缀避免语意冲突\n */\nexport interface ILayoutItem {\n  /**\n   * 标记这个布局Item的方向（left->right, right->left, top->bottom, bottom->top）\n   */\n  directionStr?: 'l2r' | 'r2l' | 't2b' | 'b2t';\n  layoutClip: boolean;\n  layoutType: ILayoutType;\n  layoutBindRegionID: number | number[];\n  layoutOrient: IOrientType;\n\n  layoutPaddingLeft: number;\n  layoutPaddingTop: number;\n  layoutPaddingRight: number;\n  layoutPaddingBottom: number;\n\n  layoutOffsetX: number;\n  layoutOffsetY: number;\n\n  // 越大越先处理\n  layoutLevel: number;\n\n  layoutZIndex: number;\n  chartLayoutRect: ILayoutRect;\n\n  /** 是否可见 */\n  getVisible: () => boolean;\n\n  /** 是否自动缩进 */\n  getAutoIndent: () => boolean;\n  getLayoutStartPoint: () => ILayoutPoint;\n  getLayoutRect: () => ILayoutRect;\n  getLastComputeOutBounds: () => IBoundsLike;\n\n  /**\n   * 更新元素布局的 layoutRect 大小，用来更新指定布局空间\n   */\n  setLayoutRect: (rect: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRectLevel>) => void;\n  /**\n   * 基于元素内部逻辑计算占位空间，rect表示可用空间\n   */\n  computeBoundsInRect: (rect: ILayoutRect) => ILayoutRect;\n  /**\n   * 更新元素布局的起始点位置\n   */\n  setLayoutStartPosition: (pos: Partial<IPoint>) => void;\n  /**\n   * 更新绝对布局元素的位置信息\n   */\n  absoluteLayoutInRect: (rect: IRect) => void;\n  /**\n   * 元素内部布局信息更新\n   */\n  updateLayoutAttribute: () => void;\n}\n\nexport interface ILayoutItemSpec {\n  /** 当前模块的布局类型，配置为 absolute 的话，当前元素会以图表左上角为原点进行绝对布局 */\n  layoutType?: ILayoutType;\n  /**\n   * 布局顺序等级，等级越大的，越优先布局\n   * 比如顶部同时有标题和图例的场景，期望标题先放在顶部，然后放置图例。\n   */\n  layoutLevel?: number;\n\n  // 基础的布局配置\n  /** 模块布局位置 */\n  orient?: IOrientType;\n  /** 模块的布局间距 */\n  padding?: ILayoutPaddingSpec;\n  /** 是否按照 orient 自动修改 padding，隐藏位于外侧的 padding。目前只在组件上生效 */\n  noOuterPadding?: boolean;\n  /** 模块的布局大小：宽度 */\n  width?: ILayoutNumber;\n  /** 模块的布局最大宽度 */\n  maxWidth?: ILayoutNumber;\n  /** 模块的布局最小宽度 */\n  minWidth?: ILayoutNumber;\n  /** 模块的布局大小：高度 */\n  height?: ILayoutNumber;\n  /** 模块的布局最大高度 */\n  maxHeight?: ILayoutNumber;\n  /** 模块的布局最小高度 */\n  minHeight?: ILayoutNumber;\n  /** 模块的布局位置偏移：X */\n  offsetX?: ILayoutNumber;\n  /** 模块的布局位置偏移：Y */\n  offsetY?: ILayoutNumber;\n\n  /** 模块的展示层级，当2个模块重叠时，层级较大的展示在上方 */\n  zIndex?: number;\n  /** 模块是否裁剪超出布局区域外的绘图内容 */\n  clip?: boolean;\n\n  // 绝对布局下的对齐设置\n\n  /** 模块绝对布局下，与图表左侧的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  left?: ILayoutNumber;\n  /** 模块绝对布局下，与图表右侧的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  right?: ILayoutNumber;\n  /** 模块绝对布局下，与图表顶部的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  top?: ILayoutNumber;\n  /** 模块绝对布局下，与图表底部的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  bottom?: ILayoutNumber;\n  /** 模块绝对布局下，元素将放置在图表的正中间。注意仅在 layoutType === 'absolute' 时生效，同时将忽略 padding 属性  */\n  center?: boolean;\n}\n\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelInitOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelLayoutOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelEvaluateOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelRenderOption {}\n\nexport interface IEffect {\n  [key: string]: (e?: any) => any;\n}\n\nexport interface IMarkTreeGroup extends Partial<IMarkStyle<IGroupMarkSpec>> {\n  // 必须要有名字\n  type: 'group';\n  name: string;\n  marks: (IMarkTreeGroup | IMark)[];\n  // TODO: 这里要不要支持复杂场景，有图形组合的场景，用自定义mark？\n  // from?: IData;\n}\n\nexport type IMarkTree = IMarkTreeGroup | IMark | (IMarkTreeGroup | IMark)[];\n\nexport interface IUpdateSpecResult {\n  change: boolean;\n  reMake: boolean;\n  reMakeData?: boolean;\n  reRender?: boolean;\n  reSize?: boolean;\n  // TODO: compile 的判断应不应该出现在这里?\n  reCompile?: boolean;\n}\n\nexport interface IModelProduct {\n  srData: IData;\n}\n\nexport interface IModel extends ICompilable, ILayoutItem {\n  readonly modelType: string;\n  readonly type: string;\n  readonly specKey: string;\n\n  readonly id: number;\n\n  readonly userId?: StringOrNumber;\n\n  // 事件\n  readonly event: IEvent;\n\n  // 副作用\n  readonly effect: IEffect;\n\n  // state如果绑定到mark的更新？\n  // 组件的 mark 要怎么样描述，才能正确的基于组件状态进行样式更新？\n  // 方案1: 组件的 state 关联到 mark 的状态。\n  // 方案2: 组件设置 mark 属性，mark自身属性变化时，自己去更新。\n  // react state\n  readonly state: ModelStateManager;\n  getState: () => ModelStateManager['_stateMap'];\n\n  coordinate?: CoordinateType;\n\n  // 初始化参数\n  getOption: () => IModelOption;\n\n  getMarks: () => IMark[];\n  getMarkNameMap: () => Record<string, IMark>;\n  getMarkInfoList: () => IModelMarkInfo[];\n\n  getData: () => ICompilableData;\n\n  getChart: () => IChart;\n\n  //生命周期\n  // 创建模块自身内容，设置自身属性\n  created: () => void;\n  // 用来处理与其他图表模块的联系\n  init: (option: IModelInitOption) => void;\n  // updateSpec 或者切换主题后，根据新 spec 执行的初始化过程\n  reInit: (theme?: any) => void;\n\n  onLayoutStart: (layoutRect: IRect, viewRect: ILayoutRect, ctx: IModelLayoutOption) => void;\n  onLayoutEnd: (ctx: IModelLayoutOption) => void;\n  onEvaluateEnd: (ctx: IModelEvaluateOption) => void;\n  onRender: (ctx: IModelRenderOption) => void;\n  onDataUpdate: () => void;\n\n  updateSpec: (spec: any, totalSpec?: any) => IUpdateSpecResult;\n  getSpec?: () => any;\n  getSpecIndex: () => number;\n\n  setCurrentTheme: (theme: any, noRender?: boolean) => void;\n\n  setMarkStyle: <T extends ICommonSpec>(\n    mark?: IMarkRaw<T>,\n    style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n    state?: StateValueType,\n    level?: number\n  ) => void;\n\n  initMarkStyleWithSpec: (mark?: IMark, spec?: any, key?: string) => void;\n\n  // tooltip\n  tooltipHelper: ITooltipHelper;\n\n  /** 绑定场景结点 */\n  bindSceneNode: (node: IElement) => void;\n  /** 获取场景结点 */\n  getSceneNodes: () => IElement[];\n  /** 获取场景结点对应 mark */\n  getSceneNodeMarks: () => IVGrammarMark[];\n}\n\nexport interface IModelOption extends ICompilableInitOption {\n  eventDispatcher: IEventDispatcher;\n  dataSet: DataSet;\n  map: Map<StringOrNumber, IModel | IMark>;\n  mode: RenderMode;\n  globalInstance: VChart;\n  specIndex?: number;\n  specKey?: string;\n\n  getTheme?: () => ITheme;\n\n  getChartLayoutRect: () => IRect;\n  getChartViewRect: () => ILayoutRect;\n\n  getChart: () => IChart;\n\n  globalScale: IGlobalScale;\n  animation: boolean;\n  /**\n   * 错误消息回调函数\n   */\n  onError: (...args: any[]) => void;\n}\n\nexport interface IModelConstructor {\n  new (ctx: IModelOption): IModel;\n}\n\nexport type ILayoutModelState = ModelStateManager['_stateMap'];\n\n// TODO: 补充model共有配置\nexport type IModelSpec = ILayoutItemSpec & { id?: StringOrNumber };\n\nexport interface IModelMarkInfo {\n  /** mark 类型 */\n  type: MarkTypeEnum | string | (MarkTypeEnum | string)[];\n  /** mark 名称 */\n  name: string;\n}\n"]}

package/cjs/plugin/components/index.d.ts

@@ -1,7 +1,5 @@
-import { AxisLabelOverlapPlugin } from './axis-label-overlap-plugin';
 import { AxisSyncPlugin } from './axis-sync-plugin/';
 declare const _default: {
-    AxisLabelOverlapPlugin: typeof AxisLabelOverlapPlugin;
     AxisSyncPlugin: typeof AxisSyncPlugin;
 };
 export default _default;

package/cjs/plugin/components/index.js

@@ -4,10 +4,9 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 });
 
-const axis_label_overlap_plugin_1 = require("./axis-label-overlap-plugin"), axis_sync_plugin_1 = require("./axis-sync-plugin/");
+const axis_sync_plugin_1 = require("./axis-sync-plugin/");
 
 exports.default = {
-    AxisLabelOverlapPlugin: axis_label_overlap_plugin_1.AxisLabelOverlapPlugin,
     AxisSyncPlugin: axis_sync_plugin_1.AxisSyncPlugin
 };
 //# sourceMappingURL=index.js.map

package/cjs/plugin/components/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/plugin/components/index.ts"],"names":[],"mappings":";;AAAA,2EAAqE;AACrE,0DAAqD;AAErD,kBAAe;IACb,sBAAsB,EAAtB,kDAAsB;IACtB,cAAc,EAAd,iCAAc;CACf,CAAC","file":"index.js","sourcesContent":["import { AxisLabelOverlapPlugin } from './axis-label-overlap-plugin';\nimport { AxisSyncPlugin } from './axis-sync-plugin/';\n\nexport default {\n  AxisLabelOverlapPlugin,\n  AxisSyncPlugin\n};\n"]}
+{"version":3,"sources":["../src/plugin/components/index.ts"],"names":[],"mappings":";;AAAA,0DAAqD;AAErD,kBAAe;IACb,cAAc,EAAd,iCAAc;CACf,CAAC","file":"index.js","sourcesContent":["import { AxisSyncPlugin } from './axis-sync-plugin/';\n\nexport default {\n  AxisSyncPlugin\n};\n"]}

package/cjs/series/area/area.d.ts

@@ -1,3 +1,4 @@
+import type { DataView } from '@visactor/vdataset';
 import { LineLikeSeriesMixin } from '../mixin/line-mixin';
 import type { IAreaMark } from '../../mark/area';
 import { CartesianSeries } from '../cartesian/cartesian';
@@ -5,7 +6,7 @@ import type { Maybe } from '../../typings';
 import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface';
 import type { IAreaSeriesSpec, IAreaSeriesTheme } from './interface';
-export interface AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> extends Pick<LineLikeSeriesMixin, 'initLineMark' | 'initSymbolMark' | 'initLabelMarkStyle' | 'initLineMarkStyle' | 'initSymbolMarkStyle' | '_lineMark' | '_symbolMark'>, CartesianSeries<T> {
+export interface AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> extends Pick<LineLikeSeriesMixin, 'initLineMark' | 'initSymbolMark' | 'initLabelMarkStyle' | 'initLineMarkStyle' | 'initSymbolMarkStyle' | 'encodeDefined' | '_lineMark' | '_symbolMark'>, CartesianSeries<T> {
 }
 export declare class AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> extends CartesianSeries<T> {
     static readonly type: string;
@@ -14,10 +15,12 @@ export declare class AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> ext
     protected _theme: Maybe<IAreaSeriesTheme>;
     protected _areaMark: IAreaMark;
     protected _stack: boolean;
+    protected _sortDataByAxis: boolean;
     setAttrFromSpec(): void;
     initMark(): void;
     initMarkStyle(): void;
     initAnimation(): void;
     protected initTooltip(): void;
+    viewDataStatisticsUpdate(d: DataView): void;
     getDefaultShapeType(): string;
 }

package/cjs/series/area/area.js

@@ -10,7 +10,8 @@ vchart_1.VChart.useMark([ line_1.LineMark, area_1.AreaMark, text_1.TextMark, sym
 
 class AreaSeries extends cartesian_1.CartesianSeries {
     constructor() {
-        super(...arguments), this.type = interface_2.SeriesTypeEnum.area, this._stack = !0;
+        super(...arguments), this.type = interface_2.SeriesTypeEnum.area, this._stack = !0, 
+        this._sortDataByAxis = !0;
     }
     setAttrFromSpec() {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
@@ -23,8 +24,8 @@ class AreaSeries extends cartesian_1.CartesianSeries {
         }));
         let mainSpec = areaSpec, subSpec = lineSpec;
         ("line" === (null !== (_l = this._spec.seriesMark) && void 0 !== _l ? _l : "area") || isLineVisible && !isAreaVisible) && (mainSpec = lineSpec, 
-        subSpec = areaSpec), areaSpec.style = (0, vutils_1.merge)({}, subSpec.style, mainSpec.style), 
-        areaSpec.state = (0, vutils_1.merge)({}, subSpec.state, mainSpec.state), isAreaVisible || (areaSpec.style.fill = !1), 
+        subSpec = areaSpec), areaSpec.style = (0, util_1.mergeSpec)({}, subSpec.style, mainSpec.style), 
+        areaSpec.state = (0, util_1.mergeSpec)({}, subSpec.state, mainSpec.state), isAreaVisible || (areaSpec.style.fill = !1), 
         isLineVisible || (areaSpec.style.stroke = !1), areaSpec.visible = !(!isAreaVisible && !isLineVisible);
     }
     initMark() {
@@ -52,7 +53,7 @@ class AreaSeries extends cartesian_1.CartesianSeries {
                 return (0, util_1.valueInScaleRange)(this.dataToPositionY1(datum), null === (_b = null === (_a = this._yAxisHelper) || void 0 === _a ? void 0 : _a.getScale) || void 0 === _b ? void 0 : _b.call(_a, 0));
             },
             y: this.dataToPositionY.bind(this),
-            z: this.dataToPositionZ.bind(this)
+            z: this._fieldZ ? this.dataToPositionZ.bind(this) : null
         }, "normal", constant_1.AttributeLevel.Series) : this.setMarkStyle(this._areaMark, {
             x: this.dataToPositionX.bind(this),
             x1: datum => {
@@ -60,7 +61,7 @@ class AreaSeries extends cartesian_1.CartesianSeries {
                 return (0, util_1.valueInScaleRange)(this.dataToPositionX1(datum), null === (_b = null === (_a = this._xAxisHelper) || void 0 === _a ? void 0 : _a.getScale) || void 0 === _b ? void 0 : _b.call(_a, 0));
             },
             y: this.dataToPositionY.bind(this),
-            z: this.dataToPositionZ.bind(this),
+            z: this._fieldZ ? this.dataToPositionZ.bind(this) : null,
             orient: this._direction
         }, "normal", constant_1.AttributeLevel.Series), this.setMarkStyle(areaMark, {
             fill: this.getColorAttribute(),
@@ -91,6 +92,9 @@ class AreaSeries extends cartesian_1.CartesianSeries {
     initTooltip() {
         this._tooltipHelper = new tooltip_helpter_1.AreaSeriesTooltipHelper(this);
     }
+    viewDataStatisticsUpdate(d) {
+        super.viewDataStatisticsUpdate(d), this.encodeDefined(this._areaMark, "defined");
+    }
     getDefaultShapeType() {
         return "square";
     }

package/cjs/series/area/area.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/area/area.ts"],"names":[],"mappings":"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","file":"area.js","sourcesContent":["import { isValid, merge } from '@visactor/vutils';\n/* eslint-disable no-duplicate-imports */\nimport { LineLikeSeriesMixin } from '../mixin/line-mixin';\nimport type { IAreaMark } from '../../mark/area';\nimport { Direction } from '../../typings/space';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport { AttributeLevel } from '../../constant';\nimport type { Maybe, Datum, ConvertToMarkStyleSpec, IAreaMarkSpec, InterpolateType } from '../../typings';\nimport { valueInScaleRange } from '../../util';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum } from '../interface';\nimport { SeriesTypeEnum } from '../interface';\nimport { mixin } from '@visactor/vutils';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport { DEFAULT_SMOOTH_INTERPOLATE } from '../../typings/interpolate';\nimport type { IAreaSeriesSpec, IAreaSeriesTheme } from './interface';\nimport type { IMarkAnimateSpec } from '../../animation/spec';\n\nimport { VChart } from '../../core/vchart';\nimport { LineMark } from '../../mark/line';\nimport { AreaMark } from '../../mark/area';\nimport { TextMark } from '../../mark/text';\nimport { SymbolMark } from '../../mark/symbol';\nimport { AreaSeriesTooltipHelper } from './tooltip-helpter';\nimport { areaSeriesMark } from './constant';\nVChart.useMark([LineMark, AreaMark, TextMark, SymbolMark]);\n\nexport interface AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec>\n  extends Pick<\n      LineLikeSeriesMixin,\n      | 'initLineMark'\n      | 'initSymbolMark'\n      | 'initLabelMarkStyle'\n      | 'initLineMarkStyle'\n      | 'initSymbolMarkStyle'\n      | '_lineMark'\n      | '_symbolMark'\n    >,\n    CartesianSeries<T> {}\n\nexport class AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> extends CartesianSeries<T> {\n  static readonly type: string = SeriesTypeEnum.area;\n  type = SeriesTypeEnum.area;\n\n  static readonly mark: SeriesMarkMap = areaSeriesMark;\n\n  protected declare _theme: Maybe<IAreaSeriesTheme>;\n\n  protected _areaMark!: IAreaMark;\n  protected _stack: boolean = true;\n\n  setAttrFromSpec(): void {\n    super.setAttrFromSpec();\n    const isAreaVisible = this._spec.area?.visible !== false && this._spec.area?.style?.visible !== false;\n    const isLineVisible = this._spec.line?.visible !== false && this._spec.line?.style?.visible !== false;\n    // merge line to area\n    const areaSpec = this._spec.area ?? {};\n    const lineSpec = this._spec.line ?? {};\n    areaSpec.interactive = areaSpec.interactive || lineSpec.interactive;\n    areaSpec.support3d = areaSpec.support3d || lineSpec.support3d;\n    areaSpec.zIndex =\n      isValid(areaSpec.zIndex) || isValid(lineSpec.zIndex)\n        ? Math.max(areaSpec.zIndex ?? 0, lineSpec.zIndex ?? 0)\n        : undefined;\n\n    // remove area stroke\n    if (areaSpec.style) {\n      delete areaSpec.style.stroke;\n    }\n    if (areaSpec.state) {\n      Object.keys(areaSpec.state).forEach(state => {\n        if ('style' in areaSpec.state[state]) {\n          delete areaSpec.state[state].style.stroke;\n        } else {\n          delete (<ConvertToMarkStyleSpec<IAreaMarkSpec>>areaSpec.state[state]).stroke;\n        }\n      });\n    }\n    // check which one is main\n    let mainSpec = areaSpec;\n    let subSpec = lineSpec;\n    const seriesMark = this._spec.seriesMark ?? 'area';\n    if (seriesMark === 'line' || (isLineVisible && !isAreaVisible)) {\n      mainSpec = lineSpec;\n      subSpec = areaSpec;\n    }\n    areaSpec.style = merge({}, subSpec.style, mainSpec.style);\n    areaSpec.state = merge({}, subSpec.state, mainSpec.state);\n    if (!isAreaVisible) {\n      areaSpec.style.fill = false;\n    }\n    if (!isLineVisible) {\n      areaSpec.style.stroke = false;\n    }\n    areaSpec.visible = !(!isAreaVisible && !isLineVisible);\n  }\n\n  initMark(): void {\n    const progressive = {\n      progressiveStep: this._spec.progressiveStep,\n      progressiveThreshold: this._spec.progressiveThreshold,\n      large: this._spec.large,\n      largeThreshold: this._spec.largeThreshold\n    };\n\n    const isAreaVisible = this._spec.area?.visible !== false && this._spec.area?.style?.visible !== false;\n    const seriesMark = this._spec.seriesMark ?? 'area';\n    // area\n    this._areaMark = this._createMark(AreaSeries.mark.area, {\n      groupKey: this._seriesField,\n      defaultMorphElementKey: this.getDimensionField()[0],\n      progressive,\n      isSeriesMark: isAreaVisible && seriesMark !== 'point'\n    }) as IAreaMark;\n\n    this.initSymbolMark(progressive, seriesMark === 'point');\n  }\n\n  initMarkStyle(): void {\n    // FIXME 是不是应该把curveType提前到上层配置\n    // 不允许area和line的curveType不一致\n    const userCurveType = (this.getSpec().area?.style?.curveType ??\n      this.getSpec().line?.style?.curveType) as InterpolateType;\n    const curveType =\n      userCurveType === DEFAULT_SMOOTH_INTERPOLATE\n        ? this._direction === Direction.vertical\n          ? 'monotoneX'\n          : 'monotoneY'\n        : userCurveType;\n\n    // area\n    const areaMark = this._areaMark;\n    if (areaMark) {\n      if (this._direction === Direction.vertical) {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            y1: (datum: Datum) => {\n              return valueInScaleRange(this.dataToPositionY1(datum), this._yAxisHelper?.getScale?.(0));\n            },\n            y: this.dataToPositionY.bind(this),\n            z: this.dataToPositionZ.bind(this)\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      } else {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            x1: (datum: Datum) => {\n              return valueInScaleRange(this.dataToPositionX1(datum), this._xAxisHelper?.getScale?.(0));\n            },\n            y: this.dataToPositionY.bind(this),\n            z: this.dataToPositionZ.bind(this),\n            orient: this._direction\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n      this.setMarkStyle(\n        areaMark,\n        {\n          fill: this.getColorAttribute(),\n          stroke: this.getColorAttribute()\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n      if (this._invalidType !== 'zero') {\n        this.setMarkStyle(\n          areaMark,\n          {\n            defined: this._getInvalidDefined,\n            connectedType: this._getInvalidConnectType()\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n      this.setMarkStyle(\n        areaMark,\n        {\n          curveType\n        },\n        'normal',\n        AttributeLevel.Built_In\n      );\n      this._trigger.registerMark(areaMark);\n      this._tooltipHelper.activeTriggerSet.dimension.add(areaMark);\n\n      // change stroke to area stoke = [lineStroke,false,false,false]\n      Object.keys(areaMark.stateStyle).forEach(state => {\n        if (areaMark.stateStyle[state].stroke) {\n          areaMark.setPostProcess(\n            'stroke',\n            result => {\n              return [result, false, false, false];\n            },\n            state\n          );\n        }\n      });\n    }\n\n    this.initLineMarkStyle(this._direction, userCurveType);\n    this.initSymbolMarkStyle();\n    this.initLabelMarkStyle();\n  }\n\n  initAnimation() {\n    const animationParams = { direction: this.direction };\n    const appearPreset = (this._spec?.animationAppear as IMarkAnimateSpec<string>)?.preset;\n\n    if (this._lineMark) {\n      this._lineMark.setAnimationConfig(\n        animationConfig(\n          DEFAULT_MARK_ANIMATION.line(animationParams, appearPreset),\n          userAnimationConfig(SeriesMarkNameEnum.line, this._spec)\n        )\n      );\n    }\n\n    if (this._areaMark) {\n      this._areaMark.setAnimationConfig(\n        animationConfig(\n          DEFAULT_MARK_ANIMATION.area(animationParams, appearPreset),\n          userAnimationConfig(SeriesMarkNameEnum.area, this._spec)\n        )\n      );\n    }\n\n    if (this._symbolMark) {\n      this._symbolMark.setAnimationConfig(\n        animationConfig(DEFAULT_MARK_ANIMATION.symbol(), userAnimationConfig(SeriesMarkNameEnum.point, this._spec))\n      );\n    }\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new AreaSeriesTooltipHelper(this);\n  }\n\n  getDefaultShapeType() {\n    return 'square';\n  }\n}\n\nmixin(AreaSeries, LineLikeSeriesMixin);\n"]}
+{"version":3,"sources":["../src/series/area/area.ts"],"names":[],"mappings":"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","file":"area.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport { isValid } from '@visactor/vutils';\n/* eslint-disable no-duplicate-imports */\nimport { LineLikeSeriesMixin } from '../mixin/line-mixin';\nimport type { IAreaMark } from '../../mark/area';\nimport { Direction } from '../../typings/space';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport { AttributeLevel } from '../../constant';\nimport type { Maybe, Datum, ConvertToMarkStyleSpec, IAreaMarkSpec, InterpolateType } from '../../typings';\nimport { valueInScaleRange, mergeSpec } from '../../util';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum } from '../interface';\nimport { SeriesTypeEnum } from '../interface';\nimport { mixin } from '@visactor/vutils';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport { DEFAULT_SMOOTH_INTERPOLATE } from '../../typings/interpolate';\nimport type { IAreaSeriesSpec, IAreaSeriesTheme } from './interface';\nimport type { IMarkAnimateSpec } from '../../animation/spec';\n\nimport { VChart } from '../../core/vchart';\nimport { LineMark } from '../../mark/line';\nimport { AreaMark } from '../../mark/area';\nimport { TextMark } from '../../mark/text';\nimport { SymbolMark } from '../../mark/symbol';\nimport { AreaSeriesTooltipHelper } from './tooltip-helpter';\nimport { areaSeriesMark } from './constant';\nVChart.useMark([LineMark, AreaMark, TextMark, SymbolMark]);\n\nexport interface AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec>\n  extends Pick<\n      LineLikeSeriesMixin,\n      | 'initLineMark'\n      | 'initSymbolMark'\n      | 'initLabelMarkStyle'\n      | 'initLineMarkStyle'\n      | 'initSymbolMarkStyle'\n      | 'encodeDefined'\n      | '_lineMark'\n      | '_symbolMark'\n    >,\n    CartesianSeries<T> {}\n\nexport class AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> extends CartesianSeries<T> {\n  static readonly type: string = SeriesTypeEnum.area;\n  type = SeriesTypeEnum.area;\n\n  static readonly mark: SeriesMarkMap = areaSeriesMark;\n\n  protected declare _theme: Maybe<IAreaSeriesTheme>;\n\n  protected _areaMark!: IAreaMark;\n  protected _stack: boolean = true;\n  protected _sortDataByAxis: boolean = true;\n\n  setAttrFromSpec(): void {\n    super.setAttrFromSpec();\n    const isAreaVisible = this._spec.area?.visible !== false && this._spec.area?.style?.visible !== false;\n    const isLineVisible = this._spec.line?.visible !== false && this._spec.line?.style?.visible !== false;\n    // merge line to area\n    const areaSpec = this._spec.area ?? {};\n    const lineSpec = this._spec.line ?? {};\n    areaSpec.interactive = areaSpec.interactive || lineSpec.interactive;\n    areaSpec.support3d = areaSpec.support3d || lineSpec.support3d;\n    areaSpec.zIndex =\n      isValid(areaSpec.zIndex) || isValid(lineSpec.zIndex)\n        ? Math.max(areaSpec.zIndex ?? 0, lineSpec.zIndex ?? 0)\n        : undefined;\n\n    // remove area stroke\n    if (areaSpec.style) {\n      delete areaSpec.style.stroke;\n    }\n    if (areaSpec.state) {\n      Object.keys(areaSpec.state).forEach(state => {\n        if ('style' in areaSpec.state[state]) {\n          delete areaSpec.state[state].style.stroke;\n        } else {\n          delete (<ConvertToMarkStyleSpec<IAreaMarkSpec>>areaSpec.state[state]).stroke;\n        }\n      });\n    }\n    // check which one is main\n    let mainSpec = areaSpec;\n    let subSpec = lineSpec;\n    const seriesMark = this._spec.seriesMark ?? 'area';\n    if (seriesMark === 'line' || (isLineVisible && !isAreaVisible)) {\n      mainSpec = lineSpec;\n      subSpec = areaSpec;\n    }\n    areaSpec.style = mergeSpec({}, subSpec.style, mainSpec.style);\n    areaSpec.state = mergeSpec({}, subSpec.state, mainSpec.state);\n    if (!isAreaVisible) {\n      areaSpec.style.fill = false;\n    }\n    if (!isLineVisible) {\n      areaSpec.style.stroke = false;\n    }\n    areaSpec.visible = !(!isAreaVisible && !isLineVisible);\n  }\n\n  initMark(): void {\n    const progressive = {\n      progressiveStep: this._spec.progressiveStep,\n      progressiveThreshold: this._spec.progressiveThreshold,\n      large: this._spec.large,\n      largeThreshold: this._spec.largeThreshold\n    };\n\n    const isAreaVisible = this._spec.area?.visible !== false && this._spec.area?.style?.visible !== false;\n    const seriesMark = this._spec.seriesMark ?? 'area';\n    // area\n    this._areaMark = this._createMark(AreaSeries.mark.area, {\n      groupKey: this._seriesField,\n      defaultMorphElementKey: this.getDimensionField()[0],\n      progressive,\n      isSeriesMark: isAreaVisible && seriesMark !== 'point'\n    }) as IAreaMark;\n\n    this.initSymbolMark(progressive, seriesMark === 'point');\n  }\n\n  initMarkStyle(): void {\n    // FIXME 是不是应该把curveType提前到上层配置\n    // 不允许area和line的curveType不一致\n    const userCurveType = (this.getSpec().area?.style?.curveType ??\n      this.getSpec().line?.style?.curveType) as InterpolateType;\n    const curveType =\n      userCurveType === DEFAULT_SMOOTH_INTERPOLATE\n        ? this._direction === Direction.vertical\n          ? 'monotoneX'\n          : 'monotoneY'\n        : userCurveType;\n\n    // area\n    const areaMark = this._areaMark;\n    if (areaMark) {\n      if (this._direction === Direction.vertical) {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            y1: (datum: Datum) => {\n              return valueInScaleRange(this.dataToPositionY1(datum), this._yAxisHelper?.getScale?.(0));\n            },\n            y: this.dataToPositionY.bind(this),\n            z: this._fieldZ ? this.dataToPositionZ.bind(this) : null\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      } else {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            x1: (datum: Datum) => {\n              return valueInScaleRange(this.dataToPositionX1(datum), this._xAxisHelper?.getScale?.(0));\n            },\n            y: this.dataToPositionY.bind(this),\n            z: this._fieldZ ? this.dataToPositionZ.bind(this) : null,\n            orient: this._direction\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n      this.setMarkStyle(\n        areaMark,\n        {\n          fill: this.getColorAttribute(),\n          stroke: this.getColorAttribute()\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n      if (this._invalidType !== 'zero') {\n        this.setMarkStyle(\n          areaMark,\n          {\n            defined: this._getInvalidDefined,\n            connectedType: this._getInvalidConnectType()\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n      this.setMarkStyle(\n        areaMark,\n        {\n          curveType\n        },\n        'normal',\n        AttributeLevel.Built_In\n      );\n      this._trigger.registerMark(areaMark);\n      this._tooltipHelper.activeTriggerSet.dimension.add(areaMark);\n\n      // change stroke to area stoke = [lineStroke,false,false,false]\n      Object.keys(areaMark.stateStyle).forEach(state => {\n        if (areaMark.stateStyle[state].stroke) {\n          areaMark.setPostProcess(\n            'stroke',\n            result => {\n              return [result, false, false, false];\n            },\n            state\n          );\n        }\n      });\n    }\n\n    this.initLineMarkStyle(this._direction, userCurveType);\n    this.initSymbolMarkStyle();\n    this.initLabelMarkStyle();\n  }\n\n  initAnimation() {\n    const animationParams = { direction: this.direction };\n    const appearPreset = (this._spec?.animationAppear as IMarkAnimateSpec<string>)?.preset;\n\n    if (this._lineMark) {\n      this._lineMark.setAnimationConfig(\n        animationConfig(\n          DEFAULT_MARK_ANIMATION.line(animationParams, appearPreset),\n          userAnimationConfig(SeriesMarkNameEnum.line, this._spec)\n        )\n      );\n    }\n\n    if (this._areaMark) {\n      this._areaMark.setAnimationConfig(\n        animationConfig(\n          DEFAULT_MARK_ANIMATION.area(animationParams, appearPreset),\n          userAnimationConfig(SeriesMarkNameEnum.area, this._spec)\n        )\n      );\n    }\n\n    if (this._symbolMark) {\n      this._symbolMark.setAnimationConfig(\n        animationConfig(DEFAULT_MARK_ANIMATION.symbol(), userAnimationConfig(SeriesMarkNameEnum.point, this._spec))\n      );\n    }\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new AreaSeriesTooltipHelper(this);\n  }\n\n  viewDataStatisticsUpdate(d: DataView) {\n    super.viewDataStatisticsUpdate(d);\n    this.encodeDefined(this._areaMark, 'defined');\n  }\n\n  getDefaultShapeType() {\n    return 'square';\n  }\n}\n\nmixin(AreaSeries, LineLikeSeriesMixin);\n"]}