Merge pull request #55 from NeverMorewd/feat-viewaliasname

NeverMorewd · web-flow · commit 7bab73f18a8a · 2025-05-30T18:03:25.000+08:00
feature:add view alias
diff --git a/samples/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs b/samples/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
@@ -47,7 +47,8 @@ public MainViewModel(IEnumerable<IModule> modules,
                 new NavigationParameters { { "requestNew", requestNew } });
             _navigationService.RequestViewNavigation("TabRegion", 
                 viewName, 
-                new NavigationParameters { { "requestNew", requestNew } });
+                new NavigationParameters { { "requestNew", requestNew } },
+                $"alias-{viewName}");
             _navigationService.RequestViewNavigation("ItemsRegion", 
                 viewName, 
                 new NavigationParameters { { "requestNew", requestNew } });
diff --git a/samples/Lemon.ModuleNavigation.Sample/Views/MainView.axaml b/samples/Lemon.ModuleNavigation.Sample/Views/MainView.axaml
@@ -72,7 +72,7 @@
                         <TabControl.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal" Spacing="2">
-                                    <TextBlock Text="{Binding}" />
+                                    <TextBlock Text="{Binding Alias}" />
                                     <Button
                                         Content="X"
                                         FontSize="11"
diff --git a/samples/Lemon.ModuleNavigation.SampleViewModel/MainWindowViewModel.cs b/samples/Lemon.ModuleNavigation.SampleViewModel/MainWindowViewModel.cs
@@ -3,6 +3,7 @@
 using ReactiveUI;
 using System.Diagnostics;
 using System.Reactive;
+using System.Reflection;
 
 namespace Lemon.ModuleNavigation.SampleViewModel;
 
@@ -32,7 +33,7 @@ public MainWindowViewModel(INavigationService navigationService,
 
             }
             _navigationService.RequestViewNavigation("ContentRegion", viewName, new NavigationParameters { { "requestNew", requestNew } });
-            _navigationService.RequestViewNavigation("TabRegion", viewName, new NavigationParameters { { "requestNew", requestNew } });
+            _navigationService.RequestViewNavigation("TabRegion", viewName, new NavigationParameters { { "requestNew", requestNew } }, $"alias-{viewName}");
             _navigationService.RequestViewNavigation("ItemsRegion", viewName, new NavigationParameters { { "requestNew", requestNew } });
         });
 
diff --git a/samples/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml b/samples/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml
@@ -55,7 +55,7 @@
                             <TabControl.ItemTemplate>
                                 <DataTemplate>
                                     <StackPanel Orientation="Horizontal">
-                                        <TextBlock Text="{Binding}" />
+                                        <TextBlock Text="{Binding Alias}" />
                                         <Button
                                             Width="20"
                                             Height="20"
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs b/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs
@@ -6,14 +6,11 @@ public interface IRegionManager : IObservable<NavigationContext>, IObservable<IR
 {
     void AddRegion(string regionName, IRegion region);
     IRegion? GetRegion(string regionName);
-
-    void RequestViewNavigate(string regionName, string viewName, NavigationParameters? parameters = null);
+    void RequestViewNavigate(string regionName, string viewName, NavigationParameters? parameters = null, string? alias = null);
     [Obsolete("requestNew was obsolete.Consider IsNavigationTarget() in INavigationAware instead.")]
     void RequestNavigate(string regionName, string viewName, bool requestNew, NavigationParameters? parameters = null);
     void RequestViewUnload(string regionName, string viewName);
     void RequestViewUnload(NavigationContext context);
-
-
     void RequestModuleNavigate(string regionName, string moduleName, NavigationParameters? parameters);
     void RequestModuleNavigate(string regionName, IModule module, NavigationParameters? parameters);
     void RequestModuleUnload(string moduleName, string viewName);
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationHandler.cs b/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationHandler.cs
@@ -5,10 +5,12 @@ namespace Lemon.ModuleNavigation.Abstractions;
 public interface IViewNavigationHandler
 {
     void OnNavigateTo(string regionName, 
-        string viewName);
+        string viewName,
+        string? alias = null);
     void OnNavigateTo(string regionName, 
         string viewName,
-        NavigationParameters parameters);
+        NavigationParameters parameters,
+        string? alias = null);
     void OnViewUnload(string regionName,
         string viewName);
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs b/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs
@@ -20,7 +20,8 @@ void RequestViewNavigation(string regionName,
         bool requestNew);
 
     void RequestViewNavigation(string regionName,
-        string viewName);
+        string viewName, 
+        string? alias = null);
 
     /// <summary>
     /// RequestViewNavigation
