This closes qax-os#2117, support add data table for chart

- Add ShowDataTable and ShowDataTableKeys fields in the ChartPlotArea data type
- Update unit tests

Author: xuri

chart.go

@@ -863,6 +863,14 @@ func (opts *Chart) parseTitle() {
 // ShowCatName: Specifies that the category name shall be shown in the data
 // label. The 'ShowCatName' property is optional. The default value is true.
 //
+// ShowDataTable: Used for add data table under chart, depending on the chart
+// type, only available for area, bar, column and line series type charts. The
+// 'ShowDataTable' property is optional. The default value is false.
+//
+// ShowDataTableKeys: Used for add legend key in data table, only works on
+// 'ShowDataTable' is enabled. The 'ShowDataTableKeys' property is optional.
+// The default value is false.
+//
 // ShowLeaderLines: Specifies leader lines shall be shown for data labels. The
 // 'ShowLeaderLines' property is optional. The default value is false.
 //

chart_test.go

@@ -293,7 +293,7 @@ func TestAddChart(t *testing.T) {
 		{"I1", Doughnut, "Clustered Column - Doughnut Chart"},
 	}
 	for _, props := range clusteredColumnCombo {
-		assert.NoError(t, f.AddChart("Combo Charts", props[0].(string), &Chart{Type: Col, Series: series[:4], Format: format, Legend: legend, Title: []RichTextRun{{Text: props[2].(string)}}, PlotArea: ChartPlotArea{ShowBubbleSize: true, ShowCatName: false, ShowLeaderLines: false, ShowPercent: true, ShowSerName: true, ShowVal: true}}, &Chart{Type: props[1].(ChartType), Series: series[4:], Format: format, Legend: legend, PlotArea: ChartPlotArea{ShowBubbleSize: true, ShowCatName: false, ShowLeaderLines: false, ShowPercent: true, ShowSerName: true, ShowVal: true}, YAxis: ChartAxis{Secondary: true}}))
+		assert.NoError(t, f.AddChart("Combo Charts", props[0].(string), &Chart{Type: Col, Series: series[:4], Format: format, Legend: legend, Title: []RichTextRun{{Text: props[2].(string)}}, PlotArea: ChartPlotArea{ShowBubbleSize: true, ShowCatName: false, ShowDataTable: true, ShowDataTableKeys: true, ShowLeaderLines: false, ShowPercent: true, ShowSerName: true, ShowVal: true}}, &Chart{Type: props[1].(ChartType), Series: series[4:], Format: format, Legend: legend, PlotArea: ChartPlotArea{ShowBubbleSize: true, ShowCatName: false, ShowLeaderLines: false, ShowPercent: true, ShowSerName: true, ShowVal: true}, YAxis: ChartAxis{Secondary: true}}))
 	}
 	stackedAreaCombo := map[string][]interface{}{
 		"A16": {Line, "Stacked Area - Line Chart"},

drawing.go

@@ -169,6 +169,7 @@ func (f *File) addChart(opts *Chart, comboCharts []*Chart) {
 		xlsxChartSpace.Chart.Legend = nil
 	}
 	xlsxChartSpace.Chart.PlotArea.SpPr = f.drawShapeFill(opts.PlotArea.Fill, xlsxChartSpace.Chart.PlotArea.SpPr)
+	xlsxChartSpace.Chart.PlotArea.DTable = f.drawPlotAreaDTable(opts)
 	addChart := func(c, p *cPlotArea) {
 		immutable, mutable := reflect.ValueOf(c).Elem(), reflect.ValueOf(p).Elem()
 		for i := 0; i < mutable.NumField(); i++ {
@@ -1232,6 +1233,19 @@ func (f *File) drawPlotAreaTitles(runs []RichTextRun, vert string) *cTitle {
 	return title
 }
 
+// drawPlotAreaDTable provides a function to draw the c:dTable element.
+func (f *File) drawPlotAreaDTable(opts *Chart) *cDTable {
+	if _, ok := plotAreaChartGrouping[opts.Type]; ok && opts.PlotArea.ShowDataTable {
+		return &cDTable{
+			ShowHorzBorder: &attrValBool{Val: boolPtr(true)},
+			ShowVertBorder: &attrValBool{Val: boolPtr(true)},
+			ShowOutline:    &attrValBool{Val: boolPtr(true)},
+			ShowKeys:       &attrValBool{Val: boolPtr(opts.PlotArea.ShowDataTableKeys)},
+		}
+	}
+	return nil
+}
+
 // drawPlotAreaSpPr provides a function to draw the c:spPr element.
 func (f *File) drawPlotAreaSpPr() *cSpPr {
 	return &cSpPr{

xmlChart.go

@@ -215,6 +215,17 @@ type aRPr struct {
 	Cs         *aCs            `xml:"a:cs"`
 }
 
+// cDTable (Data Table) directly maps the dTable element.
+type cDTable struct {
+	ShowHorzBorder *attrValBool `xml:"showHorzBorder"`
+	ShowVertBorder *attrValBool `xml:"showVertBorder"`
+	ShowOutline    *attrValBool `xml:"showOutline"`
+	ShowKeys       *attrValBool `xml:"showKeys"`
+	SpPr           *cSpPr       `xml:"spPr"`
+	TxPr           *cTxPr       `xml:"txPr"`
+	ExtLst         *xlsxExtLst  `xml:"extLst"`
+}
+
 // cSpPr (Shape Properties) directly maps the spPr element. This element
 // specifies the visual shape properties that can be applied to a shape. These
 // properties include the shape fill, outline, geometry, effects, and 3D
@@ -319,6 +330,7 @@ type cPlotArea struct {
 	CatAx          []*cAxs    `xml:"catAx"`
 	ValAx          []*cAxs    `xml:"valAx"`
 	SerAx          []*cAxs    `xml:"serAx"`
+	DTable         *cDTable   `xml:"dTable"`
 	SpPr           *cSpPr     `xml:"spPr"`
 }
 
@@ -559,15 +571,17 @@ type ChartDimension struct {
 
 // ChartPlotArea directly maps the format settings of the plot area.
 type ChartPlotArea struct {
-	SecondPlotValues int
-	ShowBubbleSize   bool
-	ShowCatName      bool
-	ShowLeaderLines  bool
-	ShowPercent      bool
-	ShowSerName      bool
-	ShowVal          bool
-	Fill             Fill
-	NumFmt           ChartNumFmt
+	SecondPlotValues  int
+	ShowBubbleSize    bool
+	ShowCatName       bool
+	ShowDataTable     bool
+	ShowDataTableKeys bool
+	ShowLeaderLines   bool
+	ShowPercent       bool
+	ShowSerName       bool
+	ShowVal           bool
+	Fill              Fill
+	NumFmt            ChartNumFmt
 }
 
 // Chart directly maps the format settings of the chart.