重构了添加设备对话框的布局

DMS.WPF/DMS.WPF.csproj

@@ -139,11 +139,6 @@
       <XamlRuntime>Wpf</XamlRuntime>
       <SubType>Designer</SubType>
     </Page>
-    <Page Update="Views\HandyDialogs\VariableEditorDialog.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <XamlRuntime>Wpf</XamlRuntime>
-      <SubType>Designer</SubType>
-    </Page>
   </ItemGroup>
 
   <ItemGroup>

DMS.WPF/Helper/MenuHelper.cs

@@ -17,5 +17,6 @@ public class MenuHelper
         //         MenuAddParent(menuItem);
         //     }
         // }
+
     }
 }

DMS.WPF/Services/DialogService.cs

@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Windows;
 using DMS.WPF.Views;
-using DMS.WPF.Views.HandyDialogs;
 using iNKORE.UI.WPF.Modern.Controls;
 
 namespace DMS.WPF.Services
@@ -16,7 +15,7 @@ namespace DMS.WPF.Services
         private static readonly Dictionary<Type, Type> _viewModelViewMap = new Dictionary<Type, Type>
         {
             { typeof(DeviceDialogViewModel), typeof(DeviceDialog) },
-            { typeof(ConfrimDialogViewModel), typeof(ConfirmDialog) },
+            { typeof(ConfirmDialogViewModel), typeof(ConfirmDialog) },
             { typeof(VariableTableDialogViewModel), typeof(VariableTableDialog) },
             { typeof(ImportExcelDialogViewModel), typeof(ImportExcelDialog) },
             { typeof(VariableDialogViewModel), typeof(VariableDialog) },

DMS.WPF/ViewModels/DeviceDetailViewModel.cs

@@ -126,7 +126,7 @@ public partial class DeviceDetailViewModel : ViewModelBase, INavigatable
             }
 
             string message = $"确认要删除变量表名为:{SelectedVariableTable.Name} \n\n此操作将同时删除该变量表下的所有变量数据，且无法恢复！";
