Merge pull request #46 from freelyshadow/master

增加图例类型
abel533 · Jun 24, 2018 · ce62f4f · ce62f4f
2 parents 6f94b23 + e49597a
commit ce62f4f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/src/main/java/com/github/abel533/echarts/Legend.java b/src/main/java/com/github/abel533/echarts/Legend.java
@@ -25,6 +25,7 @@
 package com.github.abel533.echarts;
 
 import com.github.abel533.echarts.code.Align;
+import com.github.abel533.echarts.code.LegendType;
 import com.github.abel533.echarts.code.Orient;
 import com.github.abel533.echarts.style.TextStyle;
 import lombok.Getter;
@@ -44,6 +45,12 @@ public class Legend extends Basic<Legend> implements Data<Legend>, Component {
      * @see com.github.abel533.echarts.code.Orient
      */
     private Orient orient;
+
+    /**
+     * 设置分页方式
+     */
+    private LegendType type ;
+
     /**
      * 图例图形宽度
      */
@@ -93,6 +100,15 @@ public Legend(Object... values) {
         this.data(values);
     }
 
+    public LegendType type(){
+        return this.type;
+    }
+
+    public Legend type(LegendType type) {
+        this.type = type;
+        return this;
+    }
+
     public Align align() {
         return this.align;
     }

diff --git a/src/main/java/com/github/abel533/echarts/code/LegendType.java b/src/main/java/com/github/abel533/echarts/code/LegendType.java
@@ -0,0 +1,9 @@
+package com.github.abel533.echarts.code;
+
+/**
+ * 图例类型
+ *
+ */
+public enum LegendType {
+    plain,scroll
+}
diff --git a/src/test/java/com/github/abel533/echarts/OptionTest.java b/src/test/java/com/github/abel533/echarts/OptionTest.java
@@ -26,6 +26,7 @@
 
 import com.github.abel533.echarts.axis.CategoryAxis;
 import com.github.abel533.echarts.axis.ValueAxis;
+import com.github.abel533.echarts.code.LegendType;
 import com.github.abel533.echarts.code.MarkType;
 import com.github.abel533.echarts.code.Tool;
 import com.github.abel533.echarts.code.Trigger;
@@ -45,7 +46,7 @@ public class OptionTest {
     @Test
     public void basicOption() {
         EnhancedOption option = new EnhancedOption();
-        option.legend().padding(5).itemGap(10).data("ios7", "android4");
+        option.legend().padding(5).itemGap(10).type(LegendType.scroll).data("ios7", "android4");
         option.toolbox().show(true).feature(Tool.dataView, Tool.saveAsImage, Tool.dataZoom, Tool.magicType);
         option.tooltip().trigger(Trigger.item);
         option.xAxis(new CategoryAxis().data("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"));