Add support for table footers

2025-06-19 13:28:16 +08:00 · 2020-10-24 17:15:19 +02:00
parent c9c0ad733f
commit 03334f693d
31 changed files with 504 additions and 132 deletions
--- a/src/Spectre.Console/Rendering/Borders/TableBorderPart.cs
+++ b/src/Spectre.Console/Rendering/Borders/TableBorderPart.cs
@ -60,6 +60,26 @@ namespace Spectre.Console.Rendering
        /// </summary>
        HeaderBottomRight,

+        /// <summary>
+        /// The top left part of a footer.
+        /// </summary>
+        FooterTopLeft,
+
+        /// <summary>
+        /// The top part of a footer.
+        /// </summary>
+        FooterTop,
+
+        /// <summary>
+        /// The top separator part of a footer.
+        /// </summary>
+        FooterTopSeparator,
+
+        /// <summary>
+        /// The top right part of a footer.
+        /// </summary>
+        FooterTopRight,
+
        /// <summary>
        /// The left part of a cell.
        /// </summary>
--- a/src/Spectre.Console/Rendering/Borders/Tables/Ascii2TableBorder.cs
+++ b/src/Spectre.Console/Rendering/Borders/Tables/Ascii2TableBorder.cs
@ -26,6 +26,10 @@ namespace Spectre.Console.Rendering
                TableBorderPart.CellLeft => "|",
                TableBorderPart.CellSeparator => "|",
                TableBorderPart.CellRight => "|",
+                TableBorderPart.FooterTopLeft => "|",
+                TableBorderPart.FooterTop => "-",
+                TableBorderPart.FooterTopSeparator => "+",
+                TableBorderPart.FooterTopRight => "|",
                TableBorderPart.FooterBottomLeft => "+",
                TableBorderPart.FooterBottom => "-",
                TableBorderPart.FooterBottomSeparator => "+",
--- a/src/Spectre.Console/Rendering/Borders/Tables/AsciiDoubleHeadTableBorder.cs
+++ b/src/Spectre.Console/Rendering/Borders/Tables/AsciiDoubleHeadTableBorder.cs
@ -26,6 +26,10 @@ namespace Spectre.Console.Rendering
                TableBorderPart.CellLeft => "|",
                TableBorderPart.CellSeparator => "|",
                TableBorderPart.CellRight => "|",
+                TableBorderPart.FooterTopLeft => "+",
+                TableBorderPart.FooterTop => "-",
+                TableBorderPart.FooterTopSeparator => "+",
+                TableBorderPart.FooterTopRight => "+",
                TableBorderPart.FooterBottomLeft => "+",
                TableBorderPart.FooterBottom => "-",
                TableBorderPart.FooterBottomSeparator => "+",
--- a/src/Spectre.Console/Rendering/Borders/Tables/AsciiTableBorder.cs
+++ b/src/Spectre.Console/Rendering/Borders/Tables/AsciiTableBorder.cs
@ -26,6 +26,10 @@ namespace Spectre.Console.Rendering
                TableBorderPart.CellLeft => "|",
                TableBorderPart.CellSeparator => "|",
                TableBorderPart.CellRight => "|",
+                TableBorderPart.FooterTopLeft => "|",
+                TableBorderPart.FooterTop => "-",
+                TableBorderPart.FooterTopSeparator => "+",
+                TableBorderPart.FooterTopRight => "|",
                TableBorderPart.FooterBottomLeft => "+",
                TableBorderPart.FooterBottom => "-",
                TableBorderPart.FooterBottomSeparator => "-",
--- a/src/Spectre.Console/Rendering/Borders/Tables/DoubleEdgeTableBorder.cs
+++ b/src/Spectre.Console/Rendering/Borders/Tables/DoubleEdgeTableBorder.cs
@ -26,6 +26,10 @@ namespace Spectre.Console.Rendering
                TableBorderPart.CellLeft => "║",
                TableBorderPart.CellSeparator => "│",
                TableBorderPart.CellRight => "║",
