Merge pull request #44 from cryogenian/mark-items

Mark items
slamdata · Aug 21, 2017 · 3a63c19 · 3a63c19
2 parents 1d3d414 + 8ccb3a7
commit 3a63c19
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/example/src/K.purs b/example/src/K.purs
@@ -31,6 +31,21 @@ options = do
     E.min 2200.0
     E.scale true
   E.series $ E.candlestick do
+    E.markLine do
+      E.lineStyle $ E.normal do
+        E.solidLine
+      E.buildMarkItems do
+        E.addItem do
+          E.symbol ET.Diamond
+          E.buildCoord do
+            E.coordXValue "2013/1/24"
+            E.coordY "2200.00"
+        E.addItem do
+          E.symbol ET.Diamond
+          E.buildCoord do
+            E.coordXValue "2013/1/29"
+            E.coordY "2300.00"
+
     E.buildItems
       $ F.traverse_ (E.addItem <<< E.values)
       [ [ 2320.26, 2302.6, 2287.3, 2362.94 ]

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "purescript-echarts",
   "private": true,
   "devDependencies": {
-    "echarts": "^3.3.1",
+    "echarts": "3.5.4",
     "express": "^4.14.0"
   },
   "scripts": {

diff --git a/src/ECharts/Commands.purs b/src/ECharts/Commands.purs
@@ -118,6 +118,9 @@ addItem = set "" <<< buildObj
 buildItems ∷ ∀ i. DSL TP.ItemsI → DSL (items ∷ I|i)
 buildItems is = set "data" $ buildArr is
 
+buildMarkItems ∷ ∀ i. DSL TP.ItemsI → DSL (markItems ∷ I|i)
+buildMarkItems is = set "data" $ toForeign [ buildArr is ]
+
 calendarIndex ∷ ∀ i. Int → DSL (calendarIndex ∷ I|i)
 calendarIndex i = set "calendarIndex" $ toForeign i
 

diff --git a/src/ECharts/Types/Phantom.purs b/src/ECharts/Types/Phantom.purs
@@ -1180,13 +1180,13 @@ type MarkLineI =
    , label ∷ I
    , silent ∷ I
    , lineStyle ∷ R (NormalAndEmphasis LineStyleI)
-   , items ∷ I))
+   , markItems ∷ I))
 
 type MarkAreaI =
   AnimationMixin
   ( label ∷ I
   , itemStyle ∷ I
-  , items ∷ I)
+  , markItems ∷ I)
 
 type RippleEffectI =
   ( period ∷ I