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

package/esm/series/sankey/sankey.js

@@ -8,9 +8,9 @@ import { animationConfig, userAnimationConfig } from "../../animation/utils";
 
 import { registerFadeInOutAnimation } from "../../animation/config";
 
-import { registerDataSetInstanceTransform, registerDataSetInstanceParser } from "../../data/register";
+import { registerDataSetInstanceTransform } from "../../data/register";
 
-import { sankey } from "../../data/transforms/sankey";
+import { sankeyFormat, sankeyLayout, collectHierarchyField } from "../../data/transforms/sankey";
 
 import { sankeyNodes } from "../../data/transforms/sankey-nodes";
 
@@ -18,16 +18,12 @@ import { sankeyLinks } from "../../data/transforms/sankey-links";
 
 import { STATE_VALUE_ENUM } from "../../compile/mark/interface";
 
-import { DataView, DataSet, dataViewParser } from "@visactor/vdataset";
+import { DataView } from "@visactor/vdataset";
 
-import { DEFAULT_DATA_INDEX, LayoutZIndex, AttributeLevel, Event_Bubble_Level, ChartEvent } from "../../constant";
+import { LayoutZIndex, AttributeLevel, Event_Bubble_Level, DEFAULT_DATA_INDEX } from "../../constant";
 
 import { SeriesData } from "../base/series-data";
 
-import { addVChartProperty } from "../../data/transforms/add-property";
-
-import { addDataKey, initKeyMap } from "../../data/transforms/data-key";
-
 import { SankeySeriesTooltipHelper } from "./tooltip-helper";
 
 import { Bounds, array, isNil } from "@visactor/vutils";
@@ -50,6 +46,8 @@ import { Factory } from "../../core/factory";
 
 import { TransformLevel } from "../../data/initialize";
 
