From 683fcdb9a54b6cf7dc691fa5fc152d5345a1c9bb Mon Sep 17 00:00:00 2001
From: netty <1025556487@qq.com>
Date: Mon, 15 Apr 2024 09:09:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E9=A1=B5=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AbpAntDesignThemeOptions.cs               |  5 ++++
 .../Themes/AntDesignTheme/App.razor           | 26 ++++++++++---------
 .../Themes/AntDesignTheme/DefaultLayout.razor |  8 +++++-
 .../Components/FeatureManagementModal.razor   |  9 ++++++-
 .../Pages/RoleManagement.razor                | 11 ++++++--
 .../Pages/UserManagement.razor                | 11 ++++++--
 .../SettingManagement/SettingManagement.razor |  9 ++++++-
 .../Pages/TenantManagement.razor              |  6 +++++
 .../BookStoreBlazorModule.cs                  |  3 ++-
 9 files changed, 68 insertions(+), 20 deletions(-)

diff --git a/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/AbpAntDesignThemeOptions.cs b/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/AbpAntDesignThemeOptions.cs
index 8595be3..09f4932 100644
--- a/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/AbpAntDesignThemeOptions.cs
+++ b/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/AbpAntDesignThemeOptions.cs
@@ -7,6 +7,11 @@ public class AbpAntDesignThemeOptions
 {
     public MenuOptions Menu { get; set; }
 
+    /// <summary>
+    /// 是否启用多标签页
+    /// </summary>
+    public bool EnableMultipleTabs { get; set; }
+
     public AbpAntDesignThemeOptions()
     {
         Menu = new MenuOptions();
diff --git a/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Themes/AntDesignTheme/App.razor b/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Themes/AntDesignTheme/App.razor
index 21cc949..207873b 100644
--- a/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Themes/AntDesignTheme/App.razor
+++ b/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Themes/AntDesignTheme/App.razor
@@ -5,18 +5,20 @@
     <Router AppAssembly="RouterOptions.Value.AppAssembly"
             AdditionalAssemblies="RouterOptions.Value.AdditionalAssemblies">
         <Found Context="routeData">
-            <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(DefaultLayout)">
-                <NotAuthorized>
-                    @if (!context.User.Identity.IsAuthenticated)
-                    {
-                        <RedirectToLogin/>
-                    }
-                    else
-                    {
-                        <p>You are not authorized to access this resource.</p>
-                    }
-                </NotAuthorized>
-            </AuthorizeRouteView>
+            <CascadingValue Value="routeData">
+                <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(DefaultLayout)">
+                    <NotAuthorized>
+                        @if (!context.User.Identity.IsAuthenticated)
+                        {
+                            <RedirectToLogin/>
+                        }
+                        else
+                        {
+                            <p>You are not authorized to access this resource.</p>
+                        }
+                    </NotAuthorized>
+                </AuthorizeRouteView>
+             </CascadingValue>
         </Found>
         <NotFound>
             <LayoutView Layout="@typeof(DefaultLayout)">
diff --git a/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Themes/AntDesignTheme/DefaultLayout.razor b/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Themes/AntDesignTheme/DefaultLayout.razor
index ee7d209..01ce330 100644
--- a/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Themes/AntDesignTheme/DefaultLayout.razor
+++ b/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Themes/AntDesignTheme/DefaultLayout.razor
@@ -58,7 +58,13 @@ else
             <Content Class="ant-design-content">
                 <PageAlert/>
                 <div class="ant-design-body-content">
-                    @Body
+                    @if (!Options.Value.EnableMultipleTabs){
+                        @Body
+                    }
+                    else
+                    {
+                        <ReuseTabs Class="ant-design-body-reusetabs" TabPaneClass="ant-design-body-reusetabs-tabpane" Draggable></ReuseTabs>
+                    }
                 </div>
                 <UiPageProgress/>
             </Content>
diff --git a/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI/Components/FeatureManagementModal.razor b/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI/Components/FeatureManagementModal.razor
index b7b8052..cbd7405 100644
--- a/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI/Components/FeatureManagementModal.razor
+++ b/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI/Components/FeatureManagementModal.razor
@@ -1,9 +1,11 @@
 @using AntDesign
+@using Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme
 @using Microsoft.AspNetCore.Components
 @using Microsoft.Extensions.Localization
+@using Microsoft.Extensions.Options
 @using Volo.Abp.Validation.StringValues
 @inherits AbpFeatureManagementComponentBase
-
+@implements IReuseTabsPage
 <Modal Title="@L["Features"]"
        Visible="@_visible"
        OnOk="@SaveAsync"
@@ -76,3 +78,8 @@
         }
     }
 </Modal>
