tweak the pipeline and fix legend on stream charts.

src/chart/chord.js

 import * as echarts from '../echarts';
-import * as zrUtil from 'zrender/src/core/util';
 
 import './chord/ChordSeries';
 import './chord/ChordView';
@@ -9,5 +8,5 @@ import dataColor from '../visual/dataColor';
 import dataFilter from '../processor/dataFilter';
 
 echarts.registerLayout(chordCircularLayout);
-echarts.registerVisual(zrUtil.curry(dataColor, 'chord'));
-echarts.registerProcessor(zrUtil.curry(dataFilter, 'pie'));
\ No newline at end of file
+echarts.registerVisual(dataColor('chord'));
+echarts.registerProcessor(dataFilter('pie'));
\ No newline at end of file

src/chart/funnel.js

 import * as echarts from '../echarts';
-import * as zrUtil from 'zrender/src/core/util';
 
 import './funnel/FunnelSeries';
 import './funnel/FunnelView';
@@ -8,6 +7,6 @@ import dataColor from '../visual/dataColor';
 import funnelLayout from './funnel/funnelLayout';
 import dataFilter from '../processor/dataFilter';
 
-echarts.registerVisual(zrUtil.curry(dataColor, 'funnel'));
+echarts.registerVisual(dataColor('funnel'));
 echarts.registerLayout(funnelLayout);
-echarts.registerProcessor(zrUtil.curry(dataFilter, 'funnel'));
\ No newline at end of file
+echarts.registerProcessor(dataFilter('funnel'));
\ No newline at end of file

src/chart/pie.js

@@ -23,6 +23,6 @@ createDataSelectAction('pie', [{
     method: 'unSelect'
 }]);
 
-echarts.registerVisual(zrUtil.curry(dataColor, 'pie'));
+echarts.registerVisual(dataColor('pie'));
 echarts.registerLayout(zrUtil.curry(pieLayout, 'pie'));
-echarts.registerProcessor(zrUtil.curry(dataFilter, 'pie'));
\ No newline at end of file
+echarts.registerProcessor(dataFilter('pie'));
\ No newline at end of file

src/chart/radar.js

 
 import * as echarts from '../echarts';
-import * as zrUtil from 'zrender/src/core/util';
 
 // Must use radar component
 import '../component/radar';
@@ -13,8 +12,8 @@ import radarLayout from './radar/radarLayout';
 import dataFilter from '../processor/dataFilter';
 import backwardCompat from './radar/backwardCompat';
 
-echarts.registerVisual(zrUtil.curry(dataColor, 'radar'));
+echarts.registerVisual(dataColor('radar'));
 echarts.registerVisual(visualSymbol('radar', 'circle'));
 echarts.registerLayout(radarLayout);
-echarts.registerProcessor(zrUtil.curry(dataFilter, 'radar'));
+echarts.registerProcessor(dataFilter('radar'));
 echarts.registerPreprocessor(backwardCompat);
\ No newline at end of file

src/chart/themeRiver.js

 import * as echarts from '../echarts';
-import * as zrUtil from 'zrender/src/core/util';
 
 import '../component/singleAxis';
 import './themeRiver/ThemeRiverSeries';
@@ -11,4 +10,4 @@ import dataFilter from '../processor/dataFilter';
 
 echarts.registerLayout(themeRiverLayout);
 echarts.registerVisual(themeRiverVisual);
-echarts.registerProcessor(zrUtil.curry(dataFilter, 'themeRiver'));
\ No newline at end of file
+echarts.registerProcessor(dataFilter('themeRiver'));
\ No newline at end of file

src/chart/treemap/treemapLayout.js

@@ -17,12 +17,11 @@ var PATH_UPPER_LABEL_HEIGHT = ['upperLabel', 'height'];
 /**
  * @public
  */
