New Function: Window Dialog.

Junevy · Junevy · commit ae94bb718380 · 2026-03-27T22:23:10.000+08:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,42 @@
+{
+    // 使用 IntelliSense 了解相关属性。 
+    // 悬停以查看现有属性的描述。
+    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": ".NET Core Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "警告01": "*********************************************************************************",
+            "警告02": "The C# extension was unable to automatically decode projects in the current",
+            "警告03": "workspace to create a runnable launch.json file. A template launch.json file has",
+            "警告04": "been created as a placeholder.",
+            "警告05": "",
+            "警告06": "If the server is currently unable to load your project, you can attempt to",
+            "警告07": "resolve this by restoring any missing project dependencies (example: run 'dotnet",
+            "警告08": "restore') and by fixing any reported errors from building the projects in your",
+            "警告09": "workspace.",
+            "警告10": "If this allows the server to now load your project then --",
+            "警告11": "  * Delete this file",
+            "警告12": "  * Open the Visual Studio Code command palette (View->Command Palette)",
+            "警告13": "  * run the command: '.NET: Generate Assets for Build and Debug'.",
+            "警告14": "",
+            "警告15": "If your project requires a more complex launch configuration, you may wish to",
+            "警告16": "delete this configuration and pick a different template using the 'Add",
+            "警告17": "Configuration...' button at the bottom of this file.",
+            "警告18": "*********************************************************************************",
+            "preLaunchTask": "build",
+            "program": "${workspaceFolder}/bin/Debug/<insert-target-framework-here>/<insert-project-name-here>.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach"
+        }
+    ]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,24 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "shell",
+            "args": [
+                "build",
+                // Ask dotnet build to generate full paths for file names.
+                "/property:GenerateFullPaths=true",
+                // Do not generate summary otherwise it leads to duplicate errors in Problems panel
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "group": "build",
+            "presentation": {
+                "reveal": "silent"
+            },
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}
diff --git a/Common/DialogOptions.cs b/Common/DialogOptions.cs
@@ -5,9 +5,9 @@ namespace SimpleNavigation.Common
     /// <summary>
     /// 导航配置，可配置导航的行为，如是否允许Region重复打开同一个Page、是否保留导航历史等。
     /// </summary>
