diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Masa.Auth.Web.Admin.Rcl.csproj b/src/Web/Masa.Auth.Web.Admin.Rcl/Masa.Auth.Web.Admin.Rcl.csproj index 01dffaf31..8da7d58fc 100644 --- a/src/Web/Masa.Auth.Web.Admin.Rcl/Masa.Auth.Web.Admin.Rcl.csproj +++ b/src/Web/Masa.Auth.Web.Admin.Rcl/Masa.Auth.Web.Admin.Rcl.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Permissions/PermissionsConfigure.razor b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Permissions/PermissionsConfigure.razor index 1771bd710..261954e1d 100644 --- a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Permissions/PermissionsConfigure.razor +++ b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Permissions/PermissionsConfigure.razor @@ -2,7 +2,15 @@ @if (HasPreview) { - + @if (_menu is null) + { + + + } + else + { + + } @@ -14,7 +22,7 @@
- + @T("Back")
diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/RolePermissions/Roles/Role.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/RolePermissions/Roles/Role.razor.cs index 60e5b5f17..ac875dd17 100644 --- a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/RolePermissions/Roles/Role.razor.cs +++ b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/RolePermissions/Roles/Role.razor.cs @@ -99,8 +99,10 @@ protected override void OnInitialized() public async Task GetRolesAsync() { - var reuquest = new GetRolesDto(Page, PageSize, Search, Enabled); - var response = await RoleService.GetListAsync(reuquest); + PopupService.ShowProgressLinear(); + var request = new GetRolesDto(Page, PageSize, Search, Enabled); + var response = await RoleService.GetListAsync(request); + PopupService.HideProgressLinear(); Roles = response.Items; Total = response.Total; StateHasChanged();