-export default function (ecModel, api, payload) {
-    // Layout result in each node:
-    // {x, y, width, height, area, borderWidth}
-    var condition = {mainType: 'series', subType: 'treemap', query: payload};
-    ecModel.eachComponent(condition, function (seriesModel) {
-
+export default {
+    seriesType: 'treemap',
+    reset: function (seriesModel, ecModel, api, payload) {
+        // Layout result in each node:
+        // {x, y, width, height, area, borderWidth}
         var ecWidth = api.getWidth();
         var ecHeight = api.getHeight();
         var seriesOption = seriesModel.option;
@@ -118,8 +117,8 @@ export default function (ecModel, api, payload) {
             viewRoot,
             0
         );
-    });
-}
+    }
+};
 
 /**
  * Layout treemap with squarify algorithm.

src/chart/treemap/treemapVisual.js

@@ -6,11 +6,9 @@ var isArray = zrUtil.isArray;
 
 var ITEM_STYLE_NORMAL = 'itemStyle';
 
-export default function (ecModel, api, payload) {
-
-    var condition = {mainType: 'series', subType: 'treemap', query: payload};
-    ecModel.eachComponent(condition, function (seriesModel) {
-
+export default {
+    seriesType: 'treemap',
+    reset: function (seriesModel, ecModel, api, payload) {
         var tree = seriesModel.getData().tree;
         var root = tree.root;
         var seriesItemStyleModel = seriesModel.getModel(ITEM_STYLE_NORMAL);
@@ -31,8 +29,8 @@ export default function (ecModel, api, payload) {
             seriesModel.getViewRoot().getAncestors(),
             seriesModel
         );
-    });
-}
+    }
+};
 
 function travelTree(
     node, designatedVisual, levelItemStyles, seriesItemStyleModel,

src/component/dataZoom/dataZoomProcessor.js

 import * as echarts from '../../echarts';
 
 echarts.registerProcessor({
-    getTargetSeries: function (ecModel, api) {
+    getTargetSeries: function (ecModel) {
         var seriesModels = [];
         ecModel.eachComponent('dataZoom', function (dataZoomModel) {
             dataZoomModel.eachTargetAxis(function (dimNames, axisIndex, dataZoomModel) {

src/echarts.js

@@ -768,7 +768,7 @@ var updateMethods = {
             return;
         }
 
-        ecModel.restoreData();
+        ecModel.restoreData(payload);
 
         scheduler.performSeriesTasks(ecModel);
 

src/model/Global.js

@@ -572,7 +572,7 @@ var GlobalModel = Model.extend({
         createSeriesIndices(this, filteredSeries);
     },
 
-    restoreData: function () {
+    restoreData: function (payload) {
         var componentsMap = this._componentsMap;
 
         createSeriesIndices(this, componentsMap.get('series'));
@@ -587,7 +587,8 @@ var GlobalModel = Model.extend({
             ComponentModel.getAllClassMainTypes(),
             function (componentType, dependencies) {
                 each(componentsMap.get(componentType), function (component) {
-                    component.restoreData();
+                    (componentType !== 'series' || !isNotTargetSeries(component, payload))
+                        && component.restoreData();
                 });
             }
         );
@@ -595,6 +596,17 @@ var GlobalModel = Model.extend({
 
 });
 
+function isNotTargetSeries(seriesModel, payload) {
+    if (payload) {
+        var index = payload.seiresIndex;
+        var id = payload.seriesId;
+        var name = payload.seriesName;
+        return (index != null && seriesModel.componentIndex !== index)
+            || (id != null && seriesModel.id !== id)
+            || (name != null && seriesModel.name !== name);
+    }
+}
+
 /**
  * @inner
  */

src/processor/dataFilter.js

