@visactor/vchart 1.5.4 → 1.6.0

package/esm/series/base/base-series.js

@@ -2,17 +2,23 @@ import { ChartEvent } from "../../constant/event";
 
 import { AttributeLevel, DEFAULT_DATA_KEY, DEFAULT_DATA_SERIES_FIELD, DEFAULT_SERIES_STYLE_NAME, PREFIX, STACK_FIELD_END, STACK_FIELD_END_PERCENT, STACK_FIELD_START, STACK_FIELD_START_PERCENT } from "../../constant/index";
 
-import { seriesMarkInfoMap } from "../interface";
+import { seriesMarkInfoMap } from "../interface/theme";
 
 import { DataView } from "@visactor/vdataset";
 
-import { MarkTypeEnum } from "../../mark/interface";
+import { MarkTypeEnum } from "../../mark/interface/type";
 
 import { BaseModel } from "../../model/base-model";
 
 import { dataToDataView, dataViewFromDataView, updateDataViewInData } from "../../data/initialize";
 
-import { isNil, isValid, isBoolean, isString, mergeSpec, isFunction, isArray, mergeFields, getFieldAlias, couldBeValidNumber, preprocessSpecOrTheme } from "../../util";
+import { mergeFields, getFieldAlias } from "../../util/data";
+
+import { couldBeValidNumber } from "../../util/type";
+
+import { mergeSpec } from "../../util/spec/merge-spec";
+
+import { preprocessSpecOrTheme } from "../../util/spec/preprocess";
 
 import { addVChartProperty } from "../../data/transforms/add-property";
 
@@ -22,7 +28,7 @@ import { registerDataSetInstanceTransform } from "../../data/register";
 
 import { BaseSeriesTooltipHelper } from "./tooltip-helper";
 
-import { dimensionStatistics } from "../../data/transforms/dimension-statistics";
+import { dimensionStatistics, dimensionStatisticsOfSimpleData } from "../../data/transforms/dimension-statistics";
 
 import { invalidTravel } from "../../data/transforms/invalid-travel";
 
@@ -32,13 +38,17 @@ import { SeriesData } from "./series-data";
 
 import { addDataKey, initKeyMap } from "../../data/transforms/data-key";
 
-import { array, isEqual } from "@visactor/vutils";
+import { array, isEqual, isNil, isValid, isBoolean, isString, isFunction, isArray } from "@visactor/vutils";
+
+import { getThemeFromOption } from "../../theme/util";
+
+import { getDirectionFromSeriesSpec } from "../util/spec";
 
 import { ColorOrdinalScale } from "../../scale/color-ordinal-scale";
 
 import { baseSeriesMark } from "./constant";
 
