fix: dataStack work incorrectly with toolbox dataZoom apache#10972 ap…

…ache#8520 apache#7534 apache#10359 apache#8069 apache#7872 apache#7732 apache#7672
deqingli · Sep 10, 2019 · 16dd99d · 16dd99d
1 parent 6217cd0
commit 16dd99d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/component/legend.js b/src/component/legend.js
@@ -30,7 +30,7 @@ import legendFilter from './legend/legendFilter';
 import Component from '../model/Component';
 
 // Series Filter
-echarts.registerProcessor(legendFilter);
+echarts.registerProcessor(echarts.PRIORITY.PROCESSOR.SERIES_FILTER, legendFilter);
 
 Component.registerSubTypeDefaulter('legend', function () {
     // Default 'plain' when no type specified.

diff --git a/src/echarts.js b/src/echarts.js
@@ -60,6 +60,8 @@ export var dependencies = {
 var TEST_FRAME_REMAIN_TIME = 1;
 
 var PRIORITY_PROCESSOR_FILTER = 1000;
+var PRIORITY_PROCESSOR_SERIES_FILTER = 800;
+var PRIORITY_PROCESSOR_DATASTACK = 900;
 var PRIORITY_PROCESSOR_STATISTIC = 5000;
 
 var PRIORITY_VISUAL_LAYOUT = 1000;
@@ -75,6 +77,7 @@ var PRIORITY_VISUAL_BRUSH = 5000;
 export var PRIORITY = {
     PROCESSOR: {
         FILTER: PRIORITY_PROCESSOR_FILTER,
+        SERIES_FILTER: PRIORITY_PROCESSOR_SERIES_FILTER,
         STATISTIC: PRIORITY_PROCESSOR_STATISTIC
     },
     VISUAL: {
@@ -2420,7 +2423,7 @@ export function getMap(mapName) {
 
 registerVisual(PRIORITY_VISUAL_GLOBAL, seriesColor);
 registerPreprocessor(backwardCompat);
-registerProcessor(PRIORITY_PROCESSOR_STATISTIC, dataStack);
+registerProcessor(PRIORITY_PROCESSOR_DATASTACK, dataStack);
 registerLoading('default', loadingDefault);
 
 // Default actions

diff --git a/src/processor/dataStack.js b/src/processor/dataStack.js
@@ -23,7 +23,7 @@ import {createHashMap, each} from 'zrender/src/core/util';
 //     data processing stage is blocked in stream.
 //     See <module:echarts/stream/Scheduler#performDataProcessorTasks>
 // (2) Only register once when import repeatly.
-//     Should be executed before after series filtered and before stack calculation.
+//     Should be executed after series filtered and before stack calculation.
 export default function (ecModel) {
     var stackInfoMap = createHashMap();
     ecModel.eachSeries(function (seriesModel) {