-export default function (seriesType, ecModel) {
-    var legendModels = ecModel.findComponents({
-        mainType: 'legend'
-    });
-    if (!legendModels || !legendModels.length) {
-        return;
-    }
-    ecModel.eachSeriesByType(seriesType, function (series) {
-        var data = series.getData();
-        data.filterSelf(function (idx) {
-            var name = data.getName(idx);
-            // If in any legend component the status is not selected.
-            for (var i = 0; i < legendModels.length; i++) {
-                if (!legendModels[i].isSelected(name)) {
-                    return false;
-                }
+export default function (seriesType) {
+    return {
+        seriesType: seriesType,
+        reset: function (seriesModel, ecModel) {
+            var legendModels = ecModel.findComponents({
+                mainType: 'legend'
+            });
+            if (!legendModels || !legendModels.length) {
+                return;
             }
-            return true;
-        }, this);
-    }, this);
+            var data = seriesModel.getData();
+            data.filterSelf(function (idx) {
+                var name = data.getName(idx);
+                // If in any legend component the status is not selected.
+                for (var i = 0; i < legendModels.length; i++) {
+                    if (!legendModels[i].isSelected(name)) {
+                        return false;
+                    }
+                }
+                return true;
+            }, this);
+        }
+    };
 }
\ No newline at end of file

src/stream/Scheduler.js

@@ -270,36 +270,40 @@ function createOverallStageTask(scheduler, stageHandler, stageHandlerRecord, ecM
             {ecModel: ecModel, api: api, overallReset: stageHandler.overallReset}
         );
 
-    // Consider 2 cases:
-    // 1) An overall task with seriesType detected or has `getTargetSeries`, we add
-    // stub in each pipelines, it will set the overall task dirty when the pipeline
-    // progress. Moreover, to avoid call the overall task each frame (too frequent),
-    // we set the pipeline block.
-    // 2) Otherwise, (usually it is legancy case), the overall task will only be
-    // executed when upstream dirty. Otherwise the progressive rendering of all
-    // pipelines will be disabled unexpectedly.
-
     // Reuse orignal stubs.
     var stubs = overallTask.agentStubs = overallTask.agentStubs || [];
     var stubIndex = 0;
 
     var seriesType = stageHandler.seriesType;
     var getTargetSeries = stageHandler.getTargetSeries;
+    var overallProgress = true;
+
+    // An overall task with seriesType detected or has `getTargetSeries`, we add
+    // stub in each pipelines, it will set the overall task dirty when the pipeline
+    // progress. Moreover, to avoid call the overall task each frame (too frequent),
+    // we set the pipeline block.
     if (seriesType) {
         ecModel.eachRawSeriesByType(seriesType, createStub);
     }
     else if (getTargetSeries) {
         each(getTargetSeries(ecModel, api), createStub);
     }
+    // Otherwise, (usually it is legancy case), the overall task will only be
+    // executed when upstream dirty. Otherwise the progressive rendering of all
+    // pipelines will be disabled unexpectedly.
+    else {
+        overallProgress = false;
+        each(ecModel.getSeries(), createStub);
+    }
 
     function createStub(seriesModel) {
         var stub = stubs[stubIndex] = stubs[stubIndex] || createTask(
             {plan: prepareData, reset: stubReset, onDirty: stubOnDirty},
-            {model: seriesModel}
+            {model: seriesModel, overallProgress: overallProgress}
         );
         stubIndex++;
         stub.agent = overallTask;
-        stub.__block = true;
+        stub.__block = overallProgress;
 
         pipe(scheduler, seriesModel, stub);
     }
@@ -315,7 +319,7 @@ function overallTaskReset(context) {
 
 function stubReset(context, upstreamContext) {
     pullData(context, upstreamContext);
-    return stubProgress;
+    return context.overallProgress && stubProgress;
 }
 
 function stubProgress() {
@@ -324,7 +328,7 @@ function stubProgress() {
 }
 
 function stubOnDirty() {
-    this.agent && (this.agent._dirty = true);
+    this.agent && this.agent.dirty();
 }
 
 function seriesTaskPlan(context, upstreamContext) {
@@ -447,8 +451,10 @@ mockMethods(apiMock, ExtensionAPI);
 ecModelMock.eachSeriesByType = ecModelMock.eachRawSeriesByType = function (type) {
     seriesType = type;
 };
-ecModelMock.filterSeries = function () {
-    seriesType = 'ALL_SERIES';
+ecModelMock.eachComponent = function (cond) {
+    if (cond.mainType === 'series' && cond.subType) {
+        seriesType = cond.subType;
+    }
 };
 
 function mockMethods(target, Clz) {

src/visual/dataColor.js

@@ -2,18 +2,28 @@
 // Applicable for charts that require applying color palette
 // in data level (like pie, funnel, chord).
 
-export default function (seriesType, ecModel) {
-    // Pie and funnel may use diferrent scope
-    var paletteScope = {};
-    ecModel.eachRawSeriesByType(seriesType, function (seriesModel) {
-        var dataAll = seriesModel.getRawData();
-        var idxMap = {};
-        if (!ecModel.isSeriesFiltered(seriesModel)) {
+export default function (seriesType) {
+    return {
+        getTargetSeries: function (ecModel) {
+            // Pie and funnel may use diferrent scope
+            var paletteScope = {};
+            var seiresModels = [];
+            ecModel.eachSeriesByType(seriesType, function (seriesModel) {
+                seriesModel.__paletteScope = paletteScope;
+                seriesModel.push(seriesModel);
+            });
+            return seiresModels;
+        },
+        overallReset: function (seriesModel, ecModel) {
+            var dataAll = seriesModel.getRawData();
+            var idxMap = {};
             var data = seriesModel.getData();
+
             data.each(function (idx) {
                 var rawIdx = data.getRawIndex(idx);
                 idxMap[rawIdx] = idx;
             });
+
             dataAll.each(function (rawIdx) {
                 var filteredIdx = idxMap[rawIdx];
 
@@ -25,7 +35,9 @@ export default function (seriesType, ecModel) {
                     // FIXME Performance
                     var itemModel = dataAll.getItemModel(rawIdx);
                     var color = itemModel.get('itemStyle.color')
-                        || seriesModel.getColorFromPalette(dataAll.getName(rawIdx), paletteScope);
+                        || seriesModel.getColorFromPalette(
+                            dataAll.getName(rawIdx), seriesModel.__paletteScope
+                        );
                     // Legend may use the visual info in data before processed
                     dataAll.setItemVisual(rawIdx, 'color', color);
 
@@ -40,5 +52,5 @@ export default function (seriesType, ecModel) {
                 }
             });
         }
-    });
+    };
 }
\ No newline at end of file