Browse Source

修复列注解样式与默认样式冲突问题

bugfix for https://github.com/alibaba/easyexcel/issues/3003
pull/3240/head
蓝士钦 2 years ago committed by GitHub
parent
commit
7a2bc3b7d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      easyexcel-core/src/main/java/com/alibaba/excel/write/metadata/style/WriteCellStyle.java

9
easyexcel-core/src/main/java/com/alibaba/excel/write/metadata/style/WriteCellStyle.java

@ -161,10 +161,13 @@ public class WriteCellStyle {
} }
} }
if (source.getWriteFont() != null) { if (source.getWriteFont() != null) {
if (target.getWriteFont() == null) { WriteFont targetWriteFont = target.getWriteFont();
target.setWriteFont(source.getWriteFont()); if (targetWriteFont == null) {
targetWriteFont = new WriteFont();
WriteFont.merge(source.getWriteFont(), targetWriteFont);
target.setWriteFont(targetWriteFont);
} else { } else {
WriteFont.merge(source.getWriteFont(), target.getWriteFont()); WriteFont.merge(source.getWriteFont(), targetWriteFont);
} }
} }
if (source.getHidden() != null) { if (source.getHidden() != null) {

Loading…
Cancel
Save