From 2e54b439c64e0adbb7e010243c1f33aa5fc5f503 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 11 三月 2025 14:08:57 +0800
Subject: [PATCH] 完善程序； Merge branch 'master' of http://58.211.88.246:3600/r/WPF/WPFProject

---
 HMI.DataViewer/DataViewer.xaml |   39 +++++++++++++++++++++++----------------
 1 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/HMI.DataViewer/DataViewer.xaml b/HMI.DataViewer/DataViewer.xaml
index 6e97d35..93b4116 100644
--- a/HMI.DataViewer/DataViewer.xaml
+++ b/HMI.DataViewer/DataViewer.xaml
@@ -55,20 +55,20 @@
             </Grid>-->
             <StackPanel Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Left" Style="{StaticResource ButtonGroup}">
 
-                <TextBlock Style="{StaticResource TitleBox}" Text="寮�濮嬫椂闂�"/>
-                <pu:DateTimePicker Width="190" Style="{StaticResource TimePicker}" SelectedDateTime="{x:Null}" x:Name="startTimeInput"/>
-                <TextBlock Style="{StaticResource TitleBox}" Text="缁撴潫鏃堕棿"/>
-                <pu:DateTimePicker Width="190" Style="{StaticResource TimePicker}" SelectedDateTime="{x:Null}" x:Name="endTimeInput"/>
+                <TextBlock Style="{StaticResource TitleBox}" FontSize="{StaticResource ContentFontSize2}" Text="寮�濮嬫椂闂�"/>
+                <pu:DateTimePicker Style="{StaticResource TimePicker}" SelectedDateTime="{x:Null}" x:Name="startTimeInput"/>
+                <TextBlock Style="{StaticResource TitleBox}" FontSize="{StaticResource ContentFontSize2}" Text="缁撴潫鏃堕棿"/>
+                <pu:DateTimePicker Style="{StaticResource TimePicker}" SelectedDateTime="{x:Null}" x:Name="endTimeInput"/>
 
-                <Button Style="{StaticResource PrimaryButton}" pu:ButtonHelper.Icon="&#xe752;" 
-                        x:Name="srhBtn" Click="Button_Click">鏌ヨ</Button>
+                <Button Style="{StaticResource QueryBtn}"
+                        x:Name="srhBtn" Click="Button_Click"/>
 
-                <Button Style="{StaticResource PrimaryButton}" pu:ButtonHelper.Icon="&#xe752;" 
-                        x:Name="resetBtn" Click="Button_Click">閲嶇疆</Button>
+                <Button Style="{StaticResource ResetBtn}"
+                        x:Name="resetBtn" Click="Button_Click"/>
 
-                <Menu x:Name="anyBtn" >
+                <Menu x:Name="anyBtn" Style="{StaticResource CommonMenu}">
                     <MenuItem Header="鍒嗘瀽">
-                        <MenuItem Header="CPK" />
+                        <MenuItem Header="CPK" Click="MenuItem_Click"/>
                         <MenuItem Header="RandR" />
                     </MenuItem>
                 </Menu>
@@ -77,8 +77,9 @@
 
             <DockPanel Grid.Row="2" Grid.ColumnSpan="2" Margin="0,10,0,0">
                 <pu:Drawer DockPanel.Dock="Left" x:Name="DrwMenu" MinWidth="34" MaxWidth="400"
+                           Padding="0"
                            ShadowColor="{x:Null}"
-                           AnimationDuration="0" BorderThickness="2,2,0,2" BorderBrush="{StaticResource CommonBoarder}">
+                           AnimationDuration="0" BorderThickness="2,0,0,2" BorderBrush="{StaticResource CommonBoarder}">
                     <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto"/>
@@ -90,7 +91,7 @@
                         </Grid.ColumnDefinitions>
 
                         <DockPanel Grid.ColumnSpan="2" Background="{StaticResource CommonBoarder}">
-                            <ToggleButton Grid.Column="1" x:Name="drawerBtn" BorderThickness="0"
+                            <ToggleButton x:Name="drawerBtn" BorderThickness="0"
                                           DockPanel.Dock="Right"
                                           Background="Transparent"
                                           Width="34" Height="34" HorizontalAlignment="Right"
@@ -98,7 +99,7 @@
                                           FontFamily="{StaticResource iconfont}"
                                           Content="&#xe60e;" IsChecked="{Binding IsOpen, ElementName=DrwMenu, Mode=TwoWay}">
                                 <ToggleButton.Style>
-                                    <Style TargetType="ToggleButton">
+                                    <Style TargetType="ToggleButton" BasedOn="{StaticResource CommonToggle}">
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding IsOpen, ElementName=DrwMenu}" Value="False">
                                                 <Setter Property="RenderTransform">
@@ -122,7 +123,7 @@
                                     </Style>
                                 </ToggleButton.Style>
                             </ToggleButton>
-                            
+
                             <TextBlock Text="楂樼骇鏌ヨ" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         </DockPanel>
 
@@ -140,9 +141,10 @@
                                 <Label Content="閫夋嫨鏌ヨ椤圭洰"/>
                                 <ComboBox Grid.Column="1" x:Name="programInput" SelectionChanged="programInput_SelectionChanged"/>
                             </DockPanel>
-                           
+
                             <DataGrid Margin="10" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource DefaultDataGrid}"
                                       IsReadOnly="False"
+                                      SelectionMode="Single"
                                       BorderThickness="0"
                                       ItemsSource="{Binding Datas}">
                                 <DataGrid.Columns>
@@ -216,7 +218,12 @@
                     </Grid>
                 </pu:Drawer>
 
-                <DataGrid BorderThickness="2" BorderBrush="{StaticResource CommonBoarder}" x:Name="dataTable" Style="{StaticResource DefaultDataGrid}">
+                <DataGrid BorderThickness="2" BorderBrush="{StaticResource CommonBoarder}" x:Name="dataTable" 
+                          Style="{StaticResource DefaultDataGrid}"
+                          SelectionUnit="CellOrRowHeader"
+                          SelectionMode="Extended"
+                          pu:DataGridHelper.CellSelectedBackground="{StaticResource PrimaryColor}"
+                          PreviewMouseLeftButtonDown="dataTable_PreviewMouseLeftButtonDown">
                     <DataGrid.Columns>
                         <DataGridTemplateColumn Header="#" IsReadOnly="True" CanUserResize="False">
                             <DataGridTemplateColumn.CellTemplate>

--
Gitblit v1.9.1