| @@ -14,6 +14,6 @@ exclude(module: 'xercesImpl') | |||||
| compile group: 'com.google.guava', name: 'guava', version:'16.0.1' | compile group: 'com.google.guava', name: 'guava', version:'16.0.1' | ||||
| compile group: 'org.apache.commons', name: 'commons-lang3', version:'3.2.1' | compile group: 'org.apache.commons', name: 'commons-lang3', version:'3.2.1' | ||||
| compile group: 'org.slf4j', name: 'slf4j-api', version:'1.6.1' | compile group: 'org.slf4j', name: 'slf4j-api', version:'1.6.1' | ||||
| compile group: 'org.hibernate', name: 'hibernate-validator', version:'5.1.3.Final' | |||||
| compile group: 'javax.validation', name: 'validation-api', version:'1.1.0.Final' | |||||
| compile project(':easypoi-annotation') | compile project(':easypoi-annotation') | ||||
| } | } | ||||
| @@ -71,8 +71,8 @@ | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>org.hibernate</groupId> | |||||
| <artifactId>hibernate-validator</artifactId> | |||||
| <groupId>javax.validation</groupId> | |||||
| <artifactId>validation-api</artifactId> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| @@ -10,6 +10,8 @@ package org.jeecgframework.poi.excel.graph.constant; | |||||
| * 定义元素类型 | * 定义元素类型 | ||||
| */ | */ | ||||
| public interface ExcelGraphElementType { | public interface ExcelGraphElementType { | ||||
| public static final Integer STRING_TYPE = 1; | public static final Integer STRING_TYPE = 1; | ||||
| public static final Integer NUMERIC_TYPE = 2; | public static final Integer NUMERIC_TYPE = 2; | ||||
| } | } | ||||
| @@ -10,7 +10,9 @@ package org.jeecgframework.poi.excel.graph.constant; | |||||
| * 定义图形类型 | * 定义图形类型 | ||||
| */ | */ | ||||
| public interface ExcelGraphType { | public interface ExcelGraphType { | ||||
| public static final Integer LINE_CHART = 1; | public static final Integer LINE_CHART = 1; | ||||
| public static final Integer SCATTER_CHART = 2; | public static final Integer SCATTER_CHART = 2; | ||||
| } | } | ||||
| @@ -16,11 +16,16 @@ import com.google.common.collect.Lists; | |||||
| * | * | ||||
| */ | */ | ||||
| public class ExcelGraphDefined implements ExcelGraph { | public class ExcelGraphDefined implements ExcelGraph { | ||||
| private ExcelGraphElement category; | private ExcelGraphElement category; | ||||
| public List<ExcelGraphElement> valueList = Lists.newArrayList(); | |||||
| public List<ExcelTitleCell> titleCell = Lists.newArrayList(); | |||||
| private List<ExcelGraphElement> valueList = Lists.newArrayList(); | |||||
| private List<ExcelTitleCell> titleCell = Lists.newArrayList(); | |||||
| private Integer graphType = ExcelGraphType.LINE_CHART; | private Integer graphType = ExcelGraphType.LINE_CHART; | ||||
| public List<String> title = Lists.newArrayList(); | |||||
| private List<String> title = Lists.newArrayList(); | |||||
| public ExcelGraphElement getCategory() { | public ExcelGraphElement getCategory() { | ||||
| return category; | return category; | ||||
| @@ -12,10 +12,15 @@ import org.jeecgframework.poi.excel.graph.constant.ExcelGraphElementType; | |||||
| * | * | ||||
| */ | */ | ||||
| public class ExcelGraphElement { | public class ExcelGraphElement { | ||||
| private Integer startRowNum; | private Integer startRowNum; | ||||
| private Integer endRowNum; | private Integer endRowNum; | ||||
| private Integer startColNum; | private Integer startColNum; | ||||
| private Integer endColNum; | private Integer endColNum; | ||||
| private Integer elementType = ExcelGraphElementType.STRING_TYPE; | private Integer elementType = ExcelGraphElementType.STRING_TYPE; | ||||
| public Integer getStartRowNum() { | public Integer getStartRowNum() { | ||||
| @@ -10,7 +10,9 @@ package org.jeecgframework.poi.excel.graph.entity; | |||||
| * | * | ||||
| */ | */ | ||||
| public class ExcelTitleCell { | public class ExcelTitleCell { | ||||
| private Integer row; | private Integer row; | ||||
| private Integer col; | private Integer col; | ||||
| public ExcelTitleCell() { | public ExcelTitleCell() { | ||||
| @@ -137,7 +137,7 @@ | |||||
| <scope>provided</scope> | <scope>provided</scope> | ||||
| <optional>true</optional> | <optional>true</optional> | ||||
| </dependency> | </dependency> | ||||
| <!-- PDF --> | <!-- PDF --> | ||||
| <dependency> | <dependency> | ||||
| <groupId>com.itextpdf</groupId> | <groupId>com.itextpdf</groupId> | ||||
| @@ -153,10 +153,9 @@ | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>org.hibernate</groupId> | |||||
| <artifactId>hibernate-validator</artifactId> | |||||
| <version>5.1.3.Final</version> | |||||
| <optional>true</optional> | |||||
| <groupId>javax.validation</groupId> | |||||
| <artifactId>validation-api</artifactId> | |||||
| <version>1.1.0.Final</version> | |||||
| </dependency> | </dependency> | ||||
| <!-- 模块版本 --> | <!-- 模块版本 --> | ||||