From 6d1c5cdeeb5912977c5db8a7c3b4a90fbe863c5f Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Fri, 6 May 2022 17:20:09 +0800
Subject: [PATCH 1/2] Feature modal improvement

---
 .../Components/FeatureManagementModal.razor   | 92 ++++++++++---------
 .../FeatureManagementModal.cshtml             |  6 +-
 ...tingManagementFeatureDefinitionProvider.cs | 15 +++
 3 files changed, 67 insertions(+), 46 deletions(-)

diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
index 1feaf59202..8bc5e9dfe7 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
@@ -6,7 +6,7 @@
     <ModalContent Size="ModalSize.Large" Centered="true">
         <ModalHeader>
             <ModalTitle>@L["Features"]</ModalTitle>
-            <CloseButton Clicked="CloseModal" />
+            <CloseButton Clicked="CloseModal"/>
         </ModalHeader>
         <ModalBody MaxHeight="50">
             @if (Groups == null || !Groups.Any())
@@ -33,55 +33,61 @@
                                 <hr class="mt-2 mb-3"/>
                                 @foreach (var feature in Groups[index].Features)
                                 {
-                                    var disabled = IsDisabled(feature.Provider.Name);
+                                    <div class="mt-2">
+                                        @{
+                                            var disabled = IsDisabled(feature.Provider.Name);
 
-                                    if (feature.ValueType is FreeTextStringValueType)
-                                    {
-                                        <Field Style="@GetFeatureStyles(feature)">
-                                            <FieldLabel>@feature.DisplayName</FieldLabel>
-                                            <TextEdit Disabled="@disabled"
-                                                      Text="@feature.Value"
-                                                      TextChanged="@(async (v) => await OnFeatureValueChangedAsync(v, feature))"/>
-                                            @if (feature.Description != null)
+                                            if (feature.ValueType is FreeTextStringValueType)
                                             {
-                                                <div class="form-text">@feature.Description</div>
+                                                <Field Style="@GetFeatureStyles(feature)">
+                                                    <FieldLabel>@feature.DisplayName</FieldLabel>
+                                                    <TextEdit Disabled="@disabled"
+                                                              Text="@feature.Value"
+                                                              TextChanged="@(async (v) => await OnFeatureValueChangedAsync(v, feature))"/>
+                                                    @if (feature.Description != null)
+                                                    {
+                                                        <div class="form-text">@feature.Description</div>
+                                                    }
+                                                </Field>
                                             }
-                                        </Field>
-                                    }
 
-                                    if (feature.ValueType is SelectionStringValueType)
-                                    {
-                                        var items = ((SelectionStringValueType) feature.ValueType).ItemSource.Items;
-
-                                        <Field Style="@GetFeatureStyles(feature)">
-                                            <FieldLabel>@feature.DisplayName</FieldLabel>
-                                            <Select TValue="string"
-                                                    @bind-SelectedValue="@SelectionStringValues[feature.Name]">
-                                                @foreach (var item in items)
-                                                {
-                                                    <SelectItem Value="@item.Value">
-                                                        @CreateStringLocalizer(item.DisplayText.ResourceName).GetString(item.DisplayText.Name)
-                                                    </SelectItem>
-                                                }
-                                            </Select>
-                                            @if (feature.Description != null)
+                                            if (feature.ValueType is SelectionStringValueType)
                                             {
-                                                <div class="form-text">@feature.Description</div>
+                                                var items = ((SelectionStringValueType) feature.ValueType).ItemSource.Items;
+
+                                                <Field Style="@GetFeatureStyles(feature)">
+                                                    <FieldLabel>@feature.DisplayName</FieldLabel>
+                                                    <Select TValue="string"
+                                                            @bind-SelectedValue="@SelectionStringValues[feature.Name]">
+                                                        @foreach (var item in items)
+                                                        {
+                                                            <SelectItem Value="@item.Value">
+                                                                @CreateStringLocalizer(item.DisplayText.ResourceName).GetString(item.DisplayText.Name)
+                                                            </SelectItem>
+                                                        }
+                                                    </Select>
+                                                    @if (feature.Description != null)
+                                                    {
+                                                        <div class="form-text">@feature.Description</div>
+                                                    }
+                                                </Field>
                                             }
-                                        </Field>
-                                    }
 
-                                    if (feature.ValueType is ToggleStringValueType)
-                                    {
-                                        <Field Style="@GetFeatureStyles(feature)">
-                                            <Check
-                                                TValue="bool" Checked="@ToggleValues[feature.Name]" CheckedChanged="@(async (v) => await OnSelectedValueChangedAsync(v, feature))">@feature.DisplayName</Check>
-                                        </Field>
-                                        @if (feature.Description != null)
-                                        {
-                                            <div class="form-text">@feature.Description</div>
+                                            if (feature.ValueType is ToggleStringValueType)
+                                            {
+                                                <Field Style="@GetFeatureStyles(feature)">
+                                                    <Check
+                                                        TValue="bool" Checked="@ToggleValues[feature.Name]" CheckedChanged="@(async (v) => await OnSelectedValueChangedAsync(v, feature))">
+                                                        @feature.DisplayName
+                                                    </Check>
+                                                    @if (feature.Description != null)
+                                                    {
+                                                        <div class="form-text">@feature.Description</div>
+                                                    }
+                                                </Field>
+                                            }
                                         }
-                                    }
+                                    </div>
                                 }
 
                             </TabPanel>
@@ -95,4 +101,4 @@
             <Button Color="Color.Primary" Clicked="SaveAsync">@L["Save"]</Button>
         </ModalFooter>
     </ModalContent>
-</Modal>
+</Modal>
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
index 167de4943f..d537b099c4 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
@@ -58,7 +58,7 @@
                                                            group-style="margin-left: @(feature.Depth * 20)px"/>
                                                 @if (feature.Description != null)
                                                 {
-                                                    <div class="form-text">@feature.Description</div>
+                                                    <div class="form-text" style="margin-left: @(feature.Depth * 20)px">@feature.Description</div>
                                                 }
 
                                             }
