Merge pull request #850 from LittleFish-233/master

修改是否背景图将会实时生效
CnGal · Nov 18, 2024 · 9fb15b8 · 9fb15b8
2 parents 97f6053 + 045dbbc
commit 9fb15b8
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 8 deletions.
diff --git a/CnGalWebSite/CnGalWebSite.Components/wwwroot/css/bundle.css b/CnGalWebSite/CnGalWebSite.Components/wwwroot/css/bundle.css
@@ -941,7 +941,7 @@ html {
 }
 
 .theme--light.m-application {
-    background-color: var(--md-sys-color-background);
+    background-color: transparent;
     color: var(--md-sys-color-on-background);
 }
 
@@ -968,6 +968,7 @@ html {
     text-shadow: none;
 }
 
+
 .m-toast-detail {
     white-space: pre-line;
 }

diff --git a/CnGalWebSite/CnGalWebSite.Components/wwwroot/css/bundle.min.css b/CnGalWebSite/CnGalWebSite.Components/wwwroot/css/bundle.min.css
diff --git a/CnGalWebSite/CnGalWebSite.Components/wwwroot/css/cover-default.css b/CnGalWebSite/CnGalWebSite.Components/wwwroot/css/cover-default.css
@@ -22,7 +22,7 @@ html {
 }
 
 .theme--light.m-application {
-    background-color: var(--md-sys-color-background);
+    background-color: transparent;
     color: var(--md-sys-color-on-background);
 }
 
@@ -49,6 +49,7 @@ html {
     text-shadow: none;
 }
 
+
 .m-toast-detail {
     white-space: pre-line;
 }

diff --git a/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/Shared/Tips/BackgroundImageTip.razor b/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/Shared/Tips/BackgroundImageTip.razor
@@ -1,5 +1,7 @@
 @inject IDataCacheService _dataCacheService
 @inject IHttpService _httpService
+@inject IEventService _eventService
+@implements IDisposable
 
 
 @if (_dataCacheService.ThemeSetting.IsTransparent)
@@ -22,6 +24,10 @@
 
     protected override async Task OnInitializedAsync()
     {
+        _eventService.ThemeChanged -= OnThemeChanged;
+        _eventService.ThemeChanged += OnThemeChanged;
+
+
         var user = await authenticationStateTask;
         if (user.User.Identity.IsAuthenticated&& Model==null)
         {
@@ -41,5 +47,20 @@
 
             }
         }
+
+
+    }
+
+    public async void OnThemeChanged()
+    {
+        await InvokeAsync(StateHasChanged);
+    }
+
+    #region 释放实例
+    public void Dispose()
+    {
+        _eventService.ThemeChanged -= OnThemeChanged;
+        GC.SuppressFinalize(this);
     }
+    #endregion
 }
diff --git a/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/Shared/Tips/StyleTip.razor b/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/Shared/Tips/StyleTip.razor
@@ -38,7 +38,7 @@ else if (_dataCacheService.ThemeSetting.ThemeMode == ThemeMode.Light)
 {
     <style>
         body {
-            font-family: @_dataCacheService.ThemeSetting.FontFamily !important;
+        font-family: @_dataCacheService.ThemeSetting.FontFamily !important;
         }
     </style>
 }
@@ -55,8 +55,8 @@ else if (_dataCacheService.ThemeSetting.ThemeMode == ThemeMode.Light)
 {
     <style>
         .variable.container {
-            max-width: none;
-            padding: 0;
+        max-width: none;
+        padding: 0;
         }
     </style>
 }
@@ -170,6 +170,7 @@ else if (_dataCacheService.ThemeSetting.ThemeMode == ThemeMode.Light)
     {
         await InvokeAsync(StateHasChanged);
         _eventService.OnKanbanChanged();
+        _eventService.OnThemeChanged();
     }
 
     #region 释放实例

diff --git a/CnGalWebSite/CnGalWebSite.Shared.Service/EventService.cs b/CnGalWebSite/CnGalWebSite.Shared.Service/EventService.cs
@@ -22,6 +22,7 @@ public class EventService : IEventService
         public event Action KanbanChanged;
         public event Action UserInfoChanged;
         public event Action UserCommodityChanged;
+        public event Action ThemeChanged;
 
         private readonly IMauiService _mauiService;
         private readonly IJSRuntime JS;
@@ -52,6 +53,12 @@ public void OnKanbanChanged()
             KanbanChanged?.Invoke();
         }
 
+        //主题设置修改
+        public void OnThemeChanged()
+        {
+            ThemeChanged?.Invoke();
+        }
+
         //切换词条样式
         public void OnSwitchStyle()
         {

diff --git a/CnGalWebSite/CnGalWebSite.Shared.Service/IEventService.cs b/CnGalWebSite/CnGalWebSite.Shared.Service/IEventService.cs
@@ -17,6 +17,7 @@ public interface IEventService
         event Action KanbanChanged;
         event Action UserInfoChanged;
         event Action UserCommodityChanged;
+        event Action ThemeChanged;
 
         void OnKanbanChanged();
 
@@ -37,5 +38,7 @@ public interface IEventService
         void OnUserInfoChanged();
 
         void OnUserCommodityChanged();
+
+        void OnThemeChanged();
     }
 }
diff --git a/CnGalWebSite/CnGalWebSite.Shared/wwwroot/css/bundle.css b/CnGalWebSite/CnGalWebSite.Shared/wwwroot/css/bundle.css
@@ -941,7 +941,7 @@ html {
 }
 
 .theme--light.m-application {
-    background-color: var(--md-sys-color-background);
+    background-color: transparent;
     color: var(--md-sys-color-on-background);
 }
 
@@ -968,6 +968,7 @@ html {
     text-shadow: none;
 }
 
+
 .m-toast-detail {
     white-space: pre-line;
 }

diff --git a/CnGalWebSite/CnGalWebSite.Shared/wwwroot/css/bundle.min.css b/CnGalWebSite/CnGalWebSite.Shared/wwwroot/css/bundle.min.css