p71924506
/
excelize
forked from p30928647/excelize
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #529, handle empty inline rich text

This commit is contained in:
xuri 2019-12-11 00:02:33 +08:00
parent 08d1a86c3a
commit 5d8365ca17
No known key found for this signature in database
GPG Key ID: BA5E5BB1C948EDF7
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rows.go
View File

@ -279,7 +279,10 @@ func (xlsx *xlsxC) getValueFrom(f *File, d *xlsxSST) (string, error) {
case "str": case "str":
return f.formattedValue(xlsx.S, xlsx.V), nil return f.formattedValue(xlsx.S, xlsx.V), nil
case "inlineStr": case "inlineStr":
if xlsx.IS != nil {
return f.formattedValue(xlsx.S, xlsx.IS.String()), nil return f.formattedValue(xlsx.S, xlsx.IS.String()), nil
}
return f.formattedValue(xlsx.S, xlsx.V), nil
default: default:
return f.formattedValue(xlsx.S, xlsx.V), nil return f.formattedValue(xlsx.S, xlsx.V), nil
} }

9
rows_test.go
View File

@ -706,6 +706,15 @@ func TestDuplicateRowInvalidRownum(t *testing.T) {
} }
} }
func TestGetValueFrom(t *testing.T) {
c := &xlsxC{T: "inlineStr"}
f := NewFile()
d := &xlsxSST{}
val, err := c.getValueFrom(f, d)
assert.NoError(t, err)
assert.Equal(t, "", val)
}
func TestErrSheetNotExistError(t *testing.T) { func TestErrSheetNotExistError(t *testing.T) {
err := ErrSheetNotExist{SheetName: "Sheet1"} err := ErrSheetNotExist{SheetName: "Sheet1"}
assert.EqualValues(t, err.Error(), "sheet Sheet1 is not exist") assert.EqualValues(t, err.Error(), "sheet Sheet1 is not exist")