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 6b5a16fbb0..feebe23119 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 @@ -5,7 +5,7 @@ - @L["Features"] + @L["Features"]@ProviderKeyDisplayName @if (Groups == null || !Groups.Any()) diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs index f8fe065bed..0d0728db71 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs @@ -31,6 +31,7 @@ public partial class FeatureManagementModal protected string ProviderName; protected string ProviderKey; + protected string ProviderKeyDisplayName; protected string SelectedTabName; @@ -40,7 +41,7 @@ public partial class FeatureManagementModal protected Dictionary SelectionStringValues; - public virtual async Task OpenAsync([NotNull] string providerName, string providerKey = null) + public virtual async Task OpenAsync([NotNull] string providerName, string providerKey = null, string providerKeyDisplayName = null) { try { @@ -50,6 +51,11 @@ public partial class FeatureManagementModal ToggleValues = new Dictionary(); SelectionStringValues = new Dictionary(); + if (!providerKeyDisplayName.IsNullOrWhiteSpace()) + { + ProviderKeyDisplayName = $" - {providerKeyDisplayName}"; + } + var result = await FeatureAppService.GetAsync(ProviderName, ProviderKey); Groups = result?.Groups ?? new List(); 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 87d186d4ad..c29e77fcfc 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 @@ -1,4 +1,5 @@ @page +@using System.Web @using Microsoft.AspNetCore.Mvc.Localization @using Microsoft.Extensions.Localization @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal @@ -23,7 +24,7 @@
- + @if (Model.FeatureListResultDto != null && Model.FeatureListResultDto.Groups.Any()) { var featureGroups = Model.FeatureListResultDto.Groups; diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs index 879b4f1676..f08d42cfd2 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; +using System.Web; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations; @@ -24,6 +25,10 @@ public class FeatureManagementModal : AbpPageModel [HiddenInput] [BindProperty(SupportsGet = true)] public string ProviderKey { get; set; } + + [HiddenInput] + [BindProperty(SupportsGet = true)] + public string ProviderKeyDisplayName { get; set; } [BindProperty] public List FeatureGroups { get; set; } @@ -51,7 +56,10 @@ public class FeatureManagementModal : AbpPageModel public virtual async Task OnGetAsync() { ValidateModel(); - + if (!ProviderKeyDisplayName.IsNullOrWhiteSpace()) + { + ProviderKeyDisplayName = " - " + HttpUtility.HtmlEncode(ProviderKeyDisplayName); + } FeatureListResultDto = await FeatureAppService.GetAsync(ProviderName, ProviderKey); return Page();