Release 0.2

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>0.1</Version>
+    <Version>0.2</Version>
     <!--TODO  <PackageIconUrl></PackageIconUrl> -->
     <PackageProjectUrl>https://github.com/realLiangshiwei/Lsw.Abp.AntDesignUI</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/RoleManagement.razor.cs

@@ -40,11 +40,8 @@ public partial class RoleManagement
 
     protected override ValueTask SetBreadcrumbItemsAsync()
     {
-        BreadcrumbItems = new List<AbpBreadcrumbItem>()
-        {
-            new(L["Menu:IdentityManagement"]),
-            new(L["Roles"])
-        };
+        BreadcrumbItems.Add(new AbpBreadcrumbItem(L["Menu:IdentityManagement"]));
+        BreadcrumbItems.Add(new AbpBreadcrumbItem(L["Roles"]));
 
         return base.SetBreadcrumbItemsAsync();
     }
@@ -127,6 +124,7 @@ public partial class RoleManagement
 
     protected override ValueTask SetToolbarItemsAsync()
     {
+        
         Toolbar.AddButton(L["NewRole"],
             OpenCreateModalAsync,
             IconType.Outline.Plus,

modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/UserManagement.razor.cs

@@ -61,11 +61,8 @@ public partial class UserManagement
 
     protected override ValueTask SetBreadcrumbItemsAsync()
     {
-        BreadcrumbItems = new List<AbpBreadcrumbItem>()
-        {
-            new(L["Menu:IdentityManagement"]),
-            new(L["Users"])
-        };
+        BreadcrumbItems.Add(new AbpBreadcrumbItem(L["Menu:IdentityManagement"]));
+        BreadcrumbItems.Add(new AbpBreadcrumbItem(L["Users"]));
 
         return base.SetBreadcrumbItemsAsync();
     }

modules/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Layout/AbpPageHeader.razor

@@ -4,7 +4,7 @@
 <Row Class="ant-design-row-breadcrumb">
     <Col Span="12">
         <Breadcrumb Class="ant-design-breadcrumb">
-            @if (Options.Value.RenderBreadcrumbs && PageLayout.BreadcrumbItems.Any())
+            @if (Options.Value.RenderBreadcrumbs && BreadcrumbItems.Any())
             {
                 @if (BreadcrumbShowHome)
                 {
@@ -12,7 +12,7 @@
                         <Icon Type="home"/>
                     </BreadcrumbItem>
                 }
-                @foreach (var item in PageLayout.BreadcrumbItems)
+                @foreach (var item in BreadcrumbItems)
                 {
                     <BreadcrumbItem Href="@item.Url">
                         @if (!item.Icon.IsNullOrWhiteSpace())
@@ -46,5 +46,5 @@
 </Row>
 @if (Options.Value.RenderPageTitle)
 {
-    <div class="ant-design-page-title">@PageLayout.Title</div>
+    <div class="ant-design-page-title">@Title</div>
 }

modules/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Layout/AbpPageHeader.razor.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
@@ -14,11 +15,8 @@ public partial class AbpPageHeader : ComponentBase
 
     public IPageToolbarManager PageToolbarManager { get; set; }
 
-    [Inject]
-    public PageLayout PageLayout { get; private set; }
-
     [Parameter]
-    public string Title { get => PageLayout.Title; set => PageLayout.Title = value; }
+    public string Title { get; set; }
 
     [Parameter]
     public bool BreadcrumbShowHome { get; set; } = true;
@@ -30,10 +28,7 @@ public partial class AbpPageHeader : ComponentBase
     public RenderFragment ChildContent { get; set; }
     
     [Parameter] 
-    public List<AbpBreadcrumbItem> BreadcrumbItems {
-        get => PageLayout.BreadcrumbItems.ToList();
-        set => PageLayout.BreadcrumbItems = new ObservableCollection<AbpBreadcrumbItem>(value);
-    }
+    public List<AbpBreadcrumbItem> BreadcrumbItems { get; set; }
     
     [Parameter]
     public PageToolbar Toolbar { get; set; }
@@ -48,18 +43,13 @@ public partial class AbpPageHeader : ComponentBase
         await base.OnParametersSetAsync();
         if (Toolbar != null)
         {
-            var toolbarItems = await PageToolbarManager.GetItemsAsync(Toolbar);
-            ToolbarItemRenders.Clear();
-
             if (!Options.Value.RenderToolbar)
             {
-                PageLayout.ToolbarItems.Clear();
-                foreach (var item in toolbarItems)
-                {
-                    PageLayout.ToolbarItems.Add(item);
-                }
                 return;
             }
+            
+            var toolbarItems = await PageToolbarManager.GetItemsAsync(Toolbar);
+            ToolbarItemRenders.Clear();
 
             foreach (var item in toolbarItems)
             {

modules/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Themes/AntDesignTheme/DefaultLayout.razor

@@ -53,7 +53,7 @@ else
                 <Row Justify="end">
                     <NavToolbar/>
                 </Row>
-
+                
             </Header>
             <Content Class="ant-design-content">
                 <PageAlert/>

modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.AntDesignUI/Pages/SettingManagement/SettingManagement.razor.cs

@@ -33,11 +33,7 @@ public partial class SettingManagement
 
     protected override async Task OnInitializedAsync()
     {
-        BreadcrumbItems = new List<AbpBreadcrumbItem>
-        {
-            new(L["Settings"])
-        };
-        
+        BreadcrumbItems.Add(new AbpBreadcrumbItem(L["Settings"]));
         SettingComponentCreationContext = new SettingComponentCreationContext(ServiceProvider);
 
         foreach (var contributor in Options.Contributors)

modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.AntDesignUI/Pages/TenantManagement.razor.cs

@@ -41,11 +41,8 @@ public partial class TenantManagement
 
     protected override ValueTask SetBreadcrumbItemsAsync()
     {
-        BreadcrumbItems = new List<AbpBreadcrumbItem>()
-        {
-            new(L["Menu:TenantManagement"]),
-            new(L["Tenants"])
-        };
+        BreadcrumbItems.Add(new AbpBreadcrumbItem(L["Menu:TenantManagement"]));
+        BreadcrumbItems.Add(new AbpBreadcrumbItem(L["Tenants"]));
 
         return base.SetBreadcrumbItemsAsync();
     }

src/Lsw.Abp.AntDesignUI/AbpCrudPageBase.cs

@@ -191,7 +191,7 @@ public abstract class AbpCrudPageBase<
     protected bool EditModalVisible;
     protected Form<TCreateViewModel> CreateFormRef;
     protected Form<TUpdateViewModel> EditFormRef;
-    protected List<AbpBreadcrumbItem> BreadcrumbItems = new(2);
+    protected List<AbpBreadcrumbItem> BreadcrumbItems = new();
     protected TableEntityActionsColumn<TListViewModel> EntityActionsColumn;
     protected EntityActionDictionary EntityActions { get; set; }
     protected TableColumnDictionary TableColumns { get; set; }
@@ -217,19 +217,11 @@ public abstract class AbpCrudPageBase<
         await SetPermissionsAsync();
         await SetEntityActionsAsync();
         await SetTableColumnsAsync();
+        await SetToolbarItemsAsync();
+        await SetBreadcrumbItemsAsync();
         await InvokeAsync(StateHasChanged);
     }
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender)
-        {
-            await base.OnAfterRenderAsync(true);
-            await SetToolbarItemsAsync();
-            await SetBreadcrumbItemsAsync();
-        }
-    }
-
     protected virtual async Task SetPermissionsAsync()
     {
         if (CreatePolicyName != null)