diff --git a/src/component/dataZoom/DataZoomModel.js b/src/component/dataZoom/DataZoomModel.js index 8a3eafbc8c90161bf0f94f22dd5f89474720d536..2401a75c3afe369fe6daef5b72db8bdd157501fd 100644 --- a/src/component/dataZoom/DataZoomModel.js +++ b/src/component/dataZoom/DataZoomModel.js @@ -16,7 +16,9 @@ define(function(require) { type: 'dataZoom', - dependencies: ['xAxis', 'yAxis', 'zAxis', 'radiusAxis', 'angleAxis', 'series'], + dependencies: [ + 'xAxis', 'yAxis', 'zAxis', 'radiusAxis', 'angleAxis', 'series' + ], /** * @protected diff --git a/test/dataZoom-rainfall-inside.html b/test/dataZoom-rainfall-inside.html index d36f723d63930bed919af13d6ad1805f296e3bfe..c8820c7f052f77f1d3c389704f1b2f5962f2accb 100644 --- a/test/dataZoom-rainfall-inside.html +++ b/test/dataZoom-rainfall-inside.html @@ -1,6 +1,7 @@ + diff --git a/test/parallel-aqi.html b/test/parallel-aqi.html index 67c74fe9fe6132edeb3174093210f438c3de92b3..2025d2b84a7ca5b3ab10258f879e36efc682b02f 100644 --- a/test/parallel-aqi.html +++ b/test/parallel-aqi.html @@ -36,6 +36,7 @@ 'echarts', 'echarts/chart/parallel', 'echarts/component/legend', + 'echarts/component/dataZoom', 'echarts/component/parallel', ], function (dataBJ, dataGZ, dataSH, zrUtil, echarts) { @@ -43,7 +44,6 @@ renderer: 'canvas' }); -window.cc = chart; var lineStyle = { normal: { // opacity: 0.5, @@ -83,16 +83,21 @@ window.cc = chart; + schema[6].text + ':' + value[6] + '
'; } }, + dataZoom: { + show: true, + orient: 'vertical', + parallelAxisIndex: [0] + }, parallelAxis: [ {dim: 'dim0', name: schema[0].text, inverse: true, max: 31, nameLocation: 'start'}, {dim: 'dim1', name: schema[1].text}, - // {dim: 'dim2', name: schema[2].text}, - // {dim: 'dim3', name: schema[3].text}, - // {dim: 'dim4', name: schema[4].text}, - // {dim: 'dim5', name: schema[5].text}, - // {dim: 'dim6', name: schema[6].text}, - // {dim: 'dim7', name: schema[7].text, - // type: 'category', data: ['优', '良', '轻度污染', '中度污染', '重度污染', '严重污染']} + {dim: 'dim2', name: schema[2].text}, + {dim: 'dim3', name: schema[3].text}, + {dim: 'dim4', name: schema[4].text}, + {dim: 'dim5', name: schema[5].text}, + {dim: 'dim6', name: schema[6].text}, + {dim: 'dim7', name: schema[7].text, + type: 'category', data: ['优', '良', '轻度污染', '中度污染', '重度污染', '严重污染']} ], parallel: { y2: 100,