Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/masastack/MASA.Auth
Browse files Browse the repository at this point in the history
  • Loading branch information
@duiapro
duiapro committed Mar 19, 2024
2 parents 6767935 + 54b3b8b commit 96b8a26
Show file tree
Hide file tree
Showing 30 changed files with 204 additions and 149 deletions.
2 changes: 1 addition & 1 deletion src/Web/Masa.Auth.Web.Admin.Rcl/Masa.Auth.Web.Admin.Rcl.csproj
View file
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.440" />
<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
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
2 changes: 1 addition & 1 deletion src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Organization/Organization.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<SDataTable
Dense
Height="@("calc(100vh - 420px)")"
Headers="GetHeaders()"
Headers="@_headers"
Items="@_paginationStaffs.Items"
TItem="StaffDto">
<HeaderColContent Context="header">
Expand Down
19 changes: 10 additions & 9 deletions src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Organization/Organization.razor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public partial class Organization
CopyOrgSheet _copyOrgSheet = null!;
OrgSheet _orgSheet = null!;
string _searchName = string.Empty;
private List<DataTableHeader<StaffDto>> _headers = new();

DepartmentService DepartmentService => AuthCaller.DepartmentService;

Expand All @@ -25,18 +26,18 @@ public partial class Organization
[Parameter]
public Guid DepartmentId { get; set; } = Guid.Empty;

public List<DataTableHeader<StaffDto>> GetHeaders() => new()
{
new() { Text = T(nameof(Staff)), Value = nameof(StaffDto.Name), CellClass = "body-medium emphasis2--text" },
new() { Text = T(nameof(StaffDto.Account)), Value = nameof(StaffDto.Account), CellClass = "subtitle" },
new() { Text = T(nameof(StaffDto.Position)), Value = nameof(StaffDto.Position), CellClass = "subtitle" },
new() { Text = T(nameof(StaffDto.JobNumber)), Value = nameof(StaffDto.JobNumber), CellClass = "subtitle" },
new() { Text = T("Action"), Value = "Action", Sortable = false, Align = DataTableHeaderAlign.Center, Width="80px" }
};

protected override void OnInitialized()
{
PageName = "OrganizationBlock";

_headers = new List<DataTableHeader<StaffDto>> {
new() { Text = T(nameof(Staff)), Value = nameof(StaffDto.Name), CellClass = "body-medium emphasis2--text" },
new() { Text = T(nameof(StaffDto.Account)), Value = nameof(StaffDto.Account), CellClass = "subtitle" },
new() { Text = T(nameof(StaffDto.Position)), Value = nameof(StaffDto.Position), CellClass = "subtitle" },
new() { Text = T(nameof(StaffDto.JobNumber)), Value = nameof(StaffDto.JobNumber), CellClass = "subtitle" },
new() { Text = T("Action"), Value = "Action", Sortable = false, Align = DataTableHeaderAlign.Center, Width = "80px" }
};

base.OnInitialized();
}

Expand Down
2 changes: 1 addition & 1 deletion src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Organization/Position/Position.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<SDataTable
FixedHeader
Height="@("calc(100vh - 288px)")"
Headers="GetHeaders()"
Headers="@_headers"
Items="Positions"
TItem="PositionDto"
ItemsPerPage="PageSize">
Expand Down
16 changes: 9 additions & 7 deletions src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Organization/Position/Position.razor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,22 @@ public int PageSize
public bool UpdatePositionDialogVisible { get; set; }

private PositionService PositionService => AuthCaller.PositionService;

private List<DataTableHeader<PositionDto>> _headers = new();

protected override async Task OnInitializedAsync()
{
PageName = "PositionBlock";

_headers = new List<DataTableHeader<PositionDto>>() {
new() { Text = T("Index"), Value = "Index", Sortable = false, Width = "105px" },
new() { Text = T("Name"), Value = nameof(PositionDto.Name), Sortable = false },
new() { Text = T("Action"), Value = "Action", Sortable = false, Align = DataTableHeaderAlign.Center, Width = "105px" },
};

await GetPositionsAsync();
}

public List<DataTableHeader<PositionDto>> GetHeaders() => new()
{
new() { Text = T("Index"), Value = "Index", Sortable = false , Width="105px" },
new() { Text = T("Name"), Value = nameof(PositionDto.Name), Sortable = false },
new() { Text = T("Action"), Value = "Action", Sortable = false, Align = DataTableHeaderAlign.Center, Width="105px" },
};