+
+@code {
+    public RenderFragment GetPageTitle() =>
+    @<div>L["Features"]</div>;
+}
\ No newline at end of file
diff --git a/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/RoleManagement.razor b/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/RoleManagement.razor
index 54385da..dd0fc52 100644
--- a/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/RoleManagement.razor
+++ b/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/RoleManagement.razor
@@ -1,14 +1,16 @@
 @page "/identity/roles"
 @attribute [Authorize(IdentityPermissions.Roles.Default)]
+@using Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme
 @using Microsoft.AspNetCore.Authorization
+@using Microsoft.Extensions.Options
 @using Volo.Abp.Identity
 @using Volo.Abp.Identity.Localization
 @using Lsw.Abp.PermissionManagement.Blazor.AntDesignUI.Components
 @using Volo.Abp.AspNetCore.Components.Web
 @inject AbpBlazorMessageLocalizerHelper<IdentityResource> LH
 @inherits AbpCrudPageBase<IIdentityRoleAppService, IdentityRoleDto, Guid, GetIdentityRolesInput, IdentityRoleCreateDto, IdentityRoleUpdateDto>
-
-<AbpPageHeader Title="@L["Roles"]" BreadcrumbItems="@BreadcrumbItems" Toolbar="@Toolbar"/>
+@implements IReuseTabsPage
+<AbpPageHeader Title="@L["Roles"]" BreadcrumbItems="@BreadcrumbItems" Toolbar="@Toolbar" />
 
 <div class="page-content">
     <AbpExtensibleDataGrid TItem="IdentityRoleDto"
@@ -69,4 +71,9 @@
 @if (HasManagePermissionsPermission)
 {
     <PermissionManagementModal @ref="PermissionManagementModal"/>
+}
+
+@code {
+    public RenderFragment GetPageTitle() =>
+    @<div>@L["Roles"]</div>;
 }
\ No newline at end of file
diff --git a/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/UserManagement.razor b/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/UserManagement.razor
index d76e5dd..e076f17 100644
--- a/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/UserManagement.razor
+++ b/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/UserManagement.razor
@@ -1,13 +1,15 @@
 @page "/identity/users"
 @attribute [Authorize(IdentityPermissions.Users.Default)]
+@using Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme
 @using Microsoft.AspNetCore.Authorization
 @using Lsw.Abp.PermissionManagement.Blazor.AntDesignUI.Components
+@using Microsoft.Extensions.Options
 @using Volo.Abp.Identity
 @using Volo.Abp.Identity.Localization
 @inject AbpBlazorMessageLocalizerHelper<IdentityResource> LH
 @inherits AbpCrudPageBase<IIdentityUserAppService, IdentityUserDto, Guid, GetIdentityUsersInput, IdentityUserCreateDto, IdentityUserUpdateDto>
-
-<AbpPageHeader Title="@L["Users"]" BreadcrumbItems="@BreadcrumbItems" Toolbar="@Toolbar"/>
+@implements IReuseTabsPage
+<AbpPageHeader Title="@L["Users"]" BreadcrumbItems="@BreadcrumbItems" Toolbar="@Toolbar" />
 
 <div class="page-content">
     <AbpExtensibleDataGrid TItem="IdentityUserDto"
@@ -129,4 +131,9 @@
 @if (HasManagePermissionsPermission)
 {
     <PermissionManagementModal @ref="PermissionManagementModal"/>
+}
+
+@code {
+    public RenderFragment GetPageTitle() =>
+    @<div>@L["Users"]</div>;
 }
\ No newline at end of file
diff --git a/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.AntDesignUI/Pages/SettingManagement/SettingManagement.razor b/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.AntDesignUI/Pages/SettingManagement/SettingManagement.razor
index f3d620d..e57266e 100644
--- a/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.AntDesignUI/Pages/SettingManagement/SettingManagement.razor
+++ b/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.AntDesignUI/Pages/SettingManagement/SettingManagement.razor
@@ -1,11 +1,13 @@
 @page "/setting-management"
