fuhouyin/easyexcel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3917 from alibaba/bugfix

Browse Source 
* 兼容某些特殊的xls: 修改了内置的样式导致判断样式错误
This commit is contained in:
Jiaju Zhuang 2024-08-06 17:51:20 +08:00 committed by GitHub
commit 802c86fc84
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
easyexcel-core/src/main/java/com/alibaba/excel/constant/BuiltinFormats.java
View File

@ -21,6 +21,8 @@ import com.alibaba.excel.util.StringUtils;
**/ **/
public class BuiltinFormats { public class BuiltinFormats {
private static final String RESERVED = "reserved-";
public static short GENERAL = 0; public static short GENERAL = 0;
public static final String[] BUILTIN_FORMATS_ALL_LANGUAGES = { public static final String[] BUILTIN_FORMATS_ALL_LANGUAGES = {
@ -491,7 +493,7 @@ public class BuiltinFormats {
} }
// In other cases, give priority to using the externally provided format // In other cases, give priority to using the externally provided format
if (!StringUtils.isEmpty(defaultFormat) && !defaultFormat.startsWith("reserved-")) { if (!StringUtils.isEmpty(defaultFormat) && !defaultFormat.startsWith(RESERVED)) {
return defaultFormat; return defaultFormat;
} }