From 8cd876c67de2df7f18632667ffae1df15b0a6e65 Mon Sep 17 00:00:00 2001
From: "David P.G" <pgw1315@163.com>
Date: Sun, 24 Aug 2025 12:25:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=A1=86=E7=9A=84=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/Items/VariableItemViewModel.cs |   4 +-
 DMS.WPF/Views/Dialogs/VariableDialog.xaml     | 294 +++++++++++-------
 DMS.WPF/Views/Dialogs/VariableDialog.xaml.cs  |   5 +-
 3 files changed, 182 insertions(+), 121 deletions(-)

diff --git a/DMS.WPF/ViewModels/Items/VariableItemViewModel.cs b/DMS.WPF/ViewModels/Items/VariableItemViewModel.cs
index e356a17..bd666ef 100644
--- a/DMS.WPF/ViewModels/Items/VariableItemViewModel.cs
+++ b/DMS.WPF/ViewModels/Items/VariableItemViewModel.cs
@@ -66,14 +66,14 @@ public partial class VariableItemViewModel : ObservableObject
     /// 获取或设置变量的信号类型 (如：AI, DI, AO, DO)。
     /// </summary>
     [ObservableProperty]
-    private SignalType _signalType ;
+    private SignalType _signalType =SignalType.OtherASignal;
 
     /// <summary>
     /// 获取或设置变量的轮询等级。
     /// 用于决定数据采集的频率（如：高、中、低）。
     /// </summary>
     [ObservableProperty]
-    private PollLevelType _pollLevel;
+    private PollLevelType _pollLevel=PollLevelType.ThirtySeconds;
 
     /// <summary>
     /// 获取或设置一个值，该值指示此变量是否被激活。
diff --git a/DMS.WPF/Views/Dialogs/VariableDialog.xaml b/DMS.WPF/Views/Dialogs/VariableDialog.xaml
index ad5cebf..b4bf781 100644
--- a/DMS.WPF/Views/Dialogs/VariableDialog.xaml
+++ b/DMS.WPF/Views/Dialogs/VariableDialog.xaml
@@ -1,131 +1,193 @@
-<ui:ContentDialog x:Class="DMS.WPF.Views.Dialogs.VariableDialog"
-                  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:ex="clr-namespace:DMS.Extensions"
-                  xmlns:en="clr-namespace:DMS.Core.Enums;assembly=DMS.Core"
-                  xmlns:enums="clr-namespace:DMS.Core.Enums;assembly=DMS.Core"
-                  xmlns:valueConverts="clr-namespace:DMS.WPF.ValueConverts"
-                  Title="{Binding Title}"
-                  CloseButtonText="取消"
-                  DefaultButton="Primary"
-                  PrimaryButtonText="{Binding PrimaryButText}"
-                  PrimaryButtonCommand="{Binding PrimaryButtonCommand}"
-                  CloseButtonCommand="{Binding CancleButtonCommand}"
-                  Background="#fff"
-                  d:DataContext="{d:DesignInstance vmd:VariableDialogViewModel}"
-                  mc:Ignorable="d">
-    
+<ui:ContentDialog
+    x:Class="DMS.WPF.Views.Dialogs.VariableDialog"
+    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:en="clr-namespace:DMS.Core.Enums;assembly=DMS.Core"
+    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:valueConverts="clr-namespace:DMS.WPF.ValueConverts"
+    xmlns:vmd="clr-namespace:DMS.WPF.ViewModels.Dialogs"
+    Title="{Binding Title}"
+    d:DataContext="{d:DesignInstance vmd:VariableDialogViewModel}"
+    CloseButtonCommand="{Binding CancleButtonCommand}"
+    CloseButtonText="取消"
+    DefaultButton="Primary"
+    PrimaryButtonCommand="{Binding PrimaryButtonCommand}"
+    PrimaryButtonText="{Binding PrimaryButText}"
+    mc:Ignorable="d">
+
     <ui:ContentDialog.Resources>
         <valueConverts:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
