初步完成单个变量的历史记录查询

DMS.WPF/Converters/NullToVisibilityConverter.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace DMS.WPF.Converters
+{
+    /// <summary>
+    /// Null值到可见性转换器。当绑定的值不为null时，返回Visible，否则返回Collapsed。
+    /// </summary>
+    public class NullToVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            // 如果值不为null，则可见
+            return value != null ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

DMS.WPF/ViewModels/VariableHistoryViewModel.cs

@@ -24,24 +24,6 @@ partial class VariableHistoryViewModel : ViewModelBase, INavigatable
     private readonly IDataStorageService _dataStorageService;
     private readonly INotificationService _notificationService;
 
-    /// <summary>
-    /// 用于过滤变量的搜索文本
-    /// </summary>
-    [ObservableProperty]
-    private string _searchText;
-
-    /// <summary>
-    /// 是否打开建议列表
-    /// </summary>
-    [ObservableProperty]
-    private bool _isSuggestionListOpen;
-
-    /// <summary>
-    /// 建议的变量列表
-    /// </summary>
-    [ObservableProperty]
-    private ObservableCollection<string> _suggestedVariables;
-
     /// <summary>
     /// 历史记录条数限制
     /// </summary>
@@ -64,7 +46,7 @@ partial class VariableHistoryViewModel : ViewModelBase, INavigatable
     /// 选中的变量历史记录
     /// </summary>
     [ObservableProperty]
-    private VariableHistoryDto _selectedVariable;
+    private VariableItemViewModel _currentVariable;
 
     /// <summary>
     /// 变量历史记录列表
@@ -94,13 +76,11 @@ partial class VariableHistoryViewModel : ViewModelBase, INavigatable
         _variableHistorySynchronizedView = _variableHistoryList.CreateView(v => v);
         VariableHistories = _variableHistorySynchronizedView.ToNotifyCollectionChanged();
         _allVariableHistories = new List<VariableHistoryDto>();
-        _suggestedVariables = new ObservableCollection<string>();
 
         // 初始化默认值
         _historyLimit = 1000; // 默认限制1000条记录
         _startTime = null;
         _endTime = null;
-        _selectedVariable = new VariableHistoryDto();
     }
 
     /// <summary>
@@ -109,17 +89,16 @@ partial class VariableHistoryViewModel : ViewModelBase, INavigatable
     /// <param name="limit">返回记录的最大数量，null表示无限制</param>
     /// <param name="startTime">开始时间，null表示无限制</param>
     /// <param name="endTime">结束时间，null表示无限制</param>
-    private async void LoadAllVariableHistories(int? limit = null, DateTime? startTime = null, DateTime? endTime = null)
+    private async void LoadAllVariableHistories(int variableId,int? limit = null, DateTime? startTime = null, DateTime? endTime = null)
     {
+
+        
         try
         {
             _variableHistoryList.Clear();
-            var allHistories = await _historyAppService.GetAllVariableHistoriesAsync(limit, startTime, endTime);
+            var allHistories = await _historyAppService.GetVariableHistoriesAsync(variableId,limit, startTime, endTime);
             _allVariableHistories = allHistories.ToList();
             _variableHistoryList.AddRange(_allVariableHistories);
-
-            // 更新建议列表
-            UpdateSuggestedVariables();
         }
         catch (Exception ex)
         {
@@ -128,37 +107,17 @@ partial class VariableHistoryViewModel : ViewModelBase, INavigatable
         }
     }
 
-    /// <summary>
-    /// 更新建议的变量列表
-    /// </summary>
-    private void UpdateSuggestedVariables()
-    {
-        // 清空现有建议列表
-        _suggestedVariables.Clear();
-
-        if (!string.IsNullOrWhiteSpace(SearchText))
-        {
-            // // 根据搜索文本过滤建议列表
-            // var filteredVariables = _dataStorageService.Variables
-            //                                            .Where(v =>
-            //                                                       v.Name?.Contains(
-            //                                                           SearchText, StringComparison.OrdinalIgnoreCase) ==
-            //                                                       true)
-            //                                            .Select(v => v.Name)
-            //                                            .Take(10)
-            //                                            .ToList();
-            //
-            // foreach (var variable in filteredVariables)
-            // {
-            //     _suggestedVariables.Add(variable);
-            // }
-        }
-    }
 
     public async Task OnNavigatedToAsync(MenuItemViewModel menu)
     {
-        // 加载所有变量的历史记录
-        LoadAllVariableHistories(HistoryLimit, StartTime, EndTime);
+        if (_dataStorageService.Variables.TryGetValue(menu.TargetId, out VariableItemViewModel variableItem))
+        {
+            CurrentVariable = variableItem;
+            // 加载所有变量的历史记录
+            LoadAllVariableHistories(variableItem.Id,HistoryLimit, StartTime, EndTime);
+            
+        }
+        
     }
 
     /// <summary>
