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

This closes #834, fix invalid file path and duplicate namespace when re-creating worksheet

This commit is contained in:
xuri 2021-05-06 22:09:12 +08:00
parent 7e429c5b46
commit 438fd4b3f9
No known key found for this signature in database
GPG Key ID: BA5E5BB1C948EDF7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sheet.go
View File

@ -214,7 +214,7 @@ func (f *File) setSheet(index int, name string) {
path := "xl/worksheets/sheet" + strconv.Itoa(index) + ".xml" path := "xl/worksheets/sheet" + strconv.Itoa(index) + ".xml"
f.sheetMap[trimSheetName(name)] = path f.sheetMap[trimSheetName(name)] = path
f.Sheet[path] = &ws f.Sheet[path] = &ws
f.xmlAttr[path] = append(f.xmlAttr[path], NameSpaceSpreadSheet) f.xmlAttr[path] = []xml.Attr{NameSpaceSpreadSheet}
} }
// setWorkbook update workbook property of the spreadsheet. Maximum 31 // setWorkbook update workbook property of the spreadsheet. Maximum 31
@ -530,11 +530,8 @@ func (f *File) DeleteSheet(name string) {
if wbRels != nil { if wbRels != nil {
for _, rel := range wbRels.Relationships { for _, rel := range wbRels.Relationships {
if rel.ID == sheet.ID { if rel.ID == sheet.ID {
sheetXML = fmt.Sprintf("xl/%s", rel.Target) sheetXML = rel.Target
pathInfo := strings.Split(rel.Target, "/") rels = "xl/worksheets/_rels/" + strings.TrimPrefix(f.sheetMap[sheetName], "xl/worksheets/") + ".rels"
if len(pathInfo) == 2 {
rels = fmt.Sprintf("xl/%s/_rels/%s.rels", pathInfo[0], pathInfo[1])
}
} }
} }
} }
@ -569,9 +566,12 @@ func (f *File) deleteSheetFromWorkbookRels(rID string) string {
// deleteSheetFromContentTypes provides a function to remove worksheet // deleteSheetFromContentTypes provides a function to remove worksheet
// relationships by given target name in the file [Content_Types].xml. // relationships by given target name in the file [Content_Types].xml.
func (f *File) deleteSheetFromContentTypes(target string) { func (f *File) deleteSheetFromContentTypes(target string) {
if !strings.HasPrefix(target, "/") {
target = "/xl/" + target
}
content := f.contentTypesReader() content := f.contentTypesReader()
for k, v := range content.Overrides { for k, v := range content.Overrides {
if v.PartName == "/xl/"+target { if v.PartName == target {
content.Overrides = append(content.Overrides[:k], content.Overrides[k+1:]...) content.Overrides = append(content.Overrides[:k], content.Overrides[k+1:]...)
} }
} }