diff options
| author | Eagle Xiang <eagle.xiang@outlook.com> | 2021-01-28 21:13:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-28 21:13:23 +0800 |
| commit | 219add2f0e4ae591141330648d410b60f5c0dbcf (patch) | |
| tree | ba4302ffc711ecba25cb822d6867a729454c3f8f | |
| parent | b84bd1abc06457f6383013b8a600fc8c95eed2ed (diff) | |
value fields xlsxPatternFill.FgColor & xlsxPatternFill.BgColor cause … (#770)
* value fields xlsxPatternFill.FgColor & xlsxPatternFill.BgColor cause ineffective omitempty tags
* remove useless omitempty tag on xlsxPatternFill.FgColor and xlsxPatternFill.BgColor
| -rw-r--r-- | styles.go | 6 | ||||
| -rw-r--r-- | xmlStyles.go | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -2432,8 +2432,14 @@ func newFills(style *Style, fg bool) *xlsxFill { var pattern xlsxPatternFill pattern.PatternType = patterns[style.Fill.Pattern] if fg { + if pattern.FgColor == nil { + pattern.FgColor = new(xlsxColor) + } pattern.FgColor.RGB = getPaletteColor(style.Fill.Color[0]) } else { + if pattern.BgColor == nil { + pattern.BgColor = new(xlsxColor) + } pattern.BgColor.RGB = getPaletteColor(style.Fill.Color[0]) } fill.PatternFill = &pattern diff --git a/xmlStyles.go b/xmlStyles.go index 2884800..db85b15 100644 --- a/xmlStyles.go +++ b/xmlStyles.go @@ -120,9 +120,9 @@ type xlsxFill struct { // For cell fills with patterns specified, then the cell fill color is // specified by the bgColor element. type xlsxPatternFill struct { - PatternType string `xml:"patternType,attr,omitempty"` - FgColor xlsxColor `xml:"fgColor,omitempty"` - BgColor xlsxColor `xml:"bgColor,omitempty"` + PatternType string `xml:"patternType,attr,omitempty"` + FgColor *xlsxColor `xml:"fgColor"` + BgColor *xlsxColor `xml:"bgColor"` } // xlsxGradientFill defines a gradient-style cell fill. Gradient cell fills can |