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

commented pull request

Browse Source
This commit is contained in:
jhoneill
2019-11-17 22:43:42 +00:00
parent a7104b729c
commit 36f27e3d40
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Export-Excel.ps1
View File

@@ -529,7 +529,7 @@
if (-not $PSBoundParameters.ContainsKey("TableName") -and if (-not $PSBoundParameters.ContainsKey("TableName") -and
-not $PSBoundParameters.ContainsKey("TableStyle") -and -not $PSBoundParameters.ContainsKey("TableStyle") -and
-not $AutoFilter) { -not $AutoFilter) {
$TableName = '' $TableName = '' # later rely on distinction between NULL and ""
} }
} }
if ($ExcelPackage) { if ($ExcelPackage) {
@@ -620,7 +620,7 @@
if it is a data table don't do foreach on it (slow) - put the whole table in and set dates on date columns, if it is a data table don't do foreach on it (slow) - put the whole table in and set dates on date columns,
set things up for the end block, and skip the process block #> set things up for the end block, and skip the process block #>
if ($InputObject -is [System.Data.DataTable]) { if ($InputObject -is [System.Data.DataTable]) {
#don't leave caller with a renamed table, save the name and set it back later #Change TableName if $TableName is non-empty; don't leave caller with a renamed table!
$orginalTableName = $InputObject.TableName $orginalTableName = $InputObject.TableName
if ($TableName) { if ($TableName) {
$InputObject.TableName = $TableName $InputObject.TableName = $TableName
@@ -629,6 +629,7 @@
Write-Warning "Table name $($InputObject.TableName) is not unique, adding '_' to it " Write-Warning "Table name $($InputObject.TableName) is not unique, adding '_' to it "
$InputObject.TableName += "_" $InputObject.TableName += "_"
} }
#Insert as a table, if Tablestyle didn't arrive as a default, or $TableName non-null - even if empty
if ($null -ne $TableName -or $PSBoundParameters.ContainsKey("TableStyle")) { if ($null -ne $TableName -or $PSBoundParameters.ContainsKey("TableStyle")) {
$null = $ws.Cells[$row,$StartColumn].LoadFromDataTable($InputObject, (-not $noHeader),$TableStyle ) $null = $ws.Cells[$row,$StartColumn].LoadFromDataTable($InputObject, (-not $noHeader),$TableStyle )
} }
@@ -818,6 +819,7 @@
#Allow table to be inserted by specifying Name, or Style or both; only process autoFilter if there is no table (they clash). #Allow table to be inserted by specifying Name, or Style or both; only process autoFilter if there is no table (they clash).
if ($null -ne $TableName -or $PSBoundParameters.ContainsKey('TableStyle')) { if ($null -ne $TableName -or $PSBoundParameters.ContainsKey('TableStyle')) {
#Already inserted Excel table if input was a DataTable
if ($InputObject -isnot [System.Data.DataTable]) { if ($InputObject -isnot [System.Data.DataTable]) {
Add-ExcelTable -Range $ws.Cells[$dataRange] -TableName $TableName -TableStyle $TableStyle Add-ExcelTable -Range $ws.Cells[$dataRange] -TableName $TableName -TableStyle $TableStyle
} }