Jiaju Zhuang
|
5c529df0ad
|
修改合并异常
|
2021-09-17 11:38:30 +08:00 |
|
Jiaju Zhuang
|
55a1fe1302
|
修改合并异常
|
2021-09-17 11:31:21 +08:00 |
|
Jiaju Zhuang
|
9a63692bd5
|
Merge branch 'master' into developing
# Conflicts:
# pom.xml
# src/main/java/com/alibaba/excel/analysis/v07/handlers/CellTagHandler.java
# src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java
# update.md
|
2021-09-17 11:28:20 +08:00 |
|
Jiaju Zhuang
|
939f712c39
|
Merge pull request #2072 from alibaba/bugfix
Bugfix
|
2021-09-17 11:12:45 +08:00 |
|
Jiaju Zhuang
|
a131a4e4ec
|
修改java ci
|
2021-09-17 11:11:34 +08:00 |
|
Jiaju Zhuang
|
8aa9b65e40
|
Merge branch 'master' into bugfix
|
2021-09-17 10:58:54 +08:00 |
|
Jiaju Zhuang
|
d99651a605
|
Update ci.yml
ci
|
2021-09-17 10:56:20 +08:00 |
|
Jiaju Zhuang
|
cfaddb5c88
|
Update ci.yml
ci
|
2021-09-17 10:50:18 +08:00 |
|
Jiaju Zhuang
|
1925bba2e4
|
Update ci.yml
ci
|
2021-09-17 10:45:45 +08:00 |
|
Jiaju Zhuang
|
f4ef6e151b
|
Update ci.yml
ci
|
2021-09-17 10:44:46 +08:00 |
|
Jiaju Zhuang
|
ff84b03d6d
|
Create ci.yml
新增ci
|
2021-09-17 10:36:32 +08:00 |
|
Jiaju Zhuang
|
c9bc503bd1
|
构建改成coveralls
|
2021-09-17 10:05:27 +08:00 |
|
Jiaju Zhuang
|
d4bc63a5e2
|
修复有些xlsx解析失败的bug [Issue #1595]
|
2021-09-16 21:44:45 +08:00 |
|
Jiaju Zhuang
|
5aaba749ac
|
修复读取excel可能异常的bug
|
2021-09-16 21:09:31 +08:00 |
|
Jiaju Zhuang
|
b387d7ff6a
|
修改合并异常
|
2021-09-16 19:23:36 +08:00 |
|
Jiaju Zhuang
|
6f9a4c219c
|
Merge pull request #1285 from dota17/VerticalCellStrategy02TestCase
提高metadata.property模块和write.metadata.style模块的测试覆盖率
|
2021-09-16 19:20:10 +08:00 |
|
Jiaju Zhuang
|
2c855b6ac7
|
Merge branch 'developing' into VerticalCellStrategy02TestCase
|
2021-09-16 19:19:54 +08:00 |
|
Jiaju Zhuang
|
ba8f599943
|
修复忽略字段后可能排序不一致的问题
|
2021-09-16 19:14:09 +08:00 |
|
Jiaju Zhuang
|
9603d470c9
|
Merge pull request #1718 from Hccake/master
修复当自定义 header 时，在 writeSheet 对象上指定字段名忽略不生效的问题 & 修复当属性被忽略时，会导致后续列后移，excel多了空白列的问题
|
2021-09-16 17:19:57 +08:00 |
|
Jiaju Zhuang
|
2ef2135c5e
|
Merge branch 'developing' into master
|
2021-09-16 17:09:22 +08:00 |
|
Jiaju Zhuang
|
a75326567b
|
修改合并异常
|
2021-09-16 16:37:28 +08:00 |
|
Jiaju Zhuang
|
17dd8a0f12
|
Merge branch 'bugfix' into developing
# Conflicts:
# src/main/java/com/alibaba/excel/converters/DefaultConverterLoader.java
|
2021-09-16 16:33:05 +08:00 |
|
Jiaju Zhuang
|
99729f8bb1
|
Merge pull request #1864 from KID0031/master
issue963: 增添了处理BigInteger类型的converter
|
2021-09-16 16:31:59 +08:00 |
|
Jiaju Zhuang
|
e5b579fdfa
|
修复头和数据对象不一致会覆盖的问题 [Issue #1870]
|
2021-09-16 16:30:17 +08:00 |
|
Jiaju Zhuang
|
dac1b4de0e
|
Merge branch 'bugfix' into developing
# Conflicts:
# src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java
|
2021-09-16 16:23:40 +08:00 |
|
Jiaju Zhuang
|
dc7d939c6c
|
Merge pull request #1871 from rockRust/master
Fix bug list classType not same with head type when write
|
2021-09-16 16:23:03 +08:00 |
|
Jiaju Zhuang
|
41d1220c01
|
修复不创建对象写入数据异常 [Issue #1702]
|
2021-09-16 16:05:51 +08:00 |
|
Jiaju Zhuang
|
9d8830cf85
|
Merge branch 'bugfix' into developing
# Conflicts:
# src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java
|
2021-09-16 16:00:05 +08:00 |
|
Jiaju Zhuang
|
51121df987
|
Merge remote-tracking branch 'origin/developing' into developing
|
2021-09-16 15:59:39 +08:00 |
|
Jiaju Zhuang
|
8d5db9f256
|
Merge pull request #1880 from SmireG/bugfix
fix #1702
|
2021-09-16 15:59:31 +08:00 |
|
Jiaju Zhuang
|
c30a89d4f6
|
修改返回行列
|
2021-09-16 15:59:24 +08:00 |
|
Jiaju Zhuang
|
39c9d47d6c
|
Merge pull request #1877 from JackeyXps/master
fix issue#1702 不创建对象的写，无法正常写入数据
|
2021-09-16 15:58:26 +08:00 |
|
Jiaju Zhuang
|
5c7a4abd7e
|
* 修复某些特殊的excel读取失败的问题 [Issue #1595]
|
2021-09-15 23:50:50 +08:00 |
|
Jiaju Zhuang
|
51f222770e
|
修改合并问题
|
2021-09-15 23:35:36 +08:00 |
|
Jiaju Zhuang
|
9988e0d546
|
Merge pull request #1883 from Albert1881/issue1663
fix issue-1663. Skip fill when variable does not exit.
|
2021-09-15 23:33:43 +08:00 |
|
Jiaju Zhuang
|
4346cb43c2
|
* 新增头的非空校验 [Issue #1765]
|
2021-09-15 23:16:53 +08:00 |
|
Jiaju Zhuang
|
3d19a1962e
|
* 新增头的非空校验 [Issue #1765]
|
2021-09-15 23:16:50 +08:00 |
|
Jiaju Zhuang
|
9286b57b1f
|
Merge pull request #1885 from SmireG/bugfix1765
fix #1765
|
2021-09-15 23:03:47 +08:00 |
|
Jiaju Zhuang
|
e67b491f58
|
Merge branch 'developing' into bugfix1765
|
2021-09-15 23:03:36 +08:00 |
|
Jiaju Zhuang
|
6351fe2c18
|
修复不自动行高的问题 [Issue #1869]
|
2021-09-15 22:40:23 +08:00 |
|
Jiaju Zhuang
|
56ab48e364
|
修复不自动行高的问题 [Issue #1869]
|
2021-09-15 22:39:40 +08:00 |
|
Jiaju Zhuang
|
6a17179086
|
修复填充调用横向样式策略报错 [Issue #1651]
|
2021-09-15 20:40:46 +08:00 |
|
Jiaju Zhuang
|
f9714da123
|
Merge branch 'bugfix' into developing
# Conflicts:
# src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java
|
2021-09-15 20:38:03 +08:00 |
|
Jiaju Zhuang
|
bc4ba98d58
|
修复填充调用横向样式策略报错 [Issue #1651]
|
2021-09-15 20:37:22 +08:00 |
|
Jiaju Zhuang
|
dfca139885
|
Merge pull request #1923 from zjr2000/bugfix
fix #1651：使用模板填充导出的时候设置自动换行报错
|
2021-09-15 20:31:58 +08:00 |
|
Jiaju Zhuang
|
3f2f21f955
|
修复合并头可能异常的bug
|
2021-09-15 19:58:00 +08:00 |
|
Jiaju Zhuang
|
669508ba3c
|
Merge pull request #1940 from lethal233/bugfix-1662
Bugfix #1662
|
2021-09-15 18:54:55 +08:00 |
|
Jiaju Zhuang
|
59d72a723e
|
修改合并异常
|
2021-09-15 17:28:31 +08:00 |
|
Jiaju Zhuang
|
3fadb3936e
|
Merge branch 'bugfix' into developing
# Conflicts:
# src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
|
2021-09-15 17:26:17 +08:00 |
|
Jiaju Zhuang
|
3aa18351c0
|
Merge pull request #1968 from realhht/master
fix issue 1967
|
2021-09-15 17:25:28 +08:00 |
|