完成编辑设备和删除设备

Views/DeviceDetailView.xaml

@@ -3,10 +3,13 @@
              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:PMSWPF.Views"
              mc:Ignorable="d"
-             d:DesignHeight="300" d:DesignWidth="300">
+             d:DesignHeight="300"
+             d:DesignWidth="300">
     <Grid>
-        <TextBlock Text="DeviceDetail" FontSize="40" HorizontalAlignment="Center" VerticalAlignment="Center" />
+        <TextBlock Text="DeviceDetail"
+                   FontSize="40"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Center" />
     </Grid>
-</UserControl>
+</UserControl>

Views/DevicesView.xaml

@@ -8,18 +8,26 @@
              xmlns:vm="clr-namespace:PMSWPF.ViewModels"
              d:DataContext="{d:DesignInstance vm:DevicesViewModel}"
              mc:Ignorable="d"
-             d:DesignHeight="300" d:DesignWidth="300">
+             d:DesignHeight="300"
+             d:DesignWidth="300">
     <UserControl.Resources>
         <DataTemplate x:Key="DeviceItemTemplate">
-            <Border Background="#eee" CornerRadius="10" Margin="3" Padding="10">
-                <ikw:SimpleStackPanel Spacing="10" Width="300" Height="200">
+            <Border Background="#eee"
+                    CornerRadius="10"
+                    Margin="3"
+                    Padding="10">
+                <ikw:SimpleStackPanel Spacing="10"
+                                      Width="300"
+                                      Height="200">
                     <DockPanel>
-                        <ui:ToggleSwitch
-                            DockPanel.Dock="Right"
-                            Margin="20 0 0 0 "
-                            IsOn="{Binding IsActive}"
-                            OffContent="停止" OnContent="启动" />
-                        <TextBlock FontSize="24" FontWeight="Bold" Text="{Binding Name }" />
+                        <ui:ToggleSwitch DockPanel.Dock="Right"
+                                         Margin="20 0 0 0 "
+                                         IsOn="{Binding IsActive}"
+                                         OffContent="停止"
+                                         OnContent="启动" />
+                        <TextBlock FontSize="24"
+                                   FontWeight="Bold"
+                                   Text="{Binding Name }" />
                     </DockPanel>
 
                     <TextBlock Text="{Binding Description }" />
@@ -38,22 +46,29 @@
     </UserControl.Resources>
 
     <StackPanel>
-
-        <ui:CommandBar x:Name="PrimaryCommandBar"
-                       DefaultLabelPosition="Right" IsOpen="False">
-            <ui:AppBarButton x:Name="AddButton"
-                             Command="{Binding AddDeviceCommand}"
-                             Label="Add">
+        <!-- 操作菜单栏 -->
+        <ui:CommandBar DefaultLabelPosition="Right"
+                       IsOpen="False">
+            <!-- 添加设备 -->
+            <ui:AppBarButton Command="{Binding AddDeviceCommand}"
+                             Label="添加设备">
                 <ui:AppBarButton.Icon>
                     <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Add}" />
                 </ui:AppBarButton.Icon>
             </ui:AppBarButton>
-            <ui:AppBarButton x:Name="EditButton"
-                             Label="Edit">
+            <!-- 编辑设备 -->
+            <ui:AppBarButton Command="{Binding EditDeviceCommand}"
+                             Label="编辑设备">
                 <ui:AppBarButton.Icon>
                     <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Edit}" />
                 </ui:AppBarButton.Icon>
-
+            </ui:AppBarButton>
+            <!-- 编辑设备 -->
+            <ui:AppBarButton Command="{Binding DeleteDeviceCommand}"
+                             Label="删除设备">
+                <ui:AppBarButton.Icon>
+                    <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Delete}" />
+                </ui:AppBarButton.Icon>
             </ui:AppBarButton>
             <ui:AppBarButton x:Name="ShareButton"
                              Label="Share">
@@ -63,8 +78,8 @@
             </ui:AppBarButton>
             <ui:CommandBar.SecondaryCommands>
                 <ui:AppBarButton x:Name="SettingsButton"