-import { getThemeFromOption } from "../../theme/util";
+import { isAnimationEnabledForSeries } from "../../animation/utils";
 
 export class BaseSeries extends BaseModel {
     getTrigger() {
@@ -53,9 +63,6 @@ export class BaseSeries extends BaseModel {
     getRawData() {
         return this._rawData;
     }
-    getRawDataStatistics() {
-        return this._rawDataStatistics;
-    }
     getViewDataFilter() {
         return this._viewDataFilter;
     }
@@ -121,7 +128,7 @@ export class BaseSeries extends BaseModel {
         this.initStatisticalData(), this.event.emit(ChartEvent.afterInitData, {
             model: this
         }), this.initTrigger(), this.initRootMark(), this.initMark(), this._initExtensionMark(), 
-        this.initMarkStyle(), this.initMarkState(), !1 !== this._spec.animation && isValid(this._region.animate) && this.initAnimation(), 
+        this.initMarkStyle(), this.initMarkState(), isAnimationEnabledForSeries(this) && this.initAnimation(), 
         this.afterInitMark(), this.initEvent(), this.event.emit(ChartEvent.afterInitEvent, {
             model: this
         });
@@ -154,13 +161,13 @@ export class BaseSeries extends BaseModel {
             onError: null === (_a = this._option) || void 0 === _a ? void 0 : _a.onError
         })), null === (_b = this._rawData) || void 0 === _b || _b.target.addListener("change", this.rawDataUpdate.bind(this)), 
         this._addDataIndexAndKey(), this._rawData) {
-            this._viewDataFilter = dataViewFromDataView(this._rawData, this._dataSet, {
-                name: `${PREFIX}_series_${this.id}_viewDataFilter`
+            this._stack && (this._viewDataFilter = dataViewFromDataView(this._rawData, this._dataSet, {
+                name: `${this.type}_${this.id}_viewDataFilter`
+            }));
+            const viewData = dataViewFromDataView(this._stack ? this._viewDataFilter : this._rawData, this._dataSet, {
+                name: `${this.type}_${this.id}_viewData`
             });
-            const viewData = dataViewFromDataView(this._viewDataFilter, this._dataSet, {
-                name: `${PREFIX}_series_${this.id}_viewData`
-            });
-            this._data = new SeriesData(this._option, viewData), this._viewDataFilter.target.removeListener("change", viewData.reRunAllTransform);
+            this._data = new SeriesData(this._option, viewData), this._stack && this._viewDataFilter.target.removeListener("change", viewData.reRunAllTransform);
         }
         "zero" === this._invalidType && (null === (_c = this._rawData) || void 0 === _c ? void 0 : _c.dataSet) && (registerDataSetInstanceTransform(this._rawData.dataSet, "invalidTravel", invalidTravel), 
         null === (_d = this._rawData) || void 0 === _d || _d.transform({
@@ -180,34 +187,21 @@ export class BaseSeries extends BaseModel {
         });
     }
     initStatisticalData() {
-        this._rawData && this._statisticRawData(), this._data && this._statisticViewData();
+        this._data && this._statisticViewData();
     }
-    _statisticRawData() {
-        registerDataSetInstanceTransform(this._dataSet, "dimensionStatistics", dimensionStatistics);
-        const rawDataStatisticsName = `${PREFIX}_series_${this.id}_rawDataStatic`;
-        this._rawDataStatistics = new DataView(this._dataSet, {
-            name: rawDataStatisticsName
-        }), this._rawDataStatistics.parse([ this._rawData ], {
-            type: "dataview"
-        }), this._rawDataStatistics.transform({
-            type: "dimensionStatistics",
-            options: {
-                operations: [ "max", "min", "values" ],
-                fields: () => {
-                    var _a;
-                    const fields = mergeFields(this.getStatisticFields(), null !== (_a = this._option.globalScale.getStatisticalFields(this._rawData.name)) && void 0 !== _a ? _a : []);
-                    return this._seriesField && mergeFields(fields, [ {
-                        key: this._seriesField,
-                        operations: [ "values" ]
-                    } ]), fields.filter((f => f.key !== STACK_FIELD_START_PERCENT && f.key !== STACK_FIELD_END_PERCENT && f.key !== STACK_FIELD_END && f.key !== STACK_FIELD_START));
-                },
-                target: "latest"
-            }
-        }, !1), this._rawData.target.removeListener("change", this._rawDataStatistics.reRunAllTransform);
+    getRawDataStatisticsByField(field, isNumeric) {
+        var _a;
+        if (this._rawStatisticsCache || (this._rawStatisticsCache = {}), !this._rawStatisticsCache[field]) {
+            this._viewDataStatistics && (!this._viewDataFilter || this._viewDataFilter.transformsArr.length <= 1) && this.getViewData().transformsArr.length <= 1 && (null === (_a = this._viewDataStatistics.latestData) || void 0 === _a ? void 0 : _a[field]) ? this._rawStatisticsCache[field] = this._viewDataStatistics.latestData[field] : this._rawData && (this._rawStatisticsCache[field] = dimensionStatisticsOfSimpleData(this._rawData.latestData, [ {
+                key: field,
+                operations: isNumeric ? [ "min", "max" ] : [ "values" ]
+            } ])[field]);
+        }
+        return this._rawStatisticsCache[field];
     }
     _statisticViewData() {
         registerDataSetInstanceTransform(this._dataSet, "dimensionStatistics", dimensionStatistics);
-        const viewDataStatisticsName = `${PREFIX}_series_${this.id}_viewDataStatic`;
+        const viewDataStatisticsName = `${this.type}_${this.id}_viewDataStatic`;
         this._viewDataStatistics = new DataView(this._dataSet, {
             name: viewDataStatisticsName
         }), this._viewDataStatistics.parse([ this._data.getDataView() ], {
@@ -215,8 +209,6 @@ export class BaseSeries extends BaseModel {
         }), this._viewDataStatistics.transform({
             type: "dimensionStatistics",
             options: {
-                fieldFollowSource: key => this._viewDataFilter.transformsArr.length <= 1,
-                sourceStatistics: () => this._rawDataStatistics.latestData,
                 fields: () => {
                     const fields = this.getStatisticFields();
                     return this._seriesField && mergeFields(fields, [ {
@@ -253,32 +245,33 @@ export class BaseSeries extends BaseModel {
         }, !1), data;
     }
     createdStackData() {
-        var _a, _b;
-        const dataName = null !== (_b = null === (_a = this._rawData) || void 0 === _a ? void 0 : _a.name) && void 0 !== _b ? _b : `${PREFIX}_series_${this.id}_viewStackData`;
-        this._viewStackData = new DataView(this._dataSet), this._viewStackData.parse([ this.getViewDataFilter() ], {
+        const dataName = `${this.type}_${this.id}_viewStackData`;
+        this._viewStackData = new DataView(this._dataSet, {
+            name: dataName
+        }), this._viewStackData.parse([ this._viewDataFilter ], {
             type: "dataview"
-        }), this._viewStackData.name = dataName, this._viewStackData.transform({
+        }), this._viewStackData.transform({
             type: "stackSplit",
             options: {
                 fields: this.getStackGroupFields()
             }
         }, !1);
     }
-    _noAnimationDataKey(datum, index, context) {
+    _noAnimationDataKey(datum, index) {
         return index;
     }
-    generateDefaultDataKey(dataKey, datum, index, context) {
+    generateDefaultDataKey(dataKey) {
         var _a;
-        if (isNil(dataKey)) {
+        return isNil(dataKey) ? (datum, index, context) => {
             if (!1 === this._spec.animation) {
-                const v = this._noAnimationDataKey(datum, index, context);
+                const v = this._noAnimationDataKey(datum, index);
                 if (void 0 !== v) return v;
             }
             const {keyMap: keyMap} = context, seriesDataKey = this._getSeriesDataKey(datum);
             return void 0 === keyMap.get(seriesDataKey) ? keyMap.set(seriesDataKey, 0) : keyMap.set(seriesDataKey, keyMap.get(seriesDataKey) + 1), 
             `${seriesDataKey}_${keyMap.get(seriesDataKey)}`;
-        }
-        return isString(dataKey) ? datum[dataKey] : isArray(dataKey) && dataKey.every((d => isString(d))) ? dataKey.map((k => datum[k])).join("-") : isFunction(dataKey) ? dataKey(datum, index) : void (null === (_a = this._option) || void 0 === _a || _a.onError(`invalid dataKey: ${dataKey}`));
+        } : isString(dataKey) ? datum => datum[dataKey] : isArray(dataKey) && dataKey.every((d => isString(d))) ? datum => dataKey.map((k => datum[k])).join("-") : isFunction(dataKey) ? (datum, index) => dataKey(datum, index) : (null === (_a = this._option) || void 0 === _a || _a.onError(`invalid dataKey: ${dataKey}`), 
+        (datum, index) => {});
     }
     _addDataIndexAndKey() {
         var _a;
@@ -286,8 +279,8 @@ export class BaseSeries extends BaseModel {
         this._rawData.transform({
             type: "addVChartProperty",
             options: {
-                beforeCall: initKeyMap,
-                call: addDataKey.bind(this)
+                beforeCall: initKeyMap.bind(this),
+                call: addDataKey
             }
         }, !1));
     }
@@ -297,12 +290,7 @@ export class BaseSeries extends BaseModel {
     rawDataUpdate(d) {
         var _a;
         null === (_a = this._rawDataStatistics) || void 0 === _a || _a.reRunAllTransform(), 
-        this.event.emit(ChartEvent.rawDataUpdate, {
-            model: this
-        });
-    }
-    rawDataStatisticsUpdate(d) {
-        this.event.emit(ChartEvent.rawDataStatisticsUpdate, {
+        this._rawStatisticsCache = null, this.event.emit(ChartEvent.rawDataUpdate, {
             model: this
         });
     }
@@ -312,9 +300,10 @@ export class BaseSeries extends BaseModel {
         });
     }
     viewDataUpdate(d) {
+        var _a;
         this.event.emit(ChartEvent.viewDataUpdate, {
             model: this
-        }), this._data.updateData(), this._viewDataStatistics.reRunAllTransform();
+        }), null === (_a = this._data) || void 0 === _a || _a.updateData(), this._viewDataStatistics && this._viewDataStatistics.reRunAllTransform();
     }
     viewDataStatisticsUpdate(d) {
         this.event.emit(ChartEvent.viewDataStatisticsUpdate, {
@@ -327,6 +316,9 @@ export class BaseSeries extends BaseModel {
     getDatumPositionValues(datum, fields) {
         return !datum || isNil(fields) ? [] : isString(fields) ? [ datum[fields] ] : fields.map((f => datum[f]));
     }
+    setValueFieldToStack() {}
+    setValueFieldToPercent() {}
+    setValueFieldToStackOffsetSilhouette() {}
     initRootMark() {
         var _a, _b;
         this._rootMark = this._createMark({
@@ -365,7 +357,7 @@ export class BaseSeries extends BaseModel {
         null === (_a = this._spec.extensionMark) || void 0 === _a || _a.forEach(((spec, i) => {
             var _a;
             const mark = this._marks.getMarkWithInfo({
-                name: `${PREFIX}_series_${this.id}_extensionMark_${i}`
+                name: `${this.type}_${this.id}_extensionMark_${i}`
             });
             mark && (lastSpec && isEqual(null === (_a = lastSpec.extensionMark) || void 0 === _a ? void 0 : _a[i], spec) || (this.initMarkStyleWithSpec(mark, spec), 
             mark.updateStaticEncode(), mark.updateLayoutState()));
@@ -450,10 +442,9 @@ export class BaseSeries extends BaseModel {
         return this.getMarks().find((m => m.id === markId));
     }
     initEvent() {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         this._trigger.init(), null === (_b = null === (_a = this._data) || void 0 === _a ? void 0 : _a.getDataView()) || void 0 === _b || _b.target.addListener("change", this.viewDataUpdate.bind(this)), 
-        null === (_c = this._viewDataStatistics) || void 0 === _c || _c.target.addListener("change", this.viewDataStatisticsUpdate.bind(this)), 
-        null === (_d = this._rawDataStatistics) || void 0 === _d || _d.target.addListener("change", this.rawDataStatisticsUpdate.bind(this));
+        null === (_c = this._viewDataStatistics) || void 0 === _c || _c.target.addListener("change", this.viewDataStatisticsUpdate.bind(this));
     }
     _releaseEvent() {
         super._releaseEvent(), this._trigger.release();
@@ -501,8 +492,8 @@ export class BaseSeries extends BaseModel {
         super.onLayoutEnd(ctx);
     }
     getSeriesKeys() {
-        var _a, _b, _c;
-        return this._seriesField ? null !== (_c = null === (_b = null === (_a = this._rawDataStatistics) || void 0 === _a ? void 0 : _a.latestData[this._seriesField]) || void 0 === _b ? void 0 : _b.values) && void 0 !== _c ? _c : [] : this.name ? [ this.name ] : this.userId ? [ `${this.userId}` ] : [ `${this.type}_${this.id}` ];
+        var _a, _b;
+        return this._seriesField ? null !== (_b = null === (_a = this.getRawDataStatisticsByField(this._seriesField)) || void 0 === _a ? void 0 : _a.values) && void 0 !== _b ? _b : [] : this.name ? [ this.name ] : this.userId ? [ `${this.userId}` ] : [ `${this.type}_${this.id}` ];
     }
     getSeriesStyle(datum) {
         return attribute => {
@@ -522,7 +513,7 @@ export class BaseSeries extends BaseModel {
     }
     getSeriesInfoInField(field) {
         var _a, _b;
-        return this._getSeriesInfo(field, null !== (_b = null === (_a = this._rawDataStatistics.latestData[field]) || void 0 === _a ? void 0 : _a.values) && void 0 !== _b ? _b : []);
+        return this._getSeriesInfo(field, null !== (_b = null === (_a = this.getRawDataStatisticsByField(field)) || void 0 === _a ? void 0 : _a.values) && void 0 !== _b ? _b : []);
     }
     getSeriesInfoList() {
         var _a;
@@ -538,7 +529,7 @@ export class BaseSeries extends BaseModel {
     }
     getDefaultColorDomain() {
         var _a, _b;
-        return this._seriesField ? null === (_b = null === (_a = this._viewDataStatistics) || void 0 === _a ? void 0 : _a.latestData[this._seriesField]) || void 0 === _b ? void 0 : _b.values : [];
+        return this._seriesField ? null === (_b = null === (_a = this.getViewDataStatistics()) || void 0 === _a ? void 0 : _a.latestData[this._seriesField]) || void 0 === _b ? void 0 : _b.values : [];
     }
     getColorAttribute() {
         var _a, _b;
@@ -558,14 +549,15 @@ export class BaseSeries extends BaseModel {
     }
     onMarkTreePositionUpdate(marks) {}
     _getTheme() {
-        return preprocessSpecOrTheme("theme", getThemeFromOption(`series.${this.type}`, this._option), this.getColorScheme(), this.type);
+        const direction = getDirectionFromSeriesSpec(this._spec), theme = getThemeFromOption(`series.${this.type}`, this._option), themeWithDirection = getThemeFromOption(`series.${this.type}_${direction}`, this._option);
+        return preprocessSpecOrTheme("theme", mergeSpec({}, theme, themeWithDirection), this.getColorScheme(), this._spec);
     }
     _createMark(markInfo, option = {}) {
         var _a, _b, _c, _d;
-        const {key: key, groupKey: groupKey, skipBeforeLayouted: skipBeforeLayouted, themeSpec: themeSpec = {}, markSpec: markSpec, dataView: dataView, dataProductId: dataProductId, parent: parent, isSeriesMark: isSeriesMark, dataStatistics: dataStatistics, depend: depend, label: label, progressive: progressive, support3d: support3d = this._spec.support3d || !!this._spec.zField, morph: morph = !1} = option, m = super._createMark(markInfo, {
+        const {key: key, groupKey: groupKey, skipBeforeLayouted: skipBeforeLayouted, themeSpec: themeSpec = {}, markSpec: markSpec, dataView: dataView, dataProductId: dataProductId, parent: parent, isSeriesMark: isSeriesMark, depend: depend, label: label, progressive: progressive, support3d: support3d = this._spec.support3d || !!this._spec.zField, morph: morph = !1} = option, m = super._createMark(markInfo, {
             key: null != key ? key : this._getDataIdKey(),
             support3d: support3d,
-            dataStatistics: null != dataStatistics ? dataStatistics : this._rawDataStatistics,
+            seriesId: this.id,
             attributeContext: this._markAttributeContext
         });
         if (isValid(m)) {
@@ -595,12 +587,12 @@ export class BaseSeries extends BaseModel {
         key;
     }
     addViewDataFilter(option) {
-        var _a;
-        null === (_a = this._viewDataFilter) || void 0 === _a || _a.transform(option, !1);
+        var _a, _b;
+        null === (_b = null !== (_a = this._viewDataFilter) && void 0 !== _a ? _a : this.getViewData()) || void 0 === _b || _b.transform(option, !1);
     }
     reFilterViewData() {
-        var _a;
-        null === (_a = this._viewDataFilter) || void 0 === _a || _a.reRunAllTransform();
+        var _a, _b;
+        null === (_b = null !== (_a = this._viewDataFilter) && void 0 !== _a ? _a : this.getViewData()) || void 0 === _b || _b.reRunAllTransform();
     }
     reTransformViewData() {
         var _a, _b;
@@ -611,7 +603,7 @@ export class BaseSeries extends BaseModel {
         null === (_a = this.getRawData()) || void 0 === _a || _a.reRunAllTransform();
     }
     compile() {
-        this.compileSignal(), this.compileData();
+        this.compileData();
     }
     getDefaultShapeType() {
         return "circle";