From 69f82ab68ffff20950dbe3d66728b94f989d7adb Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Thu, 3 Mar 2022 10:18:47 +0800
Subject: [PATCH 1/2] Fix Blazor modules problem

---
 .../Pages/SettingManagement/SettingManagement.razor           | 4 ++--
 .../Pages/TenantManagement/TenantManagement.razor.cs          | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor
index bf49fe61c8..7d50ef8bdf 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor
@@ -11,8 +11,8 @@
 
 <Card>
     <CardBody>
-        <Tabs @bind-SelectedTab="@SelectedGroup" TabPosition="TabPosition.Left" Pills="true">
-            <Items>
+        <Tabs @bind-SelectedTab="@SelectedGroup" TabPosition="TabPosition.Left" Pills="true" VerticalItemsColumnSize="ColumnSize.Is3">
+            <Items >
                 @foreach (var group in SettingComponentCreationContext.Groups)
                 {
                     <Tab Name="@GetNormalizedString(group.Id)">
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
index f36e211515..134bbcd439 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
@@ -8,6 +8,7 @@ using Volo.Abp.AspNetCore.Components.Web.Extensibility.EntityActions;
 using Volo.Abp.AspNetCore.Components.Web.Extensibility.TableColumns;
 using Volo.Abp.AspNetCore.Components.Web.Theming.PageToolbars;
 using Volo.Abp.BlazoriseUI;
+using Volo.Abp.FeatureManagement;
 using Volo.Abp.FeatureManagement.Blazor.Components;
 using Volo.Abp.ObjectExtending;
 using Volo.Abp.TenantManagement.Localization;
@@ -55,7 +56,8 @@ public partial class TenantManagement
     {
         Toolbar.AddButton(L["ManageHostFeatures"],
             async () => await FeatureManagementModal.OpenAsync(FeatureProviderName),
-            "fa fa-cog");
+            "fa fa-cog",
+            requiredPolicyName: FeatureManagementPermissions.ManageHostFeatures);
 
         Toolbar.AddButton(L["NewTenant"],
             OpenCreateModalAsync,

From e5b7fcf0bc6c74a364ceac8d526eb5a4fd3cb8a1 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Thu, 3 Mar 2022 15:40:19 +0800
Subject: [PATCH 2/2] Disable the `dropdown button` when it's no children.

Resolve #11785
---
 .../datatables/datatables-extensions.js                    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
index 5813db7599..b9bcde13e1 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
@@ -168,12 +168,11 @@ var abp = abp || {};
 
             if ($dropdownItemsContainer.find('li').length > 0) {
                 $dropdownItemsContainer.appendTo($container);
-                $dropdownButton.prependTo($container);
+            } else {
+                $dropdownButton.attr('disabled', 'disabled');
             }
 
-            if ($dropdownItemsContainer.children().length === 0) {
-                return "";
-            }
+            $dropdownButton.prependTo($container);
 
             return $container;
         };