This closes #866, support use the defined name to reference the data range in pivot table options

- Fix incorrect scope when getting defined name
- Update docs: use column number instead of index on get column width

1 files changed, 11 insertions, 5 deletions

diff --git a/pivotTable_test.go b/pivotTable_test.go
index 40d58d4..7098b3a 100644
--- a/pivotTable_test.go
+++ b/pivotTable_test.go
@@ -136,10 +136,16 @@ func TestAddPivotTable(t *testing.T) {
 		ShowColHeaders:  true,
 		ShowLastColumn:  true,
 	}))
-	//Test Pivot table with many data, many rows, many cols
+	// Create pivot table with many data, many rows, many cols and defined name
+	f.SetDefinedName(&DefinedName{
+		Name:     "dataRange",
+		RefersTo: "Sheet1!$A$1:$E$31",
+		Comment:  "Pivot Table Data Range",
+		Scope:    "Sheet2",
+	})
 	assert.NoError(t, f.AddPivotTable(&PivotTableOption{
-		DataRange:       "Sheet1!$A$1:$E$31",
-		PivotTableRange: "Sheet2!$A$56:$AG$90",
+		DataRange:       "dataRange",
+		PivotTableRange: "Sheet2!$A$57:$AJ$91",
 		Rows:            []PivotTableField{{Data: "Month", DefaultSubtotal: true}, {Data: "Year"}},
 		Columns:         []PivotTableField{{Data: "Region", DefaultSubtotal: true}, {Data: "Type"}},
 		Data:            []PivotTableField{{Data: "Sales", Subtotal: "Sum", Name: "Sum of Sales"}, {Data: "Sales", Subtotal: "Average", Name: "Average of Sales"}},
@@ -223,7 +229,7 @@ func TestAddPivotTable(t *testing.T) {
 	_, _, err := f.adjustRange("")
 	assert.EqualError(t, err, "parameter is required")
 	// Test get pivot fields order with empty data range
-	_, err = f.getPivotFieldsOrder("")
+	_, err = f.getPivotFieldsOrder(&PivotTableOption{})
 	assert.EqualError(t, err, `parameter 'DataRange' parsing error: parameter is required`)
 	// Test add pivot cache with empty data range
 	assert.EqualError(t, f.addPivotCache(0, "", &PivotTableOption{}, nil), "parameter 'DataRange' parsing error: parameter is required")
@@ -288,7 +294,7 @@ func TestAddPivotColFields(t *testing.T) {
 func TestGetPivotFieldsOrder(t *testing.T) {
 	f := NewFile()
 	// Test get pivot fields order with not exist worksheet
-	_, err := f.getPivotFieldsOrder("SheetN!$A$1:$E$31")
+	_, err := f.getPivotFieldsOrder(&PivotTableOption{DataRange: "SheetN!$A$1:$E$31"})
 	assert.EqualError(t, err, "sheet SheetN is not exist")
 }