Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xuri
excelize
提交
15614bad
excelize
项目概览
xuri
/
excelize
通知
13
Star
2
Fork
4
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
excelize
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
已验证
提交
15614bad
编写于
8月 25, 2023
作者:
xurime
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
This closes #1628, fix the GetPictures function returns pictures doesn't correct in some cases
上级
db224523
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
3 deletion
+10
-3
picture.go
picture.go
+1
-3
picture_test.go
picture_test.go
+9
-0
未找到文件。
picture.go
浏览文件 @
15614bad
...
@@ -649,9 +649,7 @@ func (f *File) getPicture(row, col int, drawingXML, drawingRelationships string)
...
@@ -649,9 +649,7 @@ func (f *File) getPicture(row, col int, drawingXML, drawingRelationships string)
if
wsDr
,
_
,
err
=
f
.
drawingParser
(
drawingXML
);
err
!=
nil
{
if
wsDr
,
_
,
err
=
f
.
drawingParser
(
drawingXML
);
err
!=
nil
{
return
return
}
}
if
pics
=
f
.
getPicturesFromWsDr
(
row
,
col
,
drawingRelationships
,
wsDr
);
len
(
pics
)
>
0
{
pics
=
f
.
getPicturesFromWsDr
(
row
,
col
,
drawingRelationships
,
wsDr
)
return
}
deWsDr
=
new
(
decodeWsDr
)
deWsDr
=
new
(
decodeWsDr
)
if
err
=
f
.
xmlNewDecoder
(
bytes
.
NewReader
(
namespaceStrictToTransitional
(
f
.
readXML
(
drawingXML
))))
.
if
err
=
f
.
xmlNewDecoder
(
bytes
.
NewReader
(
namespaceStrictToTransitional
(
f
.
readXML
(
drawingXML
))))
.
Decode
(
deWsDr
);
err
!=
nil
&&
err
!=
io
.
EOF
{
Decode
(
deWsDr
);
err
!=
nil
&&
err
!=
io
.
EOF
{
...
...
picture_test.go
浏览文件 @
15614bad
...
@@ -70,6 +70,15 @@ func TestAddPicture(t *testing.T) {
...
@@ -70,6 +70,15 @@ func TestAddPicture(t *testing.T) {
assert
.
NoError
(
t
,
f
.
SaveAs
(
filepath
.
Join
(
"test"
,
"TestAddPicture1.xlsx"
)))
assert
.
NoError
(
t
,
f
.
SaveAs
(
filepath
.
Join
(
"test"
,
"TestAddPicture1.xlsx"
)))
assert
.
NoError
(
t
,
f
.
Close
())
assert
.
NoError
(
t
,
f
.
Close
())
// Test get pictures after inserting a new picture from a workbook which contains existing pictures
f
,
err
=
OpenFile
(
filepath
.
Join
(
"test"
,
"TestAddPicture1.xlsx"
))
assert
.
NoError
(
t
,
err
)
assert
.
NoError
(
t
,
f
.
AddPicture
(
"Sheet1"
,
"A30"
,
filepath
.
Join
(
"test"
,
"images"
,
"excel.jpg"
),
nil
))
pics
,
err
:=
f
.
GetPictures
(
"Sheet1"
,
"A30"
)
assert
.
NoError
(
t
,
err
)
assert
.
Len
(
t
,
pics
,
2
)
assert
.
NoError
(
t
,
f
.
Close
())
// Test add picture with unsupported charset content types
// Test add picture with unsupported charset content types
f
=
NewFile
()
f
=
NewFile
()
f
.
ContentTypes
=
nil
f
.
ContentTypes
=
nil
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录