⚡ refactor(role-edit): improve the performance (#1263)

* ⚡ refactor(role-edit): improve the performance * upgrade Masa.Stack.Components
masastack · Jan 4, 2024 · 13bc2f3 · 13bc2f3
1 parent e235826
commit 13bc2f3
Show file tree

Hide file tree

Showing 22 changed files with 45 additions and 115 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.429" />
+		<PackageReference Include="Masa.Stack.Components" Version="0.0.435" />
 		<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/ButtonGroup.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/ButtonGroup.razor.cs
@@ -5,9 +5,6 @@ namespace Masa.Auth.Web.Admin.Rcl.Pages.Component;
 
 public partial class ButtonGroup<TValue> where TValue : struct, Enum
 {
-    [Parameter]
-    public string Class { get; set; } = "";
-
     [Parameter]
     public TValue Value { get; set; }
 

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/DefaultTitle.razor b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/DefaultTitle.razor
@@ -8,6 +8,10 @@
     [Parameter]
     public RenderFragment? ChildContent { get; set; }
 
-    [Parameter]
-    public string Class { get; set; } = "mb-4 mt-6";
+    protected override void OnInitialized()
+    {
+        base.OnInitialized();
+
+        Class = "mb-4 mt-6";
+    }
 }
diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/EnableChip.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/EnableChip.razor.cs
@@ -5,12 +5,6 @@ namespace Masa.Auth.Web.Admin.Rcl.Pages.Component;
 
 public partial class EnableChip
 {
-    [Parameter]
-    public string Class { get; set; } = "";
-
-    [Parameter]
-    public string Style { get; set; } = "";
-
     [Parameter]
     public bool Value { get; set; }
 

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/EnableSwitch.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/EnableSwitch.razor.cs
@@ -5,9 +5,6 @@ namespace Masa.Auth.Web.Admin.Rcl.Pages.Component;
 
 public partial class EnableSwitch
 {
-    [Parameter]
-    public string Class { get; set; } = "";
-
     [Parameter]
     public bool Value { get; set; }
 

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Permissions/PermissionsConfigure.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Permissions/PermissionsConfigure.razor.cs
@@ -5,12 +5,6 @@ namespace Masa.Auth.Web.Admin.Rcl.Pages.Component.Permissions;
 
 public partial class PermissionsConfigure
 {
-    [Parameter]
-    public string Style { get; set; } = "";
-
-    [Parameter]
-    public string Class { get; set; } = "";
-
     [Parameter]
     public List<Guid> Roles { get; set; } = new();
 

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Permissions/RoleOwner.razor b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Permissions/RoleOwner.razor
@@ -1,36 +1,55 @@
 @inherits AdminCompontentBase
 
-<SGroupBox Class="@Class" Style="Style" Title="@T("RoleOwner")">
+<SGroupBox Class="@Class" Style="@Style" Title="@T("RoleOwner")">
     <div style="min-height:48px;">
-         @if (Role.Users.Count > 0)
+        @if (Role.Users.Count > 0)
         {
             <div class="caption">@T("Member")</div>
             <div class="ml-4 mt-3">
-                @foreach (var user in Role.Users)
+                @foreach (var user in Role.Users.Take(5))
                 {
-                    <MChip Class="mr-3 pl-0" Style="height:28px;">
-                        <MAvatar Size=24>
-                            <img src="@user.Avatar" />
-                        </MAvatar>
-                        <span class="body2 regular--text ml-1">@user.DisplayName</span>
-                    </MChip>
+                    @RenderChip(user.Avatar, user.DisplayName)
                 }
+
+                @RenderMore(Role.Users.Count)
             </div>
         }
+
         @if (Role.Teams.Count > 0)
         {
             <div class="caption mt-3">@T("Team")</div>
             <div class="ml-4 mt-3">
-                @foreach (var team in Role.Teams)
+                @foreach (var team in Role.Teams.Take(5))
                 {
-                    <MChip Class="mr-3" Style="height:28px;">
-                        <MAvatar Left Size=24>
-                            <img src="@team.Avatar" />
-                        </MAvatar>
-                        <span class="body2 regular--text">@team.Name</span>
-                    </MChip>
+                    @RenderChip(team.Avatar, team.Name)
                 }
+
+                @RenderMore(Role.Teams.Count)
             </div>
         }
     </div>
 </SGroupBox>
+
+@code {
+
+    private RenderFragment RenderChip(string avatar, string displayName) => __builder =>
+    {
+        <MChip Class="mr-3 pl-0" Style="height:28px;">
+            <MAvatar Size=24>
+                <img src="@avatar" />
+            </MAvatar>
+            <span class="body2 regular--text ml-1">@displayName</span>
+        </MChip>
+    };
+
+    private RenderFragment RenderMore(int count) => __builder =>
+    {
+        if (count > 5)
+        {
+            <span class="grey--text text-caption">
+                (+@(count - 5) @T("More"))
+            </span>
+        }
+    };
+
+}
diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Permissions/RoleOwner.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Permissions/RoleOwner.razor.cs
@@ -10,12 +10,6 @@ public partial class RoleOwner
 
     private Guid OldRoleId { get; set; }
 
-    [Parameter]
-    public string Class { get; set; } = "";
-
-    [Parameter]
-    public string Style { get; set; } = "";
-
     protected RoleOwnerDto Role { get; set; } = new();
 
     protected RoleService RoleService => AuthCaller.RoleService;

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Permissions/RoleSelect.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Permissions/RoleSelect.razor.cs
@@ -17,9 +17,6 @@ public partial class RoleSelect
     [Parameter]
     public bool Readonly { get; set; }
 
-    [Parameter]
-    public string Class { get; set; } = "";
-
     protected List<RoleSelectDto> Roles { get; set; } = new();
 
     protected RoleService RoleService => AuthCaller.RoleService;

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Sso/ApiResourceSelect.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Sso/ApiResourceSelect.razor.cs
@@ -5,12 +5,6 @@ namespace Masa.Auth.Web.Admin.Rcl.Pages.Component.Sso;
 
 public partial class ApiResourceSelect
 {
-    [Parameter]
-    public string Class { get; set; } = "";
-
-    [Parameter]
-    public string Style { get; set; } = "";
-
     [Parameter]
     public int Chunk { get; set; } = 5;
 

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Sso/ApiScopeSelect.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Sso/ApiScopeSelect.razor.cs
@@ -5,12 +5,6 @@ namespace Masa.Auth.Web.Admin.Rcl.Pages.Component.Sso;
 
 public partial class ApiScopeSelect
 {
-    [Parameter]
-    public string Class { get; set; } = "";
-
-    [Parameter]
-    public string Style { get; set; } = "";
-
     [Parameter]
     public int Chunk { get; set; } = 5;
 

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Sso/ClientSelect.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Sso/ClientSelect.razor.cs
@@ -7,12 +7,6 @@ namespace Masa.Auth.Web.Admin.Rcl.Pages.Component.Sso;
 
 public partial class ClientSelect
 {
-    [Parameter]
-    public string Class { get; set; } = "";
-
-    [Parameter]
-    public string Style { get; set; } = "";
-
     [Parameter]
     public bool Disabled { get; set; }
 

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Sso/IdentityResourceSelect.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Sso/IdentityResourceSelect.razor.cs
@@ -5,12 +5,6 @@ namespace Masa.Auth.Web.Admin.Rcl.Pages.Component.Sso;
 
 public partial class IdentityResourceSelect
 {
-    [Parameter]
-    public string Class { get; set; } = "";
-
-    [Parameter]
-    public string Style { get; set; } = "";
-
     [Parameter]
     public int Chunk { get; set; } = 5;
 

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Sso/UserClaimSelect.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Sso/UserClaimSelect.razor.cs
@@ -5,12 +5,6 @@ namespace Masa.Auth.Web.Admin.Rcl.Pages.Component.Sso;
 
 public partial class UserClaimSelect
 {
-    [Parameter]
-    public string Class { get; set; } = "";
-
-    [Parameter]
-    public string Style { get; set; } = "";
-
     [Parameter]
     public int Chunk { get; set; } = 4;
 

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Subjects/ExternalThirdPartySelect.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Subjects/ExternalThirdPartySelect.razor.cs
@@ -5,12 +5,6 @@ namespace Masa.Auth.Web.Admin.Rcl.Pages.Component.Subjects;
 
 public partial class ExternalThirdPartySelect
 {
-    [Parameter]
-    public string Class { get; set; } = "";
-
-    [Parameter]
-    public string Style { get; set; } = "";
-
     [Parameter]
     public string Value { get; set; } = "";
 

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Subjects/StaffSelect.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Subjects/StaffSelect.razor.cs
@@ -20,9 +20,6 @@ public partial class StaffSelect
     [Parameter]
     public bool Readonly { get; set; }
 
-    [Parameter]
-    public string Class { get; set; } = "";
-
     [Parameter]
     public RoleLimitModel RoleLimit { get; set; } = new("", int.MaxValue);
 

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Subjects/TeamRoleSelect.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Subjects/TeamRoleSelect.razor.cs
@@ -17,9 +17,6 @@ public partial class TeamRoleSelect
     [Parameter]
     public EventCallback<List<Guid>> RolesChanged { get; set; }
 
-    [Parameter]
-    public string Class { get; set; } = "";
-
     private List<TeamRoleSelectDto> Teams { get; set; } = new();
 
     private TeamService TeamService => AuthCaller.TeamService;

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Subjects/TeamSwitch.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Subjects/TeamSwitch.razor.cs
@@ -17,12 +17,6 @@ public partial class TeamSwitch
     [Parameter]
     public EventCallback<List<Guid>> RolesChanged { get; set; }
 
-    [Parameter]
-    public string Class { get; set; } = "";
-
-    [Parameter]
-    public string Style { get; set; } = "";
-
     private List<TeamRoleSelectDto> Teams { get; set; } = new();
 
     private TeamRoleSelectDto? CurrentTeam => Teams.FirstOrDefault(team => team.Id == Value);

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Subjects/ThirdPartyIdpSelect.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Subjects/ThirdPartyIdpSelect.razor.cs
@@ -5,12 +5,6 @@ namespace Masa.Auth.Web.Admin.Rcl.Pages.Component.Subjects;
 
 public partial class ThirdPartyIdpSelect
 {
-    [Parameter]
-    public string Class { get; set; } = "";
-
-    [Parameter]
-    public string Style { get; set; } = "";
-
     [Parameter]
     public Guid Value { get; set; } = new();
 

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/RolePermissions/Roles/UpdateRoleDialog.razor b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/RolePermissions/Roles/UpdateRoleDialog.razor
@@ -30,7 +30,7 @@
                                 Roles=Role.ChildrenRoles 
                                 HasPreview
                                 @bind-Value=Role.Permissions
-                                @bind-Preview=Preview/>
+                                @bind-Preview=@Preview/>
                         </div>
                     </MWindowItem>
                 </MWindow>
@@ -41,9 +41,9 @@
                     <MSpacer></MSpacer>
                     @if(Tab == UpdateRoleTabs.Permission)
                     {
-                        <SButton Medium Outlined Class="mr-6" OnClick="() => Preview = true">@T("Preview")</SButton>
+                        <SButton Medium Outlined Class="mr-6" OnClick="@(() => Preview = true)">@T("Preview")</SButton>
                     }
-                    <SButton Medium OnClick="async () => await UpdateRoleAsync(context)">@T("Save")</SButton>
+                    <SButton Medium OnClick="@(() => UpdateRoleAsync(context!))">@T("Save")</SButton>
                 </div>
             </FooterContent>
         </AutoHeight>

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/CustomLoginRegister/RegisterFieldSelect.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/CustomLoginRegister/RegisterFieldSelect.razor.cs
@@ -5,12 +5,6 @@ namespace Masa.Auth.Web.Admin.Rcl.Pages.Sso.CustomLoginRegister;
 
 public partial class RegisterFieldSelect
 {
-    [Parameter]
-    public string Class { get; set; } = "";
-
-    [Parameter]
-    public string Style { get; set; } = "";
-
     [Parameter]
     public RegisterFieldTypes Value { get; set; } = new();
 

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Subjects/Teams/TeamCard.razor b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Subjects/Teams/TeamCard.razor
@@ -65,12 +65,6 @@
     [Parameter]
     public TeamDto Team { get; set; } = null!;
 
-    [Parameter]
-    public string? Class { get; set; }
-
-    [Parameter]
-    public string? Style { get; set; }
-
     private int _showAdminAvatarCount = 5;
 
     private async Task HandleEditClick()