@visactor/vchart 1.12.6 → 1.12.8

package/esm/core/index.js

@@ -4,7 +4,7 @@ import { Factory } from "./factory";
 
 export { VChart, Factory };
 
-export const version = "1.12.6";
+export const version = "1.12.8";
 
 export * from "../typings/spec/common";
 

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,QAAQ,CAAC;AAMhC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAG5B,cAAc,kBAAkB,CAAC;AAKjC,cAAc,uBAAuB,CAAC;AAGtC,cAAc,oBAAoB,CAAC;AAGnC,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.12.6\";\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 './interface';\n\n// some constants\nexport * from '../constant/base';\n\n/**\n * spec\n */\nexport * from '../typings/spec/index';\n\n// tooltip\nexport * from '../typings/tooltip';\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,QAAQ,CAAC;AAMhC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAG5B,cAAc,kBAAkB,CAAC;AAKjC,cAAc,uBAAuB,CAAC;AAGtC,cAAc,oBAAoB,CAAC;AAGnC,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.12.8\";\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 './interface';\n\n// some constants\nexport * from '../constant/base';\n\n/**\n * spec\n */\nexport * from '../typings/spec/index';\n\n// tooltip\nexport * from '../typings/tooltip';\n\n// theme\nexport * from '../theme/index';\n\n// vrender\nexport { vglobal } from '@visactor/vrender-core';\n"]}

package/esm/core/vchart.js

@@ -219,7 +219,7 @@ export class VChart {
             if (result.reSize = reSize, null === (_b = null === (_a = this._compiler) || void 0 === _a ? void 0 : _a.getVGrammarView()) || void 0 === _b || _b.updateLayoutTag(), 
             this._spec.type !== lastSpec.type) return result.reMake = !0, result.reTransformSpec = !0, 
             result.change = !0, result.changeTheme = !0, result;
-            this._initChartSpec(this._spec, "render");
+            this._initChartSpec(this._spec, "updateSpec");
             const res = mergeUpdateResult(this._chart.updateSpec(this._spec), result);
             return userUpdateOptions ? Object.assign(Object.assign({}, res), userUpdateOptions) : res;
         }, this._option = mergeOrigin(this._option, {
@@ -464,13 +464,10 @@ export class VChart {
         this;
         const prevData = array(this._spec.data);
         return array(data).forEach((d => {
-            var _a;
             const {id: id, values: values, parser: parser, fields: fields} = d, preDV = prevData.find((dv => dv.name === id));
             if (preDV) preDV instanceof DataView ? (preDV.setFields(cloneDeep(fields)), preDV.parse(values, cloneDeep(parser))) : (preDV.values = values, 
             isValid(parser) && (preDV.parser = parser), isValid(fields) && (preDV.fields = fields)); else {
-                const dataView = dataToDataView(d, this._dataSet, prevData, {
-                    onError: null === (_a = this._option) || void 0 === _a ? void 0 : _a.onError
-                });
+                const dataView = dataToDataView(d, this._dataSet, prevData);
                 isArray(this._spec.data) && this._spec.data.push(dataView);
             }
         })), this;
@@ -603,20 +600,24 @@ export class VChart {
         this._chart && this._chart.clearHovered();
     }
     _updateCurrentTheme(nextThemeName) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c;
         const optionTheme = this._option.theme, specTheme = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.theme, chartType = null === (_b = this._spec) || void 0 === _b ? void 0 : _b.type;
+        nextThemeName && (this._currentThemeName = nextThemeName);
+        const processThemeByChartType = (type, theme) => {
+            var _a;
+            return (null === (_a = theme.chart) || void 0 === _a ? void 0 : _a[type]) && (theme = mergeTheme({}, theme, theme.chart[type])), 
+            theme;
+        };
         let currentTheme;
-        if (nextThemeName && (this._currentThemeName = nextThemeName), isEmpty(optionTheme) && isEmpty(specTheme)) currentTheme = getThemeObject(this._currentThemeName, !0), 
-        this._currentTheme = mergeTheme({}, currentTheme, null === (_e = currentTheme.chart) || void 0 === _e ? void 0 : _e[chartType]); else if (isString(optionTheme) && (!specTheme || isString(specTheme)) || isString(specTheme) && (!optionTheme || isString(optionTheme))) {
-            currentTheme = getThemeObject(this._currentThemeName, !0);
-            const finalTheme = mergeTheme({}, currentTheme, null === (_c = currentTheme.chart) || void 0 === _c ? void 0 : _c[chartType], getThemeObject(optionTheme, !0), getThemeObject(specTheme, !0));
-            this._currentTheme = finalTheme;
+        if (isEmpty(optionTheme) && isEmpty(specTheme)) currentTheme = getThemeObject(this._currentThemeName, !0), 
+        this._currentTheme = processThemeByChartType(chartType, currentTheme); 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 = processThemeByChartType(chartType, finalTheme);
         } else {
-            currentTheme = getThemeObject(this._currentThemeName);
-            const finalTheme = mergeTheme({}, currentTheme, null === (_d = currentTheme.chart) || void 0 === _d ? void 0 : _d[chartType], getThemeObject(optionTheme), getThemeObject(specTheme));
-            this._currentTheme = preprocessTheme(finalTheme);
+            const finalTheme = mergeTheme({}, getThemeObject(this._currentThemeName), getThemeObject(optionTheme), getThemeObject(specTheme));
+            this._currentTheme = preprocessTheme(processThemeByChartType(chartType, finalTheme));
         }
-        setPoptipTheme(get(this._currentTheme, "component.poptip")), null === (_f = this._compiler) || void 0 === _f || _f.setBackground(this._getBackground());
+        setPoptipTheme(get(this._currentTheme, "component.poptip")), null === (_c = this._compiler) || void 0 === _c || _c.setBackground(this._getBackground());
     }
     _shouldChartResize(oldSpec) {
         var _a, _b;