From c1c3772a11b1f3fbad8846cc714120771d85fa53 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 12 六月 2025 20:10:59 +0800
Subject: [PATCH] 新增SeqEditor
---
Plugin.TestResult/DataTable.xaml | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/Plugin.TestResult/DataTable.xaml b/Plugin.TestResult/DataTable.xaml
index 12d9661..30ee9be 100644
--- a/Plugin.TestResult/DataTable.xaml
+++ b/Plugin.TestResult/DataTable.xaml
@@ -28,22 +28,43 @@
<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.RowSpan="1" FontSize="20" FontWeight="Bold"
- Padding="0,0,20,0"
- BorderThickness="0"
- VerticalContentAlignment="Stretch" 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>
</Grid>
- <UniformGrid x:Name="mainGrid" Grid.Row="1" Columns="6" dp:UniformGridHelper.InnerBorder="1"
+ <UniformGrid x:Name="mainGrid" Grid.Row="1" dp:UniformGridHelper.InnerBorder="1"
dp:UniformGridHelper.InnerBorderIgnore="Left,Right,Bottom">
</UniformGrid>
@@ -56,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"/>
@@ -83,8 +108,16 @@
</StatusBarItem>
</StatusBar>
- <Button Grid.Row="4" Click="SetStationGlobal_Click" Style="{StaticResource SuccessButton}"
- Content="{DynamicResource App.Start}"
- />
+ <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