From f6eb4e28b255d8d0b58bc22bbdc78951ec52ae5f Mon Sep 17 00:00:00 2001 From: jueyue Date: Sat, 17 Oct 2015 18:47:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=8Afinal=E5=8E=BB=E6=8E=89,=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=BB=A7=E6=89=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- easypoi-base/pom.xml | 12 ++++++++++++ .../poi/excel/ExcelExportUtil.java | 2 +- .../poi/excel/ExcelImportUtil.java | 2 +- .../poi/excel/ExcelToHtmlUtil.java | 2 +- .../poi/excel/export/ExcelExportServer.java | 9 --------- .../poi/excel/export/base/ExportBase.java | 16 ++++++++++++++++ .../jeecgframework/poi/word/WordExportUtil.java | 2 +- pom.xml | 14 ++++++++++++++ 8 files changed, 46 insertions(+), 13 deletions(-) diff --git a/easypoi-base/pom.xml b/easypoi-base/pom.xml index 26a41a2..2026139 100644 --- a/easypoi-base/pom.xml +++ b/easypoi-base/pom.xml @@ -40,6 +40,18 @@ true + + + com.itextpdf + itextpdf + true + + + com.itextpdf + itext-asian + true + + com.google.guava diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java index ebfc31f..2338148 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java @@ -37,7 +37,7 @@ import org.jeecgframework.poi.excel.export.template.ExcelExportOfTemplateUtil; * @version 1.0 * @date 2013-10-17 */ -public final class ExcelExportUtil { +public class ExcelExportUtil { private ExcelExportUtil() { } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelImportUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelImportUtil.java index 757eedd..7b9fa08 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelImportUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelImportUtil.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; * @version 1.0 */ @SuppressWarnings({ "unchecked" }) -public final class ExcelImportUtil { +public class ExcelImportUtil { private ExcelImportUtil() { } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelToHtmlUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelToHtmlUtil.java index 0b3582a..a94aa41 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelToHtmlUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelToHtmlUtil.java @@ -9,7 +9,7 @@ import org.jeecgframework.poi.excel.entity.ExcelToHtmlParams; * @author JueYue * @date 2015年5月10日 上午11:51:48 */ -public final class ExcelToHtmlUtil { +public class ExcelToHtmlUtil { private ExcelToHtmlUtil() { } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java index 8f8634f..f51cde1 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java @@ -318,13 +318,4 @@ public class ExcelExportServer extends ExcelExportBase { return 1; } - private ExcelExportEntity indexExcelEntity(ExportParams entity) { - ExcelExportEntity exportEntity = new ExcelExportEntity(); - exportEntity.setOrderNum(0); - exportEntity.setName(entity.getIndexName()); - exportEntity.setWidth(10); - exportEntity.setFormat(PoiBaseConstants.IS_ADD_INDEX); - return exportEntity; - } - } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExportBase.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExportBase.java index 464b3a3..cfd2c0b 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExportBase.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExportBase.java @@ -31,7 +31,9 @@ import org.apache.commons.lang3.StringUtils; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.ExcelCollection; import org.jeecgframework.poi.excel.annotation.ExcelEntity; +import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; +import org.jeecgframework.poi.excel.entity.vo.PoiBaseConstants; import org.jeecgframework.poi.handler.inter.IExcelDataHandler; import org.jeecgframework.poi.util.PoiPublicUtil; import org.jeecgframework.poi.util.PoiReflectorUtil; @@ -336,5 +338,19 @@ public class ExportBase { } } } + + /** + * 添加Index列 + * @param entity + * @return + */ + public ExcelExportEntity indexExcelEntity(ExportParams entity) { + ExcelExportEntity exportEntity = new ExcelExportEntity(); + exportEntity.setOrderNum(0); + exportEntity.setName(entity.getIndexName()); + exportEntity.setWidth(10); + exportEntity.setFormat(PoiBaseConstants.IS_ADD_INDEX); + return exportEntity; + } } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/word/WordExportUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/word/WordExportUtil.java index 7e7f034..1de77e1 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/word/WordExportUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/word/WordExportUtil.java @@ -27,7 +27,7 @@ import org.jeecgframework.poi.word.parse.ParseWord07; * @date 2013-11-16 * @version 1.0 */ -public final class WordExportUtil { +public class WordExportUtil { private WordExportUtil() { diff --git a/pom.xml b/pom.xml index 40a02dd..bfd26db 100644 --- a/pom.xml +++ b/pom.xml @@ -138,6 +138,20 @@ true + + + com.itextpdf + itextpdf + 5.5.6 + true + + + + com.itextpdf + itext-asian + 5.2.0 + + org.jeecg