A:规划文件分布

src/NetVizor.Backend/Shell/App.xaml

@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:NetVizor"
              xmlns:converters="clr-namespace:NetVizor.Views.Converters"
-             StartupUri="MainWindow.xaml">
+             StartupUri="/Views/NetView.xaml">
     <Application.Resources>
         <ResourceDictionary>
             <converters:NullToCollapsedConverter x:Key="NullToCollapsedConverter" />
@@ -19,4 +19,4 @@
 
         </ResourceDictionary>
     </Application.Resources>
-</Application>
+</Application>

src/NetVizor.Backend/Shell/MainWindow.xaml

@@ -1,20 +0,0 @@
-<Window x:Class="Shell.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:NetVizor"
-        xmlns:views1="clr-namespace:Shell.Views"
-        mc:Ignorable="d"
-        Title="NetVizor Dashboard" Height="700" Width="1300">
-    <Grid>
-        <TabControl>
-            <TabItem Header="Network Monitor">
-                <views1:NetworkMonitorView />
-            </TabItem>
-            <TabItem Header="Web Panel">
-                <views1:WebPanel />
-            </TabItem>
-        </TabControl>
-    </Grid>
-</Window>

src/NetVizor.Backend/Shell/Shell.csproj

@@ -45,4 +45,32 @@
       </None>
     </ItemGroup>
 
+    <ItemGroup>
+      <Page Update="UserControls\NetworkMonitorView.xaml">
+        <Generator>MSBuild:Compile</Generator>
+        <XamlRuntime>Wpf</XamlRuntime>
+        <SubType>Designer</SubType>
+      </Page>
+      <Page Update="UserControls\TaskbarWindow.xaml">
+        <Generator>MSBuild:Compile</Generator>
+        <XamlRuntime>Wpf</XamlRuntime>
+        <SubType>Designer</SubType>
+      </Page>
+      <Page Update="UserControls\WebPanel.xaml">
+        <Generator>MSBuild:Compile</Generator>
+        <XamlRuntime>Wpf</XamlRuntime>
+        <SubType>Designer</SubType>
+      </Page>
+      <Page Update="Views\MainWindow.xaml">
+        <Generator>MSBuild:Compile</Generator>
+        <XamlRuntime>Wpf</XamlRuntime>
+        <SubType>Designer</SubType>
+      </Page>
+      <Page Update="Views\NetView.xaml">
+        <Generator>MSBuild:Compile</Generator>
+        <XamlRuntime>Wpf</XamlRuntime>
+        <SubType>Designer</SubType>
+      </Page>
+    </ItemGroup>
+
 </Project>

src/NetVizor.Backend/Shell/UserControls/NetworkMonitorView.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="Shell.Views.NetworkMonitorView"
+<UserControl x:Class="Shell.UserControls.NetworkMonitorView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -168,4 +168,4 @@
         </Border>
     </Grid>
 
-</UserControl>
+</UserControl>

src/NetVizor.Backend/Shell/UserControls/NetworkMonitorView.xaml.cs

@@ -1,18 +1,10 @@
-using System.Windows.Controls;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Threading;
 using Common.Logger;
 using Common.Utils;
 
-namespace Shell.Views
+namespace Shell.UserControls
 {
     /// <summary>
     /// Interaction logic for NetworkMonitorView.xaml
@@ -209,4 +201,4 @@ namespace Shell.Views
             txtStatus.Text = "接口列表已刷新";
         }
     }
-}
+}

src/NetVizor.Backend/Shell/UserControls/TaskbarWindow.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="Shell.Views.TaskbarWindow"
+<Window x:Class="Shell.UserControls.TaskbarWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     WindowStyle="None"

src/NetVizor.Backend/Shell/UserControls/TaskbarWindow.xaml.cs

@@ -1,8 +1,7 @@
-using System.Runtime.InteropServices;
 using System.Windows;
 using Shell.Utils;
 
-namespace Shell.Views;
+namespace Shell.UserControls;
 
 public partial class TaskbarWindow : Window
 {

src/NetVizor.Backend/Shell/UserControls/WebPanel.xaml

@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Shell.Views.WebPanel"
+    x:Class="Shell.UserControls.WebPanel"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

src/NetVizor.Backend/Shell/UserControls/WebPanel.xaml.cs

@@ -1,19 +1,13 @@
-using System.Windows.Controls;
-using System.Text.Json;
-using System.Text.Json.Serialization;
 using System.Windows;
+using System.Windows.Controls;
 using Application.Utils;
 using Common;
 using Common.Logger;
-using Common.Net;
 using Common.Net.WebSocketConn;
 using Common.Utils;
 using Infrastructure.utils;
-using Utils.ETW;
-using Utils.ETW.Core;
-using Utils.ETW.Etw;
 
-namespace Shell.Views;
+namespace Shell.UserControls;
 
 public partial class WebPanel : UserControl
 {
@@ -181,4 +175,4 @@ public class JsData
     {
         return $"Title:{Title}, Content:{Content}";
     }
-}
+}

src/NetVizor.Backend/Shell/Views/MainWindow.xaml

@@ -0,0 +1,17 @@
+<Window
+    x:Class="Shell.Views.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:local="clr-namespace:NetVizor"
+    xmlns:views1="clr-namespace:Shell.Views"
+    xmlns:userControls="clr-namespace:Shell.UserControls"
+    mc:Ignorable="d"
+    Title="NetVizor Dashboard"
+    Height="700"
+    Width="1300">
+    <Grid>
+        <userControls:WebPanel />
+    </Grid>
+</Window>

src/NetVizor.Backend/Shell/Views/MainWindow.xaml.cs

@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace Shell;
+namespace Shell.Views;
 
 /// <summary>
 /// Interaction logic for MainWindow.xaml
@@ -12,4 +12,4 @@ public partial class MainWindow : Window
         InitializeComponent();
         Console.WriteLine("1211111111111111111111111111。");
     }
-}
+}

src/NetVizor.Backend/Shell/Views/NetView.xaml

@@ -0,0 +1,16 @@
+<Window
+    x:Class="Shell.Views.NetView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:Shell"
+    xmlns:userControls="clr-namespace:Shell.UserControls"
+    mc:Ignorable="d"
+    Title="NetView"
+    Height="450"
+    Width="800">
+    <Grid>
+        <userControls:NetworkMonitorView />
+    </Grid>
+</Window>

src/NetVizor.Backend/Shell/Views/NetView.xaml.cs

@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Shell.Views;
+
+public partial class NetView : Window
+{
+    public NetView()
+    {
+        InitializeComponent();
+    }
+}