Jiaju Zhuang
|
b73da424f9
|
Merge pull request #1159 from alibaba/2.1.x
2.1.x
|
5 years ago |
|
Jiaju Zhuang
|
0bf3e5e9a5
|
修改合并异常
|
5 years ago |
|
Jiaju Zhuang
|
b3a30d0993
|
修改合并异常
|
5 years ago |
|
Jiaju Zhuang
|
51cb8c8e54
|
Merge remote-tracking branch 'remotes/origin/master' into 2.1.x
# Conflicts:
# pom.xml
# src/main/java/com/alibaba/excel/analysis/v07/handlers/DefaultCellHandler.java
# src/main/java/com/alibaba/excel/analysis/v07/handlers/ProcessResultCellHandler.java
# src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java
# update.md
|
5 years ago |
|
Jiaju Zhuang
|
c88a082035
|
重写主流程，代码更加优雅 测试完毕
|
5 years ago |
|
Jiaju Zhuang
|
75391650e7
|
重写主流程，代码更加优雅 测试完毕
|
5 years ago |
|
Jiaju Zhuang
|
f567698331
|
重写主流程，代码更加优雅 测试完毕
|
5 years ago |
|
Jiaju Zhuang
|
26c6de095b
|
重写主流程，代码更加优雅 测试完毕
|
5 years ago |
|
Jiaju Zhuang
|
f99c198df7
|
修改测试bug
|
5 years ago |
|
Jiaju Zhuang
|
ea2669db82
|
修改补充最后一列为空会导致返回list少一个数据的问题
|
5 years ago |
|
Jiaju Zhuang
|
754c5d8dca
|
同时传入了`List<List<String>>`和`class`的head,会通过index去匹配注解
|
5 years ago |
|
Jiaju Zhuang
|
71b9c53b6d
|
* 提升合并策略效率
* 兼容部分比较特殊的excel
|
5 years ago |
|
Jiaju Zhuang
|
e63190976a
|
完成新增支持读取批注、超链接、合并单元格
|
5 years ago |
|
Jiaju Zhuang
|
13ca08e1d8
|
添加支持批注
|
5 years ago |
|
Jiaju Zhuang
|
76b0655870
|
Merge pull request #1052 from alibaba/2.1.fix
2.1.fix
|
5 years ago |
|
Jiaju Zhuang
|
482c99076a
|
修复填充只有`sheetName`会抛异常
|
5 years ago |
|
Jiaju Zhuang
|
c6f21608ab
|
修复填充只有`sheetName`会抛异常
|
5 years ago |
|
Jiaju Zhuang
|
617d2b5698
|
Merge pull request #1050 from alibaba/2.1.fix
2.1.fix
|
5 years ago |
|
Jiaju Zhuang
|
15cefb5844
|
填充时候支持根据`sheetName`定位`sheet`
|
5 years ago |
|
Jiaju Zhuang
|
88de089c10
|
填充时候支持根据`sheetName`定位`sheet`
|
5 years ago |
|
Jiaju Zhuang
|
6ed614612a
|
新增支持接收批注
|
5 years ago |
|
Jiaju Zhuang
|
f0d9051db2
|
新增支持接收批注
|
5 years ago |
|
Jiaju Zhuang
|
2c58b5e5fc
|
新增支持接收批注
|
5 years ago |
|
Jiaju Zhuang
|
47f55d570a
|
Merge pull request #737 from Kaiux/2.1.x
添加对Excel批注的读取
|
5 years ago |
|
Jiaju Zhuang
|
6559d8c52b
|
Merge branch '2.1.x' into 2.1.x
|
5 years ago |
|
Jiaju Zhuang
|
0233e34e25
|
Merge remote-tracking branch 'remotes/origin/master' into 2.1.x
# Conflicts:
# src/main/java/com/alibaba/excel/read/builder/ExcelReaderBuilder.java
# update.md
|
5 years ago |
|
Jiaju Zhuang
|
3555883871
|
修复用String接收日期、数字和excel显示不一致的bug
|
5 years ago |
|
Jiaju Zhuang
|
9c7e06022b
|
新增日期转换
|
5 years ago |
|
Jiaju Zhuang
|
da55568e19
|
Merge pull request #940 from alibaba/2.1.fix
2.1.fix
|
5 years ago |
|
Jiaju Zhuang
|
46266abccb
|
新增`useDefaultListener` 可以忽略默认监听器
|
5 years ago |
|
Jiaju Zhuang
|
49694970c6
|
Merge branch 'master' into 2.1.fix
# Conflicts:
# src/main/java/com/alibaba/excel/read/builder/ExcelReaderBuilder.java
# src/main/java/com/alibaba/excel/read/metadata/ReadWorkbook.java
|
5 years ago |
|
Jiaju Zhuang
|
569f42e0da
|
新增`useDefaultListener` 可以忽略默认监听器
|
5 years ago |
|
Jiaju Zhuang
|
f065e370ab
|
提交部分代码
|
5 years ago |
|
Jiaju Zhuang
|
e997a9efbd
|
Merge pull request #843 from alibaba/2.1.x
2.1.x
|
5 years ago |
|
Jiaju Zhuang
|
827153fda3
|
修复合并策略 空指针的问题
|
5 years ago |
|
Jiaju Zhuang
|
fe780d3c7d
|
修复合并策略 空指针的问题
|
5 years ago |
|
Jiaju Zhuang
|
76cd90fe0e
|
修复合并策略 空指针的问题
|
5 years ago |
|
Jiaju Zhuang
|
217d69a69a
|
修复合并策略 空指针的问题
|
5 years ago |
|
Jiaju Zhuang
|
adae8d05c9
|
Merge pull request #815 from alibaba/2.1.x
2.1.x
|
5 years ago |
|
Jiaju Zhuang
|
67e4e10d86
|
修复强制创建新行填充，只有一行数据会未填充的bug
|
5 years ago |
|
Jiaju Zhuang
|
7b9890ae51
|
新增since
|
5 years ago |
|
Jiaju Zhuang
|
6dcc85ff45
|
Merge pull request #796 from alibaba/2.1.x
2.1.x
|
5 years ago |
|
Jiaju Zhuang
|
d7af9b42ea
|
加入解析class缓存
|
5 years ago |
|
Jiaju Zhuang
|
cba3a9cea9
|
加入解析class缓存
|
5 years ago |
|
Jiaju Zhuang
|
b72fc513e0
|
Merge pull request #760 from pdkst/2.1.x
输出时合并单元格增加行合并选项
|
5 years ago |
|
Jiaju Zhuang
|
2205ade4be
|
修改同步读取返回对象支持泛型
|
5 years ago |
|
Jiaju Zhuang
|
6e6896d4a7
|
修改map 返回排序
|
5 years ago |
|
Jiaju Zhuang
|
ffbb38cd44
|
修改map 返回排序
|
5 years ago |
|
Jiaju Zhuang
|
00581c77ee
|
移除多余代码
|
5 years ago |
zl
|
6ecdb90abd
|
输出时合并单元格增加行合并选项
|
5 years ago |
