Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_879456671
easyexcel
提交
111d6e0a
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,发现更多精彩内容 >>
未验证
提交
111d6e0a
编写于
9月 14, 2021
作者:
庄家钜
提交者:
GitHub
9月 14, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2036 from duanqiaoyanyu/bugfix
fix issue 2035
上级
4cff5214
d1490ee2
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
9 addition
and
1 deletion
+9
-1
src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
.../alibaba/excel/write/executor/ExcelWriteFillExecutor.java
+9
-1
未找到文件。
src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
浏览文件 @
111d6e0a
...
@@ -416,6 +416,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
...
@@ -416,6 +416,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
int
startIndex
=
0
;
int
startIndex
=
0
;
int
length
=
value
.
length
();
int
length
=
value
.
length
();
int
lastPrepareDataIndex
=
0
;
int
lastPrepareDataIndex
=
0
;
int
variableCount
=
0
;
out:
out:
while
(
startIndex
<
length
)
{
while
(
startIndex
<
length
)
{
int
prefixIndex
=
value
.
indexOf
(
FILL_PREFIX
,
startIndex
);
int
prefixIndex
=
value
.
indexOf
(
FILL_PREFIX
,
startIndex
);
...
@@ -447,7 +448,10 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
...
@@ -447,7 +448,10 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
String
variable
=
value
.
substring
(
prefixIndex
+
1
,
suffixIndex
);
String
variable
=
value
.
substring
(
prefixIndex
+
1
,
suffixIndex
);
if
(
StringUtils
.
isEmpty
(
variable
))
{
if
(
StringUtils
.
isEmpty
(
variable
))
{
continue
;
continue
;
}
else
{
++
variableCount
;
}
}
int
collectPrefixIndex
=
variable
.
indexOf
(
COLLECTION_PREFIX
);
int
collectPrefixIndex
=
variable
.
indexOf
(
COLLECTION_PREFIX
);
if
(
collectPrefixIndex
>
-
1
)
{
if
(
collectPrefixIndex
>
-
1
)
{
if
(
collectPrefixIndex
!=
0
)
{
if
(
collectPrefixIndex
!=
0
)
{
...
@@ -466,10 +470,14 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
...
@@ -466,10 +470,14 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
String
data
=
convertPrepareData
(
value
.
substring
(
lastPrepareDataIndex
,
prefixIndex
));
String
data
=
convertPrepareData
(
value
.
substring
(
lastPrepareDataIndex
,
prefixIndex
));
preparedData
.
append
(
data
);
preparedData
.
append
(
data
);
analysisCell
.
getPrepareDataList
().
add
(
data
);
analysisCell
.
getPrepareDataList
().
add
(
data
);
analysisCell
.
setOnlyOneVariable
(
Boolean
.
FALSE
);
}
}
lastPrepareDataIndex
=
suffixIndex
+
1
;
lastPrepareDataIndex
=
suffixIndex
+
1
;
}
}
if
(
variableCount
>
1
)
{
analysisCell
.
setOnlyOneVariable
(
Boolean
.
FALSE
);
}
return
dealAnalysisCell
(
analysisCell
,
value
,
rowIndex
,
lastPrepareDataIndex
,
length
,
firstRowCache
,
return
dealAnalysisCell
(
analysisCell
,
value
,
rowIndex
,
lastPrepareDataIndex
,
length
,
firstRowCache
,
preparedData
);
preparedData
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录