From 4a8e9855ce155ec5bec3c408284015db423d6e98 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 14 May 2025 16:34:39 +0800 Subject: [PATCH] Skip disable feature if `value` or `provider name` is `null`. --- .../Components/FeatureManagementModal.razor.cs | 7 +++++-- .../FeatureManagement/FeatureManagementModal.cshtml.cs | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) 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 b0b7b6f70f..8a48db4b4a 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 @@ -152,10 +152,13 @@ public partial class FeatureManagementModal protected virtual bool IsDisabled(FeatureDto feature) { - return feature.Provider.Name != ProviderName && feature.Provider.Name != DefaultValueFeatureValueProvider.ProviderName; + return feature.Value != null && + feature.Provider.Name != null && + feature.Provider.Name != ProviderName && + feature.Provider.Name != DefaultValueFeatureValueProvider.ProviderName; } - public string GetShownName(FeatureDto featureDto) + public virtual string GetShownName(FeatureDto featureDto) { return !IsDisabled(featureDto) ? featureDto.DisplayName 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 39bb3ad4f0..eb27c63aae 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 @@ -85,12 +85,15 @@ public class FeatureManagementModal : AbpPageModel return NoContent(); } - public bool IsDisabled(FeatureDto featureDto) + public virtual bool IsDisabled(FeatureDto feature) { - return featureDto.Provider.Name != ProviderName && featureDto.Provider.Name != DefaultValueFeatureValueProvider.ProviderName; + return feature.Value != null && + feature.Provider.Name != null && + feature.Provider.Name != ProviderName && + feature.Provider.Name != DefaultValueFeatureValueProvider.ProviderName; } - public string GetShownName(FeatureDto featureDto) + public virtual string GetShownName(FeatureDto featureDto) { return !IsDisabled(featureDto) ? featureDto.DisplayName