public async Task GetPositionsAsync()
{
var reuquest = new GetPositionsDto(Page, PageSize, Search);
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Masa.Auth.Web.Admin.Rcl/Pages/RolePermissions/Roles/Role.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<AutoHeightContent>
<SDataTable Dense
Height="@("calc(100vh - 288px)")"
Headers="GetHeaders()"
Headers="@_headers"
Items="Roles"
TItem="RoleDto"
ItemsPerPage="PageSize">
Expand Down
35 changes: 24 additions & 11 deletions src/Web/Masa.Auth.Web.Admin.Rcl/Pages/RolePermissions/Roles/Role.razor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,22 +74,35 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
}
await base.OnAfterRenderAsync(firstRender);
}

private List<DataTableHeader<RoleDto>> _headers = new();

public List<DataTableHeader<RoleDto>> GetHeaders() => new()
protected override void OnInitialized()
{
new() { Text = T("Name"), Value = nameof(RoleDto.Name), Sortable = false, Align=DataTableHeaderAlign.Start },
new() { Text = T(nameof(RoleDto.CreationTime)), Value = nameof(RoleDto.CreationTime), Sortable = false, Align = DataTableHeaderAlign.Start },
new() { Text = T(nameof(RoleDto.ModificationTime)), Value = nameof(RoleDto.ModificationTime), Sortable = false , Align = DataTableHeaderAlign.Start },
new() { Text = T(nameof(RoleDto.Creator)), Value = nameof(RoleDto.Creator), Sortable = false, Align = DataTableHeaderAlign.Start },
new() { Text = T(nameof(RoleDto.Modifier)), Value = nameof(RoleDto.Modifier), Sortable = false , Align = DataTableHeaderAlign.Start },
new() { Text = T("State"), Value = nameof(RoleDto.Enabled), Sortable = false , Align=DataTableHeaderAlign.Start, Width = "105px" },
new() { Text = T("Action"), Value = "Action", Sortable = false, Align = DataTableHeaderAlign.Center, Width = "105px" },
};
_headers = new List<DataTableHeader<RoleDto>>() {
new() { Text = T("Name"), Value = nameof(RoleDto.Name), Sortable = false, Align = DataTableHeaderAlign.Start },
new() {
Text = T(nameof(RoleDto.CreationTime)), Value = nameof(RoleDto.CreationTime), Sortable = false, Align = DataTableHeaderAlign.Start
},
new() {
Text = T(nameof(RoleDto.ModificationTime)), Value = nameof(RoleDto.ModificationTime), Sortable = false,
Align = DataTableHeaderAlign.Start
},
new() { Text = T(nameof(RoleDto.Creator)), Value = nameof(RoleDto.Creator), Sortable = false, Align = DataTableHeaderAlign.Start },
new() { Text = T(nameof(RoleDto.Modifier)), Value = nameof(RoleDto.Modifier), Sortable = false, Align = DataTableHeaderAlign.Start },
new() { Text = T("State"), Value = nameof(RoleDto.Enabled), Sortable = false, Align = DataTableHeaderAlign.Start, Width = "105px" },
new() { Text = T("Action"), Value = "Action", Sortable = false, Align = DataTableHeaderAlign.Center, Width = "105px" },
};

base.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
2 changes: 1 addition & 1 deletion src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/ApiResource/ApiResource.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<AutoHeightContent>
<SDataTable
Height="@("calc(100vh - 288px)")"
Headers="GetHeaders()"
Headers="@_headers"
Items="ApiResources"
TItem="ApiResourceDto"
ItemsPerPage="PageSize">
Expand Down
20 changes: 11 additions & 9 deletions src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/ApiResource/ApiResource.razor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,23 @@ public int PageSize

private ApiResourceService ApiResourceService => AuthCaller.ApiResourceService;

private List<DataTableHeader<ApiResourceDto>> _headers = new();

protected override async Task OnInitializedAsync()
{
PageName = "ApiResourceBlock";

_headers = new List<DataTableHeader<ApiResourceDto>> {
new() { Text = T("Name"), Value = nameof(ApiResourceDto.Name), Sortable = false, Width = "250px" },
new() { Text = T(nameof(ApiResourceDto.DisplayName)), Value = nameof(ApiResourceDto.DisplayName), Sortable = false, Width = "250px" },
new() { Text = T(nameof(ApiResourceDto.Description)), Value = nameof(ApiResourceDto.Description), Sortable = false },
new() { Text = T("State"), Value = nameof(ApiResourceDto.Enabled), Sortable = false, Width = "105px" },
new() { Text = T("Action"), Value = "Action", Sortable = false, Align = DataTableHeaderAlign.Center, Width = "105px" },
};

await GetApiResourcesAsync();
}

