扩展关闭功能，允许退出整个应用；

dotnet9 · Nov 1, 2022 · 5ead013 · 5ead013
1 parent 0c2068f
commit 5ead013
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/src/BlazorChat.BlazorServer/Services/WindowService.cs b/src/BlazorChat.BlazorServer/Services/WindowService.cs
@@ -29,7 +29,7 @@ public bool IsMaximized()
         return true;
     }
 
-    public void Close()
+    public void Close(bool allWindow)
     {
     }
 }
diff --git a/src/WPFBlazorChat.Core/Services/IWindowService.cs b/src/WPFBlazorChat.Core/Services/IWindowService.cs
@@ -8,5 +8,5 @@ public interface IWindowService
     void Minimize();
     void Maximize();
     bool IsMaximized();
-    void Close();
+    void Close(bool allWindow = false);
 }
diff --git a/src/WPFBlazorChat.WebApp/Views/MainView.razor b/src/WPFBlazorChat.WebApp/Views/MainView.razor
@@ -140,7 +140,7 @@
               Title="关闭窗体"
               Type="AlertTypes.Warning"
               OnCancel="() => _showComfirmDialog = false"
-              OnOk="WindowService.Close">
+              OnOk="() => WindowService.Close(true)">
         您确认关闭吗？没事，待会儿再打开就是!
     </PConfirm>
     <!--确认对话框结束-->

diff --git a/src/WPFBlazorChat.WebApp/Views/WeChatView.razor b/src/WPFBlazorChat.WebApp/Views/WeChatView.razor
@@ -15,10 +15,11 @@
                     Label="搜索"
                     Outlined
                     Dense
-                    required></MTextField>
+                    required>
+        </MTextField>
         <MAppBarTitle>Title</MAppBarTitle>
         <MSpacer></MSpacer>
-        
+
         <MButton Icon OnClick="WindowService.Minimize">
             <MIcon>mdi-window-minimize</MIcon>
         </MButton>
@@ -32,7 +33,7 @@
                 <MIcon>mdi-window-maximize</MIcon>
             }
         </MButton>
-        <MButton Icon OnClick="WindowService.Close">
+        <MButton Icon OnClick="() => WindowService.Close()">
             <MIcon>mdi-close</MIcon>
         </MButton>
     </MAppBar>

diff --git a/src/WPFBlazorChat/Services/WindowService.cs b/src/WPFBlazorChat/Services/WindowService.cs
@@ -72,8 +72,14 @@ public bool IsMaximized()
         return false;
     }
 
-    public void Close()
+    public void Close(bool allWindow = false)
     {
+        if (allWindow)
+        {
+            Application.Current?.Shutdown();
+            return;
+        }
+
         var window = GetActiveWindow();
         if (window != null)
         {