-
-                                 Icon="Setting" Label="Settings" />
+                                 Icon="Setting"
+                                 Label="Settings" />
             </ui:CommandBar.SecondaryCommands>
         </ui:CommandBar>
 
@@ -72,7 +87,7 @@
         <ui:GridView x:Name="BasicGridView"
                      Margin="20"
                      IsItemClickEnabled="True"
-                     ItemClick="BasicGridView_ItemClick"
+                     SelectedItem="{Binding SelectedDevice }"
                      ItemsSource="{Binding Devices}"
                      ItemTemplate="{StaticResource DeviceItemTemplate}"
                      SelectionMode="Single" />

Views/DevicesView.xaml.cs

@@ -1,8 +1,6 @@
-using System.Windows;
-using System.Windows.Controls;
+using System.Windows.Controls;
 using iNKORE.UI.WPF.Modern.Controls;
 using Microsoft.Extensions.DependencyInjection;
-using PMSWPF.Services;
 using PMSWPF.ViewModels;
 
 namespace PMSWPF.Views;
@@ -14,9 +12,6 @@ public partial class DevicesView : UserControl
         InitializeComponent();
         DataContext=App.Current.Services.GetRequiredService<DevicesViewModel>();
     }
-
-    private void BasicGridView_ItemClick(object sender, ItemClickEventArgs e)
-    {
-    }
+    
 
 }

Views/Dialogs/ConfirmDialog.xaml

@@ -0,0 +1,38 @@
+<ui:ContentDialog x:Class="PMSWPF.Views.Dialogs.ConfirmDialog"
+                  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:ikw="http://schemas.inkore.net/lib/ui/wpf"
+                  xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+                  xmlns:vmd="clr-namespace:PMSWPF.ViewModels.Dialogs"
+                  xmlns:vc="clr-namespace:PMSWPF.ValueConverts"
+                  xmlns:ex="clr-namespace:PMSWPF.Extensions"
+                  xmlns:en="clr-namespace:PMSWPF.Enums"
+                  Title="{Binding Title}"
+                  CloseButtonText="取消"
+                  DefaultButton="Primary"
+                  PrimaryButtonText="{Binding PrimaryButtonText}"
+                  Background="#fff"
+                  d:DataContext="{d:DesignInstance vmd:ConfrimDialogViewModel}"
+                  mc:Ignorable="d">
+    <ui:ContentDialog.Resources>
+        <ex:EnumBindingSource x:Key="deviceType"
+                              EnumType="{x:Type en:DeviceType}" />
+        <ex:EnumBindingSource x:Key="protocolType"
+                              EnumType="{x:Type en:ProtocolType}" />
+        <vc:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
+
+
+    </ui:ContentDialog.Resources>
+
+    <Grid Width="480"
+          Margin="10">
+        <TextBlock Margin="20"
+                   FontSize="18"
+                   FontWeight="Bold"
+                   Text="{Binding Message}">
+        </TextBlock>
+    </Grid>
+
+</ui:ContentDialog>

Views/Dialogs/ConfirmDialog.xaml.cs

@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+using iNKORE.UI.WPF.Modern.Controls;
+using PMSWPF.ViewModels.Dialogs;
+
+namespace PMSWPF.Views.Dialogs;
+
+public partial class ConfirmDialog : ContentDialog
+{
+    
+    public ConfirmDialog(ConfrimDialogViewModel viewModel)
+    {
+        InitializeComponent();
+        this.DataContext = viewModel;
+    }
+}

Views/Dialogs/DeviceDialog.xaml