-    public class NavigationOptions
+    public class DialogOptions
     {
-        public enum PageMode
+        public enum DialogMode
         {
             Singleton,
             Transient
@@ -20,11 +20,11 @@ public enum KeepHistory
         }
 
         /// <summary>
-        /// 是否允许Region重复打开同一个Page，与<see cref="PageMode"/>相关联。
+        /// 是否允许Region重复打开同一个Page，与<see cref="DialogMode"/>相关联。
         /// Singleton：Region仅允许导航一次；
         /// Transient：Region允许导航该Page多次。
         /// </summary>
-        public PageMode AllowMulti = PageMode.Transient;
+        public DialogMode AllowMulti = DialogMode.Transient;
 
         /// <summary>
         /// 是否允许保留导航历史，影响<see cref="NavigationService.Goback(string)"/>功能。
diff --git a/Common/DialogParameters.cs b/Common/DialogParameters.cs
@@ -3,23 +3,23 @@
     /// <summary>
     /// 导航参数对象
     /// </summary>
-    public class NavigationParameter
+        public class DialogParameters
     {
         public Dictionary<string, object> Parameters { get; } = [];
 
-        public NavigationParameter(string key, object value)
+        public DialogParameters(string key, object value)
         {
             if (key != null && value != null)
                 Parameters[key] = value;
         }
 
-        public NavigationParameter(Dictionary<string, object> keyValues)
+        public DialogParameters(Dictionary<string, object> keyValues)
         {
             if (keyValues != null)
                 Parameters = keyValues;
         }
 
-        public NavigationParameter(params object[] values)
+        public DialogParameters(params object[] values) 
         {
             for (int i = 0; i < values.Length -1; i++)
             {
diff --git a/Common/NavigationRoute.cs b/Common/NavigationRoute.cs
@@ -6,7 +6,7 @@ namespace SimpleNavigation.Common
     /// 路由实例对象
     /// </summary>
     /// <param name="pageType">当前路由实例对应的Page类型，在判断是否允许重复导航时使用</param>
-    /// <param name="factory">路由实例的配置，详情见：<see cref="NavigationOptions"/></param>
+    /// <param name="factory">路由实例的配置，详情见：<see cref="DialogOptions"/></param>
     /// <param name="options">路由实例的构造方式，推荐使用<see cref="DependencyInjection"/>，以支持更复杂的页面构造需求。</param>
     internal class NavigationRoute
     {
@@ -15,7 +15,7 @@ internal class NavigationRoute
         /// </summary>
         public Guid Id { get; }
 
-        public NavigationRoute(Type pageType, Func<Page> factory, NavigationOptions options)
+        public NavigationRoute(Type pageType, Func<Page> factory, DialogOptions options)
         {
             Id = new Guid();
             this.factory = factory;
@@ -29,9 +29,9 @@ public NavigationRoute(Type pageType, Func<Page> factory, NavigationOptions opti
         private readonly Func<Page> factory;
 
         /// <summary>
-        /// 路由实例的配置，详情见：<see cref="NavigationOptions"/>
+        /// 路由实例的配置，详情见：<see cref="DialogOptions"/>
         /// </summary>
-        public NavigationOptions Options { get; }
+        public DialogOptions Options { get; }
 
         /// <summary>
         /// 当前路由实例对应的Page类型，在判断是否允许重复导航时使用
@@ -50,7 +50,7 @@ public NavigationRoute(Type pageType, Func<Page> factory, NavigationOptions opti
         /// <returns>路由实例</returns>
         public Page GetPage()
         {
-            if (Options.AllowMulti == NavigationOptions.PageMode.Singleton)
+            if (Options.AllowMulti == DialogOptions.DialogMode.Singleton)
                 return cachePage ??= factory();
 
             return factory();
diff --git a/Common/Serilogger.cs b/Common/Serilogger.cs
@@ -1,15 +1,18 @@
+using System.Windows;
+using SimpleNavigation.Interface;
+
 namespace SimpleNavigation.Common
 {
     /// <summary>
-    /// Discarded class.
+    /// Serilog日志记录器，用于全局日志记录。
     /// </summary>
     public sealed class Serilogger : IDisposable
     {
         private bool disposed = false;
         private static readonly object loggerLock = new();
         private static int _instanceSet = 0;
 
-        private static volatile ISerilog _instance;
+        private static volatile ISerilog? _instance;
         public static ISerilog Instance 
         {
             get
@@ -18,43 +21,39 @@ public static ISerilog Instance
                     throw new ArgumentNullException($"{nameof(_instance)} is null.");
                 return _instance;
             } 
+            private set => _instance = value;
         }
 
         private Serilogger() { }
 
         public static void SetInstance(ISerilog logger)
         {
-            if (logger == null) throw new ArgumentNullException($"{nameof(logger)} is null.");
-
-            if (Interlocked.CompareExchange(ref _instanceSet, 1, 0) != 0)
-            {
-                throw InvalidaOperationException($"{nameof(Instance)} has been initialized!");
-            }
+            ArgumentNullException.ThrowIfNull(logger);
 
             lock(loggerLock)
             {
                 if (Instance != null)
                 {
                     Interlocked.Exchange(ref _instanceSet, 0);
-                    throw InvalidaOperationException($"{nameof(Instance)} has been initialized!");
+                    throw new InvalidOperationException($"{nameof(Instance)} has been initialized!");
                 }
 
-                this.Instance = logger;
+                Instance = logger;
             }
         }
 
-        private void Dispose()
+        public void Dispose()
         {
             if (disposed)
-                return;
-            
-            // Dispose(true);
-            GC.SuppressFinalize(this);
-            Instance.Dispose();
-
-            disposed = true;
-            _instance = null;
-            Interlocked.Exchange(ref _instanceSet, 0);
+                 return;
+
+ 
+             GC.SuppressFinalize(this);
+             Instance.Dispose();
+
+             disposed = true;
+             _instance = null;
+             Interlocked.Exchange(ref _instanceSet, 0);
         }
     }
 }
diff --git a/Common/WindowRegistration.cs b/Common/WindowRegistration.cs
@@ -0,0 +1,41 @@
+using System.Windows;
+
+namespace SimpleNavigation.Common
+{
+    /// <summary>
+    /// 窗口注册类
+    /// </summary>
+    public class WindowRegistration
+    {
+        private readonly Func<Window> factory;
+        private Window? cacheWindow;
+
+        /// <summary>
+        /// 唯一标识
+        /// </summary>
+        public Guid Id { get; } = new Guid();
+
+        /// <summary>
+        /// 窗口类型
+        /// </summary>
+        public Type WindowType { get; set; } = null!;
+
+        public DialogOptions Options { get; set; } = null!;
+
+        public WindowRegistration(Type windowType, DialogOptions options, Func<Window> factory)
+        {
+            WindowType = windowType;
+            Options = options;
+            this.factory = factory;
+        }
+
+        public Window GetWindow()
+        {
+            if (Options.AllowMulti == DialogOptions.DialogMode.Singleton)
+                return cacheWindow ??= factory();
+
+            return factory();
+        }
+    }
+    
+}
diff --git a/Interface/INavigationAware.cs b/Interface/INavigationAware.cs
@@ -11,12 +11,12 @@ public interface INavigationAware
         /// 导航即将发生时的回调方法
         /// </summary>
         /// <param name="parameters">导航携带的参数</param>
-        void OnNavigating(NavigationParameter? parameters);
+        void OnNavigating(DialogParameters? parameters);
 
         /// <summary>
         /// 导航完成后的回调方法
         /// </summary>
         /// <param name="parameters"></param>
-        void OnNavigated(NavigationParameter? parameters);
+        void OnNavigated(DialogParameters? parameters);
     }
 }
diff --git a/Interface/INavigationService.cs b/Interface/INavigationService.cs
@@ -16,16 +16,16 @@ public interface INavigationService
         /// </summary>
         /// <param name="region">导航的目标区域</param>
         /// <param name="route">导航的目标路由</param>
-        /// <param name="parameters">导航时所携带的参数，详情见：<see cref="NavigationParameter"/></param>
-        void Navigate(string region, string route, NavigationParameter? parameters = null);
+        /// <param name="parameters">导航时所携带的参数，详情见：<see cref="DialogParameters"/></param>
+        void Navigate(string region, string route, DialogParameters? parameters = null);
 
         /// <summary>
         /// 导航功能，根据提供的路由Key和区域Key导航到目标路由（Page），并且可以传递参数。导航过程中会触发页面的<see cref="INavigationAware"/>接口方法，允许在导航前后执行特定逻辑。
         /// </summary>
         /// <typeparam name="TPage">导航的目标路由。通过TPage.FullName来获取指定的路由Key</typeparam>
         /// <param name="region">导航的目标区域</param>
-        /// <param name="parameter">导航时所携带的参数，详情见：<see cref="NavigationParameter"/></param>
-        void Navigate<TPage>(string region, NavigationParameter? parameters = null);
+        /// <param name="parameters">导航时所携带的参数，详情见：<see cref="DialogParameters"/></param>
+        void Navigate<TPage>(string region, DialogParameters? parameters = null);
 
         /// <summary>
         /// 注册区域，区域是导航的目标容器，允许在不同的区域导航到不同的页面，甚至在同一区域导航到同一个页面但传递不同的参数。
@@ -39,41 +39,41 @@ public interface INavigationService
         /// </summary>
         /// <param name="route">路由Key，<see cref="Routes"/></param>
         /// <param name="factory">路由对象的构造方式</param>
-        /// <param name="options">详情查看<see cref="NavigationOptions"/></param>
+        /// <param name="options">详情查看<see cref="DialogOptions"/></param>
         /// <param name="pageType">记录Page类型，用于判断是否能重复导航，<see cref="NavigationRoute.PageType"/></param>
-        void RegisterRoute(string route, Func<Page> factory, NavigationOptions? options = null, Type? pageType = null);
+        void RegisterRoute(string route, Func<Page> factory, DialogOptions? options = null, Type? pageType = null);
 
         /// <summary>
         /// 注册路由，默认使用类型名称作为路由Key，并且要求Page具有无参构造函数。
         /// </summary>
         /// <typeparam name="TPage">记录路由的Page类型，同时作为路由Key，<see cref="NavigationRoute.PageType"/></typeparam>
-        /// <param name="options">详情查看<see cref="NavigationOptions"/></param>
-        void RegisterRoute<TPage>(NavigationOptions? options = null) where TPage : Page, new();
+        /// <param name="options">详情查看<see cref="DialogOptions"/></param>
+        void RegisterRoute<TPage>(DialogOptions? options = null) where TPage : Page, new();
 
         /// <summary>
         /// 注册路由，要求提供Page的构造方式，推荐使用<see cref="DependencyInjection"/>
         /// </summary>
         /// <typeparam name="TPage">记录路由的Page类型，<see cref="NavigationRoute.PageType"/></typeparam>
         /// <param name="factory">路由对象的构造方式</param>
-        /// <param name="options">详情查看<see cref="NavigationOptions"/></param>
-        void RegisterRoute<TPage>(Func<Page> factory, NavigationOptions? options = null);
+        /// <param name="options">详情查看<see cref="DialogOptions"/></param>
+        void RegisterRoute<TPage>(Func<Page> factory, DialogOptions? options = null);
 
         /// <summary>
         /// 注册路由，要求Page具有无参构造函数。
         /// </summary>
         /// <typeparam name="TPage">记录路由的Page类型，<see cref="NavigationRoute.PageType"/></typeparam>
         /// <param name="route">路由Key，<see cref="Routes"/></param>
-        /// <param name="options">详情查看<see cref="NavigationOptions"/></param>
-        void RegisterRoute<TPage>(string route, NavigationOptions? options = null) where TPage : Page, new();
+        /// <param name="options">详情查看<see cref="DialogOptions"/></param>
+        void RegisterRoute<TPage>(string route, DialogOptions? options = null) where TPage : Page, new();
 
         /// <summary>
         /// 注册路由，要求提供Page的构造方式，推荐使用<see cref="DependencyInjection"/>
         /// </summary>
         /// <typeparam name="TPage">记录路由的Page类型，<see cref="NavigationRoute.PageType"/></typeparam>
         /// <param name="route">路由Key，<see cref="Routes"/></param>
         /// <param name="factory">路由对象的构造方式</param>
-        /// <param name="options">详情查看<see cref="NavigationOptions"/></param>
-        void RegisterRoute<TPage>(string route, Func<Page> factory, NavigationOptions? options = null) where TPage : Page;
+        /// <param name="options">详情查看<see cref="DialogOptions"/></param>
+        void RegisterRoute<TPage>(string route, Func<Page> factory, DialogOptions? options = null) where TPage : Page;
 
         /// <summary>
         /// 取消注册区域，根据提供的区域Key从区域表中移除对应的区域记录，取消注册后将无法通过该区域进行导航。
diff --git a/Interface/IWindowAware.cs b/Interface/IWindowAware.cs
diff --git a/Interface/IWindowService.cs b/Interface/IWindowService.cs
diff --git a/Services/NavigationService.cs b/Services/NavigationService.cs
diff --git a/Services/WindowService.cs b/Services/WindowService.cs

Original file line number	Diff line number	Diff line change
`@@ -3,23 +3,23 @@`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// 导航参数对象`
`5`	`5`	`/// </summary>`
`6`		`- public class NavigationParameter`
	`6`	`+ public class DialogParameters`
`7`	`7`	`{`
`8`	`8`	`public Dictionary<string, object> Parameters { get; } = [];`
`9`	`9`
`10`		`- public NavigationParameter(string key, object value)`
	`10`	`+ public DialogParameters(string key, object value)`
`11`	`11`	`{`
`12`	`12`	`if (key != null && value != null)`
`13`	`13`	`Parameters[key] = value;`
`14`	`14`	`}`
`15`	`15`
`16`		`- public NavigationParameter(Dictionary<string, object> keyValues)`
	`16`	`+ public DialogParameters(Dictionary<string, object> keyValues)`
`17`	`17`	`{`
`18`	`18`	`if (keyValues != null)`
`19`	`19`	`Parameters = keyValues;`
`20`	`20`	`}`
`21`	`21`
`22`		`- public NavigationParameter(params object[] values)`
	`22`	`+ public DialogParameters(params object[] values)`
`23`	`23`	`{`
`24`	`24`	`for (int i = 0; i < values.Length -1; i++)`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,18 @@`
	`1`	`+using System.Windows;`
	`2`	`+using SimpleNavigation.Interface;`
	`3`	`+`
`1`	`4`	`namespace SimpleNavigation.Common`
`2`	`5`	`{`
`3`	`6`	`/// <summary>`
`4`		`- /// Discarded class.`
	`7`	`+ /// Serilog日志记录器，用于全局日志记录。`
`5`	`8`	`/// </summary>`
`6`	`9`	`public sealed class Serilogger : IDisposable`
`7`	`10`	`{`
`8`	`11`	`private bool disposed = false;`
`9`	`12`	`private static readonly object loggerLock = new();`
`10`	`13`	`private static int _instanceSet = 0;`
`11`	`14`
`12`		`- private static volatile ISerilog _instance;`
	`15`	`+ private static volatile ISerilog? _instance;`
`13`	`16`	`public static ISerilog Instance`
`14`	`17`	`{`
`15`	`18`	`get`
`@@ -18,43 +21,39 @@ public static ISerilog Instance`
`18`	`21`	`throw new ArgumentNullException($"{nameof(_instance)} is null.");`
`19`	`22`	`return _instance;`
`20`	`23`	`}`
	`24`	`+ private set => _instance = value;`
`21`	`25`	`}`
`22`	`26`
`23`	`27`	`private Serilogger() { }`
`24`	`28`
`25`	`29`	`public static void SetInstance(ISerilog logger)`
`26`	`30`	`{`
`27`		`- if (logger == null) throw new ArgumentNullException($"{nameof(logger)} is null.");`
`28`		`-`
`29`		`- if (Interlocked.CompareExchange(ref _instanceSet, 1, 0) != 0)`
`30`		`- {`
`31`		`- throw InvalidaOperationException($"{nameof(Instance)} has been initialized!");`
`32`		`- }`
	`31`	`+ ArgumentNullException.ThrowIfNull(logger);`
`33`	`32`
`34`	`33`	`lock(loggerLock)`
`35`	`34`	`{`
`36`	`35`	`if (Instance != null)`
`37`	`36`	`{`
`38`	`37`	`Interlocked.Exchange(ref _instanceSet, 0);`
`39`		`- throw InvalidaOperationException($"{nameof(Instance)} has been initialized!");`
	`38`	`+ throw new InvalidOperationException($"{nameof(Instance)} has been initialized!");`
`40`	`39`	`}`
`41`	`40`
`42`		`- this.Instance = logger;`
	`41`	`+ Instance = logger;`
`43`	`42`	`}`
`44`	`43`	`}`
`45`	`44`
`46`		`- private void Dispose()`
	`45`	`+ public void Dispose()`
`47`	`46`	`{`
`48`	`47`	`if (disposed)`
`49`		`- return;`
`50`		`-`
`51`		`- // Dispose(true);`
`52`		`- GC.SuppressFinalize(this);`
`53`		`- Instance.Dispose();`
`54`		`-`
`55`		`- disposed = true;`
`56`		`- _instance = null;`
`57`		`- Interlocked.Exchange(ref _instanceSet, 0);`
	`48`	`+ return;`
	`49`	`+`
	`50`	`+`
	`51`	`+ GC.SuppressFinalize(this);`
	`52`	`+ Instance.Dispose();`
	`53`	`+`
	`54`	`+ disposed = true;`
	`55`	`+ _instance = null;`
	`56`	`+ Interlocked.Exchange(ref _instanceSet, 0);`
`58`	`57`	`}`
`59`	`58`	`}`
`60`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,12 @@ public interface INavigationAware`
`11`	`11`	`/// 导航即将发生时的回调方法`
`12`	`12`	`/// </summary>`
`13`	`13`	`/// <param name="parameters">导航携带的参数</param>`
`14`		`- void OnNavigating(NavigationParameter? parameters);`
	`14`	`+ void OnNavigating(DialogParameters? parameters);`
`15`	`15`
`16`	`16`	`/// <summary>`
`17`	`17`	`/// 导航完成后的回调方法`
`18`	`18`	`/// </summary>`
`19`	`19`	`/// <param name="parameters"></param>`
`20`		`- void OnNavigated(NavigationParameter? parameters);`
	`20`	`+ void OnNavigated(DialogParameters? parameters);`
`21`	`21`	`}`
`22`	`22`	`}`