From 4821d73b118a5717a6eb58aeda55f24060a97b31 Mon Sep 17 00:00:00 2001 From: "HOME-LAPTOP\\kshkulev" Date: Wed, 15 Oct 2025 16:57:09 +0900 Subject: [PATCH] Use a better method to share common page layout --- Hcs.WebApp/Components/Pages/Test/Export.razor | 78 +++++++++---------- .../AuthorizedContent.razor} | 14 ++-- 2 files changed, 42 insertions(+), 50 deletions(-) rename Hcs.WebApp/Components/{Layout/AuthorizedLayout.razor => Shared/AuthorizedContent.razor} (68%) diff --git a/Hcs.WebApp/Components/Pages/Test/Export.razor b/Hcs.WebApp/Components/Pages/Test/Export.razor index dff0f1d..dc835cd 100644 --- a/Hcs.WebApp/Components/Pages/Test/Export.razor +++ b/Hcs.WebApp/Components/Pages/Test/Export.razor @@ -11,8 +11,6 @@ @attribute [Authorize] -@layout AuthorizedLayout - @implements IDisposable @inject NavigationManager NavigationManager @@ -21,37 +19,41 @@ Тестирование экспорта - - -
- - - - - Сервис nsi - OnNsiExportItem1Click()) Disabled=@inputDisabled Text="Экспорт НСИ 1" ButtonStyle="ButtonStyle.Primary" /> - - - - -
-
- - - - - - - - - - - - - - - -
+ + + + +
+ + + + + Сервис nsi + OnNsiExportItem1Click()) Disabled=@inputDisabled Text="Экспорт НСИ 1" ButtonStyle="ButtonStyle.Primary" /> + + + + +
+
+ + + + + + + + + + + + + + + +
+
+
@code { EventConsole console = default!; @@ -66,16 +68,6 @@ FileMessageCapturer messageCapturer; bool catchMessageBody; - [CascadingParameter] - public AuthorizedLayout Layout { get; set; } - - protected override void OnInitialized() - { - base.OnInitialized(); - - Layout.Roles = AppRole.ADMINISTRATOR_TYPE; - } - public void Dispose() { if (messageCapturer != null) diff --git a/Hcs.WebApp/Components/Layout/AuthorizedLayout.razor b/Hcs.WebApp/Components/Shared/AuthorizedContent.razor similarity index 68% rename from Hcs.WebApp/Components/Layout/AuthorizedLayout.razor rename to Hcs.WebApp/Components/Shared/AuthorizedContent.razor index 5d2d127..5d9ee7d 100644 --- a/Hcs.WebApp/Components/Layout/AuthorizedLayout.razor +++ b/Hcs.WebApp/Components/Shared/AuthorizedContent.razor @@ -1,13 +1,9 @@ -@inherits LayoutComponentBase - -@using Microsoft.AspNetCore.Authorization - -@layout MainLayout +@using Microsoft.AspNetCore.Authorization - @Body + @Content @@ -18,5 +14,9 @@ @code { - public string Roles { get; set; } + [Parameter] + public required string Roles { get; set; } + + [Parameter] + public required RenderFragment Content { get; set; } }