diff --git a/src/chart/tree.js b/src/chart/tree.js index 6e9bde7ba65f246814728f1e55adce476a820ed2..fec3db9e78333b4cdf4f728dcb03a0ca601de94f 100644 --- a/src/chart/tree.js +++ b/src/chart/tree.js @@ -1,5 +1,4 @@ import * as echarts from '../echarts'; -import * as zrUtil from 'zrender/src/core/util'; import './tree/TreeSeries'; import './tree/TreeView'; diff --git a/src/component/visualMap/visualEncoding.js b/src/component/visualMap/visualEncoding.js index d0a3ac0f58bb744ab2452fc3ce06bc753785112e..3a91c58ae378620c6ea47a6cecad592b111d1a5d 100644 --- a/src/component/visualMap/visualEncoding.js +++ b/src/component/visualMap/visualEncoding.js @@ -6,6 +6,7 @@ import VisualMapping from '../../visual/VisualMapping'; var VISUAL_PRIORITY = echarts.PRIORITY.VISUAL.COMPONENT; echarts.registerVisual(VISUAL_PRIORITY, { + allSeries: true, reset: function (seriesModel, ecModel) { var resetDefines = []; ecModel.eachComponent('visualMap', function (visualMapModel) { @@ -30,6 +31,7 @@ echarts.registerVisual(VISUAL_PRIORITY, { // Only support color. echarts.registerVisual(VISUAL_PRIORITY, { + allSeries: true, reset: function (seriesModel, ecModel) { var data = seriesModel.getData(); var visualMetaList = []; diff --git a/src/stream/Scheduler.js b/src/stream/Scheduler.js index ae0e0e64c8694d3e19bbb619a483dd40ab16c17d..0b8a8a05239543f068c0ff608b87e2e81ef4db1b 100644 --- a/src/stream/Scheduler.js +++ b/src/stream/Scheduler.js @@ -224,9 +224,21 @@ function createSeriesStageTask(scheduler, stageHandler, stageHandlerRecord, ecMo var seriesTaskMap = stageHandlerRecord.seriesTaskMap || (stageHandlerRecord.seriesTaskMap = createHashMap()); var pipelineIdMap = createHashMap(); - stageHandler.seriesType - ? ecModel.eachRawSeriesByType(stageHandler.seriesType, create) - : ecModel.eachRawSeries(create); + var seriesType = stageHandler.seriesType; + var getTargetSeries = stageHandler.getTargetSeries; + + // If a stageHandler should cover all series, `allSeries` should be declared mandatorily, + // to avoid some typo or abuse. Otherwise if an extension do not specify a `seriesType`, + // it works but it may cause other irrelevant charts blocked. + if (stageHandler.allSeries) { + ecModel.eachRawSeries(create); + } + else if (seriesType) { + ecModel.eachRawSeriesByType(seriesType, create); + } + else if (getTargetSeries) { + each(getTargetSeries(ecModel, api), create); + } function create(seriesModel) { var pipelineId = seriesModel.uid; diff --git a/src/visual/dataColor.js b/src/visual/dataColor.js index b9d2d914c3e07cc336e9cfc26d7917ed3e968a98..28b843993fe882e7f428df5cf2ee778d94900080 100644 --- a/src/visual/dataColor.js +++ b/src/visual/dataColor.js @@ -8,13 +8,14 @@ export default function (seriesType) { // 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) { + reset: function (seriesModel, ecModel) { var dataAll = seriesModel.getRawData(); var idxMap = {}; var data = seriesModel.getData(); diff --git a/src/visual/seriesColor.js b/src/visual/seriesColor.js index 485f5516165455d8898b8ddf25a5793390235fc5..292a9db30aef56aae87819812a4199a02670ce3d 100644 --- a/src/visual/seriesColor.js +++ b/src/visual/seriesColor.js @@ -1,6 +1,7 @@ import Gradient from 'zrender/src/graphic/Gradient'; export default { + allSeries: true, processRawSeries: true, reset: function (seriesModel, ecModel) { var data = seriesModel.getData();