From 7bf89fd93bc487e8445d6d85bb527251b7371a04 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 12 五月 2025 13:14:11 +0800
Subject: [PATCH] 优化项目；

---
 Plugin.TestResult/DataTable.xaml |   65 ++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/Plugin.TestResult/DataTable.xaml b/Plugin.TestResult/DataTable.xaml
index 3c260c0..30ee9be 100644
--- a/Plugin.TestResult/DataTable.xaml
+++ b/Plugin.TestResult/DataTable.xaml
@@ -4,6 +4,12 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Plugin.TestResult_WPF"
+            xmlns:hb="clr-namespace:HMI.Base;assembly=HMI.Base"
+xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
+xmlns:pw="https://opensource.panuon.com/wpf"
+xmlns:pu="https://opensource.panuon.com/wpf-ui"
+xmlns:ui="clr-namespace:HMI.UI;assembly=HMI.UI"
+xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
              mc:Ignorable="d"
              Background="#FFF"
              BorderBrush="Black"
@@ -22,25 +28,44 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <Grid x:Name="infoGrid" Grid.Row="0"
-             Background="LightBlue">
+        <Grid x:Name="infoGrid" Grid.Row="0" Background="#a1eafb">
+            <Grid.RowDefinitions>
+                <RowDefinition/>
+                <RowDefinition/>
+            </Grid.RowDefinitions>
+            
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <Label Grid.Row="0" Grid.Column="0" Grid.RowSpan="1" FontSize="20" FontWeight="Bold" 
-                   Padding="0,0,20,0"
-                   BorderThickness="0,0,0,1"
-                   BorderBrush="Black"
-                   VerticalContentAlignment="Center" Background="Transparent" Content="{Binding title}"/>
+            
+            <TextBlock FontSize="{Binding ActualWidth,RelativeSource={RelativeSource AncestorType=UserControl}, 
+Converter={StaticResource FontSizeConverter}, ConverterParameter='30,940'}"
+                   FontWeight="Bold"
+                   Margin="0"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Center" Text="{Binding title}"/>
+
+            <ComboBox Grid.Row="1" FontSize="{Binding ActualWidth,RelativeSource={RelativeSource AncestorType=UserControl}, 
+Converter={StaticResource FontSizeConverter}, ConverterParameter='15,940'}"
+                      Style="{StaticResource FormComboxStyle}"
+                      pu:ComboBoxHelper.ClearButtonVisibility="Collapsed"
+                      BorderBrush="Black"
+                      BorderThickness="0,1,0,0"
+                      pu:ComboBoxHelper.Watermark="{DynamicResource Tr.ProductInfo}"
+                      Width="{Binding ActualWidth,RelativeSource={RelativeSource AncestorType=UserControl}, 
+Converter={StaticResource FontSizeConverter}, ConverterParameter='150,940'}"
+                      SelectedValuePath="Content"
+                      x:Name="CbProduct" SelectionChanged="CbProduct_SelectionChanged"/>
+
             <local:InfoTable x:Name="infoTable" Grid.Row="0" Grid.Column="1"
+                             Grid.RowSpan="2"
                FontSize="{Binding ActualWidth,RelativeSource={RelativeSource AncestorType=UserControl}, 
-            Converter={StaticResource FontSizeConverter}, ConverterParameter='15,940'}" 
-                             ></local:InfoTable>
+            Converter={StaticResource FontSizeConverter}, ConverterParameter='15,940'}"></local:InfoTable>
         </Grid>
 
-        <UniformGrid x:Name="mainGrid" Grid.Row="1" Columns="6" local:GridProperties.ShowBorder="True"
-                     local:GridProperties.InnerBorderIgnore="All">
+        <UniformGrid x:Name="mainGrid" Grid.Row="1" dp:UniformGridHelper.InnerBorder="1"
+                     dp:UniformGridHelper.InnerBorderIgnore="Left,Right,Bottom">
         </UniformGrid>
 
         <!--<local:Chart Grid.Row="2" x:Name="chart" BorderThickness="0,1,0,1" BorderBrush="Black" 
@@ -52,12 +77,16 @@
                     <DockPanel/>
                 </ItemsPanelTemplate>
             </StatusBar.ItemsPanel>
+            <StatusBarItem DockPanel.Dock="Left">
+                <Button Style="{StaticResource LinkButton}" Click="Button_Click_1">鎵爜鏋缃�</Button>
+            </StatusBarItem>
+
             <StatusBarItem DockPanel.Dock="Right">
                 <StackPanel Orientation="Horizontal">
                     <Ellipse Width="10" Height="10">
                         <Ellipse.Style>
                             <Style TargetType="Ellipse">
-                                <Setter Property="Fill" Value="Gray"/>
+                                <Setter Property="Fill" Value="LightGray"/>
                                 <Style.Triggers>
                                     <DataTrigger Binding="{Binding TcpServerStatus,ElementName=control}" Value="ERROR">
                                         <Setter Property="Fill" Value="Red"/>
@@ -79,6 +108,16 @@
             </StatusBarItem>
         </StatusBar>
 
-        <Button Grid.Row="4" Margin="0" Click="SetStationGlobal_Click" BorderThickness="0,1,0,0">鍚姩</Button>
+        <Grid Grid.Row="4">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <Button Click="ScanWindow_Click" Style="{StaticResource PrimaryButton}"
+        Content="{DynamicResource Tr.Scan}"/>
+            <Button Grid.Column="1" Click="SetStationGlobal_Click" Style="{StaticResource SuccessButton}"
+        Content="{DynamicResource App.Start}"/>
+        </Grid>
+        
     </Grid>
 </UserControl>
\ No newline at end of file

--
Gitblit v1.9.1