From c3909fee906af7252dc647bd817f0fad609fd59b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E9=94=AE=E5=86=AC?= Date: Tue, 13 Mar 2018 17:24:44 +0800 Subject: [PATCH] Timeline bug fixed (#438) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * #438 修复 Timeline 图累计多个 Bar 图会导致条形宽度压缩的 bug 以及不能正常显示 Tooltip 组件的 bug * 文档细节修正 * 测试修复以及版本号更新 --- docs/zh-cn/changelog.md | 10 ++++++++-- docs/zh-cn/django.md | 2 +- pyecharts/_version.py | 2 +- pyecharts/custom/timeline.py | 8 +++++--- test/test_timeline.py | 7 +++---- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/docs/zh-cn/changelog.md b/docs/zh-cn/changelog.md index 6e0dbf1f..633f82c7 100644 --- a/docs/zh-cn/changelog.md +++ b/docs/zh-cn/changelog.md @@ -1,9 +1,15 @@ # 版本日志 -* ### version 0.4.1 (development) +* ### version 0.4.2 * TODO -* ### version 0.4.0 - 2018.03.09（Current） +* ### version 0.4.1 - 2018.03.13（Current） + + #### Fixed + * [issue#437](https://github.com/pyecharts/pyecharts/issues/437) 修复 Timeline 图累计多个 Bar 图会导致条形宽度压缩的 bug + * [issue#437](https://github.com/pyecharts/pyecharts/issues/437) 修复 Timeline 图不能正常显示 Tooltip 组件的 bug + +* ### version 0.4.0 - 2018.03.09 #### Added * `EchartsEnvironment` 类性增 `render_chart_to_file` diff --git a/docs/zh-cn/django.md b/docs/zh-cn/django.md index cad2cd14..4bdd457b 100644 --- a/docs/zh-cn/django.md +++ b/docs/zh-cn/django.md @@ -168,7 +168,7 @@ myfirstvis 目录 - { {myechart|safe }} + {{ myechart|safe }} diff --git a/pyecharts/_version.py b/pyecharts/_version.py index da60f5cf..01fec898 100644 --- a/pyecharts/_version.py +++ b/pyecharts/_version.py @@ -1,2 +1,2 @@ -__version__ = '0.4.0' +__version__ = '0.4.1' __author__ = 'chenjiandongx' diff --git a/pyecharts/custom/timeline.py b/pyecharts/custom/timeline.py index 791d069d..39317715 100644 --- a/pyecharts/custom/timeline.py +++ b/pyecharts/custom/timeline.py @@ -106,12 +106,14 @@ class Timeline(Base): self._option.get('options').append({ "legend": chart.options.get('legend'), "series": chart.options.get('series'), - "title": chart.options.get('title') + "title": chart.options.get('title'), + "tooltip": chart.options.get('tooltip') }) _tmp_series = copy.deepcopy(chart.options.get('series')) for _s in _tmp_series: - _s.pop("data", None) - self._option.get("baseOption").get("series").append(_s) + if _s.get("type") == "map": + _s.pop("data", None) + self._option.get("baseOption").get("series").append(_s) def __check_components(self, chart): """ diff --git a/test/test_timeline.py b/test/test_timeline.py index 7ba1b0c3..e36803c9 100644 --- a/test/test_timeline.py +++ b/test/test_timeline.py @@ -46,7 +46,7 @@ def test_timeline_bar(): timeline.add(bar_3, '2014 年') timeline.add(bar_4, '2015 年') timeline.add(bar_5, '2016 年') - assert len(timeline._option.get("baseOption").get("series")) == 20 + assert len(timeline.options.get("baseOption").get("series")) == 0 timeline.render() @@ -79,7 +79,7 @@ def test_timeline_pie(): timeline.add(pie_3, '2014 年') timeline.add(pie_4, '2015 年') timeline.add(pie_5, '2016 年') - assert len(timeline._option.get("baseOption").get("series")) == 5 + assert len(timeline.options.get("baseOption").get("series")) == 0 timeline.render() @@ -131,7 +131,6 @@ def test_timeline_bar_line(): timeline.add(overlap_2, '3 月') timeline.add(overlap_3, '4 月') timeline.add(overlap_4, '5 月') - assert len(timeline._option.get("baseOption").get("series")) == 10 timeline.render() @@ -150,7 +149,7 @@ def test_timeline_map(): map.add("", attr, value, maptype='china', is_visualmap=True, visual_text_color='#000', visual_top="30%") timeline.add(map, "test2") - assert len(timeline._option.get("baseOption").get("series")) == 2 + assert len(timeline.options.get("baseOption").get("series")) == 2 timeline.render()