From 5a9dd7a4d5d39e2d50132af1bd350c5dca428fde Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Fri, 13 Dec 2019 14:36:00 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E6=9B=B4=E6=96=B0=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/DefaultLayoutComponentBase.cs  | 22 +++++++++----------
 .../Bootstrap.Admin/Components/HeaderBase.cs  | 16 +++++---------
 .../Bootstrap.Admin/Components/SideBarBase.cs | 10 ++-------
 .../Shared/DefaultLayout.razor                |  2 +-
 src/admin/Bootstrap.Admin/Shared/Header.razor |  6 ++---
 .../Bootstrap.Admin/wwwroot/css/blazor.css    |  5 +++++
 6 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/src/admin/Bootstrap.Admin/Components/DefaultLayoutComponentBase.cs b/src/admin/Bootstrap.Admin/Components/DefaultLayoutComponentBase.cs
index 74145d0b..0a67ca09 100644
--- a/src/admin/Bootstrap.Admin/Components/DefaultLayoutComponentBase.cs
+++ b/src/admin/Bootstrap.Admin/Components/DefaultLayoutComponentBase.cs
@@ -12,47 +12,47 @@ using System.Threading.Tasks;
 namespace Bootstrap.Admin.Components
 {
     /// <summary>
-    /// 
+    ///
     /// </summary>
     public class DefaultLayoutComponentBase : LayoutComponentBase
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         [Inject]
         public AuthenticationStateProvider AuthenticationStateProvider { get; set; } = new ServerAuthenticationStateProvider();
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         [Inject]
         public NavigationManager? NavigationManager { get; set; }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         [Inject]
         public IJSRuntime? JSRuntime { get; set; }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public NavigatorBarModel Model { get; set; } = new NavigatorBarModel("");
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string UserName { get; set; } = "";
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string DisplayName { get; set; } = "";
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
-        protected bool IsAdmin { get; set; }
+        public bool IsAdmin { get; set; }
 
         /// <summary>
         /// 获得/设置 系统首页
@@ -103,7 +103,7 @@ namespace Bootstrap.Admin.Components
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public void OnDisplayNameChanged(string displayName)
         {
@@ -113,7 +113,7 @@ namespace Bootstrap.Admin.Components
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="firstRender"></param>
         protected override void OnAfterRender(bool firstRender)
diff --git a/src/admin/Bootstrap.Admin/Components/HeaderBase.cs b/src/admin/Bootstrap.Admin/Components/HeaderBase.cs
index 104dbc7b..639c753b 100644
--- a/src/admin/Bootstrap.Admin/Components/HeaderBase.cs
+++ b/src/admin/Bootstrap.Admin/Components/HeaderBase.cs
@@ -4,36 +4,30 @@ using Microsoft.AspNetCore.Components;
 namespace Bootstrap.Admin.Components
 {
     /// <summary>
-    /// 
+    ///
     /// </summary>
     public class HeaderBase : ComponentBase
     {
         /// <summary>
-        /// 
-        /// </summary>
-        [Parameter]
-        public bool IsAdmin { get; set; }
-
-        /// <summary>
-        /// 
+        ///
         /// </summary>
         [Parameter]
         public string Title { get; set; } = "";
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         [CascadingParameter(Name = "Default")]
         public DefaultLayout RootLayout { get; protected set; } = new DefaultLayout();
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         [Parameter]
         public string Icon { get; set; } = "";
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public void UpdateDisplayName()
         {
diff --git a/src/admin/Bootstrap.Admin/Components/SideBarBase.cs b/src/admin/Bootstrap.Admin/Components/SideBarBase.cs
index d1a9ec83..e0ae44d0 100644
--- a/src/admin/Bootstrap.Admin/Components/SideBarBase.cs
+++ b/src/admin/Bootstrap.Admin/Components/SideBarBase.cs
@@ -16,19 +16,13 @@ namespace Bootstrap.Admin.Components
         public NavigatorBarModel Model { get; set; } = new NavigatorBarModel("");
 
         /// <summary>
-        /// 侧边栏绑定 Model 改变事件
-        /// </summary>
-        [Parameter]
-        public EventCallback<NavigatorBarModel> ModelChanged { get; set; }
-
-        /// <summary>
-        /// 
+        ///
         /// </summary>
         [CascadingParameter(Name = "Default")]
         public DefaultLayout RootLayout { get; protected set; } = new DefaultLayout();
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public void UpdateDisplayName()
         {
diff --git a/src/admin/Bootstrap.Admin/Shared/DefaultLayout.razor b/src/admin/Bootstrap.Admin/Shared/DefaultLayout.razor
index 84c026e8..973d0290 100644
--- a/src/admin/Bootstrap.Admin/Shared/DefaultLayout.razor
+++ b/src/admin/Bootstrap.Admin/Shared/DefaultLayout.razor
@@ -1,7 +1,7 @@
 @inherits DefaultLayoutComponentBase
 
 <CascadingValue Value=this Name="Default">
-    <Header @ref="Header" Icon="@Model.Icon" Title="@Model.Title" IsAdmin=@IsAdmin UserName="@UserName" HomeUrl="@HomeUrl" DisplayName="@DisplayName" />
+    <Header @ref="Header" Icon="@Model.Icon" Title="@Model.Title" />
     <SideBar @ref="SideBar" Model=@Model />
     @Body
     <Footer Text="@Model.Footer" IsDemo=@Model.IsDemo></Footer>
diff --git a/src/admin/Bootstrap.Admin/Shared/Header.razor b/src/admin/Bootstrap.Admin/Shared/Header.razor
index be05bb6f..7f5b8950 100644
--- a/src/admin/Bootstrap.Admin/Shared/Header.razor
+++ b/src/admin/Bootstrap.Admin/Shared/Header.razor
@@ -3,12 +3,12 @@
 <header class="header">
     <div class="bg"></div>
     <div class="d-flex align-items-center">
-        <a id="navbar" href="@HomeUrl" class="sidebar-toggle-box">
+        <a id="navbar" href="@RootLayout.HomeUrl" class="sidebar-toggle-box">
             <i class="fa fa-bars"></i>
             <span id="websiteTitle">@Title</span>
         </a>
         <div class="nav">
-            @if (IsAdmin)
+            @if (@RootLayout.IsAdmin)
             {
                 <!-- tasks start -->
                 <div class="dropdown">
@@ -103,7 +103,7 @@
                         <img src="@Icon.ToBlazorLink()">
                         <div class="flex-fill">
                             <div class="username text-truncate">@RootLayout.DisplayName</div>
-                            <div>登录名：@UserName</div>
+                            <div>登录名：@RootLayout.UserName</div>
                         </div>
                     </div>
                 </div>
diff --git a/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css b/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
index f3b85f7c..fc0b1d8f 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
+++ b/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
@@ -2,6 +2,10 @@
     z-index: 9999 !important;
 }
 
+.userinfo .username {
+    max-width: 120px;
+}
+
 .nav-link-bar {
     border: 1px solid #dee2e6;
     border-top-left-radius: 0.25rem;
@@ -69,6 +73,7 @@ nav .dropdown .nav-link-close.dropdown-toggle:after {
 
 .table th, .table td {
     padding: 0.5rem;
+    white-space: nowrap;
 }
 
 .table .btn.btn-sm {