2.2.3新增词云,树图等大量相关类

pom.xml

@@ -28,7 +28,7 @@
 
   <groupId>com.github.abel533</groupId>
   <artifactId>ECharts</artifactId>
-  <version>2.2.2</version>
+  <version>2.2.3</version>
   <packaging>jar</packaging>
 
   <name>ECharts</name>

src/main/java/com/github/abel533/echarts/Basic.java

@@ -73,6 +73,32 @@ public abstract class Basic<T> implements Serializable {
      * 主副标题纵向间隔，单位px，默认为10
      */
     private Integer itemGap;
+    /**
+     * 一级层叠控制
+     */
+    private Integer zlevel;
+    /**
+     * 二级层叠控制
+     */
+    private Integer z;
+
+    public T zlevel(Integer zlevel) {
+        this.zlevel = zlevel;
+        return (T) this;
+    }
+
+    public Integer zlevel() {
+        return this.zlevel;
+    }
+
+    public T z(Integer z) {
+        this.z = z;
+        return (T) this;
+    }
+
+    public Integer z() {
+        return this.z;
+    }
 
     /**
      * 获取show值
@@ -374,4 +400,20 @@ public void setItemGap(Integer itemGap) {
     public void setPadding(Object padding) {
         this.padding = padding;
     }
+
+    public Integer getZlevel() {
+        return zlevel;
+    }
+
+    public void setZlevel(Integer zlevel) {
+        this.zlevel = zlevel;
+    }
+
+    public Integer getZ() {
+        return z;
+    }
+
+    public void setZ(Integer z) {
+        this.z = z;
+    }
 }

src/main/java/com/github/abel533/echarts/DataRange.java

@@ -25,6 +25,7 @@
 package com.github.abel533.echarts;
 
 import com.github.abel533.echarts.code.Orient;
+import com.github.abel533.echarts.data.RangeData;
 import com.github.abel533.echarts.style.TextStyle;
 
 import java.util.ArrayList;
@@ -97,6 +98,40 @@ public class DataRange extends Basic<DataRange> implements Component {
      */
     private Boolean hoverLink;
 
+    /**
+     * 用于设置dataRange的初始选中范围。calculable为true时有效。
+     */
+    private RangeData range;
+
+    public DataRange range(RangeData range) {
+        this.range = range;
+        return this;
+    }
+
+    public RangeData range() {
+        return this.range;
+    }
+
+    /**
+     * 自定义分割方式，支持不等距分割。splitList被指定时，splitNumber将被忽略。
+     */
+    private List<RangeData> splitList;
+
+    public DataRange splitList(RangeData... splitList) {
+        if (splitList == null || splitList.length == 0) {
+            return this;
+        }
+        this.splitList().addAll(Arrays.asList(splitList));
+        return this;
+    }
+
+    public List<RangeData> splitList() {
+        if (this.splitList == null) {
+            this.splitList = new ArrayList<RangeData>();
+        }
+        return this.splitList;
+    }
+
     /**
      * 设置color值
      *
@@ -120,7 +155,7 @@ public DataRange text(List<String> text) {
     /**
      * 获取hoverLink值
      */
-    public Boolean hoverLink(){
+    public Boolean hoverLink() {
         return this.hoverLink;
     }
 
@@ -129,7 +164,7 @@ public Boolean hoverLink(){
      *
      * @param hoverLink
      */
-    public DataRange hoverLink(Boolean hoverLink){
+    public DataRange hoverLink(Boolean hoverLink) {
         this.hoverLink = hoverLink;
         return this;
     }
@@ -595,4 +630,20 @@ public Boolean getHoverLink() {
     public void setHoverLink(Boolean hoverLink) {
         this.hoverLink = hoverLink;
     }
+
+    public RangeData getRange() {
+        return range;
+    }
+
+    public void setRange(RangeData range) {
+        this.range = range;
+    }
+
+    public List<RangeData> getSplitList() {
+        return splitList;
+    }
+
+    public void setSplitList(List<RangeData> splitList) {
+        this.splitList = splitList;
+    }
 }

src/main/java/com/github/abel533/echarts/DataZoom.java

@@ -250,7 +250,7 @@ public DataZoom zoomLock(Boolean zoomLock) {
     /**
      * 获取showDetail值
      */
-    public Boolean showDetail(){
+    public Boolean showDetail() {
         return this.showDetail;
     }
 
@@ -259,7 +259,7 @@ public Boolean showDetail(){
      *
      * @param showDetail
      */
-    public DataZoom showDetail(Boolean showDetail){
+    public DataZoom showDetail(Boolean showDetail) {
         this.showDetail = showDetail;
         return this;
     }

src/main/java/com/github/abel533/echarts/Legend.java

@@ -213,7 +213,7 @@ public Legend selected(String name, Boolean selected) {
         if (this.selected == null) {
             this.selected = new LinkedHashMap<String, Boolean>();
         }
-        this.selected.put(name,selected);
+        this.selected.put(name, selected);
         return this;
     }