Merge pull request pyecharts#440 from pyecharts/dev

chenjiandongx · web-flow · commit 2bfc0ef59386 · 2018-03-13T19:17:23.000+08:00
Release Version 0.4.1
diff --git 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
@@ -168,7 +168,7 @@ myfirstvis 目录
 </head>
 
 <body>
-  { {myechart|safe }}
+  {{ myechart|safe }}
 </body>
 
 </html>
diff --git 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
@@ -106,12 +106,14 @@ def add(self, chart, time_point):
         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
@@ -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()
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-__version__ = '0.4.0'`
	`1`	`+__version__ = '0.4.1'`
`2`	`2`	`__author__ = 'chenjiandongx'`