@@ -40,7 +41,8 @@ void RequestViewNavigation(string regionName,
 
     void RequestViewNavigation(string regionName,
         string viewName,
-        NavigationParameters parameters);
+        NavigationParameters parameters,
+        string? alias = null);
 
     /// <summary>
     /// RequestViewUnload
diff --git a/src/Lemon.ModuleNavigation/NavigationContext.cs b/src/Lemon.ModuleNavigation/NavigationContext.cs
@@ -21,12 +21,14 @@ internal NavigationContext(string viewName,
     internal NavigationContext(string viewName,
         string regionName,
         IServiceProvider serviceProvider,
-        NavigationParameters? navigationParameters)
+        NavigationParameters? navigationParameters,
+        string? alias)
     {
         ViewName = viewName;
         Parameters = navigationParameters;
         RegionName = regionName;
         ServiceProvider = serviceProvider;
+        Alias = alias;
     }
     public static ViewNameComparer ViewNameComparer => new();
     public static StrictComparer StrictComparer => new();
@@ -35,6 +37,11 @@ public string ViewName
         get; 
         private set; 
     }
+    public string? Alias
+    {
+        get;
+        private set;
+    }
     public NavigationParameters? Parameters 
     { 
         get; 
diff --git a/src/Lemon.ModuleNavigation/NavigationHandler.cs b/src/Lemon.ModuleNavigation/NavigationHandler.cs
@@ -33,15 +33,17 @@ public void OnNavigateTo(string moduleKey, NavigationParameters? parameters)
         _moduleManager.RequestNavigate(moduleKey, parameters);
     }
     public void OnNavigateTo(string regionName,
-         string viewName)
+         string viewName,
+         string? alias = null)
     {
-        RegionManager.RequestViewNavigate(regionName, viewName, null);
+        RegionManager.RequestViewNavigate(regionName, viewName, null, alias);
     }
     public void OnNavigateTo(string regionName,
         string viewName,
-        NavigationParameters navigationParameters)
+        NavigationParameters navigationParameters,
+        string? alias = null)
     {
-        RegionManager.RequestViewNavigate(regionName, viewName, navigationParameters);
+        RegionManager.RequestViewNavigate(regionName, viewName, navigationParameters, alias);
     }
 
     public void OnViewUnload(string regionName, string viewName)
diff --git a/src/Lemon.ModuleNavigation/NavigationService.cs b/src/Lemon.ModuleNavigation/NavigationService.cs
@@ -40,21 +40,23 @@ public void RequestModuleNavigate(string moduleName, NavigationParameters? param
         _bufferModuleName.Push((moduleName, parameters));
     }
     public void RequestViewNavigation(string regionName,
-       string viewName)
+       string viewName,
+       string? alias = null)
     {
         foreach (var handler in _viewHandlers)
         {
-            handler.OnNavigateTo(regionName, viewName);
+            handler.OnNavigateTo(regionName, viewName, alias);
         }
         _bufferViewName.Push((regionName, viewName, null));
     }
     public void RequestViewNavigation(string regionName,
         string viewName,
-        NavigationParameters parameters)
+        NavigationParameters parameters,
+        string? alias = null)
     {
         foreach (var handler in _viewHandlers)
         {
-            handler.OnNavigateTo(regionName, viewName, parameters);
+            handler.OnNavigateTo(regionName, viewName, parameters, alias);
         }
         _bufferViewName.Push((regionName, viewName, parameters));
     }
