Skip to content

Commit af9ac2e

Browse files
chenjiandongxchenjiandongx
committed
Refactor: daily refactor
1 parent 603aa25 commit af9ac2e

45 files changed

Lines changed: 50 additions & 92 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pyecharts/charts/base.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
import os
44
import uuid
55

6-
from ..consts import BUILTIN_THEMES, ONLINE_HOST
76
from ..commons import utils
8-
from ..commons.structures import OrderedSet
7+
from ..consts import BUILTIN_THEMES, ONLINE_HOST
98
from ..options import InitOpts
109
from ..render.engine import RenderEngine
1110

@@ -27,12 +26,12 @@ def __init__(self, init_opts: InitOpts = InitOpts()):
2726
self.chart_id = uuid.uuid4().hex
2827
self.options: dict = {}
2928
self.js_host: str = ONLINE_HOST
30-
self.js_functions: OrderedSet = OrderedSet()
31-
self.js_dependencies: OrderedSet = OrderedSet("echarts")
29+
self.js_functions: utils.OrderedSet = utils.OrderedSet()
30+
self.js_dependencies: utils.OrderedSet = utils.OrderedSet("echarts")
3231

3332
@staticmethod
3433
def produce_js_func(fn: str) -> str:
35-
return utils._produce_js_func(fn)
34+
return utils.filter_js_func(fn)
3635

3736
def add_js_funcs(self, *fns):
3837
for fn in fns:

‎pyecharts/charts/basic_charts/bar.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# coding=utf-8
22
from ...charts.chart import AxisChart
3-
from ...options import AxisOpts, InitOpts, LabelOpts, MarkLineOpts, MarkPointOpts
43
from ...commons.types import ListTuple, Optional, Union
4+
from ...options import AxisOpts, InitOpts, LabelOpts, MarkLineOpts, MarkPointOpts
55

66

77
class Bar(AxisChart):

‎pyecharts/charts/basic_charts/boxplot.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# coding=utf-8
22
from ...charts.chart import AxisChart
3-
from ...options import AxisOpts, InitOpts, LabelOpts, MarkLineOpts, MarkPointOpts
43
from ...commons.types import ListTuple, Union
4+
from ...options import AxisOpts, InitOpts, LabelOpts, MarkLineOpts, MarkPointOpts
55

66

77
class Boxplot(AxisChart):

‎pyecharts/charts/basic_charts/effectscatter.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# coding=utf-8
22
from ...charts.chart import AxisChart
3-
from ...options import AxisOpts, EffectOpts, InitOpts, LabelOpts
43
from ...commons.types import ListTuple, Numeric, Optional, Union
4+
from ...options import AxisOpts, EffectOpts, InitOpts, LabelOpts
55

66

77
class EffectScatter(AxisChart):

‎pyecharts/charts/basic_charts/funnel.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# coding=utf-8
22
from ...charts.chart import Chart
3-
from ...options import InitOpts, LabelOpts
43
from ...commons.types import ListTuple, Numeric, Union
4+
from ...options import InitOpts, LabelOpts
55

66

77
class Funnel(Chart):

‎pyecharts/charts/basic_charts/gauge.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
# coding=utf-8
2-
32
from ...charts.chart import Chart
4-
from ...options import InitOpts
53
from ...commons.types import ListTuple, Numeric, Union
6-
7-
DEFAULT_GAUGE_TOOLTIP_FORMATTER = "{a} <br/>{b} : {c}%"
4+
from ...options import InitOpts
85

96

107
class Gauge(Chart):

‎pyecharts/charts/basic_charts/geo.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import json
44

55
from ...charts.chart import Chart
6-
from ...datasets import COORDINATES
6+
from ...commons import utils
7+
from ...commons.types import List, ListTuple, Numeric, Optional, Union
78
from ...consts import TOOLTIP_FORMATTER_TYPE
9+
from ...datasets import COORDINATES
810
from ...options import EffectOpts, InitOpts, LabelOpts, TooltipOpts
9-
from ...commons.types import List, ListTuple, Numeric, Optional, Union
10-
from ...commons.utils import produce_js_func
1111

1212

1313
class Geo(Chart):
@@ -137,7 +137,7 @@ def add(
137137
def set_global_opts(
138138
self,
139139
tooltip_opts: Union[TooltipOpts, dict] = TooltipOpts(
140-
formatter=produce_js_func(TOOLTIP_FORMATTER_TYPE.GEO)
140+
formatter=utils.filter_js_func(TOOLTIP_FORMATTER_TYPE.GEO)
141141
),
142142
**kwargs,
143143
):

‎pyecharts/charts/basic_charts/geolines.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# coding=utf-8
2-
32
from ...charts.chart import Chart
4-
from ...options import EffectOpts, InitOpts, LabelOpts, LineStyleOpts
53
from ...commons.types import Union
4+
from ...options import EffectOpts, InitOpts, LabelOpts, LineStyleOpts
65

76

87
class GeoLines(Chart):
@@ -21,16 +20,17 @@ def add(
2120
name: str,
2221
data,
2322
maptype="china",
23+
*,
2424
symbol=None,
2525
symbol_size=12,
2626
border_color="#111",
2727
normal_color="#323c48",
2828
emphasis_color="#2a333d",
2929
region_coords=None,
30+
is_roam=True,
3031
effect_opts: Union[EffectOpts, dict] = EffectOpts(),
3132
linestyle_opts: Union[LineStyleOpts, dict] = LineStyleOpts(),
3233
label_opts: Union[LabelOpts, dict] = LabelOpts(),
33-
is_roam=True,
3434
):
3535

3636
if isinstance(effect_opts, EffectOpts):

‎pyecharts/charts/basic_charts/graph.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# coding=utf-8
2-
32
from ...charts.chart import Chart
3+
from ...commons.types import Numeric, Optional, Union
44
from ...options import InitOpts, LabelOpts, LineStyleOpts
5-
from ...commons.types import Numeric, Union
65

76

87
class Graph(Chart):
@@ -25,11 +24,11 @@ def add(
2524
is_roam: bool = True,
2625
is_rotate_label: bool = False,
2726
layout: str = "force",
28-
symbol=None,
27+
symbol: Optional[str] = None,
2928
edge_length: Numeric = 50,
3029
gravity: Numeric = 0.2,
3130
repulsion: Numeric = 50,
32-
edge_symbol=None,
31+
edge_symbol: Optional[str] = None,
3332
edge_symbol_size: Numeric = 10,
3433
label_opts: Union[LabelOpts, dict] = LabelOpts(),
3534
linestyle_opts: Union[LineStyleOpts, dict] = LineStyleOpts(),

‎pyecharts/charts/basic_charts/heatmap.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# coding=utf-8
2-
32
from ...charts.chart import Chart
4-
from ...options import InitOpts, LabelOpts, SplitLineOpts
53
from ...commons.types import Union
4+
from ...options import InitOpts, LabelOpts, SplitLineOpts
65

76

87
class HeatMap(Chart):

0 commit comments

Comments
 (0)