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

masastack · Jan 8, 2024 · 90781f2 · 90781f2
1 parent a476ca3
commit 90781f2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
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
@@ -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" />

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
@@ -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>
@@ -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>

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
@@ -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();