@visactor/vchart 1.7.1 → 1.7.3

package/cjs/animation/utils.d.ts

@@ -8,6 +8,7 @@ import type { ISeriesMarkAttributeContext } from '../compile/mark';
 export declare const AnimationStates: string[];
 export declare function animationConfig<Preset extends string>(defaultConfig?: MarkAnimationSpec, userConfig?: Partial<Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>>, params?: {
     dataIndex: (datum: any) => number;
+    dataCount: () => number;
 }): MarkAnimationSpec;
 export declare function userAnimationConfig<M extends string, Preset extends string>(markName: SeriesMarkNameEnum | string, spec: IAnimationSpec<M, Preset>, ctx: ISeriesMarkAttributeContext): Partial<Record<"none" | "normal" | "state" | "update" | "appear" | "enter" | "exit" | "disappear", boolean | IAnimationConfig | IAnimationConfig[] | IStateAnimateSpec<string>>>;
 export declare function shouldMarkDoMorph(spec: ISeriesSpec & IAnimationSpec<string, string>, markName: string): boolean;

package/cjs/animation/utils.js

@@ -24,7 +24,7 @@ function animationConfig(defaultConfig = {}, userConfig, params) {
         })), null == userConfig ? void 0 : userConfig[state]) ? (stateConfig = (0, vutils_1.isArray)(userConfig[state]) ? userConfig[state] : defaultStateConfig.map(((stateConfig, i) => {
             var _a;
             let singleConfig = (0, merge_spec_1.mergeSpec)({}, defaultStateConfig[i], userConfig[state]);
-            return isChannelAnimation(singleConfig) && delete singleConfig.type, singleConfig.oneByOne && (singleConfig = produceOneByOne(singleConfig, null !== (_a = null == params ? void 0 : params.dataIndex) && void 0 !== _a ? _a : defaultDataIndex)), 
+            return isChannelAnimation(singleConfig) && delete singleConfig.type, singleConfig.oneByOne && (singleConfig = produceOneByOne(singleConfig, null !== (_a = null == params ? void 0 : params.dataIndex) && void 0 !== _a ? _a : defaultDataIndex, null == params ? void 0 : params.dataCount)), 
             singleConfig;
         })), config[state] = stateConfig) : config[state] = defaultStateConfig;
     }
@@ -43,14 +43,22 @@ function userAnimationConfig(markName, spec, ctx) {
     }, ctx);
 }
 
