@visactor/vchart 1.1.0-beta.9 → 1.1.1-beta.1

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

@@ -78,6 +78,10 @@ class BaseMark extends compilable_mark_1.CompilableMark {
             }));
         }));
     }
+    setPostProcess(key, postProcessFunc, state = "normal") {
+        var _a;
+        (null === (_a = this.stateStyle[state]) || void 0 === _a ? void 0 : _a[key]) && (this.stateStyle[state][key].postProcess = postProcessFunc);
+    }
     getAttribute(key, datum, state = "normal", opt) {
         return this._computeAttribute(key, datum, state, opt);
     }
@@ -120,8 +124,10 @@ class BaseMark extends compilable_mark_1.CompilableMark {
     }
     _computeAttribute(key, datum, state, opt) {
         var _a;
-        let baseValue;
-        return baseValue = (null === (_a = this.stateStyle[state]) || void 0 === _a ? void 0 : _a[key]) ? this._computeStateAttribute(this.stateStyle[state][key], key, datum, state, opt) : this._computeStateAttribute(this.stateStyle.normal[key], key, datum, state, opt), 
+        let stateStyle;
+        stateStyle = (null === (_a = this.stateStyle[state]) || void 0 === _a ? void 0 : _a[key]) ? this.stateStyle[state][key] : this.stateStyle.normal[key];
+        let baseValue = this._computeStateAttribute(stateStyle, key, datum, state, opt);
+        return (0, util_1.isFunction)(null == stateStyle ? void 0 : stateStyle.postProcess) && (baseValue = stateStyle.postProcess(baseValue, datum, this._attributeContext, opt, this.getDataView())), 
         key in this._computeExChannel ? this._computeExChannel[key](key, datum, state, opt, baseValue) : baseValue;
     }
     _computeStateAttribute(stateStyle, key, datum, state, opt) {

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  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            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 baseValue;\n    if (!this.stateStyle[state]?.[key]) {\n      baseValue = this._computeStateAttribute(this.stateStyle.normal[key], key, datum, state, opt);\n    } else {\n      baseValue = this._computeStateAttribute(this.stateStyle[state][key], key, datum, state, opt);\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, 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"]}

package/cjs/mark/image.d.ts

@@ -0,0 +1,10 @@
+import type { IImageMarkSpec } from './../typings/visual';
+import { BaseMark } from './base/base-mark';
+import type { IMarkRaw, IMarkStyle } from './interface';
+import { MarkTypeEnum } from './interface';
+export type IImageMark = IMarkRaw<IImageMarkSpec>;
+export declare class ImageMark extends BaseMark<IImageMarkSpec> implements IImageMark {
+    static readonly type = MarkTypeEnum.image;
+    readonly type = MarkTypeEnum.image;
+    protected _getDefaultStyle(): IMarkStyle<IImageMarkSpec>;
+}

package/cjs/mark/image.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.ImageMark = void 0;
+
+const base_mark_1 = require("./base/base-mark"), interface_1 = require("./interface");
+
+class ImageMark extends base_mark_1.BaseMark {
+    constructor() {
+        super(...arguments), this.type = ImageMark.type;
+    }
+    _getDefaultStyle() {
+        return Object.assign(Object.assign({}, super._getDefaultStyle()), {
+            width: void 0,
+            height: void 0,
+            lineWidth: 0
+        });
+    }
+}
+
+exports.ImageMark = ImageMark, ImageMark.type = interface_1.MarkTypeEnum.image;
+//# sourceMappingURL=image.js.map

package/cjs/mark/image.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/mark/image.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAA2C;AAI3C,MAAa,SAAU,SAAQ,oBAAwB;IAAvD;;QAEW,SAAI,GAAG,SAAS,CAAC,IAAI,CAAC;IAWjC,CAAC;IATW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAZH,8BAaC;AAZiB,cAAI,GAAG,wBAAY,CAAC,KAAK,CAAC","file":"image.js","sourcesContent":["import type { IImageMarkSpec } 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 IImageMark = IMarkRaw<IImageMarkSpec>;\n\nexport class ImageMark extends BaseMark<IImageMarkSpec> implements IImageMark {\n  static readonly type = MarkTypeEnum.image;\n  readonly type = ImageMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IImageMarkSpec> = {\n      ...super._getDefaultStyle(),\n      width: undefined,\n      height: undefined,\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n}\n"]}

package/cjs/mark/interface/common.d.ts

@@ -17,6 +17,7 @@ export interface IAttrConfig<A, R extends ICommonSpec> {
     level: number;
     style: StyleConvert<A>;
     referer?: IMarkRaw<R>;
+    postProcess?: (result: A, ...args: Parameters<FunctionType<A>>) => A;
 }
 export type IAttrs<T extends ICommonSpec> = {
     [K in keyof T]: IAttrConfig<T[K], T>;
@@ -39,6 +40,7 @@ export interface IMarkRaw<T extends ICommonSpec> extends ICompilableMark {
     setReferer: (mark: IMarkRaw<T>, styleKey?: string, state?: StateValueType, stateStyle?: IMarkStateStyle<T>) => void;
     initStyleWithSpec: (spec: any, key?: string) => void;
     created: () => void;
+    setPostProcess: <U extends keyof T, A>(key: U, postProcessFunc: IAttrConfig<A, T>['postProcess'], state?: StateValueType) => void;
 }
 export type IMark = IMarkRaw<ICommonSpec>;
 export interface IMarkOption extends ICompilableMarkOption {

package/cjs/mark/interface/common.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/interface/common.ts"],"names":[],"mappings":"","file":"common.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport type { IGlobalScale } from '../../scale/interface';\nimport type { ICommonSpec, VisualType, ValueType, FunctionType } from '../../typings/visual';\nimport type { IModel } from '../../model/interface';\nimport type { IBaseScale } from '@visactor/vscale';\nimport type { MarkType } from './type';\nimport type {\n  ICompilableMark,\n  ICompilableMarkOption,\n  IModelMarkAttributeContext,\n  StateValueType\n} from '../../compile/mark';\nimport type { StringOrNumber } from '../../typings';\n\nexport interface VisualScaleType {\n  scale: IBaseScale;\n  field: StringOrNumber;\n  changeDomain?: 'none' | 'replace' | 'expand'; //default 'none'\n}\n\nexport type MarkInputStyle<T> = StyleConvert<T> | VisualType<T>;\n\n/** 用户将属性类型转化为 mark-style 中某个属性的 style */\nexport type StyleConvert<T> = ValueType<T> | FunctionType<T> | VisualScaleType;\n\n/** mark-style 中某个属性的样式信息，包含层级等信息 */\nexport interface IAttrConfig<A, R extends ICommonSpec> {\n  level: number;\n  style: StyleConvert<A>;\n  referer?: IMarkRaw<R>;\n}\n/** mark-style 中某状态下的一组样式信息 */\nexport type IAttrs<T extends ICommonSpec> = {\n  [K in keyof T]: IAttrConfig<T[K], T>;\n};\n\nexport type IMarkProgressiveConfig = {\n  /** 是否开启大数据渲染模式，开启后会降低渲染的精度 */\n  large?: boolean;\n  /** 开启大数据渲染优化的阀值，对应的是data的长度;推荐 largeThreshold < progressiveThreshold  */\n  largeThreshold?: number;\n  /** 分片长度 */\n  progressiveStep?: number;\n  /** 开启分片渲染的阀值，对应的是单系列data的长度 */\n  progressiveThreshold?: number;\n};\n\n/** mark-state-style */\nexport type IMarkStateStyle<T extends ICommonSpec> = Record<StateValueType, Partial<IAttrs<T>>>;\n\n/** mark-style 一组style */\nexport type IMarkStyle<T extends ICommonSpec> = {\n  [key in keyof T]: MarkInputStyle<T[key]>;\n};\n/**********   mark  ***************/\nexport interface IMarkRaw<T extends ICommonSpec> extends ICompilableMark {\n  readonly stateStyle: IMarkStateStyle<T>;\n\n  getAttribute: <U extends keyof T>(key: U, datum: any, state?: StateValueType, opt?: any) => unknown;\n  setAttribute: <U extends keyof T>(attr: U, style: StyleConvert<T[U]>, state?: StateValueType, level?: number) => void;\n\n  // 需要支持优先级并且可以使用优先级覆盖\n  /** @deprecated VChart 层尽量使用 IModel.setMarkStyle() */\n  setStyle: (style: Partial<IMarkStyle<T>>, state?: StateValueType, level?: number) => void;\n\n  setReferer: (mark: IMarkRaw<T>, styleKey?: string, state?: StateValueType, stateStyle?: IMarkStateStyle<T>) => void;\n\n  /** @deprecated VChart 层尽量使用 IModel.initMarkStyleWithSpec() */\n  initStyleWithSpec: (spec: any, key?: string) => void;\n\n  created: () => void;\n}\n\nexport type IMark = IMarkRaw<ICommonSpec>;\n\nexport interface IMarkOption extends ICompilableMarkOption {\n  model: IModel;\n  map: Map<StringOrNumber, IModel | IMark>;\n\n  globalScale: IGlobalScale;\n  dataStatistics?: DataView;\n\n  /** 组件 mark 的具体类型 */\n  componentType?: string;\n  attributeContext?: IModelMarkAttributeContext;\n}\nexport interface IMarkConstructor {\n  type: MarkType;\n  constructorType?: MarkType;\n  new (name: string, options: IMarkOption): IMark;\n}\n\nexport interface IComponentMarkConstructor {\n  type: MarkType;\n  constructorType?: MarkType;\n  new (componentType: string, name: string, options: IMarkOption): IMark;\n}\n\nexport type MarkConstructor = IMarkConstructor | IComponentMarkConstructor;\n\nexport interface IMarkDataInitOption extends IMarkOption {\n  mark: IMark;\n}\n"]}
+{"version":3,"sources":["../src/mark/interface/common.ts"],"names":[],"mappings":"","file":"common.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport type { IGlobalScale } from '../../scale/interface';\nimport type { ICommonSpec, VisualType, ValueType, FunctionType } from '../../typings/visual';\nimport type { IModel } from '../../model/interface';\nimport type { IBaseScale } from '@visactor/vscale';\nimport type { MarkType } from './type';\nimport type {\n  ICompilableMark,\n  ICompilableMarkOption,\n  IModelMarkAttributeContext,\n  StateValueType\n} from '../../compile/mark';\nimport type { StringOrNumber } from '../../typings';\n\nexport interface VisualScaleType {\n  scale: IBaseScale;\n  field: StringOrNumber;\n  changeDomain?: 'none' | 'replace' | 'expand'; //default 'none'\n}\n\nexport type MarkInputStyle<T> = StyleConvert<T> | VisualType<T>;\n\n/** 用户将属性类型转化为 mark-style 中某个属性的 style */\nexport type StyleConvert<T> = ValueType<T> | FunctionType<T> | VisualScaleType;\n\n/** mark-style 中某个属性的样式信息，包含层级等信息 */\nexport interface IAttrConfig<A, R extends ICommonSpec> {\n  level: number;\n  style: StyleConvert<A>;\n  referer?: IMarkRaw<R>;\n  postProcess?: (result: A, ...args: Parameters<FunctionType<A>>) => A;\n}\n/** mark-style 中某状态下的一组样式信息 */\nexport type IAttrs<T extends ICommonSpec> = {\n  [K in keyof T]: IAttrConfig<T[K], T>;\n};\n\nexport type IMarkProgressiveConfig = {\n  /** 是否开启大数据渲染模式，开启后会降低渲染的精度 */\n  large?: boolean;\n  /** 开启大数据渲染优化的阀值，对应的是data的长度;推荐 largeThreshold < progressiveThreshold  */\n  largeThreshold?: number;\n  /** 分片长度 */\n  progressiveStep?: number;\n  /** 开启分片渲染的阀值，对应的是单系列data的长度 */\n  progressiveThreshold?: number;\n};\n\n/** mark-state-style */\nexport type IMarkStateStyle<T extends ICommonSpec> = Record<StateValueType, Partial<IAttrs<T>>>;\n\n/** mark-style 一组style */\nexport type IMarkStyle<T extends ICommonSpec> = {\n  [key in keyof T]: MarkInputStyle<T[key]>;\n};\n/**********   mark  ***************/\nexport interface IMarkRaw<T extends ICommonSpec> extends ICompilableMark {\n  readonly stateStyle: IMarkStateStyle<T>;\n\n  getAttribute: <U extends keyof T>(key: U, datum: any, state?: StateValueType, opt?: any) => unknown;\n  setAttribute: <U extends keyof T>(attr: U, style: StyleConvert<T[U]>, state?: StateValueType, level?: number) => void;\n\n  // 需要支持优先级并且可以使用优先级覆盖\n  /** @deprecated VChart 层尽量使用 IModel.setMarkStyle() */\n  setStyle: (style: Partial<IMarkStyle<T>>, state?: StateValueType, level?: number) => void;\n\n  setReferer: (mark: IMarkRaw<T>, styleKey?: string, state?: StateValueType, stateStyle?: IMarkStateStyle<T>) => void;\n\n  /** @deprecated VChart 层尽量使用 IModel.initMarkStyleWithSpec() */\n  initStyleWithSpec: (spec: any, key?: string) => void;\n\n  created: () => void;\n\n  setPostProcess: <U extends keyof T, A>(\n    key: U,\n    postProcessFunc: IAttrConfig<A, T>['postProcess'],\n    state?: StateValueType\n  ) => void;\n}\n\nexport type IMark = IMarkRaw<ICommonSpec>;\n\nexport interface IMarkOption extends ICompilableMarkOption {\n  model: IModel;\n  map: Map<StringOrNumber, IModel | IMark>;\n\n  globalScale: IGlobalScale;\n  dataStatistics?: DataView;\n\n  /** 组件 mark 的具体类型 */\n  componentType?: string;\n  attributeContext?: IModelMarkAttributeContext;\n}\nexport interface IMarkConstructor {\n  type: MarkType;\n  constructorType?: MarkType;\n  new (name: string, options: IMarkOption): IMark;\n}\n\nexport interface IComponentMarkConstructor {\n  type: MarkType;\n  constructorType?: MarkType;\n  new (componentType: string, name: string, options: IMarkOption): IMark;\n}\n\nexport type MarkConstructor = IMarkConstructor | IComponentMarkConstructor;\n\nexport interface IMarkDataInitOption extends IMarkOption {\n  mark: IMark;\n}\n"]}

package/cjs/mark/interface/type.d.ts

@@ -7,6 +7,7 @@ export declare enum MarkTypeEnum {
     text = "text",
     rect = "rect",
     rect3d = "rect3d",
+    image = "image",
     path = "path",
     area = "area",
     arc = "arc",

package/cjs/mark/interface/type.js

@@ -7,9 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 }), exports.MarkTypeEnum = void 0, function(MarkTypeEnum) {
     MarkTypeEnum.group = "group", MarkTypeEnum.symbol = "symbol", MarkTypeEnum.rule = "rule", 
     MarkTypeEnum.line = "line", MarkTypeEnum.text = "text", MarkTypeEnum.rect = "rect", 
-    MarkTypeEnum.rect3d = "rect3d", MarkTypeEnum.path = "path", MarkTypeEnum.area = "area", 
-    MarkTypeEnum.arc = "arc", MarkTypeEnum.arc3d = "arc3d", MarkTypeEnum.polygon = "polygon", 
-    MarkTypeEnum.pyramid3d = "pyramid3d", MarkTypeEnum.boxPlot = "boxPlot", MarkTypeEnum.linkPath = "linkPath", 
-    MarkTypeEnum.progressArc = "progressArc", MarkTypeEnum.cell = "cell", MarkTypeEnum.component = "component";
+    MarkTypeEnum.rect3d = "rect3d", MarkTypeEnum.image = "image", MarkTypeEnum.path = "path", 
+    MarkTypeEnum.area = "area", MarkTypeEnum.arc = "arc", MarkTypeEnum.arc3d = "arc3d", 
+    MarkTypeEnum.polygon = "polygon", MarkTypeEnum.pyramid3d = "pyramid3d", MarkTypeEnum.boxPlot = "boxPlot", 
+    MarkTypeEnum.linkPath = "linkPath", MarkTypeEnum.progressArc = "progressArc", MarkTypeEnum.cell = "cell", 
+    MarkTypeEnum.component = "component";
 }(MarkTypeEnum = exports.MarkTypeEnum || (exports.MarkTypeEnum = {}));
 //# sourceMappingURL=type.js.map

package/cjs/mark/interface/type.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/interface/type.ts"],"names":[],"mappings":";;;AAEA,IAAY,YAqBX;AArBD,WAAY,YAAY;IACtB,+BAAe,CAAA;IAEf,iCAAiB,CAAA;IACjB,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,iCAAiB,CAAA;IACjB,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,2BAAW,CAAA;IACX,+BAAe,CAAA;IACf,mCAAmB,CAAA;IACnB,uCAAuB,CAAA;IACvB,mCAAmB,CAAA;IACnB,qCAAqB,CAAA;IACrB,2CAA2B,CAAA;IAC3B,6BAAa,CAAA;IAEb,uCAAuB,CAAA;AACzB,CAAC,EArBW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAqBvB","file":"type.js","sourcesContent":["export type MarkType = keyof typeof MarkTypeEnum | string;\n\nexport enum MarkTypeEnum {\n  group = 'group',\n\n  symbol = 'symbol',\n  rule = 'rule',\n  line = 'line',\n  text = 'text',\n  rect = 'rect',\n  rect3d = 'rect3d',\n  path = 'path',\n  area = 'area',\n  arc = 'arc',\n  arc3d = 'arc3d',\n  polygon = 'polygon',\n  pyramid3d = 'pyramid3d',\n  boxPlot = 'boxPlot',\n  linkPath = 'linkPath',\n  progressArc = 'progressArc',\n  cell = 'cell',\n\n  component = 'component'\n}\n"]}
+{"version":3,"sources":["../src/mark/interface/type.ts"],"names":[],"mappings":";;;AAEA,IAAY,YAsBX;AAtBD,WAAY,YAAY;IACtB,+BAAe,CAAA;IAEf,iCAAiB,CAAA;IACjB,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,iCAAiB,CAAA;IACjB,+BAAe,CAAA;IACf,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,2BAAW,CAAA;IACX,+BAAe,CAAA;IACf,mCAAmB,CAAA;IACnB,uCAAuB,CAAA;IACvB,mCAAmB,CAAA;IACnB,qCAAqB,CAAA;IACrB,2CAA2B,CAAA;IAC3B,6BAAa,CAAA;IAEb,uCAAuB,CAAA;AACzB,CAAC,EAtBW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAsBvB","file":"type.js","sourcesContent":["export type MarkType = keyof typeof MarkTypeEnum | string;\n\nexport enum MarkTypeEnum {\n  group = 'group',\n\n  symbol = 'symbol',\n  rule = 'rule',\n  line = 'line',\n  text = 'text',\n  rect = 'rect',\n  rect3d = 'rect3d',\n  image = 'image',\n  path = 'path',\n  area = 'area',\n  arc = 'arc',\n  arc3d = 'arc3d',\n  polygon = 'polygon',\n  pyramid3d = 'pyramid3d',\n  boxPlot = 'boxPlot',\n  linkPath = 'linkPath',\n  progressArc = 'progressArc',\n  cell = 'cell',\n\n  component = 'component'\n}\n"]}

package/cjs/model/interface.d.ts

@@ -29,7 +29,7 @@ export interface ILayoutRect {
 }
 export type IPercent = `${number}%`;
 export type ILayoutPercent = IPercent | number;
-type ILayoutType = 'region-relative' | 'region' | 'normal' | 'absolute';
+type ILayoutType = 'region-relative' | 'region' | 'normal' | 'absolute' | 'normal-inline';
 export type ILayoutOrientPadding = {
     left?: ILayoutNumber;
     right?: ILayoutNumber;

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);\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 ILayoutPercent = IPercent | number;\n\n/**\n * 相对布局和绝对布局\n * 在相对布局结束后进行二次的绝对布局\n * 绝对布局会只根据 chart 进行相对处理\n */\n\ntype ILayoutType = 'region-relative' | 'region' | 'normal' | 'absolute';\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  getAutoIndent: () => boolean;\n  getLayoutStartPoint: () => ILayoutPoint;\n  getLayoutRect: () => ILayoutRect;\n  getLastComputeOutBounds: () => IBoundsLike;\n\n  getAttributeTag: () => boolean;\n  setAttributeTag: (tag: boolean) => boolean;\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  /** 模块的布局大小：宽度 */\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  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  // 是否要 layout 的 tag\n  getAttributeTag: () => boolean;\n  setAttributeTag: (tag: boolean) => boolean;\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\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);\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 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  getAutoIndent: () => boolean;\n  getLayoutStartPoint: () => ILayoutPoint;\n  getLayoutRect: () => ILayoutRect;\n  getLastComputeOutBounds: () => IBoundsLike;\n\n  getAttributeTag: () => boolean;\n  setAttributeTag: (tag: boolean) => boolean;\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  /** 模块的布局大小：宽度 */\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  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  // 是否要 layout 的 tag\n  getAttributeTag: () => boolean;\n  setAttributeTag: (tag: boolean) => boolean;\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\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/series/cartesian/cartesian.js

@@ -82,14 +82,14 @@ class CartesianSeries extends base_series_1.BaseSeries {
     getStatisticFields() {
         var _a, _b, _c;
         const fields = [];
-        return (null === (_a = this.getXAxisHelper()) || void 0 === _a ? void 0 : _a.getScale) && this._fieldX.forEach((f => {
+        return (null === (_a = this.getXAxisHelper()) || void 0 === _a ? void 0 : _a.getScale) && (this._fieldX2 ? [ ...this._fieldX, this._fieldX2 ] : this._fieldX).forEach((f => {
             const result = {
                 key: f,
                 operations: []
             };
             (0, vscale_1.isContinuous)(this.getXAxisHelper().getScale(0).type) ? result.operations = [ "max", "min" ] : result.operations = [ "values" ], 
             fields.push(result);
-        })), (null === (_b = this.getYAxisHelper()) || void 0 === _b ? void 0 : _b.getScale) && this._fieldY.forEach((f => {
+        })), (null === (_b = this.getYAxisHelper()) || void 0 === _b ? void 0 : _b.getScale) && (this._fieldY2 ? [ ...this._fieldY, this._fieldY2 ] : this._fieldY).forEach((f => {
             const result = {
                 key: f,
                 operations: []
@@ -148,8 +148,8 @@ class CartesianSeries extends base_series_1.BaseSeries {
         var _a, _b;
         super.setAttrFromSpec(), this.setFieldX(this._spec.xField), this.setFieldY(this._spec.yField), 
         this.setFieldZ(this._spec.zField), (0, util_1.isValid)(this._spec.direction) && (this._direction = this._spec.direction), 
-        this._direction === space_1.Direction.vertical ? (this.setFieldY2("y1"), this.setFieldX2(null === (_a = this._spec) || void 0 === _a ? void 0 : _a.x2Field)) : (this.setFieldX2("x1"), 
-        this.setFieldY2(null === (_b = this._spec) || void 0 === _b ? void 0 : _b.y2Field)), 
+        this.setFieldX2(null === (_a = this._spec) || void 0 === _a ? void 0 : _a.x2Field), 
+        this.setFieldY2(null === (_b = this._spec) || void 0 === _b ? void 0 : _b.y2Field), 
         this._stack && this.setValueFieldToStack(), this._percent && this.setValueFieldToPercent(), 
         this._stackOffsetSilhouette && this.setValueFieldToStackOffsetSilhouette();
     }

package/cjs/series/cartesian/cartesian.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/cartesian/cartesian.ts"],"names":[],"mappings":"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","file":"cartesian.js","sourcesContent":["import type { ICartesianSeries } from '../interface';\nimport { BaseSeries } from '../base/base-series';\nimport type { IPoint } from '../../typings/coordinate';\nimport type { IBaseScale } from '@visactor/vscale';\nimport {\n  STACK_FIELD_END,\n  STACK_FIELD_END_PERCENT,\n  STACK_FIELD_END_OffsetSilhouette,\n  STACK_FIELD_START,\n  STACK_FIELD_START_PERCENT,\n  STACK_FIELD_START_OffsetSilhouette\n} from '../../constant';\nimport type { IAxisHelper } from '../../component/axis/cartesian/interface';\nimport type { DirectionType } from '../../typings/space';\n// eslint-disable-next-line no-duplicate-imports\nimport { Direction } from '../../typings/space';\nimport type { Datum, StringOrNumber } from '../../typings';\nimport { array, shallowCompare, isValid } from '../../util';\n// eslint-disable-next-line no-duplicate-imports\nimport { isContinuous } from '@visactor/vscale';\nimport type { StatisticOperations } from '../../data/transforms/dimension-statistics';\nimport type { ICartesianSeriesSpec } from './interface';\n\nexport abstract class CartesianSeries<T extends ICartesianSeriesSpec = ICartesianSeriesSpec>\n  extends BaseSeries<T>\n  implements ICartesianSeries\n{\n  readonly coordinate: 'cartesian' = 'cartesian';\n  protected _bandPosition = 0.5;\n\n  protected _fieldX!: string[];\n  get fieldX() {\n    return this._fieldX;\n  }\n  setFieldX(f: string | string[]) {\n    this._fieldX = array(f);\n  }\n\n  protected _fieldY!: string[];\n  get fieldY() {\n    return this._fieldY;\n  }\n  setFieldY(f: string | string[]) {\n    this._fieldY = array(f);\n  }\n\n  protected _fieldZ?: string[];\n  get fieldZ(): string[] | undefined {\n    return this._fieldZ;\n  }\n  setFieldZ(f?: string | string[]) {\n    this._fieldZ = f && array(f);\n  }\n\n  protected _fieldX2!: string;\n  get fieldX2() {\n    return this._fieldX2;\n  }\n  setFieldX2(f: string) {\n    this._fieldX2 = f;\n  }\n\n  protected _fieldY2!: string;\n  get fieldY2() {\n    return this._fieldY2;\n  }\n  setFieldY2(f: string) {\n    this._fieldY2 = f;\n  }\n\n  protected _direction: DirectionType = Direction.vertical;\n  get direction() {\n    return this._direction;\n  }\n\n  protected _scaleX!: IBaseScale;\n  get scaleX() {\n    return this._scaleX;\n  }\n  setScaleX(s: IBaseScale) {\n    this._scaleX = s;\n  }\n\n  protected _scaleY!: IBaseScale;\n  get scaleY() {\n    return this._scaleY;\n  }\n  setScaleY(s: IBaseScale) {\n    this._scaleY = s;\n  }\n\n  protected _scaleZ?: IBaseScale;\n  get scaleZ() {\n    return this._scaleZ;\n  }\n  setScaleZ(s: IBaseScale) {\n    this._scaleZ = s;\n  }\n\n  _xAxisHelper!: IAxisHelper;\n  getXAxisHelper() {\n    return this._xAxisHelper;\n  }\n  setXAxisHelper(h: IAxisHelper) {\n    this._xAxisHelper = h;\n    this.onXAxisHelperUpdate();\n  }\n\n  _yAxisHelper!: IAxisHelper;\n  getYAxisHelper() {\n    return this._yAxisHelper;\n  }\n  setYAxisHelper(h: IAxisHelper) {\n    this._yAxisHelper = h;\n    this.onYAxisHelperUpdate();\n  }\n\n  _zAxisHelper?: IAxisHelper;\n  getZAxisHelper() {\n    return this._zAxisHelper;\n  }\n  setZAxisHelper(h: IAxisHelper) {\n    this._zAxisHelper = h;\n    this.onYAxisHelperUpdate();\n  }\n\n  getStatisticFields() {\n    const fields: { key: string; operations: StatisticOperations }[] = [];\n    if (this.getXAxisHelper()?.getScale) {\n      this._fieldX.forEach(f => {\n        const result: { key: string; operations: Array<'max' | 'min' | 'values'> } = { key: f, operations: [] };\n        if (isContinuous(this.getXAxisHelper().getScale(0).type)) {\n          result.operations = ['max', 'min'];\n        } else {\n          result.operations = ['values'];\n        }\n        fields.push(result);\n      });\n    }\n    if (this.getYAxisHelper()?.getScale) {\n      this._fieldY.forEach(f => {\n        const result: { key: string; operations: Array<'max' | 'min' | 'values'> } = { key: f, operations: [] };\n        if (isContinuous(this.getYAxisHelper().getScale(0).type)) {\n          result.operations = ['max', 'min'];\n        } else {\n          result.operations = ['values'];\n        }\n        fields.push(result);\n      });\n    }\n    if (this._fieldZ && this.getZAxisHelper()?.getScale) {\n      this._fieldZ.forEach(f => {\n        const result: { key: string; operations: Array<'max' | 'min' | 'values'> } = { key: f, operations: [] };\n        if (isContinuous(this.getZAxisHelper().getScale(0).type)) {\n          result.operations = ['max', 'min'];\n        } else {\n          result.operations = ['values'];\n        }\n        fields.push(result);\n      });\n    }\n    return fields;\n  }\n\n  getGroupFields() {\n    return this.direction === 'vertical' ? this._fieldX : this._fieldY;\n  }\n\n  getStackGroupFields(): string[] {\n    return this.getGroupFields();\n  }\n\n  getStackValueField() {\n    // TODO: hack\n    if (this.direction === Direction.vertical) {\n      return array(this._spec.yField)[0];\n    }\n    return array(this._spec.xField)[0];\n  }\n\n  setValueFieldToStack(): void {\n    if (this.direction === Direction.vertical) {\n      this.setFieldY(STACK_FIELD_END);\n      this.setFieldY2(STACK_FIELD_START);\n    } else {\n      this.setFieldX(STACK_FIELD_END);\n      this.setFieldX2(STACK_FIELD_START);\n    }\n  }\n\n  setValueFieldToPercent(): void {\n    if (this.direction === Direction.vertical) {\n      this.setFieldY(STACK_FIELD_END_PERCENT);\n      this.setFieldY2(STACK_FIELD_START_PERCENT);\n    } else {\n      this.setFieldX(STACK_FIELD_END_PERCENT);\n      this.setFieldX2(STACK_FIELD_START_PERCENT);\n    }\n  }\n\n  setValueFieldToStackOffsetSilhouette(): void {\n    if (this.direction === Direction.vertical) {\n      this.setFieldY(STACK_FIELD_END_OffsetSilhouette);\n      this.setFieldY2(STACK_FIELD_START_OffsetSilhouette);\n    } else {\n      this.setFieldX(STACK_FIELD_END_OffsetSilhouette);\n      this.setFieldX2(STACK_FIELD_START_OffsetSilhouette);\n    }\n  }\n\n  onXAxisHelperUpdate(): void {\n    this.onMarkPositionUpdate();\n  }\n\n  onYAxisHelperUpdate(): void {\n    this.onMarkPositionUpdate();\n  }\n\n  onZAxisHelperUpdate(): void {\n    this.onMarkPositionUpdate();\n  }\n\n  updateSpec(spec: any) {\n    const originalSpec = this._originalSpec;\n    const { xField, yField } = originalSpec;\n    const result = super.updateSpec(spec);\n    if (!shallowCompare(spec.xField, xField) || !shallowCompare(spec.yField, yField)) {\n      result.change = true;\n      result.reRender = true;\n      result.reMake = true;\n    }\n    return result;\n  }\n\n  setAttrFromSpec() {\n    super.setAttrFromSpec();\n    this.setFieldX(this._spec.xField);\n    this.setFieldY(this._spec.yField);\n    this.setFieldZ(this._spec.zField);\n    if (isValid(this._spec.direction)) {\n      this._direction = this._spec.direction;\n    }\n\n    if (this._direction === Direction.vertical) {\n      this.setFieldY2('y1');\n      this.setFieldX2(this._spec?.x2Field);\n    } else {\n      this.setFieldX2('x1');\n      this.setFieldY2(this._spec?.y2Field);\n    }\n\n    if (this._stack) {\n      this.setValueFieldToStack();\n    }\n    if (this._percent) {\n      this.setValueFieldToPercent();\n    }\n    if (this._stackOffsetSilhouette) {\n      this.setValueFieldToStackOffsetSilhouette();\n    }\n  }\n\n  dataToPosition(datum: Datum): IPoint | null {\n    if (!datum) {\n      return null;\n    }\n    return {\n      x: this.dataToPositionX(datum),\n      y: this.dataToPositionY(datum)\n    } as IPoint;\n  }\n\n  protected _buildMarkAttributeContext() {\n    super._buildMarkAttributeContext();\n    // position\n    this._markAttributeContext.valueToX = this.valueToPositionX.bind(this);\n    this._markAttributeContext.valueToY = this.valueToPositionY.bind(this);\n    this._markAttributeContext.xBandwidth = (depth: number = 0) => this.getXAxisHelper().getBandwidth?.(depth) ?? 0;\n    this._markAttributeContext.yBandwidth = (depth: number = 0) => this.getYAxisHelper().getBandwidth?.(depth) ?? 0;\n    this._markAttributeContext.valueToPosition = this.valueToPosition.bind(this);\n  }\n\n  valueToPosition(xValue: StringOrNumber | StringOrNumber[], yValue: StringOrNumber | StringOrNumber[]) {\n    return {\n      x: this.valueToPositionX(xValue),\n      y: this.valueToPositionY(yValue)\n    };\n  }\n\n  valueToPositionX(value: StringOrNumber | StringOrNumber[]) {\n    if (!this._xAxisHelper) {\n      return Number.NaN;\n    }\n    const { dataToPosition } = this._xAxisHelper;\n    return dataToPosition(array(value), { bandPosition: this._bandPosition });\n  }\n\n  valueToPositionY(value: StringOrNumber | StringOrNumber[]) {\n    if (!this._yAxisHelper) {\n      return Number.NaN;\n    }\n    const { dataToPosition } = this._yAxisHelper;\n    return dataToPosition(array(value), { bandPosition: this._bandPosition });\n  }\n\n  dataToPositionX(datum: Datum): number {\n    if (!this._xAxisHelper) {\n      return Number.NaN;\n    }\n    return this.valueToPositionX(this.getDatumPositionValues(datum, this._fieldX));\n  }\n\n  dataToPositionY(datum: Datum): number {\n    if (!this._yAxisHelper) {\n      return Number.NaN;\n    }\n    return this.valueToPositionY(this.getDatumPositionValues(datum, this._fieldY));\n  }\n\n  dataToPositionZ(datum: Datum): number {\n    if (!this._zAxisHelper) {\n      return Number.NaN;\n    }\n    const { dataToPosition } = this._zAxisHelper;\n\n    return dataToPosition(this.getDatumPositionValues(datum, this._fieldZ), {\n      bandPosition: this._bandPosition\n    });\n  }\n\n  dataToPositionX1(datum: Datum): number {\n    if (!this._xAxisHelper) {\n      return Number.NaN;\n    }\n    return this._fieldX2 && this._fieldX2 in datum\n      ? this.valueToPositionX(this.getDatumPositionValues(datum, this._fieldX2))\n      : this._xAxisHelper.getScale?.(0).range()[0];\n  }\n\n  dataToPositionY1(datum: Datum): number {\n    if (!this._yAxisHelper) {\n      return Number.NaN;\n    }\n    return this._fieldY2 && this._fieldY2 in datum\n      ? this.valueToPositionY(this.getDatumPositionValues(datum, this._fieldY2))\n      : this._yAxisHelper.getScale?.(0).range()[0];\n  }\n\n  positionToData(p: IPoint): IPoint | null {\n    if (!p) {\n      return null;\n    }\n    return {\n      x: this.positionToDataX(p.x),\n      y: this.positionToDataY(p.y)\n    };\n  }\n\n  positionToDataX(xPos: number): any | null {\n    if (!this._scaleX) {\n      return null;\n    }\n    return this._scaleX.invert(xPos);\n  }\n\n  positionToDataY(yPos: number): any | null {\n    if (!this._scaleY) {\n      return null;\n    }\n    return this._scaleY.invert(yPos);\n  }\n\n  getRegionRectLeft(): number {\n    if (!this._xAxisHelper) {\n      return Number.NaN;\n    }\n    const { getScale } = this._xAxisHelper;\n    return getScale(0).range()[0];\n  }\n\n  getRegionRectRight(): number {\n    if (!this._xAxisHelper) {\n      return Number.NaN;\n    }\n    const { getScale } = this._xAxisHelper;\n    return getScale(0).range()[1];\n  }\n\n  afterInitMark(): void {\n    super.afterInitMark();\n    this.setFieldX(this._fieldX);\n    this.setFieldY(this._fieldY);\n    this._trigger.setStateKeys([...this._fieldX, ...this._fieldY]);\n  }\n\n  getDimensionField(): string[] {\n    if (this._direction === Direction.vertical) {\n      return this.fieldX;\n    }\n    return this.fieldY;\n  }\n\n  getMeasureField(): string[] {\n    if (this._direction === Direction.vertical) {\n      return array(this._spec.yField ?? this.fieldY);\n    }\n    return array(this._spec.xField ?? this.fieldX);\n  }\n}\n"]}
+{"version":3,"sources":["../src/series/cartesian/cartesian.ts"],"names":[],"mappings":"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","file":"cartesian.js","sourcesContent":["import type { ICartesianSeries } from '../interface';\nimport { BaseSeries } from '../base/base-series';\nimport type { IPoint } from '../../typings/coordinate';\nimport type { IBaseScale } from '@visactor/vscale';\nimport {\n  STACK_FIELD_END,\n  STACK_FIELD_END_PERCENT,\n  STACK_FIELD_END_OffsetSilhouette,\n  STACK_FIELD_START,\n  STACK_FIELD_START_PERCENT,\n  STACK_FIELD_START_OffsetSilhouette\n} from '../../constant';\nimport type { IAxisHelper } from '../../component/axis/cartesian/interface';\nimport type { DirectionType } from '../../typings/space';\n// eslint-disable-next-line no-duplicate-imports\nimport { Direction } from '../../typings/space';\nimport type { Datum, StringOrNumber } from '../../typings';\nimport { array, shallowCompare, isValid } from '../../util';\n// eslint-disable-next-line no-duplicate-imports\nimport { isContinuous } from '@visactor/vscale';\nimport type { StatisticOperations } from '../../data/transforms/dimension-statistics';\nimport type { ICartesianSeriesSpec } from './interface';\n\nexport abstract class CartesianSeries<T extends ICartesianSeriesSpec = ICartesianSeriesSpec>\n  extends BaseSeries<T>\n  implements ICartesianSeries\n{\n  readonly coordinate: 'cartesian' = 'cartesian';\n  protected _bandPosition = 0.5;\n\n  protected _fieldX!: string[];\n  get fieldX() {\n    return this._fieldX;\n  }\n  setFieldX(f: string | string[]) {\n    this._fieldX = array(f);\n  }\n\n  protected _fieldY!: string[];\n  get fieldY() {\n    return this._fieldY;\n  }\n  setFieldY(f: string | string[]) {\n    this._fieldY = array(f);\n  }\n\n  protected _fieldZ?: string[];\n  get fieldZ(): string[] | undefined {\n    return this._fieldZ;\n  }\n  setFieldZ(f?: string | string[]) {\n    this._fieldZ = f && array(f);\n  }\n\n  protected _fieldX2!: string;\n  get fieldX2() {\n    return this._fieldX2;\n  }\n  setFieldX2(f: string) {\n    this._fieldX2 = f;\n  }\n\n  protected _fieldY2!: string;\n  get fieldY2() {\n    return this._fieldY2;\n  }\n  setFieldY2(f: string) {\n    this._fieldY2 = f;\n  }\n\n  protected _direction: DirectionType = Direction.vertical;\n  get direction() {\n    return this._direction;\n  }\n\n  protected _scaleX!: IBaseScale;\n  get scaleX() {\n    return this._scaleX;\n  }\n  setScaleX(s: IBaseScale) {\n    this._scaleX = s;\n  }\n\n  protected _scaleY!: IBaseScale;\n  get scaleY() {\n    return this._scaleY;\n  }\n  setScaleY(s: IBaseScale) {\n    this._scaleY = s;\n  }\n\n  protected _scaleZ?: IBaseScale;\n  get scaleZ() {\n    return this._scaleZ;\n  }\n  setScaleZ(s: IBaseScale) {\n    this._scaleZ = s;\n  }\n\n  _xAxisHelper!: IAxisHelper;\n  getXAxisHelper() {\n    return this._xAxisHelper;\n  }\n  setXAxisHelper(h: IAxisHelper) {\n    this._xAxisHelper = h;\n    this.onXAxisHelperUpdate();\n  }\n\n  _yAxisHelper!: IAxisHelper;\n  getYAxisHelper() {\n    return this._yAxisHelper;\n  }\n  setYAxisHelper(h: IAxisHelper) {\n    this._yAxisHelper = h;\n    this.onYAxisHelperUpdate();\n  }\n\n  _zAxisHelper?: IAxisHelper;\n  getZAxisHelper() {\n    return this._zAxisHelper;\n  }\n  setZAxisHelper(h: IAxisHelper) {\n    this._zAxisHelper = h;\n    this.onYAxisHelperUpdate();\n  }\n\n  getStatisticFields() {\n    const fields: { key: string; operations: StatisticOperations }[] = [];\n    if (this.getXAxisHelper()?.getScale) {\n      (this._fieldX2 ? [...this._fieldX, this._fieldX2] : this._fieldX).forEach(f => {\n        const result: { key: string; operations: Array<'max' | 'min' | 'values'> } = { key: f, operations: [] };\n        if (isContinuous(this.getXAxisHelper().getScale(0).type)) {\n          result.operations = ['max', 'min'];\n        } else {\n          result.operations = ['values'];\n        }\n        fields.push(result);\n      });\n    }\n    if (this.getYAxisHelper()?.getScale) {\n      (this._fieldY2 ? [...this._fieldY, this._fieldY2] : this._fieldY).forEach(f => {\n        const result: { key: string; operations: Array<'max' | 'min' | 'values'> } = { key: f, operations: [] };\n        if (isContinuous(this.getYAxisHelper().getScale(0).type)) {\n          result.operations = ['max', 'min'];\n        } else {\n          result.operations = ['values'];\n        }\n        fields.push(result);\n      });\n    }\n    if (this._fieldZ && this.getZAxisHelper()?.getScale) {\n      this._fieldZ.forEach(f => {\n        const result: { key: string; operations: Array<'max' | 'min' | 'values'> } = { key: f, operations: [] };\n        if (isContinuous(this.getZAxisHelper().getScale(0).type)) {\n          result.operations = ['max', 'min'];\n        } else {\n          result.operations = ['values'];\n        }\n        fields.push(result);\n      });\n    }\n    return fields;\n  }\n\n  getGroupFields() {\n    return this.direction === 'vertical' ? this._fieldX : this._fieldY;\n  }\n\n  getStackGroupFields(): string[] {\n    return this.getGroupFields();\n  }\n\n  getStackValueField() {\n    // TODO: hack\n    if (this.direction === Direction.vertical) {\n      return array(this._spec.yField)[0];\n    }\n    return array(this._spec.xField)[0];\n  }\n\n  setValueFieldToStack(): void {\n    if (this.direction === Direction.vertical) {\n      this.setFieldY(STACK_FIELD_END);\n      this.setFieldY2(STACK_FIELD_START);\n    } else {\n      this.setFieldX(STACK_FIELD_END);\n      this.setFieldX2(STACK_FIELD_START);\n    }\n  }\n\n  setValueFieldToPercent(): void {\n    if (this.direction === Direction.vertical) {\n      this.setFieldY(STACK_FIELD_END_PERCENT);\n      this.setFieldY2(STACK_FIELD_START_PERCENT);\n    } else {\n      this.setFieldX(STACK_FIELD_END_PERCENT);\n      this.setFieldX2(STACK_FIELD_START_PERCENT);\n    }\n  }\n\n  setValueFieldToStackOffsetSilhouette(): void {\n    if (this.direction === Direction.vertical) {\n      this.setFieldY(STACK_FIELD_END_OffsetSilhouette);\n      this.setFieldY2(STACK_FIELD_START_OffsetSilhouette);\n    } else {\n      this.setFieldX(STACK_FIELD_END_OffsetSilhouette);\n      this.setFieldX2(STACK_FIELD_START_OffsetSilhouette);\n    }\n  }\n\n  onXAxisHelperUpdate(): void {\n    this.onMarkPositionUpdate();\n  }\n\n  onYAxisHelperUpdate(): void {\n    this.onMarkPositionUpdate();\n  }\n\n  onZAxisHelperUpdate(): void {\n    this.onMarkPositionUpdate();\n  }\n\n  updateSpec(spec: any) {\n    const originalSpec = this._originalSpec;\n    const { xField, yField } = originalSpec;\n    const result = super.updateSpec(spec);\n    if (!shallowCompare(spec.xField, xField) || !shallowCompare(spec.yField, yField)) {\n      result.change = true;\n      result.reRender = true;\n      result.reMake = true;\n    }\n    return result;\n  }\n\n  setAttrFromSpec() {\n    super.setAttrFromSpec();\n    this.setFieldX(this._spec.xField);\n    this.setFieldY(this._spec.yField);\n    this.setFieldZ(this._spec.zField);\n    if (isValid(this._spec.direction)) {\n      this._direction = this._spec.direction;\n    }\n\n    this.setFieldX2(this._spec?.x2Field);\n    this.setFieldY2(this._spec?.y2Field);\n\n    if (this._stack) {\n      this.setValueFieldToStack();\n    }\n    if (this._percent) {\n      this.setValueFieldToPercent();\n    }\n    if (this._stackOffsetSilhouette) {\n      this.setValueFieldToStackOffsetSilhouette();\n    }\n  }\n\n  dataToPosition(datum: Datum): IPoint | null {\n    if (!datum) {\n      return null;\n    }\n    return {\n      x: this.dataToPositionX(datum),\n      y: this.dataToPositionY(datum)\n    } as IPoint;\n  }\n\n  protected _buildMarkAttributeContext() {\n    super._buildMarkAttributeContext();\n    // position\n    this._markAttributeContext.valueToX = this.valueToPositionX.bind(this);\n    this._markAttributeContext.valueToY = this.valueToPositionY.bind(this);\n    this._markAttributeContext.xBandwidth = (depth: number = 0) => this.getXAxisHelper().getBandwidth?.(depth) ?? 0;\n    this._markAttributeContext.yBandwidth = (depth: number = 0) => this.getYAxisHelper().getBandwidth?.(depth) ?? 0;\n    this._markAttributeContext.valueToPosition = this.valueToPosition.bind(this);\n  }\n\n  valueToPosition(xValue: StringOrNumber | StringOrNumber[], yValue: StringOrNumber | StringOrNumber[]) {\n    return {\n      x: this.valueToPositionX(xValue),\n      y: this.valueToPositionY(yValue)\n    };\n  }\n\n  valueToPositionX(value: StringOrNumber | StringOrNumber[]) {\n    if (!this._xAxisHelper) {\n      return Number.NaN;\n    }\n    const { dataToPosition } = this._xAxisHelper;\n    return dataToPosition(array(value), { bandPosition: this._bandPosition });\n  }\n\n  valueToPositionY(value: StringOrNumber | StringOrNumber[]) {\n    if (!this._yAxisHelper) {\n      return Number.NaN;\n    }\n    const { dataToPosition } = this._yAxisHelper;\n    return dataToPosition(array(value), { bandPosition: this._bandPosition });\n  }\n\n  dataToPositionX(datum: Datum): number {\n    if (!this._xAxisHelper) {\n      return Number.NaN;\n    }\n    return this.valueToPositionX(this.getDatumPositionValues(datum, this._fieldX));\n  }\n\n  dataToPositionY(datum: Datum): number {\n    if (!this._yAxisHelper) {\n      return Number.NaN;\n    }\n    return this.valueToPositionY(this.getDatumPositionValues(datum, this._fieldY));\n  }\n\n  dataToPositionZ(datum: Datum): number {\n    if (!this._zAxisHelper) {\n      return Number.NaN;\n    }\n    const { dataToPosition } = this._zAxisHelper;\n\n    return dataToPosition(this.getDatumPositionValues(datum, this._fieldZ), {\n      bandPosition: this._bandPosition\n    });\n  }\n\n  dataToPositionX1(datum: Datum): number {\n    if (!this._xAxisHelper) {\n      return Number.NaN;\n    }\n    return this._fieldX2 && this._fieldX2 in datum\n      ? this.valueToPositionX(this.getDatumPositionValues(datum, this._fieldX2))\n      : this._xAxisHelper.getScale?.(0).range()[0];\n  }\n\n  dataToPositionY1(datum: Datum): number {\n    if (!this._yAxisHelper) {\n      return Number.NaN;\n    }\n    return this._fieldY2 && this._fieldY2 in datum\n      ? this.valueToPositionY(this.getDatumPositionValues(datum, this._fieldY2))\n      : this._yAxisHelper.getScale?.(0).range()[0];\n  }\n\n  positionToData(p: IPoint): IPoint | null {\n    if (!p) {\n      return null;\n    }\n    return {\n      x: this.positionToDataX(p.x),\n      y: this.positionToDataY(p.y)\n    };\n  }\n\n  positionToDataX(xPos: number): any | null {\n    if (!this._scaleX) {\n      return null;\n    }\n    return this._scaleX.invert(xPos);\n  }\n\n  positionToDataY(yPos: number): any | null {\n    if (!this._scaleY) {\n      return null;\n    }\n    return this._scaleY.invert(yPos);\n  }\n\n  getRegionRectLeft(): number {\n    if (!this._xAxisHelper) {\n      return Number.NaN;\n    }\n    const { getScale } = this._xAxisHelper;\n    return getScale(0).range()[0];\n  }\n\n  getRegionRectRight(): number {\n    if (!this._xAxisHelper) {\n      return Number.NaN;\n    }\n    const { getScale } = this._xAxisHelper;\n    return getScale(0).range()[1];\n  }\n\n  afterInitMark(): void {\n    super.afterInitMark();\n    this.setFieldX(this._fieldX);\n    this.setFieldY(this._fieldY);\n    this._trigger.setStateKeys([...this._fieldX, ...this._fieldY]);\n  }\n\n  getDimensionField(): string[] {\n    if (this._direction === Direction.vertical) {\n      return this.fieldX;\n    }\n    return this.fieldY;\n  }\n\n  getMeasureField(): string[] {\n    if (this._direction === Direction.vertical) {\n      return array(this._spec.yField ?? this.fieldY);\n    }\n    return array(this._spec.xField ?? this.fieldX);\n  }\n}\n"]}

package/cjs/series/index.d.ts

@@ -7,8 +7,8 @@ import type { ILineSeriesSpec } from './line/interface';
 import { BarSeries } from './bar/bar';
 import { Bar3dSeries } from './bar/bar-3d';
 import type { IBar3dSeriesSpec, IBarSeriesSpec } from './bar/interface';
-import { RangeColumnSeries } from './range-column/rangeColumn';
-import { RangeColumn3dSeries } from './range-column/rangeColumn-3d';
+import { RangeColumnSeries } from './range-column/range-column';
+import { RangeColumn3dSeries } from './range-column/range-column-3d';
 import type { IRangeColumn3dSeriesSpec, IRangeColumnSeriesSpec } from './range-column/interface';
 import { RangeAreaSeries } from './range-area/range-area';
 import type { IRangeAreaSeriesSpec } from './range-area/interface';

package/cjs/series/index.js

@@ -49,21 +49,21 @@ Object.defineProperty(exports, "Bar3dSeries", {
     }
 });
 
-const rangeColumn_1 = require("./range-column/rangeColumn");
+const range_column_1 = require("./range-column/range-column");
 
 Object.defineProperty(exports, "RangeColumnSeries", {
     enumerable: !0,
     get: function() {
-        return rangeColumn_1.RangeColumnSeries;
+        return range_column_1.RangeColumnSeries;
     }
 });
 
-const rangeColumn_3d_1 = require("./range-column/rangeColumn-3d");
+const range_column_3d_1 = require("./range-column/range-column-3d");
 
 Object.defineProperty(exports, "RangeColumn3dSeries", {
     enumerable: !0,
     get: function() {
-        return rangeColumn_3d_1.RangeColumn3dSeries;
+        return range_column_3d_1.RangeColumn3dSeries;
     }
 });
 

package/cjs/series/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/index.ts"],"names":[],"mappings":";;;AAIA,qDAAwD;AAmEtD,gGAnEO,2BAAe,OAmEP;AAjEjB,kDAAoD;AAoElD,8FApEO,wBAAa,OAoEP;AAlEf,sCAAyC;AAmEvC,2FAnEO,iBAAU,OAmEP;AAjEZ,mCAAsC;AA+DpC,0FA/DO,eAAS,OA+DP;AA9DX,yCAA2C;AA6DzC,4FA7DO,oBAAW,OA6DP;AA3Db,4DAA+D;AAkE7D,kGAlEO,+BAAiB,OAkEP;AAjEnB,kEAAoE;AAgElE,oGAhEO,oCAAmB,OAgEP;AA9DrB,wDAA0D;AA6DxD,gGA7DO,4BAAe,OA6DP;AA3DjB,mCAAsC;AA8DpC,0FA9DO,eAAS,OA8DP;AA5DX,mCAAsC;AA8DpC,0FA9DO,eAAS,OA8DP;AA7DX,yCAA2C;AA4DzC,4FA5DO,oBAAW,OA4DP;AAzDb,+CAAkD;AA4DhD,8FA5DO,uBAAa,OA4DP;AA1Df,sCAAyC;AA6DvC,2FA7DO,iBAAU,OA6DP;AA3DZ,yCAA4C;AAgD1C,4FAhDO,mBAAW,OAgDP;AA9Cb,sCAAyC;AA0DvC,2FA1DO,iBAAU,OA0DP;AAxDZ,mCAAsC;AAyDpC,0FAzDO,eAAS,OAyDP;AAvDX,sCAAyC;AAyDvC,2FAzDO,iBAAU,OAyDP;AAvDZ,2DAAsE;AAyDpE,uGAzDO,iCAAsB,OAyDP;AAvDxB,qDAAgE;AAoD9D,qGApDO,6BAAoB,OAoDP;AAlDtB,wDAA0D;AAuDxD,gGAvDO,4BAAe,OAuDP;AAtDjB,8DAA+D;AAqD7D,kGArDO,iCAAiB,OAqDP;AAnDnB,4CAA+C;AAsD7C,6FAtDO,qBAAY,OAsDP;AArDd,kDAAoD;AAoDlD,+FApDO,0BAAc,OAoDP;AAlDhB,kDAAqD;AAuCnD,+FAvCO,yBAAc,OAuCP;AArChB,oEAAsE;AA4CpE,oGA5CO,oCAAmB,OA4CP;AA1CrB,4CAA+C;AAiC7C,6FAjCO,qBAAY,OAiCP;AA/Bd,+CAAkD;AA8ChD,8FA9CO,uBAAa,OA8CP;AA3Cf,mCAA0D;AA4CxD,mGA5CO,0BAAkB,OA4CP;AAClB,4FA7C2B,mBAAW,OA6C3B;AA5Cb,+CAAkD;AA6ChD,8FA7CO,uBAAa,OA6CP;AA3Cf,oDAAgD;AA4C9C,2FA5CO,wBAAU,OA4CP;AA1CZ,2CAA8C;AA2C5C,gGA3CO,2BAAe,OA2CP;AA1CjB,yCAA4C;AA2C1C,4FA3CO,mBAAW,OA2CP;AAxCb,yDAA2D;AAyCzD,mGAzCO,kCAAkB,OAyCP;AAvCpB,iDAAmD;AAoBjD,+FApBO,0BAAc,OAoBP","file":"index.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\n/**\n * @description export all mark modules\n */\nimport { WaterfallSeries } from './waterfall/waterfall';\nimport type { IWaterfallSeriesSpec } from './waterfall/interface';\nimport { BoxPlotSeries } from './box-plot/box-plot';\nimport type { IBoxPlotSeriesSpec } from './box-plot/interface';\nimport { LineSeries } from './line/line';\nimport type { ILineSeriesSpec } from './line/interface';\nimport { BarSeries } from './bar/bar';\nimport { Bar3dSeries } from './bar/bar-3d';\nimport type { IBar3dSeriesSpec, IBarSeriesSpec } from './bar/interface';\nimport { RangeColumnSeries } from './range-column/rangeColumn';\nimport { RangeColumn3dSeries } from './range-column/rangeColumn-3d';\nimport type { IRangeColumn3dSeriesSpec, IRangeColumnSeriesSpec } from './range-column/interface';\nimport { RangeAreaSeries } from './range-area/range-area';\nimport type { IRangeAreaSeriesSpec } from './range-area/interface';\nimport { MapSeries } from './map/map';\nimport type { IMapSeriesSpec } from './map/interface';\nimport { PieSeries } from './pie/pie';\nimport { Pie3dSeries } from './pie/pie-3d';\nimport type { IPie3dSeriesSpec } from './pie/interface';\nimport type { IPieSeriesSpec } from './pie/interface';\nimport { ScatterSeries } from './scatter/scatter';\nimport type { IScatterSeriesSpec } from './scatter/interface';\nimport { RoseSeries } from './rose/rose';\nimport type { IRoseSeriesSpec } from './rose/interface';\nimport { RadarSeries } from './radar/radar';\nimport type { IRadarSeriesSpec } from './radar/interface';\nimport { AreaSeries } from './area/area';\nimport type { IAreaSeriesSpec } from './area/interface';\nimport { DotSeries } from './dot/dot';\nimport type { IDotSeriesSpec } from './dot/interface';\nimport { LinkSeries } from './link/link';\nimport type { ILinkSeriesSpec } from './link/interface';\nimport { CircularProgressSeries } from './progress/circular/circular';\nimport type { ICircularProgressSeriesSpec } from './progress/circular/interface';\nimport { LinearProgressSeries } from './progress/linear/linear';\nimport type { ILinearProgressSeriesSpec } from './progress/linear/interface';\nimport { WordCloudSeries } from './word-cloud/word-cloud';\nimport { WordCloud3dSeries } from './word-cloud/word-cloud-3d';\nimport type { IWordCloud3dSeriesSpec, IWordCloudSeriesSpec } from './word-cloud/interface';\nimport { FunnelSeries } from './funnel/funnel';\nimport { Funnel3dSeries } from './funnel/funnel-3d';\nimport type { IFunnel3dSeriesSpec, IFunnelSeriesSpec } from './funnel/interface';\nimport { SunburstSeries } from './sunburst/sunburst';\nimport type { ISunburstSeriesSpec } from './sunburst/interface';\nimport { CirclePackingSeries } from './circle-packing/circle-packing';\nimport type { ICirclePackingSeriesSpec } from './circle-packing/interface';\nimport { SankeySeries } from './sankey/sankey';\nimport type { ISankeySeriesSpec } from './sankey/interface';\nimport { TreeMapSeries } from './treemap/treemap';\nimport type { ITreemapSeriesSpec } from './treemap/interface';\nimport type { IGaugePointerSeriesSpec, IGaugeSeriesSpec } from './gauge';\nimport { GaugePointerSeries, GaugeSeries } from './gauge';\nimport { HeatmapSeries } from './heatmap/heatmap';\nimport type { IHeatmapSeriesSpec } from './heatmap/interface';\nimport { BaseSeries } from './base/base-series';\nimport type { ICartesianSeriesSpec } from './cartesian';\nimport { CartesianSeries } from './cartesian';\nimport { PolarSeries } from './polar/polar';\nimport type { IPolarSeriesSpec } from './polar/interface';\nimport type { IProgressLikeSeriesSpec } from './polar/progress-like';\nimport { ProgressLikeSeries } from './polar/progress-like';\nimport type { IRoseLikeSeriesSpec } from './polar/rose-like';\nimport { RoseLikeSeries } from './polar/rose-like';\n\nimport type { ISeries } from './interface';\n\nexport {\n  WaterfallSeries,\n  Bar3dSeries,\n  BarSeries,\n  BoxPlotSeries,\n  LineSeries,\n  RadarSeries,\n  RangeAreaSeries,\n  RangeColumn3dSeries,\n  RangeColumnSeries,\n  MapSeries,\n  Pie3dSeries,\n  PieSeries,\n  SankeySeries,\n  ScatterSeries,\n  SunburstSeries,\n  RoseLikeSeries,\n  RoseSeries,\n  AreaSeries,\n  DotSeries,\n  LinearProgressSeries,\n  LinkSeries,\n  CirclePackingSeries,\n  CircularProgressSeries,\n  WordCloud3dSeries,\n  WordCloudSeries,\n  Funnel3dSeries,\n  FunnelSeries,\n  TreeMapSeries,\n  GaugePointerSeries,\n  GaugeSeries,\n  HeatmapSeries,\n  BaseSeries,\n  CartesianSeries,\n  PolarSeries,\n  ProgressLikeSeries\n};\n\nexport type {\n  ISeries,\n  IRoseLikeSeriesSpec,\n  IAreaSeriesSpec,\n  IBar3dSeriesSpec,\n  IBarSeriesSpec,\n  IBoxPlotSeriesSpec,\n  ICartesianSeriesSpec,\n  ICirclePackingSeriesSpec,\n  ICircularProgressSeriesSpec,\n  IDotSeriesSpec,\n  IFunnel3dSeriesSpec,\n  IFunnelSeriesSpec,\n  IGaugePointerSeriesSpec,\n  IGaugeSeriesSpec,\n  IHeatmapSeriesSpec,\n  ILineSeriesSpec,\n  ILinearProgressSeriesSpec,\n  ILinkSeriesSpec,\n  IMapSeriesSpec,\n  IPie3dSeriesSpec,\n  IPieSeriesSpec,\n  IPolarSeriesSpec,\n  IProgressLikeSeriesSpec,\n  IRadarSeriesSpec,\n  IRangeAreaSeriesSpec,\n  IRangeColumn3dSeriesSpec,\n  IRangeColumnSeriesSpec,\n  IRoseSeriesSpec,\n  ISankeySeriesSpec,\n  IScatterSeriesSpec,\n  ISunburstSeriesSpec,\n  ITreemapSeriesSpec,\n  IWaterfallSeriesSpec,\n  IWordCloud3dSeriesSpec,\n  IWordCloudSeriesSpec\n};\n"]}
+{"version":3,"sources":["../src/series/index.ts"],"names":[],"mappings":";;;AAIA,qDAAwD;AAmEtD,gGAnEO,2BAAe,OAmEP;AAjEjB,kDAAoD;AAoElD,8FApEO,wBAAa,OAoEP;AAlEf,sCAAyC;AAmEvC,2FAnEO,iBAAU,OAmEP;AAjEZ,mCAAsC;AA+DpC,0FA/DO,eAAS,OA+DP;AA9DX,yCAA2C;AA6DzC,4FA7DO,oBAAW,OA6DP;AA3Db,8DAAgE;AAkE9D,kGAlEO,gCAAiB,OAkEP;AAjEnB,oEAAqE;AAgEnE,oGAhEO,qCAAmB,OAgEP;AA9DrB,wDAA0D;AA6DxD,gGA7DO,4BAAe,OA6DP;AA3DjB,mCAAsC;AA8DpC,0FA9DO,eAAS,OA8DP;AA5DX,mCAAsC;AA8DpC,0FA9DO,eAAS,OA8DP;AA7DX,yCAA2C;AA4DzC,4FA5DO,oBAAW,OA4DP;AAzDb,+CAAkD;AA4DhD,8FA5DO,uBAAa,OA4DP;AA1Df,sCAAyC;AA6DvC,2FA7DO,iBAAU,OA6DP;AA3DZ,yCAA4C;AAgD1C,4FAhDO,mBAAW,OAgDP;AA9Cb,sCAAyC;AA0DvC,2FA1DO,iBAAU,OA0DP;AAxDZ,mCAAsC;AAyDpC,0FAzDO,eAAS,OAyDP;AAvDX,sCAAyC;AAyDvC,2FAzDO,iBAAU,OAyDP;AAvDZ,2DAAsE;AAyDpE,uGAzDO,iCAAsB,OAyDP;AAvDxB,qDAAgE;AAoD9D,qGApDO,6BAAoB,OAoDP;AAlDtB,wDAA0D;AAuDxD,gGAvDO,4BAAe,OAuDP;AAtDjB,8DAA+D;AAqD7D,kGArDO,iCAAiB,OAqDP;AAnDnB,4CAA+C;AAsD7C,6FAtDO,qBAAY,OAsDP;AArDd,kDAAoD;AAoDlD,+FApDO,0BAAc,OAoDP;AAlDhB,kDAAqD;AAuCnD,+FAvCO,yBAAc,OAuCP;AArChB,oEAAsE;AA4CpE,oGA5CO,oCAAmB,OA4CP;AA1CrB,4CAA+C;AAiC7C,6FAjCO,qBAAY,OAiCP;AA/Bd,+CAAkD;AA8ChD,8FA9CO,uBAAa,OA8CP;AA3Cf,mCAA0D;AA4CxD,mGA5CO,0BAAkB,OA4CP;AAClB,4FA7C2B,mBAAW,OA6C3B;AA5Cb,+CAAkD;AA6ChD,8FA7CO,uBAAa,OA6CP;AA3Cf,oDAAgD;AA4C9C,2FA5CO,wBAAU,OA4CP;AA1CZ,2CAA8C;AA2C5C,gGA3CO,2BAAe,OA2CP;AA1CjB,yCAA4C;AA2C1C,4FA3CO,mBAAW,OA2CP;AAxCb,yDAA2D;AAyCzD,mGAzCO,kCAAkB,OAyCP;AAvCpB,iDAAmD;AAoBjD,+FApBO,0BAAc,OAoBP","file":"index.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\n/**\n * @description export all mark modules\n */\nimport { WaterfallSeries } from './waterfall/waterfall';\nimport type { IWaterfallSeriesSpec } from './waterfall/interface';\nimport { BoxPlotSeries } from './box-plot/box-plot';\nimport type { IBoxPlotSeriesSpec } from './box-plot/interface';\nimport { LineSeries } from './line/line';\nimport type { ILineSeriesSpec } from './line/interface';\nimport { BarSeries } from './bar/bar';\nimport { Bar3dSeries } from './bar/bar-3d';\nimport type { IBar3dSeriesSpec, IBarSeriesSpec } from './bar/interface';\nimport { RangeColumnSeries } from './range-column/range-column';\nimport { RangeColumn3dSeries } from './range-column/range-column-3d';\nimport type { IRangeColumn3dSeriesSpec, IRangeColumnSeriesSpec } from './range-column/interface';\nimport { RangeAreaSeries } from './range-area/range-area';\nimport type { IRangeAreaSeriesSpec } from './range-area/interface';\nimport { MapSeries } from './map/map';\nimport type { IMapSeriesSpec } from './map/interface';\nimport { PieSeries } from './pie/pie';\nimport { Pie3dSeries } from './pie/pie-3d';\nimport type { IPie3dSeriesSpec } from './pie/interface';\nimport type { IPieSeriesSpec } from './pie/interface';\nimport { ScatterSeries } from './scatter/scatter';\nimport type { IScatterSeriesSpec } from './scatter/interface';\nimport { RoseSeries } from './rose/rose';\nimport type { IRoseSeriesSpec } from './rose/interface';\nimport { RadarSeries } from './radar/radar';\nimport type { IRadarSeriesSpec } from './radar/interface';\nimport { AreaSeries } from './area/area';\nimport type { IAreaSeriesSpec } from './area/interface';\nimport { DotSeries } from './dot/dot';\nimport type { IDotSeriesSpec } from './dot/interface';\nimport { LinkSeries } from './link/link';\nimport type { ILinkSeriesSpec } from './link/interface';\nimport { CircularProgressSeries } from './progress/circular/circular';\nimport type { ICircularProgressSeriesSpec } from './progress/circular/interface';\nimport { LinearProgressSeries } from './progress/linear/linear';\nimport type { ILinearProgressSeriesSpec } from './progress/linear/interface';\nimport { WordCloudSeries } from './word-cloud/word-cloud';\nimport { WordCloud3dSeries } from './word-cloud/word-cloud-3d';\nimport type { IWordCloud3dSeriesSpec, IWordCloudSeriesSpec } from './word-cloud/interface';\nimport { FunnelSeries } from './funnel/funnel';\nimport { Funnel3dSeries } from './funnel/funnel-3d';\nimport type { IFunnel3dSeriesSpec, IFunnelSeriesSpec } from './funnel/interface';\nimport { SunburstSeries } from './sunburst/sunburst';\nimport type { ISunburstSeriesSpec } from './sunburst/interface';\nimport { CirclePackingSeries } from './circle-packing/circle-packing';\nimport type { ICirclePackingSeriesSpec } from './circle-packing/interface';\nimport { SankeySeries } from './sankey/sankey';\nimport type { ISankeySeriesSpec } from './sankey/interface';\nimport { TreeMapSeries } from './treemap/treemap';\nimport type { ITreemapSeriesSpec } from './treemap/interface';\nimport type { IGaugePointerSeriesSpec, IGaugeSeriesSpec } from './gauge';\nimport { GaugePointerSeries, GaugeSeries } from './gauge';\nimport { HeatmapSeries } from './heatmap/heatmap';\nimport type { IHeatmapSeriesSpec } from './heatmap/interface';\nimport { BaseSeries } from './base/base-series';\nimport type { ICartesianSeriesSpec } from './cartesian';\nimport { CartesianSeries } from './cartesian';\nimport { PolarSeries } from './polar/polar';\nimport type { IPolarSeriesSpec } from './polar/interface';\nimport type { IProgressLikeSeriesSpec } from './polar/progress-like';\nimport { ProgressLikeSeries } from './polar/progress-like';\nimport type { IRoseLikeSeriesSpec } from './polar/rose-like';\nimport { RoseLikeSeries } from './polar/rose-like';\n\nimport type { ISeries } from './interface';\n\nexport {\n  WaterfallSeries,\n  Bar3dSeries,\n  BarSeries,\n  BoxPlotSeries,\n  LineSeries,\n  RadarSeries,\n  RangeAreaSeries,\n  RangeColumn3dSeries,\n  RangeColumnSeries,\n  MapSeries,\n  Pie3dSeries,\n  PieSeries,\n  SankeySeries,\n  ScatterSeries,\n  SunburstSeries,\n  RoseLikeSeries,\n  RoseSeries,\n  AreaSeries,\n  DotSeries,\n  LinearProgressSeries,\n  LinkSeries,\n  CirclePackingSeries,\n  CircularProgressSeries,\n  WordCloud3dSeries,\n  WordCloudSeries,\n  Funnel3dSeries,\n  FunnelSeries,\n  TreeMapSeries,\n  GaugePointerSeries,\n  GaugeSeries,\n  HeatmapSeries,\n  BaseSeries,\n  CartesianSeries,\n  PolarSeries,\n  ProgressLikeSeries\n};\n\nexport type {\n  ISeries,\n  IRoseLikeSeriesSpec,\n  IAreaSeriesSpec,\n  IBar3dSeriesSpec,\n  IBarSeriesSpec,\n  IBoxPlotSeriesSpec,\n  ICartesianSeriesSpec,\n  ICirclePackingSeriesSpec,\n  ICircularProgressSeriesSpec,\n  IDotSeriesSpec,\n  IFunnel3dSeriesSpec,\n  IFunnelSeriesSpec,\n  IGaugePointerSeriesSpec,\n  IGaugeSeriesSpec,\n  IHeatmapSeriesSpec,\n  ILineSeriesSpec,\n  ILinearProgressSeriesSpec,\n  ILinkSeriesSpec,\n  IMapSeriesSpec,\n  IPie3dSeriesSpec,\n  IPieSeriesSpec,\n  IPolarSeriesSpec,\n  IProgressLikeSeriesSpec,\n  IRadarSeriesSpec,\n  IRangeAreaSeriesSpec,\n  IRangeColumn3dSeriesSpec,\n  IRangeColumnSeriesSpec,\n  IRoseSeriesSpec,\n  ISankeySeriesSpec,\n  IScatterSeriesSpec,\n  ISunburstSeriesSpec,\n  ITreemapSeriesSpec,\n  IWaterfallSeriesSpec,\n  IWordCloud3dSeriesSpec,\n  IWordCloudSeriesSpec\n};\n"]}

package/cjs/series/map/interface.d.ts

@@ -5,8 +5,8 @@ type LineMarks = 'area';
 export interface IMapSeriesSpec extends ISeriesSpec, IAnimationSpec<LineMarks, 'fadeIn'> {
     type: 'map';
     map: string;
-    nameField: string;
-    valueField: string;
+    nameField?: string;
+    valueField?: string;
     nameProperty?: string;
     nameMap?: {
         [key: string]: string;

package/cjs/series/map/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/map/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IPathMarkSpec, ITextMarkSpec } from '../../typings/visual';\nimport type { IMarkSpec, IMarkTheme, ISeriesSpec } from '../../typings/spec/common';\nimport type { IAnimationSpec } from '../../animation/spec';\n\ntype LineMarks = 'area';\n\nexport interface IMapSeriesSpec extends ISeriesSpec, IAnimationSpec<LineMarks, 'fadeIn'> {\n  /**\n   *  系列类型\n   */\n  type: 'map';\n  /**\n   *  地图数据源\n   */\n  map: string;\n  /**\n   *  名称维度\n   */\n  nameField: string;\n  /**\n   *  值维度\n   */\n  valueField: string;\n  /**\n   * 名称映射字段\n   * @default 'name'\n   */\n  nameProperty?: string;\n  /**\n   *  名称映射表\n   */\n  nameMap?: { [key: string]: string };\n  /**\n   *  图元配置\n   */\n  area?: IMarkSpec<Omit<IPathMarkSpec, 'smoothScale'>>;\n\n  /** 默认填充颜色 */\n  defaultFillColor?: string;\n\n  /** 标签配置 */\n  label?: IMarkSpec<ITextMarkSpec> & { offset?: number; position?: string };\n}\n\nexport interface IMapSeriesTheme {\n  defaultFillColor?: string;\n  label?: Partial<IMarkTheme<ITextMarkSpec> & { offset?: number; position?: string }>;\n  area?: Partial<IMarkTheme<Omit<IPathMarkSpec, 'smoothScale'>>>;\n}\n"]}
+{"version":3,"sources":["../src/series/map/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IPathMarkSpec, ITextMarkSpec } from '../../typings/visual';\nimport type { IMarkSpec, IMarkTheme, ISeriesSpec } from '../../typings/spec/common';\nimport type { IAnimationSpec } from '../../animation/spec';\n\ntype LineMarks = 'area';\n\nexport interface IMapSeriesSpec extends ISeriesSpec, IAnimationSpec<LineMarks, 'fadeIn'> {\n  /**\n   *  系列类型\n   */\n  type: 'map';\n  /**\n   *  地图数据源\n   */\n  map: string;\n  /**\n   *  名称维度\n   */\n  nameField?: string;\n  /**\n   *  值维度\n   */\n  valueField?: string;\n  /**\n   * 名称映射字段\n   * @default 'name'\n   */\n  nameProperty?: string;\n  /**\n   *  名称映射表\n   */\n  nameMap?: { [key: string]: string };\n  /**\n   *  图元配置\n   */\n  area?: IMarkSpec<Omit<IPathMarkSpec, 'smoothScale'>>;\n\n  /** 默认填充颜色 */\n  defaultFillColor?: string;\n\n  /** 标签配置 */\n  label?: IMarkSpec<ITextMarkSpec> & { offset?: number; position?: string };\n}\n\nexport interface IMapSeriesTheme {\n  defaultFillColor?: string;\n  label?: Partial<IMarkTheme<ITextMarkSpec> & { offset?: number; position?: string }>;\n  area?: Partial<IMarkTheme<Omit<IPathMarkSpec, 'smoothScale'>>>;\n}\n"]}

package/cjs/series/map/map.d.ts

@@ -1,5 +1,5 @@
 import { DataView } from '@visactor/vdataset';
-import type { Maybe, Datum, StringOrNumber } from '../../typings';
+import type { Maybe, StringOrNumber } from '../../typings';
 import { GeoSeries } from '../geo/geo';
 import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface';
@@ -48,5 +48,5 @@ export declare class MapSeries extends GeoSeries<IMapSeriesSpec> {
     dataToPositionX(data: any): number;
     dataToPositionY(data: any): number;
     viewDataUpdate(d: DataView): void;
-    protected _getDataIdKey(): (datum: Datum) => string;
+    protected _getDataIdKey(): string;
 }