@@ -167,50 +126,14 @@ partial class VariableHistoryViewModel : ViewModelBase, INavigatable
     [RelayCommand]
     private void Reload()
     {
-        LoadAllVariableHistories(HistoryLimit, StartTime, EndTime);
-    }
-
-    /// <summary>
-    /// 更新建议列表命令
-    /// </summary>
-    [RelayCommand]
-    private void UpdateSuggestions()
-    {
-        UpdateSuggestedVariables();
-    }
-
-    /// <summary>
-    /// 当搜索文本改变时触发
-    /// </summary>
-    /// <param name="value"></param>
-    partial void OnSearchTextChanged(string value)
-    {
-        // 添加调试信息
-        System.Diagnostics.Debug.WriteLine($"OnSearchTextChanged called with value: '{value}'");
+        if (CurrentVariable!=null)
+        {
+            LoadAllVariableHistories( CurrentVariable.Id,HistoryLimit, StartTime, EndTime);
+        }
         
-        // 更新建议列表
-        UpdateSuggestedVariables();
-
-        if (string.IsNullOrWhiteSpace(value))
-        {
-            // 如果搜索文本为空，显示所有历史记录
-            _variableHistoryList.Clear();
-            _variableHistoryList.AddRange(_allVariableHistories);
-        }
-        else
-        {
-            // 根据搜索文本过滤历史记录
-            var filteredHistories = _allVariableHistories
-                                    .Where(h =>
-                                               h.VariableName?.Contains(
-                                                   value, StringComparison.OrdinalIgnoreCase) == true)
-                                    .ToList();
-
-            _variableHistoryList.Clear();
-            _variableHistoryList.AddRange(filteredHistories);
-        }
     }
 
+
     /// <summary>
     /// 根据搜索文本过滤历史记录
     /// </summary>
@@ -237,14 +160,6 @@ partial class VariableHistoryViewModel : ViewModelBase, INavigatable
         }
     }
 
-    /// <summary>
-    /// 重新加载历史记录，使用当前设置的限制和时间范围
-    /// </summary>
-    public void ReloadHistories()
-    {
-        LoadAllVariableHistories(HistoryLimit, StartTime, EndTime);
-    }
-
     /// <summary>
     /// 根据变量ID加载历史记录
     /// </summary>
@@ -260,9 +175,6 @@ partial class VariableHistoryViewModel : ViewModelBase, INavigatable
             _variableHistoryList.Clear();
             var histories = await _historyAppService.GetVariableHistoriesAsync(variableId, limit, startTime, endTime);
             _variableHistoryList.AddRange(histories);