+                TableBorderPart.FooterTopLeft => "╟",
+                TableBorderPart.FooterTop => "─",
+                TableBorderPart.FooterTopSeparator => "┼",
+                TableBorderPart.FooterTopRight => "╢",
                TableBorderPart.FooterBottomLeft => "╚",
                TableBorderPart.FooterBottom => "═",
                TableBorderPart.FooterBottomSeparator => "╧",
--- a/src/Spectre.Console/Rendering/Borders/Tables/DoubleTableBorder.cs
+++ b/src/Spectre.Console/Rendering/Borders/Tables/DoubleTableBorder.cs
@ -26,6 +26,10 @@ namespace Spectre.Console.Rendering
                TableBorderPart.CellLeft => "║",
                TableBorderPart.CellSeparator => "║",
                TableBorderPart.CellRight => "║",
+                TableBorderPart.FooterTopLeft => "╠",
+                TableBorderPart.FooterTop => "═",
+                TableBorderPart.FooterTopSeparator => "╬",
+                TableBorderPart.FooterTopRight => "╣",
                TableBorderPart.FooterBottomLeft => "╚",
                TableBorderPart.FooterBottom => "═",
                TableBorderPart.FooterBottomSeparator => "╩",
--- a/src/Spectre.Console/Rendering/Borders/Tables/HeavyEdgeTableBorder.cs
+++ b/src/Spectre.Console/Rendering/Borders/Tables/HeavyEdgeTableBorder.cs
@ -29,6 +29,10 @@ namespace Spectre.Console.Rendering
                TableBorderPart.CellLeft => "┃",
                TableBorderPart.CellSeparator => "│",
                TableBorderPart.CellRight => "┃",
+                TableBorderPart.FooterTopLeft => "┠",
+                TableBorderPart.FooterTop => "─",
+                TableBorderPart.FooterTopSeparator => "┼",
+                TableBorderPart.FooterTopRight => "┨",
                TableBorderPart.FooterBottomLeft => "┗",
                TableBorderPart.FooterBottom => "━",
                TableBorderPart.FooterBottomSeparator => "┷",
--- a/src/Spectre.Console/Rendering/Borders/Tables/HeavyHeadTableBorder.cs
+++ b/src/Spectre.Console/Rendering/Borders/Tables/HeavyHeadTableBorder.cs
@ -29,6 +29,10 @@ namespace Spectre.Console.Rendering
                TableBorderPart.CellLeft => "│",
                TableBorderPart.CellSeparator => "│",
                TableBorderPart.CellRight => "│",
+                TableBorderPart.FooterTopLeft => "├",
+                TableBorderPart.FooterTop => "─",
+                TableBorderPart.FooterTopSeparator => "┼",
+                TableBorderPart.FooterTopRight => "┤",
                TableBorderPart.FooterBottomLeft => "└",
                TableBorderPart.FooterBottom => "─",
                TableBorderPart.FooterBottomSeparator => "┴",
--- a/src/Spectre.Console/Rendering/Borders/Tables/HeavyTableBorder.cs
+++ b/src/Spectre.Console/Rendering/Borders/Tables/HeavyTableBorder.cs
@ -29,6 +29,10 @@ namespace Spectre.Console.Rendering
                TableBorderPart.CellLeft => "┃",
                TableBorderPart.CellSeparator => "┃",
                TableBorderPart.CellRight => "┃",
+                TableBorderPart.FooterTopLeft => "┣",
+                TableBorderPart.FooterTop => "━",
+                TableBorderPart.FooterTopSeparator => "╋",
+                TableBorderPart.FooterTopRight => "┫",
                TableBorderPart.FooterBottomLeft => "┗",
                TableBorderPart.FooterBottom => "━",
                TableBorderPart.FooterBottomSeparator => "┻",
--- a/src/Spectre.Console/Rendering/Borders/Tables/HorizontalTableBorder.cs
+++ b/src/Spectre.Console/Rendering/Borders/Tables/HorizontalTableBorder.cs
@ -26,6 +26,10 @@ namespace Spectre.Console.Rendering
                TableBorderPart.CellLeft => " ",
                TableBorderPart.CellSeparator => " ",
                TableBorderPart.CellRight => " ",
