Skip to content

Commit 625dfd8

Browse files
k4124kabel533
k4124k
authored and
abel533
committed
Merge pull request !4 from micky/master
2 parents b1ffafc + 427b8fa commit 625dfd8

File tree

6 files changed

+268
-5
lines changed

6 files changed

+268
-5
lines changed

‎src/main/java/com/github/abel533/echarts/code/Position.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@
3030
* @author liuzh
3131
*/
3232
public enum Position {
33-
outside, outer, inside, left, right, top, bottom
33+
outside, outer, inside, left, right, top, bottom,center
3434
}

‎src/main/java/com/github/abel533/echarts/series/Line.java

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import com.github.abel533.echarts.code.DataFilter;
2828
import com.github.abel533.echarts.code.SeriesType;
29+
import com.github.abel533.echarts.style.AreaStyle;
2930

3031
/**
3132
* @author liuzh
@@ -37,9 +38,14 @@ public class Line extends Series<Line> {
3738
private Boolean smooth;
3839
/**
3940
* ECharts 会在折线图的数据数量大于实际显示的像素宽度（高度）的时候会启用优化，对显示在一个像素宽度内的数据做筛选，该选项是指明数据筛选的策略
41+
*
4042
* @see DataFilter
4143
*/
4244
private Object dataFilter;
45+
/**
46+
* 区域填充样式。
47+
*/
48+
private AreaStyle areaStyle;
4349

4450
/**
4551
* 构造函数
@@ -133,4 +139,46 @@ public Object getDataFilter() {
133139
public void setDataFilter(Object dataFilter) {
134140
this.dataFilter = dataFilter;
135141
}
142+
143+
144+
/**
145+
* 新建并返回areaStyle
146+
*
147+
* @return
148+
*/
149+
public AreaStyle areaStyle() {
150+
if (this.areaStyle == null) {
151+
this.areaStyle = new AreaStyle();
152+
}
153+
return this.areaStyle;
154+
}
155+
156+
/**
157+
* 设置areaStyle
158+
*
159+
* @param areaStyle
160+
* @return
161+
*/
162+
public Line areaStyle(AreaStyle areaStyle) {
163+
this.areaStyle = areaStyle;
164+
return this;
165+
}
166+
167+
/**
168+
* 设置areaStyle
169+
*
170+
* @param areaStyle
171+
*/
172+
public void setAreaStyle(AreaStyle areaStyle) {
173+
this.areaStyle = areaStyle;
174+
}
175+
176+
/**
177+
* 获取areaStyle
178+
*
179+
* @return
180+
*/
181+
public AreaStyle getAreaStyle() {
182+
return areaStyle;
183+
}
136184
}