-
-            // 更新建议列表
-            UpdateSuggestedVariables();
         }
         catch (Exception ex)
         {

DMS.WPF/Views/VariableHistoryView.xaml

@@ -14,111 +14,148 @@
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     xmlns:valueConverts="clr-namespace:DMS.WPF.ValueConverts"
     xmlns:vm="clr-namespace:DMS.WPF.ViewModels"
+    xmlns:converters="clr-namespace:DMS.WPF.Converters"
     d:DataContext="{d:DesignInstance vm:VariableHistoryViewModel}"
     d:DesignHeight="600"
     d:DesignWidth="800"
     mc:Ignorable="d">
     <UserControl.Resources>
-        <ex:BindingProxy x:Key="proxy" Data="{Binding}" />
-        <valueConverts:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
-        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-        <!--  标签字体的样式  -->
-        <Style x:Key="VarHistoryLabelStyle" TargetType="TextBlock">
-            <Setter Property="Foreground" Value="{DynamicResource SecondaryTextBrush}" />
-            <Setter Property="FontSize" Value="14" />
-            <Setter Property="VerticalAlignment" Value="Center" />
-        </Style>
-        <!--  值字体的样式  -->
-        <Style x:Key="VarHistoryValueStyle" TargetType="TextBlock">
-            <Setter Property="FontWeight" Value="Bold" />
-            <Setter Property="FontSize" Value="14" />
-            <Setter Property="MinWidth" Value="100" />
-            <Setter Property="VerticalAlignment" Value="Center" />
-        </Style>
+        <!-- <ex:BindingProxy x:Key="proxy" Data="{Binding}" /> -->
+        <!-- <valueConverts:EnumDescriptionConverter x:Key="EnumDescriptionConverter" /> -->
+        <!-- <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" /> -->
+        <!-- -->
+        <!-- ~1~ 添加需要的转换器 @1@ -->
+        <!-- <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" /> -->
+        <!-- <converters:CountToVisibilityConverter x:Key="CountToVisibilityConverter" /> -->
+        <!-- <converters:BoolToStringConverter x:Key="BoolToStringConverter" /> -->
+        <!-- <converters:BoolToColorConverter x:Key="BoolToColorConverter" /> -->
+        <!-- <converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter" /> -->
     </UserControl.Resources>
 
     <DockPanel>
-        <ikw:SimpleStackPanel Margin="10" DockPanel.Dock="Top">
-            <!--  搜索区域  -->
-            <GroupBox Header="搜索条件">
-                <ikw:SimpleStackPanel Margin="5" Spacing="10">
-                    <ikw:SimpleStackPanel
-                        HorizontalAlignment="Left"
-                        Orientation="Horizontal"
-                        Spacing="10">
-                        <TextBlock Style="{StaticResource VarHistoryLabelStyle}" Text="搜索变量:" />
-                        <ui:AutoSuggestBox
-                            x:Name="SearchAutoSuggestBox"
-                            Width="200"
-                            ui:ControlHelper.PlaceholderText="搜索变量..."
-                            Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}"
-                            ItemsSource="{Binding SuggestedVariables}"
-                            DisplayMemberPath="VariableName"
-                            IsSuggestionListOpen="{Binding IsSuggestionListOpen, Mode=TwoWay}"
-                            TextMemberPath="VariableName" />
-                    </ikw:SimpleStackPanel>
-                </ikw:SimpleStackPanel>
-            </GroupBox>
+        <StackPanel DockPanel.Dock="Top">
+            <!-- 操作菜单栏 -->
+            <ui:CommandBar DefaultLabelPosition="Right" IsOpen="False">
+                <!-- 重新加载 -->
+                <ui:AppBarButton Command="{Binding ReloadCommand}" Label="重新加载">
+                    <ui:AppBarButton.Icon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Refresh}" />
+                    </ui:AppBarButton.Icon>
+                </ui:AppBarButton>
+                
+                <ui:AppBarButton x:Name="ExportButton" Label="导出">
+                    <ui:AppBarButton.Icon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Save}" />
+                    </ui:AppBarButton.Icon>
+                </ui:AppBarButton>
+                
+                <ui:AppBarButton x:Name="ShareButton" Label="分享">
+                    <ui:AppBarButton.Icon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Share}" />
+                    </ui:AppBarButton.Icon>
+                </ui:AppBarButton>
+                
+                <ui:CommandBar.SecondaryCommands>
+                    <ui:AppBarButton
+                        x:Name="SettingsButton"
+                        Icon="Setting"
+                        Label="设置" />
+                </ui:CommandBar.SecondaryCommands>
+            </ui:CommandBar>
             
-            <!--  时间范围和详细信息区域  -->
-            <GroupBox Header="详细信息">
-                <ikw:SimpleStackPanel Margin="5" Spacing="10">
-                    <!--  变量详细信息  -->
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        
-                        <TextBlock Grid.Row="0" Grid.Column="0" Style="{StaticResource VarHistoryLabelStyle}" Text="变量ID:" />
-                        <TextBlock Grid.Row="0" Grid.Column="1" Style="{StaticResource VarHistoryValueStyle}" Text="{Binding SelectedVariable.Id}" />
-                        
-                        <TextBlock Grid.Row="0" Grid.Column="2" Style="{StaticResource VarHistoryLabelStyle}" Text="变量名:" />
-                        <TextBlock Grid.Row="0" Grid.Column="3" Style="{StaticResource VarHistoryValueStyle}" Text="{Binding SelectedVariable.VariableName}" />
-                        
-                        <TextBlock Grid.Row="1" Grid.Column="0" Style="{StaticResource VarHistoryLabelStyle}" Text="当前值:" />
-                        <TextBlock Grid.Row="1" Grid.Column="1" Style="{StaticResource VarHistoryValueStyle}" Text="{Binding SelectedVariable.Value}" />
-                        
-                        <TextBlock Grid.Row="1" Grid.Column="2" Style="{StaticResource VarHistoryLabelStyle}" Text="更新时间:" />
-                        <TextBlock Grid.Row="1" Grid.Column="3" Style="{StaticResource VarHistoryValueStyle}" Text="{Binding SelectedVariable.Timestamp, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss.fff}'}" />
-                    </Grid>
-                    
-                    <!--  时间范围选择  -->
+            <!-- 时间范围选择器和详细信息区域 -->
+            <Border Background="White" 
+                    BorderBrush="#E0E0E0" 
+                    BorderThickness="1" 
+                    CornerRadius="8"
+                    Margin="20,10"
+                    Padding="15">
+                <Border.Effect>
+                    <DropShadowEffect ShadowDepth="2" 
+                                      BlurRadius="5" 
+                                      Opacity="0.1" 
+                                      Color="#888888"/>
+                </Border.Effect>
+                
+                <ikw:SimpleStackPanel Spacing="15">
+                    <!-- 时间范围选择 -->
                     <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="10">