+        <ex:EnumBindingSource x:Key="ProtocolType" EnumType="{x:Type en:ProtocolType}" />
+        <ex:EnumBindingSource x:Key="SignalType" EnumType="{x:Type enums:SignalType}" />
+        <ex:EnumBindingSource x:Key="PollLevelType" EnumType="{x:Type enums:PollLevelType}" />
     </ui:ContentDialog.Resources>
 
-    <Grid >
-        
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
+    <ScrollViewer VerticalScrollBarVisibility="Auto">
+        <StackPanel Margin="16">
+            <!--  基本信息  -->
+            <GroupBox Margin="0,0,0,15" Header="基本信息">
+                <Grid Margin="10">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="20" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
 
-        <!-- 基本信息 -->
-        <GroupBox Header="基本信息" Grid.Row="0" Grid.Column="0" Margin="0 0 10 10">
-            <ikw:SimpleStackPanel Margin="10" Spacing="12">
-                <TextBlock Text="变量名称"
-                           Style="{StaticResource TextBlockSubTitle}" />
-                <TextBox Width="200" Text="{Binding Variable.Name, UpdateSourceTrigger=PropertyChanged}" />
+                    <hc:TextBox
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        MinWidth="150"
+                        hc:InfoElement.Title="变量名称:"
+                        Text="{Binding Variable.Name, UpdateSourceTrigger=PropertyChanged}" />
 
-                <TextBlock Text="变量描述"
-                           Style="{StaticResource TextBlockSubTitle}" />
-                <TextBox AcceptsReturn="True"
-                         Text="{Binding Variable.Description, UpdateSourceTrigger=PropertyChanged}" />
+                    <hc:TextBox
+                        Grid.Row="0"
+                        Grid.Column="2"
+                        MinWidth="150"
+                        hc:InfoElement.Title="节点ID:"
+                        Text="{Binding Variable.OpcUaNodeId, UpdateSourceTrigger=PropertyChanged}" />
 
-                <TextBlock Text="节点ID"
-                           Style="{StaticResource TextBlockSubTitle}" />
-                <TextBox Text="{Binding Variable.OpcUaNodeId, UpdateSourceTrigger=PropertyChanged}" />
+                    <hc:ComboBox
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="0,15,0,0"
+                        hc:InfoElement.Title="协议类型:"
+                        ItemsSource="{Binding Source={StaticResource ProtocolType}}"
+                        SelectedItem="{Binding Variable.Protocol, UpdateSourceTrigger=PropertyChanged}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding Converter={StaticResource EnumDescriptionConverter}}" />
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </hc:ComboBox>
 
-                <TextBlock Text="协议类型"
-                           Style="{StaticResource TextBlockSubTitle}" />
-                <ComboBox SelectedValue="{Binding Variable.Protocol, UpdateSourceTrigger=PropertyChanged}"
-                          SelectedValuePath="Tag"
-                          ItemsSource="{ex:EnumBindingSource {x:Type en:ProtocolType}}">
-                    <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                            <TextBlock Text="{Binding Converter={StaticResource EnumDescriptionConverter}}" />
-                        </DataTemplate>
-                    </ComboBox.ItemTemplate>
-                </ComboBox>
+                    <hc:ComboBox
+                        Grid.Row="1"
+                        Grid.Column="2"
+                        Margin="0,15,0,0"
+                        hc:InfoElement.Title="信号类型:"
+                        ItemsSource="{Binding Source={StaticResource SignalType}}"
+                        SelectedItem="{Binding Variable.SignalType, UpdateSourceTrigger=PropertyChanged}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding Converter={StaticResource EnumDescriptionConverter}}" />
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </hc:ComboBox>
 
