Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_879456671
easyexcel
提交
3bfb78f5
E
easyexcel
项目概览
qq_879456671
/
easyexcel
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
easyexcel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
3bfb78f5
编写于
9月 15, 2021
作者:
庄家钜
提交者:
GitHub
9月 15, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2017 from xiaoming2012-lab/master
升级poi到5.0.0
上级
b8a3bb82
c5b90d31
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
24 addition
and
28 deletion
+24
-28
README.md
README.md
+9
-7
pom.xml
pom.xml
+4
-4
src/main/java/com/alibaba/excel/analysis/v07/XlsxSaxAnalyser.java
.../java/com/alibaba/excel/analysis/v07/XlsxSaxAnalyser.java
+7
-4
src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
.../alibaba/excel/write/executor/ExcelWriteFillExecutor.java
+1
-1
src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java
src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java
+1
-1
src/test/java/com/alibaba/easyexcel/test/temp/WriteV33Test.java
...st/java/com/alibaba/easyexcel/test/temp/WriteV33Test.java
+0
-9
src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatter1.java
...libaba/easyexcel/test/temp/dataformat/DataFormatter1.java
+2
-2
未找到文件。
README.md
浏览文件 @
3bfb78f5
...
@@ -4,13 +4,15 @@ EasyExcel
...
@@ -4,13 +4,15 @@ EasyExcel
[
![Maven central
](
https://maven-badges.herokuapp.com/maven-central/com.alibaba/easyexcel/badge.svg
)
](https://maven-badges.herokuapp.com/maven-central/com.alibaba/easyexcel)
[
![Maven central
](
https://maven-badges.herokuapp.com/maven-central/com.alibaba/easyexcel/badge.svg
)
](https://maven-badges.herokuapp.com/maven-central/com.alibaba/easyexcel)
[
![License
](
http://img.shields.io/:license-apache-brightgreen.svg
)
](http://www.apache.org/licenses/LICENSE-2.0.html)
[
![License
](
http://img.shields.io/:license-apache-brightgreen.svg
)
](http://www.apache.org/licenses/LICENSE-2.0.html)
[
QQ1群(已满): 662022184
](
https://jq.qq.com/?_wv=1027&k=1T21jJxh
)
[
QQ1群(已满): 662022184
](
https://jq.qq.com/?_wv=1027&k=1T21jJxh
)
[
QQ2群: 1097936804
](
https://jq.qq.com/?_wv=1027&k=j5zEy6Xl
)
[
QQ2群(已满): 1097936804
](
https://jq.qq.com/?_wv=1027&k=j5zEy6Xl
)
[
钉钉1群(已满): 21960511
](
https://qr.dingtalk.com/action/joingroup?code=v1,k1,cchz6k12ci9B08NNqhNRFGXocNVHrZtW0kaOtTKg/Rk=&_dt_no_comment=1&origin=11
)
[
QQ3群: 453928496
](
https://qm.qq.com/cgi-bin/qm/qr?k=e2ULsA5A0GldhV2CXJ8sIbAyu9I6qqs7&jump_from=webapi
)
[
钉钉2群(已满): 32796397
](
https://qr.dingtalk.com/action/joingroup?code=v1,k1,jyU9GtEuNU5S0QTyklqYcYJ8qDZtUuTPMM7uPZTS8Hs=&_dt_no_comment=1&origin=11
)
[
钉钉1群(已满): 21960511
](
https://qr.dingtalk.com/action/joingroup?code=v1,k1,cchz6k12ci9B08NNqhNRFGXocNVHrZtW0kaOtTKg/Rk=&_dt_no_comment=1&origin=11
)
[
钉钉3群(已满): 33797247
](
https://qr.dingtalk.com/action/joingroup?code=v1,k1,3UGlEScTGQaHpW2cIRo+gkxJ9EVZ5fz26M6nW3uFP30=&_dt_no_comment=1&origin=11
)
[
钉钉2群(已满): 32796397
](
https://qr.dingtalk.com/action/joingroup?code=v1,k1,jyU9GtEuNU5S0QTyklqYcYJ8qDZtUuTPMM7uPZTS8Hs=&_dt_no_comment=1&origin=11
)
[
钉钉4群: 33491624
](
https://qr.dingtalk.com/action/joingroup?code=v1,k1,V14Pb65Too70rQkEaJ9ohb6lZBZbtp6jIL/q9EWh9vA=&_dt_no_comment=1&origin=11
)
[
钉钉3群(已满): 33797247
](
https://qr.dingtalk.com/action/joingroup?code=v1,k1,3UGlEScTGQaHpW2cIRo+gkxJ9EVZ5fz26M6nW3uFP30=&_dt_no_comment=1&origin=11
)
[
官方网站: https://yuque.com/easyexcel
](
https://www.yuque.com/easyexcel/doc/easyexcel
)
[
钉钉4群(已满): 33491624
](
https://qr.dingtalk.com/action/joingroup?code=v1,k1,V14Pb65Too70rQkEaJ9ohb6lZBZbtp6jIL/q9EWh9vA=&_dt_no_comment=1&origin=11
)
[
钉钉5群: 32134498
](
https://h5.dingtalk.com/circle/healthCheckin.html?dtaction=os&corpId=dingb9fa1325d9dccc3ecac589edd02f1650&5233a=71a83&cbdbhh=qwertyuiop
)
[
官方网站: https://yuque.com/easyexcel
](
https://www.yuque.com/easyexcel/doc/easyexcel
)
[
常见问题
](
https://www.yuque.com/easyexcel/faq
)
[
常见问题
](
https://www.yuque.com/easyexcel/faq
)
#### 因为公司不方便用QQ,所以建议加钉钉群
#### 因为公司不方便用QQ,所以建议加钉钉群
...
...
pom.xml
浏览文件 @
3bfb78f5
...
@@ -60,17 +60,17 @@
...
@@ -60,17 +60,17 @@
<dependency>
<dependency>
<groupId>
org.apache.poi
</groupId>
<groupId>
org.apache.poi
</groupId>
<artifactId>
poi
</artifactId>
<artifactId>
poi
</artifactId>
<version>
3.17
</version>
<version>
5.0.0
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.apache.poi
</groupId>
<groupId>
org.apache.poi
</groupId>
<artifactId>
poi-ooxml
</artifactId>
<artifactId>
poi-ooxml
</artifactId>
<version>
3.17
</version>
<version>
5.0.0
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.apache.poi
</groupId>
<groupId>
org.apache.poi
</groupId>
<artifactId>
poi-ooxml-
schemas
</artifactId>
<artifactId>
poi-ooxml-
full
</artifactId>
<version>
3.17
</version>
<version>
5.0.0
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
cglib
</groupId>
<groupId>
cglib
</groupId>
...
...
src/main/java/com/alibaba/excel/analysis/v07/XlsxSaxAnalyser.java
浏览文件 @
3bfb78f5
...
@@ -5,6 +5,7 @@ import java.io.IOException;
...
@@ -5,6 +5,7 @@ import java.io.IOException;
import
java.io.InputStream
;
import
java.io.InputStream
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.Iterator
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.UUID
;
import
java.util.UUID
;
...
@@ -215,10 +216,12 @@ public class XlsxSaxAnalyser implements ExcelReadExecutor {
...
@@ -215,10 +216,12 @@ public class XlsxSaxAnalyser implements ExcelReadExecutor {
if
(
commentsTable
==
null
)
{
if
(
commentsTable
==
null
)
{
return
;
return
;
}
}
Map
<
CellAddress
,
XSSFComment
>
cellComments
=
commentsTable
.
getCellComments
();
Iterator
<
CellAddress
>
cellAddresses
=
commentsTable
.
getCellAddresses
();
for
(
XSSFComment
xssfComment
:
cellComments
.
values
())
{
for
(
Iterator
<
CellAddress
>
it
=
cellAddresses
;
it
.
hasNext
();
)
{
CellExtra
cellExtra
=
new
CellExtra
(
CellExtraTypeEnum
.
COMMENT
,
xssfComment
.
getString
().
toString
(),
CellAddress
cellAddress
=
it
.
next
();
xssfComment
.
getRow
(),
xssfComment
.
getColumn
());
XSSFComment
cellComment
=
commentsTable
.
findCellComment
(
cellAddress
);
CellExtra
cellExtra
=
new
CellExtra
(
CellExtraTypeEnum
.
COMMENT
,
cellComment
.
getString
().
toString
(),
cellAddress
.
getRow
(),
cellAddress
.
getColumn
());
xlsxReadContext
.
readSheetHolder
().
setCellExtra
(
cellExtra
);
xlsxReadContext
.
readSheetHolder
().
setCellExtra
(
cellExtra
);
xlsxReadContext
.
analysisEventProcessor
().
extra
(
xlsxReadContext
);
xlsxReadContext
.
analysisEventProcessor
().
extra
(
xlsxReadContext
);
}
}
...
...
src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
浏览文件 @
3bfb78f5
...
@@ -399,7 +399,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
...
@@ -399,7 +399,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
* @return Returns the data that the cell needs to replace
* @return Returns the data that the cell needs to replace
*/
*/
private
String
prepareData
(
Cell
cell
,
int
rowIndex
,
int
columnIndex
,
Map
<
String
,
Set
<
Integer
>>
firstRowCache
)
{
private
String
prepareData
(
Cell
cell
,
int
rowIndex
,
int
columnIndex
,
Map
<
String
,
Set
<
Integer
>>
firstRowCache
)
{
if
(!
CellType
.
STRING
.
equals
(
cell
.
getCellType
Enum
()))
{
if
(!
CellType
.
STRING
.
equals
(
cell
.
getCellType
()))
{
return
null
;
return
null
;
}
}
String
value
=
cell
.
getStringCellValue
();
String
value
=
cell
.
getStringCellValue
();
...
...
src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java
浏览文件 @
3bfb78f5
...
@@ -5,9 +5,9 @@ import java.util.ArrayList;
...
@@ -5,9 +5,9 @@ import java.util.ArrayList;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
org.apache.poi.hssf.util.CellReference
;
import
org.apache.poi.ss.usermodel.FillPatternType
;
import
org.apache.poi.ss.usermodel.FillPatternType
;
import
org.apache.poi.ss.usermodel.IndexedColors
;
import
org.apache.poi.ss.usermodel.IndexedColors
;
import
org.apache.poi.ss.util.CellReference
;
import
org.junit.Ignore
;
import
org.junit.Ignore
;
import
org.junit.Test
;
import
org.junit.Test
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
...
...
src/test/java/com/alibaba/easyexcel/test/temp/WriteV33Test.java
浏览文件 @
3bfb78f5
package
com.alibaba.easyexcel.test.temp
;
package
com.alibaba.easyexcel.test.temp
;
import
java.io.File
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
org.apache.poi.hssf.util.CellReference
;
import
org.apache.poi.ss.usermodel.FillPatternType
;
import
org.apache.poi.ss.usermodel.IndexedColors
;
import
org.junit.Ignore
;
import
org.junit.Ignore
;
import
org.junit.Test
;
import
org.junit.Test
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
...
@@ -19,10 +14,6 @@ import com.alibaba.excel.EasyExcel;
...
@@ -19,10 +14,6 @@ import com.alibaba.excel.EasyExcel;
import
com.alibaba.excel.ExcelWriter
;
import
com.alibaba.excel.ExcelWriter
;
import
com.alibaba.excel.write.merge.OnceAbsoluteMergeStrategy
;
import
com.alibaba.excel.write.merge.OnceAbsoluteMergeStrategy
;
import
com.alibaba.excel.write.metadata.WriteSheet
;
import
com.alibaba.excel.write.metadata.WriteSheet
;
import
com.alibaba.excel.write.metadata.style.WriteCellStyle
;
import
com.alibaba.excel.write.metadata.style.WriteFont
;
import
com.alibaba.excel.write.style.HorizontalCellStyleStrategy
;
import
com.alibaba.fastjson.JSON
;
/**
/**
* 临时测试
* 临时测试
...
...
src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatter1.java
浏览文件 @
3bfb78f5
...
@@ -968,12 +968,12 @@ public class DataFormatter1 implements Observer {
...
@@ -968,12 +968,12 @@ public class DataFormatter1 implements Observer {
return
""
;
return
""
;
}
}
CellType
cellType
=
cell
.
getCellType
Enum
();
CellType
cellType
=
cell
.
getCellType
();
if
(
cellType
==
CellType
.
FORMULA
)
{
if
(
cellType
==
CellType
.
FORMULA
)
{
if
(
evaluator
==
null
)
{
if
(
evaluator
==
null
)
{
return
cell
.
getCellFormula
();
return
cell
.
getCellFormula
();
}
}
cellType
=
evaluator
.
evaluateFormulaCell
Enum
(
cell
);
cellType
=
evaluator
.
evaluateFormulaCell
(
cell
);
}
}
switch
(
cellType
)
{
switch
(
cellType
)
{
case
NUMERIC:
case
NUMERIC:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录