Merge pull request #12041 from abpframework/auto-merge/rel-5-2/946

Merge branch dev with rel-5.2

modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor

@@ -43,7 +43,7 @@
                                                       TextChanged="@(async(v) => await OnFeatureValueChangedAsync(v, feature))" />
                                             @if (feature.Description != null)
                                             {
-                                                <span>@feature.Description</span>
+                                                <div class="form-text">@feature.Description</div>
                                             }
                                         </Field>
                                     }
@@ -63,6 +63,10 @@
                                                     </SelectItem>
                                                 }
                                             </Select>
+                                            @if (feature.Description != null)
+                                            {
+                                                <div class="form-text">@feature.Description</div>
+                                            }
                                         </Field>
                                     }
 
@@ -72,6 +76,10 @@
                                             <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>
+                                        }
                                     }
                                 }
 

modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml

@@ -56,6 +56,10 @@
                                                            group-data-feature-name="@feature.Name"
                                                            group-data-parent-name="@(feature.ParentName ?? "")"
                                                            group-style="margin-left: @(feature.Depth * 20)px"/>
+                                                @if (feature.Description != null)
+                                                {
+                                                    <div class="form-text">@feature.Description</div>
+                                                }
 
                                             }
 
@@ -75,6 +79,10 @@
                                                            group-data-feature-name="@feature.Name"
                                                            group-data-parent-name="@(feature.ParentName ?? "")"
                                                            group-style="margin-left: @(feature.Depth * 25)px"/>
+                                                @if (feature.Description != null)
+                                                {
+                                                    <div class="form-text">@feature.Description</div>
+                                                }
                                             }
 
                                             @if (feature.ValueType is SelectionStringValueType selectType)
@@ -95,6 +103,10 @@
                                                             }
                                                         }
                                                     </select>
+                                                    @if (feature.Description != null)
+                                                    {
+                                                        <div class="form-text">@feature.Description</div>
+                                                    }
                                                 </div>
                                             }