@@ -1,49 +1,57 @@
-<ui:ContentDialog
-    x:Class="PMSWPF.Views.Dialogs.DeviceDialog"
-    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:ikw="http://schemas.inkore.net/lib/ui/wpf"
-    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
-    xmlns:vmd="clr-namespace:PMSWPF.ViewModels.Dialogs"
-    xmlns:vc="clr-namespace:PMSWPF.ValueConverts"
-    xmlns:ex="clr-namespace:PMSWPF.Extensions"
-    xmlns:en="clr-namespace:PMSWPF.Enums"
-    Title="{Binding Title}"
-    CloseButtonText="取消"
-    DefaultButton="Primary"
-    PrimaryButtonText="添加设备"
-    Background="#fff"
-    d:DataContext="{d:DesignInstance vmd:DeviceDialogViewModel}"
-    mc:Ignorable="d">
+<ui:ContentDialog x:Class="PMSWPF.Views.Dialogs.DeviceDialog"
+                  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:ikw="http://schemas.inkore.net/lib/ui/wpf"
+                  xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+                  xmlns:vmd="clr-namespace:PMSWPF.ViewModels.Dialogs"
+                  xmlns:vc="clr-namespace:PMSWPF.ValueConverts"
+                  xmlns:ex="clr-namespace:PMSWPF.Extensions"
+                  xmlns:en="clr-namespace:PMSWPF.Enums"
+                  Title="{Binding Title}"
+                  CloseButtonText="取消"
+                  DefaultButton="Primary"
+                  PrimaryButtonText="{Binding PrimaryButContent}"
+                  Background="#fff"
+                  d:DataContext="{d:DesignInstance vmd:DeviceDialogViewModel}"
+                  mc:Ignorable="d">
     <ui:ContentDialog.Resources>
-        <ex:EnumBindingSource x:Key="deviceType" EnumType="{x:Type en:DeviceType}" />
-        <ex:EnumBindingSource x:Key="protocolType" EnumType="{x:Type en:ProtocolType}" />
+        <ex:EnumBindingSource x:Key="deviceType"
+                              EnumType="{x:Type en:DeviceType}" />
+        <ex:EnumBindingSource x:Key="protocolType"
+                              EnumType="{x:Type en:ProtocolType}" />
         <vc:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
-        
-        
+
+
     </ui:ContentDialog.Resources>
-    
-    <Grid Width="480"  Margin="10" >
+
+    <Grid Width="480"
+          Margin="10">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*" />
+            <ColumnDefinition Width="1*" />
         </Grid.ColumnDefinitions>
         <!-- 左边列 -->
-        <ikw:SimpleStackPanel  Grid.Column="0" Margin="10 10 20 10 "  Spacing="12">
+        <ikw:SimpleStackPanel Grid.Column="0"
+                              Margin="10 10 20 10 "
+                              Spacing="12">
             <!-- 设备名称 -->
-            <TextBlock  Text="设备名称" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" />
-            <TextBox 
-                Text="{Binding Device.Name, UpdateSourceTrigger=PropertyChanged}" />
+            <TextBlock Text="设备名称"
+                       HorizontalAlignment="Left"
+                       Style="{StaticResource TextBlockSubTitle}" />
+            <TextBox Text="{Binding Device.Name, UpdateSourceTrigger=PropertyChanged}" />
             <!-- 设备IP地址 -->
-            <TextBlock Text="设备IP地址" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" />
-            <TextBox
-                AcceptsReturn="True"
-                Text="{Binding Device.Ip, UpdateSourceTrigger=PropertyChanged}" />
+            <TextBlock Text="设备IP地址"
+                       HorizontalAlignment="Left"
+                       Style="{StaticResource TextBlockSubTitle}" />
+            <TextBox AcceptsReturn="True"
+                     Text="{Binding Device.Ip, UpdateSourceTrigger=PropertyChanged}" />
 
             <!-- 设备类型 -->
-            <TextBlock Text="设备类型" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" />
+            <TextBlock Text="设备类型"
+                       HorizontalAlignment="Left"
+                       Style="{StaticResource TextBlockSubTitle}" />
             <ComboBox SelectedItem="{Binding Device.DeviceType}"
                       ItemsSource="{Binding Source={StaticResource deviceType} }">
                 <ComboBox.ItemTemplate>
@@ -54,7 +62,9 @@
             </ComboBox>
 
             <!-- 通讯协议-->
-            <TextBlock Text="设备通信协议" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" />
+            <TextBlock Text="设备通信协议"
+                       HorizontalAlignment="Left"
+                       Style="{StaticResource TextBlockSubTitle}" />
             <ComboBox SelectedItem="{Binding Device.ProtocolType}"
                       ItemsSource="{Binding Source={StaticResource protocolType} }">
                 <ComboBox.ItemTemplate>