-                <TextBlock Text="数据类型"
-                           Style="{StaticResource TextBlockSubTitle}" />
-                <TextBox Text="{Binding Variable.CSharpDataType, UpdateSourceTrigger=PropertyChanged}" />
+                    <hc:ComboBox
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Margin="0,15,0,0"
+                        hc:InfoElement.Title="轮询级别:"
+                        ItemsSource="{Binding Source={StaticResource PollLevelType}}"
+                        SelectedItem="{Binding Variable.PollLevel, UpdateSourceTrigger=PropertyChanged}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding Converter={StaticResource EnumDescriptionConverter}}" />
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </hc:ComboBox>
 
-                <TextBlock Text="信号类型"
-                           Style="{StaticResource TextBlockSubTitle}" />
-                <ComboBox SelectedValue="{Binding Variable.SignalType, UpdateSourceTrigger=PropertyChanged}"
-                          SelectedValuePath="Tag"
-                          ItemsSource="{ex:EnumBindingSource {x:Type enums:SignalType}}">
-                    <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                            <TextBlock Text="{Binding Converter={StaticResource EnumDescriptionConverter}}" />
-                        </DataTemplate>
-                    </ComboBox.ItemTemplate>
-                </ComboBox>
+                    <hc:TextBox
+                        Grid.Row="2"
+                        Grid.Column="2"
+                        Margin="0,15,0,0"
+                        hc:InfoElement.Title="数据类型:"
+                        Text="{Binding Variable.CSharpDataType, UpdateSourceTrigger=PropertyChanged}" />
 
-                <TextBlock Text="轮询级别"
-                           Style="{StaticResource TextBlockSubTitle}" />
-                <ComboBox SelectedValue="{Binding Variable.PollLevel, UpdateSourceTrigger=PropertyChanged}"
-                          SelectedValuePath="Tag"
-                          ItemsSource="{ex:EnumBindingSource {x:Type enums:PollLevelType}}">
-                    <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                            <TextBlock Text="{Binding Converter={StaticResource EnumDescriptionConverter}}" />
-                        </DataTemplate>
-                    </ComboBox.ItemTemplate>
-                </ComboBox>
-            </ikw:SimpleStackPanel>
-        </GroupBox>
-
-        <ikw:SimpleStackPanel Grid.Row="0" Grid.Column="1" >
-            <!-- 保存设置 -->
-            <GroupBox Header="保存设置"  Margin="10 0 0 10">
-                <ikw:SimpleStackPanel Spacing="12" Margin="10">
-                    <TextBlock Text="保存范围"
-                               Style="{StaticResource TextBlockSubTitle}" />
-                    <TextBox Width="200"  Text="{Binding Variable.HistoryDeadband, UpdateSourceTrigger=PropertyChanged}" />
-                    <CheckBox Content="是否激活"
-                              FontSize="16"
-                              Margin="0 10 0 0 "
-                              IsChecked="{Binding Variable.IsActive, UpdateSourceTrigger=PropertyChanged}" />
-                    <CheckBox Content="是否保存"
-                              FontSize="16"
-                              Margin="0 10 0 0 "
-                              IsChecked="{Binding Variable.IsHistoryEnabled, UpdateSourceTrigger=PropertyChanged}" />
-              
-                </ikw:SimpleStackPanel>
+                    <hc:TextBox
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="3"
+                        Height="60"
+                        Margin="0,15,0,0"
+                        hc:InfoElement.Title="变量描述:"
+                        Text="{Binding Variable.Description, UpdateSourceTrigger=PropertyChanged}"
+                        TextWrapping="Wrap"
+                        VerticalScrollBarVisibility="Auto" />
+                </Grid>
             </GroupBox>
 