diff --git a/src/Lemon.ModuleNavigation/RegionManager.cs b/src/Lemon.ModuleNavigation/RegionManager.cs
@@ -41,9 +41,9 @@ public void RequestNavigate(string regionName, string viewName, bool requestNew,
                 });
         }
     }
-    public void RequestViewNavigate(string regionName, string viewName, NavigationParameters? parameters = null)
+    public void RequestViewNavigate(string regionName, string viewName, NavigationParameters? parameters = null, string? alias = null)
     {
-        var context = new NavigationContext(viewName, regionName, _serviceProvider, parameters);
+        var context = new NavigationContext(viewName, regionName, _serviceProvider, parameters, alias);
         if (_regions.TryGetValue(regionName, out var region))
         {
             region.Activate(context);

Original file line number	Diff line number	Diff line change
`@@ -33,15 +33,17 @@ public void OnNavigateTo(string moduleKey, NavigationParameters? parameters)`
`33`	`33`	`_moduleManager.RequestNavigate(moduleKey, parameters);`
`34`	`34`	`}`
`35`	`35`	`public void OnNavigateTo(string regionName,`
`36`		`- string viewName)`
	`36`	`+ string viewName,`
	`37`	`+ string? alias = null)`
`37`	`38`	`{`
`38`		`- RegionManager.RequestViewNavigate(regionName, viewName, null);`
	`39`	`+ RegionManager.RequestViewNavigate(regionName, viewName, null, alias);`
`39`	`40`	`}`
`40`	`41`	`public void OnNavigateTo(string regionName,`
`41`	`42`	`string viewName,`
`42`		`- NavigationParameters navigationParameters)`
	`43`	`+ NavigationParameters navigationParameters,`
	`44`	`+ string? alias = null)`
`43`	`45`	`{`
`44`		`- RegionManager.RequestViewNavigate(regionName, viewName, navigationParameters);`
	`46`	`+ RegionManager.RequestViewNavigate(regionName, viewName, navigationParameters, alias);`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`public void OnViewUnload(string regionName, string viewName)`
Original file line number	Diff line number	Diff line change
`@@ -40,21 +40,23 @@ public void RequestModuleNavigate(string moduleName, NavigationParameters? param`
`40`	`40`	`_bufferModuleName.Push((moduleName, parameters));`
`41`	`41`	`}`
`42`	`42`	`public void RequestViewNavigation(string regionName,`
`43`		`- string viewName)`
	`43`	`+ string viewName,`
	`44`	`+ string? alias = null)`
`44`	`45`	`{`
`45`	`46`	`foreach (var handler in _viewHandlers)`
`46`	`47`	`{`
`47`		`- handler.OnNavigateTo(regionName, viewName);`
	`48`	`+ handler.OnNavigateTo(regionName, viewName, alias);`
`48`	`49`	`}`
`49`	`50`	`_bufferViewName.Push((regionName, viewName, null));`
`50`	`51`	`}`
`51`	`52`	`public void RequestViewNavigation(string regionName,`
`52`	`53`	`string viewName,`
`53`		`- NavigationParameters parameters)`
	`54`	`+ NavigationParameters parameters,`
	`55`	`+ string? alias = null)`
`54`	`56`	`{`
`55`	`57`	`foreach (var handler in _viewHandlers)`
`56`	`58`	`{`
`57`		`- handler.OnNavigateTo(regionName, viewName, parameters);`
	`59`	`+ handler.OnNavigateTo(regionName, viewName, parameters, alias);`
`58`	`60`	`}`
`59`	`61`	`_bufferViewName.Push((regionName, viewName, parameters));`
`60`	`62`	`}`