-                        <TextBlock Style="{StaticResource VarHistoryLabelStyle}" Text="开始时间:" />
+                        <TextBlock Text="开始时间:" 
+                                   VerticalAlignment="Center"
+                                   Foreground="#666666"
+                                   FontSize="14"/>
                         <hc:DateTimePicker Width="200" SelectedDateTime="{Binding StartTime}" />
                         
-                        <TextBlock Style="{StaticResource VarHistoryLabelStyle}" Text="结束时间:" />
+                        <TextBlock Text="结束时间:" 
+                                   VerticalAlignment="Center"
+                                   Foreground="#666666"
+                                   FontSize="14"
+                                   Margin="10,0,0,0"/>
                         <hc:DateTimePicker Width="200" SelectedDateTime="{Binding EndTime}" />
                         
-                        <Button Content="重新加载" Command="{Binding ReloadCommand}" />
+                        <Button Content="重新加载" 
+                                Command="{Binding ReloadCommand}"
+                                Style="{StaticResource ButtonPrimary}"
+                                Margin="10,0,0,0"/>
                     </ikw:SimpleStackPanel>
+                    
+                    <!-- 选中变量详细信息 -->
+                    <Border Background="#F8F8F8" 
+                            BorderBrush="#E0E0E0" 
+                            BorderThickness="1" 
+                            CornerRadius="6"
+                            Padding="15">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+                            
+                            <TextBlock Grid.Row="0" Grid.Column="0" Text="变量ID:" 
+                                       Foreground="#666666" FontSize="14" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                            <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding CurrentVariable.Id}" 
+                                       FontWeight="Bold" FontSize="14" VerticalAlignment="Center"/>
+                            
+                            <TextBlock Grid.Row="0" Grid.Column="2" Text="变量名:" 
+                                       Foreground="#666666" FontSize="14" VerticalAlignment="Center" Margin="10,0,5,0"/>
+                            <TextBlock Grid.Row="0" Grid.Column="3" Text="{Binding CurrentVariable.Name}" 
+                                       FontWeight="Bold" FontSize="14" VerticalAlignment="Center"/>
+                            
+                            <TextBlock Grid.Row="1" Grid.Column="0" Text="当前值:" 
+                                       Foreground="#666666" FontSize="14" VerticalAlignment="Center" Margin="0,5,5,0"/>
+                            <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding CurrentVariable.DataValue}" 
+                                       FontWeight="Bold" FontSize="14" VerticalAlignment="Center" Margin="0,5,0,0"/>
+                            
+                            <TextBlock Grid.Row="1" Grid.Column="2" Text="更新时间:" 
+                                       Foreground="#666666" FontSize="14" VerticalAlignment="Center" Margin="10,5,5,0"/>
+                            <TextBlock Grid.Row="1" Grid.Column="3" Text="{Binding CurrentVariable.UpdatedAt, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" 
+                                       FontWeight="Bold" FontSize="14" VerticalAlignment="Center" Margin="0,5,0,0"/>
+                        </Grid>
+                    </Border>
                 </ikw:SimpleStackPanel>
-            </GroupBox>
-        </ikw:SimpleStackPanel>
+            </Border>
+        </StackPanel>
 
+        <!-- 变量历史记录列表 -->
         <DataGrid
-            Margin="10"
+            Margin="20"
             AutoGenerateColumns="False"
             CanUserDeleteRows="False"
-            CanUserSortColumns="False"
+            CanUserSortColumns="True"
             IsReadOnly="True"
             ItemsSource="{Binding VariableHistories}"
-            SelectedItem="{Binding SelectedVariable}"
             SelectionMode="Single"
             Style="{StaticResource DataGridBaseStyle}">
             <DataGrid.Columns>
-                <DataGridTextColumn Binding="{Binding VariableName}" Header="变量名" />
                 <DataGridTextColumn Binding="{Binding Value}" Header="值" />
                 <DataGridTextColumn
-                    Binding="{Binding Timestamp, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss.fff}'}"
+                    Binding="{Binding Timestamp, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}"
                     Header="时间戳"
                     IsReadOnly="True" />
             </DataGrid.Columns>