diff options
author | xuri <xuri.me@gmail.com> | 2022-04-19 20:54:05 +0800 |
---|---|---|
committer | xuri <xuri.me@gmail.com> | 2022-04-19 20:54:05 +0800 |
commit | c2be30ce90621e4473940d521995a6ce97537da6 (patch) | |
tree | dae3cf893cad65e90f6ea6db28a19477de2b4d4e /pivotTable.go | |
parent | 0b8965dba9cf98fd1f5704ed0d354504c20776fa (diff) |
This closes #1203, supporting same field used for pivot table data and rows/cols
Diffstat (limited to 'pivotTable.go')
-rw-r--r-- | pivotTable.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pivotTable.go b/pivotTable.go index 437d22f..28c8632 100644 --- a/pivotTable.go +++ b/pivotTable.go @@ -542,6 +542,7 @@ func (f *File) addPivotFields(pt *xlsxPivotTableDefinition, opt *PivotTableOptio pt.PivotFields.PivotField = append(pt.PivotFields.PivotField, &xlsxPivotField{ Name: f.getPivotTableFieldName(name, opt.Rows), Axis: "axisRow", + DataField: inPivotTableField(opt.Data, name) != -1, Compact: &rowOptions.Compact, Outline: &rowOptions.Outline, DefaultSubtotal: &rowOptions.DefaultSubtotal, @@ -554,8 +555,9 @@ func (f *File) addPivotFields(pt *xlsxPivotTableDefinition, opt *PivotTableOptio } if inPivotTableField(opt.Filter, name) != -1 { pt.PivotFields.PivotField = append(pt.PivotFields.PivotField, &xlsxPivotField{ - Axis: "axisPage", - Name: f.getPivotTableFieldName(name, opt.Columns), + Axis: "axisPage", + DataField: inPivotTableField(opt.Data, name) != -1, + Name: f.getPivotTableFieldName(name, opt.Columns), Items: &xlsxItems{ Count: 1, Item: []*xlsxItem{ @@ -576,6 +578,7 @@ func (f *File) addPivotFields(pt *xlsxPivotTableDefinition, opt *PivotTableOptio pt.PivotFields.PivotField = append(pt.PivotFields.PivotField, &xlsxPivotField{ Name: f.getPivotTableFieldName(name, opt.Columns), Axis: "axisCol", + DataField: inPivotTableField(opt.Data, name) != -1, Compact: &columnOptions.Compact, Outline: &columnOptions.Outline, DefaultSubtotal: &columnOptions.DefaultSubtotal, |