feat: 桑基图增加dataset支持

src/chart/helper/createGraphDataFromDataset.ts

@@ -0,0 +1,120 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+
+import * as zrUtil from 'zrender/src/core/util';
+import SeriesData from '../../data/SeriesData';
+import Graph from '../../data/Graph';
+import linkSeriesData from '../../data/helper/linkSeriesData';
+import prepareSeriesDataSchema from '../../data/helper/createDimensions';
+import CoordinateSystem from '../../core/CoordinateSystem';
+import createSeriesData from './createSeriesData';
+import SeriesModel from '../../model/Series';
+import { convertOptionIdName } from '../../util/model';
+import { SankeyEdgeItemOption, SankeyNodeItemOption } from '../sankey/SankeySeries';
+
+export default function createGraphDataFromDataset(
+    seriesModel: SeriesModel,
+    directed: boolean,
+    beforeLink: (nodeData: SeriesData, edgeData: SeriesData) => void
+): Graph {
+    // dataset support
+    const sourceManager = seriesModel.getSourceManager();
+    const source = sourceManager.getSource();
+    const edges: SankeyEdgeItemOption[] = source.data as SankeyEdgeItemOption[];
+    const nodes: SankeyNodeItemOption[] = [];
+    const nodeNames: { [key: string]: boolean } = {};
+    edges.forEach(edge => {
+        ['source', 'target'].forEach((prop: keyof SankeyEdgeItemOption) => {
+            const nodeName = edge[prop] as string;
+            if (!nodeNames[nodeName]) {
+                nodeNames[nodeName] = true;
+                nodes.push({ 'name': nodeName } as SankeyNodeItemOption);
+            }
+        });
+    });
+    const graph = new Graph(directed);
+    for (let i = 0; i < nodes.length; i++) {
+        console.log(nodes[i])
+        graph.addNode(zrUtil.retrieve(
+            // Id, name, dataIndex
+            nodes[i].id, nodes[i].name, i
+        ), i);
+    }
+
+    const linkNameList = [];
+    const validEdges = [];
+    let linkCount = 0;
+    for (let i = 0; i < edges.length; i++) {
+        const link = edges[i];
+        const source = link.source;
+        const target = link.target;
+        // addEdge may fail when source or target not exists
+        if (graph.addEdge(source, target, linkCount)) {
+            validEdges.push(link);
+            linkNameList.push(zrUtil.retrieve(
+                convertOptionIdName(link.id, null),
+                source + ' > ' + target
+            ));
+            linkCount++;
+        }
+    }
+
+    const coordSys = seriesModel.get('coordinateSystem');
+    let nodeData;
+    if (coordSys === 'cartesian2d' || coordSys === 'polar') {
+        nodeData = createSeriesData(nodes, seriesModel);
+    }
+    else {
+        const coordSysCtor = CoordinateSystem.get(coordSys);
+        const coordDimensions = coordSysCtor
+            ? (coordSysCtor.dimensions || []) : [];
+        // FIXME: Some geo do not need `value` dimenson, whereas `calendar` needs
+        // `value` dimension, but graph need `value` dimension. It's better to
+        // uniform this behavior.
+        if (zrUtil.indexOf(coordDimensions, 'value') < 0) {
+            coordDimensions.concat(['value']);
+        }
+
+        const { dimensions } = prepareSeriesDataSchema(nodes, {
+            coordDimensions: coordDimensions,
+            encodeDefine: seriesModel.getEncode()
+        });
+        nodeData = new SeriesData(dimensions, seriesModel);
+        nodeData.initData(nodes);
+    }
+
+    const edgeData = new SeriesData(['value'], seriesModel);
+    edgeData.initData(validEdges, linkNameList);
+
+    beforeLink && beforeLink(nodeData, edgeData);
+
+    linkSeriesData({
+        mainData: nodeData,
+        struct: graph,
+        structAttr: 'graph',
+        datas: {node: nodeData, edge: edgeData},
+        datasAttr: {node: 'data', edge: 'edgeData'}
+    });
+
+    // Update dataIndex of nodes and edges because invalid edge may be removed
+    graph.update();
+
+    return graph;
+}

src/chart/sankey/SankeySeries.ts

@@ -19,6 +19,7 @@
 
 import SeriesModel from '../../model/Series';
 import createGraphFromNodeEdge from '../helper/createGraphFromNodeEdge';
+import createGraphDataFromDataset from '../helper/createGraphDataFromDataset';
 import Model from '../../model/Model';
 import {
     SeriesOption,
@@ -34,7 +35,8 @@ import {
     GraphEdgeItemObject,
     OptionDataValueNumeric,
     DefaultEmphasisFocus,
-    CallbackDataParams
+    CallbackDataParams,
+    SeriesEncodeOptionMixin
 } from '../../util/types';
 import GlobalModel from '../../model/Global';
 import SeriesData from '../../data/SeriesData';
@@ -92,10 +94,11 @@ export interface SankeyLevelOption extends SankeyNodeStateOption, SankeyEdgeStat
     depth: number
 }
 
-export interface SankeySeriesOption
-    extends SeriesOption<SankeyBothStateOption<CallbackDataParams>, ExtraStateOption>,
+export interface SankeySeriesOption extends
+    Omit<SeriesOption<SankeyBothStateOption<CallbackDataParams>, ExtraStateOption>, 'sankey'>,
     SankeyBothStateOption<CallbackDataParams>,
-    BoxLayoutOptionMixin {
+    BoxLayoutOptionMixin,
+    SeriesEncodeOptionMixin {
     type?: 'sankey'
 
     /**
@@ -176,6 +179,10 @@ class SankeySeriesModel extends SeriesModel<SankeySeriesOption> {
             const graph = createGraphFromNodeEdge(nodes, links, this, true, beforeLink);
             return graph.data;
         }
+        else {
+            const graph = createGraphDataFromDataset(this, true, beforeLink);
+            return graph.data;
+        }
         function beforeLink(nodeData: SeriesData, edgeData: SeriesData) {
             nodeData.wrapMethod('getItemModel', function (model: Model, idx: number) {
                 const seriesModel = model.parentModel as SankeySeriesModel;