@@ -63,26 +73,31 @@
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
             </ComboBox>
-          
-        
+
+
         </ikw:SimpleStackPanel>
         <!-- 右边列 -->
-         <ikw:SimpleStackPanel Margin="10" Grid.Column="1"  Spacing="12">
-         
-            <!-- 设备描述 -->
-            <TextBlock Text="设备描述" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" />
-            <TextBox
-                Text="{Binding Device.Description, UpdateSourceTrigger=PropertyChanged}" />
-            <!-- 设备IP地址 -->
-            <TextBlock Text="设备端口" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" />
-            <TextBox
-                AcceptsReturn="True"
-                Text="{Binding Device.Ip, UpdateSourceTrigger=PropertyChanged}" />
+        <ikw:SimpleStackPanel Margin="10"
+                              Grid.Column="1"
+                              Spacing="12">
+
+            <!-- 设备描述 -->
+            <TextBlock Text="设备描述"
+                       HorizontalAlignment="Left"
+                       Style="{StaticResource TextBlockSubTitle}" />
+            <TextBox Text="{Binding Device.Description, UpdateSourceTrigger=PropertyChanged}" />
+            <!-- 设备IP地址 -->
+            <TextBlock Text="设备端口"
+                       HorizontalAlignment="Left"
+                       Style="{StaticResource TextBlockSubTitle}" />
+            <TextBox AcceptsReturn="True"
+                     Text="{Binding Device.Ip, UpdateSourceTrigger=PropertyChanged}" />
 
-           
 
             <!-- 通讯协议-->
-            <TextBlock Text="设备通信协议" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" />
+            <TextBlock Text="设备通信协议"
+                       HorizontalAlignment="Left"
+                       Style="{StaticResource TextBlockSubTitle}" />
             <ComboBox SelectedItem="{Binding Device.ProtocolType}"
                       ItemsSource="{Binding Source={StaticResource protocolType} }">
                 <ComboBox.ItemTemplate>
@@ -93,9 +108,12 @@
             </ComboBox>
             <!-- 通讯协议-->
 
-            <CheckBox FontSize="16" Content="是否启用" Margin="0 30 0 0" IsChecked="{Binding Device.IsActive}" />
-        
+            <CheckBox FontSize="16"
+                      Content="是否启用"
+                      Margin="0 30 0 0"
+                      IsChecked="{Binding Device.IsActive}" />
+
         </ikw:SimpleStackPanel>
     </Grid>
-    
+
 </ui:ContentDialog>

Views/Dialogs/DeviceDialog.xaml.cs

@@ -7,10 +7,10 @@ namespace PMSWPF.Views.Dialogs;
 
 public partial class DeviceDialog
 {
-    public DeviceDialog(Device device)
+    public DeviceDialog(DeviceDialogViewModel viewModel)
     {
         InitializeComponent();
-        DataContext = new DeviceDialogViewModel(device);
+        DataContext = viewModel;
     }
 
     private void OnPrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)

Views/MainView.xaml

@@ -1,25 +1,28 @@
-<Window
-    x:Class="PMSWPF.Views.MainView"
-    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:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
-    xmlns:local="clr-namespace:PMSWPF.Views"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:vm="clr-namespace:PMSWPF.ViewModels"
-    xmlns:mo="clr-namespace:PMSWPF.Models"
-    xmlns:hc="https://handyorg.github.io/handycontrol"
-    Title="设备管理系统"
-    Width="1080"
-    Height="800"
-   Loaded="MainView_OnLoaded"
-    ui:WindowHelper.UseModernWindowStyle="True"
-    ui:WindowHelper.SystemBackdropType="Mica"
-    d:DataContext="{d:DesignInstance vm:MainViewModel}"
-    mc:Ignorable="d">
+<Window x:Class="PMSWPF.Views.MainView"
+        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:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+        xmlns:local="clr-namespace:PMSWPF.Views"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:vm="clr-namespace:PMSWPF.ViewModels"
+        xmlns:mo="clr-namespace:PMSWPF.Models"
+        xmlns:hc="https://handyorg.github.io/handycontrol"
+        Title="设备管理系统"
+        Width="1080"
+        Height="800"
+        WindowStartupLocation="CenterScreen"
+        WindowState="Maximized"
+        Loaded="MainView_OnLoaded"
+        ui:WindowHelper.UseModernWindowStyle="True"
+        ui:WindowHelper.SystemBackdropType="Mica"
+        d:DataContext="{d:DesignInstance vm:MainViewModel}"
+        mc:Ignorable="d">
     <Window.Resources>
