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

This closes #838, fix wrong worksheet XML path of the stream writer in some case

This commit is contained in:
xuri 2021-05-14 00:09:23 +08:00
parent be12cc27f1
commit a1e1db1e6f
No known key found for this signature in database
GPG Key ID: BA5E5BB1C948EDF7
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
stream.go
View File

@ -99,11 +99,11 @@ func (f *File) NewStreamWriter(sheet string) (*StreamWriter, error) {
return nil, err
}
sheetXML := fmt.Sprintf("xl/worksheets/sheet%d.xml", sw.SheetID)
sheetPath := f.sheetMap[trimSheetName(sheet)]
if f.streams == nil {
f.streams = make(map[string]*StreamWriter)
}
f.streams[sheetXML] = sw
f.streams[sheetPath] = sw
_, _ = sw.rawData.WriteString(XMLHeader + `<worksheet` + templateNamespaceIDMap)
bulkAppendFields(&sw.rawData, sw.worksheet, 2, 5)
@ -462,6 +462,10 @@ func writeCell(buf *bufferedWriter, c xlsxC) {
// Flush ending the streaming writing process.
func (sw *StreamWriter) Flush() error {
if !sw.sheetWritten {
_, _ = sw.rawData.WriteString(`<sheetData>`)
sw.sheetWritten = true
}
_, _ = sw.rawData.WriteString(`</sheetData>`)
bulkAppendFields(&sw.rawData, sw.worksheet, 8, 15)
if sw.mergeCellsCount > 0 {
@ -476,10 +480,10 @@ func (sw *StreamWriter) Flush() error {
return err
}
sheetXML := fmt.Sprintf("xl/worksheets/sheet%d.xml", sw.SheetID)
delete(sw.File.Sheet, sheetXML)
delete(sw.File.checked, sheetXML)
delete(sw.File.XLSX, sheetXML)
sheetPath := sw.File.sheetMap[trimSheetName(sw.Sheet)]
delete(sw.File.Sheet, sheetPath)
delete(sw.File.checked, sheetPath)
delete(sw.File.XLSX, sheetPath)
return nil
}

6
stream_test.go
View File

@ -68,13 +68,13 @@ func TestStreamWriter(t *testing.T) {
assert.NoError(t, streamWriter.SetRow(cell, row))
}
// Test set cell column overflow.
assert.EqualError(t, streamWriter.SetRow("XFD1", []interface{}{"A", "B", "C"}), ErrColumnNumber.Error())
assert.NoError(t, streamWriter.Flush())
// Save spreadsheet by the given path.
assert.NoError(t, file.SaveAs(filepath.Join("test", "TestStreamWriter.xlsx")))
// Test set cell column overflow.
assert.EqualError(t, streamWriter.SetRow("XFD1", []interface{}{"A", "B", "C"}), ErrColumnNumber.Error())
// Test close temporary file error.
file = NewFile()
streamWriter, err = file.NewStreamWriter("Sheet1")