redundant view&viewModel of module

NeverMorewd · Feb 9, 2025 · c95897a · c95897a
1 parent dd023d2
commit c95897a
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/Core/NavigationExtension.cs b/src/Lemon.ModuleNavigation.Avaloniaui/Core/NavigationExtension.cs
@@ -213,7 +213,7 @@ private static void SetBinding(Control control,
                     {
                         return null;
                     }
-                    return navigationHandler.ModuleManager.CreateView(m) as Control;
+                    return navigationHandler.ModuleManager.GetOrCreateView(m, regionName) as Control;
                 });
             }
             else if (control is ItemsControl itemsControl)
@@ -248,7 +248,7 @@ private static void SetBinding(Control control,
                     {
                         return null;
                     }
-                    return navigationHandler.ModuleManager.CreateView(m) as Control;
+                    return navigationHandler.ModuleManager.GetOrCreateView(m, regionName) as Control;
                 });
             }
             else if (control is ContentControl contentControl)

diff --git a/src/Lemon.ModuleNavigation.Sample/Views/MainView.axaml b/src/Lemon.ModuleNavigation.Sample/Views/MainView.axaml
@@ -61,7 +61,7 @@
                     <Border Classes="HSeparator" />
                     <ContentControl lm:NavigationExtension.ModuleContainerName="NContentControl" />
                 </StackPanel>
-                <!--<StackPanel Classes="ForContainerShow" Grid.Column="2">
+                <StackPanel Classes="ForContainerShow" Grid.Column="2">
                     <Label Content="TabControl" />
                     <Border Classes="HSeparator" />
                     <TabControl lm:NavigationExtension.ModuleContainerName="NTabControl">
@@ -93,7 +93,7 @@
                         Margin="2"
                         MaxHeight="600"
                         lm:NavigationExtension.ModuleContainerName="NListBox">
-                        --><!--  https://github.com/AvaloniaUI/Avalonia/issues/17349  --><!--
+                        <!--  https://github.com/AvaloniaUI/Avalonia/issues/17349  -->
                         <ListBox.ItemsPanel>
                             <ItemsPanelTemplate>
                                 <StackPanel />
@@ -105,7 +105,7 @@
                     <Label Content="TransitioningContentControl" />
                     <Border Classes="HSeparator" />
                     <TransitioningContentControl lm:NavigationExtension.ModuleContainerName="NTransitioningContentControl" />
-                </StackPanel>-->
+                </StackPanel>
             </Grid>
         </TabItem>
         <TabItem Header="View">

diff --git a/src/Lemon.ModuleNavigation/Abstracts/IModule.cs b/src/Lemon.ModuleNavigation/Abstracts/IModule.cs
@@ -39,6 +39,14 @@ public Type ViewModelType
         {
             get;
         }
+        public IView? View
+        {
+            get;
+        }
+        public IModuleNavigationAware? ViewModel
+        {
+            get;
+        }
         public void Initialize();
     }
 }
diff --git a/src/Lemon.ModuleNavigation/Core/ModuleManager.cs b/src/Lemon.ModuleNavigation/Core/ModuleManager.cs
@@ -10,7 +10,7 @@ namespace Lemon.ModuleNavigation.Core
     public class ModuleManager : IModuleManager, INotifyPropertyChanged
     {
         private readonly ConcurrentDictionary<string, IModule> _modulesCache;
-        private readonly ConcurrentDictionary<(string, string), IView> _regionCache;
+        private readonly ConcurrentDictionary<(string RegionName, string ModuleKey), IView> _regionCache;
         private readonly IServiceProvider _serviceProvider;
         private readonly IRegionManager _regionManager;
         public ModuleManager(IEnumerable<IModule> modules,
@@ -113,10 +113,30 @@ public IView GetOrCreateView(IModule module, string regionName)
             }
             else
             {
-                var view = CreateView(module);
+                IView view;
+                if (!IsRenderedOnAnyRegion(module.Key))
+                {
+                    view = module.View!;
+                }
+                else
+                {
+                    view = CreateView(module);
+                }
                 _regionCache.TryAdd((regionName, module.Key), view);
                 return view;
             }
         }
+
+        private bool IsRenderedOnAnyRegion(string moduleKey)
+        {
+            if (!_regionCache.IsEmpty)
+            {
+                foreach (var item in _regionCache)
+                {
+                    return (item.Key.ModuleKey == moduleKey);
+                }
+            }
+            return false;
+        }
     }
 }