Selaa lähdekoodia

Trim blank cells which created by `completeCol()`, relate issue #81

Ri Xu 8 vuotta sitten
vanhempi
commit
3b2c80ddc3
2 muutettua tiedostoa jossa 20 lisäystä ja 1 poistoa
  1. 19 0
      sheet.go
  2. 1 1
      xmlWorkbook.go

+ 19 - 0
sheet.go

@@ -72,10 +72,29 @@ func (f *File) workbookWriter() {
 func (f *File) worksheetWriter() {
 	for path, sheet := range f.Sheet {
 		if sheet != nil {
+			for k, v := range sheet.SheetData.Row {
+				f.Sheet[path].SheetData.Row[k].C = trimCell(v.C)
+			}
 			output, _ := xml.Marshal(sheet)
 			f.saveFileList(path, replaceWorkSheetsRelationshipsNameSpace(string(output)))
+			ok := f.checked[path]
+			if ok {
+				f.checked[path] = false
+			}
+		}
+	}
+}
+
+// trimCell provides function to trim blank cells which created by completeCol.
+func trimCell(column []xlsxC) []xlsxC {
+	col := []xlsxC{}
+	for _, c := range column {
+		if c.S == 0 && c.V == "" && c.F == nil && c.T == "" {
+			continue
 		}
+		col = append(col, c)
 	}
+	return col
 }
 
 // Read and update property of contents type of XLSX.

+ 1 - 1
xmlWorkbook.go

@@ -203,7 +203,7 @@ type xlsxDefinedName struct {
 	FunctionGroupID   int    `xml:"functionGroupId,attr,omitempty"`
 	Help              string `xml:"help,attr,omitempty"`
 	Hidden            bool   `xml:"hidden,attr,omitempty"`
-	LocalSheetID      int    `xml:"localSheetId,attr"`
+	LocalSheetID      *int   `xml:"localSheetId,attr"`
 	Name              string `xml:"name,attr,omitempty"`
 	PublishToServer   bool   `xml:"publishToServer,attr,omitempty"`
 	ShortcutKey       string `xml:"shortcutKey,attr,omitempty"`