-            <!-- 报警设置 -->
-            <GroupBox Header="报警设置"   Margin="10 15 0 10">
-                <ikw:SimpleStackPanel Margin="10" Spacing="12">
-               
-                    <TextBlock Text="报警最小值"
-                               Style="{StaticResource TextBlockSubTitle}" />
-                    <TextBox Text="{Binding Variable.AlarmMinValue, UpdateSourceTrigger=PropertyChanged}" />
-                    <TextBlock Text="报警最大值"
-                               Style="{StaticResource TextBlockSubTitle}" />
-                    <TextBox Text="{Binding Variable.AlarmMaxValue, UpdateSourceTrigger=PropertyChanged}" />
-                
-                    <CheckBox Content="是否报警"
-                              FontSize="16"
-                              Margin="0 5"
-                              IsChecked="{Binding Variable.IsAlarmEnabled, UpdateSourceTrigger=PropertyChanged}" />
-                </ikw:SimpleStackPanel>
-            </GroupBox>
-        </ikw:SimpleStackPanel>
+            <!--  保存设置  -->
+            <GroupBox Margin="0,0,0,15" Header="保存设置">
+                <Grid Margin="10">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="20" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
 
-    </Grid>
+                    <hc:TextBox
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        hc:InfoElement.Title="保存范围:"
+                        Text="{Binding Variable.HistoryDeadband, UpdateSourceTrigger=PropertyChanged}" />
+
+                    <StackPanel
+                        Grid.Row="0"
+                        Grid.Column="2"
+                        VerticalAlignment="Bottom"
+                        Orientation="Horizontal">
+                        <CheckBox
+                            Margin="0,0,20,0"
+                            Content="是否激活"
+                            IsChecked="{Binding Variable.IsActive, UpdateSourceTrigger=PropertyChanged}" />
+                        <CheckBox Content="是否保存" IsChecked="{Binding Variable.IsHistoryEnabled, UpdateSourceTrigger=PropertyChanged}" />
+                    </StackPanel>
+                </Grid>
+            </GroupBox>
+
+            <!--  报警设置  -->
+            <GroupBox Header="报警设置">
+                <Grid Margin="10">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="20" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+
+                    <hc:TextBox
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        hc:InfoElement.Title="报警最小值:"
+                        Text="{Binding Variable.AlarmMinValue, UpdateSourceTrigger=PropertyChanged}" />
+
+                    <hc:TextBox
+                        Grid.Row="0"
+                        Grid.Column="2"
+                        hc:InfoElement.Title="报警最大值:"
+                        Text="{Binding Variable.AlarmMaxValue, UpdateSourceTrigger=PropertyChanged}" />
+
+                    <CheckBox
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="3"
+                        Margin="0,15,0,0"
+                        Content="是否报警"
+                        IsChecked="{Binding Variable.IsAlarmEnabled, UpdateSourceTrigger=PropertyChanged}" />
+                </Grid>
+            </GroupBox>
+        </StackPanel>
+    </ScrollViewer>
 </ui:ContentDialog>
\ No newline at end of file
diff --git a/DMS.WPF/Views/Dialogs/VariableDialog.xaml.cs b/DMS.WPF/Views/Dialogs/VariableDialog.xaml.cs
index 5c22c32..2630999 100644
--- a/DMS.WPF/Views/Dialogs/VariableDialog.xaml.cs
+++ b/DMS.WPF/Views/Dialogs/VariableDialog.xaml.cs
@@ -7,8 +7,8 @@ namespace DMS.WPF.Views.Dialogs;
 
 public partial class VariableDialog 
 {
-    private const int ContentAreaMaxWidth = 1000;
-    private const int ContentAreaMaxHeight = 800;
+    private const int ContentAreaMaxWidth = 1200;
+    private const int ContentAreaMaxHeight = 900;
     public VariableDialog()
     {
         InitializeComponent();
@@ -17,7 +17,6 @@ public partial class VariableDialog
 
     private void OnOpened(ContentDialog sender, ContentDialogOpenedEventArgs args)
     {
-        //�޸ĶԻ������ݵ������Ⱥ����߶�
         var backgroundElementBorder = VisualTreeFinder.FindVisualChildByName<Border>(this, "BackgroundElement");
         backgroundElementBorder.MaxWidth = ContentAreaMaxWidth;
         backgroundElementBorder.MaxWidth = ContentAreaMaxHeight;