Merge pull request #11097 from abpframework/liangshiwei/ui-blazor

Add some serivces to AbpComponentBase
abpframework · Dec 28, 2021 · e0cc584 · e0cc584
2 parents e34b54c + 55d2771
commit e0cc584
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/framework/src/Volo.Abp.AspNetCore.Components/Volo.Abp.AspNetCore.Components.csproj b/framework/src/Volo.Abp.AspNetCore.Components/Volo.Abp.AspNetCore.Components.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />
+    <ProjectReference Include="..\Volo.Abp.Timing\Volo.Abp.Timing.csproj" />
     <ProjectReference Include="..\Volo.Abp.ObjectMapping\Volo.Abp.ObjectMapping.csproj" />
     <ProjectReference Include="..\Volo.Abp.Security\Volo.Abp.Security.csproj" />
   </ItemGroup>

diff --git a/...Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/AbpAspNetCoreComponentsModule.cs b/...Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/AbpAspNetCoreComponentsModule.cs
@@ -6,13 +6,14 @@
 using Volo.Abp.Modularity;
 using Volo.Abp.ObjectMapping;
 using Volo.Abp.Security;
+using Volo.Abp.Timing;
 
 namespace Volo.Abp.AspNetCore.Components;
 
 [DependsOn(
     typeof(AbpObjectMappingModule),
     typeof(AbpSecurityModule),
-    typeof(AbpLocalizationModule)
+    typeof(AbpTimingModule)
     )]
 public class AbpAspNetCoreComponentsModule : AbpModule
 {

diff --git a/...ork/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/AbpComponentBase.cs b/...ork/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/AbpComponentBase.cs
@@ -11,7 +11,9 @@
 using Volo.Abp.AspNetCore.Components.Messages;
 using Volo.Abp.AspNetCore.Components.Notifications;
 using Volo.Abp.Localization;
+using Volo.Abp.MultiTenancy;
 using Volo.Abp.ObjectMapping;
+using Volo.Abp.Timing;
 using Volo.Abp.Users;
 
 namespace Volo.Abp.AspNetCore.Components;
@@ -54,6 +56,9 @@ protected Type LocalizationResource {
     protected ICurrentUser CurrentUser => LazyGetRequiredService(ref _currentUser);
     private ICurrentUser _currentUser;
 
+    protected ICurrentTenant CurrentTenant => LazyGetRequiredService(ref _currentTenant);
+    private ICurrentTenant _currentTenant;
+
     protected IUiMessageService Message => LazyGetNonScopedRequiredService(ref _message);
     private IUiMessageService _message;
 
@@ -66,6 +71,9 @@ protected Type LocalizationResource {
     protected IAlertManager AlertManager => LazyGetNonScopedRequiredService(ref _alertManager);
     private IAlertManager _alertManager;
 
+    protected IClock Clock => LazyGetNonScopedRequiredService(ref _clock);
+    private IClock _clock;
+
     protected AlertList Alerts => AlertManager.Alerts;
 
     protected IObjectMapper ObjectMapper {