Skip to content

Commit a1b6dbe

Browse files
Add prettify
1 parent 30994ec commit a1b6dbe

File tree

1 file changed

+22
-7
lines changed

1 file changed

+22
-7
lines changed

Public/New-HTMLTable.ps1

+22-7
Original file line numberDiff line numberDiff line change
@@ -433,16 +433,31 @@ function New-HTMLTable {
433433
$DataTable = ConvertTo-FlatObject -Objects $DataTable
434434
}
435435
}
436-
if ($PrettifyObject) {
436+
437+
if ($PSBoundParameters.ContainsKey('PrettifyObject')) {
438+
if ($PrettifyObject) {
439+
$convertToPrettyObjectSplat = @{
440+
Object = $DataTable
441+
ArrayJoin = $true
442+
}
443+
if ($PrettifyObjectDateTimeFormat) {
444+
$convertToPrettyObjectSplat['DateTimeFormat'] = $PrettifyObjectDateTimeFormat
445+
}
446+
if ($PrettifyObjectSeparator) {
447+
$convertToPrettyObjectSplat['ArrayJoinString'] = $PrettifyObjectSeparator
448+
}
449+
$DataTable = ConvertTo-PrettyObject @convertToPrettyObjectSplat
450+
}
451+
} elseif ($Script:HTMLSchema['TableOptions']['DataStoreOptions'].PrettifyObject) {
437452
$convertToPrettyObjectSplat = @{
438-
Object = $DataTable
439-
ArrayJoin = $true
453+
Object = $DataTable
454+
ArrayJoin = $true
440455
}
441-
if ($PrettifyObjectDateTimeFormat) {
442-
$convertToPrettyObjectSplat['DateTimeFormat'] = $PrettifyObjectDateTimeFormat
456+
if ($Script:HTMLSchema['TableOptions']['DataStoreOptions'].PrettifyObjectDateTimeFormat) {
457+
$convertToPrettyObjectSplat['DateTimeFormat'] = $Script:HTMLSchema['TableOptions']['DataStoreOptions'].PrettifyObjectDateTimeFormat
443458
}
444-
if ($PrettifyObjectSeparator) {
445-
$convertToPrettyObjectSplat['ArrayJoinString'] = $PrettifyObjectSeparator
459+
if ($Script:HTMLSchema['TableOptions']['DataStoreOptions'].PrettifyObjectSeparator) {
460+
$convertToPrettyObjectSplat['ArrayJoinString'] = $Script:HTMLSchema['TableOptions']['DataStoreOptions'].PrettifyObjectSeparator
446461
}
447462
$DataTable = ConvertTo-PrettyObject @convertToPrettyObjectSplat
448463
}

0 commit comments

Comments
 (0)