@visactor/vchart 1.7.0-alpha.0 → 1.7.0-alpha.1

package/esm/core/expression-function.js

@@ -0,0 +1,22 @@
+export class ExpressionFunction {
+    static instance() {
+        return ExpressionFunction.instance_ || (ExpressionFunction.instance_ = new ExpressionFunction), 
+        ExpressionFunction.instance_;
+    }
+    constructor() {
+        this.functions = {};
+    }
+    registerFunction(name, fun) {
+        name && fun && (this.functions[name] = fun);
+    }
+    unregisterFunction(name) {
+        name && delete this.functions[name];
+    }
+    getFunction(name) {
+        return this.functions[name] || null;
+    }
+    getFunctionNameList() {
+        return Object.keys(this.functions);
+    }
+}
+//# sourceMappingURL=expression-function.js.map

package/esm/core/expression-function.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/core/expression-function.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,kBAAkB;IAM7B,MAAM,CAAC,QAAQ;QACb,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE;YACjC,kBAAkB,CAAC,SAAS,GAAG,IAAI,kBAAkB,EAAE,CAAC;SACzD;QACD,OAAO,kBAAkB,CAAC,SAAS,CAAC;IACtC,CAAC;IAED;QACE,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;IACtB,CAAC;IAGD,gBAAgB,CAAC,IAAY,EAAE,GAAa;QAC1C,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE;YACjB,OAAO;SACR;QACD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;IAC7B,CAAC;IAGD,kBAAkB,CAAC,IAAY;QAC7B,IAAI,CAAC,IAAI,EAAE;YACT,OAAO;SACR;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAGD,WAAW,CAAC,IAAY;QACtB,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;IACtC,CAAC;IAGD,mBAAmB;QACjB,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACrC,CAAC;CACF","file":"expression-function.js","sourcesContent":["export class ExpressionFunction {\n  functions: { [key: string]: Function };\n\n  static instance_: ExpressionFunction;\n\n  // 单例模式\n  static instance(): ExpressionFunction {\n    if (!ExpressionFunction.instance_) {\n      ExpressionFunction.instance_ = new ExpressionFunction();\n    }\n    return ExpressionFunction.instance_;\n  }\n\n  constructor() {\n    this.functions = {};\n  }\n\n  // 注册函数\n  registerFunction(name: string, fun: Function) {\n    if (!name || !fun) {\n      return;\n    }\n    this.functions[name] = fun;\n  }\n\n  // 注销函数\n  unregisterFunction(name: string) {\n    if (!name) {\n      return;\n    }\n    delete this.functions[name];\n  }\n\n  // 获取函数\n  getFunction(name: string): Function | null {\n    return this.functions[name] || null;\n  }\n\n  // 获取函数名列表\n  getFunctionNameList(): string[] | null {\n    return Object.keys(this.functions);\n  }\n}\n"]}

package/esm/core/index.d.ts

@@ -1,12 +1,13 @@
 import { VChart } from './vchart';
 import { Factory } from './factory';
 export { VChart, Factory };
-export declare const version = "1.7.0-alpha.0";
+export declare const version = "1.7.0-alpha.1";
 export type { IVChart } from './interface';
 export type { IStateSpec, StateValueType } from '../compile/mark';
 export * from '../typings/spec/common';
 export * from '../event/interface';
 export * from '../theme/interface';
+export * from '../constant';
 export * from '../typings/spec/index';
 export * from '../theme/index';
 export { vglobal } from '@visactor/vrender-core';

package/esm/core/index.js

@@ -4,7 +4,7 @@ import { Factory } from "./factory";
 
 export { VChart, Factory };
 
-export const version = "1.7.0-alpha.0";
+export const version = "1.7.0-alpha.1";
 
 export * from "../typings/spec/common";
 
@@ -12,6 +12,8 @@ export * from "../event/interface";
 
 export * from "../theme/interface";
 
+export * from "../constant";
+
 export * from "../typings/spec/index";
 
 export * from "../theme/index";

package/esm/core/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAG3B,MAAM,CAAC,MAAM,OAAO,GAAG,eAAe,CAAC;AAMvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AAKnC,cAAc,uBAAuB,CAAC;AAGtC,cAAc,gBAAgB,CAAC;AAG/B,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC","file":"index.js","sourcesContent":["/**\n * @description The core module of VChart, containing the necessary interfaces for using VChart.\n */\n\nimport { VChart } from './vchart';\nimport { Factory } from './factory';\n\nexport { VChart, Factory };\n\n// export the version\nexport const version = \"1.7.0-alpha.0\";\n\n// export necessary types\nexport type { IVChart } from './interface';\nexport type { IStateSpec, StateValueType } from '../compile/mark';\n\nexport * from '../typings/spec/common';\nexport * from '../event/interface';\nexport * from '../theme/interface';\n\n/**\n * spec\n */\nexport * from '../typings/spec/index';\n\n// theme\nexport * from '../theme/index';\n\n// vrender\nexport { vglobal } from '@visactor/vrender-core';\n"]}
+{"version":3,"sources":["../src/core/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAG3B,MAAM,CAAC,MAAM,OAAO,GAAG,eAAe,CAAC;AAMvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAK5B,cAAc,uBAAuB,CAAC;AAGtC,cAAc,gBAAgB,CAAC;AAG/B,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC","file":"index.js","sourcesContent":["/**\n * @description The core module of VChart, containing the necessary interfaces for using VChart.\n */\n\nimport { VChart } from './vchart';\nimport { Factory } from './factory';\n\nexport { VChart, Factory };\n\n// export the version\nexport const version = \"1.7.0-alpha.1\";\n\n// export necessary types\nexport type { IVChart } from './interface';\nexport type { IStateSpec, StateValueType } from '../compile/mark';\n\nexport * from '../typings/spec/common';\nexport * from '../event/interface';\nexport * from '../theme/interface';\nexport * from '../constant';\n\n/**\n * spec\n */\nexport * from '../typings/spec/index';\n\n// theme\nexport * from '../theme/index';\n\n// vrender\nexport { vglobal } from '@visactor/vrender-core';\n"]}

package/esm/core/interface.d.ts

@@ -33,6 +33,7 @@ export interface IVChart {
     }[]) => Promise<IVChart>;
     updateDataSync: (id: StringOrNumber, data: Datum[], options?: IParserOptions) => IVChart;
     updateSpec: (spec: ISpec, forceMerge?: boolean, morphConfig?: IMorphConfig) => Promise<IVChart>;
+    updateSpecSync: (spec: ISpec, forceMerge?: boolean, morphConfig?: IMorphConfig) => void;
     updateModelSpecSync: (filter: string | {
         type: string;
         index: number;
@@ -81,6 +82,10 @@ export interface IVChart {
     stopAnimation: () => void;
     pauseAnimation: () => void;
     resumeAnimation: () => void;
+    registerFunction: (key: string, fun: Function) => void;
+    unregisterFunction: (key: string) => void;
+    getFunction: (key: string) => Function | null;
+    getFunctionList: () => string[] | null;
 }
 export interface IGlobalConfig {
     uniqueTooltip?: boolean;

package/esm/core/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { DataSet } from '@visactor/vdataset';\n\nimport type { IParserOptions } from '@visactor/vdataset/es/parser';\nimport type {\n  Datum,\n  IMarkStateSpec,\n  IPoint,\n  IRegionQuerier,\n  IShowTooltipOption,\n  ISpec,\n  ITooltipHandler,\n  Maybe,\n  MaybeArray,\n  StringOrNumber\n} from '../typings';\nimport type { IMorphConfig } from '../animation/spec';\nimport type { IBoundsLike } from '@visactor/vutils';\nimport type { EventCallback, EventParams, EventQuery, EventType } from '../event/interface';\nimport type { IMark } from '../mark/interface';\nimport type { ISeries } from '../series/interface/series';\nimport type { ITheme } from '../theme';\nimport type { IComponent } from '../component/interface';\nimport type { LayoutCallBack } from '../layout/interface';\nimport type { Compiler } from '../compile/compiler';\nimport type { IChart } from '../chart/interface';\nimport type { IGradientColor, Stage } from '@visactor/vrender-core';\nimport type { IThemeColorScheme } from '../theme/color-scheme/interface';\n\nexport type DataLinkSeries = {\n  /**\n   * 关联的系列 id\n   * the binding series id\n   */\n  seriesId?: StringOrNumber;\n  /**\n   * 关联的系列索引\n   * the binding series index\n   */\n  seriesIndex?: number;\n};\n\nexport type DataLinkAxis = {\n  /**\n   * 关联的轴 id，目前仅支持直角坐标轴\n   * the binding axis id\n   */\n  axisId?: StringOrNumber;\n  /**\n   * 关联的轴索引，目前仅支持直角坐标轴\n   * the binding axis index\n   */\n  axisIndex?: number;\n};\n\nexport interface IVChart {\n  readonly id: number;\n\n  /**\n   * **同步**渲染图表。\n   * @param morphConfig 图表 morph 动画配置，可选\n   * @returns VChart 实例\n   */\n  renderSync: (morphConfig?: IMorphConfig) => IVChart;\n\n  /**\n   * **异步**渲染图表。\n   * @async\n   * @param morphConfig 图表 morph 动画配置，可选\n   * @returns VChart 实例\n   */\n  renderAsync: (morphConfig?: IMorphConfig) => Promise<IVChart>;\n\n  /**\n   * **异步**更新数据。\n   * @param id 数据 id\n   * @param data 数据值\n   * @param options 数据参数\n   * @returns VChart 实例\n   */\n  updateData: (id: StringOrNumber, data: Datum[] | string, options?: IParserOptions) => Promise<IVChart>;\n\n  /**\n   * **异步**批量更新数据。\n   * @param list 待更新的数据列表\n   * @returns VChart 实例\n   */\n  updateDataInBatches: (list: { id: string; data: Datum[]; options?: IParserOptions }[]) => Promise<IVChart>;\n\n  /**\n   * **同步**更新数据。\n   * @param id 数据 id\n   * @param data 数据值\n   * @param options 数据参数\n   * @returns VChart 实例\n   */\n  updateDataSync: (id: StringOrNumber, data: Datum[], options?: IParserOptions) => IVChart;\n\n  /**\n   * **异步**spec 更新。\n   * @param spec\n   * @param forceMerge\n   * @returns\n   */\n  updateSpec: (spec: ISpec, forceMerge?: boolean, morphConfig?: IMorphConfig) => Promise<IVChart>;\n\n  /**\n   * **同步方法** 模块 spec 更新\n   * @param filter\n   * @param spec\n   * @param forceMerge\n   * @returns\n   * @sync 1.4.0\n   */\n  updateModelSpecSync: (\n    filter: string | { type: string; index: number },\n    spec: unknown,\n    forceMerge?: boolean,\n    morphConfig?: IMorphConfig\n  ) => IVChart;\n\n  /**\n   * **异步方法** 模块 spec 更新\n   * @param filter\n   * @param spec\n   * @param forceMerge\n   * @returns\n   * @sync 1.4.0\n   */\n  updateModelSpec: (\n    filter: string | { type: string; index: number },\n    spec: unknown,\n    forceMerge?: boolean,\n    morphConfig?: IMorphConfig\n  ) => Promise<IVChart>;\n\n  /**\n   * 更新绘制区域。\n   * @param viewBox 绘制区域\n   * @param reRender 是否重新渲染，默认为 true\n   * @returns\n   */\n  updateViewBox: (viewBox: IBoundsLike, reRender?: boolean) => IVChart;\n\n  /**\n   * **异步方法**，图表尺寸更新方法。\n   * @param width 宽度\n   * @param height 高度\n   * @returns VChart 当前实例\n   */\n  resize: (width: number, height: number) => Promise<IVChart>;\n\n  /**\n   * 销毁图表。\n   */\n  release: () => void;\n\n  /**\n   * 事件监听\n   */\n  on: ((eType: EventType, handler: EventCallback<EventParams>) => void) &\n    ((eType: EventType, query: EventQuery, handler: EventCallback<EventParams>) => void);\n  off: (eType: EventType, handler?: EventCallback<EventParams>) => void;\n\n  /**\n   * 更新或设置图元状态。\n   * @param state 状态筛选器\n   * @param filter 筛选器\n   */\n  updateState: (\n    state: Record<string, Omit<IMarkStateSpec<unknown>, 'style'>>,\n    filter?: (series: ISeries, mark: IMark, stateKey: string) => boolean //series + mark 筛选\n  ) => void;\n\n  /**\n   * 更新图元选中状态。\n   * @param datum hover 图元数据\n   * @param filter 筛选器 用来筛选系列与mark\n   * @param region region 筛选器\n   */\n  setSelected: (\n    datum: MaybeArray<any> | null,\n    filter?: (series: ISeries, mark: IMark) => boolean,\n    region?: IRegionQuerier\n  ) => void;\n\n  /**\n   * 更新图元 hover 状态\n   * @param datum hover 图元数据\n   * @param filter 筛选器 用来筛选系列与mark\n   * @param region region 筛选器\n   */\n  setHovered: (\n    datum: MaybeArray<Datum> | null,\n    filter?: (series: ISeries, mark: IMark) => boolean,\n    region?: IRegionQuerier\n  ) => void;\n\n  /**\n   * 获取当前主题，会返回完整的主题配置（只能获取用户通过`setCurrentTheme`方法设置过的主题，默认值为`ThemeManager`统一设置的主题）\n   * */\n  getCurrentTheme: () => ITheme;\n\n  /**\n   * 获取当前主题名称（只能获取用户通过`setCurrentTheme`方法设置过的主题，默认值为`ThemeManager`统一设置的主题）\n   */\n  getCurrentThemeName: () => string;\n\n  /**\n   * **异步方法**， 设置当前主题。\n   * @param name 主题名称\n   * @returns\n   */\n  setCurrentTheme: (name: string) => Promise<IVChart>;\n\n  /**\n   * 自定义 TooltipHandler。\n   * @param tooltipHandler\n   */\n  setTooltipHandler: (tooltipHandler: ITooltipHandler) => void;\n\n  /**\n   * 获取用户定义的 TooltipHandler\n   * @returns ITooltipHandler\n   */\n  getTooltipHandlerByUser: () => ITooltipHandler | undefined;\n\n  /**\n   * 获取 TooltipHandler\n   * @returns\n   */\n  getTooltipHandler: () => ITooltipHandler | undefined;\n\n  /**\n   * 手动调用展示 tooltip\n   * @param datum 原始数据\n   * @param options\n   * @returns\n   */\n  showTooltip: (datum: Datum, options: IShowTooltipOption) => boolean;\n\n  /**\n   * 手动调用，关闭 tooltip\n   * @returns\n   */\n  hideTooltip: () => boolean;\n\n  // 图例相关 api\n  /**\n   * 根据图例组件 id 获取图例数据\n   * @param id 组件 id\n   * @returns\n   */\n  getLegendDataById: (id: string) => Datum[];\n\n  /**\n   * 根据图例组件索引获取图例数据\n   * @param index 图例索引，默认为 0\n   * @returns\n   */\n  getLegendDataByIndex: (index?: number) => Datum[];\n\n  /**\n   * 根据图例组件 id 获取当前图例的选中项\n   * @param id 组件 id\n   * @returns\n   */\n  getLegendSelectedDataById: (id: string) => StringOrNumber[];\n\n  /**\n   * 根据图例组件索引获取当前图例的选中项\n   * @param index 图例索引，默认为 0\n   * @returns\n   */\n  getLegendSelectedDataByIndex: (index?: number) => StringOrNumber[];\n\n  /**\n   * 根据图例组件 id 更新图例选中数据\n   * @param id\n   * @returns\n   */\n  setLegendSelectedDataById: (id: string, selectedData: StringOrNumber[]) => void;\n\n  /**\n   * 根据图例组件索引更新图例选中数据\n   * @param index 图例索引，默认为 0\n   * @returns\n   */\n  setLegendSelectedDataByIndex: (index: number, selectedData: StringOrNumber[]) => void;\n\n  /**\n   * **异步方法**返回一个包含图片展示的 data URI。\n   * @returns data URI\n   */\n  getDataURL: () => Promise<any>;\n\n  /**\n   * **异步方法** 导出图表图片，只支持浏览器端。\n   * @param name 保存的图片名称\n   * @returns\n   */\n  exportImg: (name?: string) => Promise<void>;\n\n  /**\n   * 导出绘制了图表内容的 canvas\n   * @returns HTMLCanvasElement\n   * @since 1.5.2\n   */\n  exportCanvas: () => HTMLCanvasElement | undefined;\n\n  /**\n   * 目前仅支持 node 环境，用于 node 端的图片导出\n   * @returns\n   */\n  getImageBuffer: () => void;\n  /**\n   * 设置自定义布局\n   */\n  setLayout: (layout: LayoutCallBack) => void;\n  /**\n   * 强制重新布局\n   */\n  reLayout: () => void;\n\n  /**\n   * 获取编译器实例\n   * @returns\n   */\n  getCompiler: () => Compiler;\n\n  /**\n   * Get the chart instance\n   * 获取 Chart 图表实例。\n   * @returns Chart 实例\n   */\n  getChart: () => Maybe<IChart>;\n\n  /**\n   * Get the renderer instance.\n   * 获取渲染引擎实例。\n   * @returns the instance of VRender Stage\n   */\n  getStage: () => Stage;\n\n  /**\n   * 获取 canvas dom\n   * @returns HTMLCanvasElement | undefined\n   */\n  getCanvas: () => HTMLCanvasElement | undefined;\n\n  /**\n   * 获取图表的 dom 容器\n   * @returns\n   */\n  getContainer: () => Maybe<HTMLElement>;\n\n  /**\n   * 获取图表所有的组件实例\n   * @returns 组件实例\n   */\n  getComponents: () => IComponent[];\n\n  /**\n   * 获取图表的 DataSet 实例\n   * @returns DataSet 实例\n   */\n  getDataSet: () => Maybe<DataSet>;\n\n  // 数据转换相关的 api\n  /**\n   * Convert the data to coordinate position\n   * @param datum the datum to convert\n   * @param dataLinkInfo the data link info, could be seriesId or seriesIndex, default is { seriesIndex: 0 }\n   * @param isRelativeToCanvas 是否相对画布坐标，默认为 false Whether relative to canvas coordinates, default is false\n   * @returns\n   */\n  convertDatumToPosition: (datum: Datum, dataLinkInfo?: DataLinkSeries, isRelativeToCanvas?: boolean) => IPoint | null;\n\n  /**\n   * Convert the value to coordinate position\n   * @param value number | [number, number], the value to convert\n   * @param dataLinkInfo the data link info, could be seriesId,seriesIndex,axisId,axisIndex\n   * @param isRelativeToCanvas 是否相对画布坐标，默认为 false Whether relative to canvas coordinates, default is false\n   * returns\n   */\n  convertValueToPosition: ((\n    value: StringOrNumber,\n    dataLinkInfo: DataLinkAxis,\n    isRelativeToCanvas?: boolean\n  ) => number | null) &\n    ((\n      value: [StringOrNumber, StringOrNumber],\n      dataLinkInfo: DataLinkSeries,\n      isRelativeToCanvas?: boolean\n    ) => IPoint | null);\n\n  /** 停止正在进行的所有动画 */\n  stopAnimation: () => void;\n\n  /** 暂停正在进行的所有动画 */\n  pauseAnimation: () => void;\n\n  /** 恢复暂停时正在进行的所有动画 */\n  resumeAnimation: () => void;\n}\n\nexport interface IGlobalConfig {\n  /** 是否全局显示唯一 tooltip */\n  uniqueTooltip?: boolean;\n  /** 是否监测图表 dom 变化自动 release */\n  // TODO\n  // autoRelease?: boolean;\n}\n\n/** 图表层级的主题 */\nexport interface IChartLevelTheme {\n  /** 图表背景色 */\n  background?: string | IGradientColor;\n  /** 图表字体配置 */\n  fontFamily?: string;\n  /** 全局色板 */\n  colorScheme?: IThemeColorScheme;\n}\n"]}
+{"version":3,"sources":["../src/core/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { DataSet } from '@visactor/vdataset';\n\nimport type { IParserOptions } from '@visactor/vdataset/es/parser';\nimport type {\n  Datum,\n  IMarkStateSpec,\n  IPoint,\n  IRegionQuerier,\n  IShowTooltipOption,\n  ISpec,\n  ITooltipHandler,\n  Maybe,\n  MaybeArray,\n  StringOrNumber\n} from '../typings';\nimport type { IMorphConfig } from '../animation/spec';\nimport type { IBoundsLike } from '@visactor/vutils';\nimport type { EventCallback, EventParams, EventQuery, EventType } from '../event/interface';\nimport type { IMark } from '../mark/interface';\nimport type { ISeries } from '../series/interface/series';\nimport type { ITheme } from '../theme';\nimport type { IComponent } from '../component/interface';\nimport type { LayoutCallBack } from '../layout/interface';\nimport type { Compiler } from '../compile/compiler';\nimport type { IChart } from '../chart/interface';\nimport type { IGradientColor, Stage } from '@visactor/vrender-core';\nimport type { IThemeColorScheme } from '../theme/color-scheme/interface';\n\nexport type DataLinkSeries = {\n  /**\n   * 关联的系列 id\n   * the binding series id\n   */\n  seriesId?: StringOrNumber;\n  /**\n   * 关联的系列索引\n   * the binding series index\n   */\n  seriesIndex?: number;\n};\n\nexport type DataLinkAxis = {\n  /**\n   * 关联的轴 id，目前仅支持直角坐标轴\n   * the binding axis id\n   */\n  axisId?: StringOrNumber;\n  /**\n   * 关联的轴索引，目前仅支持直角坐标轴\n   * the binding axis index\n   */\n  axisIndex?: number;\n};\n\nexport interface IVChart {\n  readonly id: number;\n\n  /**\n   * **同步**渲染图表。\n   * @param morphConfig 图表 morph 动画配置，可选\n   * @returns VChart 实例\n   */\n  renderSync: (morphConfig?: IMorphConfig) => IVChart;\n\n  /**\n   * **异步**渲染图表。\n   * @async\n   * @param morphConfig 图表 morph 动画配置，可选\n   * @returns VChart 实例\n   */\n  renderAsync: (morphConfig?: IMorphConfig) => Promise<IVChart>;\n\n  /**\n   * **异步**更新数据。\n   * @param id 数据 id\n   * @param data 数据值\n   * @param options 数据参数\n   * @returns VChart 实例\n   */\n  updateData: (id: StringOrNumber, data: Datum[] | string, options?: IParserOptions) => Promise<IVChart>;\n\n  /**\n   * **异步**批量更新数据。\n   * @param list 待更新的数据列表\n   * @returns VChart 实例\n   */\n  updateDataInBatches: (list: { id: string; data: Datum[]; options?: IParserOptions }[]) => Promise<IVChart>;\n\n  /**\n   * **同步**更新数据。\n   * @param id 数据 id\n   * @param data 数据值\n   * @param options 数据参数\n   * @returns VChart 实例\n   */\n  updateDataSync: (id: StringOrNumber, data: Datum[], options?: IParserOptions) => IVChart;\n\n  /**\n   * **异步**spec 更新。\n   * @param spec\n   * @param forceMerge\n   * @returns\n   */\n  updateSpec: (spec: ISpec, forceMerge?: boolean, morphConfig?: IMorphConfig) => Promise<IVChart>;\n\n  /**\n   * **同步方法**spec 更新。\n   * @param spec\n   * @param forceMerge\n   * @returns\n   */\n  updateSpecSync: (spec: ISpec, forceMerge?: boolean, morphConfig?: IMorphConfig) => void;\n\n  /**\n   * **同步方法** 模块 spec 更新\n   * @param filter\n   * @param spec\n   * @param forceMerge\n   * @returns\n   * @sync 1.4.0\n   */\n  updateModelSpecSync: (\n    filter: string | { type: string; index: number },\n    spec: unknown,\n    forceMerge?: boolean,\n    morphConfig?: IMorphConfig\n  ) => IVChart;\n\n  /**\n   * **异步方法** 模块 spec 更新\n   * @param filter\n   * @param spec\n   * @param forceMerge\n   * @returns\n   * @sync 1.4.0\n   */\n  updateModelSpec: (\n    filter: string | { type: string; index: number },\n    spec: unknown,\n    forceMerge?: boolean,\n    morphConfig?: IMorphConfig\n  ) => Promise<IVChart>;\n\n  /**\n   * 更新绘制区域。\n   * @param viewBox 绘制区域\n   * @param reRender 是否重新渲染，默认为 true\n   * @returns\n   */\n  updateViewBox: (viewBox: IBoundsLike, reRender?: boolean) => IVChart;\n\n  /**\n   * **异步方法**，图表尺寸更新方法。\n   * @param width 宽度\n   * @param height 高度\n   * @returns VChart 当前实例\n   */\n  resize: (width: number, height: number) => Promise<IVChart>;\n\n  /**\n   * 销毁图表。\n   */\n  release: () => void;\n\n  /**\n   * 事件监听\n   */\n  on: ((eType: EventType, handler: EventCallback<EventParams>) => void) &\n    ((eType: EventType, query: EventQuery, handler: EventCallback<EventParams>) => void);\n  off: (eType: EventType, handler?: EventCallback<EventParams>) => void;\n\n  /**\n   * 更新或设置图元状态。\n   * @param state 状态筛选器\n   * @param filter 筛选器\n   */\n  updateState: (\n    state: Record<string, Omit<IMarkStateSpec<unknown>, 'style'>>,\n    filter?: (series: ISeries, mark: IMark, stateKey: string) => boolean //series + mark 筛选\n  ) => void;\n\n  /**\n   * 更新图元选中状态。\n   * @param datum hover 图元数据\n   * @param filter 筛选器 用来筛选系列与mark\n   * @param region region 筛选器\n   */\n  setSelected: (\n    datum: MaybeArray<any> | null,\n    filter?: (series: ISeries, mark: IMark) => boolean,\n    region?: IRegionQuerier\n  ) => void;\n\n  /**\n   * 更新图元 hover 状态\n   * @param datum hover 图元数据\n   * @param filter 筛选器 用来筛选系列与mark\n   * @param region region 筛选器\n   */\n  setHovered: (\n    datum: MaybeArray<Datum> | null,\n    filter?: (series: ISeries, mark: IMark) => boolean,\n    region?: IRegionQuerier\n  ) => void;\n\n  /**\n   * 获取当前主题，会返回完整的主题配置（只能获取用户通过`setCurrentTheme`方法设置过的主题，默认值为`ThemeManager`统一设置的主题）\n   * */\n  getCurrentTheme: () => ITheme;\n\n  /**\n   * 获取当前主题名称（只能获取用户通过`setCurrentTheme`方法设置过的主题，默认值为`ThemeManager`统一设置的主题）\n   */\n  getCurrentThemeName: () => string;\n\n  /**\n   * **异步方法**， 设置当前主题。\n   * @param name 主题名称\n   * @returns\n   */\n  setCurrentTheme: (name: string) => Promise<IVChart>;\n\n  /**\n   * 自定义 TooltipHandler。\n   * @param tooltipHandler\n   */\n  setTooltipHandler: (tooltipHandler: ITooltipHandler) => void;\n\n  /**\n   * 获取用户定义的 TooltipHandler\n   * @returns ITooltipHandler\n   */\n  getTooltipHandlerByUser: () => ITooltipHandler | undefined;\n\n  /**\n   * 获取 TooltipHandler\n   * @returns\n   */\n  getTooltipHandler: () => ITooltipHandler | undefined;\n\n  /**\n   * 手动调用展示 tooltip\n   * @param datum 原始数据\n   * @param options\n   * @returns\n   */\n  showTooltip: (datum: Datum, options: IShowTooltipOption) => boolean;\n\n  /**\n   * 手动调用，关闭 tooltip\n   * @returns\n   */\n  hideTooltip: () => boolean;\n\n  // 图例相关 api\n  /**\n   * 根据图例组件 id 获取图例数据\n   * @param id 组件 id\n   * @returns\n   */\n  getLegendDataById: (id: string) => Datum[];\n\n  /**\n   * 根据图例组件索引获取图例数据\n   * @param index 图例索引，默认为 0\n   * @returns\n   */\n  getLegendDataByIndex: (index?: number) => Datum[];\n\n  /**\n   * 根据图例组件 id 获取当前图例的选中项\n   * @param id 组件 id\n   * @returns\n   */\n  getLegendSelectedDataById: (id: string) => StringOrNumber[];\n\n  /**\n   * 根据图例组件索引获取当前图例的选中项\n   * @param index 图例索引，默认为 0\n   * @returns\n   */\n  getLegendSelectedDataByIndex: (index?: number) => StringOrNumber[];\n\n  /**\n   * 根据图例组件 id 更新图例选中数据\n   * @param id\n   * @returns\n   */\n  setLegendSelectedDataById: (id: string, selectedData: StringOrNumber[]) => void;\n\n  /**\n   * 根据图例组件索引更新图例选中数据\n   * @param index 图例索引，默认为 0\n   * @returns\n   */\n  setLegendSelectedDataByIndex: (index: number, selectedData: StringOrNumber[]) => void;\n\n  /**\n   * **异步方法**返回一个包含图片展示的 data URI。\n   * @returns data URI\n   */\n  getDataURL: () => Promise<any>;\n\n  /**\n   * **异步方法** 导出图表图片，只支持浏览器端。\n   * @param name 保存的图片名称\n   * @returns\n   */\n  exportImg: (name?: string) => Promise<void>;\n\n  /**\n   * 导出绘制了图表内容的 canvas\n   * @returns HTMLCanvasElement\n   * @since 1.5.2\n   */\n  exportCanvas: () => HTMLCanvasElement | undefined;\n\n  /**\n   * 目前仅支持 node 环境，用于 node 端的图片导出\n   * @returns\n   */\n  getImageBuffer: () => void;\n  /**\n   * 设置自定义布局\n   */\n  setLayout: (layout: LayoutCallBack) => void;\n  /**\n   * 强制重新布局\n   */\n  reLayout: () => void;\n\n  /**\n   * 获取编译器实例\n   * @returns\n   */\n  getCompiler: () => Compiler;\n\n  /**\n   * Get the chart instance\n   * 获取 Chart 图表实例。\n   * @returns Chart 实例\n   */\n  getChart: () => Maybe<IChart>;\n\n  /**\n   * Get the renderer instance.\n   * 获取渲染引擎实例。\n   * @returns the instance of VRender Stage\n   */\n  getStage: () => Stage;\n\n  /**\n   * 获取 canvas dom\n   * @returns HTMLCanvasElement | undefined\n   */\n  getCanvas: () => HTMLCanvasElement | undefined;\n\n  /**\n   * 获取图表的 dom 容器\n   * @returns\n   */\n  getContainer: () => Maybe<HTMLElement>;\n\n  /**\n   * 获取图表所有的组件实例\n   * @returns 组件实例\n   */\n  getComponents: () => IComponent[];\n\n  /**\n   * 获取图表的 DataSet 实例\n   * @returns DataSet 实例\n   */\n  getDataSet: () => Maybe<DataSet>;\n\n  // 数据转换相关的 api\n  /**\n   * Convert the data to coordinate position\n   * @param datum the datum to convert\n   * @param dataLinkInfo the data link info, could be seriesId or seriesIndex, default is { seriesIndex: 0 }\n   * @param isRelativeToCanvas 是否相对画布坐标，默认为 false Whether relative to canvas coordinates, default is false\n   * @returns\n   */\n  convertDatumToPosition: (datum: Datum, dataLinkInfo?: DataLinkSeries, isRelativeToCanvas?: boolean) => IPoint | null;\n\n  /**\n   * Convert the value to coordinate position\n   * @param value number | [number, number], the value to convert\n   * @param dataLinkInfo the data link info, could be seriesId,seriesIndex,axisId,axisIndex\n   * @param isRelativeToCanvas 是否相对画布坐标，默认为 false Whether relative to canvas coordinates, default is false\n   * returns\n   */\n  convertValueToPosition: ((\n    value: StringOrNumber,\n    dataLinkInfo: DataLinkAxis,\n    isRelativeToCanvas?: boolean\n  ) => number | null) &\n    ((\n      value: [StringOrNumber, StringOrNumber],\n      dataLinkInfo: DataLinkSeries,\n      isRelativeToCanvas?: boolean\n    ) => IPoint | null);\n\n  /** 停止正在进行的所有动画 */\n  stopAnimation: () => void;\n\n  /** 暂停正在进行的所有动画 */\n  pauseAnimation: () => void;\n\n  /** 恢复暂停时正在进行的所有动画 */\n  resumeAnimation: () => void;\n\n  /** 注册实例函数 */\n  registerFunction: (key: string, fun: Function) => void;\n\n  /** 注销实例函数 */\n  unregisterFunction: (key: string) => void;\n\n  /** 获取实例函数 */\n  getFunction: (key: string) => Function | null;\n\n  /** 获取实例函数列表 */\n  getFunctionList: () => string[] | null;\n}\n\nexport interface IGlobalConfig {\n  /** 是否全局显示唯一 tooltip */\n  uniqueTooltip?: boolean;\n  /** 是否监测图表 dom 变化自动 release */\n  // TODO\n  // autoRelease?: boolean;\n}\n\n/** 图表层级的主题 */\nexport interface IChartLevelTheme {\n  /** 图表背景色 */\n  background?: string | IGradientColor;\n  /** 图表字体配置 */\n  fontFamily?: string;\n  /** 全局色板 */\n  colorScheme?: IThemeColorScheme;\n}\n"]}

package/esm/core/vchart.d.ts

@@ -31,6 +31,10 @@ export declare class VChart implements IVChart {
     static useMark(marks: MarkConstructor[]): void;
     static useLayout(layouts: ILayoutConstructor[]): void;
     static registerDataSetTransform(name: string, transform: Transform): void;
+    static registerFunction(key: string, fun: Function): void;
+    static unregisterFunction(key: string): void;
+    static getFunction(key: string): Function | null;
+    static getFunctionList(): string[] | null;
     static registerMap(key: string, source: GeoSourceType, option?: GeoSourceOption): void;
     static unregisterMap(key: string): void;
     static getMap(key: string): GeoSourceType;
@@ -59,7 +63,7 @@ export declare class VChart implements IVChart {
     private _curSize;
     private _observer;
     private _currentThemeName;
-    private _currentChartLevelTheme;
+    private _currentTheme;
     private _onError?;
     private _context;
     private _isReleased;
@@ -146,5 +150,9 @@ export declare class VChart implements IVChart {
     convertDatumToPosition(datum: Datum, dataLinkInfo?: DataLinkSeries, isRelativeToCanvas?: boolean): IPoint | null;
     convertValueToPosition(value: StringOrNumber, dataLinkInfo: DataLinkAxis, isRelativeToCanvas?: boolean): number | null;
     convertValueToPosition(value: [StringOrNumber, StringOrNumber], dataLinkInfo: DataLinkSeries, isRelativeToCanvas?: boolean): IPoint | null;
+    getFunction(key: string): Function | null;
+    registerFunction(key: string, fun: Function): void;
+    unregisterFunction(key: string): void;
+    getFunctionList(): string[];
 }
 export declare const registerVChartCore: () => void;

package/esm/core/vchart.js

@@ -40,6 +40,8 @@ import { ComponentTypeEnum } from "../component/interface/type";
 
 import { DataSet, dataViewParser, DataView } from "@visactor/vdataset";
 
+import { isString, isValid, isNil, array, debounce, functionTransform } from "../util";
+
 import { createID } from "../util/id";
 
 import { convertPoint } from "../util/space";
@@ -52,8 +54,6 @@ import { mergeSpec, mergeSpecWithFilter } from "../util/spec/merge-spec";
 
 import { specTransform } from "../util/spec/transform";
 
-import { preprocessSpecOrTheme } from "../util/spec/preprocess";
-
 import { getThemeObject } from "../util/spec/common";
 
 import { Factory } from "./factory";
@@ -82,7 +82,7 @@ import { getCanvasDataURL, URLToImage } from "../util/image";
 
 import { ChartEvent, DEFAULT_CHART_HEIGHT, DEFAULT_CHART_WIDTH, VGRAMMAR_HOOK_EVENT } from "../constant";
 
-import { getContainerSize, isArray, isEmpty, Logger, merge as mergeOrigin, isFunction, LoggerLevel, isEqual, isString, isValid, isNil, array, debounce } from "@visactor/vutils";
+import { getContainerSize, isArray, isEmpty, Logger, merge as mergeOrigin, isFunction, LoggerLevel, isEqual, get, cloneDeep } from "@visactor/vutils";
 
 import { InstanceManager } from "./instance-manager";
 
@@ -102,14 +102,18 @@ import { View, registerFilterTransform, registerMapTransform } from "@visactor/v
 
 import { VCHART_UTILS } from "./util";
 
-import { mergeThemeAndGet } from "../theme/util";
+import { ExpressionFunction } from "./expression-function";
 
 import { registerBrowserEnv, registerNodeEnv } from "../env";
 
+import { mergeTheme, preprocessTheme } from "../util/spec";
+
+import { darkTheme, registerTheme } from "../theme/builtin";
+
 export class VChart {
     static useRegisters(comps) {
         comps.forEach((fn => {
-            fn();
+            "function" == typeof fn ? fn() : console.error("Invalid function:", fn);
         }));
     }
     static useChart(charts) {
@@ -133,6 +137,18 @@ export class VChart {
     static registerDataSetTransform(name, transform) {
         Factory.registerTransform(name, transform);
     }
+    static registerFunction(key, fun) {
+        key && fun && ExpressionFunction.instance().registerFunction(key, fun);
+    }
+    static unregisterFunction(key) {
+        key && ExpressionFunction.instance().unregisterFunction(key);
+    }
+    static getFunction(key) {
+        return key ? ExpressionFunction.instance().getFunction(key) : null;
+    }
+    static getFunctionList() {
+        return ExpressionFunction.instance().getFunctionNameList();
+    }
     static registerMap(key, source, option) {
         const impl = Factory.getImplementInKey("registerMap");
         impl && impl(key, source, option);
@@ -157,21 +173,20 @@ export class VChart {
         return this._dataSet;
     }
     constructor(spec, options) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         this.id = createID(), this._userEvents = [], this._autoSize = !0, this._option = {
             mode: RenderModeEnum["desktop-browser"],
             onError: msg => {
                 throw new Error(msg);
             }
-        }, this._observer = null, this._currentChartLevelTheme = {}, this._context = {}, 
-        this._onResize = debounce(((...args) => {
+        }, this._observer = null, this._context = {}, this._onResize = debounce(((...args) => {
             this._doResize();
         }), 100), this._option = mergeOrigin(this._option, {
             animation: !1 !== spec.animation
         }, options), this._onError = null === (_a = this._option) || void 0 === _a ? void 0 : _a.onError;
-        const _g = this._option, {dom: dom, renderCanvas: renderCanvas, mode: mode, stage: stage, poptip: poptip} = _g, restOptions = __rest(_g, [ "dom", "renderCanvas", "mode", "stage", "poptip" ]);
-        dom && (this._container = isString(dom) ? null === document || void 0 === document ? void 0 : document.getElementById(dom) : dom), 
-        renderCanvas && (this._canvas = renderCanvas), stage && (this._stage = stage), "node" === mode || this._container || this._canvas || this._stage ? (isTrueBrowser(mode) ? registerBrowserEnv() : "node" === mode && registerNodeEnv(), 
+        const _h = this._option, {dom: dom, renderCanvas: renderCanvas, mode: mode, stage: stage, poptip: poptip} = _h, restOptions = __rest(_h, [ "dom", "renderCanvas", "mode", "stage", "poptip" ]), isTrueBrowseEnv = isTrueBrowser(mode);
+        isTrueBrowseEnv && dom && (this._container = isString(dom) ? null === document || void 0 === document ? void 0 : document.getElementById(dom) : dom), 
+        renderCanvas && (this._canvas = renderCanvas), stage && (this._stage = stage), "node" === mode || this._container || this._canvas || this._stage ? (isTrueBrowseEnv ? registerBrowserEnv() : "node" === mode && registerNodeEnv(), 
         this._viewBox = this._option.viewBox, this._currentThemeName = ThemeManager.getCurrentThemeName(), 
         this._setSpec(spec), this._updateCurrentTheme(), this._curSize = calculateChartSize(this._spec, {
             container: this._container,
@@ -192,11 +207,10 @@ export class VChart {
         this._event = new Event(this._eventDispatcher, mode), this._compiler.initView(), 
         null === (_d = this.getStage()) || void 0 === _d || _d.setTheme({
             text: {
-                fontFamily: this._currentChartLevelTheme.fontFamily
+                fontFamily: null === (_e = this._currentTheme) || void 0 === _e ? void 0 : _e.fontFamily
             }
-        }), this._initDataSet(this._option.dataSet), this._autoSize = !!isTrueBrowser(mode) && (null === (_f = null !== (_e = spec.autoFit) && void 0 !== _e ? _e : this._option.autoFit) || void 0 === _f || _f), 
-        this._bindResizeEvent(), this._bindVGrammarViewEvent(), this._event.emit(ChartEvent.initialized, {}), 
-        InstanceManager.registerInstance(this)) : null === (_b = this._option) || void 0 === _b || _b.onError("please specify container or renderCanvas!");
+        }), this._initDataSet(this._option.dataSet), this._autoSize = !!isTrueBrowseEnv && (null === (_g = null !== (_f = spec.autoFit) && void 0 !== _f ? _f : this._option.autoFit) || void 0 === _g || _g), 
+        this._bindResizeEvent(), this._bindVGrammarViewEvent(), InstanceManager.registerInstance(this)) : null === (_b = this._option) || void 0 === _b || _b.onError("please specify container or renderCanvas!");
     }
     _setSpec(spec) {
         spec && (this._spec = specTransform(isString(spec) ? JSON.parse(spec) : spec));
@@ -204,6 +218,7 @@ export class VChart {
     _initChart(spec) {
         var _a, _b;
         if (!this._compiler) return void (null === (_a = this._option) || void 0 === _a || _a.onError("compiler is not initialized"));
+        VChart.getFunctionList() && VChart.getFunctionList().length && (spec = functionTransform(spec, VChart));
         const chart = Factory.createChart(spec.type, spec, {
             globalInstance: this,
             eventDispatcher: this._eventDispatcher,
@@ -217,20 +232,15 @@ export class VChart {
             performanceHook: this._option.performanceHook,
             viewBox: this._viewBox,
             animation: this._option.animation,
-            getThemeConfig: () => {
+            getTheme: () => {
                 var _a;
-                return {
-                    globalTheme: this._currentThemeName,
-                    optionTheme: this._option.theme,
-                    specTheme: null === (_a = this._spec) || void 0 === _a ? void 0 : _a.theme,
-                    chartLevelTheme: this._currentChartLevelTheme
-                };
+                return null !== (_a = this._currentTheme) && void 0 !== _a ? _a : {};
             },
             layout: this._option.layout,
             onError: this._onError
         });
         chart ? (this._chart = chart, this._chart.setCanvasRect(this._curSize.width, this._curSize.height), 
-        this._chart.created(), this._chart.init({})) : null === (_b = this._option) || void 0 === _b || _b.onError("init chart fail");
+        this._chart.created(), this._chart.init(), this._event.emit(ChartEvent.initialized, {})) : null === (_b = this._option) || void 0 === _b || _b.onError("init chart fail");
     }
     _releaseData() {
         this._dataSet && (this._dataSet.dataViewMap = {}, this._dataSet = null);
@@ -292,21 +302,21 @@ export class VChart {
         this) : this;
     }
     _reCompile(updateResult) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         if (updateResult.reMake) this._releaseData(), this._initDataSet(), this._chart.release(), 
-        this._chart = null, null === (_a = this._compiler) || void 0 === _a || _a.releaseGrammar(), 
+        this._chart = null, null === (_a = this._compiler) || void 0 === _a || _a.releaseGrammar(!1 === (null === (_b = this._option) || void 0 === _b ? void 0 : _b.animation) || !1 === (null === (_c = this._spec) || void 0 === _c ? void 0 : _c.animation)), 
         this._userEvents.forEach((e => {
             var _a;
             return null === (_a = this._event) || void 0 === _a ? void 0 : _a.on(e.eType, e.query, e.handler);
-        })), updateResult.reSize && this._doResize(); else if (updateResult.reCompile && (null === (_b = this._compiler) || void 0 === _b || _b.clear({
+        })), updateResult.reSize && this._doResize(); else if (updateResult.reCompile && (null === (_d = this._compiler) || void 0 === _d || _d.clear({
             chart: this._chart,
             vChart: this
-        }), null === (_c = this._compiler) || void 0 === _c || _c.compile({
+        }, !this._option.animation || !this._spec.animation), null === (_e = this._compiler) || void 0 === _e || _e.compile({
             chart: this._chart,
             vChart: this
         }, {})), updateResult.reSize) {
             const {width: width, height: height} = this._getCurSize();
-            this._chart.onResize(width, height), null === (_e = (_d = this._compiler).resize) || void 0 === _e || _e.call(_d, width, height, !1);
+            this._chart.onResize(width, height), null === (_g = (_f = this._compiler).resize) || void 0 === _g || _g.call(_f, width, height, !1);
         }
     }
     renderSync(morphConfig) {
@@ -417,7 +427,7 @@ export class VChart {
         return array(data).forEach((d => {
             var _a;
             const {id: id, values: values, parser: parser, fields: fields} = d, preDV = this._spec.data.find((dv => dv.name === id));
-            if (preDV) preDV.setFields(fields), preDV.parse(values, parser); else {
+            if (preDV) preDV.setFields(cloneDeep(fields)), preDV.parse(values, cloneDeep(parser)); else {
                 const dataView = dataToDataView(d, this._dataSet, this._spec.data, {
                     onError: null === (_a = this._option) || void 0 === _a ? void 0 : _a.onError
                 });
@@ -432,7 +442,7 @@ export class VChart {
             return array(data).forEach((d => {
                 var _a;
                 const {id: id, values: values, parser: parser, fields: fields} = d, preDV = this._spec.data.find((dv => dv.name === id));
-                if (preDV) preDV.setFields(fields), preDV.parse(values, parser); else {
+                if (preDV) preDV.setFields(cloneDeep(fields)), preDV.parse(values, cloneDeep(parser)); else {
                     const dataView = dataToDataView(d, this._dataSet, this._spec.data, {
                         onError: null === (_a = this._option) || void 0 === _a ? void 0 : _a.onError
                     });
@@ -522,10 +532,9 @@ export class VChart {
         }));
     }
     updateViewBox(viewBox, reRender = !0, reLayout = !0) {
-        var _a;
         return this._chart && this._compiler ? (this._viewBox = viewBox, this._chart.updateViewBox(viewBox, reLayout), 
-        reLayout && (this._compiler.renderSync(), null === (_a = this._chart) || void 0 === _a || _a.onEvaluateEnd()), 
-        this._compiler.updateViewBox(viewBox, reRender), this) : this;
+        reLayout && (this._compiler.renderSync(), this._chart.onEvaluateEnd()), this._compiler.updateViewBox(viewBox, reRender), 
+        this) : this;
     }
     on(eType, query, handler) {
         var _a;
@@ -557,14 +566,14 @@ export class VChart {
     _updateCurrentTheme(nextThemeName) {
         var _a, _b;
         const optionTheme = this._option.theme, specTheme = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.theme;
-        nextThemeName && (this._currentThemeName = nextThemeName);
-        const colorScheme = mergeThemeAndGet("colorScheme", this._currentThemeName, optionTheme, specTheme);
-        this._currentChartLevelTheme = {
-            colorScheme: colorScheme,
-            background: mergeThemeAndGet("background", this._currentThemeName, optionTheme, specTheme, colorScheme),
-            fontFamily: mergeThemeAndGet("fontFamily", this._currentThemeName, optionTheme, specTheme, colorScheme)
-        }, setPoptipTheme(preprocessSpecOrTheme("mark-theme", mergeThemeAndGet("component.poptip", this._currentThemeName, optionTheme, specTheme, colorScheme), colorScheme)), 
-        null === (_b = this._compiler) || void 0 === _b || _b.setBackground(this._getBackground());
+        if (nextThemeName && (this._currentThemeName = nextThemeName), isEmpty(optionTheme) && isEmpty(specTheme)) this._currentTheme = getThemeObject(this._currentThemeName, !0); else if (isString(optionTheme) && (!specTheme || isString(specTheme)) || isString(specTheme) && (!optionTheme || isString(optionTheme))) {
+            const finalTheme = mergeTheme({}, getThemeObject(this._currentThemeName, !0), getThemeObject(optionTheme, !0), getThemeObject(specTheme, !0));
+            this._currentTheme = finalTheme;
+        } else {
+            const finalTheme = mergeTheme({}, getThemeObject(this._currentThemeName), getThemeObject(optionTheme), getThemeObject(specTheme));
+            this._currentTheme = preprocessTheme(finalTheme, finalTheme.colorScheme);
+        }
+        setPoptipTheme(get(this._currentTheme, "component.poptip")), null === (_b = this._compiler) || void 0 === _b || _b.setBackground(this._getBackground());
     }
     _shouldChartResize(oldSpec) {
         var _a, _b;
@@ -576,7 +585,7 @@ export class VChart {
         this._autoSize !== lasAutoSize && (resize = !0), resize;
     }
     _getBackground() {
-        return ("string" == typeof this._spec.background ? this._spec.background : null) || this._currentChartLevelTheme.background || this._option.background;
+        return ("string" == typeof this._spec.background ? this._spec.background : null) || this._currentTheme.background || this._option.background;
     }
     getCurrentTheme() {
         return getThemeObject(this._currentThemeName);
@@ -789,6 +798,18 @@ export class VChart {
         series ? convertPoint(series.valueToPosition(value[0], value[1]), series.getRegion().getLayoutStartPoint(), isRelativeToCanvas) : (warn("Please check whether the `seriesId` or `seriesIndex` is set!"), 
         null);
     }
+    getFunction(key) {
+        return ExpressionFunction.instance().getFunction(key);
+    }
+    registerFunction(key, fun) {
+        key && fun && ExpressionFunction.instance().registerFunction(key, fun);
+    }
+    unregisterFunction(key) {
+        key && ExpressionFunction.instance().unregisterFunction(key);
+    }
+    getFunctionList() {
+        return ExpressionFunction.instance().getFunctionNameList();
+    }
 }
 
 VChart.InstanceManager = InstanceManager, VChart.ThemeManager = ThemeManager, VChart.globalConfig = {
@@ -798,10 +819,10 @@ VChart.InstanceManager = InstanceManager, VChart.ThemeManager = ThemeManager, VC
 export const registerVChartCore = () => {
     Factory.registerRegion("region", Region), Factory.registerLayout("base", Layout), 
     Factory.registerMark(GroupMark.type, GroupMark), View.useRegisters([ registerFilterTransform, registerMapTransform ]), 
-    registerVGrammarAnimation(), Logger.getInstance(LoggerLevel.Error);
+    registerVGrammarAnimation(), registerTheme(darkTheme.name, darkTheme), Logger.getInstance(LoggerLevel.Error);
 };
 
 Factory.registerRegion("region", Region), Factory.registerLayout("base", Layout), 
 Factory.registerMark(GroupMark.type, GroupMark), View.useRegisters([ registerFilterTransform, registerMapTransform ]), 
-registerVGrammarAnimation(), Logger.getInstance(LoggerLevel.Error);
+registerVGrammarAnimation(), registerTheme(darkTheme.name, darkTheme), Logger.getInstance(LoggerLevel.Error);
 //# sourceMappingURL=vchart.js.map