-        <DataTemplate x:Key="NavigationViewMenuItem" DataType="{x:Type mo:MenuBean}">
-            <ui:NavigationViewItem   Content="{Binding Name}" MenuItemsSource="{Binding Items }">
+        <DataTemplate x:Key="NavigationViewMenuItem"
+                      DataType="{x:Type mo:MenuBean}">
+            <ui:NavigationViewItem Content="{Binding Name}"
+                                   MenuItemsSource="{Binding Items }">
                 <ui:NavigationViewItem.Icon>
                     <ui:FontIcon Glyph="{Binding Icon}" />
                 </ui:NavigationViewItem.Icon>
@@ -27,21 +30,18 @@
         </DataTemplate>
     </Window.Resources>
     <Grid>
-        <ui:NavigationView
-
-            ExpandedModeThresholdWidth="500"
-            IsTabStop="False"
-            PaneDisplayMode="Left"
-            PaneTitle="设备管理系统"
-            IsSettingsVisible="False"
-            AlwaysShowHeader="True"
-            IsBackButtonVisible="Collapsed"
-            IsBackEnabled="False"
-            SelectionFollowsFocus="Disabled"
-            MenuItemsSource="{Binding Menus}"
-            MenuItemTemplate="{StaticResource NavigationViewMenuItem}"
-            SelectionChanged="NavigationView_SelectionChanged"
-            >
+        <ui:NavigationView ExpandedModeThresholdWidth="500"
+                           IsTabStop="False"
+                           PaneDisplayMode="Left"
+                           PaneTitle="设备管理系统"
+                           IsSettingsVisible="False"
+                           AlwaysShowHeader="True"
+                           IsBackButtonVisible="Collapsed"
+                           IsBackEnabled="False"
+                           SelectionFollowsFocus="Disabled"
+                           MenuItemsSource="{Binding Menus}"
+                           MenuItemTemplate="{StaticResource NavigationViewMenuItem}"
+                           SelectionChanged="NavigationView_SelectionChanged">
 
             <ui:NavigationView.AutoSuggestBox>
                 <ui:AutoSuggestBox AutomationProperties.Name="Search">
@@ -83,8 +83,11 @@
                     </ContentControl.Resources>
                 </ContentControl>
 
-                <ScrollViewer VerticalScrollBarVisibility="Hidden" HorizontalAlignment="Right">
-                    <StackPanel hc:Growl.GrowlParent="True" VerticalAlignment="Top" Margin="0,10,10,10" />
+                <ScrollViewer VerticalScrollBarVisibility="Hidden"
+                              HorizontalAlignment="Right">
+                    <StackPanel hc:Growl.GrowlParent="True"
+                                VerticalAlignment="Top"
+                                Margin="0,10,10,10" />
                 </ScrollViewer>
             </Grid>
 

Views/MainView.xaml.cs

@@ -1,12 +1,8 @@
 using System.Windows;
-using System.Windows.Controls;
-using CommunityToolkit.Mvvm.Messaging;
 using iNKORE.UI.WPF.Modern.Controls;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using PMSWPF.Enums;
 using PMSWPF.Helper;
-using PMSWPF.Message;
 using PMSWPF.Models;
 using PMSWPF.ViewModels;
 

Views/VariableTableView.xaml

@@ -70,9 +70,7 @@
 
         </ikw:SimpleStackPanel>
 
-        <DataGrid Margin="10" >
-
-        </DataGrid>
+        <DataGrid Margin="10" />
        </DockPanel>
 
 </UserControl>