@plotdb/chart 0.0.3 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +34 -1
- package/README.md +3 -3
- package/{dist/data → data}/index.js +0 -0
- package/{dist/chart.css → index.css} +0 -0
- package/{dist/chart.js → index.js} +3 -1
- package/{dist/chart.min.css → index.min.css} +0 -0
- package/index.min.js +1 -0
- package/package.json +1 -89
- package/{dist/utils → utils}/axis.js +6 -0
- package/utils/axis.min.js +1 -0
- package/{dist/utils → utils}/config.js +0 -0
- package/utils/config.min.js +1 -0
- package/{dist/utils → utils}/data.js +0 -0
- package/utils/data.min.js +1 -0
- package/{dist/utils → utils}/format.js +0 -0
- package/utils/format.min.js +1 -0
- package/{dist/utils → utils}/legend.css +0 -0
- package/{dist/utils → utils}/legend.js +0 -0
- package/{dist/utils → utils}/legend.min.css +0 -0
- package/utils/legend.min.js +1 -0
- package/{dist/utils → utils}/tint.js +0 -0
- package/utils/tint.min.js +1 -0
- package/{dist/utils → utils}/tip.js +0 -0
- package/utils/tip.min.js +1 -0
- package/build +0 -39
- package/dist/chart.min.js +0 -1
- package/dist/utils/axis.min.js +0 -1
- package/dist/utils/config.min.js +0 -1
- package/dist/utils/data.min.js +0 -1
- package/dist/utils/format.min.js +0 -1
- package/dist/utils/legend.min.js +0 -1
- package/dist/utils/tint.min.js +0 -1
- package/dist/utils/tip.min.js +0 -1
- package/doc/charts.md +0 -58
- package/doc/config.md +0 -44
- package/doc/draft/chart.md +0 -146
- package/doc/draft/data.md +0 -8
- package/doc/draft/definition.md +0 -0
- package/doc/draft/events.md +0 -0
- package/doc/draft/filter.md +0 -0
- package/doc/draft/lifecycle.md +0 -89
- package/doc/spec.md +0 -89
- package/doc/todo.md +0 -27
- package/doc/utils/tip.md +0 -84
- package/src/chart.ls +0 -323
- package/src/chart.styl +0 -6
- package/src/data/en-US/category +0 -20
- package/src/data/en-US/fruit +0 -39
- package/src/data/en-US/movie +0 -125
- package/src/data/en-US/name +0 -58
- package/src/data/index.ls +0 -34
- package/src/data/zh-TW/category +0 -20
- package/src/data/zh-TW/fruits +0 -38
- package/src/data/zh-TW/movie +0 -125
- package/src/data/zh-TW/names +0 -105
- package/src/utils/axis.ls +0 -229
- package/src/utils/config.ls +0 -11
- package/src/utils/data.ls +0 -104
- package/src/utils/format.ls +0 -30
- package/src/utils/legend.ls +0 -134
- package/src/utils/legend.styl +0 -37
- package/src/utils/tint.ls +0 -66
- package/src/utils/tip.ls +0 -97
- package/web/src/pug/base.pug +0 -20
- package/web/src/pug/block/axis/0.0.1/index.ls +0 -38
- package/web/src/pug/block/axis/0.0.1/index.pug +0 -1
- package/web/src/pug/block/axis-bubble/0.0.1/index.ls +0 -141
- package/web/src/pug/block/axis-bubble/0.0.1/index.pug +0 -1
- package/web/src/pug/block/bar/0.0.1/index.ls +0 -274
- package/web/src/pug/block/bar/0.0.1/index.pug +0 -35
- package/web/src/pug/block/bar-list/0.0.1/index.ls +0 -85
- package/web/src/pug/block/bar-list/0.0.1/index.pug +0 -30
- package/web/src/pug/block/bar-race/0.0.1/index.ls +0 -83
- package/web/src/pug/block/bar-race/0.0.1/index.pug +0 -21
- package/web/src/pug/block/base/0.0.1/index.ls +0 -67
- package/web/src/pug/block/base/0.0.1/index.pug +0 -5
- package/web/src/pug/block/blank/0.0.1/index.ls +0 -25
- package/web/src/pug/block/blank/0.0.1/index.pug +0 -1
- package/web/src/pug/block/bubble/0.0.1/index.ls +0 -220
- package/web/src/pug/block/bubble/0.0.1/index.pug +0 -28
- package/web/src/pug/block/curve-bar/0.0.1/index.ls +0 -89
- package/web/src/pug/block/curve-bar/0.0.1/index.pug +0 -16
- package/web/src/pug/block/curve-bar/0.0.1/sample.js +0 -338
- package/web/src/pug/block/dumbbell/0.0.1/index.ls +0 -90
- package/web/src/pug/block/dumbbell/0.0.1/index.pug +0 -1
- package/web/src/pug/block/empty/0.0.1/index.ls +0 -27
- package/web/src/pug/block/empty/0.0.1/index.pug +0 -2
- package/web/src/pug/block/gauge/0.0.1/index.ls +0 -100
- package/web/src/pug/block/gauge/0.0.1/index.pug +0 -31
- package/web/src/pug/block/gauge/0.0.1/sample.js +0 -338
- package/web/src/pug/block/line/0.0.1/index.ls +0 -302
- package/web/src/pug/block/line/0.0.1/index.pug +0 -33
- package/web/src/pug/block/number/0.0.1/index.ls +0 -69
- package/web/src/pug/block/number/0.0.1/index.pug +0 -20
- package/web/src/pug/block/percent-list/0.0.1/index.ls +0 -167
- package/web/src/pug/block/percent-list/0.0.1/index.pug +0 -34
- package/web/src/pug/block/pie/0.0.1/index.ls +0 -125
- package/web/src/pug/block/pie/0.0.1/index.pug +0 -19
- package/web/src/pug/block/pie/0.0.1/sample.js +0 -338
- package/web/src/pug/block/pie-bubble/0.0.1/index.ls +0 -185
- package/web/src/pug/block/pie-bubble/0.0.1/index.pug +0 -40
- package/web/src/pug/block/radar/0.0.1/index.ls +0 -113
- package/web/src/pug/block/radar/0.0.1/index.pug +0 -1
- package/web/src/pug/block/radar/0.0.1/xx +0 -285
- package/web/src/pug/block/scatter/0.0.1/index.ls +0 -128
- package/web/src/pug/block/scatter/0.0.1/index.pug +0 -30
- package/web/src/pug/block/sheet/0.0.1/index.ls +0 -38
- package/web/src/pug/block/sheet/0.0.1/index.pug +0 -5
- package/web/src/pug/block/table/0.0.1/index.ls +0 -40
- package/web/src/pug/block/table/0.0.1/index.pug +0 -3
- package/web/src/pug/block/taiwancounty/0.0.1/index.ls +0 -74
- package/web/src/pug/block/taiwancounty/0.0.1/index.pug +0 -64
- package/web/src/pug/block/taiwantown/0.0.1/index.ls +0 -48
- package/web/src/pug/block/taiwantown/0.0.1/index.pug +0 -52
- package/web/src/pug/block/taiwanvillage/0.0.1/index.ls +0 -53
- package/web/src/pug/block/taiwanvillage/0.0.1/index.pug +0 -52
- package/web/src/pug/block/treemap/0.0.1/index.ls +0 -172
- package/web/src/pug/block/treemap/0.0.1/index.pug +0 -42
- package/web/src/pug/block/voronoi-treemap/0.0.1/index.ls +0 -174
- package/web/src/pug/block/voronoi-treemap/0.0.1/index.pug +0 -17
- package/web/src/pug/block/voronoi-treemap/0.0.1/sample.js +0 -241
- package/web/src/pug/block/wordcloud/0.0.1/index.ls +0 -61
- package/web/src/pug/block/wordcloud/0.0.1/index.pug +0 -1
- package/web/src/pug/block/worldmap/0.0.1/index.ls +0 -81
- package/web/src/pug/block/worldmap/0.0.1/index.pug +0 -12
- package/web/src/pug/index.ls +0 -72
- package/web/src/pug/index.pug +0 -51
- package/web/src/styl/index.styl +0 -0
- package/web/static/assets/block/cache.js +0 -4
- package/web/static/assets/custom-lib/d3/d3-array.v2.js +0 -1182
- package/web/static/assets/custom-lib/d3/d3-array.v2.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-array.v3.js +0 -1273
- package/web/static/assets/custom-lib/d3/d3-array.v3.min.js +0 -1273
- package/web/static/assets/custom-lib/d3/d3-axis.v2.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-brush.v2.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-color.v2.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-dispatch.v2.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-drag.v2.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-ease.v2.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-force-boundary.v0.0.1.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-force.v2.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-format.v2.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-geo.v2.js +0 -3127
- package/web/static/assets/custom-lib/d3/d3-geo.v2.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-hierarchy.v2.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-interpolate.v2.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-path.v2.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-quadtree.v2.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-random.v2.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-scale-chromatic.v1.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-selection.v2.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-shape.v2.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-timer.v2.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3-transition.v2.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3.v4.js +0 -17178
- package/web/static/assets/custom-lib/d3/d3.v4.min.js +0 -2
- package/web/static/assets/custom-lib/d3/d3.v6.js +0 -19708
- package/web/static/assets/data/countrycode.json +0 -1
- package/web/static/assets/data/world-110m.json +0 -1
- package/web/static/assets/data/zh-to-alpha2.json +0 -1
- package/web/static/assets/img/fluid.svg +0 -16
- package/web/static/block/axis/0.0.1/index.html +0 -79
- package/web/static/block/axis-bubble/0.0.1/index.html +0 -222
- package/web/static/block/bar/0.0.1/index.html +0 -581
- package/web/static/block/bar-list/0.0.1/index.html +0 -231
- package/web/static/block/bar-race/0.0.1/index.html +0 -184
- package/web/static/block/base/0.0.1/index.html +0 -197
- package/web/static/block/blank/0.0.1/index.html +0 -42
- package/web/static/block/bubble/0.0.1/index.html +0 -402
- package/web/static/block/bubble/0.0.1/test.html +0 -0
- package/web/static/block/curve-bar/0.0.1/index.html +0 -148
- package/web/static/block/dumbbell/0.0.1/index.html +0 -178
- package/web/static/block/empty/0.0.1/index.html +0 -76
- package/web/static/block/gauge/0.0.1/index.html +0 -150
- package/web/static/block/line/0.0.1/index.html +0 -571
- package/web/static/block/number/0.0.1/index.html +0 -152
- package/web/static/block/percent-list/0.0.1/index.html +0 -316
- package/web/static/block/pie/0.0.1/index.html +0 -281
- package/web/static/block/pie-bubble/0.0.1/index.html +0 -358
- package/web/static/block/radar/0.0.1/index.html +0 -149
- package/web/static/block/scatter/0.0.1/index.html +0 -251
- package/web/static/block/sheet/0.0.1/index.html +0 -103
- package/web/static/block/table/0.0.1/index.html +0 -73
- package/web/static/block/taiwancounty/0.0.1/index.html +0 -202
- package/web/static/block/taiwantown/0.0.1/index.html +0 -210
- package/web/static/block/taiwanvillage/0.0.1/index.html +0 -220
- package/web/static/block/treemap/0.0.1/index.html +0 -360
- package/web/static/block/voronoi-treemap/0.0.1/index.html +0 -350
- package/web/static/block/wordcloud/0.0.1/index.html +0 -92
- package/web/static/block/worldmap/0.0.1/index.html +0 -207
- package/web/static/css/index.css +0 -0
- package/web/static/css/index.min.css +0 -0
- package/web/static/favicon.ico +0 -0
- package/web/static/index.html +0 -153
|
@@ -1,90 +0,0 @@
|
|
|
1
|
-
<-(->it!) _
|
|
2
|
-
|
|
3
|
-
block-factory =
|
|
4
|
-
pkg:
|
|
5
|
-
name: 'dumbbell', version: '0.0.1'
|
|
6
|
-
extend: {name: "base", version: "0.0.1"}
|
|
7
|
-
dependencies: []
|
|
8
|
-
init: ({root, context, pubsub}) ->
|
|
9
|
-
pubsub.fire \init, mod: mod {context}
|
|
10
|
-
|
|
11
|
-
mod = ({context}) ->
|
|
12
|
-
{d3,ldcolor,debounce,infinite} = context
|
|
13
|
-
sample: ->
|
|
14
|
-
raw: [0 to 10].map (val) ~>
|
|
15
|
-
val1: Math.random! * 0.5 + 0.4
|
|
16
|
-
val2: Math.random! * 0.5 + 0.4
|
|
17
|
-
val3: Math.random! * 0.6 + 0.1
|
|
18
|
-
val4: Math.random! * 0.6 + 0.1
|
|
19
|
-
name: val
|
|
20
|
-
binding:
|
|
21
|
-
name: {key: \name}
|
|
22
|
-
y1: [{key: \val1}, {key: \val2}]
|
|
23
|
-
y2: [{key: \val3}, {key: \val4}]
|
|
24
|
-
config: {}
|
|
25
|
-
dimension:
|
|
26
|
-
y1: {type: \R, multiple: true, name: "y pos"}
|
|
27
|
-
y2: {type: \R, multiple: true, name: "y pos"}
|
|
28
|
-
name: {type: \N, name: "dumbbell name"}
|
|
29
|
-
init: ->
|
|
30
|
-
@infcolor = new infinite!
|
|
31
|
-
|
|
32
|
-
parse: ->
|
|
33
|
-
@parsed = []
|
|
34
|
-
@parsed = @data.map (d,i) ~>
|
|
35
|
-
dumbbell = d.y1.map (e,j) ~>
|
|
36
|
-
{y1: (d.y1[j] or 0), y2: (d.y2[j] or 0), name: [@binding.y1[j].key, @binding.y2[j].key]}
|
|
37
|
-
{name: d.name, dumbbell}
|
|
38
|
-
@names = @data.map -> it.name
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
resize: ->
|
|
42
|
-
[w,h] = [@box.width, @box.height]
|
|
43
|
-
@extent =
|
|
44
|
-
y: [
|
|
45
|
-
d3.min(@data.map (d,i) -> d3.min([d3.min(d.y1), d3.min(d.y2)])),
|
|
46
|
-
d3.max(@data.map (d,i) -> d3.max([d3.max(d.y1), d3.max(d.y2)]))
|
|
47
|
-
]
|
|
48
|
-
@scale =
|
|
49
|
-
x: d3.scaleBand!domain(@names).range [0,w] .paddingInner 0.3
|
|
50
|
-
y: d3.scaleLinear!domain([0,@extent.y.1]).range [0,h]
|
|
51
|
-
c: d3.scaleOrdinal(d3.schemeCategory10)
|
|
52
|
-
if @cfg? and @cfg.palette => @scale.c = d3.scaleOrdinal(@cfg.palette.colors.map -> ldcolor.web(it.value or it))
|
|
53
|
-
if @cfg? and @cfg.palette => @infcolor.set-colors(@cfg.palette.colors.map -> ldcolor.web(it.value or it))
|
|
54
|
-
|
|
55
|
-
render: ->
|
|
56
|
-
{scale,infcolor} = @
|
|
57
|
-
svg = d3.select @svg
|
|
58
|
-
svg.selectAll \g.data .data @parsed
|
|
59
|
-
..exit!remove!
|
|
60
|
-
..enter!append \g .attr \class, \data
|
|
61
|
-
svg.selectAll \g.data
|
|
62
|
-
.each (e,j) ->
|
|
63
|
-
bw = scale.x.bandwidth!
|
|
64
|
-
n = d3.select(@)
|
|
65
|
-
n.selectAll \g.dumbbell .data e.dumbbell
|
|
66
|
-
..exit!remove!
|
|
67
|
-
..enter!append \g .attr \class, \dumbbell
|
|
68
|
-
n.selectAll \g.dumbbell
|
|
69
|
-
.each (f,k) ->
|
|
70
|
-
m = d3.select(@)
|
|
71
|
-
m.selectAll \circle .data [1,2]
|
|
72
|
-
..exit!remove!
|
|
73
|
-
..enter!append \circle
|
|
74
|
-
m.selectAll \line .data [0]
|
|
75
|
-
..exit!remove!
|
|
76
|
-
..enter!append \line
|
|
77
|
-
m.selectAll \circle
|
|
78
|
-
.attr \cx, (d,i) -> scale.x(e.name) + bw * i
|
|
79
|
-
.attr \cy, (d,i) -> scale.y f["y#d"]
|
|
80
|
-
.attr \r, 2
|
|
81
|
-
.attr \fill, -> infcolor.get(f.name.0)
|
|
82
|
-
m.selectAll \line
|
|
83
|
-
.attr \x1, (d,i) -> scale.x(e.name)
|
|
84
|
-
.attr \x2, (d,i) -> scale.x(e.name) + bw
|
|
85
|
-
.attr \y1, (d,i) -> scale.y f.y1
|
|
86
|
-
.attr \y2, (d,i) -> scale.y f.y2
|
|
87
|
-
.attr \stroke, -> infcolor.get(f.name.0)
|
|
88
|
-
.attr \stroke-width, 1
|
|
89
|
-
|
|
90
|
-
return block-factory
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
div: script(type="@plotdb/block"): include:lsc index.ls
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
pkg:
|
|
2
|
-
name: 'empty', version: '0.0.1'
|
|
3
|
-
dependencies: [
|
|
4
|
-
{url: "/assets/lib/@loadingio/debounce.js/main/debounce.min.js"}
|
|
5
|
-
{url: "/assets/lib/wrap-svg-text/main/index.min.js", async: false}
|
|
6
|
-
{url: "/assets/lib/@plotdb/layout/main/index.min.js", async: false}
|
|
7
|
-
{url: "/assets/lib/@plotdb/layout/main/index.min.css", type: \css}
|
|
8
|
-
{url: "/assets/lib/ldcolor/main/ldcolor.min.js", async: false}
|
|
9
|
-
{url: "/assets/lib/@plotdb/chart/main/chart.js", async: false}
|
|
10
|
-
{url: "/assets/lib/@plotdb/chart/main/chart.min.css", type: \css}
|
|
11
|
-
{url: "/assets/lib/@plotdb/chart/main/utils/legend.js", async: false}
|
|
12
|
-
{url: "/assets/lib/@plotdb/chart/main/utils/legend.css", type: \css}
|
|
13
|
-
{url: "/assets/lib/@plotdb/chart/main/utils/tint.js", async: false}
|
|
14
|
-
{url: "/assets/lib/@plotdb/chart/main/utils/data.js", async: false}
|
|
15
|
-
]
|
|
16
|
-
|
|
17
|
-
init: ({root, context, pubsub, data}) ->
|
|
18
|
-
{chart} = context
|
|
19
|
-
pubsub.on \init, (opt = {}) ~>
|
|
20
|
-
opt = {root, delay-render: true} <<< opt
|
|
21
|
-
@chart = c = new chart(opt <<< {prepare-svg: false, layout: false} <<< data)
|
|
22
|
-
c.init!then -> c
|
|
23
|
-
@
|
|
24
|
-
|
|
25
|
-
interface: -> @chart
|
|
26
|
-
|
|
27
|
-
mod: (root) -> {config: {}, dimension: {}, init: (->), resize: (->), render: (->)}
|
|
@@ -1,100 +0,0 @@
|
|
|
1
|
-
<-(->it!) _
|
|
2
|
-
|
|
3
|
-
block-factory =
|
|
4
|
-
pkg:
|
|
5
|
-
name: 'gauge', version: '0.0.1'
|
|
6
|
-
extend: {name: "base", version: "0.0.1"}
|
|
7
|
-
dependencies: []
|
|
8
|
-
|
|
9
|
-
init: ({root, context, pubsub}) ->
|
|
10
|
-
pubsub.fire \init, mod: mod {context}
|
|
11
|
-
|
|
12
|
-
mod = ({context}) ->
|
|
13
|
-
{d3,chart} = context
|
|
14
|
-
sample: ->
|
|
15
|
-
raw: [{value: Math.random!, max: 1}]
|
|
16
|
-
binding:
|
|
17
|
-
value: {key: \value}
|
|
18
|
-
max: {key: \max}
|
|
19
|
-
config: {}
|
|
20
|
-
dimension:
|
|
21
|
-
value: {type: \R, name: "value"}
|
|
22
|
-
max: {type: \R, name: "max"}
|
|
23
|
-
init: ->
|
|
24
|
-
|
|
25
|
-
@tint = tint = new chart.utils.tint!
|
|
26
|
-
|
|
27
|
-
@arc = d3.arc!
|
|
28
|
-
|
|
29
|
-
@g =
|
|
30
|
-
view: d3.select @layout.get-group \view
|
|
31
|
-
number: d3.select @layout.get-group \number
|
|
32
|
-
unit: d3.select @layout.get-group \unit
|
|
33
|
-
|
|
34
|
-
parse: ->
|
|
35
|
-
@g.view.selectAll \path.wedge .data [0,1]
|
|
36
|
-
..exit!remove!
|
|
37
|
-
..enter!append \path .attr \class, \wedge
|
|
38
|
-
@g.view.selectAll \path.pin .data [0]
|
|
39
|
-
..exit!remove!
|
|
40
|
-
..enter!append \path .attr \class, \pin
|
|
41
|
-
@g.view.selectAll \citcle .data [0]
|
|
42
|
-
..exit!remove!
|
|
43
|
-
..enter!append \circle
|
|
44
|
-
@g.number.selectAll \text .data [0]
|
|
45
|
-
..exit!remove!
|
|
46
|
-
..enter!append \text
|
|
47
|
-
@g.unit.selectAll \text .data [0]
|
|
48
|
-
..exit!remove!
|
|
49
|
-
..enter!append \text
|
|
50
|
-
|
|
51
|
-
resize: ->
|
|
52
|
-
|
|
53
|
-
n = @layout.get-node \view
|
|
54
|
-
b = @layout.get-box \view
|
|
55
|
-
n.style
|
|
56
|
-
..width = "#{b.height}px"
|
|
57
|
-
@layout.update false
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
render: ->
|
|
61
|
-
if @cfg? and @cfg.palette => @tint.set(@cfg.palette.colors.map -> it.value or it)
|
|
62
|
-
d = @data.0 or {}
|
|
63
|
-
percent = ((d.value or 0) / (d.max or 1)) <? 1 >? 0
|
|
64
|
-
angle = percent * ( Math.PI * 6 / 4 ) + Math.PI / 4
|
|
65
|
-
start = Math.PI / 4
|
|
66
|
-
end = Math.PI * 7 / 4
|
|
67
|
-
box = @layout.get-box \view
|
|
68
|
-
size = (Math.min box.width, box.height) / 2
|
|
69
|
-
@arc
|
|
70
|
-
.innerRadius size * 0.5
|
|
71
|
-
.outerRadius size
|
|
72
|
-
|
|
73
|
-
offset = size * (1 - (1/Math.sqrt(2))) / 2
|
|
74
|
-
|
|
75
|
-
@g.view.selectAll \path.wedge
|
|
76
|
-
.attr \transform, "translate(#{box.width/2},#{offset + box.height/2}) rotate(180)"
|
|
77
|
-
.attr \d, (d,i) ~>
|
|
78
|
-
@arc
|
|
79
|
-
.startAngle if i == 0 => start else angle
|
|
80
|
-
.endAngle if i == 0 => angle else end
|
|
81
|
-
@arc!
|
|
82
|
-
.attr \fill, (d,i) ~> @tint.get d
|
|
83
|
-
|
|
84
|
-
@g.view.selectAll \path.pin
|
|
85
|
-
.attr \transform, "translate(#{box.width/2} #{offset + box.height/2}) rotate(#{45 + (270 * percent)})"
|
|
86
|
-
.attr \d, "M0 #{size * 0.4}L0 #{size}"
|
|
87
|
-
.attr \fill, \none
|
|
88
|
-
.attr \stroke, \#000
|
|
89
|
-
.attr \stroke-width, 2
|
|
90
|
-
|
|
91
|
-
@g.number.selectAll \text
|
|
92
|
-
.text -> 3000
|
|
93
|
-
.attr \font-size, 24
|
|
94
|
-
.attr \dominant-baseline, \hanging
|
|
95
|
-
|
|
96
|
-
@g.unit.selectAll \text
|
|
97
|
-
.text -> "新臺幣"
|
|
98
|
-
.attr \dominant-baseline, \hanging
|
|
99
|
-
|
|
100
|
-
return block-factory
|
|
@@ -1,31 +0,0 @@
|
|
|
1
|
-
div
|
|
2
|
-
div(plug="layout")
|
|
3
|
-
.pdl-layout
|
|
4
|
-
div(data-type="layout")
|
|
5
|
-
.pdl-cell(data-name="view")
|
|
6
|
-
div.text
|
|
7
|
-
.pdl-cell(data-name="number") 0000
|
|
8
|
-
.pdl-cell(data-name="unit") 0000
|
|
9
|
-
div(data-type="render")
|
|
10
|
-
style(type="text/css"): :stylus
|
|
11
|
-
.pdl-layout > div[data-type=layout]
|
|
12
|
-
display: flex
|
|
13
|
-
justify-content: center
|
|
14
|
-
align-items: center
|
|
15
|
-
.text
|
|
16
|
-
margin-left: .5em
|
|
17
|
-
height: 100%
|
|
18
|
-
display: flex
|
|
19
|
-
flex-direction: column
|
|
20
|
-
justify-content: center
|
|
21
|
-
align-items: start
|
|
22
|
-
[data-name=view]
|
|
23
|
-
height: 100%
|
|
24
|
-
[data-name=number]
|
|
25
|
-
font-size: 24px
|
|
26
|
-
line-height: 1em
|
|
27
|
-
[data-name=unit]
|
|
28
|
-
line-height: 1em
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
script(type="@plotdb/block"): include:lsc index.ls
|
|
@@ -1,338 +0,0 @@
|
|
|
1
|
-
|
|
2
|
-
{
|
|
3
|
-
sample: function() {
|
|
4
|
-
var list = d3.range(Math.round(Math.random() * 3 + 4));
|
|
5
|
-
var value = [{name: "Amount", data: list.map(function() { return Math.random(); })}];
|
|
6
|
-
var name = [{name: "Fruit", data: list.map(function(it) {
|
|
7
|
-
return plotdb.data.sample.fruit[it % plotdb.data.sample.fruit.length]
|
|
8
|
-
})}];
|
|
9
|
-
return {name: name, value: value};
|
|
10
|
-
},
|
|
11
|
-
dimension: {
|
|
12
|
-
value: { type: [plotdb.Number], require: true, desc: "size of pie" },
|
|
13
|
-
name: { type: [], require: false, desc: "name of pie" },
|
|
14
|
-
},
|
|
15
|
-
config: {
|
|
16
|
-
fontFamily: {},
|
|
17
|
-
background: {},
|
|
18
|
-
textFill: {},
|
|
19
|
-
fontSize: {},
|
|
20
|
-
margin: {},
|
|
21
|
-
palette: {},
|
|
22
|
-
stroke: {default: "#fff"},
|
|
23
|
-
strokeWidth: {},
|
|
24
|
-
thick: { name: "thick (0~1)", type: [plotdb.Number], default: 1 },
|
|
25
|
-
boxRoundness: {},
|
|
26
|
-
labelShow: {},
|
|
27
|
-
labelShadowSize: {},
|
|
28
|
-
otherLimit: {},
|
|
29
|
-
otherLabel: {},
|
|
30
|
-
labelPosition: {},
|
|
31
|
-
legendLabel: {},
|
|
32
|
-
legendShow: {},
|
|
33
|
-
legendPosition: {},
|
|
34
|
-
legendInline: {
|
|
35
|
-
name: "Show Inline Legend",
|
|
36
|
-
type: [plotdb.Boolean],
|
|
37
|
-
default: false,
|
|
38
|
-
desc: "[Experiment feature] Show legend with wedges instead of a standalone legend panel",
|
|
39
|
-
category: "Legend Inline"
|
|
40
|
-
},
|
|
41
|
-
legendInlineColor: {
|
|
42
|
-
name: "Color",
|
|
43
|
-
type: [plotdb.Color],
|
|
44
|
-
default: "#222",
|
|
45
|
-
desc: "Dot / Line Color",
|
|
46
|
-
category: "Legend Inline"
|
|
47
|
-
},
|
|
48
|
-
legendInlineStrokeWidth: {
|
|
49
|
-
name: "Stroke Width",
|
|
50
|
-
type: [plotdb.Number],
|
|
51
|
-
default: 2,
|
|
52
|
-
desc: "Dot / line width of inline legend",
|
|
53
|
-
category: "Legend Inline"
|
|
54
|
-
},
|
|
55
|
-
unit: {},
|
|
56
|
-
sort: { name: "Sort Values", type: [plotdb.Boolean], default: true, rebindOnChange: true },
|
|
57
|
-
showPercent: {name: "Show Percent", type: [plotdb.Boolean], default: false},
|
|
58
|
-
popupShow: {}
|
|
59
|
-
},
|
|
60
|
-
|
|
61
|
-
init: function() {
|
|
62
|
-
var that = this;
|
|
63
|
-
this.svg = d3.select(this.root).append("svg");
|
|
64
|
-
this.pieGroup = this.svg.append("g").attr("class", "pie-group");
|
|
65
|
-
this.legendGroup = this.svg.append("g").attr({"class": "legend-group"});
|
|
66
|
-
this.popup = plotd3.html.tooltip(this.root).on("mousemove", function(d,i,popup) {
|
|
67
|
-
popup.select(".title").text(d.data.name || "-");
|
|
68
|
-
popup.select(".value").html([
|
|
69
|
-
Math.ceil(100 * d.data.value)/100 + (that.config.unit || ""),
|
|
70
|
-
d.data.percent
|
|
71
|
-
].join("<br>"));
|
|
72
|
-
});
|
|
73
|
-
this.popup.coord(function(d,i) {
|
|
74
|
-
var r = d.data.centralRadius;
|
|
75
|
-
var a = (d.endAngle + d.startAngle)/2;
|
|
76
|
-
var x = Math.sin(a) * r;
|
|
77
|
-
var y = -Math.cos(a) * r;
|
|
78
|
-
var cx = (that.width - that.legendOffset[0] * (that.config.legendPosition == "right" ? 1 : -1 )) / 2;
|
|
79
|
-
var cy = (that.height - that.legendOffset[1] * (that.config.legendPosition == "bottom" ? 1 : -1 )) / 2;
|
|
80
|
-
return [
|
|
81
|
-
cx + x, cy + y, 1,1
|
|
82
|
-
];
|
|
83
|
-
});
|
|
84
|
-
this.pielayout = d3.layout.pie().value(function(it) { return it.value; });
|
|
85
|
-
},
|
|
86
|
-
parse: function() {
|
|
87
|
-
if(!this.dimension.name.fields.length) this.data.map(function(d,i) { d.name = i; });
|
|
88
|
-
if(!this.dimension.value.fields.length) this.data.map(function(d,i) { d.value= 1; });
|
|
89
|
-
this.names = d3.map(this.data, function(d,i) { return d.name || ""; }).keys();
|
|
90
|
-
},
|
|
91
|
-
bind: function() {
|
|
92
|
-
var that = this, sel, sel1, sel2;
|
|
93
|
-
sel = this.pieGroup.selectAll("path.data.pie").data(this.parsed);
|
|
94
|
-
sel.exit().attr({class: ""}).transition("exit").duration(500).attr({opacity: 0}).remove();
|
|
95
|
-
sel1 = sel.enter().append("path").attr({class: "data pie", opacity: 0});
|
|
96
|
-
sel = this.pieGroup.selectAll("g.label").data(this.parsed);
|
|
97
|
-
sel.exit().attr({class: ""}).transition("exit").duration(500).attr({opacity: 0}).remove();
|
|
98
|
-
sel2 = sel.enter().append("g").attr({class: "label", opacity: 0});
|
|
99
|
-
this.pieGroup.selectAll("g.label").each(function(d,i) {
|
|
100
|
-
var node = d3.select(this),sel;
|
|
101
|
-
sel = node.selectAll("text").data([d,d]);
|
|
102
|
-
sel.exit().remove();
|
|
103
|
-
sel.enter().append("text").attr({
|
|
104
|
-
class: function(d,i) { return "data label " + (i ? "value" : "shadow"); },
|
|
105
|
-
});
|
|
106
|
-
});
|
|
107
|
-
sel = this.pieGroup.selectAll("g.marker").data(this.parsed);
|
|
108
|
-
sel.exit().remove();
|
|
109
|
-
sel.enter().append("g").attr({class: "marker"}).each(function(d,i) {
|
|
110
|
-
var node = d3.select(this);
|
|
111
|
-
node.append("path"); node.append("circle"); node.append("circle"); node.append("text");
|
|
112
|
-
});
|
|
113
|
-
this.pieGroup.selectAll("g.marker").each(function(d,i) {
|
|
114
|
-
var node = d3.select(this);
|
|
115
|
-
node.select("path").datum(d);node.selectAll("circle").data([d,d]);node.select("text").datum(d);
|
|
116
|
-
});
|
|
117
|
-
if(this.config.popupShow) this.popup.nodes(sel1).nodes(sel2);
|
|
118
|
-
[sel1,sel2].map(function(sel) {
|
|
119
|
-
sel.on("click", function(d,i) {
|
|
120
|
-
that.fire("filter", {type: "value", value: d.data.name, field: "name"});
|
|
121
|
-
});
|
|
122
|
-
});
|
|
123
|
-
},
|
|
124
|
-
resize: function() {
|
|
125
|
-
var that = this;
|
|
126
|
-
var other = {
|
|
127
|
-
name: that.config.otherLabel,
|
|
128
|
-
value: this.data.filter(function(d,i) { return d.value < that.config.otherLimit; }).reduce(function(a,b) { return a + b.value; }, 0)
|
|
129
|
-
};
|
|
130
|
-
this.fdata = this.data.filter(function(d,i) { return d.value >= that.config.otherLimit; });
|
|
131
|
-
if(other.value != 0) this.fdata.push(other);
|
|
132
|
-
this.names = this.fdata.map(function(it) { return it.name; });
|
|
133
|
-
|
|
134
|
-
var box = this.root.getBoundingClientRect();
|
|
135
|
-
var svgbox = this.svg[0][0].getBoundingClientRect();
|
|
136
|
-
var width = this.width = box.width;
|
|
137
|
-
var height = this.height = box.height;
|
|
138
|
-
this.svg.attr({
|
|
139
|
-
width: width + "px", height: height + "px",
|
|
140
|
-
viewBox: [0,0,width,height].join(" "),
|
|
141
|
-
preserveAspectRatio: "xMidYMid"
|
|
142
|
-
});
|
|
143
|
-
this.popup.fontSize(this.config.fontSize);
|
|
144
|
-
this.legendVertical = ["right","left"].indexOf(this.config.legendPosition) >= 0;
|
|
145
|
-
this.cScale = plotdb.Palette.scale.ordinal(this.config.palette);
|
|
146
|
-
this.legend = plotd3.rwd.legend()
|
|
147
|
-
.size(this.legendVertical ? [220, this.height - 2 * this.config.margin] : [this.width - 2 * this.config.margin, 220])
|
|
148
|
-
.orient(this.config.legendPosition).scale(this.cScale)
|
|
149
|
-
.label(this.config.legendLabel || "")
|
|
150
|
-
.tickValues(this.names).fontSize(this.config.fontSize);
|
|
151
|
-
this.legendGroup.call(this.legend);
|
|
152
|
-
this.legendGroup.selectAll(".legend").on("mouseover", function(d,i) {
|
|
153
|
-
that.activeGroup = d; that.render();
|
|
154
|
-
}).on("mouseout", function(d,i) {
|
|
155
|
-
that.activeGroup = null; that.render();
|
|
156
|
-
});
|
|
157
|
-
this.legendSize = (this.config.legendShow ? this.legend.offset() : [0,0]);
|
|
158
|
-
this.legendOffset = this.config.legendShow ?
|
|
159
|
-
this.legendVertical ? [this.legendSize[0] + this.config.fontSize,0] : [0, this.legendSize[1] + this.config.fontSize]
|
|
160
|
-
: [0,0];
|
|
161
|
-
var w = this.width - this.legendOffset[0];
|
|
162
|
-
var h = this.height - this.legendOffset[1] - (this.config.legendInline ? 60 : 0);
|
|
163
|
-
this.radius = ( w > h ? h : w )/2 - this.config.margin
|
|
164
|
-
- (!that.config.labelShow || (that.config.labelPosition == 'in') ? 0 : 2 * that.config.fontSize);
|
|
165
|
-
this.pielayout.sort(this.config.sort ? function(a,b) { return b.value - a.value; } : null);
|
|
166
|
-
var parsed = this.pielayout(this.fdata);
|
|
167
|
-
this.parsed = parsed;
|
|
168
|
-
var sum = d3.sum(this.fdata, function(d,i) { return d.value; });
|
|
169
|
-
parsed.map(function(d,i) {
|
|
170
|
-
var a = (d.startAngle + d.endAngle ) / 2;
|
|
171
|
-
var r = that.radius;
|
|
172
|
-
if(that.config.labelPosition != 'in') r += that.config.fontSize * 2;
|
|
173
|
-
else r = (that.radius + that.radius * 0.9 * (1 - that.config.thick/2))/2;
|
|
174
|
-
if(!d.data.parsed) d.data.parsed = d;
|
|
175
|
-
d.data.width = (d.endAngle - d.startAngle) * r;
|
|
176
|
-
d.data.centralRadius = r;
|
|
177
|
-
d.data.innerRadius = that.radius * 0.9 * (1 - that.config.thick/2);
|
|
178
|
-
d.data.x = Math.sin(a) * r;
|
|
179
|
-
d.data.y = -Math.cos(a) * r;
|
|
180
|
-
d.data.startAngle = d.startAngle;
|
|
181
|
-
d.data.endAngle = d.endAngle;
|
|
182
|
-
d.data.padAngle = d.padAngle;
|
|
183
|
-
d.data.percent = (parseInt(1000 * d.data.value / sum) / 10) + "%";
|
|
184
|
-
});
|
|
185
|
-
if(this.config.sort) {
|
|
186
|
-
this.parsed.sort(function(a,b) { return b.data.value - a.data.value; });
|
|
187
|
-
} else {
|
|
188
|
-
this.parsed.sort(function(a,b) { return parseInt(Math.random() * 2 - 1); });
|
|
189
|
-
}
|
|
190
|
-
if(this.config.thick>1) this.config.thick = 1;
|
|
191
|
-
if(this.config.thick<0) this.config.thick = 0;
|
|
192
|
-
this.arc = d3.svg.arc()
|
|
193
|
-
.innerRadius(function(d,i) { return d.data.innerRadius; })
|
|
194
|
-
.outerRadius(this.radius)
|
|
195
|
-
.cornerRadius(this.config.boxRoundness);
|
|
196
|
-
},
|
|
197
|
-
render: function() {
|
|
198
|
-
var that = this;
|
|
199
|
-
if(this.config.fontFamily) d3.select(this.root).style("font-family", this.config.fontFamily);
|
|
200
|
-
d3.select(this.root).style("background-color", this.config.background);
|
|
201
|
-
this.svg.selectAll("g.label text, .legend text, g.marker text").attr({
|
|
202
|
-
"font-size": that.config.fontSize,
|
|
203
|
-
"fill": that.config.textFill
|
|
204
|
-
});
|
|
205
|
-
(this.pieGroup.attr("transform")
|
|
206
|
-
? this.pieGroup.transition("morph").duration(500)
|
|
207
|
-
: this.pieGroup
|
|
208
|
-
).attr({
|
|
209
|
-
transform: [
|
|
210
|
-
"translate(",
|
|
211
|
-
(that.width - this.legendOffset[0] * (this.config.legendPosition == "right" ? 1 : -1 )) / 2,
|
|
212
|
-
(that.height - this.legendOffset[1] * (this.config.legendPosition == "bottom" ? 1 : -1 )) / 2,
|
|
213
|
-
")"
|
|
214
|
-
].join(" ")
|
|
215
|
-
});
|
|
216
|
-
this.pieGroup.selectAll("path.data.pie").attr({
|
|
217
|
-
fill: function(d,i) {
|
|
218
|
-
return that.cScale(d.data.name);
|
|
219
|
-
},
|
|
220
|
-
stroke: this.config.stroke,
|
|
221
|
-
"stroke-width": this.config.strokeWidth
|
|
222
|
-
}).transition("opacity").duration(500).attr({
|
|
223
|
-
opacity: function(d,i) {
|
|
224
|
-
return (!that.activeGroup || that.activeGroup == d.data.name ? 1 : 0.1);
|
|
225
|
-
}
|
|
226
|
-
});
|
|
227
|
-
this.pieGroup.selectAll("path.data.pie").transition("morph").duration(500).tween("morph", function(d,i) {
|
|
228
|
-
var oldAngles = (
|
|
229
|
-
this.lastAngles || [d.startAngle,d.startAngle,d.data.innerRadius, d.data.innerRadius]
|
|
230
|
-
);
|
|
231
|
-
var curAngles = [d.startAngle, d.endAngle, that.radius, d.data.innerRadius];
|
|
232
|
-
var node = d3.select(this);
|
|
233
|
-
this.lastAngles = curAngles;
|
|
234
|
-
return function(t) {
|
|
235
|
-
node.attr({
|
|
236
|
-
d: that.arc
|
|
237
|
-
.startAngle((curAngles[0] - oldAngles[0]) * t + oldAngles[0])
|
|
238
|
-
.endAngle((curAngles[1] - oldAngles[1]) * t + oldAngles[1])
|
|
239
|
-
.outerRadius((curAngles[2] - oldAngles[2]) * t + oldAngles[2])
|
|
240
|
-
.innerRadius((curAngles[3] - oldAngles[3]) * t + oldAngles[3])
|
|
241
|
-
});
|
|
242
|
-
};
|
|
243
|
-
});
|
|
244
|
-
var labels = this.pieGroup.selectAll("g.label");
|
|
245
|
-
labels.filter(function(d,i) { return !d3.select(this).attr("transform"); }).attr({
|
|
246
|
-
transform: function(d,i) {
|
|
247
|
-
return ["translate(", d.data.x, d.data.y,")"].join(" ");
|
|
248
|
-
}
|
|
249
|
-
});
|
|
250
|
-
labels.each(function(d,i) {
|
|
251
|
-
var node = d3.select(this);
|
|
252
|
-
node.selectAll("text").attr({
|
|
253
|
-
fill: function(d,i) {
|
|
254
|
-
var c = d3.hsl(that.cScale(d.data.name));
|
|
255
|
-
return (c.l > 0.6 || (that.config.labelPosition != 'in') ? "#000":"#fff");
|
|
256
|
-
},
|
|
257
|
-
"font-size": that.config.fontSize,
|
|
258
|
-
"text-anchor": "middle",
|
|
259
|
-
dy: "0.38em"
|
|
260
|
-
}).style({
|
|
261
|
-
display: (that.config.labelShow?"block":"none")
|
|
262
|
-
}).text(function(d,i) {
|
|
263
|
-
return (that.config.showPercent ? d.data.percent : parseInt(100*d.data.value)/100);
|
|
264
|
-
});
|
|
265
|
-
node.select("text.label.shadow").attr({
|
|
266
|
-
stroke: function(d,i) {
|
|
267
|
-
var c = d3.hsl(that.cScale(d.data.name));
|
|
268
|
-
return (c.l > 0.6 || that.config.labelPosition != 'in' ? "#fff":"#000");
|
|
269
|
-
},
|
|
270
|
-
"stroke-width": that.config.labelShadowSize,
|
|
271
|
-
}).style({
|
|
272
|
-
display: (that.config.labelShadowSize && that.config.labelShow ? "block" : "none")
|
|
273
|
-
});
|
|
274
|
-
if(that.config.fontSize * 2 > d.data.width * 1.5) {
|
|
275
|
-
node.selectAll("text").style({display: "none"});
|
|
276
|
-
}
|
|
277
|
-
})
|
|
278
|
-
labels.transition("move").duration(500).attr({
|
|
279
|
-
transform: function(d,i) {
|
|
280
|
-
return ["translate(", d.data.x, d.data.y,")"].join(" ");
|
|
281
|
-
}
|
|
282
|
-
});
|
|
283
|
-
labels.transition("opacity").duration(500).attr({opacity: 1});
|
|
284
|
-
this.pieGroup.selectAll("g.marker").attr({
|
|
285
|
-
display: (this.config.legendInline ? "block" : "none")
|
|
286
|
-
}).each(function(d,i) {
|
|
287
|
-
var node = d3.select(this);
|
|
288
|
-
var x1, y1, x2, y2, xm, ym;
|
|
289
|
-
var a = (d.startAngle + d.endAngle)/2;
|
|
290
|
-
x1 = Math.sin(a) * that.radius;
|
|
291
|
-
y1 = -Math.cos(a) * that.radius;
|
|
292
|
-
x2 = x1 + (x1 < 0 ? -100 : 100);
|
|
293
|
-
y2 = y1 + (y1 < 0 ? -20 : 20);
|
|
294
|
-
if(Math.abs(x1) < Math.abs(y1)) {
|
|
295
|
-
xm = x1 + (x1 < 0 ? -20 : 20);
|
|
296
|
-
ym = y2;
|
|
297
|
-
} else {
|
|
298
|
-
xm = x2 + (x1 < 0 ? 20 : -20);
|
|
299
|
-
ym = y1;
|
|
300
|
-
}
|
|
301
|
-
node.select("circle").attr({
|
|
302
|
-
cx: x1, cy: y1, fill: that.config.legendInlineColor,
|
|
303
|
-
r: that.config.legendInlineStrokeWidth * 1.5
|
|
304
|
-
});
|
|
305
|
-
node.select("circle:last-of-type").attr({
|
|
306
|
-
cx: x2, cy: y2, fill: that.config.legendInlineColor,
|
|
307
|
-
r: that.config.legendInlineStrokeWidth * 1.5
|
|
308
|
-
});
|
|
309
|
-
node.select("path").attr({
|
|
310
|
-
d: function() {
|
|
311
|
-
return [
|
|
312
|
-
"M", x1, y1,
|
|
313
|
-
"L", xm, ym,
|
|
314
|
-
"L", x2, y2
|
|
315
|
-
].join(" ");
|
|
316
|
-
},
|
|
317
|
-
fill: "none",
|
|
318
|
-
stroke: that.config.legendInlineColor,
|
|
319
|
-
"stroke-width": that.config.legendInlineStrokeWidth
|
|
320
|
-
});
|
|
321
|
-
node.select("text").attr({
|
|
322
|
-
x: x2, y: y2,
|
|
323
|
-
dy: "0.38em",
|
|
324
|
-
dx: (x1<0?-0.5:0.5) + "em",
|
|
325
|
-
"text-anchor": (x1<0?"end": "start")
|
|
326
|
-
}).text(d.data.name);
|
|
327
|
-
});
|
|
328
|
-
var minus = ["left","top"].indexOf(this.config.legendPosition) >= 0;
|
|
329
|
-
var offset = (this.legendVertical
|
|
330
|
-
? [this.width/2 + (this.radius + this.config.fontSize/2 - (minus?-1:1)*this.legendSize[0]/2) * (minus ? -1 : 1),(this.height - this.legendSize[1])/2]
|
|
331
|
-
: [(this.width - this.legendSize[0])/2,this.height/2 + (this.radius + this.config.fontSize + (!minus?-this.legendSize[1]:0)) * (minus?-1:1)]
|
|
332
|
-
);
|
|
333
|
-
this.legendGroup.attr({
|
|
334
|
-
transform: ["translate(",offset[0], offset[1], ")"].join(" "),
|
|
335
|
-
display: this.config.legendShow ? "block" : "none"
|
|
336
|
-
});
|
|
337
|
-
}
|
|
338
|
-
}
|