Browse Source

Merge pull request #12126 from abpframework/liangshiwei/blazorui

Identity: Enhancements for Blazor UI
pull/12153/head
Berkan Sasmaz 4 years ago
committed by GitHub
parent
commit
af16644159
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Layout/PageHeader.razor
  2. 1
      framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor
  3. 2
      modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs
  4. 6
      modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
  5. 12
      modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs

2
framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Layout/PageHeader.razor

@ -7,7 +7,7 @@
@if(Options.Value.RenderPageTitle)
{
<Column ColumnSize="ColumnSize.IsAuto">
<h1 class="content-header-title">@PageLayout.Title</h1>
<h5 class="content-header-title">@PageLayout.Title</h5>
</Column>
}

1
framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor

@ -11,6 +11,7 @@
CurrentPage="@CurrentPage"
PageSize="@PageSize"
Responsive="@Responsive"
Striped
Class="@Class">
<LoadingTemplate>
<Row Class="w-100 align-items-center" Style="height: 150px;">

2
modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs

@ -64,7 +64,7 @@ public partial class RoleManagement
new EntityAction
{
Text = L["Delete"],
Visible = (data) => HasDeletePermission,
Visible = (data) => HasDeletePermission && !data.As<IdentityRoleDto>().IsStatic,
Clicked = async (data) => await DeleteEntityAsync(data.As<IdentityRoleDto>()),
ConfirmationMessage = (data) => GetDeleteConfirmationMessage(data.As<IdentityRoleDto>())
}

6
modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor

@ -18,6 +18,12 @@
</PageHeader>
</CardHeader>
<CardBody>
<Field Horizontal>
<FieldLabel ColumnSize="ColumnSize.Is1.Is9.WithOffset">@L["Search"]</FieldLabel>
<FieldBody ColumnSize="ColumnSize.Is2">
<TextEdit Text="@GetListInput.Filter" TextChanged="@OnSearchTextChanged" />
</FieldBody>
</Field>
@* ************************* DATA GRID ************************* *@
<AbpExtensibleDataGrid TItem="IdentityUserDto"
Data="Entities"

12
modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs

@ -10,6 +10,7 @@ using Volo.Abp.AspNetCore.Components.Web.Theming.PageToolbars;
using Volo.Abp.Identity.Localization;
using Volo.Abp.ObjectExtending;
using Volo.Abp.PermissionManagement.Blazor.Components;
using Volo.Abp.Users;
namespace Volo.Abp.Identity.Blazor.Pages.Identity;
@ -64,6 +65,13 @@ public partial class UserManagement
}
}
protected virtual async Task OnSearchTextChanged(string value)
{
GetListInput.Filter = value;
CurrentPage = 1;
await GetEntitiesAsync();
}
protected override async Task SetPermissionsAsync()
{
await base.SetPermissionsAsync();
@ -154,7 +162,7 @@ public partial class UserManagement
new EntityAction
{
Text = L["Delete"],
Visible = (data) => HasDeletePermission,
Visible = (data) => HasDeletePermission && CurrentUser.GetId() != data.As<IdentityUserDto>().Id,
Clicked = async (data) => await DeleteEntityAsync(data.As<IdentityUserDto>()),
ConfirmationMessage = (data) => GetDeleteConfirmationMessage(data.As<IdentityUserDto>())
}
@ -180,7 +188,7 @@ public partial class UserManagement
},
new TableColumn
{
Title = L["Email"],
Title = L["EmailAddress"],
Data = nameof(IdentityUserDto.Email),
},
new TableColumn

Loading…
Cancel
Save