diff --git a/pyecharts/custom/page.py b/pyecharts/custom/page.py index 32ef37f9..69e9b213 100644 --- a/pyecharts/custom/page.py +++ b/pyecharts/custom/page.py @@ -61,10 +61,12 @@ class Page(object): # make sure echarts is the item in the list # require(['echarts'....], function(ec) {..}) need it to be first # but dependencies is a set so has no sequence - dependencies = ['echarts'] + list(dependencies.remove('echarts')) + if len(dependencies) > 1: + dependencies.remove('echarts') + dependencies = ['echarts'] + list(dependencies) require_config = produce_require_configuration( - self._js_dependencies, self._jshost) + dependencies, self._jshost) tmp = template.JINJA2_ENV.get_template(_tmp) html = tmp.render( single_chart=components, dom=doms, **require_config) diff --git a/test/test_page.py b/test/test_page.py index 296ae14f..1ec94b56 100644 --- a/test/test_page.py +++ b/test/test_page.py @@ -1,13 +1,15 @@ #coding=utf-8 from __future__ import unicode_literals -from pyecharts import Bar, Scatter3D, Line, Pie, Kline, Radar, WordCloud, Liquid +from pyecharts import ( + Bar, Scatter3D, Line, Pie, Map, + Kline, Radar, WordCloud, Liquid) from pyecharts import Page import codecs import json -def create_two_bars(): +def create_three(): page = Page() # bar @@ -27,11 +29,20 @@ def create_two_bars(): scatter3D = Scatter3D("3D 散点图示例", width=1200, height=600) scatter3D.add("", data, is_visualmap=True, visual_range_color=range_color) page.add(scatter3D) + + # guangdong + value = [20, 190, 253, 77, 65] + attr = ['汕头市', '汕尾市', '揭阳市', '阳江市', '肇庆市'] + map = Map("广东地图示例", width=1200, height=600) + map.add("", attr, value, maptype='广东', is_visualmap=True, + visual_text_color='#000') + page.add(map) + return page def test_two_bars(): - page = create_two_bars() + page = create_three() page.render() with codecs.open('render.html', 'r', 'utf-8') as f: actual_content = f.read() @@ -40,12 +51,20 @@ def test_two_bars(): def test_page_embed(): - page = create_two_bars() + page = create_three() html = page.render_embed() assert '' not in html assert json.dumps("柱状图数据堆叠示例") in html +def test_page_in_notebook(): + page = create_three() + html = page._repr_html_() + assert 'echartsgl' in html + assert 'echarts' in html + assert 'guangdong' in html + + def test_more(): page = Page()