Skip to content
This repository was archived by the owner on Jun 15, 2023. It is now read-only.

Commit 5de7fd7

Browse files
shujuwen2013cryogenian
authored andcommitted
Add new features and examples (#15)
+ Added more linear chart examples + Formatters are refined + Some options fixed
1 parent fdec333 commit 5de7fd7

25 files changed

+1227
-24
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ install:
55
- npm install bower gulp -g
66
- npm install && bower install
77
script:
8-
- gulp concat
8+
- travis_wait gulp concat

docs/Echarts/Axis.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#### `AxisLineStyleRec`
44

55
``` purescript
6-
type AxisLineStyleRec = { color :: Maybe (Array (Tuple Number Color)), width :: Maybe Number }
6+
type AxisLineStyleRec = { color :: Maybe Color, width :: Maybe Number }
77
```
88

99
#### `AxisLineStyle`

docs/Echarts/Color.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,31 @@ newtype ColorFuncParam
1919
= ColorFuncParam ColorFuncParamRec
2020
```
2121

22+
#### `LinearGradient`
23+
24+
``` purescript
25+
data LinearGradient :: *
26+
```
27+
28+
#### `LinearGradientInput`
29+
30+
``` purescript
31+
type LinearGradientInput = { x0 :: Number, y0 :: Number, x1 :: Number, y1 :: Number, s0 :: Number, sc0 :: String, s1 :: Number, sc1 :: String }
32+
```
33+
34+
#### `linearGradientInputDefault`
35+
36+
``` purescript
37+
linearGradientInputDefault :: LinearGradientInput
38+
```
39+
2240
#### `CalculableColor`
2341

2442
``` purescript
2543
data CalculableColor
2644
= SimpleColor Color
27-
| ColorFunc (ColorFuncParam -> Color)
45+
| ColorFunc (String -> Color)
46+
| GradientColor LinearGradient
2847
```
2948

3049
##### Instances

docs/Echarts/Formatter.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ type FormatParams = Json
1111
``` purescript
1212
data Formatter
1313
= Template String
14-
| FormatFunc (forall eff. Array FormatParams -> Eff eff String)
14+
| FormatFunc (Array FormatParams -> String)
15+
| StringFormatFunc (String -> String)
16+
| NumberFormatFunc (Number -> String)
1517
```
1618

1719
##### Instances

docs/Echarts/Mark.Line.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ markLineDefault :: MarkLineRec
2828
#### `addMarkLine`
2929

3030
``` purescript
31-
addMarkLine :: forall e a. MarkLine -> EChart -> Eff (addMarkLineECharts :: ADD_MARKLINE | e) EChart
31+
addMarkLine :: forall e. MarkLine -> EChart -> Eff (addMarkLineECharts :: ADD_MARKLINE | e) EChart
3232
```
3333

3434
#### `delMarkLine`

docs/Echarts/Mark.Point.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ markPointDefault :: MarkPointRec
2828
#### `delMarkPoint`
2929

3030
``` purescript
31-
delMarkPoint :: forall e. Number -> String -> EChart -> Eff (removeMarkPointECharts :: REMOVE_MARKPOINT | e) EChart
31+
delMarkPoint :: forall e. Number -> String -> EChart -> (Eff (removeMarkPointECharts :: REMOVE_MARKPOINT | e) EChart)
3232
```
3333

3434
#### `addMarkPoint`
3535

3636
``` purescript
37-
addMarkPoint :: forall e. MarkPoint -> EChart -> Eff (addMarkPointECharts :: ADD_MARKPOINT | e) EChart
37+
addMarkPoint :: forall e. MarkPoint -> EChart -> (Eff (addMarkPointECharts :: ADD_MARKPOINT | e) EChart)
3838
```
3939

4040

docs/Echarts/Style.Area.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
## Module ECharts.Style.Area
22

3+
#### `AreaStyleRec`
4+
5+
``` purescript
6+
type AreaStyleRec = { color :: Maybe CalculableColor, type :: Maybe String }
7+
```
8+
39
#### `AreaStyle`
410

511
``` purescript
612
newtype AreaStyle
7-
= AreaStyle Color
13+
= AreaStyle AreaStyleRec
814
```
915

1016
##### Instances
@@ -13,4 +19,10 @@ EncodeJson AreaStyle
1319
DecodeJson AreaStyle
1420
```
1521

22+
#### `areaStyleDefault`
23+
24+
``` purescript
25+
areaStyleDefault :: AreaStyleRec
26+
```
27+
1628

docs/Echarts/Symbol.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ data Symbol
1212
| EmptyRectangle
1313
| EmptyTriangle
1414
| EmptyDiamond
15+
| NoSymbol
1516
```
1617

1718
##### Instances

docs/Echarts/Utils.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,16 @@
66
unnull :: Json -> Json
77
```
88

9+
#### `dateTimeFormatter`
10+
11+
``` purescript
12+
dateTimeFormatter :: String -> (String -> String)
13+
```
14+
15+
#### `numeralFormatter`
16+
17+
``` purescript
18+
numeralFormatter :: String -> (Number -> String)
19+
```
20+
921

example/AreaPlot.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// module AreaPlot
2+
3+
exports.linearGradientColor = function(a) {
4+
return zrender.tool.color.getLinearGradient(
5+
a.x0, a.y0, a.x1, a.y1, [[a.s0, a.sc0],[a.s1, a.sc1]])
6+
};
7+
8+
9+

0 commit comments

Comments
 (0)