From d757568ac64b9dfe25662cd2f25f1e356ab6b396 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Sat, 12 Mar 2022 15:48:40 +0800 Subject: [PATCH] Release 0.2 --- common.props | 2 +- .../Pages/RoleManagement.razor.cs | 8 +++---- .../Pages/UserManagement.razor.cs | 7 ++---- .../Layout/AbpPageHeader.razor | 6 ++--- .../Layout/AbpPageHeader.razor.cs | 24 ++++++------------- .../Themes/AntDesignTheme/DefaultLayout.razor | 2 +- .../SettingManagement.razor.cs | 6 +---- .../Pages/TenantManagement.razor.cs | 7 ++---- src/Lsw.Abp.AntDesignUI/AbpCrudPageBase.cs | 14 +++-------- 9 files changed, 23 insertions(+), 53 deletions(-) diff --git a/common.props b/common.props index b9680a4..8f78445 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 0.1 + 0.2 https://github.com/realLiangshiwei/Lsw.Abp.AntDesignUI MIT diff --git a/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/RoleManagement.razor.cs b/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/RoleManagement.razor.cs index 384efe5..4ca3ca4 100644 --- a/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/RoleManagement.razor.cs +++ b/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() - { - 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, diff --git a/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/UserManagement.razor.cs b/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/UserManagement.razor.cs index 7d0d579..9ec1284 100644 --- a/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/UserManagement.razor.cs +++ b/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() - { - new(L["Menu:IdentityManagement"]), - new(L["Users"]) - }; + BreadcrumbItems.Add(new AbpBreadcrumbItem(L["Menu:IdentityManagement"])); + BreadcrumbItems.Add(new AbpBreadcrumbItem(L["Users"])); return base.SetBreadcrumbItemsAsync(); } diff --git a/modules/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Layout/AbpPageHeader.razor b/modules/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Layout/AbpPageHeader.razor index 772305c..1b41614 100644 --- a/modules/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Layout/AbpPageHeader.razor +++ b/modules/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Layout/AbpPageHeader.razor @@ -4,7 +4,7 @@ - @if (Options.Value.RenderBreadcrumbs && PageLayout.BreadcrumbItems.Any()) + @if (Options.Value.RenderBreadcrumbs && BreadcrumbItems.Any()) { @if (BreadcrumbShowHome) { @@ -12,7 +12,7 @@ } - @foreach (var item in PageLayout.BreadcrumbItems) + @foreach (var item in BreadcrumbItems) { @if (!item.Icon.IsNullOrWhiteSpace()) @@ -46,5 +46,5 @@ @if (Options.Value.RenderPageTitle) { -
@PageLayout.Title
+
@Title
} diff --git a/modules/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Layout/AbpPageHeader.razor.cs b/modules/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Layout/AbpPageHeader.razor.cs index 9438930..2dcb5d1 100644 --- a/modules/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Layout/AbpPageHeader.razor.cs +++ b/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 BreadcrumbItems { - get => PageLayout.BreadcrumbItems.ToList(); - set => PageLayout.BreadcrumbItems = new ObservableCollection(value); - } + public List 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) { diff --git a/modules/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Themes/AntDesignTheme/DefaultLayout.razor b/modules/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Themes/AntDesignTheme/DefaultLayout.razor index 60dad00..ee7d209 100644 --- a/modules/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Themes/AntDesignTheme/DefaultLayout.razor +++ b/modules/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Themes/AntDesignTheme/DefaultLayout.razor @@ -53,7 +53,7 @@ else - + diff --git a/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.AntDesignUI/Pages/SettingManagement/SettingManagement.razor.cs b/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.AntDesignUI/Pages/SettingManagement/SettingManagement.razor.cs index b88b01c..372ef6a 100644 --- a/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.AntDesignUI/Pages/SettingManagement/SettingManagement.razor.cs +++ b/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 - { - new(L["Settings"]) - }; - + BreadcrumbItems.Add(new AbpBreadcrumbItem(L["Settings"])); SettingComponentCreationContext = new SettingComponentCreationContext(ServiceProvider); foreach (var contributor in Options.Contributors) diff --git a/modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.AntDesignUI/Pages/TenantManagement.razor.cs b/modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.AntDesignUI/Pages/TenantManagement.razor.cs index 658049e..4284f5f 100644 --- a/modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.AntDesignUI/Pages/TenantManagement.razor.cs +++ b/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() - { - new(L["Menu:TenantManagement"]), - new(L["Tenants"]) - }; + BreadcrumbItems.Add(new AbpBreadcrumbItem(L["Menu:TenantManagement"])); + BreadcrumbItems.Add(new AbpBreadcrumbItem(L["Tenants"])); return base.SetBreadcrumbItemsAsync(); } diff --git a/src/Lsw.Abp.AntDesignUI/AbpCrudPageBase.cs b/src/Lsw.Abp.AntDesignUI/AbpCrudPageBase.cs index 2fa1cbb..8fa7e60 100644 --- a/src/Lsw.Abp.AntDesignUI/AbpCrudPageBase.cs +++ b/src/Lsw.Abp.AntDesignUI/AbpCrudPageBase.cs @@ -191,7 +191,7 @@ public abstract class AbpCrudPageBase< protected bool EditModalVisible; protected Form CreateFormRef; protected Form EditFormRef; - protected List BreadcrumbItems = new(2); + protected List BreadcrumbItems = new(); protected TableEntityActionsColumn 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)