- Worksheet conditional formatting support added, relate issue #56;

- gofmted with -s
This commit is contained in:
Ri Xu 2017-05-25 10:57:45 +08:00
parent dea57dd0ae
commit fbc3d1cd01
2 changed files with 24 additions and 23 deletions

View File

@ -390,12 +390,12 @@ func (f *File) drawBarChart(formatSet *formatChart) *cPlotArea {
},
}
charts := map[string]*cPlotArea{
"bar": &cPlotArea{
"bar": {
BarChart: &c,
CatAx: f.drawPlotAreaCatAx(),
ValAx: f.drawPlotAreaValAx(),
},
"bar3D": &cPlotArea{
"bar3D": {
Bar3DChart: &c,
CatAx: f.drawPlotAreaCatAx(),
ValAx: f.drawPlotAreaValAx(),

View File

@ -15,7 +15,7 @@ type xlsxWorksheet struct {
SheetData xlsxSheetData `xml:"sheetData"`
SheetProtection *xlsxSheetProtection `xml:"sheetProtection"`
MergeCells *xlsxMergeCells `xml:"mergeCells,omitempty"`
ConditionalFormatting *xlsxConditionalFormatting `xml:"conditionalFormatting"`
ConditionalFormatting []*xlsxConditionalFormatting `xml:"conditionalFormatting"`
DataValidations *xlsxDataValidations `xml:"dataValidations"`
Hyperlinks *xlsxHyperlinks `xml:"hyperlinks"`
PrintOptions *xlsxPrintOptions `xml:"printOptions"`
@ -348,6 +348,7 @@ type xlsxSheetProtection struct {
// condition is true. This collection expresses conditional formatting rules
// applied to a particular cell or range.
type xlsxConditionalFormatting struct {
SQRef string `xml:"sqref,attr,omitempty"`
CfRule string `xml:",innerxml"`
}