-            ConfrimDialogViewModel viewModel = new ConfrimDialogViewModel("删除变量表",message,"删除");
+            ConfirmDialogViewModel viewModel = new ConfirmDialogViewModel("删除变量表",message,"删除");
             var res = await _dialogService.ShowDialogAsync(viewModel);
             if (res)
             {

DMS.WPF/ViewModels/DevicesViewModel.cs

@@ -85,12 +85,12 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
     {
         try
         {
-            DeviceDialogViewModel deviceDialogViewModel = new DeviceDialogViewModel()
-                                                          {
-                                                              PrimaryButText = "添加设备"
-                                                          };
             // 1. 显示添加设备对话框
-            DeviceItemViewModel device = await _dialogService.ShowDialogAsync(deviceDialogViewModel);
+            DeviceItemViewModel device = await _dialogService.ShowDialogAsync(new DeviceDialogViewModel()
+            {
+                Title = "添加设备",
+                PrimaryButText = "添加设备"
+            });
             // 如果用户取消或对话框未返回设备，则直接返回
             if (device == null)
             {
@@ -156,7 +156,7 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
             }
 
 
-            if (await _dialogService.ShowDialogAsync(new ConfrimDialogViewModel("删除设备",$"确认要删除设备名为:{SelectedDevice.Name}","删除设备")))
+            if (await _dialogService.ShowDialogAsync(new ConfirmDialogViewModel("删除设备",$"确认要删除设备名为:{SelectedDevice.Name}","删除设备")))
             {
                 var isDel = await _deviceAppService.DeleteDeviceByIdAsync(SelectedDevice.Id);
                 if (isDel)

DMS.WPF/ViewModels/Dialogs/ConfirmDialogViewModel.cs

@@ -3,13 +3,13 @@ using CommunityToolkit.Mvvm.Input;
 
 namespace DMS.WPF.ViewModels.Dialogs;
 
-public partial class ConfrimDialogViewModel : DialogViewModelBase<Boolean>
+public partial class ConfirmDialogViewModel : DialogViewModelBase<Boolean>
 {
     
     [ObservableProperty]
     private string _message;
 
-    public ConfrimDialogViewModel(string title,string message,string primaryButText)
+    public ConfirmDialogViewModel(string title,string message,string primaryButText)
     {
         Message = message;
         Title = title;

DMS.WPF/ViewModels/Items/DeviceItemViewModel.cs

@@ -27,10 +27,10 @@ public partial class DeviceItemViewModel : ObservableObject
     private string _ipAddress;
 
     [ObservableProperty]
-    private int _port;
+    private int _port=102;
 
     [ObservableProperty]
-    private int _rack;
+    private int _rack=1;
 
     [ObservableProperty]
     private int _slot;
@@ -45,7 +45,7 @@ public partial class DeviceItemViewModel : ObservableObject
     private string _opcUaServerUrl;
 
     [ObservableProperty]
-    private bool _isActive;
+    private bool _isActive =true;
 
     [ObservableProperty]
     private bool _isRunning;
@@ -54,7 +54,7 @@ public partial class DeviceItemViewModel : ObservableObject
     private string _status;
     
     [ObservableProperty]
-    private bool _isAddDefVarTable;
+    private bool _isAddDefVarTable=true;
 
     partial void OnIpAddressChanged(string newIpAddress)
     {

DMS.WPF/ViewModels/VariableTableViewModel.cs

@@ -16,7 +16,6 @@ using DMS.Application.Interfaces;
 using DMS.Application.Services;
 using DMS.Helper;
 using DMS.WPF.Views;
-using DMS.WPF.Views.HandyDialogs;
 using HandyControl.Controls;
 using HandyControl.Data;
 using HandyControl.Tools.Extension;
@@ -314,7 +313,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
                 // // 拼接要删除的变量名称，用于确认提示
                 var existNames = string.Join("、", existList.Select(v => v.Name));
                 var confrimDialogViewModel
-                    = new ConfrimDialogViewModel("存在已经添加的变量", $"变量名称:{existNames}，已经存在，是否跳过继续添加其他的变量。取消则不添加任何变量", "继续");
+                    = new ConfirmDialogViewModel("存在已经添加的变量", $"变量名称:{existNames}，已经存在，是否跳过继续添加其他的变量。取消则不添加任何变量", "继续");
                 var res = await _dialogService.ShowDialogAsync(confrimDialogViewModel);
                 if (!res) return;
                 // 从导入列表中删除已经存在的变量

DMS.WPF/Views/Dialogs/ConfirmDialog.xaml

@@ -1,38 +1,28 @@
-<ui:ContentDialog x:Class="DMS.WPF.Views.Dialogs.ConfirmDialog"
+<ui:ContentDialog
+    x:Class="DMS.WPF.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:DMS.WPF.ViewModels.Dialogs"
-                  xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-                  xmlns:ex="clr-namespace:DMS.Extensions"
-                  xmlns:en="clr-namespace:DMS.Core.Enums"
     Title="{Binding Title}"
+    d:DataContext="{d:DesignInstance vmd:ConfirmDialogViewModel}"
+    Background="#fff"
+    CloseButtonCommand="{Binding CancleButtonCommand}"
     CloseButtonText="取消"
     DefaultButton="Primary"
+    PrimaryButtonCommand="{Binding PrimaryButtonCommand}"
     PrimaryButtonText="{Binding PrimaryButText}"
-                  Background="#fff"
-                  d:DataContext="{d:DesignInstance vmd:ConfrimDialogViewModel}"
     mc:Ignorable="d">
-    <i:Interaction.Triggers>
-        <i:EventTrigger EventName="PrimaryButtonClick">
-            <i:InvokeCommandAction Command="{Binding PrimaryButtonCommand}" />
-        </i:EventTrigger>
-        <i:EventTrigger EventName="CloseButtonClick">
-            <i:InvokeCommandAction Command="{Binding CancleButtonCommand}" />
-        </i:EventTrigger>
-    </i:Interaction.Triggers>
 
-    <Grid Width="360"
+    <Grid Width="360" Margin="10">
-          Margin="10">
+        <TextBlock
-        <TextBlock Margin="20"
+            Margin="20"
             FontSize="14"
-                   TextWrapping="Wrap"
             FontWeight="Bold"
-                   Text="{Binding Message}">
+            Text="{Binding Message}"
-        </TextBlock>
+            TextWrapping="Wrap" />
     </Grid>
 
 </ui:ContentDialog>

DMS.WPF/Views/Dialogs/DeviceDialog.xaml

@@ -1,23 +1,23 @@
-<ui:ContentDialog x:Class="DMS.WPF.Views.Dialogs.DeviceDialog"
+<ui:ContentDialog
+    x:Class="DMS.WPF.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:enums="clr-namespace:DMS.Core.Enums;assembly=DMS.Core"
+    xmlns:ex="clr-namespace:DMS.Extensions"
+    xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
-                  xmlns:hc="https://handyorg.github.io/handycontrol"
-                  xmlns:vmd="clr-namespace:DMS.WPF.ViewModels.Dialogs"
-                  xmlns:ex="clr-namespace:DMS.Extensions"
-                  xmlns:enums="clr-namespace:DMS.Core.Enums;assembly=DMS.Core"
     xmlns:vc="clr-namespace:DMS.WPF.ValueConverts"
+    xmlns:vmd="clr-namespace:DMS.WPF.ViewModels.Dialogs"
     Title="{Binding Title}"
+    d:DataContext="{d:DesignInstance vmd:DeviceDialogViewModel}"
+    CloseButtonCommand="{Binding CancleButtonCommand}"
     CloseButtonText="取消"
     DefaultButton="Primary"
-                  PrimaryButtonText="{Binding PrimaryButText}"
     PrimaryButtonCommand="{Binding PrimaryButtonCommand}"
-                  CloseButtonCommand="{Binding CancleButtonCommand}"
+    PrimaryButtonText="{Binding PrimaryButText}"
-                  d:DataContext="{d:DesignInstance vmd:DeviceDialogViewModel}"
+    mc:Ignorable="d">
-                  mc:Ignorable="d"
-                  >
 
     <ui:ContentDialog.Resources>
         <ex:EnumBindingSource x:Key="DeviceType" EnumType="{x:Type enums:DeviceType}" />
@@ -26,42 +26,61 @@
         <vc:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
         <vc:EnumToStringConverter x:Key="EnumToStringConverter" />
 
-        <!-- 统一定义输入控件的下边距 -->
+        <Style x:Key="LabelStyle" TargetType="TextBlock">
-        <Style TargetType="hc:TextBox" BasedOn="{StaticResource {x:Type hc:TextBox}}">
+            <Setter Property="VerticalAlignment" Value="Center" />
-            <Setter Property="Margin" Value="0,0,0,15"/>
+            <Setter Property="HorizontalAlignment" Value="Right" />
-        </Style>
+            <Setter Property="Margin" Value="0,0,10,0" />
-        <Style TargetType="hc:ComboBox" BasedOn="{StaticResource {x:Type hc:ComboBox}}">
-            <Setter Property="Margin" Value="0,0,0,15"/>
-        </Style>
-        <Style TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
-            <Setter Property="Margin" Value="0,10,0,0"/>
-        </Style>
-        <Style x:Key="ConditionalPanelStyle" TargetType="Border">
-            <Setter Property="Padding" Value="10"/>
-            <Setter Property="Margin" Value="0,0,0,15"/>
-            <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="CornerRadius" Value="4"/>
-            <Setter Property="Visibility" Value="Collapsed"/>
         </Style>
     </ui:ContentDialog.Resources>
 
-    <Grid Margin="10">
+    <StackPanel Margin="16">
+        <!--  主设置项  -->
+        <Grid>
             <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="20" />
+                <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
 
-        <!-- 左边列 -->
+            <!--  Row 0  -->
-        <StackPanel Grid.Column="0" MinWidth="220" Margin="0,0,10,0">
+            <hc:TextBox
-            <hc:TextBox hc:InfoElement.Title="设备名称"
+                Grid.Row="0"
+                Grid.Column="0"
+                hc:InfoElement.Title="设备名称:"
                 Text="{Binding Device.Name, UpdateSourceTrigger=PropertyChanged}" />
 
-            <hc:TextBox hc:InfoElement.Title="设备IP地址"
+            <hc:TextBox
+                Grid.Row="0"
+                Grid.Column="2"
+                hc:InfoElement.Title="设备描述:"
+                Text="{Binding Device.Description, UpdateSourceTrigger=PropertyChanged}" />
+
+            <!--  Row 1  -->
+            <hc:TextBox
+                Grid.Row="1"
+                Grid.Column="0"
+                Margin="0,15,0,0"
+                hc:InfoElement.Title="IP 地址:"
                 Text="{Binding Device.IpAddress, UpdateSourceTrigger=PropertyChanged}" />
 
-            <hc:ComboBox hc:InfoElement.Title="设备类型"
+            <hc:TextBox
+                Grid.Row="1"
+                Grid.Column="2"
+                Margin="0,15,0,0"
+                hc:InfoElement.Title="端口:"
+                Text="{Binding Device.Port, UpdateSourceTrigger=PropertyChanged}" />
+
+            <hc:ComboBox
+                Grid.Row="2"
+                Grid.Column="0"
+                Margin="0,15,0,0"
+                hc:InfoElement.Title="设备类型:"
                 IsEnabled="{Binding IsAddMode}"
                 ItemsSource="{Binding Source={StaticResource DeviceType}}"
                 SelectedItem="{Binding Device.DeviceType}">
@@ -72,21 +91,12 @@
                 </ComboBox.ItemTemplate>
             </hc:ComboBox>
 
-            <CheckBox Content="是否添加默认变量表"
+            <hc:ComboBox
-                         IsChecked="{Binding Device.IsAddDefVarTable}" />
+                x:Name="ProtocolComboBox"
-        </StackPanel>
+                Grid.Row="2"
-
+                Grid.Column="4"
-        <!-- 右边列 -->
+                Margin="0,15,0,0"
-        <StackPanel Grid.Column="1" MinWidth="220" Margin="10,0,0,0">
+                hc:InfoElement.Title="通讯协议:"
-            <hc:TextBox hc:InfoElement.Title="设备描述"
-                        Text="{Binding Device.Description, UpdateSourceTrigger=PropertyChanged}" />
-
-            <TextBlock Margin="8,0,0,5" Text="设备端口"/>
-            <hc:NumericUpDown 
-                        Value="{Binding Device.Port, UpdateSourceTrigger=PropertyChanged}" />
-
-            <hc:ComboBox x:Name="ProtocolComboBox"
-                         hc:InfoElement.Title="设备通信协议"
                 IsEnabled="{Binding IsAddMode}"
                 ItemsSource="{Binding Source={StaticResource ProtocolType}}"
                 SelectedItem="{Binding Device.Protocol}">
@@ -97,50 +107,92 @@
                 </ComboBox.ItemTemplate>
             </hc:ComboBox>
 
+            <!--  Row 3  -->
+            <CheckBox
+                Grid.Row="3"
+                Grid.Column="0"
+                Margin="0,20,0,0"
+                Content="是否添加默认变量表"
+                IsChecked="{Binding Device.IsAddDefVarTable}" />
+            <CheckBox
+                Grid.Row="3"
+                Grid.Column="4"
+                Margin="0,20,0,0"
+                Content="是否启用"
+                IsChecked="{Binding Device.IsActive}" />
+
+        </Grid>
+
         <!--  OpcUa Specific Properties  -->
-            <Border x:Name="OpcUaPanel">
+        <GroupBox Margin="0,15,0,0" Header="OpcUa 协议设置">
-                <Border.Style>
+            <GroupBox.Style>
-                    <Style TargetType="Border" BasedOn="{StaticResource ConditionalPanelStyle}">
+                <Style BasedOn="{StaticResource {x:Type GroupBox}}" TargetType="GroupBox">
+                    <Setter Property="Visibility" Value="Collapsed" />
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding ElementName=ProtocolComboBox, Path=SelectedItem, Converter={StaticResource EnumToStringConverter}}" Value="OpcUa">
                             <Setter Property="Visibility" Value="Visible" />
                         </DataTrigger>
                     </Style.Triggers>
                 </Style>
-                </Border.Style>
+            </GroupBox.Style>
-                <StackPanel>
+            <Grid Margin="5">
-                    <hc:TextBox hc:InfoElement.Title="OpcUa服务器地址"
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <hc:TextBox
+                    Grid.Column="1"
+                    MinWidth="400"
+                    hc:InfoElement.Title="OpcUa服务器地址:"
                     Text="{Binding Device.OpcUaServerUrl}" />
-                </StackPanel>
+            </Grid>
-            </Border>
+        </GroupBox>
 
         <!--  S7 Specific Properties  -->
-            <Border x:Name="S7PropertiesPanel">
+        <GroupBox Margin="0,10,0,0" Header="S7 协议设置">
-                <Border.Style>
+            <GroupBox.Style>
-                    <Style TargetType="Border" BasedOn="{StaticResource ConditionalPanelStyle}">
+                <Style BasedOn="{StaticResource {x:Type GroupBox}}" TargetType="GroupBox">
+                    <Setter Property="Visibility" Value="Collapsed" />
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding ElementName=ProtocolComboBox, Path=SelectedItem, Converter={StaticResource EnumToStringConverter}}" Value="S7">
                             <Setter Property="Visibility" Value="Visible" />
                         </DataTrigger>
                     </Style.Triggers>
                 </Style>
-                </Border.Style>
+            </GroupBox.Style>
-                <StackPanel>
+            <Grid Margin="5">
-                    <hc:ComboBox hc:InfoElement.Title="CPU 类型"
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="20" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="20" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <TextBlock
+                    Grid.Column="0"
+                    Style="{StaticResource LabelStyle}"
+                    Text="CPU 类型:" />
+                <hc:ComboBox
+                    Grid.Column="1"
                     ItemsSource="{Binding Source={StaticResource CpuType}}"
                     SelectedItem="{Binding Device.CpuType}" />
-                    <TextBlock Margin="8,0,0,5" Text="机架号"/>
-                    <hc:NumericUpDown 
-                                Value="{Binding Device.Rack, UpdateSourceTrigger=PropertyChanged}" />
-                    <TextBlock Margin="8,0,0,5" Text="槽号"/>
-                    <hc:NumericUpDown 
-                                Value="{Binding Device.Slot, UpdateSourceTrigger=PropertyChanged}" />
-                </StackPanel>
-            </Border>
 
-            <CheckBox Content="是否启用"
+                <TextBlock
-                         IsChecked="{Binding Device.IsActive}" />
+                    Grid.Column="3"
-        </StackPanel>
+                    Style="{StaticResource LabelStyle}"
+                    Text="机架号:" />
+                <hc:TextBox Grid.Column="4" Text="{Binding Device.Rack, UpdateSourceTrigger=PropertyChanged}" />
+
+                <TextBlock
+                    Grid.Column="6"
+                    Style="{StaticResource LabelStyle}"
+                    Text="槽号:" />
+                <hc:TextBox Grid.Column="7" Text="{Binding Device.Slot, UpdateSourceTrigger=PropertyChanged}" />
             </Grid>
+        </GroupBox>
 
+    </StackPanel>
 </ui:ContentDialog>

DMS.WPF/Views/HandyDialogs/VariableEditorDialog.xaml

@@ -1,87 +0,0 @@
-
-<UserControl x:Class="DMS.WPF.Views.HandyDialogs.VariableEditorDialog"
-             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:DMS.WPF.Views"
-             xmlns:vmd="clr-namespace:DMS.WPF.ViewModels.Dialogs"
-             xmlns:hc="https://handyorg.github.io/handycontrol"
-             xmlns:enums="clr-namespace:DMS.Core.Enums;assembly=DMS.Core"
-             mc:Ignorable="d" 
-             d:DataContext="{d:DesignInstance Type=vmd:VariableDialogViewModel}"
-             Background="#fff"
-             Width="1000">
-    <Grid Margin="16">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="Auto"/>
-        </Grid.RowDefinitions>
-
-        <TextBlock Grid.Row="0" Text="{Binding Title}" Style="{StaticResource TextBlockTitle}" Margin="0,0,0,16"/>
-
-        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                </Grid.RowDefinitions>
-
-                <TextBlock Grid.Row="0" Grid.Column="0" Text="名称:" VerticalAlignment="Center" Margin="0,0,10,0"/>
-                <hc:TextBox Grid.Row="0" Grid.Column="1" Text="{Binding Variable.Name, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource TextBoxExtend}" Margin="0,5"/>
-
-                <TextBlock Grid.Row="1" Grid.Column="0" Text="地址:" VerticalAlignment="Center" Margin="0,0,10,0"/>
-                <hc:TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Variable.S7Address, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource TextBoxExtend}" Margin="0,5"/>
-                
-                <TextBlock Grid.Row="2" Grid.Column="0" Text="描述:" VerticalAlignment="Center" Margin="0,0,10,0"/>
-                <hc:TextBox Grid.Row="2" Grid.Column="1" Text="{Binding Variable.Description, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" AcceptsReturn="True" MinHeight="60" Style="{StaticResource TextBoxExtend}" Margin="0,5"/>
-
-                <TextBlock Grid.Row="3" Grid.Column="0" Text="数据类型:" VerticalAlignment="Center" Margin="0,0,10,0"/>
-                <hc:ComboBox Grid.Row="3" Grid.Column="1" ItemsSource="{Binding CSharpDataTypes}" SelectedItem="{Binding Variable.CSharpDataType}" Style="{StaticResource ComboBoxExtend}" Margin="0,5"/>
-
-                <TextBlock Grid.Row="4" Grid.Column="0" Text="协议:" VerticalAlignment="Center" Margin="0,0,10,0"/>
-                <hc:ComboBox Grid.Row="4" Grid.Column="1" ItemsSource="{Binding ProtocolTypes}" SelectedItem="{Binding Variable.Protocol}" Style="{StaticResource ComboBoxExtend}" Margin="0,5"/>
-
-                <TextBlock Grid.Row="5" Grid.Column="0" Text="轮询频率:" VerticalAlignment="Center" Margin="0,0,10,0"/>
-                <hc:ComboBox Grid.Row="5" Grid.Column="1" ItemsSource="{Binding PollLevelTypes}" SelectedItem="{Binding Variable.PollLevel}" Style="{StaticResource ComboBoxExtend}" Margin="0,5"/>
-
-                <hc:Divider Grid.Row="6" Grid.ColumnSpan="2" Margin="0,10"/>
-
-                <StackPanel Grid.Row="7" Grid.ColumnSpan="2" Orientation="Horizontal">
-                    <CheckBox IsChecked="{Binding Variable.IsActive}" Content="启用变量" Margin="0,5,20,5"/>
-                    <CheckBox IsChecked="{Binding Variable.IsHistoryEnabled}" Content="启用历史记录" Margin="0,5,20,5"/>
-                    <CheckBox IsChecked="{Binding Variable.IsAlarmEnabled}" Content="启用报警" Margin="0,5,20,5"/>
-                </StackPanel>
-
-                <Grid Grid.Row="8" Grid.ColumnSpan="2" IsEnabled="{Binding Variable.IsAlarmEnabled}">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition/>
-                        <ColumnDefinition/>
-                    </Grid.ColumnDefinitions>
-                    <hc:NumericUpDown Grid.Column="0" Minimum="-999999" Maximum="999999" Value="{Binding Variable.AlarmMinValue}" hc:InfoElement.Title="报警下限" Margin="0,5,5,5"/>
-                    <hc:NumericUpDown Grid.Column="1" Minimum="-999999" Maximum="999999" Value="{Binding Variable.AlarmMaxValue}" hc:InfoElement.Title="报警上限" Margin="5,5"/>
-                    <hc:NumericUpDown Grid.Column="2" Minimum="0" Maximum="999999" Value="{Binding Variable.AlarmDeadband}" hc:InfoElement.Title="报警死区" Margin="5,5,0,5"/>
-                </Grid>
-
-            </Grid>
-        </ScrollViewer>
-
-        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,16,0,0">
-            <Button Command="{Binding SaveCommand}" Content="保存" Style="{StaticResource ButtonPrimary}" IsDefault="True"/>
-            <Button Command="{Binding CancelCommand}" Content="取消" Margin="10,0,0,0" IsCancel="True"/>
-        </StackPanel>
-    </Grid>
-</UserControl>

DMS.WPF/Views/HandyDialogs/VariableEditorDialog.xaml.cs

@@ -1,16 +0,0 @@
-
-using System.Windows.Controls;
-
-namespace DMS.WPF.Views.HandyDialogs
-{
-    /// <summary>
-    /// Interaction logic for VariableEditorDialog.xaml
-    /// </summary>
-    public partial class VariableEditorDialog : UserControl
-    {
-        public VariableEditorDialog()
-        {
-            InitializeComponent();
-        }
-    }
-}

DMS.WPF/Views/MainView.xaml

@@ -1,26 +1,27 @@
-<Window x:Class="DMS.WPF.Views.MainView"
+<Window
+    x:Class="DMS.WPF.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:DMS.WPF.Views"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:vm="clr-namespace:DMS.WPF.ViewModels"
-        xmlns:mo="clr-namespace:DMS.Core.Models;assembly=DMS.Core"
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-        xmlns:tb="http://hardcodet.net/taskbar"
+    xmlns:local="clr-namespace:DMS.WPF.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:mo="clr-namespace:DMS.Core.Models;assembly=DMS.Core"
     xmlns:taskbarNotification="http://www.hardcodet.net/taskbar"
+    xmlns:tb="http://hardcodet.net/taskbar"
+    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+    xmlns:vm="clr-namespace:DMS.WPF.ViewModels"
     Title="设备管理系统"
     Width="1080"
     Height="800"
+    d:DataContext="{d:DesignInstance vm:MainViewModel}"
+    ui:WindowHelper.SystemBackdropType="Mica"
+    ui:WindowHelper.UseModernWindowStyle="True"
+    Closing="Window_Closing"
+    Loaded="MainView_OnLoaded"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
-        Loaded="MainView_OnLoaded"
-        Closing="Window_Closing"
-        ui:WindowHelper.UseModernWindowStyle="True"
-        ui:WindowHelper.SystemBackdropType="Mica"
-        d:DataContext="{d:DesignInstance vm:MainViewModel}"
     mc:Ignorable="d">
     <Window.Resources>
 
@@ -30,11 +31,11 @@
             <Separator />
             <MenuItem Header="删除" />
         </ContextMenu>
-        <DataTemplate x:Key="NavigationViewMenuItem"
+        <DataTemplate x:Key="NavigationViewMenuItem" DataType="{x:Type mo:MenuBean}">
-                      DataType="{x:Type mo:MenuBean}">
+            <ui:NavigationViewItem
-            <ui:NavigationViewItem Content="{Binding Header}"
+                Content="{Binding Header}"
-                                   Tag="{Binding }"
+                MenuItemsSource="{Binding Children}"
-                                   MenuItemsSource="{Binding Children }">
+                Tag="{Binding}">
                 <ui:NavigationViewItem.Icon>
                     <ui:FontIcon Glyph="{Binding Icon}" />
                 </ui:NavigationViewItem.Icon>
@@ -42,29 +43,31 @@
         </DataTemplate>
     </Window.Resources>
     <Grid>
-        <taskbarNotification:TaskbarIcon x:Name="MyNotifyIcon"
+        <taskbarNotification:TaskbarIcon
-                        ToolTipText="设备管理系统"
+            x:Name="MyNotifyIcon"
+            DoubleClickCommand="{Binding ShowWindowCommand}"
             IconSource="/Assets/AppIcon2.ico"
-                        DoubleClickCommand="{Binding ShowWindowCommand}">
+            ToolTipText="设备管理系统">
             <taskbarNotification:TaskbarIcon.ContextMenu>
                 <ContextMenu>
-                    <MenuItem Header="显示窗口" Command="{Binding ShowWindowCommand}" />
+                    <MenuItem Command="{Binding ShowWindowCommand}" Header="显示窗口" />
-                    <MenuItem Header="退出" Command="{Binding ExitApplicationCommand}" />
+                    <MenuItem Command="{Binding ExitApplicationCommand}" Header="退出" />
                 </ContextMenu>
             </taskbarNotification:TaskbarIcon.ContextMenu>
         </taskbarNotification:TaskbarIcon>
-        <ui:NavigationView ExpandedModeThresholdWidth="500"
+        <ui:NavigationView
-                           IsTabStop="False"
-                           PaneDisplayMode="Left"
-                           PaneTitle="设备管理系统"
-                           IsSettingsVisible="False"
             AlwaysShowHeader="True"
+            ExpandedModeThresholdWidth="500"
             IsBackButtonVisible="Collapsed"
             IsBackEnabled="False"
-                           SelectionFollowsFocus="Disabled"
+            IsSettingsVisible="False"
-                           SelectionChanged="NavigationView_SelectionChanged"
+            IsTabStop="False"
+            MenuItemTemplate="{StaticResource NavigationViewMenuItem}"
             MenuItemsSource="{Binding DataServices.MenuTrees}"
-                           MenuItemTemplate="{StaticResource NavigationViewMenuItem}">
+            PaneDisplayMode="Left"
+            PaneTitle="设备管理系统"
+            SelectionChanged="NavigationView_SelectionChanged"
+            SelectionFollowsFocus="Disabled">
 
 
 
@@ -116,11 +119,11 @@
                     </ContentControl.Resources>
                 </ContentControl>
 
-                <ScrollViewer VerticalScrollBarVisibility="Hidden"
+                <ScrollViewer HorizontalAlignment="Right" VerticalScrollBarVisibility="Hidden">
-                              HorizontalAlignment="Right">
+                    <StackPanel
-                    <StackPanel hc:Growl.GrowlParent="True"
+                        Margin="0,10,10,10"
                         VerticalAlignment="Top"
-                                Margin="0,10,10,10" />
+                        hc:Growl.GrowlParent="True" />
                 </ScrollViewer>
             </Grid>