From 5465de62942589bf950a29e900c7274eabd1cab5 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Fri, 15 Oct 2021 13:09:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=A1=AB=E5=85=85=E6=94=AF?= =?UTF-8?q?=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 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 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