-function produceOneByOne(stateConfig, dataIndex) {
-    const {oneByOne: oneByOne, duration: duration} = stateConfig;
+function produceOneByOne(stateConfig, dataIndex, dataCount) {
+    const {oneByOne: oneByOne, duration: duration, delay: delay, delayAfter: delayAfter} = stateConfig;
     return stateConfig.delay = (datum, element, params) => {
-        const _index = dataIndex(datum), _durationTime = (0, type_1.isFunction)(duration) ? duration(datum, element, params) : (0, 
-        type_1.isValidNumber)(duration) ? duration : 0;
-        let _oneByOneTime = (0, type_1.isFunction)(oneByOne) ? oneByOne(datum, element, params) : oneByOne;
-        return !1 === _oneByOneTime ? 0 : (_oneByOneTime = !0 === _oneByOneTime ? 0 : _oneByOneTime, 
-        _index * (_durationTime + _oneByOneTime));
+        const index = dataIndex(datum), durationTime = (0, type_1.isFunction)(duration) ? duration(datum, element, params) : (0, 
+        type_1.isValidNumber)(duration) ? duration : 0, userDelay = (0, type_1.isFunction)(delay) ? delay(datum, element, params) : (0, 
+        type_1.isValidNumber)(delay) ? delay : 0;
+        let oneByOneTime = (0, type_1.isFunction)(oneByOne) ? oneByOne(datum, element, params) : oneByOne;
+        return !1 === oneByOneTime ? userDelay : (oneByOneTime = !0 === oneByOneTime ? 0 : oneByOneTime, 
+        userDelay + index * (durationTime + oneByOneTime));
+    }, stateConfig.delayAfter = (datum, element, params) => {
+        const index = dataIndex(datum), durationTime = (0, type_1.isFunction)(duration) ? duration(datum, element, params) : (0, 
+        type_1.isValidNumber)(duration) ? duration : 0, userDelayAfter = (0, type_1.isFunction)(delayAfter) ? delayAfter(datum, element, params) : (0, 
+        type_1.isValidNumber)(delayAfter) ? delayAfter : 0;
+        let oneByOneTime = (0, type_1.isFunction)(oneByOne) ? oneByOne(datum, element, params) : oneByOne;
+        if (!1 === oneByOneTime) return userDelayAfter;
+        return oneByOneTime = !0 === oneByOneTime ? 0 : oneByOneTime, userDelayAfter + ((dataCount ? dataCount() : element.mark.elements.length) - index) * (durationTime + oneByOneTime);
     }, delete stateConfig.oneByOne, stateConfig;
 }
 

package/cjs/animation/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/animation/utils.ts"],"names":[],"mappings":"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","file":"utils.js","sourcesContent":["import type { IAnimationConfig } from '@visactor/vgrammar-core';\n// eslint-disable-next-line no-duplicate-imports\nimport type {\n  IElement,\n  IAnimationTypeConfig,\n  IStateAnimationConfig,\n  IAnimationTimeline\n} from '@visactor/vgrammar-core';\nimport type { MarkAnimationSpec, IAnimationState } from './interface';\nimport type { IStateAnimateSpec, IAnimationSpec } from './spec';\nimport { isFunction, isValidNumber } from '../util/type';\nimport { DEFAULT_DATA_INDEX } from '../constant';\nimport { DEFAULT_ANIMATION_CONFIG } from './config';\nimport { cloneDeep, isArray, isObject, isValid } from '@visactor/vutils';\nimport type { SeriesMarkNameEnum } from '../series/interface/type';\nimport { mergeSpec } from '../util/spec/merge-spec';\nimport type { ISeries } from '../series';\nimport type { ISeriesSpec } from '../typings';\nimport type { ISeriesMarkAttributeContext } from '../compile/mark';\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  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    }\n    // FIXME: 用来控制当动画状态发生变更时是否清除正在执行的动画。\n    // 现在 vrender 对于同一个视觉通道的 tween 不会做覆盖的处理。若不做动画清空同时 exit 动画比 update 动画时间长的情况下，效果会不正确\n    if (state === 'exit') {\n      defaultStateConfig.forEach(exitConfig => {\n        exitConfig.controlOptions = { stopWhenStateChange: true };\n      });\n    }\n\n    if (!userConfig?.[state]) {\n      config[state] = defaultStateConfig;\n      continue;\n    }\n\n    // 开始处理用户配置的动画逻辑\n    let stateConfig: IAnimationConfig[];\n    if (isArray(userConfig[state])) {\n      stateConfig = userConfig[state];\n    } else {\n      stateConfig = defaultStateConfig.map((stateConfig, i) => {\n        let singleConfig: IAnimationConfig = mergeSpec(\n          {},\n          defaultStateConfig[i],\n          userConfig[state]\n        ) as IAnimationConfig;\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        return singleConfig;\n      });\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  ctx: ISeriesMarkAttributeContext\n) {\n  const userConfig = {\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  return uniformAnimationConfig(userConfig, ctx);\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 shouldMarkDoMorph(spec: ISeriesSpec & IAnimationSpec<string, string>, markName: string) {\n  if (spec.animation === false) {\n    return false;\n  }\n\n  if (spec.morph?.enable === false) {\n    return false;\n  }\n\n  const appearAnimationEnabled = (spec.animationAppear?.[markName] ?? spec.animationAppear) !== false;\n  const updateAnimationEnabled = (spec.animationUpdate?.[markName] ?? spec.animationUpdate) !== false;\n\n  if (!appearAnimationEnabled || !updateAnimationEnabled) {\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\nexport function uniformAnimationConfig<Preset extends string>(\n  config: Partial<Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>>,\n  ctx: ISeriesMarkAttributeContext\n) {\n  if (!config) {\n    return config;\n  }\n  config = cloneDeep(config);\n  traverseSpec(config, (node: any) => {\n    // 将函数转换为 vchart 代理的函数\n    // 这里可能会传自定义动画的构造函数，不能被代理\n    if (isFunction(node) && node.prototype?.constructor !== node) {\n      const name = (...args: any) => {\n        return node(...args, ctx);\n      };\n      return name;\n    }\n    return node;\n  });\n\n  return config;\n}\n\nfunction traverseSpec(spec: any, transform: (node: any, key: string | number) => any) {\n  if (isArray(spec)) {\n    spec.forEach((i: any, index: number) => {\n      spec[index] = transform(spec[index], index);\n      traverseSpec(spec[index], transform);\n    });\n  } else if (isObject(spec)) {\n    for (const key in spec) {\n      spec[key] = transform(spec[key], key);\n      traverseSpec(spec[key], transform);\n    }\n  }\n}\n\nexport function isAnimationEnabledForSeries(series: ISeries) {\n  return series.getSpec().animation !== false && isValid(series.getRegion().animate);\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-core';\n// eslint-disable-next-line no-duplicate-imports\nimport type {\n  IElement,\n  IAnimationTypeConfig,\n  IStateAnimationConfig,\n  IAnimationTimeline\n} from '@visactor/vgrammar-core';\nimport type { MarkAnimationSpec, IAnimationState } from './interface';\nimport type { IStateAnimateSpec, IAnimationSpec } from './spec';\nimport { isFunction, isValidNumber } from '../util/type';\nimport { DEFAULT_DATA_INDEX } from '../constant';\nimport { DEFAULT_ANIMATION_CONFIG } from './config';\nimport { cloneDeep, isArray, isObject, isValid } from '@visactor/vutils';\nimport type { SeriesMarkNameEnum } from '../series/interface/type';\nimport { mergeSpec } from '../util/spec/merge-spec';\nimport type { ISeries } from '../series';\nimport type { ISeriesSpec } from '../typings';\nimport type { ISeriesMarkAttributeContext } from '../compile/mark';\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    dataCount: () => number;\n  }\n) {\n  const config = {} as MarkAnimationSpec;\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    }\n    // FIXME: 用来控制当动画状态发生变更时是否清除正在执行的动画。\n    // 现在 vrender 对于同一个视觉通道的 tween 不会做覆盖的处理。若不做动画清空同时 exit 动画比 update 动画时间长的情况下，效果会不正确\n    if (state === 'exit') {\n      defaultStateConfig.forEach(exitConfig => {\n        exitConfig.controlOptions = { stopWhenStateChange: true };\n      });\n    }\n\n    if (!userConfig?.[state]) {\n      config[state] = defaultStateConfig;\n      continue;\n    }\n\n    // 开始处理用户配置的动画逻辑\n    let stateConfig: IAnimationConfig[];\n    if (isArray(userConfig[state])) {\n      stateConfig = userConfig[state];\n    } else {\n      stateConfig = defaultStateConfig.map((stateConfig, i) => {\n        let singleConfig: IAnimationConfig = mergeSpec(\n          {},\n          defaultStateConfig[i],\n          userConfig[state]\n        ) as IAnimationConfig;\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(\n            singleConfig as IAnimationTypeConfig,\n            params?.dataIndex ?? defaultDataIndex,\n            params?.dataCount\n          );\n        }\n        return singleConfig;\n      });\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  ctx: ISeriesMarkAttributeContext\n) {\n  const userConfig = {\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  return uniformAnimationConfig(userConfig, ctx);\n}\n\n/**\n * oneByOne\n */\nfunction produceOneByOne(\n  stateConfig: IAnimationTypeConfig,\n  dataIndex: (datum: any) => number,\n  dataCount?: () => number\n) {\n  const { oneByOne, duration, delay, delayAfter } = 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    const userDelay = isFunction(delay) ? delay(datum, element, params) : isValidNumber(delay) ? delay : 0;\n    let oneByOneTime = isFunction(oneByOne) ? oneByOne(datum, element, params) : oneByOne;\n    if (oneByOneTime === false) {\n      return userDelay;\n    }\n    oneByOneTime = oneByOneTime === true ? 0 : oneByOneTime;\n    return userDelay + index * (durationTime + oneByOneTime);\n  };\n  stateConfig.delayAfter = (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    const userDelayAfter = isFunction(delayAfter)\n      ? delayAfter(datum, element, params)\n      : isValidNumber(delayAfter)\n      ? delayAfter\n      : 0;\n    let oneByOneTime = isFunction(oneByOne) ? oneByOne(datum, element, params) : oneByOne;\n    if (oneByOneTime === false) {\n      return userDelayAfter;\n    }\n    const indexCount = dataCount ? dataCount() : element.mark.elements.length;\n    oneByOneTime = oneByOneTime === true ? 0 : oneByOneTime;\n    return userDelayAfter + (indexCount - 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 shouldMarkDoMorph(spec: ISeriesSpec & IAnimationSpec<string, string>, markName: string) {\n  if (spec.animation === false) {\n    return false;\n  }\n\n  if (spec.morph?.enable === false) {\n    return false;\n  }\n\n  const appearAnimationEnabled = (spec.animationAppear?.[markName] ?? spec.animationAppear) !== false;\n  const updateAnimationEnabled = (spec.animationUpdate?.[markName] ?? spec.animationUpdate) !== false;\n\n  if (!appearAnimationEnabled || !updateAnimationEnabled) {\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\nexport function uniformAnimationConfig<Preset extends string>(\n  config: Partial<Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>>,\n  ctx: ISeriesMarkAttributeContext\n) {\n  if (!config) {\n    return config;\n  }\n  config = cloneDeep(config);\n  traverseSpec(config, (node: any) => {\n    // 将函数转换为 vchart 代理的函数\n    // 这里可能会传自定义动画的构造函数，不能被代理\n    if (isFunction(node) && node.prototype?.constructor !== node) {\n      const name = (...args: any) => {\n        return node(...args, ctx);\n      };\n      return name;\n    }\n    return node;\n  });\n\n  return config;\n}\n\nfunction traverseSpec(spec: any, transform: (node: any, key: string | number) => any) {\n  if (isArray(spec)) {\n    spec.forEach((i: any, index: number) => {\n      spec[index] = transform(spec[index], index);\n      traverseSpec(spec[index], transform);\n    });\n  } else if (isObject(spec)) {\n    for (const key in spec) {\n      spec[key] = transform(spec[key], key);\n      traverseSpec(spec[key], transform);\n    }\n  }\n}\n\nexport function isAnimationEnabledForSeries(series: ISeries) {\n  return series.getSpec().animation !== false && isValid(series.getRegion().animate);\n}\n"]}

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

@@ -1,5 +1,5 @@
-import { CartesianChart } from '../cartesian/cartesian';
-export declare class Bar3dChart extends CartesianChart {
+import { BarChart } from './bar';
+export declare class Bar3dChart extends BarChart {
     static readonly type: string;
     static readonly view: string;
     readonly type: string;

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

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerBar3dChart = exports.Bar3dChart = void 0;
 
-const bar_3d_1 = require("../../series/bar/bar-3d"), type_1 = require("../../series/interface/type"), cartesian_1 = require("../cartesian/cartesian"), type_2 = require("../interface/type"), factory_1 = require("../../core/factory");
+const bar_3d_1 = require("../../series/bar/bar-3d"), type_1 = require("../../series/interface/type"), type_2 = require("../interface/type"), factory_1 = require("../../core/factory"), bar_1 = require("./bar");
 
-class Bar3dChart extends cartesian_1.CartesianChart {
+class Bar3dChart extends bar_1.BarChart {
     constructor() {
         super(...arguments), this.type = type_2.ChartTypeEnum.bar3d, this.seriesType = type_1.SeriesTypeEnum.bar3d;
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/chart/bar/bar-3d.ts"],"names":[],"mappings":";;;AAAA,oDAA8D;AAC9D,sDAA6D;AAC7D,sDAAwD;AACxD,4CAAkD;AAElD,gDAA6C;AAE7C,MAAa,UAAW,SAAQ,0BAAc;IAA9C;;QAGW,SAAI,GAAW,oBAAa,CAAC,KAAK,CAAC;QACnC,eAAU,GAAW,qBAAc,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,oBAAa,CAAC,KAAK,CAAC;AACnC,eAAI,GAAW,eAAe,CAAC;AAe1C,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,IAAA,4BAAmB,GAAE,CAAC;IACtB,iBAAO,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AACrD,CAAC,CAAC;AAHW,QAAA,kBAAkB,sBAG7B","file":"bar-3d.js","sourcesContent":["import { registerBar3dSeries } from '../../series/bar/bar-3d';\nimport { SeriesTypeEnum } from '../../series/interface/type';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface/type';\nimport type { IBar3dChartSpec } from './interface';\nimport { Factory } from '../../core/factory';\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\nexport const registerBar3dChart = () => {\n  registerBar3dSeries();\n  Factory.registerChart(Bar3dChart.type, Bar3dChart);\n};\n"]}
+{"version":3,"sources":["../src/chart/bar/bar-3d.ts"],"names":[],"mappings":";;;AAAA,oDAA8D;AAC9D,sDAA6D;AAE7D,4CAAkD;AAElD,gDAA6C;AAC7C,+BAAiC;AAEjC,MAAa,UAAW,SAAQ,cAAQ;IAAxC;;QAGW,SAAI,GAAW,oBAAa,CAAC,KAAK,CAAC;QACnC,eAAU,GAAW,qBAAc,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,oBAAa,CAAC,KAAK,CAAC;AACnC,eAAI,GAAW,eAAe,CAAC;AAe1C,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,IAAA,4BAAmB,GAAE,CAAC;IACtB,iBAAO,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AACrD,CAAC,CAAC;AAHW,QAAA,kBAAkB,sBAG7B","file":"bar-3d.js","sourcesContent":["import { registerBar3dSeries } from '../../series/bar/bar-3d';\nimport { SeriesTypeEnum } from '../../series/interface/type';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface/type';\nimport type { IBar3dChartSpec } from './interface';\nimport { Factory } from '../../core/factory';\nimport { BarChart } from './bar';\n\nexport class Bar3dChart extends BarChart {\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\nexport const registerBar3dChart = () => {\n  registerBar3dSeries();\n  Factory.registerChart(Bar3dChart.type, Bar3dChart);\n};\n"]}

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

@@ -109,7 +109,7 @@ export declare class BaseChart extends CompilableBase implements IChart {
     updateGlobalScaleDomain(): void;
     updateGlobalScale(result: IUpdateSpecResult): void;
     updateGlobalScaleTheme(): void;
-    updateSpec(spec: any, morphConfig?: IMorphConfig): {
+    updateSpec(spec: any): {
         change: boolean;
         reMake: boolean;
         reRender: boolean;
@@ -125,10 +125,7 @@ export declare class BaseChart extends CompilableBase implements IChart {
     protected isValidSeries(seriesType: string): boolean;
     protected _getDefaultSeriesSpec(spec: any): any;
     private _updateLayoutRect;
-    setCurrentTheme(reInit?: boolean): void;
-    protected setRegionTheme(reInit?: boolean): void;
-    protected setComponentTheme(reInit?: boolean): void;
-    protected setSeriesTheme(reInit?: boolean): void;
+    setCurrentTheme(): void;
     clear(): void;
     compile(): void;
     afterCompile(): void;

package/cjs/chart/base-chart.js

@@ -1,31 +1,5 @@
 "use strict";
 
-var __awaiter = this && this.__awaiter || function(thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))((function(resolve, reject) {
-        function fulfilled(value) {
-            try {
-                step(generator.next(value));
-            } catch (e) {
-                reject(e);
-            }
-        }
-        function rejected(value) {
-            try {
-                step(generator.throw(value));
-            } catch (e) {
-                reject(e);
-            }
-        }
-        function step(result) {
-            var value;
-            result.done ? resolve(result.value) : (value = result.value, value instanceof P ? value : new P((function(resolve) {
-                resolve(value);
-            }))).then(fulfilled, rejected);
-        }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    }));
-};
-
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseChart = void 0;
@@ -188,6 +162,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
             util_1.isValid)(spec.regionIndex) && (region = this.getRegionsInIndex([ spec.regionIndex ])[0]), 
             region || (region = this._regions[0]), !region) return;
             const series = factory_1.Factory.createSeries(spec.type, spec, Object.assign(Object.assign({}, this._modelOption), {
+                type: spec.type,
                 region: region,
                 specIndex: index,
                 globalScale: this._globalScale,
@@ -201,6 +176,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
     }
     _createComponent(Component, spec) {
         const component = Component.createComponent(spec, Object.assign(Object.assign({}, this._modelOption), {
+            type: Component.type,
             getAllRegions: this.getAllRegions,
             getRegionsInIndex: this.getRegionsInIndex,
             getRegionsInIds: this.getRegionsInIds,
@@ -393,7 +369,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
         colorSpec.rangeTheme && (colorSpec.range = (0, util_2.getDataScheme)(colorScheme), 
         this._globalScale.getScale("color").range(colorSpec.range));
     }
-    updateSpec(spec, morphConfig) {
+    updateSpec(spec) {
         const result = {
             change: !1,
             reMake: !1,
@@ -401,7 +377,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
             reSize: !1,
             reCompile: !1
         };
-        if (this.setLayoutTag(!0, morphConfig), spec.type !== this.type) return result.reMake = !0, 
+        if (this.setLayoutTag(!0, null, !1), spec.type !== this.type) return result.reMake = !0, 
         result;
         this.transformSpec(spec);
         const currentKeys = Object.keys(this._spec).sort(), nextKeys = Object.keys(spec).sort();
@@ -502,27 +478,13 @@ class BaseChart extends compilable_base_1.CompilableBase {
         this._layoutRect.height = viewRect.height - this.padding.top - this.padding.bottom, 
         this._layoutRect.x = this.padding.left, this._layoutRect.y = this.padding.top, this._event.emit(constant_1.ChartEvent.layoutRectUpdate, {});
     }
-    setCurrentTheme(reInit = !0) {
+    setCurrentTheme() {
         this.updateChartConfig({
             change: !0,
             reMake: !1
-        }, this._spec), this.setLayoutTag(!0), this.transformSpec(this._spec), this.updateGlobalScaleTheme(), 
-        this.setRegionTheme(reInit), this.setComponentTheme(reInit), this.setSeriesTheme(reInit);
-    }
-    setRegionTheme(reInit = !0) {
-        this._regions.forEach((r => __awaiter(this, void 0, void 0, (function*() {
-            yield r.setCurrentTheme(reInit);
-        }))));
-    }
-    setComponentTheme(reInit = !0) {
-        this._components.forEach((c => __awaiter(this, void 0, void 0, (function*() {
-            yield c.setCurrentTheme(reInit);
-        }))));
-    }
-    setSeriesTheme(reInit = !0) {
-        this._series.forEach((s => __awaiter(this, void 0, void 0, (function*() {
-            yield s.setCurrentTheme(reInit);
-        }))));
+        }, this._spec), this.setLayoutTag(!0, null, !1), this.transformSpec(this._spec), 
+        this.updateGlobalScaleTheme(), this._regions.forEach((r => r.setCurrentTheme())), 
+        this._components.forEach((c => c.setCurrentTheme())), this._series.forEach((s => s.setCurrentTheme()));
     }
     clear() {
         this.getAllModels().forEach((i => {