‎src/main/java/com/github/abel533/echarts/series/Pie.java

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ public class Pie extends Series<Pie> {
7272
*/
7373
private SelectedMode selectedMode;
7474

75+
/**
76+
* 是否启用防止标签重叠策略，默认开启
77+
*/
78+
private Boolean avoidLabelOverlap;
79+
7580
/**
7681
* 构造函数
7782
*/
@@ -335,7 +340,7 @@ public void setClockWise(Boolean clockWise) {
335340
/**
336341
* 获取roseType值
337342
*/
338-
public RoseType getRoseType() {
343+
public RoseType getRoseType() {
339344
return roseType;
340345
}
341346

@@ -351,7 +356,7 @@ public void setRoseType(RoseType roseType) {
351356
/**
352357
* 获取selectedOffset值
353358
*/
354-
public Integer getSelectedOffset() {
359+
public Integer getSelectedOffset() {
355360
return selectedOffset;
356361
}
357362

@@ -367,7 +372,7 @@ public void setSelectedOffset(Integer selectedOffset) {
367372
/**
368373
* 获取selectedMode值
369374
*/
370-
public SelectedMode getSelectedMode() {
375+
public SelectedMode getSelectedMode() {
371376
return selectedMode;
372377
}
373378

@@ -376,7 +381,41 @@ public SelectedMode getSelectedMode() {
376381
*
377382
* @param selectedMode
378383
*/
379-
public void setSelectedMode(SelectedMode selectedMode) {
384+
public void setSelectedMode(SelectedMode selectedMode) {
380385
this.selectedMode = selectedMode;
381386
}
387+
388+
/**
389+
* 返回avoidLabelOverlap
390+
*
391+
* @return
392+
*/
393+
public Boolean getAvoidLabelOverlap() {
394+
return avoidLabelOverlap;
395+
}
396+
397+
/**
398+
* 设置 avoidLabelOverlap值
399+
*
400+
* @param avoidLabelOverlap
401+
*/
402+
public void setAvoidLabelOverlap(Boolean avoidLabelOverlap) {
403+
this.avoidLabelOverlap = avoidLabelOverlap;
404+
}
405+
406+
public Boolean avoidLabelOverlap() {
407+
return this.avoidLabelOverlap;
408+
409+
}
410+
411+
/**
412+
* 设置 avoidLabelOverlap
413+
*
414+
* @param avoidLabelOverlap
415+
* @return
416+
*/
417+
public Pie avoidLabelOverlap(Boolean avoidLabelOverlap) {
418+
this.avoidLabelOverlap = avoidLabelOverlap;
419+
return this;
420+
}
382421
}

‎src/main/java/com/github/abel533/echarts/series/force/Link.java

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
package com.github.abel533.echarts.series.force;
2626

2727
import com.github.abel533.echarts.style.ItemStyle;
28+
import com.github.abel533.echarts.style.LineStyle;
2829

2930
import java.io.Serializable;
3031

@@ -54,6 +55,11 @@ public class Link implements Serializable {
5455
*/
5556
private ItemStyle itemStyle;
5657

58+
/**
59+
* lineStyle样式
60+
*/
61+
private LineStyle lineStyle;
62+
5763
/**
5864
* 构造函数
5965
*/
@@ -197,4 +203,45 @@ public Integer getWeight() {
197203
public void setWeight(Integer weight) {
198204
this.weight = weight;
199205
}
206+
207+
/**
208+
* 设置lineStyle
209+
*
210+
* @param lineStyle
211+
*/
212+
public void setLineStyle(LineStyle lineStyle) {
213+
this.lineStyle = lineStyle;
214+
}
215+
216+
/**
217+
* 获取lineStyle
218+
*
219+
* @return
220+
*/
221+
public LineStyle getLineStyle() {
222+
return lineStyle;
223+
}
224+
225+
/**
226+
* 设置lineStyle，返回object
227+
*
228+
* @param lineStyle
229+
* @return
230+
*/
231+
public Link lineStyle(LineStyle lineStyle) {
232+
this.lineStyle = lineStyle;
233+
return this;
234+
}
235+
236+
/**
237+
* 返回lineStyle
238+
*
239+
* @return
240+
*/
241+
public LineStyle lineStyle() {
242+
if (lineStyle == null) {
243+
this.lineStyle = new LineStyle();
244+
}
245+
return this.lineStyle;
246+
}
200247
}

‎src/main/java/com/github/abel533/echarts/style/LineStyle.java

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
package com.github.abel533.echarts.style;
2626

2727
import com.github.abel533.echarts.code.LineType;
28+
import com.github.abel533.echarts.style.itemstyle.Emphasis;
29+
import com.github.abel533.echarts.style.itemstyle.Normal;
2830

2931
import java.io.Serializable;
3032

@@ -70,6 +72,15 @@ public class LineStyle implements Serializable {
7072
*/
7173
private Integer shadowOffsetY;
7274

75+
/**
76+
* normal属性
77+
*/
78+
private Normal normal;
79+
/**
80+
* emphasis属性
81+
*/
82+
private Emphasis emphasis;
83+
7384
/**
7485
* 获取color值
7586
*/
@@ -333,4 +344,88 @@ public Integer getShadowOffsetY() {
333344
public void setShadowOffsetY(Integer shadowOffsetY) {
334345
this.shadowOffsetY = shadowOffsetY;
335346
}
347+
348+
/**
349+
* 获取normal
350+
*
351+
* @return
352+
*/
353+
public Normal getNormal() {
354+
return normal;
355+
}
356+
357+
/**
358+
* 设置normal
359+
*
360+
* @param normal
361+
*/
362+
public void setNormal(Normal normal) {
363+
this.normal = normal;
364+
}
365+
366+
/**
367+
* 新建返回normal
368+
*
369+
* @return
370+
*/
371+
public Normal normal() {
372+
if (this.normal == null) {
373+
this.normal = new Normal();
374+
}
375+
return this.normal;
376+
377+
}
378+
379+
/**
380+
* 设置normal
381+
*
382+
* @param normal
383+
* @return
384+
*/
385+
public LineStyle normal(Normal normal) {
386+
this.normal = normal;
387+
return this;
388+
}
389+
390+
/**
391+
* 获取emphasis
392+
*
393+
* @return
394+
*/
395+
public Emphasis getEmphasis() {
396+
return emphasis;
397+
}
398+
399+
/**
400+
* 设置emphasis
401+
*
402+
* @param emphasis
403+
*/
404+
public void setEmphasis(Emphasis emphasis) {
405+
this.emphasis = emphasis;
406+
}
407+
408+
/**
409+
* 新建返回emphasis
410+
*
411+
* @return
412+
*/
413+
public Emphasis emphasis() {
414+
if (this.emphasis == null) {
415+
this.emphasis = new Emphasis();
416+
}
417+
return this.emphasis;
418+
419+
}
420+
421+
/**
422+
* 设置emphasis
423+
*
424+
* @param emphasis
425+
* @return
426+
*/
427+
public LineStyle emphasis(Emphasis emphasis) {
428+
this.emphasis = emphasis;
429+
return this;
430+
}
336431
}

‎src/main/java/com/github/abel533/echarts/style/itemstyle/Style.java

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,11 @@ public abstract class Style<T> implements Serializable {
150150
*/
151151
private TextStyle textStyle;
152152

153+
/**
154+
* 边的曲度，支持从 0 到 1 的值，值越大曲度越大。
155+
*/
156+
private Double curveness;
157+
153158
public TextStyle getTextStyle() {
154159
return textStyle;
155160
}
@@ -836,4 +841,33 @@ public Integer getBarBorderWidth() {
836841
public void setBarBorderWidth(Integer barBorderWidth) {
837842
this.barBorderWidth = barBorderWidth;
838843
}
844+
845+
/**
846+
* 设置curveness
847+
*
848+
* @param curveness
849+
*/
850+
public void setCurveness(Double curveness) {
851+
this.curveness = curveness;
852+
}
853+
854+
/**
855+
* 获取curveness
856+
*
857+
* @return
858+
*/
859+
public Double getCurveness() {
860+
return curveness;
861+
}
862+
863+
/**
864+
* 设置curveness ，返回T对象
865+
*
866+
* @param curveness
867+
* @return
868+
*/
869+
public T curveness(Double curveness) {
870+
this.curveness = curveness;
871+
return (T) this;
872+
}
839873
}

0 commit comments

Comments
 (0)