@visactor/vchart 1.2.3 → 1.3.0-beta.0

package/cjs/animation/spec.d.ts

@@ -1,6 +1,6 @@
 import type { IAnimationConfig } from '@visactor/vgrammar';
 import type { EasingType } from '@visactor/vrender';
-export type { IMorphConfig, IMorphAnimationConfig } from '@visactor/vgrammar';
+export type { IRunningConfig as IMorphConfig, IMorphAnimationConfig } from '@visactor/vgrammar';
 export type IStateAnimateSpec<Preset extends string> = {
     preset?: Preset | false;
     duration?: number;

package/cjs/animation/spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/animation/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { IAnimationConfig } from '@visactor/vgrammar';\nimport type { EasingType } from '@visactor/vrender';\nexport type { IMorphConfig, IMorphAnimationConfig } from '@visactor/vgrammar';\n\nexport type IStateAnimateSpec<Preset extends string> = {\n  /**\n   * 预设动画效果\n   */\n  preset?: Preset | false;\n  /**\n   * 图表动画时长\n   */\n  duration?: number;\n  /**\n   * 动画延迟开始的时长\n   */\n  delay?: number;\n  /**\n   * 动画缓动效果\n   */\n  easing?: EasingType;\n  /**\n   * 是否轮流执行\n   */\n  oneByOne?: boolean;\n};\n\nexport type IMarkAnimateSpec<MarkName extends string> = Partial<\n  Record<MarkName, false | IAnimationConfig | IAnimationConfig[]>\n>;\n\nexport interface IAnimationSpec<MarkName extends string, Preset extends string> {\n  /**\n   * 图表入场动画\n   * 支持配置图表内置不同动画效果\n   */\n  animationAppear?: boolean | IStateAnimateSpec<Preset> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 数据更新 - 新增数据动画\n   */\n  animationEnter?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 数据更新 - 数据更新动画\n   */\n  animationUpdate?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 数据更新 - 数据删除动画\n   */\n  animationExit?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 图表退场动画\n   */\n  animationDisappear?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 循环动画\n   */\n  animationNormal?: IMarkAnimateSpec<MarkName>;\n}\nexport interface IMorphSeriesSpec {\n  /**\n   * 系列全局动画是否开启\n   * @default true\n   */\n  enable?: boolean;\n  /**\n   * 图元匹配字段\n   * 系列前后根据 morphKey 配置的内容进行关联\n   */\n  morphKey?: string;\n  /**\n   * 数据匹配字段\n   * 多数据图元可配置\n   */\n  morphElementKey?: string;\n}\n"]}
+{"version":3,"sources":["../src/animation/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { IAnimationConfig } from '@visactor/vgrammar';\nimport type { EasingType } from '@visactor/vrender';\nexport type { IRunningConfig as IMorphConfig, IMorphAnimationConfig } from '@visactor/vgrammar';\n\nexport type IStateAnimateSpec<Preset extends string> = {\n  /**\n   * 预设动画效果\n   */\n  preset?: Preset | false;\n  /**\n   * 图表动画时长\n   */\n  duration?: number;\n  /**\n   * 动画延迟开始的时长\n   */\n  delay?: number;\n  /**\n   * 动画缓动效果\n   */\n  easing?: EasingType;\n  /**\n   * 是否轮流执行\n   */\n  oneByOne?: boolean;\n};\n\nexport type IMarkAnimateSpec<MarkName extends string> = Partial<\n  Record<MarkName, false | IAnimationConfig | IAnimationConfig[]>\n>;\n\nexport interface IAnimationSpec<MarkName extends string, Preset extends string> {\n  /**\n   * 图表入场动画\n   * 支持配置图表内置不同动画效果\n   */\n  animationAppear?: boolean | IStateAnimateSpec<Preset> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 数据更新 - 新增数据动画\n   */\n  animationEnter?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 数据更新 - 数据更新动画\n   */\n  animationUpdate?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 数据更新 - 数据删除动画\n   */\n  animationExit?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 图表退场动画\n   */\n  animationDisappear?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 循环动画\n   */\n  animationNormal?: IMarkAnimateSpec<MarkName>;\n}\nexport interface IMorphSeriesSpec {\n  /**\n   * 系列全局动画是否开启\n   * @default true\n   */\n  enable?: boolean;\n  /**\n   * 图元匹配字段\n   * 系列前后根据 morphKey 配置的内容进行关联\n   */\n  morphKey?: string;\n  /**\n   * 数据匹配字段\n   * 多数据图元可配置\n   */\n  morphElementKey?: string;\n}\n"]}

package/cjs/animation/utils.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.isChannelAnimation = exports.isTimeLineAnimation = exports.shouldDoMorph = exports.userAnimationConfig = exports.animationConfig = exports.AnimationStates = void 0;
 
-const util_1 = require("../util"), type_1 = require("../util/type"), constant_1 = require("../constant"), config_1 = require("./config"), vutils_1 = require("@visactor/vutils");
+const type_1 = require("../util/type"), constant_1 = require("../constant"), config_1 = require("./config"), vutils_1 = require("@visactor/vutils"), spec_1 = require("../util/spec");
 
 function animationConfig(defaultConfig, userConfig, params) {
     var _a;
@@ -22,7 +22,7 @@ function animationConfig(defaultConfig, userConfig, params) {
             stopWhenStateChange: !0
         })), null == userConfig ? void 0 : userConfig[state]) {
             if ((0, vutils_1.isArray)(userConfig[state])) stateConfig = userConfig[state]; else {
-                let singleConfig = (0, util_1.merge)({}, defaultStateConfig[0], userConfig[state]);
+                let singleConfig = (0, spec_1.mergeSpec)({}, defaultStateConfig[0], userConfig[state]);
                 isChannelAnimation(singleConfig) && delete singleConfig.type, singleConfig.oneByOne && (singleConfig = produceOneByOne(singleConfig, null !== (_a = null == params ? void 0 : params.dataIndex) && void 0 !== _a ? _a : defaultDataIndex)), 
                 stateConfig = [ singleConfig ];
             }

package/cjs/animation/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/animation/utils.ts"],"names":[],"mappings":";;;AAAA,kCAAgC;AAKhC,uCAAyD;AACzD,0CAAiD;AACjD,qCAAoD;AACpD,6CAAoD;AAGvC,QAAA,eAAe,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;AAE5F,SAAgB,eAAe,CAC7B,aAAgC,EAChC,UAEC,EACD,MAEC;;IAED,MAAM,MAAM,GAAG,EAAuB,CAAC;IAEvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,uBAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC/C,MAAM,KAAK,GAAG,uBAAe,CAAC,CAAC,CAAC,CAAC;QAEjC,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,KAAK,CAAC,MAAK,KAAK,EAAE;YACjC,SAAS;SACV;QAED,IAAI,KAAK,KAAK,QAAQ,EAAE;YACtB,UAAU,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,UAAU,CAAC,MAA8B,CAAC,CAAC;YACjF,SAAS;SACV;QAED,IAAI,kBAAsC,CAAC;QAC3C,IAAI,IAAA,gBAAO,EAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE;YACjC,kBAAkB,GAAG,aAAa,CAAC,KAAK,CAAuB,CAAC;SACjE;aAAM;YACL,kBAAkB,GAAG,CAAC,gCAAK,iCAAwB,CAAC,KAAK,CAAC,GAAK,aAAa,CAAC,KAAK,CAAC,CAAS,CAAC,CAAC;YAG9F,IAAI,KAAK,KAAK,MAAM,EAAE;gBACpB,kBAAkB,CAAC,CAAC,CAAC,CAAC,cAAc,GAAG,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC;aACtE;SACF;QAED,IAAI,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,KAAK,CAAC,CAAA,EAAE;YACxB,MAAM,CAAC,KAAK,CAAC,GAAG,kBAAkB,CAAC;YACnC,SAAS;SACV;QAGD,IAAI,WAA+B,CAAC;QAEpC,IAAI,IAAA,gBAAO,EAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE;YAC9B,WAAW,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;SACjC;aAAM;YACL,IAAI,YAAY,GAAqB,IAAA,YAAK,EAAC,EAAE,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,CAAqB,CAAC;YAE7G,IAAI,kBAAkB,CAAC,YAAY,CAAC,EAAE;gBAGpC,OAAQ,YAAqC,CAAC,IAAI,CAAC;aACpD;YAED,IAAI,YAAY,CAAC,QAAQ,EAAE;gBACzB,YAAY,GAAG,eAAe,CAAC,YAAoC,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,mCAAI,gBAAgB,CAAC,CAAC;aAC7G;YAED,WAAW,GAAG,CAAC,YAAY,CAAC,CAAC;SAC9B;QAED,MAAM,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC;KAC7B;IAGD,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,MAA+B,CAAC;IACtD,OAAO,MAAM,CAAC;AAChB,CAAC;AAnED,0CAmEC;AAED,SAAgB,mBAAmB,CACjC,QAAqC,EACrC,IAA+B;;IAE/B,OAAO;QACL,MAAM,EAAE,MAAA,MAAA,IAAI,CAAC,eAAe,0CAAG,QAAQ,CAAC,mCAAI,IAAI,CAAC,eAAe;QAChE,SAAS,EAAE,MAAA,MAAA,IAAI,CAAC,kBAAkB,0CAAG,QAAQ,CAAC,mCAAI,IAAI,CAAC,kBAAkB;QACzE,KAAK,EAAE,MAAA,MAAA,IAAI,CAAC,cAAc,0CAAG,QAAQ,CAAC,mCAAI,IAAI,CAAC,cAAc;QAC7D,IAAI,EAAE,MAAA,MAAA,IAAI,CAAC,aAAa,0CAAG,QAAQ,CAAC,mCAAI,IAAI,CAAC,aAAa;QAC1D,MAAM,EAAE,MAAA,MAAA,IAAI,CAAC,eAAe,0CAAG,QAAQ,CAAC,mCAAI,IAAI,CAAC,eAAe;QAChE,MAAM,EAAE,MAAA,IAAI,CAAC,eAAe,0CAAG,QAAQ,CAAC;KACzC,CAAC;AACJ,CAAC;AAZD,kDAYC;AAKD,SAAS,eAAe,CAAC,WAAiC,EAAE,SAAiC;IAC3F,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC;IAC3C,WAAW,CAAC,KAAK,GAAG,CAAC,KAAU,EAAE,OAAiB,EAAE,MAAW,EAAE,EAAE;QACjE,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QAChC,MAAM,aAAa,GAAG,IAAA,iBAAU,EAAC,QAAQ,CAAC;YACxC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC;YAClC,CAAC,CAAC,IAAA,oBAAa,EAAC,QAAQ,CAAC;gBACzB,CAAC,CAAC,QAAQ;gBACV,CAAC,CAAC,CAAC,CAAC;QACN,IAAI,aAAa,GAAG,IAAA,iBAAU,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QACvF,IAAI,aAAa,KAAK,KAAK,EAAE;YAC3B,OAAO,CAAC,CAAC;SACV;QACD,aAAa,GAAG,aAAa,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;QAC3D,OAAO,MAAM,GAAG,CAAC,aAAa,GAAG,aAAa,CAAC,CAAC;IAClD,CAAC,CAAC;IACF,OAAO,WAAW,CAAC,QAAQ,CAAC;IAC5B,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAU;IAClC,OAAO,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,6BAAkB,CAAC,CAAC;AACrC,CAAC;AAED,SAAgB,aAAa,CAC3B,YAAqB,EACrB,WAA8B,EAC9B,eAAwD;IAExD,IAAI,YAAY,KAAK,KAAK,EAAE;QAC1B,OAAO,KAAK,CAAC;KACd;IAED,IAAI,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,MAAK,KAAK,IAAI,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,MAAK,KAAK,EAAE;QAC1E,OAAO,KAAK,CAAC;KACd;IAED,IAAI,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,MAAK,KAAK,EAAE;QACjC,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAlBD,sCAkBC;AAED,SAAgB,mBAAmB,CAAC,eAAiC;IACnE,OAAO,IAAA,gBAAO,EAAE,eAAsC,CAAC,UAAU,CAAC,CAAC;AACrE,CAAC;AAFD,kDAEC;AAED,SAAgB,kBAAkB,CAAC,eAAiC;IAClE,OAAO,CAAC,mBAAmB,CAAC,eAAe,CAAC,IAAI,IAAA,gBAAO,EAAE,eAAwC,CAAC,OAAO,CAAC,CAAC;AAC7G,CAAC;AAFD,gDAEC","file":"utils.js","sourcesContent":["import { merge } from '../util';\nimport type { IAnimationConfig } from '@visactor/vgrammar';\nimport type { IElement, IAnimationTypeConfig, IStateAnimationConfig, IAnimationTimeline } from '@visactor/vgrammar';\nimport type { MarkAnimationSpec, IAnimationState } from './interface';\nimport type { IStateAnimateSpec, IAnimationSpec, IMorphSeriesSpec } from './spec';\nimport { isFunction, isValidNumber } from '../util/type';\nimport { DEFAULT_DATA_INDEX } from '../constant';\nimport { DEFAULT_ANIMATION_CONFIG } from './config';\nimport { isArray, isValid } from '@visactor/vutils';\nimport type { SeriesMarkNameEnum } from '../series/interface';\n\nexport const AnimationStates = ['appear', 'enter', 'update', 'exit', 'disappear', 'normal'];\n\nexport function animationConfig<Preset extends string>(\n  defaultConfig: MarkAnimationSpec,\n  userConfig?: Partial<\n    Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>\n  >,\n  params?: {\n    dataIndex: (datum: any) => number;\n  }\n) {\n  const config = {} as MarkAnimationSpec;\n\n  for (let i = 0; i < AnimationStates.length; i++) {\n    const state = AnimationStates[i];\n\n    if (userConfig?.[state] === false) {\n      continue;\n    }\n\n    if (state === 'normal') {\n      userConfig.normal && (config.normal = userConfig.normal as IAnimationTypeConfig);\n      continue;\n    }\n    // 开始处理默认动画逻辑\n    let defaultStateConfig: IAnimationConfig[];\n    if (isArray(defaultConfig[state])) {\n      defaultStateConfig = defaultConfig[state] as IAnimationConfig[];\n    } else {\n      defaultStateConfig = [{ ...DEFAULT_ANIMATION_CONFIG[state], ...defaultConfig[state] } as any];\n      // FIXME: 用来控制当动画状态发生变更时是否清除正在执行的动画。\n      // 现在 vrender 对于同一个视觉通道的 tween 不会做覆盖的处理。若不做动画清空同时 exit 动画比 update 动画时间长的情况下，效果会不正确\n      if (state === 'exit') {\n        defaultStateConfig[0].controlOptions = { stopWhenStateChange: true };\n      }\n    }\n\n    if (!userConfig?.[state]) {\n      config[state] = defaultStateConfig;\n      continue;\n    }\n\n    // 开始处理用户配置的动画逻辑\n    let stateConfig: IAnimationConfig[];\n\n    if (isArray(userConfig[state])) {\n      stateConfig = userConfig[state];\n    } else {\n      let singleConfig: IAnimationConfig = merge({}, defaultStateConfig[0], userConfig[state]) as IAnimationConfig;\n\n      if (isChannelAnimation(singleConfig)) {\n        // `type` and `channel` is conflict, and `type` has a higher priority.\n        // here if user configured `channel`, we should remove `type` which will come from default animation config\n        delete (singleConfig as IAnimationTypeConfig).type;\n      }\n\n      if (singleConfig.oneByOne) {\n        singleConfig = produceOneByOne(singleConfig as IAnimationTypeConfig, params?.dataIndex ?? defaultDataIndex);\n      }\n\n      stateConfig = [singleConfig];\n    }\n\n    config[state] = stateConfig;\n  }\n\n  // 将 update copy 到 state 保证 useState 效果与 update 对齐\n  config.state = config.update as IStateAnimationConfig;\n  return config;\n}\n\nexport function userAnimationConfig<M extends string, Preset extends string>(\n  markName: SeriesMarkNameEnum | string,\n  spec: IAnimationSpec<M, Preset>\n) {\n  return {\n    appear: spec.animationAppear?.[markName] ?? spec.animationAppear,\n    disappear: spec.animationDisappear?.[markName] ?? spec.animationDisappear,\n    enter: spec.animationEnter?.[markName] ?? spec.animationEnter,\n    exit: spec.animationExit?.[markName] ?? spec.animationExit,\n    update: spec.animationUpdate?.[markName] ?? spec.animationUpdate,\n    normal: spec.animationNormal?.[markName]\n  };\n}\n\n/**\n * oneByOne\n */\nfunction produceOneByOne(stateConfig: IAnimationTypeConfig, dataIndex: (datum: any) => number) {\n  const { oneByOne, duration } = stateConfig;\n  stateConfig.delay = (datum: any, element: IElement, params: any) => {\n    const _index = dataIndex(datum);\n    const _durationTime = isFunction(duration)\n      ? duration(datum, element, params)\n      : isValidNumber(duration)\n      ? duration\n      : 0;\n    let _oneByOneTime = isFunction(oneByOne) ? oneByOne(datum, element, params) : oneByOne;\n    if (_oneByOneTime === false) {\n      return 0;\n    }\n    _oneByOneTime = _oneByOneTime === true ? 0 : _oneByOneTime;\n    return _index * (_durationTime + _oneByOneTime);\n  };\n  delete stateConfig.oneByOne;\n  return stateConfig;\n}\n\nfunction defaultDataIndex(datum: any) {\n  return datum?.[DEFAULT_DATA_INDEX];\n}\n\nexport function shouldDoMorph(\n  hasAnimation: boolean,\n  morphConfig?: IMorphSeriesSpec,\n  animationConfig?: ReturnType<typeof userAnimationConfig>\n) {\n  if (hasAnimation === false) {\n    return false;\n  }\n\n  if (animationConfig?.appear === false || animationConfig?.update === false) {\n    return false;\n  }\n\n  if (morphConfig?.enable === false) {\n    return false;\n  }\n\n  return true;\n}\n\nexport function isTimeLineAnimation(animationConfig: IAnimationConfig) {\n  return isValid((animationConfig as IAnimationTimeline).timeSlices);\n}\n\nexport function isChannelAnimation(animationConfig: IAnimationConfig) {\n  return !isTimeLineAnimation(animationConfig) && isValid((animationConfig as IAnimationTypeConfig).channel);\n}\n"]}
+{"version":3,"sources":["../src/animation/utils.ts"],"names":[],"mappings":"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","file":"utils.js","sourcesContent":["import type { IAnimationConfig } from '@visactor/vgrammar';\n// eslint-disable-next-line no-duplicate-imports\nimport type { IElement, IAnimationTypeConfig, IStateAnimationConfig, IAnimationTimeline } from '@visactor/vgrammar';\nimport type { MarkAnimationSpec, IAnimationState } from './interface';\nimport type { IStateAnimateSpec, IAnimationSpec, IMorphSeriesSpec } from './spec';\nimport { isFunction, isValidNumber } from '../util/type';\nimport { DEFAULT_DATA_INDEX } from '../constant';\nimport { DEFAULT_ANIMATION_CONFIG } from './config';\nimport { isArray, isValid } from '@visactor/vutils';\nimport type { SeriesMarkNameEnum } from '../series/interface';\nimport { mergeSpec } from '../util/spec';\n\nexport const AnimationStates = ['appear', 'enter', 'update', 'exit', 'disappear', 'normal'];\n\nexport function animationConfig<Preset extends string>(\n  defaultConfig: MarkAnimationSpec,\n  userConfig?: Partial<\n    Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>\n  >,\n  params?: {\n    dataIndex: (datum: any) => number;\n  }\n) {\n  const config = {} as MarkAnimationSpec;\n\n  for (let i = 0; i < AnimationStates.length; i++) {\n    const state = AnimationStates[i];\n\n    if (userConfig?.[state] === false) {\n      continue;\n    }\n\n    if (state === 'normal') {\n      userConfig.normal && (config.normal = userConfig.normal as IAnimationTypeConfig);\n      continue;\n    }\n    // 开始处理默认动画逻辑\n    let defaultStateConfig: IAnimationConfig[];\n    if (isArray(defaultConfig[state])) {\n      defaultStateConfig = defaultConfig[state] as IAnimationConfig[];\n    } else {\n      defaultStateConfig = [{ ...DEFAULT_ANIMATION_CONFIG[state], ...defaultConfig[state] } as any];\n      // FIXME: 用来控制当动画状态发生变更时是否清除正在执行的动画。\n      // 现在 vrender 对于同一个视觉通道的 tween 不会做覆盖的处理。若不做动画清空同时 exit 动画比 update 动画时间长的情况下，效果会不正确\n      if (state === 'exit') {\n        defaultStateConfig[0].controlOptions = { stopWhenStateChange: true };\n      }\n    }\n\n    if (!userConfig?.[state]) {\n      config[state] = defaultStateConfig;\n      continue;\n    }\n\n    // 开始处理用户配置的动画逻辑\n    let stateConfig: IAnimationConfig[];\n\n    if (isArray(userConfig[state])) {\n      stateConfig = userConfig[state];\n    } else {\n      let singleConfig: IAnimationConfig = mergeSpec({}, defaultStateConfig[0], userConfig[state]) as IAnimationConfig;\n\n      if (isChannelAnimation(singleConfig)) {\n        // `type` and `channel` is conflict, and `type` has a higher priority.\n        // here if user configured `channel`, we should remove `type` which will come from default animation config\n        delete (singleConfig as IAnimationTypeConfig).type;\n      }\n\n      if (singleConfig.oneByOne) {\n        singleConfig = produceOneByOne(singleConfig as IAnimationTypeConfig, params?.dataIndex ?? defaultDataIndex);\n      }\n\n      stateConfig = [singleConfig];\n    }\n\n    config[state] = stateConfig;\n  }\n\n  // 将 update copy 到 state 保证 useState 效果与 update 对齐\n  config.state = config.update as IStateAnimationConfig;\n  return config;\n}\n\nexport function userAnimationConfig<M extends string, Preset extends string>(\n  markName: SeriesMarkNameEnum | string,\n  spec: IAnimationSpec<M, Preset>\n) {\n  return {\n    appear: spec.animationAppear?.[markName] ?? spec.animationAppear,\n    disappear: spec.animationDisappear?.[markName] ?? spec.animationDisappear,\n    enter: spec.animationEnter?.[markName] ?? spec.animationEnter,\n    exit: spec.animationExit?.[markName] ?? spec.animationExit,\n    update: spec.animationUpdate?.[markName] ?? spec.animationUpdate,\n    normal: spec.animationNormal?.[markName]\n  };\n}\n\n/**\n * oneByOne\n */\nfunction produceOneByOne(stateConfig: IAnimationTypeConfig, dataIndex: (datum: any) => number) {\n  const { oneByOne, duration } = stateConfig;\n  stateConfig.delay = (datum: any, element: IElement, params: any) => {\n    const _index = dataIndex(datum);\n    const _durationTime = isFunction(duration)\n      ? duration(datum, element, params)\n      : isValidNumber(duration)\n      ? duration\n      : 0;\n    let _oneByOneTime = isFunction(oneByOne) ? oneByOne(datum, element, params) : oneByOne;\n    if (_oneByOneTime === false) {\n      return 0;\n    }\n    _oneByOneTime = _oneByOneTime === true ? 0 : _oneByOneTime;\n    return _index * (_durationTime + _oneByOneTime);\n  };\n  delete stateConfig.oneByOne;\n  return stateConfig;\n}\n\nfunction defaultDataIndex(datum: any) {\n  return datum?.[DEFAULT_DATA_INDEX];\n}\n\nexport function shouldDoMorph(\n  hasAnimation: boolean,\n  morphConfig?: IMorphSeriesSpec,\n  animationConfig?: ReturnType<typeof userAnimationConfig>\n) {\n  if (hasAnimation === false) {\n    return false;\n  }\n\n  if (animationConfig?.appear === false || animationConfig?.update === false) {\n    return false;\n  }\n\n  if (morphConfig?.enable === false) {\n    return false;\n  }\n\n  return true;\n}\n\nexport function isTimeLineAnimation(animationConfig: IAnimationConfig) {\n  return isValid((animationConfig as IAnimationTimeline).timeSlices);\n}\n\nexport function isChannelAnimation(animationConfig: IAnimationConfig) {\n  return !isTimeLineAnimation(animationConfig) && isValid((animationConfig as IAnimationTypeConfig).channel);\n}\n"]}

package/cjs/chart/area/area.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.AreaChart = void 0;
 
-const interface_1 = require("../../series/interface"), cartesian_1 = require("../cartesian/cartesian"), interface_2 = require("../interface"), util_1 = require("../util"), vchart_1 = require("../../core/vchart"), series_1 = require("../../series");
+const area_1 = require("./../../series/area/area"), interface_1 = require("../../series/interface"), cartesian_1 = require("../cartesian/cartesian"), interface_2 = require("../interface"), vchart_1 = require("../../core/vchart"), util_1 = require("../util");
 
-vchart_1.VChart.useSeries([ series_1.AreaSeries ]);
+vchart_1.VChart.useSeries([ area_1.AreaSeries ]);
 
 class AreaChart extends cartesian_1.CartesianChart {
     constructor() {
@@ -15,7 +15,6 @@ class AreaChart extends cartesian_1.CartesianChart {
     _getDefaultSeriesSpec(spec) {
         var _a;
         return Object.assign(Object.assign({}, super._getDefaultSeriesSpec(spec)), {
-            invalidType: spec.invalidType || "break",
             point: spec.point,
             line: spec.line,
             area: spec.area,

package/cjs/chart/area/area.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/chart/area/area.ts"],"names":[],"mappings":";;;AAAA,sDAAwD;AACxD,sDAAwD;AACxD,4CAA6C;AAE7C,kCAA+D;AAC/D,8CAA2C;AAC3C,yCAA0C;AAC1C,eAAM,CAAC,SAAS,CAAC,CAAC,mBAAU,CAAC,CAAC,CAAC;AAE/B,MAAa,SAAU,SAAQ,0BAAc;IAA7C;;QAGW,SAAI,GAAW,yBAAa,CAAC,IAAI,CAAC;QAClC,eAAU,GAAW,0BAAc,CAAC,IAAI,CAAC;IAkBpD,CAAC;IAhBW,qBAAqB,CAAC,IAAoB;;QAClD,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,OAAO,EACxC,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,UAAU,EAAE,MAAA,IAAI,CAAC,UAAU,mCAAI,MAAM,EACrC,WAAW,EAAE,IAAI,CAAC,WAAW,IAC7B;IACJ,CAAC;IAED,aAAa,CAAC,IAAS;QACrB,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAA,2CAAoC,EAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;;AArBH,8BAsBC;AArBiB,cAAI,GAAW,yBAAa,CAAC,IAAI,CAAC;AAClC,cAAI,GAAW,eAAe,CAAC","file":"area.js","sourcesContent":["import { SeriesTypeEnum } from '../../series/interface';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface';\nimport type { IAreaChartSpec } from './interface';\nimport { setDefaultCrosshairForCartesianChart } from '../util';\nimport { VChart } from '../../core/vchart';\nimport { AreaSeries } from '../../series';\nVChart.useSeries([AreaSeries]);\n\nexport class AreaChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.area;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.area;\n  readonly seriesType: string = SeriesTypeEnum.area;\n\n  protected _getDefaultSeriesSpec(spec: IAreaChartSpec): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      invalidType: spec.invalidType || 'break',\n      point: spec.point,\n      line: spec.line,\n      area: spec.area,\n      seriesMark: spec.seriesMark ?? 'area',\n      activePoint: spec.activePoint\n    };\n  }\n\n  transformSpec(spec: any): void {\n    super.transformSpec(spec);\n    setDefaultCrosshairForCartesianChart(spec);\n  }\n}\n"]}
+{"version":3,"sources":["../src/chart/area/area.ts"],"names":[],"mappings":";;;AAAA,mDAAsD;AACtD,sDAAwD;AACxD,sDAAwD;AACxD,4CAA6C;AAE7C,8CAA2C;AAC3C,kCAA+D;AAC/D,eAAM,CAAC,SAAS,CAAC,CAAC,iBAAU,CAAC,CAAC,CAAC;AAE/B,MAAa,SAAU,SAAQ,0BAAc;IAA7C;;QAGW,SAAI,GAAW,yBAAa,CAAC,IAAI,CAAC;QAClC,eAAU,GAAW,0BAAc,CAAC,IAAI,CAAC;IAiBpD,CAAC;IAfW,qBAAqB,CAAC,IAAoB;;QAClD,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,UAAU,EAAE,MAAA,IAAI,CAAC,UAAU,mCAAI,MAAM,EACrC,WAAW,EAAE,IAAI,CAAC,WAAW,IAC7B;IACJ,CAAC;IAED,aAAa,CAAC,IAAS;QACrB,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAA,2CAAoC,EAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;;AApBH,8BAqBC;AApBiB,cAAI,GAAW,yBAAa,CAAC,IAAI,CAAC;AAClC,cAAI,GAAW,eAAe,CAAC","file":"area.js","sourcesContent":["import { AreaSeries } from './../../series/area/area';\nimport { SeriesTypeEnum } from '../../series/interface';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface';\nimport type { IAreaChartSpec } from './interface';\nimport { VChart } from '../../core/vchart';\nimport { setDefaultCrosshairForCartesianChart } from '../util';\nVChart.useSeries([AreaSeries]);\n\nexport class AreaChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.area;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.area;\n  readonly seriesType: string = SeriesTypeEnum.area;\n\n  protected _getDefaultSeriesSpec(spec: IAreaChartSpec): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      point: spec.point,\n      line: spec.line,\n      area: spec.area,\n      seriesMark: spec.seriesMark ?? 'area',\n      activePoint: spec.activePoint\n    };\n  }\n\n  transformSpec(spec: any): void {\n    super.transformSpec(spec);\n    setDefaultCrosshairForCartesianChart(spec);\n  }\n}\n"]}

package/cjs/chart/bar/bar-3d.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.Bar3dChart = void 0;
 
-const interface_1 = require("../../series/interface"), cartesian_1 = require("../cartesian/cartesian"), interface_2 = require("../interface"), vchart_1 = require("../../core/vchart"), series_1 = require("../../series");
+const bar_3d_1 = require("./../../series/bar/bar-3d"), interface_1 = require("../../series/interface"), cartesian_1 = require("../cartesian/cartesian"), interface_2 = require("../interface"), vchart_1 = require("../../core/vchart");
 
-vchart_1.VChart.useSeries([ series_1.Bar3dSeries ]);
+vchart_1.VChart.useSeries([ bar_3d_1.Bar3dSeries ]);
 
 class Bar3dChart extends cartesian_1.CartesianChart {
     constructor() {

package/cjs/chart/bar/bar-3d.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/chart/bar/bar-3d.ts"],"names":[],"mappings":";;;AAAA,sDAAwD;AACxD,sDAAwD;AACxD,4CAA6C;AAC7C,8CAA2C;AAC3C,yCAA2C;AAE3C,eAAM,CAAC,SAAS,CAAC,CAAC,oBAAW,CAAC,CAAC,CAAC;AAEhC,MAAa,UAAW,SAAQ,0BAAc;IAA9C;;QAGW,SAAI,GAAW,yBAAa,CAAC,KAAK,CAAC;QACnC,eAAU,GAAW,0BAAc,CAAC,KAAK,CAAC;IAWrD,CAAC;IATW,qBAAqB,CAAC,IAAS;QACvC,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,QAAQ,EAAoB,IAAK,CAAC,QAAQ,EAC1C,WAAW,EAAoB,IAAK,CAAC,WAAW,EAChD,WAAW,EAAoB,IAAK,CAAC,WAAW,EAChD,aAAa,EAAoB,IAAK,CAAC,aAAa,IACpD;IACJ,CAAC;;AAdH,gCAeC;AAdiB,eAAI,GAAW,yBAAa,CAAC,KAAK,CAAC;AACnC,eAAI,GAAW,eAAe,CAAC","file":"bar-3d.js","sourcesContent":["import { SeriesTypeEnum } from '../../series/interface';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface';\nimport { VChart } from '../../core/vchart';\nimport { Bar3dSeries } from '../../series';\nimport type { IBar3dChartSpec } from './interface';\nVChart.useSeries([Bar3dSeries]);\n\nexport class Bar3dChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.bar3d;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.bar3d;\n  readonly seriesType: string = SeriesTypeEnum.bar3d;\n\n  protected _getDefaultSeriesSpec(spec: any): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      barWidth: (<IBar3dChartSpec>spec).barWidth,\n      barMaxWidth: (<IBar3dChartSpec>spec).barMaxWidth,\n      barMinWidth: (<IBar3dChartSpec>spec).barMinWidth,\n      barGapInGroup: (<IBar3dChartSpec>spec).barGapInGroup\n    };\n  }\n}\n"]}
+{"version":3,"sources":["../src/chart/bar/bar-3d.ts"],"names":[],"mappings":";;;AAAA,sDAAwD;AACxD,sDAAwD;AACxD,sDAAwD;AACxD,4CAA6C;AAC7C,8CAA2C;AAE3C,eAAM,CAAC,SAAS,CAAC,CAAC,oBAAW,CAAC,CAAC,CAAC;AAEhC,MAAa,UAAW,SAAQ,0BAAc;IAA9C;;QAGW,SAAI,GAAW,yBAAa,CAAC,KAAK,CAAC;QACnC,eAAU,GAAW,0BAAc,CAAC,KAAK,CAAC;IAWrD,CAAC;IATW,qBAAqB,CAAC,IAAS;QACvC,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,QAAQ,EAAoB,IAAK,CAAC,QAAQ,EAC1C,WAAW,EAAoB,IAAK,CAAC,WAAW,EAChD,WAAW,EAAoB,IAAK,CAAC,WAAW,EAChD,aAAa,EAAoB,IAAK,CAAC,aAAa,IACpD;IACJ,CAAC;;AAdH,gCAeC;AAdiB,eAAI,GAAW,yBAAa,CAAC,KAAK,CAAC;AACnC,eAAI,GAAW,eAAe,CAAC","file":"bar-3d.js","sourcesContent":["import { Bar3dSeries } from './../../series/bar/bar-3d';\nimport { SeriesTypeEnum } from '../../series/interface';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface';\nimport { VChart } from '../../core/vchart';\nimport type { IBar3dChartSpec } from './interface';\nVChart.useSeries([Bar3dSeries]);\n\nexport class Bar3dChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.bar3d;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.bar3d;\n  readonly seriesType: string = SeriesTypeEnum.bar3d;\n\n  protected _getDefaultSeriesSpec(spec: any): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      barWidth: (<IBar3dChartSpec>spec).barWidth,\n      barMaxWidth: (<IBar3dChartSpec>spec).barMaxWidth,\n      barMinWidth: (<IBar3dChartSpec>spec).barMinWidth,\n      barGapInGroup: (<IBar3dChartSpec>spec).barGapInGroup\n    };\n  }\n}\n"]}

package/cjs/chart/bar/bar.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BarChart = void 0;
 
-const interface_1 = require("../../series/interface"), cartesian_1 = require("../cartesian/cartesian"), interface_2 = require("../interface"), util_1 = require("../util"), vchart_1 = require("../../core/vchart"), series_1 = require("../../series");
+const bar_1 = require("./../../series/bar/bar"), interface_1 = require("../../series/interface"), cartesian_1 = require("../cartesian/cartesian"), interface_2 = require("../interface"), util_1 = require("../util"), vchart_1 = require("../../core/vchart");
 
-vchart_1.VChart.useSeries([ series_1.BarSeries ]);
+vchart_1.VChart.useSeries([ bar_1.BarSeries ]);
 
 class BarChart extends cartesian_1.CartesianChart {
     constructor() {

package/cjs/chart/bar/bar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/chart/bar/bar.ts"],"names":[],"mappings":";;;AAAA,sDAAwD;AACxD,sDAAwD;AACxD,4CAA6C;AAC7C,kCAA+D;AAC/D,8CAA2C;AAC3C,yCAAyC;AAEzC,eAAM,CAAC,SAAS,CAAC,CAAC,kBAAS,CAAC,CAAC,CAAC;AAE9B,MAAa,QAAS,SAAQ,0BAAc;IAA5C;;QAGW,SAAI,GAAW,yBAAa,CAAC,GAAG,CAAC;QACjC,eAAU,GAAW,0BAAc,CAAC,GAAG,CAAC;IAgBnD,CAAC;IAdW,qBAAqB,CAAC,IAAS;QACvC,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,QAAQ,EAAkB,IAAK,CAAC,QAAQ,EACxC,WAAW,EAAkB,IAAK,CAAC,WAAW,EAC9C,WAAW,EAAkB,IAAK,CAAC,WAAW,EAC9C,aAAa,EAAkB,IAAK,CAAC,aAAa,IAClD;IACJ,CAAC;IAED,aAAa,CAAC,IAAS;QACrB,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAA,2CAAoC,EAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;;AAnBH,4BAoBC;AAnBiB,aAAI,GAAW,yBAAa,CAAC,GAAG,CAAC;AACjC,aAAI,GAAW,eAAe,CAAC","file":"bar.js","sourcesContent":["import { SeriesTypeEnum } from '../../series/interface';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface';\nimport { setDefaultCrosshairForCartesianChart } from '../util';\nimport { VChart } from '../../core/vchart';\nimport { BarSeries } from '../../series';\nimport type { IBarChartSpec } from './interface';\nVChart.useSeries([BarSeries]);\n\nexport class BarChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.bar;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.bar;\n  readonly seriesType: string = SeriesTypeEnum.bar;\n\n  protected _getDefaultSeriesSpec(spec: any): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      barWidth: (<IBarChartSpec>spec).barWidth,\n      barMaxWidth: (<IBarChartSpec>spec).barMaxWidth,\n      barMinWidth: (<IBarChartSpec>spec).barMinWidth,\n      barGapInGroup: (<IBarChartSpec>spec).barGapInGroup\n    };\n  }\n\n  transformSpec(spec: any): void {\n    super.transformSpec(spec);\n    setDefaultCrosshairForCartesianChart(spec);\n  }\n}\n"]}
+{"version":3,"sources":["../src/chart/bar/bar.ts"],"names":[],"mappings":";;;AAAA,gDAAmD;AACnD,sDAAwD;AACxD,sDAAwD;AACxD,4CAA6C;AAC7C,kCAA+D;AAC/D,8CAA2C;AAE3C,eAAM,CAAC,SAAS,CAAC,CAAC,eAAS,CAAC,CAAC,CAAC;AAE9B,MAAa,QAAS,SAAQ,0BAAc;IAA5C;;QAGW,SAAI,GAAW,yBAAa,CAAC,GAAG,CAAC;QACjC,eAAU,GAAW,0BAAc,CAAC,GAAG,CAAC;IAgBnD,CAAC;IAdW,qBAAqB,CAAC,IAAS;QACvC,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,QAAQ,EAAkB,IAAK,CAAC,QAAQ,EACxC,WAAW,EAAkB,IAAK,CAAC,WAAW,EAC9C,WAAW,EAAkB,IAAK,CAAC,WAAW,EAC9C,aAAa,EAAkB,IAAK,CAAC,aAAa,IAClD;IACJ,CAAC;IAED,aAAa,CAAC,IAAS;QACrB,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAA,2CAAoC,EAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;;AAnBH,4BAoBC;AAnBiB,aAAI,GAAW,yBAAa,CAAC,GAAG,CAAC;AACjC,aAAI,GAAW,eAAe,CAAC","file":"bar.js","sourcesContent":["import { BarSeries } from './../../series/bar/bar';\nimport { SeriesTypeEnum } from '../../series/interface';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface';\nimport { setDefaultCrosshairForCartesianChart } from '../util';\nimport { VChart } from '../../core/vchart';\nimport type { IBarChartSpec } from './interface';\nVChart.useSeries([BarSeries]);\n\nexport class BarChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.bar;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.bar;\n  readonly seriesType: string = SeriesTypeEnum.bar;\n\n  protected _getDefaultSeriesSpec(spec: any): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      barWidth: (<IBarChartSpec>spec).barWidth,\n      barMaxWidth: (<IBarChartSpec>spec).barMaxWidth,\n      barMinWidth: (<IBarChartSpec>spec).barMinWidth,\n      barGapInGroup: (<IBarChartSpec>spec).barGapInGroup\n    };\n  }\n\n  transformSpec(spec: any): void {\n    super.transformSpec(spec);\n    setDefaultCrosshairForCartesianChart(spec);\n  }\n}\n"]}

package/cjs/chart/base-chart.d.ts

@@ -1,4 +1,4 @@
-import type { ISeriesSpec, Datum, IMarkStateSpec, IRegionQuerier, MaybeArray, IPadding, IRect, StringOrNumber, IChartSpec } from '../typings';
+import type { ISeriesSpec, Datum, IMarkStateSpec, IRegionQuerier, MaybeArray, IPadding, IRect, StringOrNumber, IChartSpec, IDataValues } from '../typings';
 import type { LayoutCallBack } from '../layout/interface';
 import type { ILayoutModelState, ILayoutOrientPadding, ILayoutRect, IModel, IModelOption, IUpdateSpecResult } from '../model/interface';
 import type { IChart, IChartLayoutOption, IChartRenderOption, IChartOption, IChartEvaluateOption, ILayoutParams, DimensionIndexOption } from './interface';
@@ -13,7 +13,7 @@ import { Stack } from './stack';
 import type { ITheme } from '../theme/interface';
 import type { IParserOptions } from '@visactor/vdataset/es/parser';
 import type { IBoundsLike } from '@visactor/vutils';
-import type { IMorphConfig, IMark as IVGrammarMark, IView } from '@visactor/vgrammar';
+import type { IRunningConfig as IMorphConfig, IMark as IVGrammarMark, IView } from '@visactor/vgrammar';
 import { CompilableBase } from '../compile/compilable-base';
 import type { IGlobalScale } from '../scale/interface';
 import type { IRectMark } from '../mark/rect';
@@ -96,7 +96,9 @@ export declare class BaseChart extends CompilableBase implements IChart {
     getMarkById(id: number): IMark | undefined;
     updateParseData(id: string, data: Datum[], options?: IParserOptions): void;
     updateData(id: StringOrNumber, data: unknown, updateGlobalScale?: boolean, options?: IParserOptions): void;
+    updateFullData(data: IDataValues | IDataValues[], updateGlobalScale?: boolean): void;
     onRender(option: IChartRenderOption): void;
+    setCanvasRect(width: number, height: number): void;
     getCanvasRect(): Omit<IRect, 'x' | 'y'>;
     getSeriesData(id: StringOrNumber | undefined, index: number | undefined): DataView | undefined;
     private _transformSpecScale;
@@ -125,6 +127,7 @@ export declare class BaseChart extends CompilableBase implements IChart {
     protected setRegionTheme(): void;
     protected setComponentTheme(theme: ITheme): void;
     protected setSeriesTheme(theme: ITheme): void;
+    clear(): void;
     compile(): void;
     afterCompile(): void;
     compileLayout(): void;

package/cjs/chart/base-chart.js

@@ -30,7 +30,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseChart = void 0;
 
-const global_scale_1 = require("../scale/global-scale"), interface_1 = require("../component/interface"), interface_2 = require("../mark/interface"), factory_1 = require("../core/factory"), event_1 = require("../event/event"), util_1 = require("../util"), stack_1 = require("./stack"), base_model_1 = require("../model/base-model"), base_mark_1 = require("../mark/base/base-mark"), base_1 = require("../constant/base"), initialize_1 = require("../data/initialize"), vutils_1 = require("@visactor/vutils"), util_2 = require("../theme/color-scheme/util"), compilable_base_1 = require("../compile/compilable-base"), interface_3 = require("../compile/mark/interface"), constant_1 = require("../constant"), dimension_1 = require("../event/events/dimension");
+const global_scale_1 = require("../scale/global-scale"), interface_1 = require("../component/interface"), interface_2 = require("../mark/interface"), factory_1 = require("../core/factory"), event_1 = require("../event/event"), util_1 = require("../util"), stack_1 = require("./stack"), base_model_1 = require("../model/base-model"), base_mark_1 = require("../mark/base/base-mark"), base_1 = require("../constant/base"), initialize_1 = require("../data/initialize"), vutils_1 = require("@visactor/vutils"), util_2 = require("../theme/color-scheme/util"), compilable_base_1 = require("../compile/compilable-base"), interface_3 = require("../compile/mark/interface"), constant_1 = require("../constant"), dimension_1 = require("../event/events/dimension"), util_3 = require("./util");
 
 class BaseChart extends compilable_base_1.CompilableBase {
     getSpec() {
@@ -309,36 +309,28 @@ class BaseChart extends compilable_base_1.CompilableBase {
         dv && dv.parseNewData(data, options), updateGlobalScale && this.updateGlobalScaleDomain(), 
         this.getAllModels().forEach((model => model.onDataUpdate()));
     }
+    updateFullData(data, updateGlobalScale = !0) {
+        const dvs = [];
+        (0, util_1.array)(data).forEach((d => {
+            const dv = this._dataSet.getDataView(d.id);
+            dv && (dvs.push({
+                d: d,
+                dv: dv
+            }), dv.markRunning());
+        })), dvs.forEach((({d: d, dv: dv}) => {
+            dv.setFields(d.fields), dv.parseNewData(d.values, d.parser);
+        })), updateGlobalScale && this.updateGlobalScaleDomain(), this.getAllModels().forEach((model => model.onDataUpdate()));
+    }
     onRender(option) {}
+    setCanvasRect(width, height) {
+        this._canvasRect = {
+            width: width,
+            height: height
+        };
+    }
     getCanvasRect() {
-        var _a;
-        if (this._canvasRect) return this._canvasRect;
-        const {width: userWidth, height: userHeight} = this._spec;
-        if ((0, util_1.isValid)(userWidth) && (0, util_1.isValid)(userHeight)) this._canvasRect = {
-            width: userWidth,
-            height: userHeight
-        }; else {
-            let width = base_1.DEFAULT_CHART_WIDTH, height = base_1.DEFAULT_CHART_HEIGHT;
-            const container = this._option.container, canvas = this._option.canvas;
-            if (container) {
-                const {width: containerWidth, height: containerHeight} = (0, vutils_1.getContainerSize)(this._option.container, base_1.DEFAULT_CHART_WIDTH, base_1.DEFAULT_CHART_HEIGHT);
-                width = containerWidth, height = containerHeight;
-            } else if (canvas && (0, util_1.isTrueBrowser)(this._option.mode)) {
-                let canvasNode;
-                canvasNode = (0, util_1.isString)(canvas) ? null === document || void 0 === document ? void 0 : document.getElementById(canvas) : canvas;
-                const {width: containerWidth, height: containerHeight} = (0, vutils_1.getContainerSize)(canvasNode, base_1.DEFAULT_CHART_WIDTH, base_1.DEFAULT_CHART_HEIGHT);
-                width = containerWidth, height = containerHeight;
-            } else if ((0, util_1.isMiniAppLikeMode)(this._option.mode) && (null === (_a = this._option.modeParams) || void 0 === _a ? void 0 : _a.domref)) {
-                const domRef = this._option.modeParams.domref;
-                width = domRef.width, height = domRef.height;
-            }
-            width = null != userWidth ? userWidth : width, height = null != userHeight ? userHeight : height, 
-            this._canvasRect = {
-                width: width,
-                height: height
-            };
-        }
-        return this._canvasRect;
+        return this._canvasRect || (this._canvasRect = (0, util_3.calculateChartSize)(this._spec, this._option)), 
+        this._canvasRect;
     }
     getSeriesData(id, index) {
         if (!this._spec.data) return this._option.onError("no data in spec!"), null;
@@ -409,17 +401,17 @@ class BaseChart extends compilable_base_1.CompilableBase {
         if (this.setLayoutTag(!0, morphConfig), spec.type !== this.type) return result.reMake = !0, 
         result;
         this.transformSpec(spec);
-        const currentKeys = Object.keys(this._spec), nextKeys = Object.keys(spec);
+        const currentKeys = Object.keys(this._spec).sort(), nextKeys = Object.keys(spec).sort();
         return JSON.stringify(currentKeys) !== JSON.stringify(nextKeys) ? (result.reMake = !0, 
-        result) : (this._spec = spec, this.updateGlobalScale(result), result.reMake ? result : (this.updateDataSpec(result), 
-        result.reMake ? result : (this.updateGlobalScaleDomain(), this.updateRegionSpec(result), 
-        result.reMake ? result : (this.updateComponentSpec(result), result.reMake || this.updateSeriesSpec(result), 
-        result))));
+        result) : (this._spec = spec, this.updateGlobalScale(result), result.reMake ? result : (this.updateRegionSpec(result), 
+        result.reMake ? result : (this.updateComponentSpec(result), result.reMake ? result : (this.updateSeriesSpec(result), 
+        result.reMake ? result : (this.updateDataSpec(result), result.reMake || this.updateGlobalScaleDomain(), 
+        result)))));
     }
     updateDataSpec(result) {
-        this._spec.data && (0, util_1.array)(this._spec.data).forEach((d => {
+        this._spec.data && (0, util_1.array)(this._spec.data).forEach(((d, i) => {
             const dataView = this._dataSet.getDataView(d.id);
-            dataView && (d.values ? dataView.updateRawData(d.values) : d.latestData || dataView.updateRawData([]));
+            dataView ? d.values ? dataView.updateRawData(d.values) : d.latestData || dataView.updateRawData([]) : result.reMakeData = !0;
         }));
     }
     updateRegionSpec(result) {
@@ -437,7 +429,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
             (0, util_1.isArray)(cmpSpec) ? (componentCache[c.specKey] = componentCache[c.specKey] || {
                 specCount: cmpSpec.length,
                 componentCount: 0
-            }, componentCache[c.specKey].componentCount++, this._mergeUpdateResult(result, c.updateSpec(cmpSpec[c.getSpecIndex()]))) : this._mergeUpdateResult(result, c.updateSpec(cmpSpec)), 
+            }, componentCache[c.specKey].componentCount++, this._mergeUpdateResult(result, c.updateSpec(cmpSpec[c.getSpecIndex()], cmpSpec))) : this._mergeUpdateResult(result, c.updateSpec(cmpSpec)), 
             c.reInit();
         }));
         for (const key in componentCache) if (Object.prototype.hasOwnProperty.call(componentCache, key)) {
@@ -447,8 +439,14 @@ class BaseChart extends compilable_base_1.CompilableBase {
     }
     updateSeriesSpec(result) {
         this._spec.series.length === this._series.length ? this._series.forEach((s => {
-            this._mergeUpdateResult(result, s.updateSpec(this._spec.series[s.getSpecIndex()])), 
-            s.reInit();
+            var _a;
+            const spec = this._spec.series[s.getSpecIndex()];
+            if (result.reMakeData) {
+                let values;
+                values = spec.data ? spec.data.values : null === (_a = this.getSeriesData(spec.dataId, spec.dataIndex)) || void 0 === _a ? void 0 : _a.latestData, 
+                s.updateRawData(values);
+            }
+            this._mergeUpdateResult(result, s.updateSpec(spec)), s.reInit();
         })) : result.reMake = !0;
     }
     getCanvas() {
@@ -480,7 +478,9 @@ class BaseChart extends compilable_base_1.CompilableBase {
             largeThreshold: spec.largeThreshold,
             progressiveStep: spec.progressiveStep,
             progressiveThreshold: spec.progressiveThreshold,
-            background: spec.seriesBackground
+            background: spec.seriesBackground,
+            invalidType: spec.invalidType,
+            seriesField: spec.seriesField
         };
     }
     _mergeUpdateResult(resultA, resultB) {
@@ -530,6 +530,12 @@ class BaseChart extends compilable_base_1.CompilableBase {
             yield s.setCurrentTheme(theme.series[s.type], !0);
         }))));
     }
+    clear() {
+        this.getLayoutElements().forEach((i => {
+            var _a;
+            return null === (_a = i.clear) || void 0 === _a ? void 0 : _a.call(i);
+        }));
+    }
     compile() {
         this.compileBackground(), this.compileLayout(), this.compileRegions(), this.compileSeries(), 
         this.compileComponents();
@@ -580,7 +586,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
         })), null === (_d = null === (_c = this._option.performanceHook) || void 0 === _c ? void 0 : _c.afterComponentCompile) || void 0 === _d || _d.call(_c);
     }
     release() {
-        super.release(), [ ...this._components, ...this._regions, ...this._series ].forEach((m => {
+        super.release(), this.clear(), [ ...this._components, ...this._regions, ...this._series ].forEach((m => {
             m.release();
         })), this._components = this._regions = this._series = [], this._spec = {}, this._dataSet = this._globalScale = this._layoutFunc = null, 
         this._layoutTag = !1, this._idMap.clear();
@@ -692,7 +698,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
                 if (tooltip.getVisible()) {
                     const dataFilter = {};
                     dimensionInfo.forEach((d => {
-                        const {axis: axis, value: value, data: data} = d, isY = "left" === axis.orient || "right" === axis.orient;
+                        const {axis: axis, value: value, data: data} = d, isY = "left" === axis.getOrient() || "right" === axis.getOrient();
                         data.forEach((d => {
                             isY ? dataFilter[d.series.fieldY[0]] = value : dataFilter[d.series.fieldX[0]] = value;
                         }));