Permalink
Browse files

Merge pull request #57 from Meldanen/additional-options

Additional options
  • Loading branch information...
abel533 committed Sep 30, 2018
2 parents 51ef60d + 7c8bc52 commit 7911c7374da406980c2e2fb3796401ee266ed513
@@ -52,7 +52,7 @@
/**
* 显示的label的格式化器
*/
private String labelFormatter;
private Object labelFormatter;
/**
* 是否在 dataZoom-silder 组件中显示数据阴影。数据阴影可以简单得反应数据走势
*/
@@ -134,6 +134,8 @@
*/
private Boolean showDetail;
private Object minValueSpan;
public String labelPrecision() {
return this.labelPrecision;
}
@@ -143,11 +145,11 @@ public DataZoom labelPrecision(String labelPrecision) {
return this;
}
public String labelFormatter() {
public Object labelFormatter() {
return this.labelFormatter;
}
public DataZoom labelFormatter(String labelFormatter) {
public DataZoom labelFormatter(Object labelFormatter) {
this.labelFormatter = labelFormatter;
return this;
}
@@ -220,6 +222,7 @@ public DataZoom endValue(Date endValue) {
this.endValue = endValue;
return this;
}
public DataZoomType type() {
return this.type;
}
@@ -488,4 +491,21 @@ public DataZoom showDetail(Boolean showDetail) {
this.showDetail = showDetail;
return this;
}
/**
* minValueSpan
*
* @param minValueSpan
*/
public DataZoom minValueSpan(Object minValueSpan) {
this.minValueSpan = minValueSpan;
return this;
}
/**
* minValueSpan
*/
public Object minValueSpan() {
return this.minValueSpan;
}
}
@@ -54,7 +54,8 @@
*/
private AxisType type;
/**
* 坐标轴类型,横轴默认为类目型'bottom',纵轴默认为数值型'left',可选为:'bottom' | 'top' | 'left' | 'right'
* 坐标轴类型,横轴默认为类目型'bottom',纵轴默认为数值型'left',可选为:'bottom' | 'top' | 'left' |
* 'right'
*
* @see com.github.abel533.echarts.code.X
* @see com.github.abel533.echarts.code.Y
@@ -135,6 +136,8 @@
*/
private Object interval;
private Number minInterval;
public Boolean scale() {
return this.scale;
}
@@ -470,7 +473,6 @@ public T axisLabel(AxisLabel label) {
return (T) this;
}
/**
* 分隔线,默认显示,属性show控制显示与否,属性lineStyle(详见lineStyle)控制线条样式
*
@@ -521,6 +523,7 @@ public T splitArea(SplitArea splitArea) {
* @param values
* @return
*/
@Override
public T data(Object... values) {
if (values == null || values.length == 0) {
return (T) this;
@@ -535,4 +538,13 @@ public T data(Object... values) {
this.data.addAll(Arrays.asList(values));
return (T) this;
}
public Number minInterval() {
return this.minInterval;
}
public T minInterval(Number minInterval) {
this.minInterval = minInterval;
return (T) this;
}
}
@@ -31,6 +31,12 @@
* @author liuzh
*/
public class DataZoom extends Feature {
/**
* 当不指定时默认控制所有纵向类目,可通过数组指定多个需要控制的纵向类目坐标轴Index,仅一个时可直接为数字
*/
private Object yAxisIndex;
/**
* 构造函数
*/
@@ -41,4 +47,22 @@ public DataZoom() {
title.put("dataZoomReset", "区域缩放后退");
this.title(title);
}
/**
* 获取yAxisIndex值
*/
public Object yAxisIndex() {
return this.yAxisIndex;
}
/**
* 设置yAxisIndex值
*
* @param yAxisIndex
*/
public DataZoom yAxisIndex(Object yAxisIndex) {
this.yAxisIndex = yAxisIndex;
return this;
}
}
@@ -27,6 +27,7 @@
import com.github.abel533.echarts.code.DataFilter;
import com.github.abel533.echarts.code.SeriesType;
import com.github.abel533.echarts.style.AreaStyle;
import com.github.abel533.echarts.style.LineStyle;
import lombok.Getter;
import lombok.Setter;
@@ -51,6 +52,11 @@
*/
private AreaStyle areaStyle;
/**
* lineStyle
*/
private LineStyle lineStyle;
/**
* 构造函数
*/
@@ -111,6 +117,7 @@ public Line smooth(Boolean smooth) {
this.smooth = smooth;
return this;
}
/**
* 新建并返回areaStyle
*
@@ -133,4 +140,27 @@ public Line areaStyle(AreaStyle areaStyle) {
this.areaStyle = areaStyle;
return this;
}
/**
* 新建并返回lineStyle
*
* @return
*/
public LineStyle lineStyle() {
if (this.lineStyle == null) {
this.lineStyle = new LineStyle();
}
return this.lineStyle;
}
/**
* 设置lineStyle
*
* @param lineStyle
* @return
*/
public Line lineStyle(LineStyle lineStyle) {
this.lineStyle = lineStyle;
return this;
}
}
@@ -38,6 +38,15 @@
private static final long serialVersionUID = 418674375057055357L;
/**
* 阳线颜色
*/
private Object color;
/**
* 阴线颜色
*/
private Object color0;
/**
* 默认样式
*/
@@ -206,7 +215,7 @@ public void setBreadcrumb(Breadcrumb breadcrumb) {
/**
* 获取childBorderWidth值
*/
public Integer getChildBorderWidth() {
public Integer getChildBorderWidth() {
return childBorderWidth;
}
@@ -222,7 +231,7 @@ public void setChildBorderWidth(Integer childBorderWidth) {
/**
* 获取childBorderColor值
*/
public Object getChildBorderColor() {
public Object getChildBorderColor() {
return childBorderColor;
}
@@ -234,4 +243,70 @@ public Object getChildBorderColor() {
public void setChildBorderColor(Object childBorderColor) {
this.childBorderColor = childBorderColor;
}
/**
* 获取color值
*/
public Object color() {
return this.color;
}
/**
* 设置color值
*
* @param color
*/
public ItemStyle color(Object color) {
this.color = color;
return this;
}
/**
* 获取color0值
*/
public Object color0() {
return this.color0;
}
/**
* 设置color0值
*
* @param color0
*/
public ItemStyle color0(Object color0) {
this.color0 = color0;
return this;
}
/**
* 获取color值
*/
public Object getColor() {
return color;
}
/**
* 设置color值
*
* @param color
*/
public void setColor(Object color) {
this.color = color;
}
/**
* 获取color0值
*/
public Object getColor0() {
return color0;
}
/**
* 设置color0值
*
* @param color0
*/
public void setColor0(Object color0) {
this.color0 = color0;
}
}
@@ -37,6 +37,11 @@
private static final long serialVersionUID = 4765717693423256102L;
/**
* 图形透明度。支持从 0 到 1 的数字,为 0 时不绘制该图形
*/
private Double opacity;
/**
* 阳线颜色
*/
@@ -428,4 +433,13 @@ public LineStyle emphasis(Emphasis emphasis) {
this.emphasis = emphasis;
return this;
}
public Double opacity() {
return this.opacity;
}
public LineStyle opacity(Double opacity) {
this.opacity = opacity;
return this;
}
}

0 comments on commit 7911c73

Please sign in to comment.