From 6bcafc823e836ecd5790f87178a906333699f868 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 10 四月 2025 10:46:47 +0800
Subject: [PATCH] 优化插件结构；
---
Plugin.TestResult/DataTable.xaml | 48 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/Plugin.TestResult/DataTable.xaml b/Plugin.TestResult/DataTable.xaml
index 12d9661..b0bfc58 100644
--- a/Plugin.TestResult/DataTable.xaml
+++ b/Plugin.TestResult/DataTable.xaml
@@ -28,22 +28,42 @@
<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="LightBlue">
+ <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" Background="Transparent" 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>
@@ -83,8 +103,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