public List<DataTableHeader<ApiResourceDto>> GetHeaders() => new()
{
new() { Text = T("Name"), Value = nameof(ApiResourceDto.Name), Sortable = false, Width="250px" },
new() { Text = T(nameof(ApiResourceDto.DisplayName)), Value = nameof(ApiResourceDto.DisplayName), Sortable = false, Width="250px" },
new() { Text = T(nameof(ApiResourceDto.Description)), Value = nameof(ApiResourceDto.Description), Sortable = false },
new() { Text = T("State"), Value = nameof(ApiResourceDto.Enabled), Sortable = false , Width="105px"},
new() { Text = T("Action"), Value = "Action", Sortable = false, Align = DataTableHeaderAlign.Center, Width="105px" },
};

public async Task GetApiResourcesAsync()
{
var reuquest = new GetApiResourcesDto(Page, PageSize, Search);
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/ApiScope/ApiScope.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<AutoHeightContent>
<SDataTable
Height="@("calc(100vh - 288px)")"
Headers="GetHeaders()"
Headers="@_headers"
Items="ApiScopes"
TItem="ApiScopeDto"
ItemsPerPage="PageSize">
Expand Down
20 changes: 11 additions & 9 deletions src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/ApiScope/ApiScope.razor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,20 @@ public int PageSize
protected override async Task OnInitializedAsync()
{
PageName = "ApiScopeBlock";

_headers = new List<DataTableHeader<ApiScopeDto>> {
new() { Text = T("Name"), Value = nameof(ApiScopeDto.Name), Sortable = false, Width="250px" },
new() { Text = T(nameof(ApiScopeDto.DisplayName)), Value = nameof(ApiScopeDto.DisplayName), Sortable = false , Width="250px"},
new() { Text = T("Required"), Value = nameof(ApiScopeDto.Required), Sortable = false, Width="105px" },
new() { Text = T(nameof(ApiScopeDto.Description)), Value = nameof(ApiScopeDto.Description), Sortable = false },
new() { Text = T("State"), Value = nameof(ApiScopeDto.Enabled), Sortable = false, Width="105px" },
new() { Text = T("Action"), Value = "Action", Sortable = false, Align = DataTableHeaderAlign.Center, Width="105px" },
};

await GetApiScopesAsync();
}

public List<DataTableHeader<ApiScopeDto>> GetHeaders() => new()
{
new() { Text = T("Name"), Value = nameof(ApiScopeDto.Name), Sortable = false, Width="250px" },
new() { Text = T(nameof(ApiScopeDto.DisplayName)), Value = nameof(ApiScopeDto.DisplayName), Sortable = false , Width="250px"},
new() { Text = T("Required"), Value = nameof(ApiScopeDto.Required), Sortable = false, Width="105px" },
new() { Text = T(nameof(ApiScopeDto.Description)), Value = nameof(ApiScopeDto.Description), Sortable = false },
new() { Text = T("State"), Value = nameof(ApiScopeDto.Enabled), Sortable = false, Width="105px" },
new() { Text = T("Action"), Value = "Action", Sortable = false, Align = DataTableHeaderAlign.Center, Width="105px" },
};
private List<DataTableHeader<ApiScopeDto>> _headers = new();

public async Task GetApiScopesAsync()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/Client/Client.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<AutoHeightContent>
<SDataTable
Height="@("calc(100vh - 288px)")"
Headers="GetHeaders()"
Headers="@_headers"
Items="_paginationDto.Items"
TItem="ClientDto"
ItemsPerPage="_clientPaginationDto.PageSize">
Expand Down
20 changes: 11 additions & 9 deletions src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/Client/Client.razor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,21 @@ public partial class Client

ClientService _clientService => AuthCaller.ClientService;

public List<DataTableHeader<ClientDto>> GetHeaders() => new()
{
new() { Text = T(nameof(ClientDto.ClientName)), Value = nameof(ClientDto.ClientName), Sortable = false , Width="300px"},
new() { Text = T(nameof(ClientDto.ClientId)), Value = nameof(ClientDto.ClientId), Sortable = false, Width="300px" },
new() { Text = T(nameof(ClientDto.ClientType)), Value = nameof(ClientDto.ClientType), Sortable = false, Width="105px" },
new() { Text = T(nameof(ClientDto.Description)), Value = nameof(ClientDto.Description), Sortable = false },
new() { Text = T(nameof(ClientDto.Enabled)), Value = nameof(ClientDto.Enabled), Sortable = false, Width="105px" },
new() { Text = T("Action"), Value = "Action", Sortable = false, Align = DataTableHeaderAlign.Center, Width="105px" },
};
private List<DataTableHeader<ClientDto>> _headers = new();

protected override void OnInitialized()
{
PageName = "ClientBlock";

_headers = new List<DataTableHeader<ClientDto>> {
new() { Text = T(nameof(ClientDto.ClientName)), Value = nameof(ClientDto.ClientName), Sortable = false , Width="300px"},
new() { Text = T(nameof(ClientDto.ClientId)), Value = nameof(ClientDto.ClientId), Sortable = false, Width="300px" },
new() { Text = T(nameof(ClientDto.ClientType)), Value = nameof(ClientDto.ClientType), Sortable = false, Width="105px" },
new() { Text = T(nameof(ClientDto.Description)), Value = nameof(ClientDto.Description), Sortable = false },
new() { Text = T(nameof(ClientDto.Enabled)), Value = nameof(ClientDto.Enabled), Sortable = false, Width="105px" },
new() { Text = T("Action"), Value = "Action", Sortable = false, Align = DataTableHeaderAlign.Center, Width="105px" },
};

base.OnInitialized();
}

Expand Down
2 changes: 1 addition & 1 deletion src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/CustomLoginRegister/CustomLoginRegister.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<AutoHeightContent>
<SDataTable Dense
Height="@("calc(100vh - 288px)")"
Headers="GetHeaders()"
Headers="@_headers"
Items="CustomLogins"
TItem="CustomLoginDto"
ItemsPerPage="PageSize">
Expand Down
26 changes: 16 additions & 10 deletions src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/CustomLoginRegister/CustomLoginRegister.razor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,23 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
await base.OnAfterRenderAsync(firstRender);
}