+@using Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme
 @using Microsoft.AspNetCore.Authorization
+@using Microsoft.Extensions.Options
 @using Volo.Abp.Features
 @using Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme.Layout
 @using Volo.Abp.SettingManagement
 @attribute [Authorize]
 @attribute [RequiresFeature(SettingManagementFeatures.Enable)]
-
+@implements IReuseTabsPage
 <CascadingValue Value="this" IsFixed="true">
 
     <AbpPageHeader Title="@L["Settings"]" BreadcrumbItems="@BreadcrumbItems"/>
@@ -32,3 +34,8 @@
         </Tabs>
     </div>
 </CascadingValue>
+
+@code {
+    public RenderFragment GetPageTitle() =>
+    @<div>@L["Settings"]</div>;
+}
diff --git a/modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.AntDesignUI/Pages/TenantManagement.razor b/modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.AntDesignUI/Pages/TenantManagement.razor
index 63cd59e..d2cd04c 100644
--- a/modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.AntDesignUI/Pages/TenantManagement.razor
+++ b/modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.AntDesignUI/Pages/TenantManagement.razor
@@ -8,6 +8,7 @@
 @using Volo.Abp.TenantManagement
 @inject AbpBlazorMessageLocalizerHelper<AbpTenantManagementResource> LH
 @inherits AbpCrudPageBase<ITenantAppService, TenantDto, Guid, GetTenantsInput, TenantCreateDto, TenantUpdateDto>
+@implements IReuseTabsPage
 
 <AbpPageHeader Title="@L["Tenants"]" BreadcrumbItems="@BreadcrumbItems" Toolbar="@Toolbar"/>
 
@@ -63,4 +64,9 @@
 @if (HasManageFeaturesPermission)
 {
     <FeatureManagementModal @ref="FeatureManagementModal"/>
+}
+
+@code {
+    public RenderFragment GetPageTitle() =>
+    @<div>@L["Tenants"]</div>;
 }
\ No newline at end of file
diff --git a/samples/BookStore/src/BookStore.BlazorServer/BookStoreBlazorModule.cs b/samples/BookStore/src/BookStore.BlazorServer/BookStoreBlazorModule.cs
index 12959f7..bea418f 100644
--- a/samples/BookStore/src/BookStore.BlazorServer/BookStoreBlazorModule.cs
+++ b/samples/BookStore/src/BookStore.BlazorServer/BookStoreBlazorModule.cs
@@ -35,6 +35,7 @@ using Volo.Abp.UI.Navigation;
 using Volo.Abp.UI.Navigation.Urls;
 using Volo.Abp.VirtualFileSystem;
 using Volo.Abp.Timing;
+using Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme;
 
 namespace BookStore.Blazor;
 
@@ -75,7 +76,7 @@ public class BookStoreBlazorModule : AbpModule
         var configuration = context.Services.GetConfiguration();
 
         Configure<AbpClockOptions>(options => options.Kind = DateTimeKind.Utc);
-
+        Configure<AbpAntDesignThemeOptions>(options=> options.EnableMultipleTabs=true);
         ConfigureUrls(configuration);
         ConfigureBundles();
         ConfigureAuthentication(context, configuration);

From 959efe8a495fe9cf8bfc9266aa5393f91ed49fe6 Mon Sep 17 00:00:00 2001
From: netty2019 <47128297+netty2019@users.noreply.github.com>
Date: Tue, 16 Apr 2024 08:08:27 +0800
Subject: [PATCH 2/2] Update FeatureManagementModal.razor

---
 .../Components/FeatureManagementModal.razor                 | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI/Components/FeatureManagementModal.razor b/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI/Components/FeatureManagementModal.razor
index cbd7405..c6cc91a 100644
--- a/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI/Components/FeatureManagementModal.razor
+++ b/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI/Components/FeatureManagementModal.razor
@@ -5,7 +5,6 @@
 @using Microsoft.Extensions.Options
 @using Volo.Abp.Validation.StringValues
 @inherits AbpFeatureManagementComponentBase
-@implements IReuseTabsPage
 <Modal Title="@L["Features"]"
        Visible="@_visible"
        OnOk="@SaveAsync"
@@ -78,8 +77,3 @@
         }
     }
 </Modal>
-
-@code {
-    public RenderFragment GetPageTitle() =>
-    @<div>L["Features"]</div>;
-}
\ No newline at end of file