diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Script/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Script/Default.cshtml index 118e04f4a8..b5575fe349 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Script/Default.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Script/Default.cshtml @@ -1 +1 @@ - + \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Script/GlobalScriptViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Script/GlobalScriptViewComponent.cs index 1abf2a4c16..31312cfa4f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Script/GlobalScriptViewComponent.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Script/GlobalScriptViewComponent.cs @@ -1,13 +1,27 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.Features; +using Volo.CmsKit.Features; namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.GlobalResources.Script; public class GlobalScriptViewComponent : AbpViewComponent { + protected IFeatureChecker FeatureChecker { get; } + + public GlobalScriptViewComponent(IFeatureChecker featureChecker) + { + FeatureChecker = featureChecker; + } + public async Task InvokeAsync() { + if (!await FeatureChecker.IsEnabledAsync(CmsKitFeatures.GlobalResourceEnable)) + { + return Content(string.Empty); + } + return View("~/Pages/CmsKit/Shared/Components/GlobalResources/Script/Default.cshtml"); } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Style/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Style/Default.cshtml index fdcfb382bb..769fdddc1b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Style/Default.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Style/Default.cshtml @@ -1,3 +1 @@ -@model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.GlobalResources.Style.GlobalStyleModel - - \ No newline at end of file + \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Style/GlobalStyleModel.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Style/GlobalStyleModel.cs deleted file mode 100644 index 869f768987..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Style/GlobalStyleModel.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.GlobalResources.Style; - -public class GlobalStyleModel -{ - public long LastModificationTimeTimestamp { get; set; } -} diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Style/GlobalStyleViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Style/GlobalStyleViewComponent.cs index 49062bdb06..bb5b064e13 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Style/GlobalStyleViewComponent.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Style/GlobalStyleViewComponent.cs @@ -1,33 +1,27 @@ -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; -using Volo.CmsKit.Public.GlobalResources; +using Volo.Abp.Features; +using Volo.CmsKit.Features; namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.GlobalResources.Style; public class GlobalStyleViewComponent : AbpViewComponent { - protected IGlobalResourcePublicAppService GlobalResourcePublicAppService { get; } + protected IFeatureChecker FeatureChecker { get; } - public GlobalStyleViewComponent(IGlobalResourcePublicAppService globalResourcePublicAppService) + public GlobalStyleViewComponent(IFeatureChecker featureChecker) { - GlobalResourcePublicAppService = globalResourcePublicAppService; + FeatureChecker = featureChecker; } - [BindProperty(SupportsGet = true)] - public DateTime? LastModificationTime { get; set; } - public async Task InvokeAsync() { - var lastModificationTime = (await GlobalResourcePublicAppService.GetGlobalStyleAsync())?.LastModificationTime; - var lastModificationTimeTimestamp = (long)(lastModificationTime.HasValue ? lastModificationTime.Value.Subtract(DateTime.UnixEpoch).TotalSeconds : 0); + if (!await FeatureChecker.IsEnabledAsync(CmsKitFeatures.GlobalResourceEnable)) + { + return Content(string.Empty); + } - return View("~/Pages/CmsKit/Shared/Components/GlobalResources/Style/Default.cshtml", - new GlobalStyleModel() - { - LastModificationTimeTimestamp = lastModificationTimeTimestamp - }); + return View("~/Pages/CmsKit/Shared/Components/GlobalResources/Style/Default.cshtml"); } - } \ No newline at end of file