+import { addDataKey, initKeyMap } from "../../data/transforms/data-key";
+
 export class SankeySeries extends CartesianSeries {
     constructor() {
         super(...arguments), this.type = SeriesTypeEnum.sankey, this._nodeLayoutZIndex = LayoutZIndex.Node, 
@@ -355,10 +353,15 @@ export class SankeySeries extends CartesianSeries {
         this._labelLimit = null !== (_c = null === (_b = this._spec.label) || void 0 === _b ? void 0 : _b.limit) && void 0 !== _c ? _c : 100;
     }
     initData() {
-        var _a, _b, _c, _d, _e, _f;
-        if (super.initData(), this.getViewData()) {
-            registerDataSetInstanceTransform(this._dataSet, "sankey", sankey), this.addViewDataFilter({
-                type: "sankey",
+        var _a, _b, _c, _d;
+        super.initData();
+        const viewData = this.getViewData(), rawData = this.getRawData();
+        if (rawData && viewData) {
+            registerDataSetInstanceTransform(this._dataSet, "sankeyLayout", sankeyLayout), registerDataSetInstanceTransform(this._dataSet, "sankeyFormat", sankeyFormat), 
+            rawData.transform({
+                type: "sankeyFormat"
+            }, !1), viewData.transform({
+                type: "sankeyLayout",
                 options: {
                     view: () => ({
                         x0: this._viewBox.x1,
@@ -385,11 +388,9 @@ export class SankeySeries extends CartesianSeries {
                 },
                 level: TransformLevel.sankeyLayout
             });
-            const nodesDataSet = new DataSet;
-            registerDataSetInstanceParser(nodesDataSet, "dataview", dataViewParser), registerDataSetInstanceTransform(nodesDataSet, "sankeyNodes", sankeyNodes), 
-            registerDataSetInstanceTransform(nodesDataSet, "addVChartProperty", addVChartProperty), 
-            registerDataSetInstanceTransform(nodesDataSet, "flatten", flatten);
-            const nodesDataView = new DataView(nodesDataSet, {
+            const {dataSet: dataSet} = this._option;
+            registerDataSetInstanceTransform(dataSet, "sankeyNodes", sankeyNodes), registerDataSetInstanceTransform(dataSet, "flatten", flatten);
+            const nodesDataView = new DataView(dataSet, {
                 name: `sankey-node-${this.id}-data`
             });
             nodesDataView.parse([ this.getViewData() ], {
@@ -407,18 +408,14 @@ export class SankeySeries extends CartesianSeries {
                         return node;
                     }
                 }
-            }), nodesDataView.transform({
+            }, !1), nodesDataView.transform({
                 type: "addVChartProperty",
                 options: {
                     beforeCall: initKeyMap.bind(this),
                     call: addDataKey
                 }
-            }, !1), null === (_e = this._data) || void 0 === _e || _e.getDataView().target.addListener("change", nodesDataView.reRunAllTransform), 
-            this._nodesSeriesData = new SeriesData(this._option, nodesDataView);
-            const linksDataSet = new DataSet;
-            registerDataSetInstanceParser(linksDataSet, "dataview", dataViewParser), registerDataSetInstanceTransform(linksDataSet, "sankeyLinks", sankeyLinks), 
-            registerDataSetInstanceTransform(linksDataSet, "addVChartProperty", addVChartProperty);
-            const linksDataView = new DataView(linksDataSet, {
+            }, !1), this._nodesSeriesData = new SeriesData(this._option, nodesDataView), registerDataSetInstanceTransform(dataSet, "sankeyLinks", sankeyLinks);
+            const linksDataView = new DataView(dataSet, {
                 name: `sankey-link-${this.id}-data`
             });
             linksDataView.parse([ this.getViewData() ], {
@@ -431,25 +428,26 @@ export class SankeySeries extends CartesianSeries {
                     beforeCall: initKeyMap.bind(this),
                     call: addDataKey
                 }
-            }, !1), null === (_f = this._data) || void 0 === _f || _f.getDataView().target.addListener("change", linksDataView.reRunAllTransform), 
-            this._linksSeriesData = new SeriesData(this._option, linksDataView);
+            }, !1), this._linksSeriesData = new SeriesData(this._option, linksDataView);
         }
     }
     initMark() {
-        var _a;
+        var _a, _b, _c;
         const nodeMark = this._createMark(SankeySeries.mark.node, {
             isSeriesMark: !0,
             key: DEFAULT_DATA_INDEX,
             dataView: this._nodesSeriesData.getDataView(),
-            dataProductId: this._nodesSeriesData.getProductId()
+            dataProductId: this._nodesSeriesData.getProductId(),
+            customShape: null === (_a = this._spec.node) || void 0 === _a ? void 0 : _a.customShape
         });
         nodeMark && (nodeMark.setZIndex(this._nodeLayoutZIndex), this._nodeMark = nodeMark);
         const linkMark = this._createMark(SankeySeries.mark.link, {
             key: DEFAULT_DATA_INDEX,
             dataView: this._linksSeriesData.getDataView(),
-            dataProductId: this._linksSeriesData.getProductId()
+            dataProductId: this._linksSeriesData.getProductId(),
+            customShape: null === (_b = this._spec.link) || void 0 === _b ? void 0 : _b.customShape
         });
-        if (linkMark && (this._linkMark = linkMark), null === (_a = this._spec.label) || void 0 === _a ? void 0 : _a.visible) {
+        if (linkMark && (this._linkMark = linkMark), null === (_c = this._spec.label) || void 0 === _c ? void 0 : _c.visible) {
             const labelMark = this._createMark(SankeySeries.mark.label, {
                 key: DEFAULT_DATA_INDEX,
                 dataView: this._nodesSeriesData.getDataView(),
@@ -484,9 +482,11 @@ export class SankeySeries extends CartesianSeries {
             y1: datum => datum.y1,
             thickness: datum => datum.thickness,
             fill: datum => {
-                var _a, _b, _c, _d, _e, _f, _g, _h;
-                const sourceName = (null === (_a = this._spec) || void 0 === _a ? void 0 : _a.nodeKey) || (null === (_d = null === (_c = null === (_b = this._rawData.latestData[0]) || void 0 === _b ? void 0 : _b.nodes) || void 0 === _c ? void 0 : _c[0]) || void 0 === _d ? void 0 : _d.children) ? datum.source : this.getNodeList()[datum.source];
-                return null !== (_g = null === (_f = null === (_e = this._spec.link) || void 0 === _e ? void 0 : _e.style) || void 0 === _f ? void 0 : _f.fill) && void 0 !== _g ? _g : null === (_h = this._colorScale) || void 0 === _h ? void 0 : _h.scale(sourceName);
+                var _a, _b, _c, _d, _e, _f, _g;
+                const fill = null === (_b = null === (_a = this._spec.link) || void 0 === _a ? void 0 : _a.style) || void 0 === _b ? void 0 : _b.fill;
+                if (fill) return fill;
+                const sourceName = (null === (_c = this._spec) || void 0 === _c ? void 0 : _c.nodeKey) || (null === (_f = null === (_e = null === (_d = this._rawData.latestData[0]) || void 0 === _d ? void 0 : _d.nodes) || void 0 === _e ? void 0 : _e[0]) || void 0 === _f ? void 0 : _f.children) ? datum.source : this.getNodeList()[datum.source];
+                return null === (_g = this._colorScale) || void 0 === _g ? void 0 : _g.scale(sourceName);
             },
             direction: null !== (_a = this._spec.direction) && void 0 !== _a ? _a : "horizontal"
         }, STATE_VALUE_ENUM.STATE_NORMAL, AttributeLevel.Series), this._trigger.registerMark(linkMark));
@@ -640,14 +640,10 @@ export class SankeySeries extends CartesianSeries {
         }, this._handleRelatedClick));
     }
     nodesSeriesDataUpdate() {
-        this.event.emit(ChartEvent.legendFilter, {
-            model: this
-        }), this._nodesSeriesData.updateData(), this._setNodeOrdinalColorScale();
+        this._nodesSeriesData.updateData(), this._setNodeOrdinalColorScale();
     }
     linksSeriesDataUpdate() {
-        this.event.emit(ChartEvent.legendFilter, {
-            model: this
-        }), this._linksSeriesData.updateData();
+        this._linksSeriesData.updateData();
     }
     initTooltip() {
         this._tooltipHelper = new SankeySeriesTooltipHelper(this), this._nodeMark && this._tooltipHelper.activeTriggerSet.mark.add(this._nodeMark), 
@@ -687,21 +683,30 @@ export class SankeySeries extends CartesianSeries {
     getMeasureField() {
         return [ this._valueField ];
     }
-    getSeriesKeys() {
-        var _a, _b;
-        if (this._seriesField) {
-            const keyArray = [];
-            return null === (_b = null === (_a = this._nodesSeriesData) || void 0 === _a ? void 0 : _a.getDataView()) || void 0 === _b || _b.latestData.forEach((datum => {
-                var _a;
-                keyArray.push(null !== (_a = datum[this._seriesField]) && void 0 !== _a ? _a : datum.datum[this._seriesField]);
-            })), keyArray;
+    getRawDataStatisticsByField(field, isNumeric) {
+        var _a;
+        if (this._rawStatisticsCache || (this._rawStatisticsCache = {}), !this._rawStatisticsCache[field]) {
+            this._viewDataStatistics && 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] = {
+                values: this._collectByField(field)
+            });
         }
-        return [];
+        return this._rawStatisticsCache[field];
+    }
+    _collectByField(field) {
+        var _a, _b, _c;
+        const keyArray = [], rawData = null === (_b = null === (_a = this.getRawData()) || void 0 === _a ? void 0 : _a.latestData) || void 0 === _b ? void 0 : _b[0];
+        if (!rawData) return [];
+        if (rawData.links) (null === (_c = rawData.nodes) || void 0 === _c ? void 0 : _c.length) && rawData.nodes.forEach((node => {
+            node[this._seriesField] && keyArray.push(node[this._seriesField]);
+        })); else if (rawData.nodes) {
+            const set = new Set;
+            return collectHierarchyField(set, rawData.nodes, this._seriesField), Array.from(set);
+        }
+        return keyArray;
     }
     onLayoutEnd(ctx) {
         super.onLayoutEnd(ctx), this._viewBox.set(0, 0, this._region.getLayoutRect().width, this._region.getLayoutRect().height), 
-        this._rawData.reRunAllTransform(), this.getViewData().reRunAllTransform(), this._nodesSeriesData.updateData(), 
-        this._linksSeriesData.updateData();
+        this.getViewData().reRunAllTransform(), this._nodesSeriesData.updateData(), this._linksSeriesData.updateData();
     }
     getDefaultShapeType() {
         return "square";