From d1216576a0af9f0b8bd5088a013ef6afdfb57960 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Thu, 4 May 2023 20:38:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alibaba/excel/enums/ByteOrderMarkEnum.java | 15 +++++++++++++++ .../excel/write/metadata/holder/WriteHolder.java | 16 ++++++++++++++-- pom.xml | 1 + 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/easyexcel-core/src/main/java/com/alibaba/excel/enums/ByteOrderMarkEnum.java b/easyexcel-core/src/main/java/com/alibaba/excel/enums/ByteOrderMarkEnum.java index f6b1e8b0..7c069099 100644 --- a/easyexcel-core/src/main/java/com/alibaba/excel/enums/ByteOrderMarkEnum.java +++ b/easyexcel-core/src/main/java/com/alibaba/excel/enums/ByteOrderMarkEnum.java @@ -16,10 +16,25 @@ import org.apache.commons.io.ByteOrderMark; @Getter public enum ByteOrderMarkEnum { + /** + * UTF_8 + */ UTF_8(ByteOrderMark.UTF_8), + /** + * UTF_16BE + */ UTF_16BE(ByteOrderMark.UTF_16BE), + /** + * UTF_16LE + */ UTF_16LE(ByteOrderMark.UTF_16LE), + /** + * UTF_32BE + */ UTF_32BE(ByteOrderMark.UTF_32BE), + /** + * UTF_32LE + */ UTF_32LE(ByteOrderMark.UTF_32LE), ; diff --git a/easyexcel-core/src/main/java/com/alibaba/excel/write/metadata/holder/WriteHolder.java b/easyexcel-core/src/main/java/com/alibaba/excel/write/metadata/holder/WriteHolder.java index 24ba0c6f..ca0fb3e9 100644 --- a/easyexcel-core/src/main/java/com/alibaba/excel/write/metadata/holder/WriteHolder.java +++ b/easyexcel-core/src/main/java/com/alibaba/excel/write/metadata/holder/WriteHolder.java @@ -52,25 +52,37 @@ public interface WriteHolder extends ConfigurationHolder { * Data will be order by {@link #includeColumnFieldNames} or {@link #includeColumnIndexes}. * * default is false. + * + * @return */ + boolean orderByIncludeColumn(); /** * Only output the custom columns. + * + * @return */ Collection includeColumnIndexes(); /** * Only output the custom columns. + * + * @return */ Collection includeColumnFieldNames(); /** * Ignore the custom columns. + * + * @return */ - Collection excludeColumnIndexes(); + Collection excludeColumnIndexes(); + /** * Ignore the custom columns. + * + * @return */ - Collection excludeColumnFieldNames(); + Collection excludeColumnFieldNames(); } diff --git a/pom.xml b/pom.xml index 7288396a..e3cbf50f 100644 --- a/pom.xml +++ b/pom.xml @@ -242,6 +242,7 @@ com/alibaba/excel/metadata/format/ExcelGeneralNumberFormat.java com/alibaba/excel/metadata/csv/CsvDataFormat.java com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java + com/alibaba/excel/analysis/v07/handlers/sax/SharedStringsTableHandler.java