未验证 提交 644922e3 编写于 作者: D Deqing Li 提交者: GitHub

Merge pull request #11213 from deqingli/master

Fix dataStack work incorrectly with dataZoom
......@@ -161,6 +161,8 @@ export default echarts.extendChartView({
var max = [];
bbox.fromPoints(points, min, max);
// If don't Store min max when collapse the root node after roam,
// the root node will disappear.
var oldMin = this._min;
var oldMax = this._max;
......
......@@ -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.
......
......@@ -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
......
......@@ -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) {
......
......@@ -128,5 +128,6 @@
"treemap-option": 1,
"treemap-option2": 1,
"visualMap-categories": 1,
"axes": 0
"axes": 0,
"stackBar-dataZoom": 7
}
\ No newline at end of file
此差异已折叠。
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册