jgaunt/ImportExcel
1
0
Fork 0
mirror of https://github.com/dfinke/ImportExcel.git synced 2025-12-16 00:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

assume IncludePivot when implied by other params

Browse Source
This commit is contained in:
jhoneill
2019-12-22 14:52:06 +00:00
parent 718bf951b7
commit 6f48219819
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Public/Export-Excel.ps1
View File

@@ -442,7 +442,7 @@
Add-PivotTable -ExcelPackage $pkg -PivotTableName $item.key @Params Add-PivotTable -ExcelPackage $pkg -PivotTableName $item.key @Params
} }
} }
if ($IncludePivotTable -or $IncludePivotChart) { if ($IncludePivotTable -or $IncludePivotChart -or $PivotData) {
$params = @{ $params = @{
'SourceRange' = $dataRange 'SourceRange' = $dataRange
} }
@@ -461,7 +461,8 @@
if ($NoTotalsInPivot) {$params.PivotTotals = "None" } if ($NoTotalsInPivot) {$params.PivotTotals = "None" }
Elseif ($PivotTotals) {$params.PivotTotals = $PivotTotals} Elseif ($PivotTotals) {$params.PivotTotals = $PivotTotals}
if ($PivotDataToColumn) {$params.PivotDataToColumn = $true} if ($PivotDataToColumn) {$params.PivotDataToColumn = $true}
if ($IncludePivotChart) { if ($IncludePivotChart -or
$PSBoundParameters.ContainsKey('ChartType')) {
$params.IncludePivotChart = $true $params.IncludePivotChart = $true
$Params.ChartType = $ChartType $Params.ChartType = $ChartType
if ($ShowCategory) {$params.ShowCategory = $true} if ($ShowCategory) {$params.ShowCategory = $true}

3
Public/New-PivotTableDefinition.ps1
View File

@@ -62,6 +62,9 @@ function New-PivotTableDefinition {
$parameters.Remove('NoTotalsInPivot') $parameters.Remove('NoTotalsInPivot')
$parameters["PivotTotals"] = "None" $parameters["PivotTotals"] = "None"
} }
if ($PSBoundParameters.ContainsKey('ChartType') -and -not $PSBoundParameters.ContainsKey('IncludePivotChart')) {
$parameters['IncludePivotChart'] = $true
}
$parameters.Remove('PivotTableName') $parameters.Remove('PivotTableName')
if ($PivotChartDefinition) { if ($PivotChartDefinition) {
$parameters.PivotChartDefinition.XRange = $null $parameters.PivotChartDefinition.XRange = $null