@visactor/vchart 1.6.7 → 1.7.0-alpha.1

package/cjs/core/vchart.js

@@ -38,12 +38,12 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerVChartCore = exports.VChart = void 0;
 
-const array_1 = require("../data/parser/array"), common_1 = require("../typings/spec/common"), type_1 = require("../component/interface/type"), vdataset_1 = require("@visactor/vdataset"), id_1 = require("../util/id"), space_1 = require("../util/space"), env_1 = require("../util/env"), debug_1 = require("../util/debug"), merge_spec_1 = require("../util/spec/merge-spec"), transform_1 = require("../util/spec/transform"), preprocess_1 = require("../util/spec/preprocess"), common_2 = require("../util/spec/common"), factory_1 = require("./factory"), event_1 = require("../event/event"), event_dispatcher_1 = require("../event/event-dispatcher"), geo_source_1 = require("../series/map/geo-source"), register_1 = require("../data/register"), initialize_1 = require("../data/initialize"), stack_split_1 = require("../data/transforms/stack-split"), copy_data_view_1 = require("../data/transforms/copy-data-view"), interface_1 = require("../animation/interface"), theme_manager_1 = require("../theme/theme-manager"), compiler_1 = require("../compile/compiler"), image_1 = require("../util/image"), constant_1 = require("../constant"), vutils_1 = require("@visactor/vutils"), instance_manager_1 = require("./instance-manager"), vrender_components_1 = require("@visactor/vrender-components"), util_1 = require("../chart/util"), region_1 = require("../region/region"), base_layout_1 = require("../layout/base-layout"), group_1 = require("../mark/group"), config_1 = require("../animation/config"), vgrammar_core_1 = require("@visactor/vgrammar-core"), util_2 = require("./util"), util_3 = require("../theme/util"), env_2 = require("../env");
+const array_1 = require("../data/parser/array"), common_1 = require("../typings/spec/common"), type_1 = require("../component/interface/type"), vdataset_1 = require("@visactor/vdataset"), util_1 = require("../util"), id_1 = require("../util/id"), space_1 = require("../util/space"), env_1 = require("../util/env"), debug_1 = require("../util/debug"), merge_spec_1 = require("../util/spec/merge-spec"), transform_1 = require("../util/spec/transform"), common_2 = require("../util/spec/common"), factory_1 = require("./factory"), event_1 = require("../event/event"), event_dispatcher_1 = require("../event/event-dispatcher"), geo_source_1 = require("../series/map/geo-source"), register_1 = require("../data/register"), initialize_1 = require("../data/initialize"), stack_split_1 = require("../data/transforms/stack-split"), copy_data_view_1 = require("../data/transforms/copy-data-view"), interface_1 = require("../animation/interface"), theme_manager_1 = require("../theme/theme-manager"), compiler_1 = require("../compile/compiler"), image_1 = require("../util/image"), constant_1 = require("../constant"), vutils_1 = require("@visactor/vutils"), instance_manager_1 = require("./instance-manager"), vrender_components_1 = require("@visactor/vrender-components"), util_2 = require("../chart/util"), region_1 = require("../region/region"), base_layout_1 = require("../layout/base-layout"), group_1 = require("../mark/group"), config_1 = require("../animation/config"), vgrammar_core_1 = require("@visactor/vgrammar-core"), util_3 = require("./util"), expression_function_1 = require("./expression-function"), env_2 = require("../env"), spec_1 = require("../util/spec"), builtin_1 = require("../theme/builtin");
 
 class VChart {
     static useRegisters(comps) {
         comps.forEach((fn => {
-            fn();
+            "function" == typeof fn ? fn() : console.error("Invalid function:", fn);
         }));
     }
     static useChart(charts) {
@@ -67,6 +67,18 @@ class VChart {
     static registerDataSetTransform(name, transform) {
         factory_1.Factory.registerTransform(name, transform);
     }
+    static registerFunction(key, fun) {
+        key && fun && expression_function_1.ExpressionFunction.instance().registerFunction(key, fun);
+    }
+    static unregisterFunction(key) {
+        key && expression_function_1.ExpressionFunction.instance().unregisterFunction(key);
+    }
+    static getFunction(key) {
+        return key ? expression_function_1.ExpressionFunction.instance().getFunction(key) : null;
+    }
+    static getFunctionList() {
+        return expression_function_1.ExpressionFunction.instance().getFunctionNameList();
+    }
     static registerMap(key, source, option) {
         const impl = factory_1.Factory.getImplementInKey("registerMap");
         impl && impl(key, source, option);
@@ -91,24 +103,24 @@ 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 = (0, id_1.createID)(), this._userEvents = [], this._autoSize = !0, this._option = {
             mode: common_1.RenderModeEnum["desktop-browser"],
             onError: msg => {
                 throw new Error(msg);
             }
-        }, this._observer = null, this._currentChartLevelTheme = {}, this._context = {}, 
-        this._onResize = (0, vutils_1.debounce)(((...args) => {
+        }, this._observer = null, this._context = {}, this._onResize = (0, util_1.debounce)(((...args) => {
             this._doResize();
         }), 100), this._option = (0, vutils_1.merge)(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 = (0, vutils_1.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 ? ((0, 
-        env_1.isTrueBrowser)(mode) ? (0, env_2.registerBrowserEnv)() : "node" === mode && (0, 
-        env_2.registerNodeEnv)(), this._viewBox = this._option.viewBox, this._currentThemeName = theme_manager_1.ThemeManager.getCurrentThemeName(), 
-        this._setSpec(spec), this._updateCurrentTheme(), this._curSize = (0, util_1.calculateChartSize)(this._spec, {
+        const _h = this._option, {dom: dom, renderCanvas: renderCanvas, mode: mode, stage: stage, poptip: poptip} = _h, restOptions = __rest(_h, [ "dom", "renderCanvas", "mode", "stage", "poptip" ]), isTrueBrowseEnv = (0, 
+        env_1.isTrueBrowser)(mode);
+        isTrueBrowseEnv && dom && (this._container = (0, util_1.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 ? (0, 
+        env_2.registerBrowserEnv)() : "node" === mode && (0, env_2.registerNodeEnv)(), this._viewBox = this._option.viewBox, 
+        this._currentThemeName = theme_manager_1.ThemeManager.getCurrentThemeName(), this._setSpec(spec), 
+        this._updateCurrentTheme(), this._curSize = (0, util_2.calculateChartSize)(this._spec, {
             container: this._container,
             canvas: this._canvas,
             mode: this._option.mode || common_1.RenderModeEnum["desktop-browser"],
@@ -127,18 +139,18 @@ class VChart {
         this._event = new event_1.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 = !!(0, env_1.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(constant_1.ChartEvent.initialized, {}), 
-        instance_manager_1.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(), instance_manager_1.InstanceManager.registerInstance(this)) : null === (_b = this._option) || void 0 === _b || _b.onError("please specify container or renderCanvas!");
     }
     _setSpec(spec) {
-        spec && (this._spec = (0, transform_1.specTransform)((0, vutils_1.isString)(spec) ? JSON.parse(spec) : spec));
+        spec && (this._spec = (0, transform_1.specTransform)((0, util_1.isString)(spec) ? JSON.parse(spec) : spec));
     }
     _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 = (0, util_1.functionTransform)(spec, VChart));
         const chart = factory_1.Factory.createChart(spec.type, spec, {
             globalInstance: this,
             eventDispatcher: this._eventDispatcher,
@@ -152,20 +164,15 @@ 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(constant_1.ChartEvent.initialized, {})) : null === (_b = this._option) || void 0 === _b || _b.onError("init chart fail");
     }
     _releaseData() {
         this._dataSet && (this._dataSet.dataViewMap = {}, this._dataSet = null);
@@ -219,13 +226,13 @@ class VChart {
         return __awaiter(this, void 0, void 0, (function*() {
             if (this._isReleased) return this;
             const result = modifyConfig();
-            return (0, vutils_1.isValid)(result) ? (this._reCompile(result), yield this.renderAsync(morphConfig), 
+            return (0, util_1.isValid)(result) ? (this._reCompile(result), yield this.renderAsync(morphConfig), 
             this) : this;
         }));
     }
     updateCustomConfigAndRerenderSync(modifyConfig, morphConfig) {
         const result = modifyConfig();
-        return (0, vutils_1.isValid)(result) ? (this._reCompile(result), this.renderSync(morphConfig), 
+        return (0, util_1.isValid)(result) ? (this._reCompile(result), this.renderSync(morphConfig), 
         this) : this;
     }
     _reCompile(updateResult) {
@@ -306,10 +313,10 @@ class VChart {
     }
     updateData(id, data, options) {
         return __awaiter(this, void 0, void 0, (function*() {
-            if ((0, vutils_1.isNil)(this._dataSet)) return this;
+            if ((0, util_1.isNil)(this._dataSet)) return this;
             if (this._chart) return this._chart.updateData(id, data, !0, options), yield this._compiler.renderAsync(), 
             this;
-            this._spec.data = (0, vutils_1.array)(this._spec.data);
+            this._spec.data = (0, util_1.array)(this._spec.data);
             const preDV = this._spec.data.find((dv => dv.name === id || dv.id === id));
             return preDV ? preDV.id === id ? preDV.values = data : preDV.name === id && preDV.parse(data, options) : (0, 
             vutils_1.isArray)(data) ? this._spec.data.push({
@@ -337,7 +344,7 @@ class VChart {
         }));
     }
     updateDataSync(id, data, options) {
-        if ((0, vutils_1.isNil)(this._dataSet)) return this;
+        if ((0, util_1.isNil)(this._dataSet)) return this;
         if (this._chart) return this._chart.updateData(id, data, !0, options), this._compiler.renderSync(), 
         this;
         const preDV = this._spec.data.find((dv => dv.name === id));
@@ -352,10 +359,11 @@ class VChart {
     updateFullDataSync(data, reRender = !0) {
         if (this._chart) return this._chart.updateFullData(data), reRender && this._compiler.renderSync(), 
         this;
-        return (0, vutils_1.array)(data).forEach((d => {
+        return (0, util_1.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((0, vutils_1.cloneDeep)(fields)), preDV.parse(values, (0, 
+            vutils_1.cloneDeep)(parser)); else {
                 const dataView = (0, initialize_1.dataToDataView)(d, this._dataSet, this._spec.data, {
                     onError: null === (_a = this._option) || void 0 === _a ? void 0 : _a.onError
                 });
@@ -367,10 +375,11 @@ class VChart {
         return __awaiter(this, void 0, void 0, (function*() {
             if (this._chart) return this._chart.updateFullData(data), reRender && (yield this._compiler.renderAsync()), 
             this;
-            return (0, vutils_1.array)(data).forEach((d => {
+            return (0, util_1.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((0, vutils_1.cloneDeep)(fields)), preDV.parse(values, (0, 
+                vutils_1.cloneDeep)(parser)); else {
                     const dataView = (0, initialize_1.dataToDataView)(d, this._dataSet, this._spec.data, {
                         onError: null === (_a = this._option) || void 0 === _a ? void 0 : _a.onError
                     });
@@ -381,7 +390,7 @@ class VChart {
     }
     updateSpec(spec, forceMerge = !1, morphConfig) {
         return __awaiter(this, void 0, void 0, (function*() {
-            return spec ? ((0, vutils_1.isString)(spec) && (spec = JSON.parse(spec)), forceMerge && (spec = (0, 
+            return spec ? ((0, util_1.isString)(spec) && (spec = JSON.parse(spec)), forceMerge && (spec = (0, 
             merge_spec_1.mergeSpec)({}, this._spec, spec)), yield this.updateCustomConfigAndRerender((() => {
                 var _a, _b, _c;
                 spec = (0, transform_1.specTransform)(spec);
@@ -390,7 +399,7 @@ class VChart {
                 null === (_a = this._chart) || void 0 === _a || _a.setCurrentTheme());
                 const reSize = this._shouldChartResize(lastSpec);
                 return null === (_c = null === (_b = this._compiler) || void 0 === _b ? void 0 : _b.getVGrammarView()) || void 0 === _c || _c.updateLayoutTag(), 
-                (0, util_1.mergeUpdateResult)(this._chart.updateSpec(spec, morphConfig), {
+                (0, util_2.mergeUpdateResult)(this._chart.updateSpec(spec, morphConfig), {
                     change: reSize,
                     reMake: !1,
                     reCompile: !1,
@@ -400,7 +409,7 @@ class VChart {
         }));
     }
     updateSpecSync(spec, forceMerge = !1, morphConfig) {
-        return spec ? ((0, vutils_1.isString)(spec) && (spec = JSON.parse(spec)), forceMerge && (spec = (0, 
+        return spec ? ((0, util_1.isString)(spec) && (spec = JSON.parse(spec)), forceMerge && (spec = (0, 
         merge_spec_1.mergeSpec)({}, this._spec, spec)), this.updateCustomConfigAndRerenderSync((() => {
             var _a, _b, _c, _d;
             (spec = (0, transform_1.specTransform)(spec)).data = null !== (_a = spec.data) && void 0 !== _a ? _a : [];
@@ -409,7 +418,7 @@ class VChart {
             null === (_b = this._chart) || void 0 === _b || _b.setCurrentTheme());
             const reSize = this._shouldChartResize(lastSpec);
             return null === (_d = null === (_c = this._compiler) || void 0 === _c ? void 0 : _c.getVGrammarView()) || void 0 === _d || _d.updateLayoutTag(), 
-            (0, util_1.mergeUpdateResult)(this._chart.updateSpec(spec, morphConfig), {
+            (0, util_2.mergeUpdateResult)(this._chart.updateSpec(spec, morphConfig), {
                 change: reSize,
                 reMake: !1,
                 reCompile: !1,
@@ -420,7 +429,7 @@ class VChart {
     updateModelSpec(filter, spec, forceMerge = !1, morphConfig) {
         return __awaiter(this, void 0, void 0, (function*() {
             if (!spec || !this._spec) return this;
-            if ((0, vutils_1.isString)(spec) && (spec = JSON.parse(spec)), (0, vutils_1.isFunction)(filter) || (0, 
+            if ((0, util_1.isString)(spec) && (spec = JSON.parse(spec)), (0, vutils_1.isFunction)(filter) || (0, 
             merge_spec_1.mergeSpecWithFilter)(this._spec, filter, spec, forceMerge), this._chart) {
                 const model = this._chart.getModelInFilter(filter);
                 if (model) return this._updateModelSpec(model, spec, !1, forceMerge, morphConfig);
@@ -430,7 +439,7 @@ class VChart {
     }
     updateModelSpecSync(filter, spec, forceMerge = !1, morphConfig) {
         if (!spec || !this._spec) return this;
-        if ((0, vutils_1.isString)(spec) && (spec = JSON.parse(spec)), (0, vutils_1.isFunction)(filter) || (0, 
+        if ((0, util_1.isString)(spec) && (spec = JSON.parse(spec)), (0, vutils_1.isFunction)(filter) || (0, 
         merge_spec_1.mergeSpecWithFilter)(this._spec, filter, spec, forceMerge), this._chart) {
             const model = this._chart.getModelInFilter(filter);
             if (model) return this._updateModelSpec(model, spec, !0, forceMerge, morphConfig);
@@ -460,10 +469,9 @@ 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;
@@ -495,27 +503,32 @@ 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 = (0, util_3.mergeThemeAndGet)("colorScheme", this._currentThemeName, optionTheme, specTheme);
-        this._currentChartLevelTheme = {
-            colorScheme: colorScheme,
-            background: (0, util_3.mergeThemeAndGet)("background", this._currentThemeName, optionTheme, specTheme, colorScheme),
-            fontFamily: (0, util_3.mergeThemeAndGet)("fontFamily", this._currentThemeName, optionTheme, specTheme, colorScheme)
-        }, (0, vrender_components_1.setPoptipTheme)((0, preprocess_1.preprocessSpecOrTheme)("mark-theme", (0, 
-        util_3.mergeThemeAndGet)("component.poptip", this._currentThemeName, optionTheme, specTheme, colorScheme), colorScheme)), 
+        if (nextThemeName && (this._currentThemeName = nextThemeName), (0, vutils_1.isEmpty)(optionTheme) && (0, 
+        vutils_1.isEmpty)(specTheme)) this._currentTheme = (0, common_2.getThemeObject)(this._currentThemeName, !0); else if ((0, 
+        util_1.isString)(optionTheme) && (!specTheme || (0, util_1.isString)(specTheme)) || (0, 
+        util_1.isString)(specTheme) && (!optionTheme || (0, util_1.isString)(optionTheme))) {
+            const finalTheme = (0, spec_1.mergeTheme)({}, (0, common_2.getThemeObject)(this._currentThemeName, !0), (0, 
+            common_2.getThemeObject)(optionTheme, !0), (0, common_2.getThemeObject)(specTheme, !0));
+            this._currentTheme = finalTheme;
+        } else {
+            const finalTheme = (0, spec_1.mergeTheme)({}, (0, common_2.getThemeObject)(this._currentThemeName), (0, 
+            common_2.getThemeObject)(optionTheme), (0, common_2.getThemeObject)(specTheme));
+            this._currentTheme = (0, spec_1.preprocessTheme)(finalTheme, finalTheme.colorScheme);
+        }
+        (0, vrender_components_1.setPoptipTheme)((0, vutils_1.get)(this._currentTheme, "component.poptip")), 
         null === (_b = this._compiler) || void 0 === _b || _b.setBackground(this._getBackground());
     }
     _shouldChartResize(oldSpec) {
         var _a, _b;
         let resize = !1;
-        (0, vutils_1.isNil)(this._spec.width) ? this._spec.width = oldSpec.width : this._spec.width !== oldSpec.width && (resize = !0), 
-        (0, vutils_1.isNil)(this._spec.height) ? this._spec.height = oldSpec.height : this._spec.height !== oldSpec.height && (resize = !0);
+        (0, util_1.isNil)(this._spec.width) ? this._spec.width = oldSpec.width : this._spec.width !== oldSpec.width && (resize = !0), 
+        (0, util_1.isNil)(this._spec.height) ? this._spec.height = oldSpec.height : this._spec.height !== oldSpec.height && (resize = !0);
         const lasAutoSize = this._autoSize;
         return this._autoSize = !!(0, env_1.isTrueBrowser)(this._option.mode) && (null === (_b = null !== (_a = this._spec.autoFit) && void 0 !== _a ? _a : this._option.autoFit) || void 0 === _b || _b), 
         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 (0, common_2.getThemeObject)(this._currentThemeName);
@@ -567,7 +580,7 @@ class VChart {
     showTooltip(datum, options) {
         var _a;
         const tooltip = this._getTooltipComponent();
-        return null !== (_a = (0, vutils_1.isValid)(datum) && "none" !== (null == tooltip ? void 0 : tooltip.showTooltip(datum, options))) && void 0 !== _a && _a;
+        return null !== (_a = (0, util_1.isValid)(datum) && "none" !== (null == tooltip ? void 0 : tooltip.showTooltip(datum, options))) && void 0 !== _a && _a;
     }
     hideTooltip() {
         var _a;
@@ -667,10 +680,10 @@ class VChart {
     }
     getContainer() {
         var _a;
-        if ((0, vutils_1.isValid)(this._container)) return this._container;
+        if ((0, util_1.isValid)(this._container)) return this._container;
         let canvasNode;
-        return canvasNode = (0, vutils_1.isString)(this._canvas) ? null === document || void 0 === document ? void 0 : document.getElementById(this._canvas) : this._canvas, 
-        (0, vutils_1.isValid)(canvasNode) ? canvasNode.parentElement : null === (_a = this.getCanvas()) || void 0 === _a ? void 0 : _a.parentElement;
+        return canvasNode = (0, util_1.isString)(this._canvas) ? null === document || void 0 === document ? void 0 : document.getElementById(this._canvas) : this._canvas, 
+        (0, util_1.isValid)(canvasNode) ? canvasNode.parentElement : null === (_a = this.getCanvas()) || void 0 === _a ? void 0 : _a.parentElement;
     }
     getComponents() {
         return this._chart.getAllComponents();
@@ -697,10 +710,10 @@ class VChart {
         if ((0, vutils_1.isEmpty)(datum)) return null;
         const {seriesId: seriesId, seriesIndex: seriesIndex = 0} = dataLinkInfo;
         let series;
-        if ((0, vutils_1.isValid)(seriesId) ? series = this._chart.getSeriesInUserId(seriesId) : (0, 
-        vutils_1.isValid)(seriesIndex) && (series = null === (_a = this._chart.getSeriesInIndex([ seriesIndex ])) || void 0 === _a ? void 0 : _a[0]), 
+        if ((0, util_1.isValid)(seriesId) ? series = this._chart.getSeriesInUserId(seriesId) : (0, 
+        util_1.isValid)(seriesIndex) && (series = null === (_a = this._chart.getSeriesInIndex([ seriesIndex ])) || void 0 === _a ? void 0 : _a[0]), 
         series) {
-            const keys = Object.keys(datum), handledDatum = series.getViewData().latestData.find((viewDatum => keys.every((k => viewDatum[k] == datum[k])))), seriesLayoutStartPoint = series.getLayoutStartPoint();
+            const keys = Object.keys(datum), handledDatum = series.getViewData().latestData.find((viewDatum => keys.every((k => viewDatum[k] == datum[k])))), seriesLayoutStartPoint = series.getRegion().getLayoutStartPoint();
             let point;
             return point = handledDatum ? series.dataToPosition(handledDatum) : series.dataToPosition(datum), 
             (0, space_1.convertPoint)(point, seriesLayoutStartPoint, isRelativeToCanvas);
@@ -709,12 +722,12 @@ class VChart {
     }
     convertValueToPosition(value, dataLinkInfo, isRelativeToCanvas = !1) {
         var _a, _b;
-        if (!this._chart || (0, vutils_1.isNil)(value) || (0, vutils_1.isEmpty)(dataLinkInfo)) return null;
+        if (!this._chart || (0, util_1.isNil)(value) || (0, vutils_1.isEmpty)(dataLinkInfo)) return null;
         if (!(0, vutils_1.isArray)(value)) {
             const {axisId: axisId, axisIndex: axisIndex} = dataLinkInfo;
             let axis;
-            if ((0, vutils_1.isValid)(axisId) ? axis = this._chart.getComponentsByKey("axes").find((s => s.userId === axisId)) : (0, 
-            vutils_1.isValid)(axisIndex) && (axis = null === (_a = this._chart.getComponentsByKey("axes")) || void 0 === _a ? void 0 : _a[axisIndex]), 
+            if ((0, util_1.isValid)(axisId) ? axis = this._chart.getComponentsByKey("axes").find((s => s.userId === axisId)) : (0, 
+            util_1.isValid)(axisIndex) && (axis = null === (_a = this._chart.getComponentsByKey("axes")) || void 0 === _a ? void 0 : _a[axisIndex]), 
             !axis) return (0, debug_1.warn)("Please check whether the `axisId` or `axisIndex` is set!"), 
             null;
             const pointValue = null == axis ? void 0 : axis.valueToPosition(value);
@@ -726,22 +739,35 @@ class VChart {
         }
         const {seriesId: seriesId, seriesIndex: seriesIndex} = dataLinkInfo;
         let series;
-        return (0, vutils_1.isValid)(seriesId) ? series = this._chart.getSeriesInUserId(seriesId) : (0, 
-        vutils_1.isValid)(seriesIndex) && (series = null === (_b = this._chart.getSeriesInIndex([ seriesIndex ])) || void 0 === _b ? void 0 : _b[0]), 
-        series ? (0, space_1.convertPoint)(series.valueToPosition(value[0], value[1]), series.getLayoutStartPoint(), isRelativeToCanvas) : ((0, 
+        return (0, util_1.isValid)(seriesId) ? series = this._chart.getSeriesInUserId(seriesId) : (0, 
+        util_1.isValid)(seriesIndex) && (series = null === (_b = this._chart.getSeriesInIndex([ seriesIndex ])) || void 0 === _b ? void 0 : _b[0]), 
+        series ? (0, space_1.convertPoint)(series.valueToPosition(value[0], value[1]), series.getRegion().getLayoutStartPoint(), isRelativeToCanvas) : ((0, 
         debug_1.warn)("Please check whether the `seriesId` or `seriesIndex` is set!"), null);
     }
+    getFunction(key) {
+        return expression_function_1.ExpressionFunction.instance().getFunction(key);
+    }
+    registerFunction(key, fun) {
+        key && fun && expression_function_1.ExpressionFunction.instance().registerFunction(key, fun);
+    }
+    unregisterFunction(key) {
+        key && expression_function_1.ExpressionFunction.instance().unregisterFunction(key);
+    }
+    getFunctionList() {
+        return expression_function_1.ExpressionFunction.instance().getFunctionNameList();
+    }
 }
 
 exports.VChart = VChart, VChart.InstanceManager = instance_manager_1.InstanceManager, 
 VChart.ThemeManager = theme_manager_1.ThemeManager, VChart.globalConfig = {
     uniqueTooltip: !0
-}, VChart.Utils = util_2.VCHART_UTILS;
+}, VChart.Utils = util_3.VCHART_UTILS;
 
 const registerVChartCore = () => {
     factory_1.Factory.registerRegion("region", region_1.Region), factory_1.Factory.registerLayout("base", base_layout_1.Layout), 
     factory_1.Factory.registerMark(group_1.GroupMark.type, group_1.GroupMark), vgrammar_core_1.View.useRegisters([ vgrammar_core_1.registerFilterTransform, vgrammar_core_1.registerMapTransform ]), 
-    (0, config_1.registerVGrammarAnimation)(), vutils_1.Logger.getInstance(vutils_1.LoggerLevel.Error);
+    (0, config_1.registerVGrammarAnimation)(), (0, builtin_1.registerTheme)(builtin_1.darkTheme.name, builtin_1.darkTheme), 
+    vutils_1.Logger.getInstance(vutils_1.LoggerLevel.Error);
 };
 
 exports.registerVChartCore = registerVChartCore, (0, exports.registerVChartCore)();