refactor: 移除 IsPage 参数

Author: ArgoZhang

src/BootstrapBlazor.Server/Components/Layout/PageLayout.razor

@@ -6,7 +6,7 @@
 </HeadContent>
 
 <CascadingValue Value="this" IsFixed="true">
-    <Layout SideWidth="0" IsPage="true" IsFullSide="@IsFullSide" IsFixedHeader="@IsFixedHeader" IsFixedFooter="@IsFixedFooter"
+    <Layout SideWidth="0" IsFullSide="@IsFullSide" IsFixedHeader="@IsFixedHeader" IsFixedFooter="@IsFixedFooter"
             ShowFooter="@ShowFooter" ShowGotoTop="true" ShowCollapseBar="true" Menus="@Menus"
             UseTabSet="@UseTabSet" TabDefaultUrl="layout-page" AdditionalAssemblies="new[] { GetType().Assembly }" class="@LayoutClassString">
         <Header>

src/BootstrapBlazor/Components/Layout/Layout.razor.cs

@@ -108,6 +108,8 @@ public partial class Layout : IHandlerException
     /// </summary>
     /// <remarks>为真时增加 is-page 样式</remarks>
     [Parameter]
+    [Obsolete("已弃用，直接删除即可；Deprecated Please remove it")]
+    [ExcludeFromCodeCoverage]
     public bool IsPage { get; set; }
 
     /// <summary>
@@ -233,7 +235,6 @@ public partial class Layout : IHandlerException
     private string? ClassString => CssBuilder.Default("layout")
         .AddClass("is-collapsed", IsCollapsed)
         .AddClass("has-sidebar", Side != null && IsFullSide)
-        .AddClass("is-page", IsPage)
         .AddClass("has-footer", ShowFooter && Footer != null)
         .AddClassFromAttributes(AdditionalAttributes)
         .Build();

src/BootstrapBlazor/Components/Layout/Layout.razor.scss

@@ -161,93 +161,91 @@
         }
     }
 
-    &.is-page {
-        .has-sidebar {
-            .layout-banner {
-                display: none;
-            }
-
-            .layout-main {
-                width: 100%;
-            }
+    .has-sidebar {
+        .layout-banner {
+            display: none;
         }
 
-        .layout-right {
+        .layout-main {
             width: 100%;
         }
+    }
+
+    .layout-right {
+        width: 100%;
+    }
+
+    &.is-fixed {
+        position: fixed;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+    }
+
+    .layout-header {
+        background-color: var(--bb-layout-header-background);
+        height: var(--bb-layout-header-height);
+        color: var(--bb-layout-header-color);
+        display: flex;
+        align-items: center;
+        padding: 0 1rem;
+        position: sticky;
+        z-index: 1035;
+        border-bottom: 1px solid var(--bb-layout-header-border-color);
 
         &.is-fixed {
-            position: fixed;
             top: 0;
-            bottom: 0;
-            left: 0;
-            right: 0;
         }
 
-        .layout-header {
-            background-color: var(--bb-layout-header-background);
-            height: var(--bb-layout-header-height);
-            color: var(--bb-layout-header-color);
-            display: flex;
-            align-items: center;
-            padding: 0 1rem;
-            position: sticky;
-            z-index: 1035;
-            border-bottom: 1px solid var(--bb-layout-header-border-color);
+        .widget {
+            --bb-widget-toggle-color: var(--bb-layout-header-color);
 
-            &.is-fixed {
-                top: 0;
+            .progress {
+                height: 7px;
             }
+        }
 
-            .widget {
-                --bb-widget-toggle-color: var(--bb-layout-header-color);
+        .logout-avatar {
+            border-radius: 50%;
+        }
 
-                .progress {
-                    height: 7px;
-                }
-            }
+        .dropdown-logout {
+            --bb-logout-text-color: var(--bb-layout-header-color);
+            --bb-logout-user-bg: var(--bb-layout-menu-user-banner-background);
+            --bb-logout-menu-border-color: var(--bb-layout-menu-user-border-color);
 
-            .logout-avatar {
+            .dropdown-user img {
                 border-radius: 50%;
             }
-
-            .dropdown-logout {
-                --bb-logout-text-color: var(--bb-layout-header-color);
-                --bb-logout-user-bg: var(--bb-layout-menu-user-banner-background);
-                --bb-logout-menu-border-color: var(--bb-layout-menu-user-border-color);
-
-                .dropdown-user img {
-                    border-radius: 50%;
-                }
-            }
         }
+    }
 
-        .layout-menu {
-            .menu {
-                --bb-menu-item-hover-bg: var(--bb-layout-menu-item-hover-bg);
-            }
+    .layout-menu {
+        .menu {
+            --bb-menu-item-hover-bg: var(--bb-layout-menu-item-hover-bg);
         }
+    }
 
-        .layout-main {
-            padding: 1rem;
-            position: relative;
-            min-height: calc(100vh - var(--bb-layout-header-height) - var(--bb-layout-footer-height));
-        }
+    .layout-main {
+        padding: 1rem;
+        position: relative;
+        min-height: calc(100vh - var(--bb-layout-header-height) - var(--bb-layout-footer-height));
+    }
 
-        .layout-footer {
-            height: var(--bb-layout-footer-height);
-            color: var(--bb-layout-footer-color);
-            background-color: var(--bb-layout-footer-background);
-            display: flex;
-            align-items: center;
-            padding: 0 1rem;
-            border-top: 1px solid var(--bs-border-color);
-
-            &.is-fixed {
-                z-index: 1035;
-                position: sticky;
-                bottom: 0;
-            }
+    .layout-footer {
+        height: var(--bb-layout-footer-height);
+        color: var(--bb-layout-footer-color);
+        background-color: var(--bb-layout-footer-background);
+        display: flex;
+        align-items: center;
+        padding: 0 1rem;
+        border-top: 1px solid var(--bs-border-color);
+
+        &.is-fixed {
+            z-index: 1035;
+            position: sticky;
+            bottom: 0;
         }
     }
 }

test/UnitTest/Components/LayoutTest.cs

@@ -99,19 +99,6 @@ await cut.InvokeAsync(() =>
         cut.WaitForAssertion(() => Assert.DoesNotContain("<i class=\"fa-solid fa-bars\"></i>", cut.Markup));
     }
 
-    [Fact]
-    public void IsPage_OK()
-    {
-        var cut = Context.RenderComponent<Layout>(pb =>
-        {
-            pb.Add(a => a.IsPage, true);
-        });
-        Assert.Contains("is-page", cut.Markup);
-
-        cut.SetParametersAndRender(pb => pb.Add(a => a.IsPage, false));
-        cut.WaitForAssertion(() => Assert.DoesNotContain("is-page", cut.Markup));
-    }
-
     [Fact]
     public void IsFullSide_OK()
     {