public List<DataTableHeader<CustomLoginDto>> GetHeaders() => new()
protected override void OnInitialized()
{
new() { Text = T(nameof(ClientDto.LogoUri)), Value = nameof(ClientDto.LogoUri), Sortable = false, Width="105px" },
new() { Text = T("TitleName"), Value = nameof(CustomLoginDto.Name), Sortable = false},
new() { Text = T("ClientName"), Value = nameof(ClientDto.ClientName), Sortable = false},
new() { Text = T(nameof(CustomLoginDto.CreationTime)), Value = nameof(CustomLoginDto.CreationTime), Sortable = false , Width="250px" },
new() { Text = T(nameof(CustomLoginDto.ModificationTime)), Value = nameof(CustomLoginDto.ModificationTime), Sortable = false, Width="250px" },
new() { Text = T(nameof(CustomLoginDto.Modifier)), Value = nameof(CustomLoginDto.Modifier), Sortable = false, Width="105px" },
new() { Text = T("State"), Value = nameof(CustomLoginDto.Enabled), Sortable = false , Width="105px"},
new() { Text = T("Action"), Value = "Action", Sortable = false, Align = DataTableHeaderAlign.Center, Width="105px" },
};
base.OnInitialized();

_headers = new List<DataTableHeader<CustomLoginDto>> {
new() { Text = T(nameof(ClientDto.LogoUri)), Value = nameof(ClientDto.LogoUri), Sortable = false, Width="105px" },
new() { Text = T("TitleName"), Value = nameof(CustomLoginDto.Name), Sortable = false},
new() { Text = T("ClientName"), Value = nameof(ClientDto.ClientName), Sortable = false},
new() { Text = T(nameof(CustomLoginDto.CreationTime)), Value = nameof(CustomLoginDto.CreationTime), Sortable = false , Width="250px" },
new() { Text = T(nameof(CustomLoginDto.ModificationTime)), Value = nameof(CustomLoginDto.ModificationTime), Sortable = false, Width="250px" },
new() { Text = T(nameof(CustomLoginDto.Modifier)), Value = nameof(CustomLoginDto.Modifier), Sortable = false, Width="105px" },
new() { Text = T("State"), Value = nameof(CustomLoginDto.Enabled), Sortable = false , Width="105px"},
new() { Text = T("Action"), Value = "Action", Sortable = false, Align = DataTableHeaderAlign.Center, Width="105px" },
};
}

private List<DataTableHeader<CustomLoginDto>> _headers = new();

public async Task GetCustomLoginsAsync()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/IdentityResource/IdentityResource.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<AutoHeightContent>
<SDataTable
Height="@("calc(100vh - 288px)")"
Headers="GetHeaders()"
Headers="@_headers"
Items="IdentityResources"
TItem="IdentityResourceDto"
ItemsPerPage="PageSize">
Expand Down
Loading

0 comments on commit 96b8a26

Please sign in to comment.