-
Notifications
You must be signed in to change notification settings - Fork 19.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix #7955 (do not filter empty data item in data zoom, which makes li…
…ne chart keeping broken)
- Loading branch information
Showing
2 changed files
with
255 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,232 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1" /> | ||
| <script src="lib/esl.js"></script> | ||
| <script src="lib/config.js"></script> | ||
| <script src="lib/jquery.min.js"></script> | ||
| <script src="lib/facePrint.js"></script> | ||
| <script src="lib/testHelper.js"></script> | ||
| <link rel="stylesheet" href="lib/reset.css" /> | ||
| </head> | ||
| <body> | ||
| <style> | ||
| .test-title { | ||
| background: #146402; | ||
| color: #fff; | ||
| } | ||
| </style> | ||
|
|
||
|
|
||
| <div id="main0"></div> | ||
| <div id="main1"></div> | ||
| <div id="main2"></div> | ||
|
|
||
|
|
||
| <script> | ||
|
|
||
| var chart; | ||
| var myChart; | ||
| var option; | ||
|
|
||
| require([ | ||
| 'echarts'/*, 'map/js/china' */ | ||
| ], function (echarts) { | ||
|
|
||
| // Thanks to <https://github.com/vision57> | ||
| // See <https://github.com/ecomfe/echarts/issues/7666> | ||
|
|
||
| function createParams() { | ||
| var notMerge = true; | ||
| var option = { | ||
| dataZoom: [{ | ||
| type: 'inside' | ||
| }, { | ||
| type: 'slider' | ||
| }], | ||
| xAxis: { | ||
| type: 'time' | ||
| }, | ||
| yAxis: { | ||
| type: 'value' | ||
| }, | ||
| series: [] | ||
| }; | ||
| return { | ||
| title: 'series empty, should no exception.', | ||
| notMerge: notMerge, | ||
| option: option, | ||
| info: option | ||
| }; | ||
| } | ||
|
|
||
| chart = myChart = testHelper.create(echarts, 'main0', createParams()); | ||
| // Set option again with notMerge mode. | ||
| chart.setOption(createParams().option, true); | ||
| }); | ||
|
|
||
| </script> | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
| <script> | ||
|
|
||
| // See https://github.com/ecomfe/echarts/issues/7955 | ||
| // Thanks to https://github.com/cbtpro | ||
|
|
||
| require([ | ||
| 'echarts', | ||
| 'extension/bmap' | ||
| ], function (echarts) { | ||
| var option = { | ||
| tooltip: { | ||
| trigger: 'axis' | ||
| }, | ||
| legend: { | ||
| }, | ||
| toolbox: { | ||
| feature: { | ||
| saveAsImage: {} | ||
| } | ||
| }, | ||
| xAxis: { | ||
| type: 'category', | ||
| data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] | ||
| }, | ||
| yAxis: { | ||
| type: 'value' | ||
| }, | ||
| series: [ | ||
| { | ||
| name:'Step Start', | ||
| type:'line', | ||
| step: 'start', | ||
| data:[120, 132, null, 134, 90, 230, 210] | ||
| }, | ||
| { | ||
| name:'Step Middle', | ||
| type:'line', | ||
| step: 'middle', | ||
| data:[220, 282, 201, 234, null, 430, 410] | ||
| } | ||
| ] | ||
| } | ||
|
|
||
| var chart = testHelper.create(echarts, 'main1', { | ||
| title: 'When toolbox.dataZoom enabled, line should keep broken.', | ||
| option: option, | ||
| button: { | ||
| text: 'Click enable toolbox.dataZoom', | ||
| onClick: function () { | ||
| chart.setOption({ | ||
| toolbox: { | ||
| feature: { | ||
| dataZoom: {} | ||
| } | ||
| }, | ||
| // xAxis: { | ||
| // type: 'category', | ||
| // data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] | ||
| // }, | ||
| // yAxis: { | ||
| // type: 'value' | ||
| // }, | ||
| // series: [ | ||
| // { | ||
| // name:'Step Start', | ||
| // type:'line', | ||
| // step: 'start', | ||
| // data:[120, 132, null, 134, 90, 230, 210] | ||
| // }, | ||
| // { | ||
| // name:'Step Middle', | ||
| // type:'line', | ||
| // step: 'middle', | ||
| // data:[220, 282, 201, 234, null, 430, 410] | ||
| // }, | ||
| // { | ||
| // name:'Step End', | ||
| // type:'line', | ||
| // step: 'end', | ||
| // data:[450, 432, 401, 454, 590, null, 510] | ||
| // } | ||
| // ] | ||
| }); | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| }); | ||
| </script> | ||
|
|
||
|
|
||
|
|
||
|
|
||
| <script> | ||
|
|
||
| require([ | ||
| 'echarts', | ||
| 'extension/bmap' | ||
| ], function (echarts) { | ||
|
|
||
| var option = { | ||
| tooltip: { | ||
| trigger: 'axis' | ||
| }, | ||
| legend: { | ||
| }, | ||
| xAxis: { | ||
| }, | ||
| yAxis: { | ||
| }, | ||
| series: [ | ||
| { | ||
| name:'Step Start', | ||
| type:'line', | ||
| data:[[12, 120], [23, 132], null, [19, 134], [45, 90]] | ||
| }, | ||
| { | ||
| name:'Step Middle', | ||
| type:'line', | ||
| data:[[42, 120], [53, 132], [null, 55], [49, 134], [15, 90]] | ||
| } | ||
| ] | ||
| } | ||
|
|
||
| var chart = testHelper.create(echarts, 'main2', { | ||
| title: 'Add dataZoom, and zoom data, line should keep broken', | ||
| option: option, | ||
| button: { | ||
| text: 'Click to add dataZoom', | ||
| onClick: function () { | ||
| chart.setOption({ | ||
| dataZoom: [{ | ||
| }, { | ||
| type: 'inside' | ||
| }] | ||
| }) | ||
| } | ||
| } | ||
| }); | ||
| }); | ||
|
|
||
| </script> | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
| </body> | ||
| </html> |