Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆ chore: bump Masa.Stack.Components from 0.0.435 to 0.0.436 #1265

Merged
merged 1 commit into from
Jan 8, 2024
Merged

⬆ chore: bump Masa.Stack.Components from 0.0.435 to 0.0.436 #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Web/Masa.Auth.Web.Admin.Rcl/Masa.Auth.Web.Admin.Rcl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
<PackageReference Include="Humanizer.Core.zh-CN" Version="2.14.1" />
<PackageReference Include="Mapster" Version="7.3.0" />
<PackageReference Include="Masa.Stack.Components" Version="0.0.435" />
<PackageReference Include="Masa.Stack.Components" Version="0.0.436" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.7" />
<!--Support GB2312-->
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
Expand Down
12 changes: 10 additions & 2 deletions src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Permissions/PermissionsConfigure.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@

@if (HasPreview)
{
<ExpansionMenuWrapper Value="Menu" />
@if (_menu is null)
{
<MSkeletonLoader Type="image,image,image" Class="global-nav-content__loader"></MSkeletonLoader>
<MSkeletonLoader Type="image" Class="global-nav-content__toc-loader"></MSkeletonLoader>
}
else
{
<ExpansionMenuWrapper Value="Menu" />
}

<DefaultSheetDialog Value="Preview" ValueChanged="PreviewChanged" Title="@T("Preview Permissions")">
<AutoHeight>
Expand All @@ -14,7 +22,7 @@
<FooterContent>
<div class="d-flex mt-6">
<MSpacer />
<SButton OnClick="async() => await PreviewChanged.InvokeAsync(false)" Medium Outlined>
<SButton OnClick="@(() => PreviewChanged.InvokeAsync(false))" Medium Outlined>
@T("Back")
</SButton>
</div>
Expand Down
6 changes: 4 additions & 2 deletions src/Web/Masa.Auth.Web.Admin.Rcl/Pages/RolePermissions/Roles/Role.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down