From ef35c4fca807c9e42a5b5d5402ca49a062177b03 Mon Sep 17 00:00:00 2001 From: dfinke Date: Sun, 12 Jun 2022 09:53:52 -0400 Subject: [PATCH] Fix for EndRow and EndColumn Parameters Ignored in Import-Excel #1194 --- Public/Import-Excel.ps1 | 7 +++- .../ImportExcelTests/DataInDiffRowCol.xlsx | Bin 0 -> 9082 bytes .../ImportExcelEndRowEndColumn.tests.ps1 | 36 ++++++++++++++++++ .../ReadMultipleXLSXFiles.tests.ps1 | 2 +- 4 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 __tests__/ImportExcelTests/DataInDiffRowCol.xlsx create mode 100644 __tests__/ImportExcelTests/ImportExcelEndRowEndColumn.tests.ps1 diff --git a/Public/Import-Excel.ps1 b/Public/Import-Excel.ps1 index 819fa0c..f95bc25 100644 --- a/Public/Import-Excel.ps1 +++ b/Public/Import-Excel.ps1 @@ -134,8 +134,11 @@ $xlBook = [Ordered]@{} foreach ($sheet in $Worksheet) { - $EndRow = 0 - $EndColumn = 0 + if ($Worksheet.Count -gt 1 -or $Paths.Count -gt 1) { + $EndRow = 0 + $EndColumn = 0 + } + $targetSheetname = $sheet.Name $xlBook["$targetSheetname"] = @() #region Get rows and columns diff --git a/__tests__/ImportExcelTests/DataInDiffRowCol.xlsx b/__tests__/ImportExcelTests/DataInDiffRowCol.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..f09b5b7dcf063f11b703d3e81dcf91230ce2d37b GIT binary patch literal 9082 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