@@ -81,7 +81,7 @@
                                                            group-style="margin-left: @(feature.Depth * 25)px"/>
                                                 @if (feature.Description != null)
                                                 {
-                                                    <div class="form-text">@feature.Description</div>
+                                                    <div class="form-text" style="margin-left: @(feature.Depth * 25)px">@feature.Description</div>
                                                 }
                                             }
 
@@ -105,7 +105,7 @@
                                                     </select>
                                                     @if (feature.Description != null)
                                                     {
-                                                        <div class="form-text">@feature.Description</div>
+                                                        <div class="form-text" style="margin-left: @(feature.Depth * 25)px">@feature.Description</div>
                                                     }
                                                 </div>
                                             }
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingManagementFeatureDefinitionProvider.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingManagementFeatureDefinitionProvider.cs
index 23f0c071fd..9f27dd2c60 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingManagementFeatureDefinitionProvider.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingManagementFeatureDefinitionProvider.cs
@@ -18,6 +18,13 @@ public class SettingManagementFeatureDefinitionProvider : FeatureDefinitionProvi
             L("Feature:SettingManagementEnable"),
             L("Feature:SettingManagementEnableDescription"),
             new ToggleStringValueType());
+        
+        group.AddFeature(
+            "MaxNumber",
+            "",
+            L("Max number"),
+            new FixedLocalizableString("Test feature max number"),
+            new FreeTextStringValueType());
 
         settingEnableFeature.CreateChild(
             SettingManagementFeatures.AllowTenantsToChangeEmailSettings,
@@ -26,6 +33,14 @@ public class SettingManagementFeatureDefinitionProvider : FeatureDefinitionProvi
             L("Feature:AllowTenantsToChangeEmailSettingsDescription"),
             new ToggleStringValueType(),
             isAvailableToHost: false);
+        
+        settingEnableFeature.CreateChild(
+            "MinNumber",
+            "",
+            L("Min number"),
+            new FixedLocalizableString("Test feature min number"),
+            new FreeTextStringValueType(),
+            isAvailableToHost: false);
     }
 
     private static LocalizableString L(string name)

From b43f36ad6f4319ecb8e23738044cc683fc951776 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Fri, 6 May 2022 21:02:16 +0800
Subject: [PATCH 2/2] Update SettingManagementFeatureDefinitionProvider

---
 .../SettingManagementFeatureDefinitionProvider.cs | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingManagementFeatureDefinitionProvider.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingManagementFeatureDefinitionProvider.cs
index 9f27dd2c60..23f0c071fd 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingManagementFeatureDefinitionProvider.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingManagementFeatureDefinitionProvider.cs
@@ -18,13 +18,6 @@ public class SettingManagementFeatureDefinitionProvider : FeatureDefinitionProvi
             L("Feature:SettingManagementEnable"),
             L("Feature:SettingManagementEnableDescription"),
             new ToggleStringValueType());
-        
-        group.AddFeature(
-            "MaxNumber",
-            "",
-            L("Max number"),
-            new FixedLocalizableString("Test feature max number"),
-            new FreeTextStringValueType());
 
         settingEnableFeature.CreateChild(
             SettingManagementFeatures.AllowTenantsToChangeEmailSettings,
@@ -33,14 +26,6 @@ public class SettingManagementFeatureDefinitionProvider : FeatureDefinitionProvi
             L("Feature:AllowTenantsToChangeEmailSettingsDescription"),
             new ToggleStringValueType(),
             isAvailableToHost: false);
-        
-        settingEnableFeature.CreateChild(
-            "MinNumber",
-            "",
-            L("Min number"),
-            new FixedLocalizableString("Test feature min number"),
-            new FreeTextStringValueType(),
-            isAvailableToHost: false);
     }
 
     private static LocalizableString L(string name)