Merge pull request #24638 from abpframework/auto-merge/rel-10-0/4279

Merge branch rel-10.1 with rel-10.0

framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Layout/PageLayout.cs

@@ -31,6 +31,8 @@ public class PageLayout : IScopedDependency, INotifyPropertyChanged
         }
     }
 
+    public bool ShowToolbar { get; set; } = true;
+
     public virtual ObservableCollection<BreadcrumbItem> BreadcrumbItems { get; } = new();
 
     public virtual ObservableCollection<PageToolbarItem> ToolbarItems { get; } = new();

framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Layout/ContentLayout.cs

@@ -11,6 +11,8 @@ public class ContentLayout
 
     public string? MenuItemName { get; set; }
 
+    public bool ShowToolbar { get; set; } = true;
+
     public ContentLayout()
     {
         BreadCrumb = new BreadCrumb();
@@ -23,11 +25,6 @@ public class ContentLayout
             return true;
         }
 
-        if (BreadCrumb.ShowCurrent && !Title.IsNullOrEmpty())
-        {
-            return true;
-        }
-
-        return false;
+        return BreadCrumb.ShowCurrent || BreadCrumb.ShowHome;
     }
 }