删除

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/AbstractAxisOption.java

@@ -1,147 +0,0 @@
-package com.bstek.ureport.echarts.options;
-
-import java.util.List;
-
-import com.bstek.ureport.echarts.options.prop.AxisData;
-import com.bstek.ureport.echarts.options.prop.AxisLabel;
-import com.bstek.ureport.echarts.options.prop.AxisLine;
-import com.bstek.ureport.echarts.options.prop.AxisPointer;
-import com.bstek.ureport.echarts.options.prop.AxisTick;
-import com.bstek.ureport.echarts.options.prop.NameLocation;
-import com.bstek.ureport.echarts.options.prop.SplitArea;
-import com.bstek.ureport.echarts.options.prop.SplitLine;
-import com.bstek.ureport.echarts.options.prop.TextStyle;
-import com.bstek.ureport.echarts.options.prop.XAxisType;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月25日
- */
-public abstract class AbstractAxisOption {
-	private boolean show=true;
-	private int offset;
-	private XAxisType type;
-	private String name;
-	private NameLocation nameLocation;
-	private TextStyle nameTextStyle;
-	private int nameGap=15;
-	private Integer nameRotate;
-	private String boundaryGap;
-	private String min;
-	private String max;
-	private AxisLine axisLine;
-	private AxisTick axisTick;
-	private AxisLabel axisLabel;
-	private SplitLine splitLine;
-	private SplitArea splitArea;
-	private List<AxisData> data;
-	private AxisPointer axisPointer;
-	public boolean isShow() {
-		return show;
-	}
-	public void setShow(boolean show) {
-		this.show = show;
-	}
-	public int getOffset() {
-		return offset;
-	}
-	public void setOffset(int offset) {
-		this.offset = offset;
-	}
-	public XAxisType getType() {
-		return type;
-	}
-	public void setType(XAxisType type) {
-		this.type = type;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public NameLocation getNameLocation() {
-		return nameLocation;
-	}
-	public void setNameLocation(NameLocation nameLocation) {
-		this.nameLocation = nameLocation;
-	}
-	public TextStyle getNameTextStyle() {
-		return nameTextStyle;
-	}
-	public void setNameTextStyle(TextStyle nameTextStyle) {
-		this.nameTextStyle = nameTextStyle;
-	}
-	public int getNameGap() {
-		return nameGap;
-	}
-	public void setNameGap(int nameGap) {
-		this.nameGap = nameGap;
-	}
-	public Integer getNameRotate() {
-		return nameRotate;
-	}
-	public void setNameRotate(Integer nameRotate) {
-		this.nameRotate = nameRotate;
-	}
-	public String getBoundaryGap() {
-		return boundaryGap;
-	}
-	public void setBoundaryGap(String boundaryGap) {
-		this.boundaryGap = boundaryGap;
-	}
-	public String getMin() {
-		return min;
-	}
-	public void setMin(String min) {
-		this.min = min;
-	}
-	public String getMax() {
-		return max;
-	}
-	public void setMax(String max) {
-		this.max = max;
-	}
-	public AxisLine getAxisLine() {
-		return axisLine;
-	}
-	public void setAxisLine(AxisLine axisLine) {
-		this.axisLine = axisLine;
-	}
-	public AxisTick getAxisTick() {
-		return axisTick;
-	}
-	public void setAxisTick(AxisTick axisTick) {
-		this.axisTick = axisTick;
-	}
-	public AxisLabel getAxisLabel() {
-		return axisLabel;
-	}
-	public void setAxisLabel(AxisLabel axisLabel) {
-		this.axisLabel = axisLabel;
-	}
-	public SplitLine getSplitLine() {
-		return splitLine;
-	}
-	public void setSplitLine(SplitLine splitLine) {
-		this.splitLine = splitLine;
-	}
-	public SplitArea getSplitArea() {
-		return splitArea;
-	}
-	public void setSplitArea(SplitArea splitArea) {
-		this.splitArea = splitArea;
-	}
-	public List<AxisData> getData() {
-		return data;
-	}
-	public void setData(List<AxisData> data) {
-		this.data = data;
-	}
-	public AxisPointer getAxisPointer() {
-		return axisPointer;
-	}
-	public void setAxisPointer(AxisPointer axisPointer) {
-		this.axisPointer = axisPointer;
-	}
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/AngleAxisOption.java

@@ -1,145 +0,0 @@
-package com.bstek.ureport.echarts.options;
-
-import java.util.List;
-
-import com.bstek.ureport.echarts.options.prop.AxisData;
-import com.bstek.ureport.echarts.options.prop.AxisLabel;
-import com.bstek.ureport.echarts.options.prop.AxisLine;
-import com.bstek.ureport.echarts.options.prop.AxisPointer;
-import com.bstek.ureport.echarts.options.prop.AxisTick;
-import com.bstek.ureport.echarts.options.prop.AxisType;
-import com.bstek.ureport.echarts.options.prop.SplitArea;
-import com.bstek.ureport.echarts.options.prop.SplitLine;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月27日
- */
-public class AngleAxisOption {
-	private int startAngle=90;
-	private boolean clockwise=true;
-	private AxisType type;
-	private String min;
-	private String max;
-	private boolean scale;
-	private int splitNumber=5;
-	private int minInterval;
-	private String maxInterval;
-	private String interval;
-	private int logBase=10;
-	private AxisLine axisLine;
-	private AxisTick axisTick;
-	private AxisLabel axisLabel;
-	private SplitLine splitLine;
-	private SplitArea splitArea;
-	private List<AxisData> data;
-	private AxisPointer axisPointer;
-	public int getStartAngle() {
-		return startAngle;
-	}
-	public void setStartAngle(int startAngle) {
-		this.startAngle = startAngle;
-	}
-	public boolean isClockwise() {
-		return clockwise;
-	}
-	public void setClockwise(boolean clockwise) {
-		this.clockwise = clockwise;
-	}
-	public AxisType getType() {
-		return type;
-	}
-	public void setType(AxisType type) {
-		this.type = type;
-	}
-	public String getMin() {
-		return min;
-	}
-	public void setMin(String min) {
-		this.min = min;
-	}
-	public String getMax() {
-		return max;
-	}
-	public void setMax(String max) {
-		this.max = max;
-	}
-	public boolean isScale() {
-		return scale;
-	}
-	public void setScale(boolean scale) {
-		this.scale = scale;
-	}
-	public int getSplitNumber() {
-		return splitNumber;
-	}
-	public void setSplitNumber(int splitNumber) {
-		this.splitNumber = splitNumber;
-	}
-	public int getMinInterval() {
-		return minInterval;
-	}
-	public void setMinInterval(int minInterval) {
-		this.minInterval = minInterval;
-	}
-	public String getMaxInterval() {
-		return maxInterval;
-	}
-	public void setMaxInterval(String maxInterval) {
-		this.maxInterval = maxInterval;
-	}
-	public String getInterval() {
-		return interval;
-	}
-	public void setInterval(String interval) {
-		this.interval = interval;
-	}
-	public int getLogBase() {
-		return logBase;
-	}
-	public void setLogBase(int logBase) {
-		this.logBase = logBase;
-	}
-	public AxisLine getAxisLine() {
-		return axisLine;
-	}
-	public void setAxisLine(AxisLine axisLine) {
-		this.axisLine = axisLine;
-	}
-	public AxisTick getAxisTick() {
-		return axisTick;
-	}
-	public void setAxisTick(AxisTick axisTick) {
-		this.axisTick = axisTick;
-	}
-	public AxisLabel getAxisLabel() {
-		return axisLabel;
-	}
-	public void setAxisLabel(AxisLabel axisLabel) {
-		this.axisLabel = axisLabel;
-	}
-	public SplitLine getSplitLine() {
-		return splitLine;
-	}
-	public void setSplitLine(SplitLine splitLine) {
-		this.splitLine = splitLine;
-	}
-	public SplitArea getSplitArea() {
-		return splitArea;
-	}
-	public void setSplitArea(SplitArea splitArea) {
-		this.splitArea = splitArea;
-	}
-	public List<AxisData> getData() {
-		return data;
-	}
-	public void setData(List<AxisData> data) {
-		this.data = data;
-	}
-	public AxisPointer getAxisPointer() {
-		return axisPointer;
-	}
-	public void setAxisPointer(AxisPointer axisPointer) {
-		this.axisPointer = axisPointer;
-	}
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/GridOption.java

@@ -1,64 +0,0 @@
-package com.bstek.ureport.echarts.options;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月25日
- */
-public class GridOption {
-	private String left;
-	private String right;
-	private String top;
-	private String bottom;
-	private boolean containLabel=true;
-	private String backgroundColor;
-	private String borderColor;
-	private int borderWidth;
-	public String getLeft() {
-		return left;
-	}
-	public void setLeft(String left) {
-		this.left = left;
-	}
-	public String getRight() {
-		return right;
-	}
-	public void setRight(String right) {
-		this.right = right;
-	}
-	public String getTop() {
-		return top;
-	}
-	public void setTop(String top) {
-		this.top = top;
-	}
-	public String getBottom() {
-		return bottom;
-	}
-	public void setBottom(String bottom) {
-		this.bottom = bottom;
-	}
-	public boolean isContainLabel() {
-		return containLabel;
-	}
-	public void setContainLabel(boolean containLabel) {
-		this.containLabel = containLabel;
-	}
-	public String getBackgroundColor() {
-		return backgroundColor;
-	}
-	public void setBackgroundColor(String backgroundColor) {
-		this.backgroundColor = backgroundColor;
-	}
-	public String getBorderColor() {
-		return borderColor;
-	}
-	public void setBorderColor(String borderColor) {
-		this.borderColor = borderColor;
-	}
-	public int getBorderWidth() {
-		return borderWidth;
-	}
-	public void setBorderWidth(int borderWidth) {
-		this.borderWidth = borderWidth;
-	}
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/LegendOption.java

@@ -1,155 +0,0 @@
-package com.bstek.ureport.echarts.options;
-
-import java.util.List;
-
-import com.bstek.ureport.echarts.options.prop.Align;
-import com.bstek.ureport.echarts.options.prop.LegendType;
-import com.bstek.ureport.echarts.options.prop.Orient;
-import com.bstek.ureport.echarts.options.prop.TextStyle;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月25日
- */
-public class LegendOption {
-	private boolean show;
-	private LegendType type;
-	private String left;
-	private String right;
-	private String top;
-	private String bottom;
-	private Orient orient;
-	private Align align;
-	private String padding;
-	private int itemGap;
-	private String formatter;
-	private String selectedMode;
-	private String inactiveColor;
-	private TextStyle textStyle;
-	private List<String> data;
-	private String backgroundColor;
-	private String borderColor;
-	private int borderWidth;
-	private int borderRadius;
-	private TextStyle pageTextStyle;
-	public boolean isShow() {
-		return show;
-	}
-	public void setShow(boolean show) {
-		this.show = show;
-	}
-	public LegendType getType() {
-		return type;
-	}
-	public void setType(LegendType type) {
-		this.type = type;
-	}
-	public String getLeft() {
-		return left;
-	}
-	public void setLeft(String left) {
-		this.left = left;
-	}
-	public String getRight() {
-		return right;
-	}
-	public void setRight(String right) {
-		this.right = right;
-	}
-	public String getTop() {
-		return top;
-	}
-	public void setTop(String top) {
-		this.top = top;
-	}
-	public String getBottom() {
-		return bottom;
-	}
-	public void setBottom(String bottom) {
-		this.bottom = bottom;
-	}
-	public Orient getOrient() {
-		return orient;
-	}
-	public void setOrient(Orient orient) {
-		this.orient = orient;
-	}
-	public Align getAlign() {
-		return align;
-	}
-	public void setAlign(Align align) {
-		this.align = align;
-	}
-	public String getPadding() {
-		return padding;
-	}
-	public void setPadding(String padding) {
-		this.padding = padding;
-	}
-	public int getItemGap() {
-		return itemGap;
-	}
-	public void setItemGap(int itemGap) {
-		this.itemGap = itemGap;
-	}
-	public String getFormatter() {
-		return formatter;
-	}
-	public void setFormatter(String formatter) {
-		this.formatter = formatter;
-	}
-	public String getSelectedMode() {
-		return selectedMode;
-	}
-	public void setSelectedMode(String selectedMode) {
-		this.selectedMode = selectedMode;
-	}
-	public String getInactiveColor() {
-		return inactiveColor;
-	}
-	public void setInactiveColor(String inactiveColor) {
-		this.inactiveColor = inactiveColor;
-	}
-	public TextStyle getTextStyle() {
-		return textStyle;
-	}
-	public void setTextStyle(TextStyle textStyle) {
-		this.textStyle = textStyle;
-	}
-	public List<String> getData() {
-		return data;
-	}
-	public void setData(List<String> data) {
-		this.data = data;
-	}
-	public String getBackgroundColor() {
-		return backgroundColor;
-	}
-	public void setBackgroundColor(String backgroundColor) {
-		this.backgroundColor = backgroundColor;
-	}
-	public String getBorderColor() {
-		return borderColor;
-	}
-	public void setBorderColor(String borderColor) {
-		this.borderColor = borderColor;
-	}
-	public int getBorderWidth() {
-		return borderWidth;
-	}
-	public void setBorderWidth(int borderWidth) {
-		this.borderWidth = borderWidth;
-	}
-	public int getBorderRadius() {
-		return borderRadius;
-	}
-	public void setBorderRadius(int borderRadius) {
-		this.borderRadius = borderRadius;
-	}
-	public TextStyle getPageTextStyle() {
-		return pageTextStyle;
-	}
-	public void setPageTextStyle(TextStyle pageTextStyle) {
-		this.pageTextStyle = pageTextStyle;
-	}
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/PolarOption.java

@@ -1,24 +0,0 @@
-package com.bstek.ureport.echarts.options;
-
-import com.bstek.ureport.echarts.options.prop.PolarTooltip;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月27日
- */
-public class PolarOption {
-	private String center;
-	private PolarTooltip tooltip;
-	public String getCenter() {
-		return center;
-	}
-	public void setCenter(String center) {
-		this.center = center;
-	}
-	public PolarTooltip getTooltip() {
-		return tooltip;
-	}
-	public void setTooltip(PolarTooltip tooltip) {
-		this.tooltip = tooltip;
-	}
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/RadarOption.java

@@ -1,9 +0,0 @@
-package com.bstek.ureport.echarts.options;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月27日
- */
-public class RadarOption {
-
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/RadiusAxisOption.java

@@ -1,17 +0,0 @@
-package com.bstek.ureport.echarts.options;
-
-import com.bstek.ureport.echarts.options.prop.NameLocation;
-import com.bstek.ureport.echarts.options.prop.AxisType;
-import com.bstek.ureport.echarts.options.prop.TextStyle;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月27日
- */
-public class RadiusAxisOption {
-	private AxisType type;
-	private String name;
-	private NameLocation nameLocation;
-	private TextStyle nameTextStyle;
-	
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/TitleOption.java

@@ -1,115 +0,0 @@
-package com.bstek.ureport.echarts.options;
-
-import com.bstek.ureport.echarts.options.prop.TextStyle;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月25日
- */
-public class TitleOption {
-	private boolean show=true;
-	private String text;
-	private String link;
-	private String target="blank";
-	private TextStyle textStyle;
-	private String subtext;
-	private String sublink;
-	private String subtarget="blank";
-	private TextStyle subtextStyle;
-	private String padding;
-	private int itemGap;
-	private String backgroundColor;
-	private String borderColor;
-	private int borderWidth;
-	private int borderRadius;
-	public boolean isShow() {
-		return show;
-	}
-	public void setShow(boolean show) {
-		this.show = show;
-	}
-	public String getText() {
-		return text;
-	}
-	public void setText(String text) {
-		this.text = text;
-	}
-	public String getLink() {
-		return link;
-	}
-	public void setLink(String link) {
-		this.link = link;
-	}
-	public String getTarget() {
-		return target;
-	}
-	public void setTarget(String target) {
-		this.target = target;
-	}
-	public TextStyle getTextStyle() {
-		return textStyle;
-	}
-	public void setTextStyle(TextStyle textStyle) {
-		this.textStyle = textStyle;
-	}
-	public String getSubtext() {
-		return subtext;
-	}
-	public void setSubtext(String subtext) {
-		this.subtext = subtext;
-	}
-	public String getSublink() {
-		return sublink;
-	}
-	public void setSublink(String sublink) {
-		this.sublink = sublink;
-	}
-	public String getSubtarget() {
-		return subtarget;
-	}
-	public void setSubtarget(String subtarget) {
-		this.subtarget = subtarget;
-	}
-	public TextStyle getSubtextStyle() {
-		return subtextStyle;
-	}
-	public void setSubtextStyle(TextStyle subtextStyle) {
-		this.subtextStyle = subtextStyle;
-	}
-	public String getPadding() {
-		return padding;
-	}
-	public void setPadding(String padding) {
-		this.padding = padding;
-	}
-	public int getItemGap() {
-		return itemGap;
-	}
-	public void setItemGap(int itemGap) {
-		this.itemGap = itemGap;
-	}
-	public String getBackgroundColor() {
-		return backgroundColor;
-	}
-	public void setBackgroundColor(String backgroundColor) {
-		this.backgroundColor = backgroundColor;
-	}
-	public String getBorderColor() {
-		return borderColor;
-	}
-	public void setBorderColor(String borderColor) {
-		this.borderColor = borderColor;
-	}
-	public int getBorderWidth() {
-		return borderWidth;
-	}
-	public void setBorderWidth(int borderWidth) {
-		this.borderWidth = borderWidth;
-	}
-	public int getBorderRadius() {
-		return borderRadius;
-	}
-	public void setBorderRadius(int borderRadius) {
-		this.borderRadius = borderRadius;
-	}
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/XAxisOption.java

@@ -1,8 +0,0 @@
-package com.bstek.ureport.echarts.options;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月27日
- */
-public class XAxisOption extends AbstractAxisOption {
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/YAxisOption.java

@@ -1,8 +0,0 @@
-package com.bstek.ureport.echarts.options;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月27日
- */
-public class YAxisOption extends AbstractAxisOption {
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/Align.java

@@ -1,9 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月25日
- */
-public enum Align {
-	left,center,right;
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/AxisData.java

@@ -1,22 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月27日
- */
-public class AxisData {
-	private String value;
-	private TextStyle textStyle;
-	public String getValue() {
-		return value;
-	}
-	public void setValue(String value) {
-		this.value = value;
-	}
-	public TextStyle getTextStyle() {
-		return textStyle;
-	}
-	public void setTextStyle(TextStyle textStyle) {
-		this.textStyle = textStyle;
-	}
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/AxisLabel.java

@@ -1,149 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-
-/**
- * @author Jacky.gao
- * @since 2017年12月25日
- */
-public class AxisLabel {
-	private boolean show=true;
-	private Integer interval;
-	private Boolean inside;
-	private Integer rotate;
-	private Integer margin;
-	private String formatter;
-	private Boolean showMinLabel;
-	private Boolean showMaxLabel;
-	private String color;
-	private FontStyle fontStyle;
-	private FontWeight fontWeight;
-	private String fontFamily;
-	private Integer fontSize;
-	private Align align;
-	private VerticalAlign verticalAlign;
-	private String backgroundColor;
-	private String borderColor;
-	private int borderWidth;
-	private int borderRadius;
-	private String padding;
-	public boolean isShow() {
-		return show;
-	}
-	public void setShow(boolean show) {
-		this.show = show;
-	}
-	public Integer getInterval() {
-		return interval;
-	}
-	public void setInterval(Integer interval) {
-		this.interval = interval;
-	}
-	public boolean isInside() {
-		return inside;
-	}
-	public void setInside(boolean inside) {
-		this.inside = inside;
-	}
-	public Integer getRotate() {
-		return rotate;
-	}
-	public void setRotate(Integer rotate) {
-		this.rotate = rotate;
-	}
-	public Integer getMargin() {
-		return margin;
-	}
-	public void setMargin(Integer margin) {
-		this.margin = margin;
-	}
-	public String getFormatter() {
-		return formatter;
-	}
-	public void setFormatter(String formatter) {
-		this.formatter = formatter;
-	}
-	public Boolean getShowMinLabel() {
-		return showMinLabel;
-	}
-	public void setShowMinLabel(Boolean showMinLabel) {
-		this.showMinLabel = showMinLabel;
-	}
-	public Boolean getShowMaxLabel() {
-		return showMaxLabel;
-	}
-	public void setShowMaxLabel(Boolean showMaxLabel) {
-		this.showMaxLabel = showMaxLabel;
-	}
-	public String getColor() {
-		return color;
-	}
-	public void setColor(String color) {
-		this.color = color;
-	}
-	public FontStyle getFontStyle() {
-		return fontStyle;
-	}
-	public void setFontStyle(FontStyle fontStyle) {
-		this.fontStyle = fontStyle;
-	}
-	public FontWeight getFontWeight() {
-		return fontWeight;
-	}
-	public void setFontWeight(FontWeight fontWeight) {
-		this.fontWeight = fontWeight;
-	}
-	public String getFontFamily() {
-		return fontFamily;
-	}
-	public void setFontFamily(String fontFamily) {
-		this.fontFamily = fontFamily;
-	}
-	public Integer getFontSize() {
-		return fontSize;
-	}
-	public void setFontSize(Integer fontSize) {
-		this.fontSize = fontSize;
-	}
-	public Align getAlign() {
-		return align;
-	}
-	public void setAlign(Align align) {
-		this.align = align;
-	}
-	public VerticalAlign getVerticalAlign() {
-		return verticalAlign;
-	}
-	public void setVerticalAlign(VerticalAlign verticalAlign) {
-		this.verticalAlign = verticalAlign;
-	}
-	public String getBackgroundColor() {
-		return backgroundColor;
-	}
-	public void setBackgroundColor(String backgroundColor) {
-		this.backgroundColor = backgroundColor;
-	}
-	public String getBorderColor() {
-		return borderColor;
-	}
-	public void setBorderColor(String borderColor) {
-		this.borderColor = borderColor;
-	}
-	public int getBorderWidth() {
-		return borderWidth;
-	}
-	public void setBorderWidth(int borderWidth) {
-		this.borderWidth = borderWidth;
-	}
-	public int getBorderRadius() {
-		return borderRadius;
-	}
-	public void setBorderRadius(int borderRadius) {
-		this.borderRadius = borderRadius;
-	}
-	public String getPadding() {
-		return padding;
-	}
-	public void setPadding(String padding) {
-		this.padding = padding;
-	}
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/AxisLine.java

@@ -1,30 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-
-/**
- * @author Jacky.gao
- * @since 2017年12月25日
- */
-public class AxisLine {
-	private boolean show=true;
-	private String axisLine;
-	private LineStyle lineStyle;
-	public boolean isShow() {
-		return show;
-	}
-	public void setShow(boolean show) {
-		this.show = show;
-	}
-	public String getAxisLine() {
-		return axisLine;
-	}
-	public void setAxisLine(String axisLine) {
-		this.axisLine = axisLine;
-	}
-	public LineStyle getLineStyle() {
-		return lineStyle;
-	}
-	public void setLineStyle(LineStyle lineStyle) {
-		this.lineStyle = lineStyle;
-	}
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/AxisPointer.java

@@ -1,36 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月27日
- */
-public class AxisPointer {
-	private boolean show;
-	private AxisPointerType type;
-	private AxisPointerLabel label;
-	private AxisPointerHandle handle;
-	public boolean isShow() {
-		return show;
-	}
-	public void setShow(boolean show) {
-		this.show = show;
-	}
-	public AxisPointerType getType() {
-		return type;
-	}
-	public void setType(AxisPointerType type) {
-		this.type = type;
-	}
-	public AxisPointerLabel getLabel() {
-		return label;
-	}
-	public void setLabel(AxisPointerLabel label) {
-		this.label = label;
-	}
-	public AxisPointerHandle getHandle() {
-		return handle;
-	}
-	public void setHandle(AxisPointerHandle handle) {
-		this.handle = handle;
-	}
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/AxisPointerHandle.java

@@ -1,29 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月27日
- */
-public class AxisPointerHandle {
-	private boolean show;
-	private int size=45;
-	private String color;
-	public boolean isShow() {
-		return show;
-	}
-	public void setShow(boolean show) {
-		this.show = show;
-	}
-	public int getSize() {
-		return size;
-	}
-	public void setSize(int size) {
-		this.size = size;
-	}
-	public String getColor() {
-		return color;
-	}
-	public void setColor(String color) {
-		this.color = color;
-	}
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/AxisPointerLabel.java

@@ -1,36 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月27日
- */
-public class AxisPointerLabel {
-	private boolean show;
-	private String formatter;
-	private TextStyle textStyle;
-	private String backgroundColor;
-	public boolean isShow() {
-		return show;
-	}
-	public void setShow(boolean show) {
-		this.show = show;
-	}
-	public String getFormatter() {
-		return formatter;
-	}
-	public void setFormatter(String formatter) {
-		this.formatter = formatter;
-	}
-	public TextStyle getTextStyle() {
-		return textStyle;
-	}
-	public void setTextStyle(TextStyle textStyle) {
-		this.textStyle = textStyle;
-	}
-	public String getBackgroundColor() {
-		return backgroundColor;
-	}
-	public void setBackgroundColor(String backgroundColor) {
-		this.backgroundColor = backgroundColor;
-	}
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/AxisPointerType.java

@@ -1,9 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月27日
- */
-public enum AxisPointerType {
-	line,shadow
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/AxisTick.java

@@ -1,51 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-
-/**
- * @author Jacky.gao
- * @since 2017年12月25日
- */
-public class AxisTick {
-	private boolean show=true;
-	private Boolean alignWithLabel;
-	private Integer interval;
-	private Boolean inside;
-	private Integer length;
-	private LineStyle lineStyle;
-	public boolean isShow() {
-		return show;
-	}
-	public void setShow(boolean show) {
-		this.show = show;
-	}
-	public Boolean getAlignWithLabel() {
-		return alignWithLabel;
-	}
-	public void setAlignWithLabel(Boolean alignWithLabel) {
-		this.alignWithLabel = alignWithLabel;
-	}
-	public Integer getInterval() {
-		return interval;
-	}
-	public void setInterval(Integer interval) {
-		this.interval = interval;
-	}
-	public Boolean getInside() {
-		return inside;
-	}
-	public void setInside(Boolean inside) {
-		this.inside = inside;
-	}
-	public Integer getLength() {
-		return length;
-	}
-	public void setLength(Integer length) {
-		this.length = length;
-	}
-	public LineStyle getLineStyle() {
-		return lineStyle;
-	}
-	public void setLineStyle(LineStyle lineStyle) {
-		this.lineStyle = lineStyle;
-	}
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/AxisType.java

@@ -1,9 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月27日
- */
-public enum AxisType {
-	value,category,time,log;
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/FontStyle.java

@@ -1,9 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月25日
- */
-public enum FontStyle {
-	normal,italic,oblique
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/FontWeight.java

@@ -1,9 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月25日
- */
-public enum FontWeight {
-	normal,bold,bolder,lighter
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/LegendType.java

@@ -1,9 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月25日
- */
-public enum LegendType {
-	plain,scroll;
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/LineStyle.java

@@ -1,36 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月25日
- */
-public class LineStyle {
-	private String color="#333";
-	private int width=1;
-	private LineType type;
-	private int opacity=1;
-	public String getColor() {
-		return color;
-	}
-	public void setColor(String color) {
-		this.color = color;
-	}
-	public int getWidth() {
-		return width;
-	}
-	public void setWidth(int width) {
-		this.width = width;
-	}
-	public LineType getType() {
-		return type;
-	}
-	public void setType(LineType type) {
-		this.type = type;
-	}
-	public int getOpacity() {
-		return opacity;
-	}
-	public void setOpacity(int opacity) {
-		this.opacity = opacity;
-	}
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/LineType.java

@@ -1,9 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月25日
- */
-public enum LineType {
-	solid,dashed,dotted
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/NameLocation.java

@@ -1,9 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月25日
- */
-public enum NameLocation {
-	start,middle,center,end;
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/Orient.java

@@ -1,9 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月25日
- */
-public enum Orient {
-	horizontal,vertial;
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/PolarTooltip.java

@@ -1,50 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月27日
- */
-public class PolarTooltip {
-	private boolean show=true;
-	private Trigger trigger;
-	private AxisPointer axisPointer;
-	private String formatter;
-	private String backgroundColor;
-	private TextStyle textStyle;
-	public boolean isShow() {
-		return show;
-	}
-	public void setShow(boolean show) {
-		this.show = show;
-	}
-	public Trigger getTrigger() {
-		return trigger;
-	}
-	public void setTrigger(Trigger trigger) {
-		this.trigger = trigger;
-	}
-	public AxisPointer getAxisPointer() {
-		return axisPointer;
-	}
-	public void setAxisPointer(AxisPointer axisPointer) {
-		this.axisPointer = axisPointer;
-	}
-	public String getFormatter() {
-		return formatter;
-	}
-	public void setFormatter(String formatter) {
-		this.formatter = formatter;
-	}
-	public String getBackgroundColor() {
-		return backgroundColor;
-	}
-	public void setBackgroundColor(String backgroundColor) {
-		this.backgroundColor = backgroundColor;
-	}
-	public TextStyle getTextStyle() {
-		return textStyle;
-	}
-	public void setTextStyle(TextStyle textStyle) {
-		this.textStyle = textStyle;
-	}
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/SplitArea.java

@@ -1,36 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月27日
- */
-public class SplitArea {
-	private boolean show;
-	private String interval;
-	private String color;
-	private int opacity=1;
-	public boolean isShow() {
-		return show;
-	}
-	public void setShow(boolean show) {
-		this.show = show;
-	}
-	public String getInterval() {
-		return interval;
-	}
-	public void setInterval(String interval) {
-		this.interval = interval;
-	}
-	public String getColor() {
-		return color;
-	}
-	public void setColor(String color) {
-		this.color = color;
-	}
-	public int getOpacity() {
-		return opacity;
-	}
-	public void setOpacity(int opacity) {
-		this.opacity = opacity;
-	}
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/SplitLine.java

@@ -1,29 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月25日
- */
-public class SplitLine {
-	private boolean show;
-	private String interval;
-	private LineStyle lineStyle;
-	public boolean isShow() {
-		return show;
-	}
-	public void setShow(boolean show) {
-		this.show = show;
-	}
-	public String getInterval() {
-		return interval;
-	}
-	public void setInterval(String interval) {
-		this.interval = interval;
-	}
-	public LineStyle getLineStyle() {
-		return lineStyle;
-	}
-	public void setLineStyle(LineStyle lineStyle) {
-		this.lineStyle = lineStyle;
-	}
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/TextStyle.java

@@ -1,65 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-
-/**
- * @author Jacky.gao
- * @since 2017年12月25日
- */
-public class TextStyle {
-	private String color="#333";
-	private String fontStyle="normal";
-	private String fontWeight="normal";
-	private String fontFamily="sans-serif";
-	private int fontSize=18;
-	private Align align;
-	private VerticalAlign verticalAlign;
-	private int lineHeight;
-	public String getColor() {
-		return color;
-	}
-	public void setColor(String color) {
-		this.color = color;
-	}
-	public String getFontStyle() {
-		return fontStyle;
-	}
-	public void setFontStyle(String fontStyle) {
-		this.fontStyle = fontStyle;
-	}
-	public String getFontWeight() {
-		return fontWeight;
-	}
-	public void setFontWeight(String fontWeight) {
-		this.fontWeight = fontWeight;
-	}
-	public String getFontFamily() {
-		return fontFamily;
-	}
-	public void setFontFamily(String fontFamily) {
-		this.fontFamily = fontFamily;
-	}
-	public int getFontSize() {
-		return fontSize;
-	}
-	public void setFontSize(int fontSize) {
-		this.fontSize = fontSize;
-	}
-	public Align getAlign() {
-		return align;
-	}
-	public void setAlign(Align align) {
-		this.align = align;
-	}
-	public VerticalAlign getVerticalAlign() {
-		return verticalAlign;
-	}
-	public void setVerticalAlign(VerticalAlign verticalAlign) {
-		this.verticalAlign = verticalAlign;
-	}
-	public int getLineHeight() {
-		return lineHeight;
-	}
-	public void setLineHeight(int lineHeight) {
-		this.lineHeight = lineHeight;
-	}
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/Trigger.java

@@ -1,9 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月27日
- */
-public enum Trigger {
-	item,axis,none;
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/VerticalAlign.java

@@ -1,9 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月25日
- */
-public enum VerticalAlign {
-	top,middle,bottom;
-}

ureport2-core/src/main/java/com/bstek/ureport/echarts/options/prop/XAxisType.java

@@ -1,9 +0,0 @@
-package com.bstek.ureport.echarts.options.prop;
-
-/**
- * @author Jacky.gao
- * @since 2017年12月25日
- */
-public enum XAxisType {
-	value,category,time,log;
-}