@visactor/vchart 1.1.2 → 1.2.0-beta.2

package/cjs/chart/area/area.js

@@ -13,11 +13,13 @@ class AreaChart extends cartesian_1.CartesianChart {
         super(...arguments), this.type = interface_2.ChartTypeEnum.area, this.seriesType = interface_1.SeriesTypeEnum.area;
     }
     _getDefaultSeriesSpec(spec) {
+        var _a;
         return Object.assign(Object.assign({}, super._getDefaultSeriesSpec(spec)), {
             invalidType: spec.invalidType || "break",
             point: spec.point,
             line: spec.line,
-            area: spec.area
+            area: spec.area,
+            seriesMark: null !== (_a = spec.seriesMark) && void 0 !== _a ? _a : "area"
         });
     }
     transformSpec(spec) {

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

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

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

@@ -1,11 +1,11 @@
-import type { ISeriesSpec, Datum, IMarkStateSpec, IRegionQuerier, MaybeArray, IPadding, IRect, StringOrNumber } from '../typings';
+import type { ISeriesSpec, Datum, IMarkStateSpec, IRegionQuerier, MaybeArray, IPadding, IRect, StringOrNumber, IChartSpec } from '../typings';
 import type { LayoutCallBack } from '../layout/interface';
 import type { ILayoutModelState, ILayoutOrientPadding, ILayoutRect, IModel, IModelOption, IUpdateSpecResult } from '../model/interface';
 import type { IChart, IChartLayoutOption, IChartRenderOption, IChartOption, IChartEvaluateOption, ILayoutParams, DimensionIndexOption } from './interface';
 import type { ISeries } from '../series/interface';
 import type { IRegion } from '../region/interface';
 import type { IComponent } from '../component/interface';
-import type { IMark } from '../mark/interface';
+import { type IMark } from '../mark/interface';
 import type { IEvent } from '../event/interface';
 import type { DataView } from '@visactor/vdataset';
 import type { DataSet } from '@visactor/vdataset/es/data-set';
@@ -16,12 +16,14 @@ import type { IBoundsLike } from '@visactor/vutils';
 import type { IMorphConfig, IMark as IVGrammarMark, IView } from '@visactor/vgrammar';
 import { CompilableBase } from '../compile/compilable-base';
 import type { IGlobalScale } from '../scale/interface';
+import type { IRectMark } from '../mark/rect';
 export declare class BaseChart extends CompilableBase implements IChart {
     readonly type: string;
     readonly id: number;
     protected _spec: any;
     getSpec(): any;
     setSpec(s: any): void;
+    getOption(): IChartOption;
     protected _theme: ITheme;
     protected _regions: IRegion[];
     protected _series: ISeries[];
@@ -47,12 +49,14 @@ export declare class BaseChart extends CompilableBase implements IChart {
     padding: IPadding;
     protected _paddingSpec: ILayoutOrientPadding;
     protected _canvasRect: ILayoutRect;
+    protected _backgroundMark: IRectMark;
     constructor(spec: any, option: IChartOption);
     created(): void;
     transformSpec(spec: any): void;
     init(options?: any): void;
     onResize(width: number, height: number): void;
     updateViewBox(viewBox: IBoundsLike): void;
+    createBackground(bg: IChartSpec['background']): void;
     createRegion(regionSpec: any[]): void;
     initRegion(): void;
     createSeries(seriesSpec: ISeriesSpec[]): void;
@@ -124,6 +128,7 @@ export declare class BaseChart extends CompilableBase implements IChart {
     compile(): void;
     afterCompile(): void;
     compileLayout(): void;
+    compileBackground(): void;
     compileRegions(): void;
     compileSeries(): void;
     compileComponents(): void;

package/cjs/chart/base-chart.js

@@ -30,7 +30,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseChart = void 0;
 
-const global_scale_1 = require("../scale/global-scale"), interface_1 = require("../component/interface"), factory_1 = require("../core/factory"), event_1 = require("../event/event"), util_1 = require("../util"), stack_1 = require("./stack"), base_model_1 = require("../model/base-model"), base_mark_1 = require("../mark/base/base-mark"), base_1 = require("../constant/base"), initialize_1 = require("../data/initialize"), vutils_1 = require("@visactor/vutils"), util_2 = require("../theme/color-scheme/util"), compilable_base_1 = require("../compile/compilable-base"), interface_2 = require("../compile/mark/interface"), constant_1 = require("../constant"), dimension_1 = require("../event/events/dimension");
+const global_scale_1 = require("../scale/global-scale"), interface_1 = require("../component/interface"), interface_2 = require("../mark/interface"), factory_1 = require("../core/factory"), event_1 = require("../event/event"), util_1 = require("../util"), stack_1 = require("./stack"), base_model_1 = require("../model/base-model"), base_mark_1 = require("../mark/base/base-mark"), base_1 = require("../constant/base"), initialize_1 = require("../data/initialize"), vutils_1 = require("@visactor/vutils"), util_2 = require("../theme/color-scheme/util"), compilable_base_1 = require("../compile/compilable-base"), interface_3 = require("../compile/mark/interface"), constant_1 = require("../constant"), dimension_1 = require("../event/events/dimension");
 
 class BaseChart extends compilable_base_1.CompilableBase {
     getSpec() {
@@ -39,6 +39,9 @@ class BaseChart extends compilable_base_1.CompilableBase {
     setSpec(s) {
         this.transformSpec(s), this._spec = s;
     }
+    getOption() {
+        return this._option;
+    }
     getLayoutRect() {
         return this._layoutRect;
     }
@@ -109,12 +112,14 @@ class BaseChart extends compilable_base_1.CompilableBase {
             getChartLayoutRect: () => this._layoutRect,
             getChartViewRect: () => this._viewRect,
             getChart: () => this,
-            globalScale: this._globalScale
+            globalScale: this._globalScale,
+            onError: this._option.onError
         }), this._stack = new stack_1.Stack(this), this._spec = spec;
     }
     created() {
-        this.transformSpec(this._spec), this.createGlobalScale(), this.createLayout(), this.createRegion(this._spec.region), 
-        this.createSeries(this._spec.series), this.createComponent(this._spec);
+        this.transformSpec(this._spec), this.createGlobalScale(), this.createBackground(this._spec.background), 
+        this.createLayout(), this.createRegion(this._spec.region), this.createSeries(this._spec.series), 
+        this.createComponent(this._spec);
     }
     transformSpec(spec) {
         spec.region && 0 !== spec.region.length || (spec.region = [ {} ]), (0, vutils_1.has)(spec, "tooltip") || (spec.tooltip = {});
@@ -136,6 +141,20 @@ class BaseChart extends compilable_base_1.CompilableBase {
     updateViewBox(viewBox) {
         this._updateLayoutRect(viewBox), this.setLayoutTag(!0);
     }
+    createBackground(bg) {
+        bg && "object" == typeof bg && (this._backgroundMark = factory_1.Factory.createMark(interface_2.MarkTypeEnum.group, "chart-background", {
+            model: this,
+            map: this._option.map,
+            getCompiler: this.getCompiler,
+            globalScale: this._globalScale
+        }), this._backgroundMark.created(), this._backgroundMark.setStyle((0, util_1.convertBackgroundSpec)(bg)), 
+        this._backgroundMark.setStyle({
+            x: () => this._viewBox.x1,
+            y: () => this._viewBox.y1,
+            width: () => this._viewBox.x2 - this._viewBox.x1,
+            height: () => this._viewBox.y2 - this._viewBox.y1
+        }));
+    }
     createRegion(regionSpec) {
         regionSpec && regionSpec.forEach(((s, i) => {
             const region = factory_1.Factory.createRegion("region", s, Object.assign(Object.assign({}, this._modelOption), {
@@ -151,8 +170,10 @@ class BaseChart extends compilable_base_1.CompilableBase {
     createSeries(seriesSpec) {
         seriesSpec.forEach(((spec, index) => {
             let region;
-            if (spec.data ? spec.data = (0, initialize_1.dataToDataView)(spec.data, this._dataSet, this._spec.data) : spec.data = this.getSeriesData(spec.dataId, spec.dataIndex), 
-            !1 === this._option.animation && (spec.animation = !1), (0, util_1.isValid)(spec.regionId) ? region = this.getRegionsInUserId(spec.regionId) : (0, 
+            if (spec.data ? spec.data = (0, initialize_1.dataToDataView)(spec.data, this._dataSet, this._spec.data, {
+                onError: this._option.onError
+            }) : spec.data = this.getSeriesData(spec.dataId, spec.dataIndex), !1 === this._option.animation && (spec.animation = !1), 
+            (0, util_1.isValid)(spec.regionId) ? region = this.getRegionsInUserId(spec.regionId) : (0, 
             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), {
@@ -227,7 +248,9 @@ class BaseChart extends compilable_base_1.CompilableBase {
         if (this._layoutFunc = this._option.layout, !this._layoutFunc) {
             let use3dLayout = !1;
             (this._spec.zField || this._spec.series && this._spec.series.some((s => s.zField))) && (use3dLayout = !0);
-            const layout = new (factory_1.Factory.getLayout(null !== (_b = null === (_a = this._spec.layout) || void 0 === _a ? void 0 : _a.type) && void 0 !== _b ? _b : use3dLayout ? "layout3d" : "base"))(this._spec.layout);
+            const layout = new (factory_1.Factory.getLayout(null !== (_b = null === (_a = this._spec.layout) || void 0 === _a ? void 0 : _a.type) && void 0 !== _b ? _b : use3dLayout ? "layout3d" : "base"))(this._spec.layout, {
+                onError: this._option.onError
+            });
             this._layoutFunc = layout.layoutItems.bind(layout);
         }
     }
@@ -314,17 +337,14 @@ class BaseChart extends compilable_base_1.CompilableBase {
         return this._canvasRect;
     }
     getSeriesData(id, index) {
-        if (!this._spec.data) throw new Error("no data in spec!");
+        if (!this._spec.data) return this._option.onError("no data in spec!"), null;
         if ("string" == typeof id) {
             const metchData = this._spec.data.filter((data => data.name === id));
-            if (metchData[0]) return metchData[0];
-            throw new Error(`no data matches dataId ${id}!`);
-        }
-        if ("number" == typeof index) {
-            if (this._spec.data[index]) return this._spec.data[index];
-            throw new Error(`no data matches dataIndex ${index}!`);
+            return metchData[0] ? metchData[0] : (this._option.onError(`no data matches dataId ${id}!`), 
+            null);
         }
-        return this._spec.data[0];
+        return "number" == typeof index ? this._spec.data[index] ? this._spec.data[index] : (this._option.onError(`no data matches dataIndex ${index}!`), 
+        null) : this._spec.data[0];
     }
     _transformSpecScale() {
         var _a, _b, _c;
@@ -454,7 +474,8 @@ class BaseChart extends compilable_base_1.CompilableBase {
             large: spec.large,
             largeThreshold: spec.largeThreshold,
             progressiveStep: spec.progressiveStep,
-            progressiveThreshold: spec.progressiveThreshold
+            progressiveThreshold: spec.progressiveThreshold,
+            background: spec.seriesBackground
         };
     }
     _mergeUpdateResult(resultA, resultB) {
@@ -505,7 +526,8 @@ class BaseChart extends compilable_base_1.CompilableBase {
         }))));
     }
     compile() {
-        this.compileLayout(), this.compileRegions(), this.compileSeries(), this.compileComponents();
+        this.compileBackground(), this.compileLayout(), this.compileRegions(), this.compileSeries(), 
+        this.compileComponents();
     }
     afterCompile() {
         this.getAllRegions().forEach((r => {
@@ -523,6 +545,14 @@ class BaseChart extends compilable_base_1.CompilableBase {
         const {width: width, height: height} = this.getCanvasRect();
         this.getCompiler().setSize(width, height);
     }
+    compileBackground() {
+        var _a;
+        this._backgroundMark && (this._backgroundMark.compile(), null === (_a = this._backgroundMark.getProduct()) || void 0 === _a || _a.configure({
+            context: {
+                model: this
+            }
+        }).layout((() => {})));
+    }
     compileRegions() {
         var _a, _b, _c, _d;
         null === (_b = null === (_a = this._option.performanceHook) || void 0 === _a ? void 0 : _a.beforeRegionCompile) || void 0 === _b || _b.call(_a), 
@@ -559,10 +589,8 @@ class BaseChart extends compilable_base_1.CompilableBase {
     }
     checkUpdate(mark, model, sceneRoot) {
         var _a, _b;
-        if ((null === (_a = mark.context) || void 0 === _a ? void 0 : _a.model) && (sceneRoot = mark, 
-        model = mark.context.model), model && mark.isUpdated) return null === (_b = model.bindSceneNode) || void 0 === _b || _b.call(model, sceneRoot.elements[0]), 
-        void model.setAttributeTag(!0);
-        "group" === mark.markType && mark.children.forEach((child => {
+        (null === (_a = mark.context) || void 0 === _a ? void 0 : _a.model) && (sceneRoot = mark, 
+        model = mark.context.model), model && mark.isUpdated ? null === (_b = model.bindSceneNode) || void 0 === _b || _b.call(model, sceneRoot.elements[0]) : "group" === mark.markType && mark.children.forEach((child => {
             this.checkUpdate(child, model, sceneRoot);
         }));
     }
@@ -586,10 +614,10 @@ class BaseChart extends compilable_base_1.CompilableBase {
         }
     }
     setSelected(datum, filter, region) {
-        this._setStateInDatum(interface_2.STATE_VALUE_ENUM.STATE_SELECTED, !0, datum, filter, region);
+        this._setStateInDatum(interface_3.STATE_VALUE_ENUM.STATE_SELECTED, !0, datum, filter, region);
     }
     setHovered(datum, filter, region) {
-        this._setStateInDatum(interface_2.STATE_VALUE_ENUM.STATE_HOVER, !0, datum, filter, region);
+        this._setStateInDatum(interface_3.STATE_VALUE_ENUM.STATE_HOVER, !0, datum, filter, region);
     }
     initEvent() {
         [ constant_1.ChartEvent.dataZoomChange, constant_1.ChartEvent.scrollBarChange ].forEach((event => {