+                TableBorderPart.FooterTopLeft => "─",
+                TableBorderPart.FooterTop => "─",
+                TableBorderPart.FooterTopSeparator => "─",
+                TableBorderPart.FooterTopRight => "─",
                TableBorderPart.FooterBottomLeft => "─",
                TableBorderPart.FooterBottom => "─",
                TableBorderPart.FooterBottomSeparator => "─",
--- a/src/Spectre.Console/Rendering/Borders/Tables/MarkdownTableBorder.cs
+++ b/src/Spectre.Console/Rendering/Borders/Tables/MarkdownTableBorder.cs
@ -29,6 +29,10 @@ namespace Spectre.Console.Rendering
                TableBorderPart.CellLeft => "|",
                TableBorderPart.CellSeparator => "|",
                TableBorderPart.CellRight => "|",
+                TableBorderPart.FooterTopLeft => " ",
+                TableBorderPart.FooterTop => " ",
+                TableBorderPart.FooterTopSeparator => " ",
+                TableBorderPart.FooterTopRight => " ",
                TableBorderPart.FooterBottomLeft => " ",
                TableBorderPart.FooterBottom => " ",
                TableBorderPart.FooterBottomSeparator => " ",
@ -40,7 +44,12 @@ namespace Spectre.Console.Rendering
        /// <inheritdoc/>
        public override string GetColumnRow(TablePart part, IReadOnlyList<int> widths, IReadOnlyList<IColumn> columns)
        {
-            if (part != TablePart.Separator)
+            if (part == TablePart.FooterSeparator)
+            {
+                return string.Empty;
+            }
+
+            if (part != TablePart.HeaderSeparator)
            {
                return base.GetColumnRow(part, widths, columns);
            }
--- a/src/Spectre.Console/Rendering/Borders/Tables/MinimalDoubleHeadTableBorder.cs
+++ b/src/Spectre.Console/Rendering/Borders/Tables/MinimalDoubleHeadTableBorder.cs
@ -26,6 +26,10 @@ namespace Spectre.Console.Rendering
                TableBorderPart.CellLeft => " ",
                TableBorderPart.CellSeparator => "│",
                TableBorderPart.CellRight => " ",
+                TableBorderPart.FooterTopLeft => " ",
+                TableBorderPart.FooterTop => "═",
+                TableBorderPart.FooterTopSeparator => "╪",
+                TableBorderPart.FooterTopRight => " ",
                TableBorderPart.FooterBottomLeft => " ",
                TableBorderPart.FooterBottom => " ",
                TableBorderPart.FooterBottomSeparator => " ",
--- a/src/Spectre.Console/Rendering/Borders/Tables/MinimalHeavyHeadTableBorder.cs
+++ b/src/Spectre.Console/Rendering/Borders/Tables/MinimalHeavyHeadTableBorder.cs
@ -29,6 +29,10 @@ namespace Spectre.Console.Rendering
                TableBorderPart.CellLeft => " ",
                TableBorderPart.CellSeparator => "│",
                TableBorderPart.CellRight => " ",
+                TableBorderPart.FooterTopLeft => " ",
+                TableBorderPart.FooterTop => "━",
+                TableBorderPart.FooterTopSeparator => "┿",
+                TableBorderPart.FooterTopRight => " ",
                TableBorderPart.FooterBottomLeft => " ",
                TableBorderPart.FooterBottom => " ",
                TableBorderPart.FooterBottomSeparator => " ",
--- a/src/Spectre.Console/Rendering/Borders/Tables/MinimalTableBorder.cs
+++ b/src/Spectre.Console/Rendering/Borders/Tables/MinimalTableBorder.cs
@ -26,6 +26,10 @@ namespace Spectre.Console.Rendering
                TableBorderPart.CellLeft => " ",
                TableBorderPart.CellSeparator => "│",
                TableBorderPart.CellRight => " ",
+                TableBorderPart.FooterTopLeft => " ",
+                TableBorderPart.FooterTop => "─",
+                TableBorderPart.FooterTopSeparator => "┼",
+                TableBorderPart.FooterTopRight => " ",
                TableBorderPart.FooterBottomLeft => " ",
                TableBorderPart.FooterBottom => " ",
                TableBorderPart.FooterBottomSeparator => " ",
--- a/src/Spectre.Console/Rendering/Borders/Tables/RoundedTableBorder.cs
+++ b/src/Spectre.Console/Rendering/Borders/Tables/RoundedTableBorder.cs
@ -29,6 +29,10 @@ namespace Spectre.Console.Rendering
                TableBorderPart.CellLeft => "│",
                TableBorderPart.CellSeparator => "│",
                TableBorderPart.CellRight => "│",
+                TableBorderPart.FooterTopLeft => "├",
+                TableBorderPart.FooterTop => "─",
+                TableBorderPart.FooterTopSeparator => "┼",
+                TableBorderPart.FooterTopRight => "┤",
                TableBorderPart.FooterBottomLeft => "╰",
                TableBorderPart.FooterBottom => "─",
                TableBorderPart.FooterBottomSeparator => "┴",
--- a/src/Spectre.Console/Rendering/Borders/Tables/SimpleHeavyTableBorder.cs
+++ b/src/Spectre.Console/Rendering/Borders/Tables/SimpleHeavyTableBorder.cs
@ -29,6 +29,10 @@ namespace Spectre.Console.Rendering
                TableBorderPart.CellLeft => " ",
                TableBorderPart.CellSeparator => " ",
                TableBorderPart.CellRight => " ",
+                TableBorderPart.FooterTopLeft => "━",
+                TableBorderPart.FooterTop => "━",
+                TableBorderPart.FooterTopSeparator => "━",
+                TableBorderPart.FooterTopRight => "━",
                TableBorderPart.FooterBottomLeft => " ",
                TableBorderPart.FooterBottom => " ",
                TableBorderPart.FooterBottomSeparator => " ",
--- a/src/Spectre.Console/Rendering/Borders/Tables/SimpleTableBorder.cs
+++ b/src/Spectre.Console/Rendering/Borders/Tables/SimpleTableBorder.cs
@ -26,6 +26,10 @@ namespace Spectre.Console.Rendering
                TableBorderPart.CellLeft => " ",
                TableBorderPart.CellSeparator => " ",
                TableBorderPart.CellRight => " ",
+                TableBorderPart.FooterTopLeft => "─",
+                TableBorderPart.FooterTop => "─",
+                TableBorderPart.FooterTopSeparator => "─",
+                TableBorderPart.FooterTopRight => "─",
                TableBorderPart.FooterBottomLeft => " ",
                TableBorderPart.FooterBottom => " ",
                TableBorderPart.FooterBottomSeparator => " ",
--- a/src/Spectre.Console/Rendering/Borders/Tables/SquareTableBorder.cs
+++ b/src/Spectre.Console/Rendering/Borders/Tables/SquareTableBorder.cs
@ -26,6 +26,10 @@ namespace Spectre.Console.Rendering
                TableBorderPart.CellLeft => "│",
                TableBorderPart.CellSeparator => "│",
                TableBorderPart.CellRight => "│",
+                TableBorderPart.FooterTopLeft => "├",
+                TableBorderPart.FooterTop => "─",
+                TableBorderPart.FooterTopSeparator => "┼",
+                TableBorderPart.FooterTopRight => "┤",
                TableBorderPart.FooterBottomLeft => "└",
                TableBorderPart.FooterBottom => "─",
                TableBorderPart.FooterBottomSeparator => "┴",
--- a/src/Spectre.Console/Rendering/TablePart.cs
+++ b/src/Spectre.Console/Rendering/TablePart.cs
@ -13,7 +13,12 @@ namespace Spectre.Console.Rendering
        /// <summary>
        /// The separator between the header and the cells.
        /// </summary>
-        Separator,
+        HeaderSeparator,
+
+        /// <summary>
+        /// The separator between the footer and the cells.
+        /// </summary>
+        FooterSeparator,

        /// <summary>
        /// The bottom of a table.