feat:user authorize dialog update

masastack · Jul 28, 2023 · 505d040 · 505d040
1 parent db6ff7e
commit 505d040
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 24 deletions.
diff --git a/src/Services/Masa.Auth.Service.Admin/appsettings.json b/src/Services/Masa.Auth.Service.Admin/appsettings.json
@@ -6,6 +6,5 @@
  "Microsoft.Hosting.Lifetime": "Information"
  }
  },
- "AllowedHosts": "*",
- "DBName": "auth"
+ "AllowedHosts": "*"
 }
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.421" />
+ <PackageReference Include="Masa.Stack.Components" Version="0.0.422" />
  <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/Subjects/Users/UserAuthorizeDialog.razor b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Subjects/Users/UserAuthorizeDialog.razor
@@ -3,33 +3,25 @@
 <DefaultSheetDialog Value="_visible" ValueChanged=UpdateVisible Title="@T("User roles and permissions settings")">
  <AutoHeight>
  <HeaderContent>
- <div class="height:55px;">
- <div class="mb-4 d-flex">
- @if(User.StaffId is not null)
+ <div class="d-flex">
+ <div class="flex-grow-1">
+ @if (User.StaffId is not null)
  {
- <TeamSwitch Value=Teams.FirstOrDefault() ValueChanged=TeamValueChanged UserId="_userId" Style="width:100%;" />
+ <TeamSwitch Value=Teams.FirstOrDefault() ValueChanged=TeamValueChanged UserId="_userId" Class="mb-4" Style="width:100%;" />
  }
- else
- {
- <MSpacer />
- }
-
- <div class="d-flex" style="width:200px;">
- <MSpacer /> 
- <MAvatar Size=48 Class="mr-2">
- <img src="@User.Avatar" />
- </MAvatar>
- <div class="my-auto emphasis2-text subtitle">@User.DisplayName</div>
- </div>
+ <RoleSelectForUser @bind-Value="Authorization.Roles" />
  </div>
- <div class="d-flex">
- <RoleSelectForUser Class="mb-6" @bind-Value="Authorization.Roles" />
- <div style="width:174px;" />
- </div> 
+ <div class="d-flex align-center" style="width:200px;">
+ <MSpacer />
+ <MAvatar Size=48 Class="mr-2">
+ <img src="@User.Avatar" />
+ </MAvatar>
+ <div class="my-auto emphasis2-text subtitle">@User.DisplayName</div>
+ </div> 
  </div>
  </HeaderContent>
  <AutoHeightContent>
- <div class="global-nav" style="display: flex;max-height:calc(100vh - 380px);">
+ <div class="global-nav mt-6" style="display: flex;max-height:calc(100vh - 380px);">
  <PermissionsConfigure User=_userId
  Teams=Teams
  Roles=Authorization.Roles