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

Support for hash tables as definitions; more tests

Browse Source
This commit is contained in:
jhoneill
2018-09-07 13:07:40 +01:00
parent 061ae22bfe
commit f47887f7fe
7 changed files with 100 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Export-Excel.ps1
View File

@@ -910,9 +910,14 @@
}
foreach ($chartDef in $ExcelChartDefinition) {
$params = @{}
$chartDef.PSObject.Properties | ForEach-Object {if ( $null -ne $_.value) {$params[$_.name] = $_.value}}
Add-ExcelChart -Worksheet $ws @params
if ($chartDef -is [System.Management.Automation.PSCustomObject]) {
$params = @{}
$chartDef.PSObject.Properties | ForEach-Object {if ( $null -ne $_.value) {$params[$_.name] = $_.value}}
Add-ExcelChart -Worksheet $ws @params
}
elseif ($chartDef -is [hashtable] -or $chartDef -is[System.Collections.Specialized.OrderedDictionary]) {
Add-ExcelChart -Worksheet $ws @chartDef
}
}
if ($Calculate) {
@@ -951,10 +956,12 @@
Add-ExcelChart -Worksheet $ws @params
}
}
# It now doesn't matter if the conditional formating rules are passed in $conditionalText or $conditional format.
# Just one with an alias for compatiblity it will break things for people who are using both at once
foreach ($c in (@() + $ConditionalText + $ConditionalFormat) ) {
try {
#we can take an object with a .ConditionalType property made by New-ConditionalText or with a .Formatter Property made by New-ConditionalFormattingIconSet or a hash table
if ($c.ConditionalType) {
$cfParams = @{RuleType = $c.ConditionalType; ConditionValue = $c.Text ;
BackgroundColor = $c.BackgroundColor; BackgroundPattern = $c.PatternType ;
@@ -972,9 +979,14 @@
}
Write-Verbose -Message "Added conditional formatting to range $($c.range)"
}
elseif ($c -is [hashtable] -or $c -is[System.Collections.Specialized.OrderedDictionary]) {
if (-not $c.Range) {$c.Range = $ws.Dimension.Address }
Add-ConditionalFormatting -WorkSheet $ws @c
}
}
catch {throw "Error applying confitional formatting to worksheet $_"}
catch {throw "Error applying conditional formatting to worksheet $_"}
}
if ($CellStyleSB) {
try {
$TotalRows = $ws.Dimension.Rows
@@ -984,7 +996,6 @@
catch {Write-Warning -Message "Failed processing CellStyleSB in worksheet '$WorksheetName': $_"}
}
if ($Password) {
try {
$ws.Protection.SetPassword($Password)