From 24c9fa43cd5c981dc0dc4a73a5373ea8de1febd3 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Tue, 12 Oct 2021 15:08:22 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=A1=AB=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/metadata/data/WriteCellData.java | 7 +++ .../com/alibaba/excel/util/StyleUtil.java | 54 ++++++++++++++++++ .../executor/ExcelWriteFillExecutor.java | 40 +++++++++---- .../easyexcel/test/demo/fill/FillData.java | 4 ++ .../easyexcel/test/demo/fill/FillTest.java | 43 +++++++------- src/test/resources/demo/fill/list.xlsx | Bin 10029 -> 10744 bytes 6 files changed, 116 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java b/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java index 60413385..cf60f58e 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java @@ -12,6 +12,7 @@ import com.alibaba.excel.write.metadata.style.WriteCellStyle; import lombok.Data; import lombok.NoArgsConstructor; +import org.apache.poi.ss.usermodel.CellStyle; /** * wirte cell data @@ -47,6 +48,12 @@ public class WriteCellData extends CellData { */ private WriteCellStyle writeCellStyle; + /** + * If originCellStyle is empty, one will be created. + * If both writeCellStyle and originCellStyle exist, copy from writeCellStyle to originCellStyle. + */ + private CellStyle originCellStyle; + public WriteCellData(String stringValue) { this(CellDataTypeEnum.STRING, stringValue); } diff --git a/src/main/java/com/alibaba/excel/util/StyleUtil.java b/src/main/java/com/alibaba/excel/util/StyleUtil.java index 70c7ac7a..023f789d 100644 --- a/src/main/java/com/alibaba/excel/util/StyleUtil.java +++ b/src/main/java/com/alibaba/excel/util/StyleUtil.java @@ -156,6 +156,60 @@ public class StyleUtil { return font; } + public static WriteCellStyle buildWritCellStyle(CellStyle cellStyle, Font font) { + WriteCellStyle writeCellStyle = new WriteCellStyle(); + if (cellStyle == null) { + return writeCellStyle; + } + writeCellStyle.setHidden(cellStyle.getHidden()); + writeCellStyle.setLocked(cellStyle.getLocked()); + writeCellStyle.setQuotePrefix(cellStyle.getQuotePrefixed()); + writeCellStyle.setHorizontalAlignment(cellStyle.getAlignment()); + writeCellStyle.setWrapped(cellStyle.getWrapText()); + writeCellStyle.setVerticalAlignment(cellStyle.getVerticalAlignment()); + writeCellStyle.setRotation(cellStyle.getRotation()); + writeCellStyle.setIndent(cellStyle.getIndention()); + writeCellStyle.setBorderLeft(cellStyle.getBorderLeft()); + writeCellStyle.setBorderRight(cellStyle.getBorderRight()); + writeCellStyle.setBorderTop(cellStyle.getBorderTop()); + writeCellStyle.setBorderBottom(cellStyle.getBorderBottom()); + writeCellStyle.setLeftBorderColor(cellStyle.getLeftBorderColor()); + writeCellStyle.setRightBorderColor(cellStyle.getRightBorderColor()); + writeCellStyle.setTopBorderColor(cellStyle.getTopBorderColor()); + writeCellStyle.setBottomBorderColor(cellStyle.getBottomBorderColor()); + writeCellStyle.setFillPatternType(cellStyle.getFillPattern()); + //writeCellStyle.setFillBackgroundColor(cellStyle.getFillBackgroundColor()); + //writeCellStyle.setFillForegroundColor(cellStyle.getFillForegroundColor()); + writeCellStyle.setShrinkToFit(cellStyle.getShrinkToFit()); + writeCellStyle.setDataFormatData(buildDataFormat(cellStyle.getDataFormat(), cellStyle.getDataFormatString())); + writeCellStyle.setWriteFont(buildFont(font)); + return writeCellStyle; + } + + public static DataFormatData buildDataFormat(short dataFormat, String dataFormatString) { + DataFormatData dataFormatData = new DataFormatData(); + dataFormatData.setIndex(dataFormat); + dataFormatData.setFormat(dataFormatString); + return dataFormatData; + } + + public static WriteFont buildFont(Font font) { + WriteFont writeFont = new WriteFont(); + if (font == null) { + return writeFont; + } + writeFont.setFontName(font.getFontName()); + writeFont.setFontHeightInPoints(font.getFontHeightInPoints()); + writeFont.setItalic(font.getItalic()); + writeFont.setStrikeout(font.getStrikeout()); + writeFont.setColor(font.getColor()); + writeFont.setTypeOffset(font.getTypeOffset()); + writeFont.setUnderline(font.getUnderline()); + writeFont.setCharset(font.getCharSet()); + writeFont.setBold(font.getBold()); + return writeFont; + } + public static RichTextString buildRichTextString(WriteWorkbookHolder writeWorkbookHolder, RichTextStringData richTextStringData) { if (richTextStringData == null) { diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java index e91e2834..cd20a2b9 100644 --- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java @@ -7,7 +7,9 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; import com.alibaba.excel.context.WriteContext; import com.alibaba.excel.enums.CellDataTypeEnum; @@ -176,6 +178,8 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { } } + AtomicInteger integer = new AtomicInteger(0); + private void doFill(List analysisCellList, Object oneRowData, FillConfig fillConfig, Integer relativeRowIndex) { if (CollectionUtils.isEmpty(analysisCellList) || oneRowData == null) { @@ -190,7 +194,6 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { WriteSheetHolder writeSheetHolder = writeContext.writeSheetHolder(); Map fieldNameContentPropertyMap = writeContext.currentWriteHolder().excelWriteHeadProperty().getFieldNameContentPropertyMap(); - for (AnalysisCell analysisCell : analysisCellList) { Cell cell = getOneCell(analysisCell, fillConfig); if (analysisCell.getOnlyOneVariable()) { @@ -202,6 +205,21 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { WriteCellData cellData = converterAndSet(writeSheetHolder, FieldUtils.getFieldClass(dataMap, variable), null, cell, value, fieldNameContentPropertyMap.get(variable), null, relativeRowIndex); + + // Restyle + if (fillConfig.getAutoStyle()) { + Optional.ofNullable(collectionFieldStyleCache.get(currentUniqueDataFlag)) + .map(collectionFieldStyleMap -> collectionFieldStyleMap.get(analysisCell)) + .ifPresent(cellStyle -> { + cellData.setOriginCellStyle(cellStyle); + //WriteCellStyle writeCellStyle = StyleUtil.buildWritCellStyle(cellStyle, + // writeContext.writeWorkbookHolder().getWorkbook() + // .getFontAt(cellStyle.getFontIndexAsInt())); + //WriteCellStyle.merge(cellData.getWriteCellStyle(), writeCellStyle); + //cellData.setWriteCellStyle(writeCellStyle); + }); + } + WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, null, relativeRowIndex, Boolean.FALSE); } else { StringBuilder cellValueBuild = new StringBuilder(); @@ -235,6 +253,14 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { } cellValueBuild.append(analysisCell.getPrepareDataList().get(index)); cell.setCellValue(cellValueBuild.toString()); + + // Restyle + if (fillConfig.getAutoStyle()) { + Optional.ofNullable(collectionFieldStyleCache.get(currentUniqueDataFlag)) + .map(collectionFieldStyleMap -> collectionFieldStyleMap.get(analysisCell)) + .ifPresent(cell::setCellStyle); + } + WriteHandlerUtils.afterCellDispose(writeContext, cellDataList, cell, null, relativeRowIndex, Boolean.FALSE); } @@ -295,18 +321,10 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { Row row = createRowIfNecessary(sheet, cachedSheet, lastRowIndex, fillConfig, analysisCell, isOriginalCell); Cell cell = createCellIfNecessary(row, lastColumnIndex); - Map collectionFieldStyleMap = collectionFieldStyleCache.computeIfAbsent( - currentUniqueDataFlag, key -> MapUtils.newHashMap()); - if (isOriginalCell) { + Map collectionFieldStyleMap = collectionFieldStyleCache.computeIfAbsent( + currentUniqueDataFlag, key -> MapUtils.newHashMap()); collectionFieldStyleMap.put(analysisCell, cell.getCellStyle()); - } else { - if (fillConfig.getAutoStyle()) { - CellStyle cellStyle = collectionFieldStyleMap.get(analysisCell); - if (cellStyle != null) { - cell.setCellStyle(cellStyle); - } - } } return cell; } diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java b/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java index 8890b82f..589f838c 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java @@ -1,5 +1,7 @@ package com.alibaba.easyexcel.test.demo.fill; +import java.util.Date; + import lombok.Data; /** @@ -9,4 +11,6 @@ import lombok.Data; public class FillData { private String name; private double number; + private Date date; + } diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java b/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java index 309e410f..04e8b53a 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java @@ -69,27 +69,27 @@ public class FillTest { // 方案1 一下子全部放到内存里面 并填充 String fileName = TestFileUtil.getPath() + "listFill" + System.currentTimeMillis() + ".xlsx"; // 这里 会填充到第一个sheet， 然后文件流会自动关闭 - EasyExcel.write(fileName).withTemplate(templateFileName).sheet().doFill(data()); - - // 方案2 分多次 填充 会使用文件缓存（省内存） jdk8 - // since: 3.0.0-beta1 - fileName = TestFileUtil.getPath() + "listFill" + System.currentTimeMillis() + ".xlsx"; - EasyExcel.write(fileName) - .withTemplate(templateFileName) - .sheet() - .doFill(() -> { - // 分页查询数据 - return data(); - }); - - // 方案3 分多次 填充 会使用文件缓存（省内存） - fileName = TestFileUtil.getPath() + "listFill" + System.currentTimeMillis() + ".xlsx"; - ExcelWriter excelWriter = EasyExcel.write(fileName).withTemplate(templateFileName).build(); - WriteSheet writeSheet = EasyExcel.writerSheet().build(); - excelWriter.fill(data(), writeSheet); - excelWriter.fill(data(), writeSheet); - // 千万别忘记关闭流 - excelWriter.finish(); + EasyExcel.write(fileName).withTemplate(templateFileName).inMemory(Boolean.TRUE).sheet().doFill(data()); + + //// 方案2 分多次 填充 会使用文件缓存（省内存） jdk8 + //// since: 3.0.0-beta1 + //fileName = TestFileUtil.getPath() + "listFill" + System.currentTimeMillis() + ".xlsx"; + //EasyExcel.write(fileName) + // .withTemplate(templateFileName) + // .sheet() + // .doFill(() -> { + // // 分页查询数据 + // return data(); + // }); + // + //// 方案3 分多次 填充 会使用文件缓存（省内存） + //fileName = TestFileUtil.getPath() + "listFill" + System.currentTimeMillis() + ".xlsx"; + //ExcelWriter excelWriter = EasyExcel.write(fileName).withTemplate(templateFileName).build(); + //WriteSheet writeSheet = EasyExcel.writerSheet().build(); + //excelWriter.fill(data(), writeSheet); + //excelWriter.fill(data(), writeSheet); + //// 千万别忘记关闭流 + //excelWriter.finish(); } /** @@ -233,6 +233,7 @@ public class FillTest { list.add(fillData); fillData.setName("张三"); fillData.setNumber(5.2); + fillData.setDate(new Date()); } return list; } diff --git a/src/test/resources/demo/fill/list.xlsx b/src/test/resources/demo/fill/list.xlsx index 717cb498a406f09ac0751c7c8d7403936ac940ec..8e3ed67dd26ab212946ab9a5c5e9caaee8a0730c 100644 GIT binary patch literal 10744 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 literal 10029 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 From edc9869b37be6a895c8806d228ec97700d404c85 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Wed, 13 Oct 2021 17:30:41 +0800 Subject: [PATCH 02/19] =?UTF-8?q?*=20=E4=BF=AE=E5=A4=8D=E5=A1=AB=E5=85=85?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=8F=AF=E8=83=BD=E4=B8=A2=E5=A4=B1=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/alibaba/excel/util/NumberUtils.java | 1 + .../com/alibaba/excel/util/StyleUtil.java | 103 ++++++-------- .../executor/AbstractExcelWriteExecutor.java | 12 -- .../executor/ExcelWriteFillExecutor.java | 12 +- .../impl/FillStyleCellWriteHandler.java | 6 +- .../metadata/holder/WriteWorkbookHolder.java | 49 +++++-- .../easyexcel/test/demo/fill/FillTest.java | 42 +++--- .../easyexcel/test/temp/poi/PoiTest.java | 132 ++++++++++++++++-- src/test/resources/demo/fill/list.xlsx | Bin 10744 -> 10704 bytes 9 files changed, 236 insertions(+), 121 deletions(-) diff --git a/src/main/java/com/alibaba/excel/util/NumberUtils.java b/src/main/java/com/alibaba/excel/util/NumberUtils.java index 4226e967..c467762c 100644 --- a/src/main/java/com/alibaba/excel/util/NumberUtils.java +++ b/src/main/java/com/alibaba/excel/util/NumberUtils.java @@ -186,4 +186,5 @@ public class NumberUtils { decimalFormat.setParseBigDecimal(true); return decimalFormat.parse(string); } + } diff --git a/src/main/java/com/alibaba/excel/util/StyleUtil.java b/src/main/java/com/alibaba/excel/util/StyleUtil.java index 023f789d..7481d6a5 100644 --- a/src/main/java/com/alibaba/excel/util/StyleUtil.java +++ b/src/main/java/com/alibaba/excel/util/StyleUtil.java @@ -12,6 +12,7 @@ import com.alibaba.excel.write.metadata.style.WriteFont; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.common.usermodel.HyperlinkType; +import org.apache.poi.hssf.usermodel.HSSFFont; import org.apache.poi.hssf.usermodel.HSSFRichTextString; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.DataFormat; @@ -19,6 +20,8 @@ import org.apache.poi.ss.usermodel.Font; import org.apache.poi.ss.usermodel.RichTextString; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.util.Units; +import org.apache.poi.xssf.usermodel.XSSFColor; +import org.apache.poi.xssf.usermodel.XSSFFont; import org.apache.poi.xssf.usermodel.XSSFRichTextString; /** @@ -32,11 +35,16 @@ public class StyleUtil { * Build cell style * * @param workbook + * @param originCellStyle * @param writeCellStyle * @return */ - public static CellStyle buildCellStyle(Workbook workbook, WriteCellStyle writeCellStyle) { + public static CellStyle buildCellStyle(Workbook workbook, CellStyle originCellStyle, + WriteCellStyle writeCellStyle) { CellStyle cellStyle = workbook.createCellStyle(); + if (originCellStyle != null) { + cellStyle.cloneStyleFrom(originCellStyle); + } if (writeCellStyle == null) { return cellStyle; } @@ -121,8 +129,8 @@ public class StyleUtil { return BuiltinFormats.GENERAL; } - public static Font buildFont(Workbook workbook, WriteFont writeFont) { - Font font = workbook.createFont(); + public static Font buildFont(Workbook workbook, Font originFont, WriteFont writeFont) { + Font font = createFont(workbook, originFont); if (writeFont == null || font == null) { return font; } @@ -156,58 +164,39 @@ public class StyleUtil { return font; } - public static WriteCellStyle buildWritCellStyle(CellStyle cellStyle, Font font) { - WriteCellStyle writeCellStyle = new WriteCellStyle(); - if (cellStyle == null) { - return writeCellStyle; - } - writeCellStyle.setHidden(cellStyle.getHidden()); - writeCellStyle.setLocked(cellStyle.getLocked()); - writeCellStyle.setQuotePrefix(cellStyle.getQuotePrefixed()); - writeCellStyle.setHorizontalAlignment(cellStyle.getAlignment()); - writeCellStyle.setWrapped(cellStyle.getWrapText()); - writeCellStyle.setVerticalAlignment(cellStyle.getVerticalAlignment()); - writeCellStyle.setRotation(cellStyle.getRotation()); - writeCellStyle.setIndent(cellStyle.getIndention()); - writeCellStyle.setBorderLeft(cellStyle.getBorderLeft()); - writeCellStyle.setBorderRight(cellStyle.getBorderRight()); - writeCellStyle.setBorderTop(cellStyle.getBorderTop()); - writeCellStyle.setBorderBottom(cellStyle.getBorderBottom()); - writeCellStyle.setLeftBorderColor(cellStyle.getLeftBorderColor()); - writeCellStyle.setRightBorderColor(cellStyle.getRightBorderColor()); - writeCellStyle.setTopBorderColor(cellStyle.getTopBorderColor()); - writeCellStyle.setBottomBorderColor(cellStyle.getBottomBorderColor()); - writeCellStyle.setFillPatternType(cellStyle.getFillPattern()); - //writeCellStyle.setFillBackgroundColor(cellStyle.getFillBackgroundColor()); - //writeCellStyle.setFillForegroundColor(cellStyle.getFillForegroundColor()); - writeCellStyle.setShrinkToFit(cellStyle.getShrinkToFit()); - writeCellStyle.setDataFormatData(buildDataFormat(cellStyle.getDataFormat(), cellStyle.getDataFormatString())); - writeCellStyle.setWriteFont(buildFont(font)); - return writeCellStyle; - } - - public static DataFormatData buildDataFormat(short dataFormat, String dataFormatString) { - DataFormatData dataFormatData = new DataFormatData(); - dataFormatData.setIndex(dataFormat); - dataFormatData.setFormat(dataFormatString); - return dataFormatData; - } - - public static WriteFont buildFont(Font font) { - WriteFont writeFont = new WriteFont(); - if (font == null) { - return writeFont; - } - writeFont.setFontName(font.getFontName()); - writeFont.setFontHeightInPoints(font.getFontHeightInPoints()); - writeFont.setItalic(font.getItalic()); - writeFont.setStrikeout(font.getStrikeout()); - writeFont.setColor(font.getColor()); - writeFont.setTypeOffset(font.getTypeOffset()); - writeFont.setUnderline(font.getUnderline()); - writeFont.setCharset(font.getCharSet()); - writeFont.setBold(font.getBold()); - return writeFont; + private static Font createFont(Workbook workbook, Font originFont) { + Font font = workbook.createFont(); + if (originFont == null) { + return font; + } + if (originFont instanceof XSSFFont) { + XSSFFont xssfFont = (XSSFFont)font; + XSSFFont xssfOriginFont = ((XSSFFont)originFont); + xssfFont.setFontName(xssfOriginFont.getFontName()); + xssfFont.setFontHeightInPoints(xssfOriginFont.getFontHeightInPoints()); + xssfFont.setItalic(xssfOriginFont.getItalic()); + xssfFont.setStrikeout(xssfOriginFont.getStrikeout()); + xssfFont.setColor(new XSSFColor(xssfOriginFont.getXSSFColor().getRGB(), null)); + xssfFont.setTypeOffset(xssfOriginFont.getTypeOffset()); + xssfFont.setUnderline(xssfOriginFont.getUnderline()); + xssfFont.setCharSet(xssfOriginFont.getCharSet()); + xssfFont.setBold(xssfOriginFont.getBold()); + return xssfFont; + } else if (originFont instanceof HSSFFont) { + HSSFFont hssfFont = (HSSFFont)font; + HSSFFont hssfOriginFont = (HSSFFont)originFont; + hssfFont.setFontName(hssfOriginFont.getFontName()); + hssfFont.setFontHeightInPoints(hssfOriginFont.getFontHeightInPoints()); + hssfFont.setItalic(hssfOriginFont.getItalic()); + hssfFont.setStrikeout(hssfOriginFont.getStrikeout()); + hssfFont.setColor(hssfOriginFont.getColor()); + hssfFont.setTypeOffset(hssfOriginFont.getTypeOffset()); + hssfFont.setUnderline(hssfOriginFont.getUnderline()); + hssfFont.setCharSet(hssfOriginFont.getCharSet()); + hssfFont.setBold(hssfOriginFont.getBold()); + return hssfFont; + } + return font; } public static RichTextString buildRichTextString(WriteWorkbookHolder writeWorkbookHolder, @@ -222,12 +211,12 @@ public class StyleUtil { richTextString = new HSSFRichTextString(richTextStringData.getTextString()); } if (richTextStringData.getWriteFont() != null) { - richTextString.applyFont(writeWorkbookHolder.createFont(richTextStringData.getWriteFont())); + richTextString.applyFont(writeWorkbookHolder.createFont(richTextStringData.getWriteFont(), null, true)); } if (CollectionUtils.isNotEmpty(richTextStringData.getIntervalFontList())) { for (IntervalFont intervalFont : richTextStringData.getIntervalFontList()) { richTextString.applyFont(intervalFont.getStartIndex(), intervalFont.getEndIndex(), - writeWorkbookHolder.createFont(intervalFont.getWriteFont())); + writeWorkbookHolder.createFont(intervalFont.getWriteFont(), null, true)); } } return richTextString; diff --git a/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java b/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java index 5cd0cda2..3c2d21db 100644 --- a/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java @@ -23,12 +23,10 @@ import com.alibaba.excel.util.StyleUtil; import com.alibaba.excel.util.WorkBookUtil; import com.alibaba.excel.util.WriteHandlerUtils; import com.alibaba.excel.write.metadata.holder.WriteHolder; -import com.alibaba.excel.write.metadata.style.WriteCellStyle; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.hssf.usermodel.HSSFClientAnchor; import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.ClientAnchor; import org.apache.poi.ss.usermodel.Comment; import org.apache.poi.ss.usermodel.CreationHelper; @@ -72,9 +70,6 @@ public abstract class AbstractExcelWriteExecutor implements ExcelWriteExecutor { // Fill in formula information fillFormula(cell, cellData.getFormulaData()); - // Fill in style information - fillStyle(cell, cellData.getWriteCellStyle()); - // Fill index cellData.setRowIndex(cell.getRowIndex()); cellData.setColumnIndex(cell.getColumnIndex()); @@ -109,13 +104,6 @@ public abstract class AbstractExcelWriteExecutor implements ExcelWriteExecutor { } - private void fillStyle(Cell cell, WriteCellStyle writeCellStyle) { - if (writeCellStyle == null) { - return; - } - CellStyle cellStyle = writeContext.writeWorkbookHolder().createCellStyle(writeCellStyle); - cell.setCellStyle(cellStyle); - } private void fillFormula(Cell cell, FormulaData formulaData) { if (formulaData == null) { diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java index cd20a2b9..57315ac6 100644 --- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java @@ -9,7 +9,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; import com.alibaba.excel.context.WriteContext; import com.alibaba.excel.enums.CellDataTypeEnum; @@ -178,8 +177,6 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { } } - AtomicInteger integer = new AtomicInteger(0); - private void doFill(List analysisCellList, Object oneRowData, FillConfig fillConfig, Integer relativeRowIndex) { if (CollectionUtils.isEmpty(analysisCellList) || oneRowData == null) { @@ -210,14 +207,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { if (fillConfig.getAutoStyle()) { Optional.ofNullable(collectionFieldStyleCache.get(currentUniqueDataFlag)) .map(collectionFieldStyleMap -> collectionFieldStyleMap.get(analysisCell)) - .ifPresent(cellStyle -> { - cellData.setOriginCellStyle(cellStyle); - //WriteCellStyle writeCellStyle = StyleUtil.buildWritCellStyle(cellStyle, - // writeContext.writeWorkbookHolder().getWorkbook() - // .getFontAt(cellStyle.getFontIndexAsInt())); - //WriteCellStyle.merge(cellData.getWriteCellStyle(), writeCellStyle); - //cellData.setWriteCellStyle(writeCellStyle); - }); + .ifPresent(cellData::setOriginCellStyle); } WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, null, relativeRowIndex, Boolean.FALSE); diff --git a/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java b/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java index 9956ea19..de7977ff 100644 --- a/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java +++ b/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java @@ -11,6 +11,7 @@ import com.alibaba.excel.write.metadata.style.WriteCellStyle; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.poi.ss.usermodel.CellStyle; /** * fill cell style. @@ -33,11 +34,12 @@ public class FillStyleCellWriteHandler implements CellWriteHandler { } WriteCellData cellData = cellDataList.get(0); WriteCellStyle writeCellStyle = cellData.getWriteCellStyle(); - if (writeCellStyle == null) { + CellStyle originCellStyle = cellData.getOriginCellStyle(); + if (writeCellStyle == null && originCellStyle == null) { return; } WriteWorkbookHolder writeWorkbookHolder = context.getWriteWorkbookHolder(); - context.getCell().setCellStyle(writeWorkbookHolder.createCellStyle(writeCellStyle)); + context.getCell().setCellStyle(writeWorkbookHolder.createCellStyle(writeCellStyle, originCellStyle)); } } diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java index 85e15275..2c392f0c 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java @@ -24,11 +24,13 @@ import com.alibaba.excel.write.metadata.style.WriteCellStyle; import com.alibaba.excel.write.metadata.style.WriteFont; import lombok.Data; +import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.Font; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.streaming.SXSSFWorkbook; +import org.apache.poi.xssf.usermodel.XSSFCellStyle; import org.apache.poi.xssf.usermodel.XSSFWorkbook; /** @@ -129,7 +131,7 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { /** * Used to cell style. */ - private Map cellStyleMap; + private Map> cellStyleIndexMap; /** * Used to font. */ @@ -206,7 +208,7 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { } else { this.writeExcelOnException = writeWorkbook.getWriteExcelOnException(); } - this.cellStyleMap = MapUtils.newHashMap(); + this.cellStyleIndexMap = MapUtils.newHashMap(); this.fontMap = MapUtils.newHashMap(); this.dataFormatMap = MapUtils.newHashMap(); } @@ -242,16 +244,36 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { * create a cell style. * * @param writeCellStyle + * @param originCellStyle * @return */ - public CellStyle createCellStyle(WriteCellStyle writeCellStyle) { + public CellStyle createCellStyle(WriteCellStyle writeCellStyle, CellStyle originCellStyle) { + if (writeCellStyle == null) { + return originCellStyle; + } + + short styleIndex = -1; + Font originFont = null; + boolean useCache = false; + if (originCellStyle != null) { + styleIndex = originCellStyle.getIndex(); + if (originCellStyle instanceof XSSFCellStyle) { + originFont = ((XSSFCellStyle)originCellStyle).getFont(); + } else if (originCellStyle instanceof HSSFCellStyle) { + originFont = ((HSSFCellStyle)originCellStyle).getFont(workbook); + } + useCache = true; + } + + Map cellStyleMap = cellStyleIndexMap.computeIfAbsent(styleIndex, + key -> MapUtils.newHashMap()); CellStyle cellStyle = cellStyleMap.get(writeCellStyle); if (cellStyle != null) { return cellStyle; } - cellStyle = StyleUtil.buildCellStyle(workbook, writeCellStyle); - cellStyle.setDataFormat(createDataFormat(writeCellStyle.getDataFormatData())); - cellStyle.setFont(createFont(writeCellStyle.getWriteFont())); + cellStyle = StyleUtil.buildCellStyle(workbook, originCellStyle, writeCellStyle); + cellStyle.setDataFormat(createDataFormat(writeCellStyle.getDataFormatData(), useCache)); + cellStyle.setFont(createFont(writeCellStyle.getWriteFont(), originFont, useCache)); cellStyleMap.put(writeCellStyle, cellStyle); return cellStyle; } @@ -260,14 +282,19 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { * create a font. * * @param writeFont + * @param originFont + * @param useCache * @return */ - public Font createFont(WriteFont writeFont) { + public Font createFont(WriteFont writeFont, Font originFont, boolean useCache) { + if (!useCache) { + return StyleUtil.buildFont(workbook, originFont, writeFont); + } Font font = fontMap.get(writeFont); if (font != null) { return font; } - font = StyleUtil.buildFont(workbook, writeFont); + font = StyleUtil.buildFont(workbook, originFont, writeFont); fontMap.put(writeFont, font); return font; } @@ -276,9 +303,13 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { * create a data format. * * @param dataFormatData + * @param useCache * @return */ - public Short createDataFormat(DataFormatData dataFormatData) { + public Short createDataFormat(DataFormatData dataFormatData, boolean useCache) { + if (!useCache) { + return StyleUtil.buildDataFormat(workbook, dataFormatData); + } Short dataFormat = dataFormatMap.get(dataFormatData); if (dataFormat != null) { return dataFormat; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java b/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java index 04e8b53a..baca2232 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java @@ -69,27 +69,27 @@ public class FillTest { // 方案1 一下子全部放到内存里面 并填充 String fileName = TestFileUtil.getPath() + "listFill" + System.currentTimeMillis() + ".xlsx"; // 这里 会填充到第一个sheet， 然后文件流会自动关闭 - EasyExcel.write(fileName).withTemplate(templateFileName).inMemory(Boolean.TRUE).sheet().doFill(data()); - - //// 方案2 分多次 填充 会使用文件缓存（省内存） jdk8 - //// since: 3.0.0-beta1 - //fileName = TestFileUtil.getPath() + "listFill" + System.currentTimeMillis() + ".xlsx"; - //EasyExcel.write(fileName) - // .withTemplate(templateFileName) - // .sheet() - // .doFill(() -> { - // // 分页查询数据 - // return data(); - // }); - // - //// 方案3 分多次 填充 会使用文件缓存（省内存） - //fileName = TestFileUtil.getPath() + "listFill" + System.currentTimeMillis() + ".xlsx"; - //ExcelWriter excelWriter = EasyExcel.write(fileName).withTemplate(templateFileName).build(); - //WriteSheet writeSheet = EasyExcel.writerSheet().build(); - //excelWriter.fill(data(), writeSheet); - //excelWriter.fill(data(), writeSheet); - //// 千万别忘记关闭流 - //excelWriter.finish(); + EasyExcel.write(fileName).withTemplate(templateFileName).sheet().doFill(data()); + + // 方案2 分多次 填充 会使用文件缓存（省内存） jdk8 + // since: 3.0.0-beta1 + fileName = TestFileUtil.getPath() + "listFill" + System.currentTimeMillis() + ".xlsx"; + EasyExcel.write(fileName) + .withTemplate(templateFileName) + .sheet() + .doFill(() -> { + // 分页查询数据 + return data(); + }); + + // 方案3 分多次 填充 会使用文件缓存（省内存） + fileName = TestFileUtil.getPath() + "listFill" + System.currentTimeMillis() + ".xlsx"; + ExcelWriter excelWriter = EasyExcel.write(fileName).withTemplate(templateFileName).build(); + WriteSheet writeSheet = EasyExcel.writerSheet().build(); + excelWriter.fill(data(), writeSheet); + excelWriter.fill(data(), writeSheet); + // 千万别忘记关闭流 + excelWriter.finish(); } /** diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiTest.java b/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiTest.java index d56bd7b8..e27136d4 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiTest.java @@ -1,6 +1,7 @@ package com.alibaba.easyexcel.test.temp.poi; import java.io.File; +import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.util.Date; @@ -8,13 +9,22 @@ import java.util.Date; import com.alibaba.easyexcel.test.util.TestFileUtil; import com.alibaba.excel.util.FileUtils; +import org.apache.poi.hssf.usermodel.HSSFCellStyle; +import org.apache.poi.hssf.usermodel.HSSFFont; +import org.apache.poi.hssf.usermodel.HSSFRow; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.IndexedColors; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.streaming.SXSSFRow; import org.apache.poi.xssf.streaming.SXSSFSheet; import org.apache.poi.xssf.streaming.SXSSFWorkbook; +import org.apache.poi.xssf.usermodel.XSSFCellStyle; +import org.apache.poi.xssf.usermodel.XSSFColor; +import org.apache.poi.xssf.usermodel.XSSFFont; import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -39,25 +49,129 @@ public class PoiTest { SXSSFSheet xssfSheet = xssfWorkbook.getSheetAt(0); LOGGER.info("一共行数:{}", xssfSheet.getLastRowNum()); SXSSFRow row = xssfSheet.getRow(0); - LOGGER.info("dd{}",row.getCell(0).getColumnIndex()); + LOGGER.info("dd{}", row.getCell(0).getColumnIndex()); Date date = row.getCell(1).getDateCellValue(); - } @Test public void lastRowNumXSSF() throws IOException { - String file = "/Users/zhuangjiaju/test/test3.xlsx"; - XSSFWorkbook xssfWorkbook = new XSSFWorkbook(file); + + String file = "/Users/zhuangjiaju/test/test3 copy 10.xlsx"; + XSSFWorkbook xssfWorkbook = new XSSFWorkbook(new FileInputStream(file)); LOGGER.info("一共:{}个sheet", xssfWorkbook.getNumberOfSheets()); XSSFSheet xssfSheet = xssfWorkbook.getSheetAt(0); LOGGER.info("一共行数:{}", xssfSheet.getLastRowNum()); - XSSFRow row = xssfSheet.getRow(0); - LOGGER.info("dd{}",row.getCell(0).getRow().getRowNum()); - LOGGER.info("dd{}",xssfSheet.getLastRowNum()); + XSSFRow row = xssfSheet.getRow(1); + LOGGER.info("dd{}", row.getCell(0).getRow().getRowNum()); + LOGGER.info("dd{}", xssfSheet.getLastRowNum()); - Date date = row.getCell(1).getDateCellValue(); - LOGGER.info("date{}",date); + XSSFCellStyle cellStyle = row.getCell(0).getCellStyle(); + LOGGER.info("size1:{}", cellStyle.getFontIndexAsInt()); + + XSSFCellStyle cellStyle1 = xssfWorkbook.createCellStyle(); + LOGGER.info("size2:{}", cellStyle1.getFontIndexAsInt()); + + cellStyle1.cloneStyleFrom(cellStyle); + LOGGER.info("size3:{}", cellStyle1.getFontIndexAsInt()); + + LOGGER.info("bbb:{}", cellStyle1.getFont().getXSSFColor().getIndex()); + LOGGER.info("bbb:{}", cellStyle1.getFont().getXSSFColor().getIndexed()); + XSSFColor myColor = new XSSFColor(cellStyle1.getFont().getXSSFColor().getRGB(), null); + LOGGER.info("bbb:{}", cellStyle1.getFont().getXSSFColor().getRGB()); + LOGGER.info("bbb:{}", cellStyle1.getFont().getXSSFColor().getARGBHex()); + + LOGGER.info("bbb:{}", cellStyle1.getFont().getBold()); + LOGGER.info("bbb:{}", cellStyle1.getFont().getFontName()); + + + XSSFFont xssfFont = xssfWorkbook.createFont(); + + xssfFont.setColor(myColor); + + xssfFont.setFontHeightInPoints((short)50); + xssfFont.setBold(Boolean.TRUE); + cellStyle1.setFont(xssfFont); + cellStyle1.setFillForegroundColor(IndexedColors.PINK.getIndex()); + + + LOGGER.info("aaa:{}", cellStyle1.getFont().getColor()); + + row.getCell(1).setCellStyle(cellStyle1); + row.getCell(1).setCellValue(3334l); + + XSSFCellStyle cellStyle2 = xssfWorkbook.createCellStyle(); + cellStyle2.cloneStyleFrom(cellStyle); + cellStyle2.setFillForegroundColor(IndexedColors.BLUE.getIndex()); + //cellStyle2.setFont(cellStyle1.getFont()); + row.getCell(2).setCellStyle(cellStyle2); + row.getCell(2).setCellValue(3334l); + //LOGGER.info("date1:{}", row.getCell(0).getStringCellValue()); + //LOGGER.info("date2:{}", ((XSSFColor) cellStyle.getFillForegroundColorColor()).getIndex()); + //LOGGER.info("date2:{}", ((XSSFColor) cellStyle.getFillForegroundColorColor()).isRGB()); + //LOGGER.info("date4:{}", ((XSSFColor) cellStyle.getFillForegroundColorColor()).isIndexed()); + //LOGGER.info("date3:{}", cellStyle.getFont().getXSSFColor().getRGB()); + //LOGGER.info("date4:{}", cellStyle.getFont().getCTFont().getColorArray(0).getRgb()); + FileOutputStream fileOutputStream = new FileOutputStream(file); + xssfWorkbook.write(fileOutputStream); + fileOutputStream.flush(); + xssfWorkbook.close(); + } + + + @Test + public void lastRowNumXSSFv22() throws IOException { + + String file = "/Users/zhuangjiaju/test/test3 copy 2.xls"; + HSSFWorkbook xssfWorkbook = new HSSFWorkbook(new FileInputStream(file)); + LOGGER.info("一共:{}个sheet", xssfWorkbook.getNumberOfSheets()); + HSSFSheet xssfSheet = xssfWorkbook.getSheetAt(0); + LOGGER.info("一共行数:{}", xssfSheet.getLastRowNum()); + HSSFRow row = xssfSheet.getRow(1); + LOGGER.info("dd{}", row.getCell(0).getRow().getRowNum()); + LOGGER.info("dd{}", xssfSheet.getLastRowNum()); + + HSSFCellStyle cellStyle = row.getCell(0).getCellStyle(); + LOGGER.info("单元格1的字体:{}", cellStyle.getFontIndexAsInt()); + + HSSFCellStyle cellStyle1 = xssfWorkbook.createCellStyle(); + LOGGER.info("size2:{}", cellStyle1.getFontIndexAsInt()); + + cellStyle1.cloneStyleFrom(cellStyle); + LOGGER.info("单元格2的字体:{}", cellStyle1.getFontIndexAsInt()); + + LOGGER.info("bbb:{}", cellStyle1.getFont(xssfWorkbook).getColor()); + + + HSSFFont xssfFont = xssfWorkbook.createFont(); + + xssfFont.setColor(cellStyle1.getFont(xssfWorkbook).getColor()); + xssfFont.setFontHeightInPoints((short)50); + xssfFont.setBold(Boolean.TRUE); + cellStyle1.setFont(xssfFont); + cellStyle1.setFillForegroundColor(IndexedColors.PINK.getIndex()); + + LOGGER.info("aaa:{}", cellStyle1.getFont(xssfWorkbook).getColor()); + + row.getCell(1).setCellStyle(cellStyle1); + row.getCell(1).setCellValue(3334l); + + HSSFCellStyle cellStyle2 = xssfWorkbook.createCellStyle(); + cellStyle2.cloneStyleFrom(cellStyle); + cellStyle2.setFillForegroundColor(IndexedColors.BLUE.getIndex()); + //cellStyle2.setFont(cellStyle1.getFont()); + row.getCell(2).setCellStyle(cellStyle2); + row.getCell(2).setCellValue(3334l); + //LOGGER.info("date1:{}", row.getCell(0).getStringCellValue()); + //LOGGER.info("date2:{}", ((XSSFColor) cellStyle.getFillForegroundColorColor()).getIndex()); + //LOGGER.info("date2:{}", ((XSSFColor) cellStyle.getFillForegroundColorColor()).isRGB()); + //LOGGER.info("date4:{}", ((XSSFColor) cellStyle.getFillForegroundColorColor()).isIndexed()); + //LOGGER.info("date3:{}", cellStyle.getFont().getXSSFColor().getRGB()); + //LOGGER.info("date4:{}", cellStyle.getFont().getCTFont().getColorArray(0).getRgb()); + FileOutputStream fileOutputStream = new FileOutputStream(file); + xssfWorkbook.write(fileOutputStream); + fileOutputStream.flush(); + xssfWorkbook.close(); } @Test diff --git a/src/test/resources/demo/fill/list.xlsx b/src/test/resources/demo/fill/list.xlsx index 8e3ed67dd26ab212946ab9a5c5e9caaee8a0730c..d29e05e76f7d37aafe843249b9ab5b9b78835e0e 100644 GIT binary patch delta 3364 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 W0bC?`%V{t)ke Date: Wed, 13 Oct 2021 17:30:49 +0800 Subject: [PATCH 03/19] =?UTF-8?q?*=20=E4=BF=AE=E5=A4=8D=E5=A1=AB=E5=85=85?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=8F=AF=E8=83=BD=E4=B8=A2=E5=A4=B1=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20[Issue=20#2124]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/update.md b/update.md index 7a2cb568..c1a7efd8 100644 --- a/update.md +++ b/update.md @@ -1,3 +1,7 @@ +# 3.0.1 +* 升级到正式版 +* 修复填充样式可能丢失的问题 [Issue #2124](https://github.com/alibaba/easyexcel/issues/2124) + # 3.0.0-beta3 * 修复导出浮点型数据可能精度异常的bug From 5465de62942589bf950a29e900c7274eabd1cab5 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Fri, 15 Oct 2021 13:09:03 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=A1=AB=E5=85=85?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/alibaba/excel/metadata/Head.java | 91 +---- .../com/alibaba/excel/util/FieldUtils.java | 17 +- .../com/alibaba/excel/util/StyleUtil.java | 22 +- .../executor/AbstractExcelWriteExecutor.java | 1 - .../write/executor/ExcelWriteAddExecutor.java | 4 +- .../executor/ExcelWriteFillExecutor.java | 7 +- .../impl/FillStyleCellWriteHandler.java | 2 +- .../metadata/holder/AbstractWriteHolder.java | 11 +- .../metadata/holder/WriteWorkbookHolder.java | 22 +- .../AbstractVerticalCellStyleStrategy.java | 28 +- .../test/core/fill/FillDataTest.java | 35 +- .../fill/style/FillStyleAnnotatedData.java | 29 ++ .../fill/style/FillStyleAnnotatedTest.java | 325 ++++++++++++++++ .../test/core/fill/style/FillStyleData.java | 16 + .../core/fill/style/FillStyleDataTest.java | 346 ++++++++++++++++++ .../easyexcel/test/temp/poi/PoiWriteTest.java | 17 +- src/test/resources/fill/simple.csv | 2 + src/test/resources/fill/style.xls | Bin 0 -> 27648 bytes src/test/resources/fill/style.xlsx | Bin 0 -> 11114 bytes update.md | 1 + 20 files changed, 836 insertions(+), 140 deletions(-) create mode 100644 src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java create mode 100644 src/test/resources/fill/simple.csv create mode 100644 src/test/resources/fill/style.xls create mode 100644 src/test/resources/fill/style.xlsx diff --git a/src/main/java/com/alibaba/excel/metadata/Head.java b/src/main/java/com/alibaba/excel/metadata/Head.java index c150fe02..2f98a14b 100644 --- a/src/main/java/com/alibaba/excel/metadata/Head.java +++ b/src/main/java/com/alibaba/excel/metadata/Head.java @@ -9,11 +9,14 @@ import com.alibaba.excel.metadata.property.FontProperty; import com.alibaba.excel.metadata.property.LoopMergeProperty; import com.alibaba.excel.metadata.property.StyleProperty; +import lombok.Data; + /** * excel head * * @author Jiaju Zhuang **/ +@Data public class Head { /** * Column index of head @@ -77,92 +80,4 @@ public class Head { this.forceIndex = forceIndex; this.forceName = forceName; } - - public Integer getColumnIndex() { - return columnIndex; - } - - public void setColumnIndex(Integer columnIndex) { - this.columnIndex = columnIndex; - } - - public String getFieldName() { - return fieldName; - } - - public void setFieldName(String fieldName) { - this.fieldName = fieldName; - } - - public List getHeadNameList() { - return headNameList; - } - - public void setHeadNameList(List headNameList) { - this.headNameList = headNameList; - } - - public ColumnWidthProperty getColumnWidthProperty() { - return columnWidthProperty; - } - - public void setColumnWidthProperty(ColumnWidthProperty columnWidthProperty) { - this.columnWidthProperty = columnWidthProperty; - } - - public Boolean getForceIndex() { - return forceIndex; - } - - public void setForceIndex(Boolean forceIndex) { - this.forceIndex = forceIndex; - } - - public Boolean getForceName() { - return forceName; - } - - public void setForceName(Boolean forceName) { - this.forceName = forceName; - } - - public LoopMergeProperty getLoopMergeProperty() { - return loopMergeProperty; - } - - public void setLoopMergeProperty(LoopMergeProperty loopMergeProperty) { - this.loopMergeProperty = loopMergeProperty; - } - - public StyleProperty getHeadStyleProperty() { - return headStyleProperty; - } - - public void setHeadStyleProperty(StyleProperty headStyleProperty) { - this.headStyleProperty = headStyleProperty; - } - - public StyleProperty getContentStyleProperty() { - return contentStyleProperty; - } - - public void setContentStyleProperty(StyleProperty contentStyleProperty) { - this.contentStyleProperty = contentStyleProperty; - } - - public FontProperty getHeadFontProperty() { - return headFontProperty; - } - - public void setHeadFontProperty(FontProperty headFontProperty) { - this.headFontProperty = headFontProperty; - } - - public FontProperty getContentFontProperty() { - return contentFontProperty; - } - - public void setContentFontProperty(FontProperty contentFontProperty) { - this.contentFontProperty = contentFontProperty; - } } diff --git a/src/main/java/com/alibaba/excel/util/FieldUtils.java b/src/main/java/com/alibaba/excel/util/FieldUtils.java index a5c75731..367c6e55 100644 --- a/src/main/java/com/alibaba/excel/util/FieldUtils.java +++ b/src/main/java/com/alibaba/excel/util/FieldUtils.java @@ -5,7 +5,6 @@ import java.lang.reflect.Modifier; import java.util.Map; import com.alibaba.excel.metadata.NullObject; -import com.alibaba.excel.write.metadata.RowData; import net.sf.cglib.beans.BeanMap; @@ -20,19 +19,17 @@ public class FieldUtils { private static final int START_RESOLVE_FIELD_LENGTH = 2; - public static Class getFieldClass(Map dataMap, String filedName) { + public static Class getFieldClass(Map dataMap, String filedName, Object value) { if (dataMap instanceof BeanMap) { - return ((BeanMap)dataMap).getPropertyType(filedName); - } - Object value = dataMap.get(filedName); - if (value != null) { - return value.getClass(); + Class fieldClass = ((BeanMap)dataMap).getPropertyType(filedName); + if (fieldClass != null) { + return fieldClass; + } } - return nullObjectClass; + return getFieldClass(value); } - public static Class getFieldClass(RowData rowData, int dataIndex) { - Object value = rowData.get(dataIndex); + public static Class getFieldClass(Object value) { if (value != null) { return value.getClass(); } diff --git a/src/main/java/com/alibaba/excel/util/StyleUtil.java b/src/main/java/com/alibaba/excel/util/StyleUtil.java index 7481d6a5..93ae6577 100644 --- a/src/main/java/com/alibaba/excel/util/StyleUtil.java +++ b/src/main/java/com/alibaba/excel/util/StyleUtil.java @@ -10,6 +10,7 @@ import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; import com.alibaba.excel.write.metadata.style.WriteCellStyle; import com.alibaba.excel.write.metadata.style.WriteFont; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.common.usermodel.HyperlinkType; import org.apache.poi.hssf.usermodel.HSSFFont; @@ -27,6 +28,7 @@ import org.apache.poi.xssf.usermodel.XSSFRichTextString; /** * @author jipengfei */ +@Slf4j public class StyleUtil { private StyleUtil() {} @@ -123,6 +125,9 @@ public class StyleUtil { return dataFormatData.getIndex(); } if (StringUtils.isNotBlank(dataFormatData.getFormat())) { + if (log.isDebugEnabled()) { + log.info("create new data fromat:{}", dataFormatData); + } DataFormat dataFormatCreate = workbook.createDataFormat(); return dataFormatCreate.getFormat(dataFormatData.getFormat()); } @@ -130,8 +135,14 @@ public class StyleUtil { } public static Font buildFont(Workbook workbook, Font originFont, WriteFont writeFont) { - Font font = createFont(workbook, originFont); - if (writeFont == null || font == null) { + if (log.isDebugEnabled()) { + log.info("create new font:{},{}", writeFont, originFont); + } + if (writeFont == null && originFont == null) { + return null; + } + Font font = createFont(workbook, originFont, writeFont); + if (writeFont == null) { return font; } if (writeFont.getFontName() != null) { @@ -164,7 +175,7 @@ public class StyleUtil { return font; } - private static Font createFont(Workbook workbook, Font originFont) { + private static Font createFont(Workbook workbook, Font originFont, WriteFont writeFont) { Font font = workbook.createFont(); if (originFont == null) { return font; @@ -176,7 +187,10 @@ public class StyleUtil { xssfFont.setFontHeightInPoints(xssfOriginFont.getFontHeightInPoints()); xssfFont.setItalic(xssfOriginFont.getItalic()); xssfFont.setStrikeout(xssfOriginFont.getStrikeout()); - xssfFont.setColor(new XSSFColor(xssfOriginFont.getXSSFColor().getRGB(), null)); + // Colors cannot be overwritten + if (writeFont == null || writeFont.getColor() == null) { + xssfFont.setColor(new XSSFColor(xssfOriginFont.getXSSFColor().getRGB(), null)); + } xssfFont.setTypeOffset(xssfOriginFont.getTypeOffset()); xssfFont.setUnderline(xssfOriginFont.getUnderline()); xssfFont.setCharSet(xssfOriginFont.getCharSet()); diff --git a/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java b/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java index 3c2d21db..ecc34b55 100644 --- a/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java @@ -104,7 +104,6 @@ public abstract class AbstractExcelWriteExecutor implements ExcelWriteExecutor { } - private void fillFormula(Cell cell, FormulaData formulaData) { if (formulaData == null) { return; diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java index e053d81f..866f6378 100644 --- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java @@ -115,7 +115,7 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { WriteHandlerUtils.afterCellCreate(writeContext, cell, head, relativeRowIndex, Boolean.FALSE); Object value = oneRowData.get(dataIndex); WriteCellData cellData = converterAndSet(writeContext.currentWriteHolder(), - FieldUtils.getFieldClass(oneRowData, dataIndex), null, cell, value, null, head, relativeRowIndex); + FieldUtils.getFieldClass(value), null, cell, value, null, head, relativeRowIndex); WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, head, relativeRowIndex, Boolean.FALSE); } @@ -173,7 +173,7 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { Cell cell = WorkBookUtil.createCell(row, maxCellIndex++); WriteHandlerUtils.afterCellCreate(writeContext, cell, null, relativeRowIndex, Boolean.FALSE); WriteCellData cellData = converterAndSet(currentWriteHolder, - FieldUtils.getFieldClass(beanMap, filedName), null, cell, value, null, null, relativeRowIndex); + FieldUtils.getFieldClass(beanMap, filedName, value), null, cell, value, null, null, relativeRowIndex); WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, null, relativeRowIndex, Boolean.FALSE); } } diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java index 57315ac6..70e28e77 100644 --- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java @@ -200,7 +200,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { } Object value = dataMap.get(variable); WriteCellData cellData = converterAndSet(writeSheetHolder, - FieldUtils.getFieldClass(dataMap, variable), + FieldUtils.getFieldClass(dataMap, variable, value), null, cell, value, fieldNameContentPropertyMap.get(variable), null, relativeRowIndex); // Restyle @@ -221,8 +221,9 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { continue; } Object value = dataMap.get(variable); - WriteCellData cellData = convert(writeSheetHolder, value == null ? null : value.getClass(), - CellDataTypeEnum.STRING, cell, value, fieldNameContentPropertyMap.get(variable)); + WriteCellData cellData = convert(writeSheetHolder, + FieldUtils.getFieldClass(dataMap, variable, value), CellDataTypeEnum.STRING, cell, value, + fieldNameContentPropertyMap.get(variable)); cellDataList.add(cellData); CellDataTypeEnum type = cellData.getType(); if (type != null) { diff --git a/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java b/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java index de7977ff..faf39ad7 100644 --- a/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java +++ b/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java @@ -29,7 +29,7 @@ public class FillStyleCellWriteHandler implements CellWriteHandler { @Override public void afterCellDispose(CellWriteHandlerContext context) { List> cellDataList = context.getCellDataList(); - if (CollectionUtils.isEmpty(cellDataList) || cellDataList.size() > 1) { + if (CollectionUtils.isEmpty(cellDataList)) { return; } WriteCellData cellData = cellDataList.get(0); diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java index d6921681..8028e4bd 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java @@ -27,6 +27,7 @@ import com.alibaba.excel.write.handler.RowWriteHandler; import com.alibaba.excel.write.handler.SheetWriteHandler; import com.alibaba.excel.write.handler.WorkbookWriteHandler; import com.alibaba.excel.write.handler.WriteHandler; +import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; import com.alibaba.excel.write.merge.LoopMergeStrategy; import com.alibaba.excel.write.merge.OnceAbsoluteMergeStrategy; import com.alibaba.excel.write.metadata.WriteBasicParameter; @@ -242,13 +243,15 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ } @Override - protected WriteCellStyle headCellStyle(Head head) { - return WriteCellStyle.build(head.getHeadStyleProperty(), head.getHeadFontProperty()); + protected WriteCellStyle headCellStyle(CellWriteHandlerContext context) { + //return WriteCellStyle.build(head.getHeadStyleProperty(), head.getHeadFontProperty()); + return null; } @Override - protected WriteCellStyle contentCellStyle(Head head) { - return WriteCellStyle.build(head.getContentStyleProperty(), head.getContentFontProperty()); + protected WriteCellStyle contentCellStyle(CellWriteHandlerContext context) { + //return WriteCellStyle.build(head.getContentStyleProperty(), head.getContentFontProperty()); + return null; } }; handlerList.add(styleStrategy); diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java index 2c392f0c..494473dc 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java @@ -24,6 +24,7 @@ import com.alibaba.excel.write.metadata.style.WriteCellStyle; import com.alibaba.excel.write.metadata.style.WriteFont; import lombok.Data; +import lombok.extern.slf4j.Slf4j; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.CellStyle; @@ -39,6 +40,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; * @author Jiaju Zhuang */ @Data +@Slf4j public class WriteWorkbookHolder extends AbstractWriteHolder { /*** * Current poi Workbook.This is only for writing, and there may be no data in version 07 when template data needs to @@ -254,7 +256,7 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { short styleIndex = -1; Font originFont = null; - boolean useCache = false; + boolean useCache = true; if (originCellStyle != null) { styleIndex = originCellStyle.getIndex(); if (originCellStyle instanceof XSSFCellStyle) { @@ -262,7 +264,7 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { } else if (originCellStyle instanceof HSSFCellStyle) { originFont = ((HSSFCellStyle)originCellStyle).getFont(workbook); } - useCache = true; + useCache = false; } Map cellStyleMap = cellStyleIndexMap.computeIfAbsent(styleIndex, @@ -271,9 +273,18 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { if (cellStyle != null) { return cellStyle; } + if (log.isDebugEnabled()) { + log.info("create new style:{},{}", writeCellStyle, originCellStyle); + } cellStyle = StyleUtil.buildCellStyle(workbook, originCellStyle, writeCellStyle); - cellStyle.setDataFormat(createDataFormat(writeCellStyle.getDataFormatData(), useCache)); - cellStyle.setFont(createFont(writeCellStyle.getWriteFont(), originFont, useCache)); + Short dataFormat = createDataFormat(writeCellStyle.getDataFormatData(), useCache); + if (dataFormat != null) { + cellStyle.setDataFormat(dataFormat); + } + Font font = createFont(writeCellStyle.getWriteFont(), originFont, useCache); + if (font != null) { + cellStyle.setFont(font); + } cellStyleMap.put(writeCellStyle, cellStyle); return cellStyle; } @@ -307,6 +318,9 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { * @return */ public Short createDataFormat(DataFormatData dataFormatData, boolean useCache) { + if (dataFormatData == null) { + return null; + } if (!useCache) { return StyleUtil.buildDataFormat(workbook, dataFormatData); } diff --git a/src/main/java/com/alibaba/excel/write/style/AbstractVerticalCellStyleStrategy.java b/src/main/java/com/alibaba/excel/write/style/AbstractVerticalCellStyleStrategy.java index e37987bb..f9d76f7f 100644 --- a/src/main/java/com/alibaba/excel/write/style/AbstractVerticalCellStyleStrategy.java +++ b/src/main/java/com/alibaba/excel/write/style/AbstractVerticalCellStyleStrategy.java @@ -18,12 +18,12 @@ public abstract class AbstractVerticalCellStyleStrategy extends AbstractCellStyl return; } WriteCellData cellData = context.getFirstCellData(); - WriteCellStyle.merge(headCellStyle(context.getHeadData()), cellData.getOrCreateStyle()); + WriteCellStyle.merge(headCellStyle(context), cellData.getOrCreateStyle()); } @Override protected void setContentCellStyle(CellWriteHandlerContext context) { - if (stopProcessing(context)) { + if (context.getFirstCellData() == null) { return; } WriteCellData cellData = context.getFirstCellData(); @@ -31,13 +31,13 @@ public abstract class AbstractVerticalCellStyleStrategy extends AbstractCellStyl } /** - * Returns the column width corresponding to each column head. + * Returns the column width corresponding to each column head * * @param context * @return */ - protected WriteCellStyle contentCellStyle(CellWriteHandlerContext context) { - return contentCellStyle(context.getHeadData()); + protected WriteCellStyle headCellStyle(CellWriteHandlerContext context) { + return headCellStyle(context.getHeadData()); } /** @@ -46,7 +46,19 @@ public abstract class AbstractVerticalCellStyleStrategy extends AbstractCellStyl * @param head Nullable * @return */ - protected abstract WriteCellStyle headCellStyle(Head head); + protected WriteCellStyle headCellStyle(Head head) { + return null; + } + + /** + * Returns the column width corresponding to each column head. + * + * @param context + * @return + */ + protected WriteCellStyle contentCellStyle(CellWriteHandlerContext context) { + return contentCellStyle(context.getHeadData()); + } /** * Returns the column width corresponding to each column head @@ -55,9 +67,7 @@ public abstract class AbstractVerticalCellStyleStrategy extends AbstractCellStyl * @return */ protected WriteCellStyle contentCellStyle(Head head) { - throw new UnsupportedOperationException( - "One of the two methods 'contentCellStyle(Cell cell, Head head, Integer relativeRowIndex)' and " - + "'contentCellStyle(Head head)' must be implemented."); + return null; } protected boolean stopProcessing(CellWriteHandlerContext context) { diff --git a/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java index 3df12b1c..6cd629f6 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java @@ -6,23 +6,23 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; - import com.alibaba.easyexcel.test.util.TestFileUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.enums.WriteDirectionEnum; +import com.alibaba.excel.exception.ExcelGenerateException; import com.alibaba.excel.write.merge.LoopMergeStrategy; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.fill.FillConfig; import com.alibaba.excel.write.metadata.fill.FillWrapper; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + /** - * * @author Jiaju Zhuang */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @@ -30,8 +30,10 @@ public class FillDataTest { private static File file07; private static File file03; + private static File fileCsv; private static File simpleTemplate07; private static File simpleTemplate03; + private static File simpleTemplateCsv; private static File fileComplex07; private static File complexFillTemplate07; private static File fileComplex03; @@ -53,8 +55,10 @@ public class FillDataTest { public static void init() { file07 = TestFileUtil.createNewFile("fill07.xlsx"); file03 = TestFileUtil.createNewFile("fill03.xls"); + fileCsv = TestFileUtil.createNewFile("fill.csv"); simpleTemplate07 = TestFileUtil.readFile("fill" + File.separator + "simple.xlsx"); simpleTemplate03 = TestFileUtil.readFile("fill" + File.separator + "simple.xls"); + simpleTemplateCsv = TestFileUtil.readFile("fill" + File.separator + "simple.csv"); fileComplex07 = TestFileUtil.createNewFile("fillComplex07.xlsx"); complexFillTemplate07 = TestFileUtil.readFile("fill" + File.separator + "complex.xlsx"); fileComplex03 = TestFileUtil.createNewFile("fillComplex03.xls"); @@ -83,6 +87,13 @@ public class FillDataTest { fill(file03, simpleTemplate03); } + @Test + public void t03FillCsv() { + ExcelGenerateException excelGenerateException = Assert.assertThrows(ExcelGenerateException.class, + () -> fill(fileCsv, simpleTemplateCsv)); + Assert.assertEquals("Calling the 'fill' method must use a template.", excelGenerateException.getMessage()); + } + @Test public void t03ComplexFill07() { complexFill(fileComplex07, complexFillTemplate07); @@ -147,11 +158,11 @@ public class FillDataTest { excelWriter.finish(); List list = EasyExcel.read(file).ignoreEmptyRow(false).sheet().headRowNumber(0).doReadSync(); - Map map0 = (Map) list.get(0); + Map map0 = (Map)list.get(0); Assert.assertEquals("张三", map0.get(21)); - Map map27 = (Map) list.get(27); + Map map27 = (Map)list.get(27); Assert.assertEquals("张三", map27.get(0)); - Map map29 = (Map) list.get(29); + Map map29 = (Map)list.get(29); Assert.assertEquals("张三", map29.get(3)); } @@ -168,7 +179,7 @@ public class FillDataTest { List list = EasyExcel.read(file).sheet().headRowNumber(0).doReadSync(); Assert.assertEquals(list.size(), 5L); - Map map0 = (Map) list.get(0); + Map map0 = (Map)list.get(0); Assert.assertEquals("张三", map0.get(2)); } @@ -185,7 +196,7 @@ public class FillDataTest { excelWriter.finish(); List list = EasyExcel.read(file).sheet().headRowNumber(3).doReadSync(); Assert.assertEquals(list.size(), 21L); - Map map19 = (Map) list.get(19); + Map map19 = (Map)list.get(19); Assert.assertEquals("张三", map19.get(0)); } diff --git a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java new file mode 100644 index 00000000..f5984a1e --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java @@ -0,0 +1,29 @@ +package com.alibaba.easyexcel.test.core.fill.style; + +import java.util.Date; + +import com.alibaba.excel.annotation.write.style.ContentFontStyle; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.enums.BooleanEnum; +import com.alibaba.excel.enums.poi.FillPatternTypeEnum; + +import lombok.Data; + +/** + * @author Jiaju Zhuang + */ +@Data +public class FillStyleAnnotatedData { + @ContentStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 13) + @ContentFontStyle(bold = BooleanEnum.TRUE, color = 19) + private String name; + @ContentStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 10) + @ContentFontStyle(bold = BooleanEnum.TRUE, color = 16) + private Double number; + @ContentStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 17) + @ContentFontStyle(bold = BooleanEnum.TRUE, color = 18) + private Date date; + @ContentStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 12) + @ContentFontStyle(bold = BooleanEnum.TRUE, color = 18) + private String empty; +} diff --git a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java new file mode 100644 index 00000000..d1d45322 --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java @@ -0,0 +1,325 @@ +package com.alibaba.easyexcel.test.core.fill.style; + +import java.io.File; +import java.io.FileInputStream; +import java.util.List; + +import com.alibaba.easyexcel.test.core.fill.FillData; +import com.alibaba.easyexcel.test.util.TestFileUtil; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.metadata.Head; +import com.alibaba.excel.util.DateUtils; +import com.alibaba.excel.util.ListUtils; +import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; +import com.alibaba.excel.write.metadata.style.WriteCellStyle; +import com.alibaba.excel.write.metadata.style.WriteFont; +import com.alibaba.excel.write.style.AbstractVerticalCellStyleStrategy; + +import org.apache.poi.hssf.usermodel.HSSFCell; +import org.apache.poi.hssf.usermodel.HSSFRow; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.FillPatternType; +import org.apache.poi.ss.usermodel.IndexedColors; +import org.apache.poi.xssf.usermodel.XSSFCell; +import org.apache.poi.xssf.usermodel.XSSFRow; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + +/** + * @author Jiaju Zhuang + */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +public class FillStyleAnnotatedTest { + + private static File FillStyleAnnotated07; + private static File FillStyleAnnotated03; + private static File fileStyleTemplate07; + private static File fileStyleTemplate03; + + @BeforeClass + public static void init() { + FillStyleAnnotated07 = TestFileUtil.createNewFile("FillStyleAnnotated07.xlsx"); + FillStyleAnnotated03 = TestFileUtil.createNewFile("FillStyleAnnotated03.xls"); + fileStyleTemplate07 = TestFileUtil.readFile("fill" + File.separator + "style.xlsx"); + fileStyleTemplate03 = TestFileUtil.readFile("fill" + File.separator + "style.xls"); + } + + @Test + public void t01Fill07() throws Exception { + fill(FillStyleAnnotated07, fileStyleTemplate07); + XSSFWorkbook workbook = new XSSFWorkbook(new FileInputStream(FillStyleAnnotated07)); + XSSFSheet sheet = workbook.getSheetAt(0); + t01Fill07check(sheet.getRow(1)); + t01Fill07check(sheet.getRow(2)); + } + + private void t01Fill07check(XSSFRow row) { + XSSFCell cell0 = row.getCell(0); + Assert.assertEquals("张三", cell0.getStringCellValue()); + Assert.assertEquals(49, cell0.getCellStyle().getDataFormat()); + Assert.assertEquals("FF00B050", cell0.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF7030A0", cell0.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertTrue(cell0.getCellStyle().getFont().getBold()); + + XSSFCell cell1 = row.getCell(1); + Assert.assertEquals("5", cell1.getStringCellValue()); + Assert.assertEquals(0, cell1.getCellStyle().getDataFormat()); + Assert.assertEquals("FF92D050", cell1.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF4BACC6", cell1.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertFalse(cell1.getCellStyle().getFont().getBold()); + + XSSFCell cell2 = row.getCell(2); + Assert.assertEquals("2020-01-01 01:01:01", DateUtils.format(cell2.getDateCellValue(), "yyyy-MM-dd HH:mm:ss")); + Assert.assertEquals("yyyy-MM-dd HH:mm:ss", cell2.getCellStyle().getDataFormatString()); + Assert.assertEquals("FFFFC000", cell2.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FFC0504D", cell2.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertTrue(cell2.getCellStyle().getFont().getBold()); + + XSSFCell cell3 = row.getCell(3); + Assert.assertEquals("张三今年5岁了", cell3.getStringCellValue()); + Assert.assertEquals(0, cell3.getCellStyle().getDataFormat()); + Assert.assertEquals("FFFF0000", cell3.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FFEEECE1", cell3.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertTrue(cell3.getCellStyle().getFont().getBold()); + + XSSFCell cell4 = row.getCell(4); + Assert.assertEquals("{.name}忽略，张三", cell4.getStringCellValue()); + Assert.assertEquals(0, cell4.getCellStyle().getDataFormat()); + Assert.assertEquals("FFC00000", cell4.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF000000", cell4.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertFalse(cell4.getCellStyle().getFont().getBold()); + + XSSFCell cell5 = row.getCell(5); + Assert.assertEquals("空", cell5.getStringCellValue()); + Assert.assertEquals(0, cell5.getCellStyle().getDataFormat()); + Assert.assertEquals("FFF79646", cell5.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF8064A2", cell5.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertFalse(cell5.getCellStyle().getFont().getBold()); + } + + @Test + public void t02Fill03() throws Exception { + fill(FillStyleAnnotated03, fileStyleTemplate03); + HSSFWorkbook workbook = new HSSFWorkbook(new FileInputStream(FillStyleAnnotated03)); + HSSFSheet sheet = workbook.getSheetAt(0); + t02Fill03check(workbook, sheet.getRow(1)); + t02Fill03check(workbook, sheet.getRow(2)); + } + + private void t02Fill03check(HSSFWorkbook workbook, HSSFRow row) { + HSSFCell cell0 = row.getCell(0); + Assert.assertEquals("张三", cell0.getStringCellValue()); + Assert.assertEquals(49, cell0.getCellStyle().getDataFormat()); + Assert.assertEquals("0:8080:0", cell0.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("8080:0:8080", cell0.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertTrue(cell0.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell1 = row.getCell(1); + Assert.assertEquals("5", cell1.getStringCellValue()); + Assert.assertEquals(0, cell1.getCellStyle().getDataFormat()); + Assert.assertEquals("9999:CCCC:0", cell1.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("0:8080:8080", cell1.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertFalse(cell1.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell2 = row.getCell(2); + Assert.assertEquals("2020-01-01 01:01:01", DateUtils.format(cell2.getDateCellValue(), "yyyy-MM-dd HH:mm:ss")); + Assert.assertEquals("yyyy-MM-dd HH:mm:ss", cell2.getCellStyle().getDataFormatString()); + Assert.assertEquals("FFFF:CCCC:0", cell2.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("8080:0:0", cell2.getCellStyle().getFont(workbook).getHSSFColor(workbook).getHexString()); + Assert.assertTrue(cell2.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell3 = row.getCell(3); + Assert.assertEquals("张三今年5岁了", cell3.getStringCellValue()); + Assert.assertEquals(0, cell3.getCellStyle().getDataFormat()); + Assert.assertEquals("FFFF:0:0", cell3.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("FFFF:FFFF:9999", cell3.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertTrue(cell3.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell4 = row.getCell(4); + Assert.assertEquals("{.name}忽略，张三", cell4.getStringCellValue()); + Assert.assertEquals(0, cell4.getCellStyle().getDataFormat()); + Assert.assertEquals("9999:3333:0", cell4.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("3333:3333:3333", cell4.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertFalse(cell4.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell5 = row.getCell(5); + Assert.assertEquals("空", cell5.getStringCellValue()); + Assert.assertEquals(0, cell5.getCellStyle().getDataFormat()); + Assert.assertEquals("9999:3333:0", cell5.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("CCCC:9999:FFFF", cell5.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertFalse(cell5.getCellStyle().getFont(workbook).getBold()); + } + + private void fill(File file, File template) throws Exception { + EasyExcel.write(file, FillStyleAnnotatedData.class).withTemplate(template).sheet().doFill(data()); + } + + + private void t11FillStyleHandler07check(XSSFRow row) { + XSSFCell cell0 = row.getCell(0); + Assert.assertEquals("张三", cell0.getStringCellValue()); + Assert.assertEquals(49, cell0.getCellStyle().getDataFormat()); + Assert.assertEquals("FFFFFF00", cell0.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF808000", cell0.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertTrue(cell0.getCellStyle().getFont().getBold()); + + XSSFCell cell1 = row.getCell(1); + Assert.assertEquals("5", cell1.getStringCellValue()); + Assert.assertEquals(0, cell1.getCellStyle().getDataFormat()); + Assert.assertEquals("FFFF0000", cell1.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF800000", cell1.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertTrue(cell1.getCellStyle().getFont().getBold()); + + XSSFCell cell2 = row.getCell(2); + Assert.assertEquals("2020-01-01 01:01:01", DateUtils.format(cell2.getDateCellValue(), "yyyy-MM-dd HH:mm:ss")); + Assert.assertEquals("yyyy-MM-dd HH:mm:ss", cell2.getCellStyle().getDataFormatString()); + Assert.assertEquals("FF008000", cell2.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF003300", cell2.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertTrue(cell2.getCellStyle().getFont().getBold()); + + XSSFCell cell3 = row.getCell(3); + Assert.assertEquals("张三今年5岁了", cell3.getStringCellValue()); + Assert.assertEquals(0, cell3.getCellStyle().getDataFormat()); + Assert.assertEquals("FF0000FF", cell3.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF000080", cell3.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertTrue(cell3.getCellStyle().getFont().getBold()); + + XSSFCell cell4 = row.getCell(4); + Assert.assertEquals("{.name}忽略，张三", cell4.getStringCellValue()); + Assert.assertEquals(0, cell4.getCellStyle().getDataFormat()); + Assert.assertEquals("FFFFFF00", cell4.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF808000", cell4.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertTrue(cell4.getCellStyle().getFont().getBold()); + + XSSFCell cell5 = row.getCell(5); + Assert.assertEquals("空", cell5.getStringCellValue()); + Assert.assertEquals(0, cell5.getCellStyle().getDataFormat()); + Assert.assertEquals("FF008080", cell5.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF003366", cell5.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertTrue(cell5.getCellStyle().getFont().getBold()); + } + + + private void t12FillStyleHandler03check(HSSFWorkbook workbook, HSSFRow row) { + HSSFCell cell0 = row.getCell(0); + Assert.assertEquals("张三", cell0.getStringCellValue()); + Assert.assertEquals(49, cell0.getCellStyle().getDataFormat()); + Assert.assertEquals("FFFF:FFFF:0", cell0.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("8080:8080:0", cell0.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertTrue(cell0.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell1 = row.getCell(1); + Assert.assertEquals("5", cell1.getStringCellValue()); + Assert.assertEquals(0, cell1.getCellStyle().getDataFormat()); + Assert.assertEquals("FFFF:0:0", cell1.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("8080:0:0", cell1.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertTrue(cell1.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell2 = row.getCell(2); + Assert.assertEquals("2020-01-01 01:01:01", DateUtils.format(cell2.getDateCellValue(), "yyyy-MM-dd HH:mm:ss")); + Assert.assertEquals("yyyy-MM-dd HH:mm:ss", cell2.getCellStyle().getDataFormatString()); + Assert.assertEquals("0:8080:0", cell2.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("0:3333:0", cell2.getCellStyle().getFont(workbook).getHSSFColor(workbook).getHexString()); + Assert.assertTrue(cell2.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell3 = row.getCell(3); + Assert.assertEquals("张三今年5岁了", cell3.getStringCellValue()); + Assert.assertEquals(0, cell3.getCellStyle().getDataFormat()); + Assert.assertEquals("0:0:FFFF", cell3.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("0:0:8080", cell3.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertTrue(cell3.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell4 = row.getCell(4); + Assert.assertEquals("{.name}忽略，张三", cell4.getStringCellValue()); + Assert.assertEquals(0, cell4.getCellStyle().getDataFormat()); + Assert.assertEquals("FFFF:FFFF:0", cell4.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("8080:8080:0", cell4.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertTrue(cell4.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell5 = row.getCell(5); + Assert.assertEquals("空", cell5.getStringCellValue()); + Assert.assertEquals(0, cell5.getCellStyle().getDataFormat()); + Assert.assertEquals("0:8080:8080", cell5.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("0:3333:6666", cell5.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertTrue(cell5.getCellStyle().getFont(workbook).getBold()); + } + + private void fillStyleHandler(File file, File template) throws Exception { + EasyExcel.write(file, FillData.class).withTemplate(template).sheet() + .registerWriteHandler(new AbstractVerticalCellStyleStrategy() { + + @Override + protected WriteCellStyle contentCellStyle(CellWriteHandlerContext context) { + WriteCellStyle writeCellStyle = new WriteCellStyle(); + WriteFont writeFont = new WriteFont(); + writeCellStyle.setWriteFont(writeFont); + writeCellStyle.setFillPatternType(FillPatternType.SOLID_FOREGROUND); + writeFont.setBold(true); + if (context.getColumnIndex() == 0) { + writeCellStyle.setFillForegroundColor(IndexedColors.YELLOW.getIndex()); + writeFont.setColor(IndexedColors.DARK_YELLOW.getIndex()); + } + if (context.getColumnIndex() == 1) { + writeCellStyle.setFillForegroundColor(IndexedColors.RED.getIndex()); + writeFont.setColor(IndexedColors.DARK_RED.getIndex()); + } + if (context.getColumnIndex() == 2) { + writeCellStyle.setFillForegroundColor(IndexedColors.GREEN.getIndex()); + writeFont.setColor(IndexedColors.DARK_GREEN.getIndex()); + } + if (context.getColumnIndex() == 3) { + writeCellStyle.setFillForegroundColor(IndexedColors.BLUE.getIndex()); + writeFont.setColor(IndexedColors.DARK_BLUE.getIndex()); + } + if (context.getColumnIndex() == 4) { + writeCellStyle.setFillForegroundColor(IndexedColors.YELLOW.getIndex()); + writeFont.setColor(IndexedColors.DARK_YELLOW.getIndex()); + } + if (context.getColumnIndex() == 5) { + writeCellStyle.setFillForegroundColor(IndexedColors.TEAL.getIndex()); + writeFont.setColor(IndexedColors.DARK_TEAL.getIndex()); + } + return writeCellStyle; + } + + @Override + protected WriteCellStyle headCellStyle(Head head) { + return null; + } + + }) + .doFill(data()); + } + + private List data() throws Exception { + List list = ListUtils.newArrayList(); + for (int i = 0; i < 10; i++) { + FillStyleAnnotatedData fillData = new FillStyleAnnotatedData(); + list.add(fillData); + fillData.setName("张三"); + fillData.setNumber(5.2); + fillData.setDate(DateUtils.parseDate("2020-01-01 01:01:01")); + if (i == 5) { + fillData.setName(null); + } + } + return list; + } + +} diff --git a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java new file mode 100644 index 00000000..98c29fb2 --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java @@ -0,0 +1,16 @@ +package com.alibaba.easyexcel.test.core.fill.style; + +import java.util.Date; + +import lombok.Data; + +/** + * @author Jiaju Zhuang + */ +@Data +public class FillStyleData { + private String name; + private Double number; + private Date date; + private String empty; +} diff --git a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java new file mode 100644 index 00000000..e8af2e34 --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java @@ -0,0 +1,346 @@ +package com.alibaba.easyexcel.test.core.fill.style; + +import java.io.File; +import java.io.FileInputStream; +import java.util.List; + +import com.alibaba.easyexcel.test.core.fill.FillData; +import com.alibaba.easyexcel.test.util.TestFileUtil; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.metadata.Head; +import com.alibaba.excel.util.DateUtils; +import com.alibaba.excel.util.ListUtils; +import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; +import com.alibaba.excel.write.metadata.style.WriteCellStyle; +import com.alibaba.excel.write.metadata.style.WriteFont; +import com.alibaba.excel.write.style.AbstractVerticalCellStyleStrategy; + +import org.apache.poi.hssf.usermodel.HSSFCell; +import org.apache.poi.hssf.usermodel.HSSFRow; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.FillPatternType; +import org.apache.poi.ss.usermodel.IndexedColors; +import org.apache.poi.xssf.usermodel.XSSFCell; +import org.apache.poi.xssf.usermodel.XSSFRow; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + +/** + * @author Jiaju Zhuang + */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +public class FillStyleDataTest { + + private static File fileStyle07; + private static File fileStyle03; + private static File fileStyleHandler07; + private static File fileStyleHandler03; + private static File fileStyleTemplate07; + private static File fileStyleTemplate03; + + @BeforeClass + public static void init() { + fileStyle07 = TestFileUtil.createNewFile("fileStyle07.xlsx"); + fileStyle03 = TestFileUtil.createNewFile("fileStyle03.xls"); + fileStyleHandler07 = TestFileUtil.createNewFile("fileStyleHandler07.xlsx"); + fileStyleHandler03 = TestFileUtil.createNewFile("fileStyleHandler03.xls"); + fileStyleTemplate07 = TestFileUtil.readFile("fill" + File.separator + "style.xlsx"); + fileStyleTemplate03 = TestFileUtil.readFile("fill" + File.separator + "style.xls"); + } + + @Test + public void t01Fill07() throws Exception { + fill(fileStyle07, fileStyleTemplate07); + XSSFWorkbook workbook = new XSSFWorkbook(new FileInputStream(fileStyle07)); + XSSFSheet sheet = workbook.getSheetAt(0); + t01Fill07check(sheet.getRow(1)); + t01Fill07check(sheet.getRow(2)); + } + + private void t01Fill07check(XSSFRow row) { + XSSFCell cell0 = row.getCell(0); + Assert.assertEquals("张三", cell0.getStringCellValue()); + Assert.assertEquals(49, cell0.getCellStyle().getDataFormat()); + Assert.assertEquals("FF00B050", cell0.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF7030A0", cell0.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertTrue(cell0.getCellStyle().getFont().getBold()); + + XSSFCell cell1 = row.getCell(1); + Assert.assertEquals("5", cell1.getStringCellValue()); + Assert.assertEquals(0, cell1.getCellStyle().getDataFormat()); + Assert.assertEquals("FF92D050", cell1.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF4BACC6", cell1.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertFalse(cell1.getCellStyle().getFont().getBold()); + + XSSFCell cell2 = row.getCell(2); + Assert.assertEquals("2020-01-01 01:01:01", DateUtils.format(cell2.getDateCellValue(), "yyyy-MM-dd HH:mm:ss")); + Assert.assertEquals("yyyy-MM-dd HH:mm:ss", cell2.getCellStyle().getDataFormatString()); + Assert.assertEquals("FFFFC000", cell2.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FFC0504D", cell2.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertTrue(cell2.getCellStyle().getFont().getBold()); + + XSSFCell cell3 = row.getCell(3); + Assert.assertEquals("张三今年5岁了", cell3.getStringCellValue()); + Assert.assertEquals(0, cell3.getCellStyle().getDataFormat()); + Assert.assertEquals("FFFF0000", cell3.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FFEEECE1", cell3.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertTrue(cell3.getCellStyle().getFont().getBold()); + + XSSFCell cell4 = row.getCell(4); + Assert.assertEquals("{.name}忽略，张三", cell4.getStringCellValue()); + Assert.assertEquals(0, cell4.getCellStyle().getDataFormat()); + Assert.assertEquals("FFC00000", cell4.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF000000", cell4.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertFalse(cell4.getCellStyle().getFont().getBold()); + + XSSFCell cell5 = row.getCell(5); + Assert.assertEquals("空", cell5.getStringCellValue()); + Assert.assertEquals(0, cell5.getCellStyle().getDataFormat()); + Assert.assertEquals("FFF79646", cell5.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF8064A2", cell5.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertFalse(cell5.getCellStyle().getFont().getBold()); + } + + @Test + public void t02Fill03() throws Exception { + fill(fileStyle03, fileStyleTemplate03); + HSSFWorkbook workbook = new HSSFWorkbook(new FileInputStream(fileStyle03)); + HSSFSheet sheet = workbook.getSheetAt(0); + t02Fill03check(workbook, sheet.getRow(1)); + t02Fill03check(workbook, sheet.getRow(2)); + } + + private void t02Fill03check(HSSFWorkbook workbook, HSSFRow row) { + HSSFCell cell0 = row.getCell(0); + Assert.assertEquals("张三", cell0.getStringCellValue()); + Assert.assertEquals(49, cell0.getCellStyle().getDataFormat()); + Assert.assertEquals("0:8080:0", cell0.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("8080:0:8080", cell0.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertTrue(cell0.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell1 = row.getCell(1); + Assert.assertEquals("5", cell1.getStringCellValue()); + Assert.assertEquals(0, cell1.getCellStyle().getDataFormat()); + Assert.assertEquals("9999:CCCC:0", cell1.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("0:8080:8080", cell1.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertFalse(cell1.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell2 = row.getCell(2); + Assert.assertEquals("2020-01-01 01:01:01", DateUtils.format(cell2.getDateCellValue(), "yyyy-MM-dd HH:mm:ss")); + Assert.assertEquals("yyyy-MM-dd HH:mm:ss", cell2.getCellStyle().getDataFormatString()); + Assert.assertEquals("FFFF:CCCC:0", cell2.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("8080:0:0", cell2.getCellStyle().getFont(workbook).getHSSFColor(workbook).getHexString()); + Assert.assertTrue(cell2.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell3 = row.getCell(3); + Assert.assertEquals("张三今年5岁了", cell3.getStringCellValue()); + Assert.assertEquals(0, cell3.getCellStyle().getDataFormat()); + Assert.assertEquals("FFFF:0:0", cell3.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("FFFF:FFFF:9999", cell3.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertTrue(cell3.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell4 = row.getCell(4); + Assert.assertEquals("{.name}忽略，张三", cell4.getStringCellValue()); + Assert.assertEquals(0, cell4.getCellStyle().getDataFormat()); + Assert.assertEquals("9999:3333:0", cell4.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("3333:3333:3333", cell4.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertFalse(cell4.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell5 = row.getCell(5); + Assert.assertEquals("空", cell5.getStringCellValue()); + Assert.assertEquals(0, cell5.getCellStyle().getDataFormat()); + Assert.assertEquals("9999:3333:0", cell5.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("CCCC:9999:FFFF", cell5.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertFalse(cell5.getCellStyle().getFont(workbook).getBold()); + } + + private void fill(File file, File template) throws Exception { + EasyExcel.write(file, FillData.class).withTemplate(template).sheet().doFill(data()); + } + + @Test + public void t11FillStyleHandler07() throws Exception { + fillStyleHandler(fileStyleHandler07, fileStyleTemplate07); + XSSFWorkbook workbook = new XSSFWorkbook(new FileInputStream(fileStyleHandler07)); + XSSFSheet sheet = workbook.getSheetAt(0); + t11FillStyleHandler07check(sheet.getRow(1)); + t11FillStyleHandler07check(sheet.getRow(2)); + } + + private void t11FillStyleHandler07check(XSSFRow row) { + XSSFCell cell0 = row.getCell(0); + Assert.assertEquals("张三", cell0.getStringCellValue()); + Assert.assertEquals(49, cell0.getCellStyle().getDataFormat()); + Assert.assertEquals("FFFFFF00", cell0.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF808000", cell0.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertTrue(cell0.getCellStyle().getFont().getBold()); + + XSSFCell cell1 = row.getCell(1); + Assert.assertEquals("5", cell1.getStringCellValue()); + Assert.assertEquals(0, cell1.getCellStyle().getDataFormat()); + Assert.assertEquals("FFFF0000", cell1.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF800000", cell1.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertTrue(cell1.getCellStyle().getFont().getBold()); + + XSSFCell cell2 = row.getCell(2); + Assert.assertEquals("2020-01-01 01:01:01", DateUtils.format(cell2.getDateCellValue(), "yyyy-MM-dd HH:mm:ss")); + Assert.assertEquals("yyyy-MM-dd HH:mm:ss", cell2.getCellStyle().getDataFormatString()); + Assert.assertEquals("FF008000", cell2.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF003300", cell2.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertTrue(cell2.getCellStyle().getFont().getBold()); + + XSSFCell cell3 = row.getCell(3); + Assert.assertEquals("张三今年5岁了", cell3.getStringCellValue()); + Assert.assertEquals(0, cell3.getCellStyle().getDataFormat()); + Assert.assertEquals("FF0000FF", cell3.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF000080", cell3.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertTrue(cell3.getCellStyle().getFont().getBold()); + + XSSFCell cell4 = row.getCell(4); + Assert.assertEquals("{.name}忽略，张三", cell4.getStringCellValue()); + Assert.assertEquals(0, cell4.getCellStyle().getDataFormat()); + Assert.assertEquals("FFFFFF00", cell4.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF808000", cell4.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertTrue(cell4.getCellStyle().getFont().getBold()); + + XSSFCell cell5 = row.getCell(5); + Assert.assertEquals("空", cell5.getStringCellValue()); + Assert.assertEquals(0, cell5.getCellStyle().getDataFormat()); + Assert.assertEquals("FF008080", cell5.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF003366", cell5.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertTrue(cell5.getCellStyle().getFont().getBold()); + } + + + @Test + public void t12FillStyleHandler03() throws Exception { + fillStyleHandler(fileStyleHandler03, fileStyleTemplate03); + HSSFWorkbook workbook = new HSSFWorkbook(new FileInputStream(fileStyleHandler03)); + HSSFSheet sheet = workbook.getSheetAt(0); + t12FillStyleHandler03check(workbook, sheet.getRow(1)); + t12FillStyleHandler03check(workbook, sheet.getRow(2)); + } + + private void t12FillStyleHandler03check(HSSFWorkbook workbook, HSSFRow row) { + HSSFCell cell0 = row.getCell(0); + Assert.assertEquals("张三", cell0.getStringCellValue()); + Assert.assertEquals(49, cell0.getCellStyle().getDataFormat()); + Assert.assertEquals("FFFF:FFFF:0", cell0.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("8080:8080:0", cell0.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertTrue(cell0.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell1 = row.getCell(1); + Assert.assertEquals("5", cell1.getStringCellValue()); + Assert.assertEquals(0, cell1.getCellStyle().getDataFormat()); + Assert.assertEquals("FFFF:0:0", cell1.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("8080:0:0", cell1.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertTrue(cell1.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell2 = row.getCell(2); + Assert.assertEquals("2020-01-01 01:01:01", DateUtils.format(cell2.getDateCellValue(), "yyyy-MM-dd HH:mm:ss")); + Assert.assertEquals("yyyy-MM-dd HH:mm:ss", cell2.getCellStyle().getDataFormatString()); + Assert.assertEquals("0:8080:0", cell2.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("0:3333:0", cell2.getCellStyle().getFont(workbook).getHSSFColor(workbook).getHexString()); + Assert.assertTrue(cell2.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell3 = row.getCell(3); + Assert.assertEquals("张三今年5岁了", cell3.getStringCellValue()); + Assert.assertEquals(0, cell3.getCellStyle().getDataFormat()); + Assert.assertEquals("0:0:FFFF", cell3.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("0:0:8080", cell3.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertTrue(cell3.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell4 = row.getCell(4); + Assert.assertEquals("{.name}忽略，张三", cell4.getStringCellValue()); + Assert.assertEquals(0, cell4.getCellStyle().getDataFormat()); + Assert.assertEquals("FFFF:FFFF:0", cell4.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("8080:8080:0", cell4.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertTrue(cell4.getCellStyle().getFont(workbook).getBold()); + + HSSFCell cell5 = row.getCell(5); + Assert.assertEquals("空", cell5.getStringCellValue()); + Assert.assertEquals(0, cell5.getCellStyle().getDataFormat()); + Assert.assertEquals("0:8080:8080", cell5.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("0:3333:6666", cell5.getCellStyle().getFont(workbook).getHSSFColor(workbook) + .getHexString()); + Assert.assertTrue(cell5.getCellStyle().getFont(workbook).getBold()); + } + + private void fillStyleHandler(File file, File template) throws Exception { + EasyExcel.write(file, FillData.class).withTemplate(template).sheet() + .registerWriteHandler(new AbstractVerticalCellStyleStrategy() { + + @Override + protected WriteCellStyle contentCellStyle(CellWriteHandlerContext context) { + WriteCellStyle writeCellStyle = new WriteCellStyle(); + WriteFont writeFont = new WriteFont(); + writeCellStyle.setWriteFont(writeFont); + writeCellStyle.setFillPatternType(FillPatternType.SOLID_FOREGROUND); + writeFont.setBold(true); + if (context.getColumnIndex() == 0) { + writeCellStyle.setFillForegroundColor(IndexedColors.YELLOW.getIndex()); + writeFont.setColor(IndexedColors.DARK_YELLOW.getIndex()); + } + if (context.getColumnIndex() == 1) { + writeCellStyle.setFillForegroundColor(IndexedColors.RED.getIndex()); + writeFont.setColor(IndexedColors.DARK_RED.getIndex()); + } + if (context.getColumnIndex() == 2) { + writeCellStyle.setFillForegroundColor(IndexedColors.GREEN.getIndex()); + writeFont.setColor(IndexedColors.DARK_GREEN.getIndex()); + } + if (context.getColumnIndex() == 3) { + writeCellStyle.setFillForegroundColor(IndexedColors.BLUE.getIndex()); + writeFont.setColor(IndexedColors.DARK_BLUE.getIndex()); + } + if (context.getColumnIndex() == 4) { + writeCellStyle.setFillForegroundColor(IndexedColors.YELLOW.getIndex()); + writeFont.setColor(IndexedColors.DARK_YELLOW.getIndex()); + } + if (context.getColumnIndex() == 5) { + writeCellStyle.setFillForegroundColor(IndexedColors.TEAL.getIndex()); + writeFont.setColor(IndexedColors.DARK_TEAL.getIndex()); + } + return writeCellStyle; + } + + @Override + protected WriteCellStyle headCellStyle(Head head) { + return null; + } + + }) + .doFill(data()); + } + + private List data() throws Exception { + List list = ListUtils.newArrayList(); + for (int i = 0; i < 10; i++) { + FillStyleData fillData = new FillStyleData(); + list.add(fillData); + fillData.setName("张三"); + fillData.setNumber(5.2); + fillData.setDate(DateUtils.parseDate("2020-01-01 01:01:01")); + if (i == 5) { + fillData.setName(null); + } + } + return list; + } + +} diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiWriteTest.java b/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiWriteTest.java index fa417049..59330bbd 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiWriteTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiWriteTest.java @@ -1,10 +1,15 @@ package com.alibaba.easyexcel.test.temp.poi; +import java.io.BufferedInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.math.BigDecimal; +import java.net.URL; import java.util.regex.Pattern; +import com.alibaba.fastjson.JSON; + import org.apache.poi.xssf.streaming.SXSSFCell; import org.apache.poi.xssf.streaming.SXSSFRow; import org.apache.poi.xssf.streaming.SXSSFSheet; @@ -14,8 +19,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.alibaba.fastjson.JSON; - /** * 测试poi * @@ -104,4 +107,14 @@ public class PoiWriteTest { } + @Test + public void part4() throws IOException { + //URL url=new URL("http://120.55.161.4/group1/M00/00/00/i8QJ8WFfwMiAXKYrAAACqC1MFiY641.png"); + URL url=new URL("https://img-blog.csdn.net/20160729002743309?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQv/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/Center"); + + InputStream in = new BufferedInputStream(url.openStream()); + + + } + } diff --git a/src/test/resources/fill/simple.csv b/src/test/resources/fill/simple.csv new file mode 100644 index 00000000..a5153481 --- /dev/null +++ b/src/test/resources/fill/simple.csv @@ -0,0 +1,2 @@ +姓名,数字,复杂,忽略,空 +{name},{number},{name}今年{number}岁了,\{name\}忽略，{name},空{.empty} \ No newline at end of file diff --git a/src/test/resources/fill/style.xls b/src/test/resources/fill/style.xls new file mode 100644 index 0000000000000000000000000000000000000000..9e7ca73971419c9ef6aba3643a8b5fbc236ff734 GIT binary patch literal 27648 zcmeHQ30O_r+h6B&s?#J5(m)-ll+v6cDMJ)x9QI;CGh*Q-s`y7(vF7CWM41j7m;QNs3Js^^T2A7$p`BOc5uG{zIWNB||h1WvBqd z3*c!H9?&#MK3t861tpy^bv2=`JE^hhWP~F{h;Z_+BiOdF1-T;~gCc>8D{+E<(bhfkmpB<#$p*5C}Y}|I1>*RQ>MO@FH@Of&8}$)+J{*(!j5TVgk#-3 zs?3I%6H9h(ow`^>L@=pYNsG{or5F@jYk@t0h!o1mBT)tafboFgy#!`=X{ZpX>8Ol< zzaDrne@X+N#>eG@(mzh?7zAr6{VUUVsGx6EK`&N8&r?C)se-;;1%0&&`dk%sRr099 zFI9oFMg_g0@@!Cnvs(rI7m98Gb1Kzef79K?*hwQuQuKH7bVG)Ine>5M8>T#30#%-- z>oIgA8C?XoP@T3DDO~~IgefnzAKFfgmFTpcz}(L8jV7d{R2~DE6uH`E05dZe9o7(< zzQo9Ax!!U;B3MT0$3jYvjXi90*oFx9QFNHH=<*8k!)(V%H)rUVNfg{dFF!OTB zV*rZ)7u}S>k?Lm~C65_H2l;6^Y58Gprg5b0qQ?a+cQjp!^DBj;OrN8IzF!5MwnJqc z+76ZJdng zf}ny%-H78=V86?aH~|br95T7*`$*`Wxk!{QR0Qe70`W3Y8nz5b1srfygLGzrRE43* zDoLV2cok@AszJK2KzJ26vXnruIg*O{B?8FoQuST!SpkxuF$Y8d|}&p%q%nRlxa|tvQ~u`Po4c#)k1uz5-uZx18X_tlDzy zzXwDTSU-rv_kehM$%80%dMf~t^`TO8l-m!-HZED9~ovUZ~Im&_L6D@8K z$%*9mbpq>hW3wvJqPfa6{V=CND9K(09&;T zGdAt})vY)%-9Zd`V4__?U&-5maw`I$7;QAz3YF`kL{g>HijtBNC8J@}m{uSSu&KZp z4V$LCWp;zIvR0rS$f-76I8b3cwuTA<)thqEJ2sC!siEE(8Z#c1=Ph5TC7ZV)q1?#~ zi0XM858N^kP919yaV%RpWl8YV_)UwkF#mQfB^!UkvK!RH*xU*5M6Lczk zQxb7({UGQG_$EkISp6V)%>5>ar&s+T?c_ip!L1WK7OB<=I!?YRi8!`?5cFPr6QnAv zeh};L0rB*z9|RoTEJ+~2trOfvtJVoRnZDT^acun{=o$JZ2)&_KEs4$dfOvYh1Cxt`W_HZulhkc$bmqDTPO9Os?d4%&E|+> z>jyzk;Wt65!s-WU@jW1(UTl!Xd<*cK=@OnNaVPdfMA|?M`Z0OB2wYXU!tM|Ov@Y-j z))HNKWTjjZh364{qAd`|-g@*#qKWso+`u-#9-ULj$B3JcCkG!}PCj_xtK*|7j(vOU zCO02rZa!Wdd>lCW;5o65kCr(0*_%7ud`!6ccysV+&B=#85Kwy47RNrg`<$DPDK{S< z4nD4&d~kbS*B+rb_QuPWRS&rNH09>QWp6Dx`LOM+D(q3&K5jnd+9w@9nww8^Za!T0X2;2gZEv1lHC{@vTg*3rca;QmU3#4kP^jNnBB1JHF50dl249;r zg2kGU-qQ|2BM{MEhKLrch-f55q^(p1q9kzBVO%Z|(LsiYwyB6{EJdX4Q3WDB;P@0` zD;XkMp_@XhO{9oudCHoDU5GYugpCUC7M8xrLes#N`Tcb4_WAy72fu zz)zOXSP;|Ly52Vc{lc)1o!esojiN9B_uhv_6yn%63|ac+mC0423Ur*Jd~ye2-Ky2cyFzKOO|0v(T2P-w4kJ&LP;%& zwzQ7TJHj0H$U*lxV@LVmW0#H`AH-R_@Kax9du#$Yn8UUK zwmo7;D%pU{9x)qVN2GN^r`R^YgLdn{zJlT}=HPEi@fXYSmw*SKX$QLb<@h&zJQxsP zv>n;e&R<@ag67awOfI8O*$M&2Ip{v=SitGsPlksJh9X`IDIR-U18=nS38&hngx5}n zhs%W`p1l;0y?r4huY4#sUV9lHE*6S-PEtJfHieLknDyLv{xUpVIu!BRNb%U)5kh)y zKhBNUL57E05Jfx>DIR;Ty`oQCX3lhqF=sl(m@}PPARIy#usGxZA0zlT0G6teB$0?of09ZjQFq~xiXjPP z0vQ9YgFbLKkt9K`tV9^l;z&HuJYbMSQE!}Q!C*RxPY8$>=^rl^r+Oe|R}hQhiIlX? zEQ;4Ep*dN_l8asd>4yu2@HT%TD-Y|8T+w1w|sc1$lbM@GvYoq!~P6GJ)S=U6RJ8ipQo#4wy7f zoHE=sZA{|!MQ3^)b#EM88}iSLhi!V~mjnszpH4rq;KceV6(?8PnVq^;vT5Mw+OUfQ zI&T)4CAwVqs$Jt>lYGcVd(Y7o`I~y|eB0UC?wM8h;YD|Sdtcu%D0`Zvd57pC!xiri z{Cd#QcUDGd_NsnGlOK(X3o8j&kdthav*F?=KmHk?i4GZGG8&zo(D#=4v+PBFHK)2% zKh)T}tND$v#<9) z*sr*A%!N~pFZKw&={?eJ>ZV2GBdcvztg-l`ZP=yvX8o#tqly=9J|!tV>Rz>`cjeTb zE)RnRV||x|B|I2eu-UDq|Dl}C;;omh&+jSwc=Zc3MY*A)CoMCZ0S%l35g#@ z-B{P~=&{jp;$*ZC{i<-?qoT$^_tFb~%(?D6s@ySnWXYN0@(-j-zGbHq>n^UnS^cnP zhVQw%rdRTM8Vq&G*EX0VKI=Mr-|HzZo2)k92x<14OX9r~O&&c>Ge7mqe3QGOCsX>S zx4e>*wPVk1(bYZ9S6aMsxjkaP-M<3nb|3uYQmxbd;AhSbx_m!w;WsSIO)P-t8O7iO z#?inMn{I*!iv4`(-6SiYW>dT0pStU1`sj-e!~3^cy~=xN^s_-e*Uww8o}2Rcw;wxR z?^S*<{AP`v-Las_ojMOc5zH8S#4*dG=?Y8cRZ>5u|ce))fJetvW`v&XRE1x7ZIyN+Z*U|9< zTRs@DcV*D$6+Qt`z7Mq1le^>^;MD0WBrpfO@^J<;csH51GG z?YtZ@W!l%%`Bn1=Z5x=hp=8KQTQgU(T?UfUTnOaa&mU*i++DwR#dlknlf{G{K>+erRHyjw3)L< zc=yqIJz@|uQ7bLaD&i^*nVYy2Etr@VjPYU-5nO}~77aAvS!p!10{ zwqL7XS$B|pyp$}8IUlyZ>Ds`rFP_#kUD)yGk7th>|GlwdhV8-LEp0FOBxig`6CAKO zT9&(bn&0g?KhNG$%AXZfo|)P`tI_Klrlp<{bIXpGJFQDw!gK3A*1zOKXOF(WWd60( zJvqZaztpU0kyhFINljdCtv%MMU5ba({SWSU+-hzg-(7R#oZYmoD>aKoeV!Q7%;QIk z1x*@-gqdDUnGzO~J#nAogy#pkq*vP8IHk^AZ?>_>;pwGmCLyIT0q_rpok`Ui?7#Q= z{_G#}mnIwv{xICmP7rH4MWCAI2Y>qjh-Bz#$GXNv;2}EpFK)t-WYo z;klfUp?e=4AnAI&4o@!_vGhRttnijiolKiAzi@C)J2%^Xf0s4C@91>&Lwqx{-8LsZ zG99~>M=Y)Uu`I8}CyReFYO-Gb8k$}6vPQ4cz|zn5EWhjTVO_J`+)Q2`OG-N3ZN-Y# z8uquhTsE37*_!C3JK<(>+Tgu;cN`K&icgiMZy4fsZ|bDXsAsNCoqZ#VC!ahKddaG?uf@;Zbkc_Z8EafhidRpuPrPQ6SLJXf?oMLN zoc*DFvThoVu5FjKx_ypt%idl3W8znA@fHl(-frl}<!E$xjoTWa(nN!1b zcNISS!PC+xvdQY<<`?#sE=+KGXcFAjt(o;YUf%2g{g>4Rx}Ws7WLg>aH+rWL@q5DP zJg0qrn?eU4H1+cHUoh18{x7%wG(GEi{YZGH(_;7Dns0*k^}9YldDGzEHvD6;rJsI{ zWM%800;f68URv-W!*KaAe#_NP;S2SeBya8<8uFz$<9OxeMzhVz?q?+kTbFHZdw2Tt zXGwV}%Vvg-_6yw_U@7Vp9oVlx6w~x{ZuYOEW)Hk{=uB>mQwx*6n&ZVIf3wa>Kl15- zR`H*QZg**sd0>k}f`xlo;hV=DH(7WKQy2HI^4*mCaPrQx(+-#awfmHQkNp#_d3&$? zl4A7Nhp4^VZoH43w71r*$pw?rw%eA8HQk*PHRpT3xZ5YQ|JXfyN1jbM81Z|ihTFN( z`ZFeVSyB;fd{Gi5DLfK)EOYmrKA)!;{>yoKZPQienFd|ox4W4p8ZLVA2eEABA3q~> zammK;VXemONi6MH)64hqd!BkF>n05NzsF*to%)TU*&~iuWv*hS>jzO*tu0O)A~T%TatS>*}JFjS8#_ZugC@$ za@OvJ#moxU>sAVj8odpnmO0kCT(>O=*FEBHnpr#jM`2RZr2~x@IozIoe#d2v%m+RO zZ3FH4K7V0Q>>_lX75(eVg!1L9PnnGJyyFqS)l%60>C*A5D#w&PUl7#KtXKAR|Cn7- z(-$Q9zGxD+sHbDNgIzyISC19Rjav0soPU1KfR7o)euWDMJ+Lj@*y&{X`HFeI) z@uvJ{cW7ke$ybQQvOcRMrC7>q>;WfNO)?x>zY$-KCwXw1%VQlDAcM>U z+B_Bw%VA;qJMPAE-*M~lO);Aa&>ryP!S}gA1YYEVQy!e%_;6-5r0$L2O5ho}ko>dd z&BgGMeF7sXIyzzre3ygQ=@cb{I;KDpf;~982r=hPgPck@!r)iRgv_8yXHr)OC>=|M zM}hd!D0A;9MR^kF#JUeB)u?ZoHzF%X9UYm7+4SO6cM>Oc-0P~jgR@`muesBkHe z`Q?#(p#wxHt|D|m_X-sT0){Re_V6SOK?h&ZCsZ2IGxShDbXo%*F%TnJS^($j3{zPe z-e7{ye(Cyzk6#9$cM=13t&orBU%WTRWtEE7!mx3DDYE{M`Qo#K-&l*Z|l2I)#kL8ksC^!OO~D`1k#9`)QuZ4J6ei3COPwp%2YmRn*pO&wQ9|*cNpPpJ5|yO$ zib|m?Ax_v7A_IadGEJ=7g{tAz}Ps;jSTT#u!wN4$>8c=IMtpT+L z)EZE0K&=6_2Gkl*Ye205wFcB0P-{S01FFvdcwXmUIeR7F)vEF0<#7IY`B)4tSfZ&w z6M!S20_f-mK%YPeMEq{J4@7(&X9z^}&PG8*UqC!Wd;w$}MD!7)K}4TH0Yt_}K%e6q zQ}uzY^4A)Gu`Ir2NxwfQyY-aadJ%mnh~Vg4z{2}CRM+l)LDj|jF%W507Ye205wFcB0P-{S~0ksCy8c=IMtpT+L)EfBT)c~G#@obCdUjamXvkaf_<1rb} z^!OegzF&xEc|51%nH}G4!}r|qTyF#spZ(+6n0W&b&-ds9z~}trTt!RPwT zA>u*V2BHXJ3y8K5@&6FAgI{}y4iH;GbcE;xu{A`@cY$C0gNOL10o@?FL-c@%-(F(= z7l`<)4&SeVe(;?leyJ#ew*$w*Z!&z**pOgGG^zLVkR#fWNQhV3Cj>v;sD#1=`-mY8 z2JXpZG<>0la!`LZg30=>U-%z@r2J8a@2Uiag3y@-K@+~w#4iNLz?XyA_E6A5EF}|C zQsJx3B%r7cj=&$s5RRYk<=+zFaPUCTgm*2I$S6t%G1UVNlgIDB(SB!ST*v>v0FDxi Ay#N3J literal 0 HcmV?d00001 diff --git a/src/test/resources/fill/style.xlsx b/src/test/resources/fill/style.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..234c3b30852827f436ef2d7157903f8b69f8cda4 GIT binary patch literal 11114 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 Jf#Jum{{ex!y0!oS literal 0 HcmV?d00001 diff --git a/update.md b/update.md index c1a7efd8..ca31cb5b 100644 --- a/update.md +++ b/update.md @@ -1,6 +1,7 @@ # 3.0.1 * 升级到正式版 * 修复填充样式可能丢失的问题 [Issue #2124](https://github.com/alibaba/easyexcel/issues/2124) +* 修复填充数据为空 可能NPE的bug # 3.0.0-beta3 From 25537211893d77ca2944e12317a925ec4bd700a8 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Wed, 20 Oct 2021 23:07:50 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=A1=AB=E5=85=85?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/annotation/ExcelProperty.java | 2 +- .../excel/context/WriteContextImpl.java | 14 +- .../java/com/alibaba/excel/metadata/Head.java | 18 +- .../excel/metadata/data/WriteCellData.java | 7 + .../property/ExcelContentProperty.java | 21 +- .../metadata/property/ExcelHeadProperty.java | 48 +--- .../listener/ModelBuildEventListener.java | 19 +- .../DefaultAnalysisEventProcessor.java | 7 - .../com/alibaba/excel/util/ClassUtils.java | 212 +++++++++++++++--- .../alibaba/excel/util/WriteHandlerUtils.java | 23 +- .../executor/AbstractExcelWriteExecutor.java | 3 +- .../write/executor/ExcelWriteAddExecutor.java | 49 ++-- .../executor/ExcelWriteFillExecutor.java | 37 +-- .../context/CellWriteHandlerContext.java | 5 + .../impl/FillStyleCellWriteHandler.java | 7 +- .../metadata/holder/AbstractWriteHolder.java | 21 +- .../property/ExcelWriteHeadProperty.java | 73 ++---- .../fill/style/FillStyleAnnotatedData.java | 2 +- .../fill/style/FillStyleAnnotatedTest.java | 36 +-- .../core/fill/style/FillStyleDataTest.java | 51 +++-- src/test/resources/fill/style.xls | Bin 27648 -> 27648 bytes src/test/resources/fill/style.xlsx | Bin 11114 -> 11122 bytes update.md | 1 + 23 files changed, 383 insertions(+), 273 deletions(-) diff --git a/src/main/java/com/alibaba/excel/annotation/ExcelProperty.java b/src/main/java/com/alibaba/excel/annotation/ExcelProperty.java index e763ab37..db539266 100644 --- a/src/main/java/com/alibaba/excel/annotation/ExcelProperty.java +++ b/src/main/java/com/alibaba/excel/annotation/ExcelProperty.java @@ -54,7 +54,7 @@ public @interface ExcelProperty { * * @return Converter */ - Class converter() default AutoConverter.class; + Class> converter() default AutoConverter.class; /** * diff --git a/src/main/java/com/alibaba/excel/context/WriteContextImpl.java b/src/main/java/com/alibaba/excel/context/WriteContextImpl.java index 2c66b535..f31705f7 100644 --- a/src/main/java/com/alibaba/excel/context/WriteContextImpl.java +++ b/src/main/java/com/alibaba/excel/context/WriteContextImpl.java @@ -10,7 +10,9 @@ import com.alibaba.excel.enums.WriteTypeEnum; import com.alibaba.excel.exception.ExcelGenerateException; import com.alibaba.excel.metadata.Head; import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.alibaba.excel.support.ExcelTypeEnum; +import com.alibaba.excel.util.ClassUtils; import com.alibaba.excel.util.DateUtils; import com.alibaba.excel.util.FileUtils; import com.alibaba.excel.util.NumberDataFormatterUtils; @@ -244,17 +246,21 @@ public class WriteContextImpl implements WriteContext { for (Map.Entry entry : headMap.entrySet()) { Head head = entry.getValue(); int columnIndex = entry.getKey(); - WriteHandlerUtils.beforeCellCreate(this, row, head, columnIndex, relativeRowIndex, Boolean.TRUE); + ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(null, + currentWriteHolder.excelWriteHeadProperty().getHeadClazz(), head.getFieldName()); + + WriteHandlerUtils.beforeCellCreate(this, row, head, columnIndex, relativeRowIndex, Boolean.TRUE, + excelContentProperty); Cell cell = row.createCell(columnIndex); - WriteHandlerUtils.afterCellCreate(this, cell, head, relativeRowIndex, Boolean.TRUE); + WriteHandlerUtils.afterCellCreate(this, cell, head, relativeRowIndex, Boolean.TRUE, excelContentProperty); WriteCellData writeCellData = new WriteCellData<>(head.getHeadNameList().get(relativeRowIndex)); cell.setCellValue(writeCellData.getStringValue()); - WriteHandlerUtils.afterCellDispose(this, writeCellData, cell, head, relativeRowIndex, - Boolean.TRUE); + WriteHandlerUtils.afterCellDispose(this, writeCellData, cell, head, relativeRowIndex, Boolean.TRUE, + excelContentProperty); } } diff --git a/src/main/java/com/alibaba/excel/metadata/Head.java b/src/main/java/com/alibaba/excel/metadata/Head.java index 2f98a14b..7e1fd47b 100644 --- a/src/main/java/com/alibaba/excel/metadata/Head.java +++ b/src/main/java/com/alibaba/excel/metadata/Head.java @@ -1,5 +1,6 @@ package com.alibaba.excel.metadata; +import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; @@ -22,6 +23,10 @@ public class Head { * Column index of head */ private Integer columnIndex; + /** + * It only has values when passed in {@link Sheet#setClazz(Class)} and {@link Table#setClazz(Class)} + */ + private Field field; /** * It only has values when passed in {@link Sheet#setClazz(Class)} and {@link Table#setClazz(Class)} */ @@ -38,10 +43,12 @@ public class Head { * Whether to specify a name */ private Boolean forceName; + /** * column with */ private ColumnWidthProperty columnWidthProperty; + /** * Loop merge */ @@ -50,22 +57,15 @@ public class Head { * Head style */ private StyleProperty headStyleProperty; - /** - * Content style - */ - private StyleProperty contentStyleProperty; /** * Head font */ private FontProperty headFontProperty; - /** - * Content font - */ - private FontProperty contentFontProperty; - public Head(Integer columnIndex, String fieldName, List headNameList, Boolean forceIndex, + public Head(Integer columnIndex, Field field, String fieldName, List headNameList, Boolean forceIndex, Boolean forceName) { this.columnIndex = columnIndex; + this.field = field; this.fieldName = fieldName; if (headNameList == null) { this.headNameList = new ArrayList<>(); diff --git a/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java b/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java index cf60f58e..5a3487bf 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java @@ -8,6 +8,7 @@ import java.util.List; import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.util.ListUtils; +import com.alibaba.excel.write.metadata.fill.AnalysisCell; import com.alibaba.excel.write.metadata.style.WriteCellStyle; import lombok.Data; @@ -43,6 +44,7 @@ public class WriteCellData extends CellData { * hyper link */ private HyperlinkData hyperlinkData; + /** * style */ @@ -54,6 +56,11 @@ public class WriteCellData extends CellData { */ private CellStyle originCellStyle; + /** + * Only in the case of the fill is not null + */ + private AnalysisCell analysisCell; + public WriteCellData(String stringValue) { this(CellDataTypeEnum.STRING, stringValue); } diff --git a/src/main/java/com/alibaba/excel/metadata/property/ExcelContentProperty.java b/src/main/java/com/alibaba/excel/metadata/property/ExcelContentProperty.java index f6f92532..1c0bb232 100644 --- a/src/main/java/com/alibaba/excel/metadata/property/ExcelContentProperty.java +++ b/src/main/java/com/alibaba/excel/metadata/property/ExcelContentProperty.java @@ -3,7 +3,6 @@ package com.alibaba.excel.metadata.property; import java.lang.reflect.Field; import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.metadata.Head; import lombok.Data; @@ -12,18 +11,30 @@ import lombok.Data; */ @Data public class ExcelContentProperty { + public static final ExcelContentProperty EMPTY = new ExcelContentProperty(); + /** * Java filed */ private Field field; - /** - * Excel head - */ - private Head head; /** * Custom defined converters */ private Converter converter; + /** + * date time format + */ private DateTimeFormatProperty dateTimeFormatProperty; + /** + * number format + */ private NumberFormatProperty numberFormatProperty; + /** + * Content style + */ + private StyleProperty contentStyleProperty; + /** + * Content font + */ + private FontProperty contentFontProperty; } diff --git a/src/main/java/com/alibaba/excel/metadata/property/ExcelHeadProperty.java b/src/main/java/com/alibaba/excel/metadata/property/ExcelHeadProperty.java index 3562501d..a0359fb3 100644 --- a/src/main/java/com/alibaba/excel/metadata/property/ExcelHeadProperty.java +++ b/src/main/java/com/alibaba/excel/metadata/property/ExcelHeadProperty.java @@ -8,15 +8,11 @@ import java.util.Map; import java.util.TreeMap; import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.format.DateTimeFormat; -import com.alibaba.excel.annotation.format.NumberFormat; -import com.alibaba.excel.converters.AutoConverter; -import com.alibaba.excel.converters.Converter; import com.alibaba.excel.enums.HeadKindEnum; -import com.alibaba.excel.exception.ExcelCommonException; import com.alibaba.excel.metadata.Head; import com.alibaba.excel.metadata.Holder; import com.alibaba.excel.util.ClassUtils; +import com.alibaba.excel.util.FieldUtils; import com.alibaba.excel.util.MapUtils; import com.alibaba.excel.util.StringUtils; import com.alibaba.excel.write.metadata.holder.AbstractWriteHolder; @@ -38,7 +34,7 @@ public class ExcelHeadProperty { /** * Custom class */ - private Class headClazz; + private Class headClazz; /** * The types of head */ @@ -51,24 +47,14 @@ public class ExcelHeadProperty { * Configuration header information */ private Map headMap; - /** - * Configuration column information - */ - private Map contentPropertyMap; - /** - * Configuration column information - */ - private Map fieldNameContentPropertyMap; /** * Fields ignored */ private Map ignoreMap; - public ExcelHeadProperty(Holder holder, Class headClazz, List> head) { + public ExcelHeadProperty(Holder holder, Class headClazz, List> head) { this.headClazz = headClazz; headMap = new TreeMap<>(); - contentPropertyMap = new TreeMap<>(); - fieldNameContentPropertyMap = MapUtils.newHashMap(); ignoreMap = MapUtils.newHashMap(); headKind = HeadKindEnum.NONE; headRowNumber = 0; @@ -80,8 +66,7 @@ public class ExcelHeadProperty { continue; } } - headMap.put(headIndex, new Head(headIndex, null, head.get(i), Boolean.FALSE, Boolean.TRUE)); - contentPropertyMap.put(headIndex, null); + headMap.put(headIndex, new Head(headIndex, null, null, head.get(i), Boolean.FALSE, Boolean.TRUE)); headIndex++; } headKind = HeadKindEnum.STRING; @@ -148,39 +133,20 @@ public class ExcelHeadProperty { private void initOneColumnProperty(int index, Field field, Boolean forceIndex) { ExcelProperty excelProperty = field.getAnnotation(ExcelProperty.class); List tmpHeadList = new ArrayList(); + String fieldName = FieldUtils.resolveCglibFieldName(field); boolean notForceName = excelProperty == null || excelProperty.value().length <= 0 || (excelProperty.value().length == 1 && StringUtils.isEmpty((excelProperty.value())[0])); if (headMap.containsKey(index)) { tmpHeadList.addAll(headMap.get(index).getHeadNameList()); } else { if (notForceName) { - tmpHeadList.add(field.getName()); + tmpHeadList.add(fieldName); } else { Collections.addAll(tmpHeadList, excelProperty.value()); } } - Head head = new Head(index, field.getName(), tmpHeadList, forceIndex, !notForceName); - ExcelContentProperty excelContentProperty = new ExcelContentProperty(); - if (excelProperty != null) { - Class convertClazz = excelProperty.converter(); - if (convertClazz != AutoConverter.class) { - try { - Converter converter = convertClazz.newInstance(); - excelContentProperty.setConverter(converter); - } catch (Exception e) { - throw new ExcelCommonException("Can not instance custom converter:" + convertClazz.getName()); - } - } - } - excelContentProperty.setHead(head); - excelContentProperty.setField(field); - excelContentProperty - .setDateTimeFormatProperty(DateTimeFormatProperty.build(field.getAnnotation(DateTimeFormat.class))); - excelContentProperty - .setNumberFormatProperty(NumberFormatProperty.build(field.getAnnotation(NumberFormat.class))); + Head head = new Head(index, field, fieldName, tmpHeadList, forceIndex, !notForceName); headMap.put(index, head); - contentPropertyMap.put(index, excelContentProperty); - fieldNameContentPropertyMap.put(field.getName(), excelContentProperty); } public boolean hasHead() { diff --git a/src/main/java/com/alibaba/excel/read/listener/ModelBuildEventListener.java b/src/main/java/com/alibaba/excel/read/listener/ModelBuildEventListener.java index 6a814f4d..7ba8b88f 100644 --- a/src/main/java/com/alibaba/excel/read/listener/ModelBuildEventListener.java +++ b/src/main/java/com/alibaba/excel/read/listener/ModelBuildEventListener.java @@ -8,14 +8,14 @@ import com.alibaba.excel.enums.HeadKindEnum; import com.alibaba.excel.exception.ExcelDataConvertException; import com.alibaba.excel.metadata.Head; import com.alibaba.excel.metadata.data.ReadCellData; -import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.alibaba.excel.read.metadata.holder.ReadSheetHolder; import com.alibaba.excel.read.metadata.property.ExcelReadHeadProperty; import com.alibaba.excel.util.BeanMapUtils; +import com.alibaba.excel.util.ClassUtils; import com.alibaba.excel.util.ConverterUtils; -import com.alibaba.excel.util.FieldUtils; import com.alibaba.excel.util.MapUtils; +import net.sf.cglib.beans.BeanMap; import org.apache.commons.collections4.CollectionUtils; /** @@ -92,22 +92,23 @@ public class ModelBuildEventListener implements ReadListener headMap = excelReadHeadProperty.getHeadMap(); Map map = MapUtils.newHashMapWithExpectedSize(headMap.size()); - Map contentPropertyMap = excelReadHeadProperty.getContentPropertyMap(); + BeanMap dataMap = BeanMapUtils.create(resultModel); for (Map.Entry entry : headMap.entrySet()) { Integer index = entry.getKey(); + Head head = entry.getValue(); + String fieldName = head.getFieldName(); if (!cellDataMap.containsKey(index)) { continue; } ReadCellData cellData = cellDataMap.get(index); - ExcelContentProperty excelContentProperty = contentPropertyMap.get(index); - Object value = ConverterUtils.convertToJavaObject(cellData, excelContentProperty.getField(), - excelContentProperty, readSheetHolder.converterMap(), context, - context.readRowHolder().getRowIndex(), index); + Object value = ConverterUtils.convertToJavaObject(cellData, head.getField(), + ClassUtils.declaredExcelContentProperty(dataMap, readSheetHolder.excelReadHeadProperty().getHeadClazz(), + fieldName), readSheetHolder.converterMap(), context, context.readRowHolder().getRowIndex(), index); if (value != null) { - map.put(FieldUtils.resolveCglibFieldName(excelContentProperty.getField()), value); + map.put(fieldName, value); } } - BeanMapUtils.create(resultModel).putAll(map); + dataMap.putAll(map); return resultModel; } diff --git a/src/main/java/com/alibaba/excel/read/processor/DefaultAnalysisEventProcessor.java b/src/main/java/com/alibaba/excel/read/processor/DefaultAnalysisEventProcessor.java index c3c50234..914a9654 100644 --- a/src/main/java/com/alibaba/excel/read/processor/DefaultAnalysisEventProcessor.java +++ b/src/main/java/com/alibaba/excel/read/processor/DefaultAnalysisEventProcessor.java @@ -11,7 +11,6 @@ import com.alibaba.excel.exception.ExcelAnalysisException; import com.alibaba.excel.exception.ExcelAnalysisStopException; import com.alibaba.excel.metadata.Head; import com.alibaba.excel.metadata.data.ReadCellData; -import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.alibaba.excel.read.listener.ReadListener; import com.alibaba.excel.read.metadata.holder.ReadRowHolder; import com.alibaba.excel.read.metadata.property.ExcelReadHeadProperty; @@ -118,15 +117,11 @@ public class DefaultAnalysisEventProcessor implements AnalysisEventProcessor { Map dataMap = ConverterUtils.convertToStringMap(cellDataMap, analysisContext); ExcelReadHeadProperty excelHeadPropertyData = analysisContext.readSheetHolder().excelReadHeadProperty(); Map headMapData = excelHeadPropertyData.getHeadMap(); - Map contentPropertyMapData = excelHeadPropertyData.getContentPropertyMap(); Map tmpHeadMap = new HashMap(headMapData.size() * 4 / 3 + 1); - Map tmpContentPropertyMap = - new HashMap(contentPropertyMapData.size() * 4 / 3 + 1); for (Map.Entry entry : headMapData.entrySet()) { Head headData = entry.getValue(); if (headData.getForceIndex() || !headData.getForceName()) { tmpHeadMap.put(entry.getKey(), headData); - tmpContentPropertyMap.put(entry.getKey(), contentPropertyMapData.get(entry.getKey())); continue; } List headNameList = headData.getHeadNameList(); @@ -146,12 +141,10 @@ public class DefaultAnalysisEventProcessor implements AnalysisEventProcessor { if (headName.equals(headString)) { headData.setColumnIndex(stringKey); tmpHeadMap.put(stringKey, headData); - tmpContentPropertyMap.put(stringKey, contentPropertyMapData.get(entry.getKey())); break; } } } excelHeadPropertyData.setHeadMap(tmpHeadMap); - excelHeadPropertyData.setContentPropertyMap(tmpContentPropertyMap); } } diff --git a/src/main/java/com/alibaba/excel/util/ClassUtils.java b/src/main/java/com/alibaba/excel/util/ClassUtils.java index 50e9351a..491d4b3d 100644 --- a/src/main/java/com/alibaba/excel/util/ClassUtils.java +++ b/src/main/java/com/alibaba/excel/util/ClassUtils.java @@ -1,6 +1,5 @@ package com.alibaba.excel.util; -import java.lang.ref.SoftReference; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.ArrayList; @@ -10,16 +9,26 @@ import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ContentFontStyle; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.converters.AutoConverter; +import com.alibaba.excel.converters.Converter; import com.alibaba.excel.exception.ExcelCommonException; import com.alibaba.excel.metadata.Holder; +import com.alibaba.excel.metadata.property.ExcelContentProperty; +import com.alibaba.excel.metadata.property.FontProperty; +import com.alibaba.excel.metadata.property.StyleProperty; import com.alibaba.excel.write.metadata.holder.WriteHolder; +import net.sf.cglib.beans.BeanMap; + /** * Class utils * @@ -27,7 +36,150 @@ import com.alibaba.excel.write.metadata.holder.WriteHolder; **/ public class ClassUtils { - public static final Map, SoftReference> FIELD_CACHE = new ConcurrentHashMap<>(); + public static final Map, FieldCache> FIELD_CACHE = new ConcurrentHashMap<>(); + + /** + * The cache configuration information for each of the class + */ + public static final Map, Map> CLASS_CONTENT_CACHE + = new ConcurrentHashMap<>(); + + /** + * The cache configuration information for each of the class + */ + public static final Map CONTENT_CACHE = new ConcurrentHashMap<>(); + + /** + * Calculate the configuration information for the class + * + * @param dataMap + * @param headClazz + * @param fieldName + * @return + */ + public static ExcelContentProperty declaredExcelContentProperty(Map dataMap, Class headClazz, + String fieldName) { + Class clazz = null; + if (dataMap instanceof BeanMap) { + Object bean = ((BeanMap)dataMap).getBean(); + if (bean != null) { + clazz = bean.getClass(); + } + } + return getExcelContentProperty(clazz, headClazz, fieldName); + } + + private static ExcelContentProperty getExcelContentProperty(Class clazz, Class headClass, String fieldName) { + return CONTENT_CACHE.computeIfAbsent(buildKey(clazz, headClass, fieldName), key -> { + ExcelContentProperty excelContentProperty = Optional.ofNullable(declaredFieldContentMap(clazz)) + .map(map -> map.get(fieldName)) + .orElse(null); + ExcelContentProperty headExcelContentProperty = Optional.ofNullable(declaredFieldContentMap(headClass)) + .map(map -> map.get(fieldName)) + .orElse(null); + ExcelContentProperty combineExcelContentProperty = new ExcelContentProperty(); + + combineExcelContentProperty(combineExcelContentProperty, headExcelContentProperty); + if (clazz != headClass) { + combineExcelContentProperty(combineExcelContentProperty, excelContentProperty); + } + return combineExcelContentProperty; + }); + + } + + public static void combineExcelContentProperty(ExcelContentProperty combineExcelContentProperty, + ExcelContentProperty excelContentProperty) { + if (excelContentProperty == null) { + return; + } + if (excelContentProperty.getField() != null) { + combineExcelContentProperty.setField(excelContentProperty.getField()); + } + if (excelContentProperty.getConverter() != null) { + combineExcelContentProperty.setConverter(excelContentProperty.getConverter()); + } + if (excelContentProperty.getDateTimeFormatProperty() != null) { + combineExcelContentProperty.setDateTimeFormatProperty(excelContentProperty.getDateTimeFormatProperty()); + } + if (excelContentProperty.getNumberFormatProperty() != null) { + combineExcelContentProperty.setNumberFormatProperty(excelContentProperty.getNumberFormatProperty()); + } + if (excelContentProperty.getContentStyleProperty() != null) { + combineExcelContentProperty.setContentStyleProperty(excelContentProperty.getContentStyleProperty()); + } + if (excelContentProperty.getContentFontProperty() != null) { + combineExcelContentProperty.setContentFontProperty(excelContentProperty.getContentFontProperty()); + } + } + + private static String buildKey(Class clazz, Class headClass, String fieldName) { + String key = ""; + if (clazz != null) { + key += clazz.getName(); + } + key += "-"; + if (headClass != null) { + key += headClass.getName(); + } + key += "-"; + if (fieldName != null) { + key += fieldName; + } + return key; + } + + private static Map declaredFieldContentMap(Class clazz) { + if (clazz == null) { + return null; + } + return CLASS_CONTENT_CACHE.computeIfAbsent(clazz, key -> { + List tempFieldList = new ArrayList<>(); + Class tempClass = clazz; + while (tempClass != null) { + Collections.addAll(tempFieldList, tempClass.getDeclaredFields()); + // Get the parent class and give it to yourself + tempClass = tempClass.getSuperclass(); + } + + ContentStyle parentContentStyle = clazz.getAnnotation(ContentStyle.class); + ContentFontStyle parentContentFontStyle = clazz.getAnnotation(ContentFontStyle.class); + Map fieldContentMap = MapUtils.newHashMapWithExpectedSize( + tempFieldList.size()); + for (Field field : tempFieldList) { + ExcelContentProperty excelContentProperty = new ExcelContentProperty(); + excelContentProperty.setField(field); + + ExcelProperty excelProperty = field.getAnnotation(ExcelProperty.class); + if (excelProperty != null) { + Class> convertClazz = excelProperty.converter(); + if (convertClazz != AutoConverter.class) { + try { + Converter converter = convertClazz.newInstance(); + excelContentProperty.setConverter(converter); + } catch (Exception e) { + throw new ExcelCommonException( + "Can not instance custom converter:" + convertClazz.getName()); + } + } + } + + ContentStyle contentStyle = field.getAnnotation(ContentStyle.class); + if (contentStyle == null) { + contentStyle = parentContentStyle; + } + excelContentProperty.setContentStyleProperty(StyleProperty.build(contentStyle)); + + ContentFontStyle contentFontStyle = field.getAnnotation(ContentFontStyle.class); + if (contentFontStyle == null) { + contentFontStyle = parentContentFontStyle; + } + excelContentProperty.setContentFontProperty(FontProperty.build(contentFontStyle)); + fieldContentMap.put(field.getName(), excelContentProperty); + } + return fieldContentMap; + }); + } /** * Parsing filed in the class @@ -41,7 +193,7 @@ public class ClassUtils { */ public static void declaredFields(Class clazz, Map sortedAllFiledMap, Map indexFiledMap, Map ignoreMap, Boolean needIgnore, Holder holder) { - FieldCache fieldCache = getFieldCache(clazz); + FieldCache fieldCache = declaredFields(clazz); if (fieldCache == null) { return; } @@ -92,45 +244,31 @@ public class ClassUtils { declaredFields(clazz, sortedAllFiledMap, null, null, needIgnore, writeHolder); } - private static FieldCache getFieldCache(Class clazz) { + private static FieldCache declaredFields(Class clazz) { if (clazz == null) { return null; } - SoftReference fieldCacheSoftReference = FIELD_CACHE.get(clazz); - if (fieldCacheSoftReference != null && fieldCacheSoftReference.get() != null) { - return fieldCacheSoftReference.get(); - } - synchronized (clazz) { - fieldCacheSoftReference = FIELD_CACHE.get(clazz); - if (fieldCacheSoftReference != null && fieldCacheSoftReference.get() != null) { - return fieldCacheSoftReference.get(); + return FIELD_CACHE.computeIfAbsent(clazz, key -> { + List tempFieldList = new ArrayList<>(); + Class tempClass = clazz; + // When the parent class is null, it indicates that the parent class (Object class) has reached the top + // level. + while (tempClass != null) { + Collections.addAll(tempFieldList, tempClass.getDeclaredFields()); + // Get the parent class and give it to yourself + tempClass = tempClass.getSuperclass(); } - declaredFields(clazz); - } - return FIELD_CACHE.get(clazz).get(); - } + // Screening of field + Map> orderFiledMap = new TreeMap>(); + Map indexFiledMap = new TreeMap(); + Map ignoreMap = new HashMap(16); - private static void declaredFields(Class clazz) { - List tempFieldList = new ArrayList<>(); - Class tempClass = clazz; - // When the parent class is null, it indicates that the parent class (Object class) has reached the top - // level. - while (tempClass != null) { - Collections.addAll(tempFieldList, tempClass.getDeclaredFields()); - // Get the parent class and give it to yourself - tempClass = tempClass.getSuperclass(); - } - // Screening of field - Map> orderFiledMap = new TreeMap>(); - Map indexFiledMap = new TreeMap(); - Map ignoreMap = new HashMap(16); - - ExcelIgnoreUnannotated excelIgnoreUnannotated = clazz.getAnnotation(ExcelIgnoreUnannotated.class); - for (Field field : tempFieldList) { - declaredOneField(field, orderFiledMap, indexFiledMap, ignoreMap, excelIgnoreUnannotated); - } - FIELD_CACHE.put(clazz, new SoftReference( - new FieldCache(buildSortedAllFiledMap(orderFiledMap, indexFiledMap), indexFiledMap, ignoreMap))); + ExcelIgnoreUnannotated excelIgnoreUnannotated = clazz.getAnnotation(ExcelIgnoreUnannotated.class); + for (Field field : tempFieldList) { + declaredOneField(field, orderFiledMap, indexFiledMap, ignoreMap, excelIgnoreUnannotated); + } + return new FieldCache(buildSortedAllFiledMap(orderFiledMap, indexFiledMap), indexFiledMap, ignoreMap); + }); } private static Map buildSortedAllFiledMap(Map> orderFiledMap, diff --git a/src/main/java/com/alibaba/excel/util/WriteHandlerUtils.java b/src/main/java/com/alibaba/excel/util/WriteHandlerUtils.java index 4279baf4..78ce8d8e 100644 --- a/src/main/java/com/alibaba/excel/util/WriteHandlerUtils.java +++ b/src/main/java/com/alibaba/excel/util/WriteHandlerUtils.java @@ -6,6 +6,7 @@ import java.util.Map; import com.alibaba.excel.context.WriteContext; import com.alibaba.excel.metadata.Head; import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.alibaba.excel.write.handler.CellWriteHandler; import com.alibaba.excel.write.handler.RowWriteHandler; import com.alibaba.excel.write.handler.SheetWriteHandler; @@ -116,7 +117,7 @@ public class WriteHandlerUtils { } public static void beforeCellCreate(WriteContext writeContext, Row row, Head head, Integer columnIndex, - Integer relativeRowIndex, Boolean isHead) { + Integer relativeRowIndex, Boolean isHead, ExcelContentProperty excelContentProperty) { List handlerList = writeContext.currentWriteHolder().writeHandlerMap().get(CellWriteHandler.class); if (handlerList == null || handlerList.isEmpty()) { @@ -124,7 +125,7 @@ public class WriteHandlerUtils { } CellWriteHandlerContext context = new CellWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), writeContext.writeSheetHolder(), writeContext.writeTableHolder(), row, null, columnIndex, relativeRowIndex, - head, null, null, isHead); + head, null, null, isHead, excelContentProperty); for (WriteHandler writeHandler : handlerList) { if (writeHandler instanceof CellWriteHandler) { ((CellWriteHandler)writeHandler).beforeCellCreate(context); @@ -133,7 +134,7 @@ public class WriteHandlerUtils { } public static void afterCellCreate(WriteContext writeContext, Cell cell, Head head, Integer relativeRowIndex, - Boolean isHead) { + Boolean isHead, ExcelContentProperty excelContentProperty) { List handlerList = writeContext.currentWriteHolder().writeHandlerMap().get(CellWriteHandler.class); if (handlerList == null || handlerList.isEmpty()) { @@ -141,7 +142,7 @@ public class WriteHandlerUtils { } CellWriteHandlerContext context = new CellWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), writeContext.writeSheetHolder(), writeContext.writeTableHolder(), cell.getRow(), cell, - cell.getColumnIndex(), relativeRowIndex, head, null, null, isHead); + cell.getColumnIndex(), relativeRowIndex, head, null, null, isHead, excelContentProperty); for (WriteHandler writeHandler : handlerList) { if (writeHandler instanceof CellWriteHandler) { ((CellWriteHandler)writeHandler).afterCellCreate(context); @@ -150,8 +151,7 @@ public class WriteHandlerUtils { } public static void afterCellDataConverted(WriteContext writeContext, WriteCellData cellData, Cell cell, - Head head, - Integer relativeRowIndex, Boolean isHead) { + Head head, Integer relativeRowIndex, Boolean isHead, ExcelContentProperty excelContentProperty) { List handlerList = writeContext.currentWriteHolder().writeHandlerMap().get(CellWriteHandler.class); if (handlerList == null || handlerList.isEmpty()) { @@ -160,7 +160,7 @@ public class WriteHandlerUtils { List> cellDataList = cellData == null ? null : ListUtils.newArrayList(cellData); CellWriteHandlerContext context = new CellWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), writeContext.writeSheetHolder(), writeContext.writeTableHolder(), cell.getRow(), cell, - cell.getColumnIndex(), relativeRowIndex, head, cellDataList, cellData, isHead); + cell.getColumnIndex(), relativeRowIndex, head, cellDataList, cellData, isHead, excelContentProperty); for (WriteHandler writeHandler : handlerList) { if (writeHandler instanceof CellWriteHandler) { ((CellWriteHandler)writeHandler).afterCellDataConverted(context); @@ -169,14 +169,13 @@ public class WriteHandlerUtils { } public static void afterCellDispose(WriteContext writeContext, WriteCellData cellData, Cell cell, Head head, - Integer relativeRowIndex, Boolean isHead) { + Integer relativeRowIndex, Boolean isHead, ExcelContentProperty excelContentProperty) { List> cellDataList = cellData == null ? null : ListUtils.newArrayList(cellData); - afterCellDispose(writeContext, cellDataList, cell, head, relativeRowIndex, isHead); + afterCellDispose(writeContext, cellDataList, cell, head, relativeRowIndex, isHead, excelContentProperty); } public static void afterCellDispose(WriteContext writeContext, List> cellDataList, Cell cell, - Head head, - Integer relativeRowIndex, Boolean isHead) { + Head head, Integer relativeRowIndex, Boolean isHead, ExcelContentProperty excelContentProperty) { List handlerList = writeContext.currentWriteHolder().writeHandlerMap().get(CellWriteHandler.class); if (handlerList == null || handlerList.isEmpty()) { @@ -188,7 +187,7 @@ public class WriteHandlerUtils { } CellWriteHandlerContext context = new CellWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), writeContext.writeSheetHolder(), writeContext.writeTableHolder(), cell.getRow(), cell, - cell.getColumnIndex(), relativeRowIndex, head, cellDataList, cellData, isHead); + cell.getColumnIndex(), relativeRowIndex, head, cellDataList, cellData, isHead, excelContentProperty); for (WriteHandler writeHandler : handlerList) { if (writeHandler instanceof CellWriteHandler) { ((CellWriteHandler)writeHandler).afterCellDispose(context); diff --git a/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java b/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java index ecc34b55..92e42419 100644 --- a/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java @@ -56,7 +56,8 @@ public abstract class AbstractExcelWriteExecutor implements ExcelWriteExecutor { value = ((String)value).trim(); } WriteCellData cellData = convert(currentWriteHolder, clazz, targetType, cell, value, excelContentProperty); - WriteHandlerUtils.afterCellDataConverted(writeContext, cellData, cell, head, relativeRowIndex, Boolean.FALSE); + WriteHandlerUtils.afterCellDataConverted(writeContext, cellData, cell, head, relativeRowIndex, Boolean.FALSE, + excelContentProperty); // Fill in picture information fillImage(cell, cellData.getImageDataList()); diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java index 866f6378..6bfe34c2 100644 --- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java @@ -110,13 +110,20 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { private void doAddBasicTypeToExcel(RowData oneRowData, Head head, Row row, int relativeRowIndex, int dataIndex, int cellIndex) { - WriteHandlerUtils.beforeCellCreate(writeContext, row, head, cellIndex, relativeRowIndex, Boolean.FALSE); + ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(null, + writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadClazz(), + head == null ? null : head.getFieldName()); + + WriteHandlerUtils.beforeCellCreate(writeContext, row, head, cellIndex, relativeRowIndex, Boolean.FALSE, + excelContentProperty); Cell cell = WorkBookUtil.createCell(row, cellIndex); - WriteHandlerUtils.afterCellCreate(writeContext, cell, head, relativeRowIndex, Boolean.FALSE); + WriteHandlerUtils.afterCellCreate(writeContext, cell, head, relativeRowIndex, Boolean.FALSE, + excelContentProperty); Object value = oneRowData.get(dataIndex); WriteCellData cellData = converterAndSet(writeContext.currentWriteHolder(), FieldUtils.getFieldClass(value), null, cell, value, null, head, relativeRowIndex); - WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, head, relativeRowIndex, Boolean.FALSE); + WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, head, relativeRowIndex, Boolean.FALSE, + excelContentProperty); } private void addJavaObjectToExcel(Object oneRowData, Row row, int relativeRowIndex, @@ -128,24 +135,25 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { // If it's a class it needs to be cast by type if (HeadKindEnum.CLASS.equals(writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadKind())) { Map headMap = writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadMap(); - Map contentPropertyMap = - writeContext.currentWriteHolder().excelWriteHeadProperty().getContentPropertyMap(); - for (Map.Entry entry : contentPropertyMap.entrySet()) { + for (Map.Entry entry : headMap.entrySet()) { int cellIndex = entry.getKey(); - ExcelContentProperty excelContentProperty = entry.getValue(); - String name = FieldUtils.resolveCglibFieldName(excelContentProperty.getField()); + Head head = entry.getValue(); + String name = head.getFieldName(); if (!beanMap.containsKey(name)) { continue; } - Head head = headMap.get(cellIndex); - WriteHandlerUtils.beforeCellCreate(writeContext, row, head, cellIndex, relativeRowIndex, Boolean.FALSE); + ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(beanMap, + currentWriteHolder.excelWriteHeadProperty().getHeadClazz(), name); + WriteHandlerUtils.beforeCellCreate(writeContext, row, head, cellIndex, relativeRowIndex, Boolean.FALSE, + excelContentProperty); Cell cell = WorkBookUtil.createCell(row, cellIndex); - WriteHandlerUtils.afterCellCreate(writeContext, cell, head, relativeRowIndex, Boolean.FALSE); + WriteHandlerUtils.afterCellCreate(writeContext, cell, head, relativeRowIndex, Boolean.FALSE, + excelContentProperty); Object value = beanMap.get(name); - WriteCellData cellData = converterAndSet(currentWriteHolder, - excelContentProperty.getField().getType(), + WriteCellData cellData = converterAndSet(currentWriteHolder, head.getField().getType(), null, cell, value, excelContentProperty, head, relativeRowIndex); - WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, head, relativeRowIndex, Boolean.FALSE); + WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, head, relativeRowIndex, Boolean.FALSE, + excelContentProperty); beanMapHandledSet.add(name); maxCellIndex = Math.max(maxCellIndex, cellIndex); } @@ -160,21 +168,26 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { initSortedAllFiledMapFieldList(oneRowData.getClass(), sortedAllFiledMap); for (Map.Entry entry : sortedAllFiledMap.entrySet()) { Field field = entry.getValue(); - String filedName = field.getName(); + String filedName = FieldUtils.resolveCglibFieldName(field); boolean uselessData = !beanMap.containsKey(filedName) || beanMapHandledSet.contains(filedName) || ignoreMap.containsKey(filedName); if (uselessData) { continue; } Object value = beanMap.get(filedName); - WriteHandlerUtils.beforeCellCreate(writeContext, row, null, maxCellIndex, relativeRowIndex, Boolean.FALSE); + ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(beanMap, + currentWriteHolder.excelWriteHeadProperty().getHeadClazz(), filedName); + WriteHandlerUtils.beforeCellCreate(writeContext, row, null, maxCellIndex, relativeRowIndex, Boolean.FALSE, + excelContentProperty); // fix https://github.com/alibaba/easyexcel/issues/1870 // If there is data, it is written to the next cell Cell cell = WorkBookUtil.createCell(row, maxCellIndex++); - WriteHandlerUtils.afterCellCreate(writeContext, cell, null, relativeRowIndex, Boolean.FALSE); + WriteHandlerUtils.afterCellCreate(writeContext, cell, null, relativeRowIndex, Boolean.FALSE, + excelContentProperty); WriteCellData cellData = converterAndSet(currentWriteHolder, FieldUtils.getFieldClass(beanMap, filedName, value), null, cell, value, null, null, relativeRowIndex); - WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, null, relativeRowIndex, Boolean.FALSE); + WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, null, relativeRowIndex, Boolean.FALSE, + excelContentProperty); } } diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java index 70e28e77..10025390 100644 --- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java @@ -18,6 +18,7 @@ import com.alibaba.excel.exception.ExcelGenerateException; import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.alibaba.excel.util.BeanMapUtils; +import com.alibaba.excel.util.ClassUtils; import com.alibaba.excel.util.FieldUtils; import com.alibaba.excel.util.ListUtils; import com.alibaba.excel.util.MapUtils; @@ -189,19 +190,21 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { dataMap = BeanMapUtils.create(oneRowData); } WriteSheetHolder writeSheetHolder = writeContext.writeSheetHolder(); - Map fieldNameContentPropertyMap = - writeContext.currentWriteHolder().excelWriteHeadProperty().getFieldNameContentPropertyMap(); for (AnalysisCell analysisCell : analysisCellList) { - Cell cell = getOneCell(analysisCell, fillConfig); if (analysisCell.getOnlyOneVariable()) { String variable = analysisCell.getVariableList().get(0); if (!dataMap.containsKey(variable)) { continue; } Object value = dataMap.get(variable); + ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(dataMap, + writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadClazz(), variable); + Cell cell = getOneCell(analysisCell, fillConfig, excelContentProperty); + WriteCellData cellData = converterAndSet(writeSheetHolder, - FieldUtils.getFieldClass(dataMap, variable, value), - null, cell, value, fieldNameContentPropertyMap.get(variable), null, relativeRowIndex); + FieldUtils.getFieldClass(dataMap, variable, value), null, cell, value, excelContentProperty, null, + relativeRowIndex); + cellData.setAnalysisCell(analysisCell); // Restyle if (fillConfig.getAutoStyle()) { @@ -210,20 +213,26 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { .ifPresent(cellData::setOriginCellStyle); } - WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, null, relativeRowIndex, Boolean.FALSE); + WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, null, relativeRowIndex, Boolean.FALSE, + excelContentProperty); } else { StringBuilder cellValueBuild = new StringBuilder(); int index = 0; List> cellDataList = new ArrayList<>(); + Cell cell = getOneCell(analysisCell, fillConfig, ExcelContentProperty.EMPTY); + for (String variable : analysisCell.getVariableList()) { cellValueBuild.append(analysisCell.getPrepareDataList().get(index++)); if (!dataMap.containsKey(variable)) { continue; } Object value = dataMap.get(variable); + ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(dataMap, + writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadClazz(), variable); WriteCellData cellData = convert(writeSheetHolder, FieldUtils.getFieldClass(dataMap, variable, value), CellDataTypeEnum.STRING, cell, value, - fieldNameContentPropertyMap.get(variable)); + excelContentProperty); + cellData.setAnalysisCell(analysisCell); cellDataList.add(cellData); CellDataTypeEnum type = cellData.getType(); if (type != null) { @@ -253,7 +262,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { } WriteHandlerUtils.afterCellDispose(writeContext, cellDataList, cell, null, relativeRowIndex, - Boolean.FALSE); + Boolean.FALSE, ExcelContentProperty.EMPTY); } } } @@ -269,7 +278,8 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { return relativeRowIndex; } - private Cell getOneCell(AnalysisCell analysisCell, FillConfig fillConfig) { + private Cell getOneCell(AnalysisCell analysisCell, FillConfig fillConfig, + ExcelContentProperty excelContentProperty) { Sheet cachedSheet = writeContext.writeSheetHolder().getCachedSheet(); if (WriteTemplateAnalysisCellTypeEnum.COMMON.equals(analysisCell.getCellType())) { return cachedSheet.getRow(analysisCell.getRowIndex()).getCell(analysisCell.getColumnIndex()); @@ -310,7 +320,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { } Row row = createRowIfNecessary(sheet, cachedSheet, lastRowIndex, fillConfig, analysisCell, isOriginalCell); - Cell cell = createCellIfNecessary(row, lastColumnIndex); + Cell cell = createCellIfNecessary(row, lastColumnIndex, excelContentProperty); if (isOriginalCell) { Map collectionFieldStyleMap = collectionFieldStyleCache.computeIfAbsent( @@ -320,14 +330,15 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { return cell; } - private Cell createCellIfNecessary(Row row, Integer lastColumnIndex) { + private Cell createCellIfNecessary(Row row, Integer lastColumnIndex, ExcelContentProperty excelContentProperty) { Cell cell = row.getCell(lastColumnIndex); if (cell != null) { return cell; } - WriteHandlerUtils.beforeCellCreate(writeContext, row, null, lastColumnIndex, null, Boolean.FALSE); + WriteHandlerUtils.beforeCellCreate(writeContext, row, null, lastColumnIndex, null, Boolean.FALSE, + excelContentProperty); cell = row.createCell(lastColumnIndex); - WriteHandlerUtils.afterCellCreate(writeContext, cell, null, null, Boolean.FALSE); + WriteHandlerUtils.afterCellCreate(writeContext, cell, null, null, Boolean.FALSE, excelContentProperty); return cell; } diff --git a/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java b/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java index 92c1500f..27530f6f 100644 --- a/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java +++ b/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java @@ -5,6 +5,7 @@ import java.util.List; import com.alibaba.excel.context.WriteContext; import com.alibaba.excel.metadata.Head; import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.metadata.holder.WriteTableHolder; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; @@ -73,4 +74,8 @@ public class CellWriteHandlerContext { * Nullable.It is null in the case of fill data. */ private Boolean head; + /** + * Field annotation configuration information. + */ + private ExcelContentProperty excelContentProperty; } diff --git a/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java b/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java index faf39ad7..c8116b4d 100644 --- a/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java +++ b/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java @@ -29,10 +29,13 @@ public class FillStyleCellWriteHandler implements CellWriteHandler { @Override public void afterCellDispose(CellWriteHandlerContext context) { List> cellDataList = context.getCellDataList(); - if (CollectionUtils.isEmpty(cellDataList)) { + if (CollectionUtils.size(cellDataList) != 1) { + return; + } + WriteCellData cellData = context.getFirstCellData(); + if (cellData.getAnalysisCell() != null && !cellData.getAnalysisCell().getOnlyOneVariable()) { return; } - WriteCellData cellData = cellDataList.get(0); WriteCellStyle writeCellStyle = cellData.getWriteCellStyle(); CellStyle originCellStyle = cellData.getOriginCellStyle(); if (writeCellStyle == null && originCellStyle == null) { diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java index 8028e4bd..5059894a 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java @@ -18,6 +18,7 @@ import com.alibaba.excel.event.NotRepeatExecutor; import com.alibaba.excel.event.Order; import com.alibaba.excel.metadata.AbstractHolder; import com.alibaba.excel.metadata.Head; +import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.alibaba.excel.metadata.property.LoopMergeProperty; import com.alibaba.excel.metadata.property.OnceAbsoluteMergeProperty; import com.alibaba.excel.metadata.property.RowHeightProperty; @@ -78,6 +79,7 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ * Whether to automatically merge headers.Default is true. */ private Boolean automaticMergeHead; + /** * Ignore the custom columns. */ @@ -195,7 +197,7 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ } if (writeBasicParameter.getCustomConverterList() != null && !writeBasicParameter.getCustomConverterList().isEmpty()) { - for (Converter converter : writeBasicParameter.getCustomConverterList()) { + for (Converter converter : writeBasicParameter.getCustomConverterList()) { getConverterMap().put(ConverterKeyBuild.buildKey(converter.supportJavaTypeKey()), converter); } } @@ -216,8 +218,7 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ if (head.getColumnWidthProperty() != null) { hasColumnWidth = true; } - if (head.getHeadStyleProperty() != null || head.getHeadFontProperty() != null - || head.getContentStyleProperty() != null || head.getContentFontProperty() != null) { + if (head.getHeadStyleProperty() != null || head.getHeadFontProperty() != null) { hasStyle = true; } dealLoopMerge(handlerList, head); @@ -227,9 +228,9 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ dealColumnWidth(handlerList); } - if (hasStyle) { + //if (hasStyle) { dealStyle(handlerList); - } + //} dealRowHigh(handlerList); dealOnceAbsoluteMerge(handlerList); @@ -244,14 +245,16 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ @Override protected WriteCellStyle headCellStyle(CellWriteHandlerContext context) { - //return WriteCellStyle.build(head.getHeadStyleProperty(), head.getHeadFontProperty()); - return null; + ExcelContentProperty excelContentProperty = context.getExcelContentProperty(); + return WriteCellStyle.build(excelContentProperty.getContentStyleProperty(), + excelContentProperty.getContentFontProperty()); } @Override protected WriteCellStyle contentCellStyle(CellWriteHandlerContext context) { - //return WriteCellStyle.build(head.getContentStyleProperty(), head.getContentFontProperty()); - return null; + ExcelContentProperty excelContentProperty = context.getExcelContentProperty(); + return WriteCellStyle.build(excelContentProperty.getContentStyleProperty(), + excelContentProperty.getContentFontProperty()); } }; handlerList.add(styleStrategy); diff --git a/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java b/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java index c2779136..692a510a 100644 --- a/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java +++ b/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java @@ -7,11 +7,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentFontStyle; import com.alibaba.excel.annotation.write.style.ContentLoopMerge; import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadFontStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.annotation.write.style.HeadStyle; @@ -20,8 +17,6 @@ import com.alibaba.excel.enums.HeadKindEnum; import com.alibaba.excel.metadata.CellRange; import com.alibaba.excel.metadata.Head; import com.alibaba.excel.metadata.Holder; -import com.alibaba.excel.metadata.property.ColumnWidthProperty; -import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.alibaba.excel.metadata.property.ExcelHeadProperty; import com.alibaba.excel.metadata.property.FontProperty; import com.alibaba.excel.metadata.property.LoopMergeProperty; @@ -29,49 +24,43 @@ import com.alibaba.excel.metadata.property.OnceAbsoluteMergeProperty; import com.alibaba.excel.metadata.property.RowHeightProperty; import com.alibaba.excel.metadata.property.StyleProperty; +import lombok.Data; + /** * Define the header attribute of excel * * @author jipengfei */ +@Data public class ExcelWriteHeadProperty extends ExcelHeadProperty { private RowHeightProperty headRowHeightProperty; private RowHeightProperty contentRowHeightProperty; private OnceAbsoluteMergeProperty onceAbsoluteMergeProperty; - public ExcelWriteHeadProperty(Holder holder, Class headClazz, List> head) { + public ExcelWriteHeadProperty(Holder holder, Class headClazz, List> head) { super(holder, headClazz, head); if (getHeadKind() != HeadKindEnum.CLASS) { return; } this.headRowHeightProperty = - RowHeightProperty.build((HeadRowHeight)headClazz.getAnnotation(HeadRowHeight.class)); + RowHeightProperty.build(headClazz.getAnnotation(HeadRowHeight.class)); this.contentRowHeightProperty = - RowHeightProperty.build((ContentRowHeight)headClazz.getAnnotation(ContentRowHeight.class)); + RowHeightProperty.build(headClazz.getAnnotation(ContentRowHeight.class)); this.onceAbsoluteMergeProperty = - OnceAbsoluteMergeProperty.build((OnceAbsoluteMerge)headClazz.getAnnotation(OnceAbsoluteMerge.class)); + OnceAbsoluteMergeProperty.build(headClazz.getAnnotation(OnceAbsoluteMerge.class)); - ColumnWidth parentColumnWidth = (ColumnWidth)headClazz.getAnnotation(ColumnWidth.class); - HeadStyle parentHeadStyle = (HeadStyle)headClazz.getAnnotation(HeadStyle.class); - HeadFontStyle parentHeadFontStyle = (HeadFontStyle)headClazz.getAnnotation(HeadFontStyle.class); - ContentStyle parentContentStyle = (ContentStyle)headClazz.getAnnotation(ContentStyle.class); - ContentFontStyle parentContentFontStyle = (ContentFontStyle)headClazz.getAnnotation(ContentFontStyle.class); + HeadStyle parentHeadStyle = headClazz.getAnnotation(HeadStyle.class); + HeadFontStyle parentHeadFontStyle = headClazz.getAnnotation(HeadFontStyle.class); - for (Map.Entry entry : getContentPropertyMap().entrySet()) { + for (Map.Entry entry : getHeadMap().entrySet()) { Integer index = entry.getKey(); - ExcelContentProperty excelContentPropertyData = entry.getValue(); - if (excelContentPropertyData == null) { + Head headData = entry.getValue(); + if (headData == null) { throw new IllegalArgumentException( "Passing in the class and list the head, the two must be the same size."); } - Field field = excelContentPropertyData.getField(); - Head headData = getHeadMap().get(index); - ColumnWidth columnWidth = field.getAnnotation(ColumnWidth.class); - if (columnWidth == null) { - columnWidth = parentColumnWidth; - } - headData.setColumnWidthProperty(ColumnWidthProperty.build(columnWidth)); + Field field = headData.getField(); HeadStyle headStyle = field.getAnnotation(HeadStyle.class); if (headStyle == null) { @@ -85,46 +74,10 @@ public class ExcelWriteHeadProperty extends ExcelHeadProperty { } headData.setHeadFontProperty(FontProperty.build(headFontStyle)); - ContentStyle contentStyle = field.getAnnotation(ContentStyle.class); - if (contentStyle == null) { - contentStyle = parentContentStyle; - } - headData.setContentStyleProperty(StyleProperty.build(contentStyle)); - - ContentFontStyle contentFontStyle = field.getAnnotation(ContentFontStyle.class); - if (contentFontStyle == null) { - contentFontStyle = parentContentFontStyle; - } - headData.setContentFontProperty(FontProperty.build(contentFontStyle)); - headData.setLoopMergeProperty(LoopMergeProperty.build(field.getAnnotation(ContentLoopMerge.class))); } } - public RowHeightProperty getHeadRowHeightProperty() { - return headRowHeightProperty; - } - - public void setHeadRowHeightProperty(RowHeightProperty headRowHeightProperty) { - this.headRowHeightProperty = headRowHeightProperty; - } - - public RowHeightProperty getContentRowHeightProperty() { - return contentRowHeightProperty; - } - - public void setContentRowHeightProperty(RowHeightProperty contentRowHeightProperty) { - this.contentRowHeightProperty = contentRowHeightProperty; - } - - public OnceAbsoluteMergeProperty getOnceAbsoluteMergeProperty() { - return onceAbsoluteMergeProperty; - } - - public void setOnceAbsoluteMergeProperty(OnceAbsoluteMergeProperty onceAbsoluteMergeProperty) { - this.onceAbsoluteMergeProperty = onceAbsoluteMergeProperty; - } - /** * Calculate all cells that need to be merged * diff --git a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java index f5984a1e..52b1cc04 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java @@ -21,7 +21,7 @@ public class FillStyleAnnotatedData { @ContentFontStyle(bold = BooleanEnum.TRUE, color = 16) private Double number; @ContentStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 17) - @ContentFontStyle(bold = BooleanEnum.TRUE, color = 18) + @ContentFontStyle(bold = BooleanEnum.TRUE, color = 58) private Date date; @ContentStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 12) @ContentFontStyle(bold = BooleanEnum.TRUE, color = 18) diff --git a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java index d1d45322..13367904 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java @@ -63,26 +63,26 @@ public class FillStyleAnnotatedTest { XSSFCell cell0 = row.getCell(0); Assert.assertEquals("张三", cell0.getStringCellValue()); Assert.assertEquals(49, cell0.getCellStyle().getDataFormat()); - Assert.assertEquals("FF00B050", cell0.getCellStyle().getFillForegroundColorColor().getARGBHex()); - Assert.assertEquals("FF7030A0", cell0.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertEquals("FFFFFF00", cell0.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF808000", cell0.getCellStyle().getFont().getXSSFColor().getARGBHex()); Assert.assertTrue(cell0.getCellStyle().getFont().getBold()); XSSFCell cell1 = row.getCell(1); - Assert.assertEquals("5", cell1.getStringCellValue()); + Assert.assertEquals(5.2, cell1.getNumericCellValue(), 1); Assert.assertEquals(0, cell1.getCellStyle().getDataFormat()); - Assert.assertEquals("FF92D050", cell1.getCellStyle().getFillForegroundColorColor().getARGBHex()); - Assert.assertEquals("FF4BACC6", cell1.getCellStyle().getFont().getXSSFColor().getARGBHex()); - Assert.assertFalse(cell1.getCellStyle().getFont().getBold()); + Assert.assertEquals("FFFF0000", cell1.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF800000", cell1.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertTrue(cell1.getCellStyle().getFont().getBold()); XSSFCell cell2 = row.getCell(2); Assert.assertEquals("2020-01-01 01:01:01", DateUtils.format(cell2.getDateCellValue(), "yyyy-MM-dd HH:mm:ss")); Assert.assertEquals("yyyy-MM-dd HH:mm:ss", cell2.getCellStyle().getDataFormatString()); - Assert.assertEquals("FFFFC000", cell2.getCellStyle().getFillForegroundColorColor().getARGBHex()); - Assert.assertEquals("FFC0504D", cell2.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertEquals("FF008000", cell2.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF003300", cell2.getCellStyle().getFont().getXSSFColor().getARGBHex()); Assert.assertTrue(cell2.getCellStyle().getFont().getBold()); XSSFCell cell3 = row.getCell(3); - Assert.assertEquals("张三今年5岁了", cell3.getStringCellValue()); + Assert.assertEquals("张三今年5.2岁了", cell3.getStringCellValue()); Assert.assertEquals(0, cell3.getCellStyle().getDataFormat()); Assert.assertEquals("FFFF0000", cell3.getCellStyle().getFillForegroundColorColor().getARGBHex()); Assert.assertEquals("FFEEECE1", cell3.getCellStyle().getFont().getXSSFColor().getARGBHex()); @@ -116,28 +116,28 @@ public class FillStyleAnnotatedTest { HSSFCell cell0 = row.getCell(0); Assert.assertEquals("张三", cell0.getStringCellValue()); Assert.assertEquals(49, cell0.getCellStyle().getDataFormat()); - Assert.assertEquals("0:8080:0", cell0.getCellStyle().getFillForegroundColorColor().getHexString()); - Assert.assertEquals("8080:0:8080", cell0.getCellStyle().getFont(workbook).getHSSFColor(workbook) + Assert.assertEquals("FFFF:FFFF:0", cell0.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("8080:8080:0", cell0.getCellStyle().getFont(workbook).getHSSFColor(workbook) .getHexString()); Assert.assertTrue(cell0.getCellStyle().getFont(workbook).getBold()); HSSFCell cell1 = row.getCell(1); - Assert.assertEquals("5", cell1.getStringCellValue()); + Assert.assertEquals(5.2, cell1.getNumericCellValue(), 1); Assert.assertEquals(0, cell1.getCellStyle().getDataFormat()); - Assert.assertEquals("9999:CCCC:0", cell1.getCellStyle().getFillForegroundColorColor().getHexString()); - Assert.assertEquals("0:8080:8080", cell1.getCellStyle().getFont(workbook).getHSSFColor(workbook) + Assert.assertEquals("FFFF:0:0", cell1.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("8080:0:0", cell1.getCellStyle().getFont(workbook).getHSSFColor(workbook) .getHexString()); - Assert.assertFalse(cell1.getCellStyle().getFont(workbook).getBold()); + Assert.assertTrue(cell1.getCellStyle().getFont(workbook).getBold()); HSSFCell cell2 = row.getCell(2); Assert.assertEquals("2020-01-01 01:01:01", DateUtils.format(cell2.getDateCellValue(), "yyyy-MM-dd HH:mm:ss")); Assert.assertEquals("yyyy-MM-dd HH:mm:ss", cell2.getCellStyle().getDataFormatString()); - Assert.assertEquals("FFFF:CCCC:0", cell2.getCellStyle().getFillForegroundColorColor().getHexString()); - Assert.assertEquals("8080:0:0", cell2.getCellStyle().getFont(workbook).getHSSFColor(workbook).getHexString()); + Assert.assertEquals("0:8080:0", cell2.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("0:3333:0", cell2.getCellStyle().getFont(workbook).getHSSFColor(workbook).getHexString()); Assert.assertTrue(cell2.getCellStyle().getFont(workbook).getBold()); HSSFCell cell3 = row.getCell(3); - Assert.assertEquals("张三今年5岁了", cell3.getStringCellValue()); + Assert.assertEquals("张三今年5.2岁了", cell3.getStringCellValue()); Assert.assertEquals(0, cell3.getCellStyle().getDataFormat()); Assert.assertEquals("FFFF:0:0", cell3.getCellStyle().getFillForegroundColorColor().getHexString()); Assert.assertEquals("FFFF:FFFF:9999", cell3.getCellStyle().getFont(workbook).getHSSFColor(workbook) diff --git a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java index e8af2e34..8e418549 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java @@ -72,7 +72,7 @@ public class FillStyleDataTest { Assert.assertTrue(cell0.getCellStyle().getFont().getBold()); XSSFCell cell1 = row.getCell(1); - Assert.assertEquals("5", cell1.getStringCellValue()); + Assert.assertEquals("5.2", cell1.getStringCellValue()); Assert.assertEquals(0, cell1.getCellStyle().getDataFormat()); Assert.assertEquals("FF92D050", cell1.getCellStyle().getFillForegroundColorColor().getARGBHex()); Assert.assertEquals("FF4BACC6", cell1.getCellStyle().getFont().getXSSFColor().getARGBHex()); @@ -86,7 +86,7 @@ public class FillStyleDataTest { Assert.assertTrue(cell2.getCellStyle().getFont().getBold()); XSSFCell cell3 = row.getCell(3); - Assert.assertEquals("张三今年5岁了", cell3.getStringCellValue()); + Assert.assertEquals("张三今年5.2岁了", cell3.getStringCellValue()); Assert.assertEquals(0, cell3.getCellStyle().getDataFormat()); Assert.assertEquals("FFFF0000", cell3.getCellStyle().getFillForegroundColorColor().getARGBHex()); Assert.assertEquals("FFEEECE1", cell3.getCellStyle().getFont().getXSSFColor().getARGBHex()); @@ -126,7 +126,7 @@ public class FillStyleDataTest { Assert.assertTrue(cell0.getCellStyle().getFont(workbook).getBold()); HSSFCell cell1 = row.getCell(1); - Assert.assertEquals("5", cell1.getStringCellValue()); + Assert.assertEquals("5.2", cell1.getStringCellValue()); Assert.assertEquals(0, cell1.getCellStyle().getDataFormat()); Assert.assertEquals("9999:CCCC:0", cell1.getCellStyle().getFillForegroundColorColor().getHexString()); Assert.assertEquals("0:8080:8080", cell1.getCellStyle().getFont(workbook).getHSSFColor(workbook) @@ -141,7 +141,7 @@ public class FillStyleDataTest { Assert.assertTrue(cell2.getCellStyle().getFont(workbook).getBold()); HSSFCell cell3 = row.getCell(3); - Assert.assertEquals("张三今年5岁了", cell3.getStringCellValue()); + Assert.assertEquals("张三今年5.2岁了", cell3.getStringCellValue()); Assert.assertEquals(0, cell3.getCellStyle().getDataFormat()); Assert.assertEquals("FFFF:0:0", cell3.getCellStyle().getFillForegroundColorColor().getHexString()); Assert.assertEquals("FFFF:FFFF:9999", cell3.getCellStyle().getFont(workbook).getHSSFColor(workbook) @@ -187,7 +187,7 @@ public class FillStyleDataTest { Assert.assertTrue(cell0.getCellStyle().getFont().getBold()); XSSFCell cell1 = row.getCell(1); - Assert.assertEquals("5", cell1.getStringCellValue()); + Assert.assertEquals(5.2, cell1.getNumericCellValue(), 1); Assert.assertEquals(0, cell1.getCellStyle().getDataFormat()); Assert.assertEquals("FFFF0000", cell1.getCellStyle().getFillForegroundColorColor().getARGBHex()); Assert.assertEquals("FF800000", cell1.getCellStyle().getFont().getXSSFColor().getARGBHex()); @@ -201,28 +201,27 @@ public class FillStyleDataTest { Assert.assertTrue(cell2.getCellStyle().getFont().getBold()); XSSFCell cell3 = row.getCell(3); - Assert.assertEquals("张三今年5岁了", cell3.getStringCellValue()); + Assert.assertEquals("张三今年5.2岁了", cell3.getStringCellValue()); Assert.assertEquals(0, cell3.getCellStyle().getDataFormat()); - Assert.assertEquals("FF0000FF", cell3.getCellStyle().getFillForegroundColorColor().getARGBHex()); - Assert.assertEquals("FF000080", cell3.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertEquals("FFFF0000", cell3.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FFEEECE1", cell3.getCellStyle().getFont().getXSSFColor().getARGBHex()); Assert.assertTrue(cell3.getCellStyle().getFont().getBold()); XSSFCell cell4 = row.getCell(4); Assert.assertEquals("{.name}忽略，张三", cell4.getStringCellValue()); Assert.assertEquals(0, cell4.getCellStyle().getDataFormat()); - Assert.assertEquals("FFFFFF00", cell4.getCellStyle().getFillForegroundColorColor().getARGBHex()); - Assert.assertEquals("FF808000", cell4.getCellStyle().getFont().getXSSFColor().getARGBHex()); - Assert.assertTrue(cell4.getCellStyle().getFont().getBold()); + Assert.assertEquals("FFC00000", cell4.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF000000", cell4.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertFalse(cell4.getCellStyle().getFont().getBold()); XSSFCell cell5 = row.getCell(5); Assert.assertEquals("空", cell5.getStringCellValue()); Assert.assertEquals(0, cell5.getCellStyle().getDataFormat()); - Assert.assertEquals("FF008080", cell5.getCellStyle().getFillForegroundColorColor().getARGBHex()); - Assert.assertEquals("FF003366", cell5.getCellStyle().getFont().getXSSFColor().getARGBHex()); - Assert.assertTrue(cell5.getCellStyle().getFont().getBold()); + Assert.assertEquals("FFF79646", cell5.getCellStyle().getFillForegroundColorColor().getARGBHex()); + Assert.assertEquals("FF8064A2", cell5.getCellStyle().getFont().getXSSFColor().getARGBHex()); + Assert.assertFalse(cell5.getCellStyle().getFont().getBold()); } - @Test public void t12FillStyleHandler03() throws Exception { fillStyleHandler(fileStyleHandler03, fileStyleTemplate03); @@ -242,7 +241,7 @@ public class FillStyleDataTest { Assert.assertTrue(cell0.getCellStyle().getFont(workbook).getBold()); HSSFCell cell1 = row.getCell(1); - Assert.assertEquals("5", cell1.getStringCellValue()); + Assert.assertEquals(5.2, cell1.getNumericCellValue(), 1); Assert.assertEquals(0, cell1.getCellStyle().getDataFormat()); Assert.assertEquals("FFFF:0:0", cell1.getCellStyle().getFillForegroundColorColor().getHexString()); Assert.assertEquals("8080:0:0", cell1.getCellStyle().getFont(workbook).getHSSFColor(workbook) @@ -257,32 +256,32 @@ public class FillStyleDataTest { Assert.assertTrue(cell2.getCellStyle().getFont(workbook).getBold()); HSSFCell cell3 = row.getCell(3); - Assert.assertEquals("张三今年5岁了", cell3.getStringCellValue()); + Assert.assertEquals("张三今年5.2岁了", cell3.getStringCellValue()); Assert.assertEquals(0, cell3.getCellStyle().getDataFormat()); - Assert.assertEquals("0:0:FFFF", cell3.getCellStyle().getFillForegroundColorColor().getHexString()); - Assert.assertEquals("0:0:8080", cell3.getCellStyle().getFont(workbook).getHSSFColor(workbook) + Assert.assertEquals("FFFF:0:0", cell3.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("FFFF:FFFF:9999", cell3.getCellStyle().getFont(workbook).getHSSFColor(workbook) .getHexString()); Assert.assertTrue(cell3.getCellStyle().getFont(workbook).getBold()); HSSFCell cell4 = row.getCell(4); Assert.assertEquals("{.name}忽略，张三", cell4.getStringCellValue()); Assert.assertEquals(0, cell4.getCellStyle().getDataFormat()); - Assert.assertEquals("FFFF:FFFF:0", cell4.getCellStyle().getFillForegroundColorColor().getHexString()); - Assert.assertEquals("8080:8080:0", cell4.getCellStyle().getFont(workbook).getHSSFColor(workbook) + Assert.assertEquals("9999:3333:0", cell4.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("3333:3333:3333", cell4.getCellStyle().getFont(workbook).getHSSFColor(workbook) .getHexString()); - Assert.assertTrue(cell4.getCellStyle().getFont(workbook).getBold()); + Assert.assertFalse(cell4.getCellStyle().getFont(workbook).getBold()); HSSFCell cell5 = row.getCell(5); Assert.assertEquals("空", cell5.getStringCellValue()); Assert.assertEquals(0, cell5.getCellStyle().getDataFormat()); - Assert.assertEquals("0:8080:8080", cell5.getCellStyle().getFillForegroundColorColor().getHexString()); - Assert.assertEquals("0:3333:6666", cell5.getCellStyle().getFont(workbook).getHSSFColor(workbook) + Assert.assertEquals("9999:3333:0", cell5.getCellStyle().getFillForegroundColorColor().getHexString()); + Assert.assertEquals("CCCC:9999:FFFF", cell5.getCellStyle().getFont(workbook).getHSSFColor(workbook) .getHexString()); - Assert.assertTrue(cell5.getCellStyle().getFont(workbook).getBold()); + Assert.assertFalse(cell5.getCellStyle().getFont(workbook).getBold()); } private void fillStyleHandler(File file, File template) throws Exception { - EasyExcel.write(file, FillData.class).withTemplate(template).sheet() + EasyExcel.write(file, FillStyleData.class).withTemplate(template).sheet() .registerWriteHandler(new AbstractVerticalCellStyleStrategy() { @Override diff --git a/src/test/resources/fill/style.xls b/src/test/resources/fill/style.xls index 9e7ca73971419c9ef6aba3643a8b5fbc236ff734..3127743c0d0dd5655d3f7bf37dc55265c9f491b6 100644 GIT binary patch delta 2791 zcmchZTWl0n7=ZsXvpe0grOe*D+bz2!8cU0GyG^4BwcVDTrVkc~D8b0U1;@Xqy;Fniyh}MtH!a8sB{I61+X=`k!<5On1B8Ci=j6 zm^tVBujfDiT#nvmM{l!B4H}zs)@si%JfSC@hdtvAb9xfPx|x`t-nG3G!f*%b;6Avf z0WdfQ8k?WSX+5gZ?H@gwE!S$V&{Ea_eK5{|M#=i7uy$^EH)*y(__w0TrKK^OUZkM+ zh}$YE-S27OQrs>4{yzg_dwqu;BYRQ5DQY~>5#Wm82Gq+V`?GXpr3R=| zM|roB`xIY*VVb5?!_?El7H2O7ekEA5WRRxmx+=abK!ehEk5cvuIb7CTvR5LCFMz!d zpx4dFfK4mz%z(BPIe+ZM23`*YPWeyy!SjZwP|)QE4$P!xQsDVS@UY_U26o72CsZYn zJfQdj?4@Z!RlQ zl}c{A2A@_6Tu!Y=omcHhc3w6ANa(vS)pLPB)E}jKpAo!?5@kTA!CQ@n4VtW(UU&n3&W98<|L*u z2(wRqn{&n*gF1d3G4acUg}0h5{4r@^vBknr%EAZI7W#-KiDii8*IT%o__M^f5#LAr zF!AHWr-)xpcj3#Cp!0P2DTe;2g*PJI7)d;V1qz^rcjETAi8HYRCSoR@Zkoiq@eMd0 zFmW^8c@mE|bqn3|p`BtqOg`FTlQ49nKcm1mDe(8HZahx1k$8c% z;>kdWG5pSq#72FsFj}$YKH9dD^(>R+NT%W5P{j67)6jPu;L>mrip8&rTSi((earRx zxjw8VT^-mg53@Ow*|Tw^wN2Sie7&0eK!v?`$=-Gy6lYB{AH^uhFTm<+_53*6w@!6_g{U4%M93caR2`2 zI}6YV=W}Hw%gI4}yYnpbVt+P4*FD)5y1tlA(e;d&U(NQ?{Euu;vlkxX#$ps9NRQ;N z9RU0leb{-d>sUj}9G#6phvL`5B{hCp06+Hvv^u}^U0^oNX#5TQL%^Vya#JgfR{TJu zOs5sEj$CjJ`mFu`km?gD5J8tjGc3)@?(UY7xq3gb$JKtQpev9eO{7}a_eD09pXuE$8vW)ZBp*r?26G16P delta 2238 zcmbW2YiJx*6vxk<+1W>SH#_^xzLIQ_B5A8;HwF#F&1Rbk`4BN05j6_7kg7pzKJ-I{ zm~B6-LgNE+nih>u5R}?S%0yJqc7qfIi&zM>U_Y!-@MA#Y3n}s3JGtYu$$Zd(y?g$@ zbM86k&YYb+a*Z9i#+E_~TQS4RvkYHX(|AbDvm_SPI4)~C_N#vFIsn`)$fKIB%uV2| zmWt0!j6YO_1Y8Fn?1rxu0A|+IkC@rib}9I)Fa5thPX^L8M&*9n&;gdo;FsrvLX#?O zCLFBP{&2}8S)nW6mTsRFA&61tSj<;rMEB{=?hh;@-ZSIqNWRrVKA`cG}@iy-lJRtdD887(LKvQ_zh90pYw1u|_ z-U3A{epDuk7H0ejn2`+%JPc>M;&+-ST4O2}be)y4sCTmgS_}A8PLEV5N`)}pK^0iT zj}ONZetOHo{EuTBcr>1E9drcr#PLcpDf|rp;g3`u{>!62N{~`nBY^vo?UB6>A8Tkl zIlh(C)W+uCA*a8o*#6DjF~j!rmZrNu+`wigslw72u4P~3=fSJ#NBFlnpW4r`FWrlC zaUIv&416JH;BdZ<7cx4Y&n;kIrjFm|b-a}A#pgS8{2{Y|$Fn=Ii~KKl)Nwpp#DnQ4 zFqzQtr@Vn*Mh$!{Zs2;tz(Tu$H%Tv&?n@dtNxB*{ut|EB^eNJ>k={wM-;!PG(ZP@%r0QeZE=-KA1tC@%{0Gz>g2D1IK6(x8fWR4W;;NX@7*vedVE z*}xiCI8*IrD|n{brra1b-yC{{(QUCAJ8ix(G)u?~4c}n%BbWRy)&KsZah0j&m63ZQ TI6dVxmB)XNv5NWEl#l%b!!*zK diff --git a/src/test/resources/fill/style.xlsx b/src/test/resources/fill/style.xlsx index 234c3b30852827f436ef2d7157903f8b69f8cda4..062540d0d8ef0a5cfb0ee83b76e798e468bdac96 100644 GIT binary patch delta 3268 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 T1xelnDq__ng=v{#KNJ4|lWyL< delta 3208 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 N&O%v+1*C9%@lS#4+|mF5 diff --git a/update.md b/update.md index ca31cb5b..70e11c8c 100644 --- a/update.md +++ b/update.md @@ -2,6 +2,7 @@ * 升级到正式版 * 修复填充样式可能丢失的问题 [Issue #2124](https://github.com/alibaba/easyexcel/issues/2124) * 修复填充数据为空 可能NPE的bug +* 修复填充样式可能不生效bug # 3.0.0-beta3 From 2319610f3736608d8937043fc83c39f69f202ca0 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Wed, 20 Oct 2021 23:56:09 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=99=E7=9A=84?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../easyexcel/test/core/StyleTestUtils.java | 43 ++++++++++++ .../test/core/style/StyleDataTest.java | 65 +++++++++++++++---- 2 files changed, 97 insertions(+), 11 deletions(-) create mode 100644 src/test/java/com/alibaba/easyexcel/test/core/StyleTestUtils.java diff --git a/src/test/java/com/alibaba/easyexcel/test/core/StyleTestUtils.java b/src/test/java/com/alibaba/easyexcel/test/core/StyleTestUtils.java new file mode 100644 index 00000000..266f724a --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/core/StyleTestUtils.java @@ -0,0 +1,43 @@ +package com.alibaba.easyexcel.test.core; + +import org.apache.poi.hssf.usermodel.HSSFCell; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFCell; + +public class StyleTestUtils { + + public static byte[] getFillForegroundColor(Cell cell) { + if (cell instanceof XSSFCell) { + return ((XSSFCell)cell).getCellStyle().getFillForegroundColorColor().getRGB(); + } else { + return short2byte(((HSSFCell)cell).getCellStyle().getFillForegroundColorColor().getTriplet()); + } + } + + public static byte[] getFontColor(Cell cell, Workbook workbook) { + if (cell instanceof XSSFCell) { + return ((XSSFCell)cell).getCellStyle().getFont().getXSSFColor().getRGB(); + } else { + return short2byte(((HSSFCell)cell).getCellStyle().getFont(workbook).getHSSFColor((HSSFWorkbook)workbook) + .getTriplet()); + } + } + + public static short getFontHeightInPoints(Cell cell, Workbook workbook) { + if (cell instanceof XSSFCell) { + return ((XSSFCell)cell).getCellStyle().getFont().getFontHeightInPoints(); + } else { + return ((HSSFCell)cell).getCellStyle().getFont(workbook).getFontHeightInPoints(); + } + } + + private static byte[] short2byte(short[] shorts) { + byte[] bytes = new byte[shorts.length]; + for (int i = 0; i < shorts.length; i++) { + bytes[i] = (byte)shorts[i]; + } + return bytes; + } +} diff --git a/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java index ceb571db..a48c3238 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java @@ -4,14 +4,15 @@ import java.io.File; import java.util.ArrayList; import java.util.List; +import com.alibaba.easyexcel.test.core.StyleTestUtils; import com.alibaba.easyexcel.test.util.TestFileUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.annotation.write.style.HeadFontStyle; import com.alibaba.excel.annotation.write.style.HeadStyle; import com.alibaba.excel.metadata.Head; +import com.alibaba.excel.metadata.data.DataFormatData; import com.alibaba.excel.metadata.property.FontProperty; import com.alibaba.excel.metadata.property.StyleProperty; -import com.alibaba.excel.metadata.data.DataFormatData; import com.alibaba.excel.write.merge.LoopMergeStrategy; import com.alibaba.excel.write.merge.OnceAbsoluteMergeStrategy; import com.alibaba.excel.write.metadata.style.WriteCellStyle; @@ -22,11 +23,17 @@ import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.alibaba.excel.write.style.row.SimpleRowHeightStyleStrategy; import org.apache.poi.ss.usermodel.BorderStyle; +import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.FillPatternType; import org.apache.poi.ss.usermodel.Font; import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.IndexedColors; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.WorkbookFactory; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.FixMethodOrder; import org.junit.Test; @@ -40,20 +47,26 @@ public class StyleDataTest { private static File file07; private static File file03; + private static File fileVerticalCellStyleStrategy07; + private static File fileVerticalCellStyleStrategy207; + private static File fileLoopMergeStrategy; @BeforeClass public static void init() { file07 = TestFileUtil.createNewFile("style07.xlsx"); file03 = TestFileUtil.createNewFile("style03.xls"); + fileVerticalCellStyleStrategy07 = TestFileUtil.createNewFile("verticalCellStyle.xlsx"); + fileVerticalCellStyleStrategy207 = TestFileUtil.createNewFile("verticalCellStyle2.xlsx"); + fileLoopMergeStrategy = TestFileUtil.createNewFile("loopMergeStrategy.xlsx"); } @Test - public void t01ReadAndWrite07() { + public void t01ReadAndWrite07() throws Exception { readAndWrite(file07); } @Test - public void t02ReadAndWrite03() { + public void t02ReadAndWrite03() throws Exception { readAndWrite(file03); } @@ -113,9 +126,12 @@ public class StyleDataTest { return writeCellStyle; } }; - EasyExcel.write(file07, StyleData.class).registerWriteHandler(verticalCellStyleStrategy).sheet() + EasyExcel.write(fileVerticalCellStyleStrategy07, StyleData.class).registerWriteHandler( + verticalCellStyleStrategy).sheet() .doWrite(data()); + } + @Test public void t04AbstractVerticalCellStyleStrategy02() { final StyleProperty styleProperty = StyleProperty.build(StyleData.class.getAnnotation(HeadStyle.class)); @@ -152,32 +168,36 @@ public class StyleDataTest { return writeCellStyle; } }; - EasyExcel.write(file07, StyleData.class).registerWriteHandler(verticalCellStyleStrategy).sheet() + EasyExcel.write(fileVerticalCellStyleStrategy207, StyleData.class).registerWriteHandler( + verticalCellStyleStrategy).sheet() .doWrite(data()); } @Test public void t05LoopMergeStrategy() { - EasyExcel.write(file07, StyleData.class).sheet().registerWriteHandler(new LoopMergeStrategy(2, 1)) + EasyExcel.write(fileLoopMergeStrategy, StyleData.class).sheet().registerWriteHandler( + new LoopMergeStrategy(2, 1)) .doWrite(data10()); } - private void readAndWrite(File file) { + private void readAndWrite(File file) throws Exception { SimpleColumnWidthStyleStrategy simpleColumnWidthStyleStrategy = new SimpleColumnWidthStyleStrategy(50); SimpleRowHeightStyleStrategy simpleRowHeightStyleStrategy = new SimpleRowHeightStyleStrategy((short)40, (short)50); WriteCellStyle headWriteCellStyle = new WriteCellStyle(); - headWriteCellStyle.setFillForegroundColor(IndexedColors.RED.getIndex()); + headWriteCellStyle.setFillForegroundColor(IndexedColors.YELLOW.getIndex()); WriteFont headWriteFont = new WriteFont(); headWriteFont.setFontHeightInPoints((short)20); + headWriteFont.setColor(IndexedColors.DARK_YELLOW.getIndex()); headWriteCellStyle.setWriteFont(headWriteFont); WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); contentWriteCellStyle.setFillPatternType(FillPatternType.SOLID_FOREGROUND); - contentWriteCellStyle.setFillForegroundColor(IndexedColors.GREEN.getIndex()); + contentWriteCellStyle.setFillForegroundColor(IndexedColors.TEAL.getIndex()); WriteFont contentWriteFont = new WriteFont(); - contentWriteFont.setFontHeightInPoints((short)20); - headWriteCellStyle.setWriteFont(contentWriteFont); + contentWriteFont.setFontHeightInPoints((short)30); + contentWriteFont.setColor(IndexedColors.DARK_TEAL.getIndex()); + contentWriteCellStyle.setWriteFont(contentWriteFont); HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); @@ -186,6 +206,29 @@ public class StyleDataTest { .registerWriteHandler(simpleRowHeightStyleStrategy).registerWriteHandler(horizontalCellStyleStrategy) .registerWriteHandler(onceAbsoluteMergeStrategy).sheet().doWrite(data()); EasyExcel.read(file, StyleData.class, new StyleDataListener()).sheet().doRead(); + + Workbook workbook = WorkbookFactory.create(file); + Sheet sheet = workbook.getSheetAt(0); + Row row0 = sheet.getRow(0); + Cell cell00 = row0.getCell(0); + Assert.assertArrayEquals(new byte[] {-1, -1, 0}, StyleTestUtils.getFillForegroundColor(cell00)); + Assert.assertArrayEquals(new byte[] {-128, -128, 0}, StyleTestUtils.getFontColor(cell00, workbook)); + Assert.assertEquals(20, StyleTestUtils.getFontHeightInPoints(cell00, workbook)); + + Cell cell01 = row0.getCell(1); + Assert.assertArrayEquals(new byte[] {-1, -1, 0}, StyleTestUtils.getFillForegroundColor(cell01)); + Assert.assertArrayEquals(new byte[] {-128, -128, 0}, StyleTestUtils.getFontColor(cell01, workbook)); + Assert.assertEquals(20, StyleTestUtils.getFontHeightInPoints(cell01, workbook)); + + Row row1 = sheet.getRow(1); + Cell cell10 = row1.getCell(0); + Assert.assertArrayEquals(new byte[] {0, -128, -128}, StyleTestUtils.getFillForegroundColor(cell10)); + Assert.assertArrayEquals(new byte[] {0, 51, 102}, StyleTestUtils.getFontColor(cell10, workbook)); + Assert.assertEquals(30, StyleTestUtils.getFontHeightInPoints(cell10, workbook)); + Cell cell11 = row1.getCell(1); + Assert.assertArrayEquals(new byte[] {0, -128, -128}, StyleTestUtils.getFillForegroundColor(cell11)); + Assert.assertArrayEquals(new byte[] {0, 51, 102}, StyleTestUtils.getFontColor(cell11, workbook)); + Assert.assertEquals(30, StyleTestUtils.getFontHeightInPoints(cell11, workbook)); } private List data() { From 68200389fb5b72dc38e3f1233e8e18097d6e629e Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Thu, 21 Oct 2021 00:02:10 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E8=B6=85=E8=BF=87=E6=9C=80=E5=A4=A7=E9=99=90?= =?UTF-8?q?=E5=88=B6=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metadata/holder/WriteWorkbookHolder.java | 21 ++++++++++--------- update.md | 1 + 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java index 494473dc..73a680d6 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java @@ -10,6 +10,7 @@ import java.io.OutputStream; import java.nio.charset.Charset; import java.util.HashMap; import java.util.Map; +import java.util.Objects; import com.alibaba.excel.enums.HolderEnum; import com.alibaba.excel.exception.ExcelGenerateException; @@ -133,15 +134,15 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { /** * Used to cell style. */ - private Map> cellStyleIndexMap; + private Map> cellStyleIndexMap; /** * Used to font. */ - private Map fontMap; + private Map fontMap; /** * Used to data format. */ - private Map dataFormatMap; + private Map dataFormatMap; public WriteWorkbookHolder(WriteWorkbook writeWorkbook) { super(writeWorkbook, null); @@ -267,9 +268,9 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { useCache = false; } - Map cellStyleMap = cellStyleIndexMap.computeIfAbsent(styleIndex, + Map cellStyleMap = cellStyleIndexMap.computeIfAbsent(styleIndex, key -> MapUtils.newHashMap()); - CellStyle cellStyle = cellStyleMap.get(writeCellStyle); + CellStyle cellStyle = cellStyleMap.get(Objects.toString(writeCellStyle)); if (cellStyle != null) { return cellStyle; } @@ -285,7 +286,7 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { if (font != null) { cellStyle.setFont(font); } - cellStyleMap.put(writeCellStyle, cellStyle); + cellStyleMap.put(Objects.toString(writeCellStyle), cellStyle); return cellStyle; } @@ -301,12 +302,12 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { if (!useCache) { return StyleUtil.buildFont(workbook, originFont, writeFont); } - Font font = fontMap.get(writeFont); + Font font = fontMap.get(Objects.toString(writeFont)); if (font != null) { return font; } font = StyleUtil.buildFont(workbook, originFont, writeFont); - fontMap.put(writeFont, font); + fontMap.put(Objects.toString(writeFont), font); return font; } @@ -324,12 +325,12 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { if (!useCache) { return StyleUtil.buildDataFormat(workbook, dataFormatData); } - Short dataFormat = dataFormatMap.get(dataFormatData); + Short dataFormat = dataFormatMap.get(Objects.toString(dataFormatData)); if (dataFormat != null) { return dataFormat; } dataFormat = StyleUtil.buildDataFormat(workbook, dataFormatData); - dataFormatMap.put(dataFormatData, dataFormat); + dataFormatMap.put(Objects.toString(dataFormatData), dataFormat); return dataFormat; } diff --git a/update.md b/update.md index 70e11c8c..bb9763b1 100644 --- a/update.md +++ b/update.md @@ -3,6 +3,7 @@ * 修复填充样式可能丢失的问题 [Issue #2124](https://github.com/alibaba/easyexcel/issues/2124) * 修复填充数据为空 可能NPE的bug * 修复填充样式可能不生效bug +* 修复样式可能超过最大限制的bug # 3.0.0-beta3 From 66cb5472778fa364a2c7e76b0ed144a1282bc759 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Thu, 21 Oct 2021 15:38:52 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=A1=88=E4=BE=8B=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/alibaba/excel/util/ClassUtils.java | 10 +++++ .../com/alibaba/excel/util/StyleUtil.java | 2 +- .../property/ExcelWriteHeadProperty.java | 1 - .../test/core/fill/FillDataTest.java | 2 +- .../core/fill/style/FillStyleDataTest.java | 7 ++- .../test/core/large/LargeDataTest.java | 43 +++++++++++++++++++ .../core/noncamel/UnCamelDataListener.java | 5 ++- 7 files changed, 61 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/alibaba/excel/util/ClassUtils.java b/src/main/java/com/alibaba/excel/util/ClassUtils.java index 491d4b3d..9020d56c 100644 --- a/src/main/java/com/alibaba/excel/util/ClassUtils.java +++ b/src/main/java/com/alibaba/excel/util/ClassUtils.java @@ -16,14 +16,18 @@ import java.util.concurrent.ConcurrentHashMap; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.DateTimeFormat; +import com.alibaba.excel.annotation.format.NumberFormat; import com.alibaba.excel.annotation.write.style.ContentFontStyle; import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.converters.AutoConverter; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.exception.ExcelCommonException; import com.alibaba.excel.metadata.Holder; +import com.alibaba.excel.metadata.property.DateTimeFormatProperty; import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.alibaba.excel.metadata.property.FontProperty; +import com.alibaba.excel.metadata.property.NumberFormatProperty; import com.alibaba.excel.metadata.property.StyleProperty; import com.alibaba.excel.write.metadata.holder.WriteHolder; @@ -175,6 +179,12 @@ public class ClassUtils { contentFontStyle = parentContentFontStyle; } excelContentProperty.setContentFontProperty(FontProperty.build(contentFontStyle)); + + excelContentProperty.setDateTimeFormatProperty( + DateTimeFormatProperty.build(field.getAnnotation(DateTimeFormat.class))); + excelContentProperty.setNumberFormatProperty( + NumberFormatProperty.build(field.getAnnotation(NumberFormat.class))); + fieldContentMap.put(field.getName(), excelContentProperty); } return fieldContentMap; diff --git a/src/main/java/com/alibaba/excel/util/StyleUtil.java b/src/main/java/com/alibaba/excel/util/StyleUtil.java index 93ae6577..1bafcdc8 100644 --- a/src/main/java/com/alibaba/excel/util/StyleUtil.java +++ b/src/main/java/com/alibaba/excel/util/StyleUtil.java @@ -142,7 +142,7 @@ public class StyleUtil { return null; } Font font = createFont(workbook, originFont, writeFont); - if (writeFont == null) { + if (writeFont == null || font == null) { return font; } if (writeFont.getFontName() != null) { diff --git a/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java b/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java index 692a510a..7f52cd1d 100644 --- a/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java +++ b/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java @@ -54,7 +54,6 @@ public class ExcelWriteHeadProperty extends ExcelHeadProperty { HeadFontStyle parentHeadFontStyle = headClazz.getAnnotation(HeadFontStyle.class); for (Map.Entry entry : getHeadMap().entrySet()) { - Integer index = entry.getKey(); Head headData = entry.getValue(); if (headData == null) { throw new IllegalArgumentException( diff --git a/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java index 6cd629f6..e85d63a6 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java @@ -91,7 +91,7 @@ public class FillDataTest { public void t03FillCsv() { ExcelGenerateException excelGenerateException = Assert.assertThrows(ExcelGenerateException.class, () -> fill(fileCsv, simpleTemplateCsv)); - Assert.assertEquals("Calling the 'fill' method must use a template.", excelGenerateException.getMessage()); + Assert.assertEquals("csv cannot use template.", excelGenerateException.getMessage()); } @Test diff --git a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java index 8e418549..210a5b9f 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java @@ -4,7 +4,6 @@ import java.io.File; import java.io.FileInputStream; import java.util.List; -import com.alibaba.easyexcel.test.core.fill.FillData; import com.alibaba.easyexcel.test.util.TestFileUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.metadata.Head; @@ -72,7 +71,7 @@ public class FillStyleDataTest { Assert.assertTrue(cell0.getCellStyle().getFont().getBold()); XSSFCell cell1 = row.getCell(1); - Assert.assertEquals("5.2", cell1.getStringCellValue()); + Assert.assertEquals(5.2, cell1.getNumericCellValue(), 1); Assert.assertEquals(0, cell1.getCellStyle().getDataFormat()); Assert.assertEquals("FF92D050", cell1.getCellStyle().getFillForegroundColorColor().getARGBHex()); Assert.assertEquals("FF4BACC6", cell1.getCellStyle().getFont().getXSSFColor().getARGBHex()); @@ -126,7 +125,7 @@ public class FillStyleDataTest { Assert.assertTrue(cell0.getCellStyle().getFont(workbook).getBold()); HSSFCell cell1 = row.getCell(1); - Assert.assertEquals("5.2", cell1.getStringCellValue()); + Assert.assertEquals(5.2, cell1.getNumericCellValue(), 1); Assert.assertEquals(0, cell1.getCellStyle().getDataFormat()); Assert.assertEquals("9999:CCCC:0", cell1.getCellStyle().getFillForegroundColorColor().getHexString()); Assert.assertEquals("0:8080:8080", cell1.getCellStyle().getFont(workbook).getHSSFColor(workbook) @@ -166,7 +165,7 @@ public class FillStyleDataTest { } private void fill(File file, File template) throws Exception { - EasyExcel.write(file, FillData.class).withTemplate(template).sheet().doFill(data()); + EasyExcel.write(file, FillStyleData.class).withTemplate(template).sheet().doFill(data()); } @Test diff --git a/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java index 957894e2..e1038f03 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java @@ -1,6 +1,7 @@ package com.alibaba.easyexcel.test.core.large; import java.io.File; +import java.io.FileOutputStream; import java.util.ArrayList; import java.util.List; @@ -9,6 +10,10 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; +import org.apache.poi.xssf.streaming.SXSSFCell; +import org.apache.poi.xssf.streaming.SXSSFRow; +import org.apache.poi.xssf.streaming.SXSSFSheet; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.junit.BeforeClass; import org.junit.FixMethodOrder; import org.junit.Test; @@ -25,11 +30,16 @@ public class LargeDataTest { private static File fileFill07; private static File template07; private static File fileCsv; + private static File fileWrite07; + private static File fileWritePoi07; + private int i = 0; @BeforeClass public static void init() { fileFill07 = TestFileUtil.createNewFile("largefill07.xlsx"); + fileWrite07 = TestFileUtil.createNewFile("large" + File.separator + "fileWrite07.xlsx"); + fileWritePoi07 = TestFileUtil.createNewFile("large" + File.separator + "fileWritePoi07.xlsx"); template07 = TestFileUtil.readFile("large" + File.separator + "fill.xlsx"); fileCsv = TestFileUtil.createNewFile("largefileCsv.csv"); } @@ -72,6 +82,39 @@ public class LargeDataTest { LOGGER.info("CSV large data total time spent:{}", System.currentTimeMillis() - start); } + @Test + public void t04Write() throws Exception { + long start = System.currentTimeMillis(); + ExcelWriter excelWriter = EasyExcel.write(fileWrite07).build(); + WriteSheet writeSheet = EasyExcel.writerSheet().build(); + for (int j = 0; j < 100; j++) { + excelWriter.write(data(), writeSheet); + LOGGER.info("{} write success.", j); + } + excelWriter.finish(); + LOGGER.info("write cost:{}", System.currentTimeMillis() - start); + start = System.currentTimeMillis(); + try (FileOutputStream fileOutputStream = new FileOutputStream(fileWritePoi07)) { + SXSSFWorkbook workbook = new SXSSFWorkbook(); + SXSSFSheet sheet = workbook.createSheet("sheet1"); + for (int i = 0; i < 100 * 5000; i++) { + SXSSFRow row = sheet.createRow(i); + for (int j = 0; j < 25; j++) { + SXSSFCell cell = row.createCell(j); + cell.setCellValue("str-" + j + "-" + i); + } + if (i % 5000 == 0) { + LOGGER.info("{} write success.", i); + } + } + workbook.write(fileOutputStream); + workbook.dispose(); + workbook.close(); + } + + LOGGER.info("poi write cost:{}", System.currentTimeMillis() - start); + } + private List data() { List list = new ArrayList<>(); int size = i + 5000; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataListener.java b/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataListener.java index 2f36d665..b307ddb4 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataListener.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataListener.java @@ -22,11 +22,12 @@ public class UnCamelDataListener extends AnalysisEventListener { public void invokeHeadMap(Map headMap, AnalysisContext context) { log.debug("Head is:{}", JSON.toJSONString(headMap)); Assert.assertEquals(headMap.get(0), "string1"); - Assert.assertEquals(headMap.get(1), "String2"); - Assert.assertEquals(headMap.get(2), "sTring3"); + Assert.assertEquals(headMap.get(1), "string2"); + Assert.assertEquals(headMap.get(2), "STring3"); Assert.assertEquals(headMap.get(3), "STring4"); Assert.assertEquals(headMap.get(4), "STRING5"); Assert.assertEquals(headMap.get(5), "STRing6"); + } @Override From a42a511a55f3f0b518ca65c128f17023df64c68c Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Thu, 21 Oct 2021 16:20:59 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=99=E5=85=A5?= =?UTF-8?q?=E8=BF=87=E6=85=A2=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/AbstractExcelWriteExecutor.java | 6 +-- .../write/executor/ExcelWriteAddExecutor.java | 49 ++++++++++--------- .../executor/ExcelWriteFillExecutor.java | 2 +- 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java b/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java index 92e42419..597d94de 100644 --- a/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java @@ -49,7 +49,7 @@ public abstract class AbstractExcelWriteExecutor implements ExcelWriteExecutor { protected WriteCellData converterAndSet(WriteHolder currentWriteHolder, Class clazz, CellDataTypeEnum targetType, Cell cell, Object value, ExcelContentProperty excelContentProperty, Head head, - Integer relativeRowIndex) { + Integer relativeRowIndex, int rowIndex, int columnIndex) { boolean needTrim = value != null && (value instanceof String && currentWriteHolder.globalConfiguration() .getAutoTrim()); if (needTrim) { @@ -72,8 +72,8 @@ public abstract class AbstractExcelWriteExecutor implements ExcelWriteExecutor { fillFormula(cell, cellData.getFormulaData()); // Fill index - cellData.setRowIndex(cell.getRowIndex()); - cellData.setColumnIndex(cell.getColumnIndex()); + cellData.setRowIndex(rowIndex); + cellData.setColumnIndex(columnIndex); if (cellData.getType() == null) { cellData.setType(CellDataTypeEnum.EMPTY); diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java index 6bfe34c2..bdfea49e 100644 --- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java @@ -59,26 +59,26 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { } } - private void addOneRowOfDataToExcel(Object oneRowData, int n, int relativeRowIndex, + private void addOneRowOfDataToExcel(Object oneRowData, int rowIndex, int relativeRowIndex, Map sortedAllFiledMap) { if (oneRowData == null) { return; } - WriteHandlerUtils.beforeRowCreate(writeContext, n, relativeRowIndex, Boolean.FALSE); - Row row = WorkBookUtil.createRow(writeContext.writeSheetHolder().getSheet(), n); + WriteHandlerUtils.beforeRowCreate(writeContext, rowIndex, relativeRowIndex, Boolean.FALSE); + Row row = WorkBookUtil.createRow(writeContext.writeSheetHolder().getSheet(), rowIndex); WriteHandlerUtils.afterRowCreate(writeContext, row, relativeRowIndex, Boolean.FALSE); if (oneRowData instanceof Collection) { - addBasicTypeToExcel(new CollectionRowData((Collection)oneRowData), row, relativeRowIndex); + addBasicTypeToExcel(new CollectionRowData((Collection)oneRowData), row, rowIndex, relativeRowIndex); } else if (oneRowData instanceof Map) { - addBasicTypeToExcel(new MapRowData((Map)oneRowData), row, relativeRowIndex); + addBasicTypeToExcel(new MapRowData((Map)oneRowData), row, rowIndex, relativeRowIndex); } else { - addJavaObjectToExcel(oneRowData, row, relativeRowIndex, sortedAllFiledMap); + addJavaObjectToExcel(oneRowData, row, rowIndex, relativeRowIndex, sortedAllFiledMap); } WriteHandlerUtils.afterRowDispose(writeContext, row, relativeRowIndex, Boolean.FALSE); } - private void addBasicTypeToExcel(RowData oneRowData, Row row, int relativeRowIndex) { + private void addBasicTypeToExcel(RowData oneRowData, Row row, int rowIndex, int relativeRowIndex) { if (oneRowData.isEmpty()) { return; } @@ -89,10 +89,10 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { if (dataIndex >= oneRowData.size()) { return; } - int cellIndex = entry.getKey(); + int columnIndex = entry.getKey(); Head head = entry.getValue(); - doAddBasicTypeToExcel(oneRowData, head, row, relativeRowIndex, dataIndex++, cellIndex); - maxCellIndex = Math.max(maxCellIndex, cellIndex); + doAddBasicTypeToExcel(oneRowData, head, row, rowIndex, relativeRowIndex, dataIndex++, columnIndex); + maxCellIndex = Math.max(maxCellIndex, columnIndex); } // Finish if (dataIndex >= oneRowData.size()) { @@ -104,29 +104,29 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { int size = oneRowData.size() - dataIndex; for (int i = 0; i < size; i++) { - doAddBasicTypeToExcel(oneRowData, null, row, relativeRowIndex, dataIndex++, maxCellIndex++); + doAddBasicTypeToExcel(oneRowData, null, row, rowIndex, relativeRowIndex, dataIndex++, maxCellIndex++); } } - private void doAddBasicTypeToExcel(RowData oneRowData, Head head, Row row, int relativeRowIndex, int dataIndex, - int cellIndex) { + private void doAddBasicTypeToExcel(RowData oneRowData, Head head, Row row, int rowIndex, int relativeRowIndex, + int dataIndex, int columnIndex) { ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(null, writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadClazz(), head == null ? null : head.getFieldName()); - WriteHandlerUtils.beforeCellCreate(writeContext, row, head, cellIndex, relativeRowIndex, Boolean.FALSE, + WriteHandlerUtils.beforeCellCreate(writeContext, row, head, columnIndex, relativeRowIndex, Boolean.FALSE, excelContentProperty); - Cell cell = WorkBookUtil.createCell(row, cellIndex); + Cell cell = WorkBookUtil.createCell(row, columnIndex); WriteHandlerUtils.afterCellCreate(writeContext, cell, head, relativeRowIndex, Boolean.FALSE, excelContentProperty); Object value = oneRowData.get(dataIndex); WriteCellData cellData = converterAndSet(writeContext.currentWriteHolder(), - FieldUtils.getFieldClass(value), null, cell, value, null, head, relativeRowIndex); + FieldUtils.getFieldClass(value), null, cell, value, null, head, relativeRowIndex, rowIndex, columnIndex); WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, head, relativeRowIndex, Boolean.FALSE, excelContentProperty); } - private void addJavaObjectToExcel(Object oneRowData, Row row, int relativeRowIndex, + private void addJavaObjectToExcel(Object oneRowData, Row row, int rowIndex, int relativeRowIndex, Map sortedAllFiledMap) { WriteHolder currentWriteHolder = writeContext.currentWriteHolder(); BeanMap beanMap = BeanMapUtils.create(oneRowData); @@ -136,7 +136,7 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { if (HeadKindEnum.CLASS.equals(writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadKind())) { Map headMap = writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadMap(); for (Map.Entry entry : headMap.entrySet()) { - int cellIndex = entry.getKey(); + int columnIndex = entry.getKey(); Head head = entry.getValue(); String name = head.getFieldName(); if (!beanMap.containsKey(name)) { @@ -144,18 +144,18 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { } ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(beanMap, currentWriteHolder.excelWriteHeadProperty().getHeadClazz(), name); - WriteHandlerUtils.beforeCellCreate(writeContext, row, head, cellIndex, relativeRowIndex, Boolean.FALSE, - excelContentProperty); - Cell cell = WorkBookUtil.createCell(row, cellIndex); + WriteHandlerUtils.beforeCellCreate(writeContext, row, head, columnIndex, relativeRowIndex, + Boolean.FALSE, excelContentProperty); + Cell cell = WorkBookUtil.createCell(row, columnIndex); WriteHandlerUtils.afterCellCreate(writeContext, cell, head, relativeRowIndex, Boolean.FALSE, excelContentProperty); Object value = beanMap.get(name); WriteCellData cellData = converterAndSet(currentWriteHolder, head.getField().getType(), - null, cell, value, excelContentProperty, head, relativeRowIndex); + null, cell, value, excelContentProperty, head, relativeRowIndex, rowIndex, columnIndex); WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, head, relativeRowIndex, Boolean.FALSE, excelContentProperty); beanMapHandledSet.add(name); - maxCellIndex = Math.max(maxCellIndex, cellIndex); + maxCellIndex = Math.max(maxCellIndex, columnIndex); } } // Finish @@ -185,7 +185,8 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { WriteHandlerUtils.afterCellCreate(writeContext, cell, null, relativeRowIndex, Boolean.FALSE, excelContentProperty); WriteCellData cellData = converterAndSet(currentWriteHolder, - FieldUtils.getFieldClass(beanMap, filedName, value), null, cell, value, null, null, relativeRowIndex); + FieldUtils.getFieldClass(beanMap, filedName, value), null, cell, value, null, null, relativeRowIndex, + rowIndex, maxCellIndex); WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, null, relativeRowIndex, Boolean.FALSE, excelContentProperty); } diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java index 10025390..2fb755a7 100644 --- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java @@ -203,7 +203,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { WriteCellData cellData = converterAndSet(writeSheetHolder, FieldUtils.getFieldClass(dataMap, variable, value), null, cell, value, excelContentProperty, null, - relativeRowIndex); + relativeRowIndex, analysisCell.getRowIndex(), analysisCell.getColumnIndex()); cellData.setAnalysisCell(analysisCell); // Restyle From d922e321fd1227cac5ee989619f7af5d25f9aaf3 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Thu, 21 Oct 2021 16:22:02 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=99=E5=85=A5?= =?UTF-8?q?=E8=BF=87=E6=85=A2=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/update.md b/update.md index bb9763b1..fdec0ee3 100644 --- a/update.md +++ b/update.md @@ -4,6 +4,8 @@ * 修复填充数据为空 可能NPE的bug * 修复填充样式可能不生效bug * 修复样式可能超过最大限制的bug +* 修复写入过慢的bug + # 3.0.0-beta3 From 5ff50736aaa713222d777c21ed6a68b6b4a56fb5 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Thu, 21 Oct 2021 17:33:26 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=99=E5=85=A5?= =?UTF-8?q?=E8=BF=87=E6=85=A2=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metadata/holder/WriteWorkbookHolder.java | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java index 73a680d6..374b5b7a 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java @@ -10,7 +10,6 @@ import java.io.OutputStream; import java.nio.charset.Charset; import java.util.HashMap; import java.util.Map; -import java.util.Objects; import com.alibaba.excel.enums.HolderEnum; import com.alibaba.excel.exception.ExcelGenerateException; @@ -134,15 +133,15 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { /** * Used to cell style. */ - private Map> cellStyleIndexMap; + private Map> cellStyleIndexMap; /** * Used to font. */ - private Map fontMap; + private Map fontMap; /** * Used to data format. */ - private Map dataFormatMap; + private Map dataFormatMap; public WriteWorkbookHolder(WriteWorkbook writeWorkbook) { super(writeWorkbook, null); @@ -254,6 +253,8 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { if (writeCellStyle == null) { return originCellStyle; } + WriteCellStyle tempWriteCellStyle = new WriteCellStyle(); + WriteCellStyle.merge(writeCellStyle, tempWriteCellStyle); short styleIndex = -1; Font originFont = null; @@ -268,25 +269,25 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { useCache = false; } - Map cellStyleMap = cellStyleIndexMap.computeIfAbsent(styleIndex, + Map cellStyleMap = cellStyleIndexMap.computeIfAbsent(styleIndex, key -> MapUtils.newHashMap()); - CellStyle cellStyle = cellStyleMap.get(Objects.toString(writeCellStyle)); + CellStyle cellStyle = cellStyleMap.get(tempWriteCellStyle); if (cellStyle != null) { return cellStyle; } if (log.isDebugEnabled()) { - log.info("create new style:{},{}", writeCellStyle, originCellStyle); + log.info("create new style:{},{}", tempWriteCellStyle, originCellStyle); } cellStyle = StyleUtil.buildCellStyle(workbook, originCellStyle, writeCellStyle); - Short dataFormat = createDataFormat(writeCellStyle.getDataFormatData(), useCache); + Short dataFormat = createDataFormat(tempWriteCellStyle.getDataFormatData(), useCache); if (dataFormat != null) { cellStyle.setDataFormat(dataFormat); } - Font font = createFont(writeCellStyle.getWriteFont(), originFont, useCache); + Font font = createFont(tempWriteCellStyle.getWriteFont(), originFont, useCache); if (font != null) { cellStyle.setFont(font); } - cellStyleMap.put(Objects.toString(writeCellStyle), cellStyle); + cellStyleMap.put(tempWriteCellStyle, cellStyle); return cellStyle; } @@ -302,12 +303,15 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { if (!useCache) { return StyleUtil.buildFont(workbook, originFont, writeFont); } - Font font = fontMap.get(Objects.toString(writeFont)); + WriteFont tempWriteFont = new WriteFont(); + WriteFont.merge(writeFont, tempWriteFont); + + Font font = fontMap.get(tempWriteFont); if (font != null) { return font; } - font = StyleUtil.buildFont(workbook, originFont, writeFont); - fontMap.put(Objects.toString(writeFont), font); + font = StyleUtil.buildFont(workbook, originFont, tempWriteFont); + fontMap.put(tempWriteFont, font); return font; } @@ -325,12 +329,15 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { if (!useCache) { return StyleUtil.buildDataFormat(workbook, dataFormatData); } - Short dataFormat = dataFormatMap.get(Objects.toString(dataFormatData)); + DataFormatData tempDataFormatData = new DataFormatData(); + DataFormatData.merge(dataFormatData, tempDataFormatData); + + Short dataFormat = dataFormatMap.get(tempDataFormatData); if (dataFormat != null) { return dataFormat; } - dataFormat = StyleUtil.buildDataFormat(workbook, dataFormatData); - dataFormatMap.put(Objects.toString(dataFormatData), dataFormat); + dataFormat = StyleUtil.buildDataFormat(workbook, tempDataFormatData); + dataFormatMap.put(tempDataFormatData, dataFormat); return dataFormat; } From 21c2e89645c20582f847c4a8356b68d382ff2156 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Thu, 21 Oct 2021 17:35:43 +0800 Subject: [PATCH 12/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=99=E5=85=A5?= =?UTF-8?q?=E8=BF=87=E6=85=A2=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/alibaba/easyexcel/test/core/large/LargeDataTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java index e1038f03..15720c3f 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java @@ -85,7 +85,7 @@ public class LargeDataTest { @Test public void t04Write() throws Exception { long start = System.currentTimeMillis(); - ExcelWriter excelWriter = EasyExcel.write(fileWrite07).build(); + ExcelWriter excelWriter = EasyExcel.write(fileWrite07, LargeData.class).build(); WriteSheet writeSheet = EasyExcel.writerSheet().build(); for (int j = 0; j < 100; j++) { excelWriter.write(data(), writeSheet); From 4e4aeead8e35825be5890f978b152f89bf1f3e66 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Thu, 21 Oct 2021 20:30:34 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alibaba/easyexcel/test/core/large/LargeDataTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java index 15720c3f..3da8500d 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java @@ -14,6 +14,7 @@ import org.apache.poi.xssf.streaming.SXSSFCell; import org.apache.poi.xssf.streaming.SXSSFRow; import org.apache.poi.xssf.streaming.SXSSFSheet; import org.apache.poi.xssf.streaming.SXSSFWorkbook; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.FixMethodOrder; import org.junit.Test; @@ -92,7 +93,8 @@ public class LargeDataTest { LOGGER.info("{} write success.", j); } excelWriter.finish(); - LOGGER.info("write cost:{}", System.currentTimeMillis() - start); + long cost = System.currentTimeMillis() - start; + LOGGER.info("write cost:{}", cost); start = System.currentTimeMillis(); try (FileOutputStream fileOutputStream = new FileOutputStream(fileWritePoi07)) { SXSSFWorkbook workbook = new SXSSFWorkbook(); @@ -111,8 +113,9 @@ public class LargeDataTest { workbook.dispose(); workbook.close(); } - + long costPoi = System.currentTimeMillis() - start; LOGGER.info("poi write cost:{}", System.currentTimeMillis() - start); + Assert.assertTrue(costPoi * 3 > cost); } private List data() { From 0cddd477ffce5b59b76adde93c8b1a144cbebde0 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Thu, 21 Oct 2021 21:10:49 +0800 Subject: [PATCH 14/19] =?UTF-8?q?=E6=96=B0=E5=A2=9Epom=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 325984c1..bc234820 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,15 @@ Java解析、生成Excel比较有名的框架有Apache poi、jxl。但他们都 * 大版本升级后建议相关内容重新测试下 * 要升级涉及到 +### 最新版本 +```xml + + com.alibaba + easyexcel + 3.0.1 + +``` + ## 广告位 ### 支付宝扫一扫红包 本项目都是个人业余时间写的，所以比较贫穷。推广下支付宝，赚个建群的费用。有空的同学帮忙扫一扫 From 30ad7fc64815b85dc092b1241c11761b9e658c4b Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Thu, 21 Oct 2021 21:11:11 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E6=96=B0=E5=A2=9Epom=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 01134342..66331d1b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.alibaba easyexcel - 3.0.0-beta3 + 3.0.1 jar easyexcel From 57536b8c6ce3858b596d1ac8875869231ff49a4a Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Thu, 21 Oct 2021 21:13:01 +0800 Subject: [PATCH 16/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java index e85d63a6..0034d116 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java @@ -216,6 +216,7 @@ public class FillDataTest { fillData.setNumber(5.2); if (i == 5) { fillData.setName(null); + fillData.setNumber(null); } } return list; From 44b5dedbfa533d1b32a25093de15a21241a64a99 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Thu, 21 Oct 2021 21:17:27 +0800 Subject: [PATCH 17/19] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BD=9C=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/alibaba/excel/util/StringUtils.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/alibaba/excel/util/StringUtils.java b/src/main/java/com/alibaba/excel/util/StringUtils.java index 40b77d52..b076370c 100644 --- a/src/main/java/com/alibaba/excel/util/StringUtils.java +++ b/src/main/java/com/alibaba/excel/util/StringUtils.java @@ -1,5 +1,6 @@ package com.alibaba.excel.util; -/* + +/** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -12,8 +13,9 @@ package com.alibaba.excel.util; * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * @author Apache Software Foundation (ASF) */ - public class StringUtils { private StringUtils() {} @@ -194,7 +196,6 @@ public class StringUtils { return true; } - /** *

Checks if the CharSequence contains only Unicode digits. * A decimal point is not a Unicode digit and returns false.

@@ -221,7 +222,7 @@ public class StringUtils { * StringUtils.isNumeric("+123") = false * * - * @param cs the CharSequence to check, may be null + * @param cs the CharSequence to check, may be null * @return {@code true} if only contains digits, and is non-null * @since 3.0 Changed signature from isNumeric(String) to isNumeric(CharSequence) * @since 3.0 Changed "" to return false and not true From 66d0955ec79cd6e8eede9c2b2fac12b580cfb905 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Thu, 21 Oct 2021 21:18:46 +0800 Subject: [PATCH 18/19] =?UTF-8?q?=E6=96=B0=E5=A2=9Eapche=20=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/alibaba/excel/util/ListUtils.java | 17 ++++++++++++++--- .../java/com/alibaba/excel/util/MapUtils.java | 17 ++++++++++++++--- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/alibaba/excel/util/ListUtils.java b/src/main/java/com/alibaba/excel/util/ListUtils.java index e64acb36..1a3451d8 100644 --- a/src/main/java/com/alibaba/excel/util/ListUtils.java +++ b/src/main/java/com/alibaba/excel/util/ListUtils.java @@ -10,10 +10,21 @@ import lombok.NonNull; import org.apache.commons.compress.utils.Iterators; /** - * List utils + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 * - * @author Jiaju Zhuang - **/ + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @author Apache Software Foundation (ASF) + */ public class ListUtils { private ListUtils() {} diff --git a/src/main/java/com/alibaba/excel/util/MapUtils.java b/src/main/java/com/alibaba/excel/util/MapUtils.java index 7d049e9d..6039fbde 100644 --- a/src/main/java/com/alibaba/excel/util/MapUtils.java +++ b/src/main/java/com/alibaba/excel/util/MapUtils.java @@ -5,10 +5,21 @@ import java.util.LinkedHashMap; import java.util.TreeMap; /** - * Map utils + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 * - * @author Jiaju Zhuang - **/ + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @author Apache Software Foundation (ASF) + */ public class MapUtils { private MapUtils() {} From 7e0b9ab0aa016ef8bb5a9ec316e7c3c99c6a4b86 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Thu, 21 Oct 2021 21:21:58 +0800 Subject: [PATCH 19/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java index 0034d116..e85d63a6 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java @@ -216,7 +216,6 @@ public class FillDataTest { fillData.setNumber(5.2); if (i == 5) { fillData.setName(null); - fillData.setNumber(null); } } return list;