From 12e606635c42ea20f4b7c2bdda5204237a4b4c96 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 02 三月 2026 16:14:49 +0800
Subject: [PATCH] 优化
---
Plugin.TestResult/InfoWindow.xaml | 63 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/Plugin.TestResult/InfoWindow.xaml b/Plugin.TestResult/InfoWindow.xaml
index 290ba69..7d9d601 100644
--- a/Plugin.TestResult/InfoWindow.xaml
+++ b/Plugin.TestResult/InfoWindow.xaml
@@ -15,15 +15,18 @@
InteropOwnersMask="False"
Topmost="False"
Loaded="Window_Loaded"
+ SizeToContent="Height"
Unloaded="Window_Unloaded"
SizeChanged="Window_SizeChanged"
pu:WindowXModalDialog.Buttons="{x:Null}"
- Title="{Binding title}" Height="500" Width="800">
+ Title="{Binding title}" Width="800" Height="825">
<Grid x:Name="mainGrid">
<Grid.RowDefinitions>
- <RowDefinition/>
- <RowDefinition Height="Auto"/>
- <RowDefinition Height="Auto"/>
+ <RowDefinition Height="500"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="25"/>
</Grid.RowDefinitions>
<DataGrid ItemsSource="{Binding dataSource}" AutoGenerateColumns="False"
CanUserAddRows="False"
@@ -32,6 +35,9 @@
ColumnWidth="*"
VirtualizingStackPanel.VirtualizationMode="Standard"
FontSize="16">
+ <DataGrid.Resources>
+ <Style TargetType="ScrollBar" BasedOn="{StaticResource ScrollStyle_Mobile}"/>
+ </DataGrid.Resources>
<DataGrid.Columns>
<!--<DataGridTemplateColumn Header="#" CanUserResize="False" Width="Auto">
<DataGridTemplateColumn.CellTemplate>
@@ -41,21 +47,50 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>-->
- <DataGridTextColumn Header="娴嬭瘯椤瑰悕绉�" Binding="{Binding step}"/>
- <DataGridTextColumn Header="娴嬭瘯鍊�" Binding="{Binding value}"/>
- <DataGridTextColumn Header="娴嬭瘯缁撴灉" Binding="{Binding result}"/>
- <DataGridTextColumn Header="娴嬭瘯鑼冨洿" Binding="{Binding range}"/>
- <DataGridTextColumn Header="娴嬭瘯鏉′欢" Binding="{Binding condition}"/>
- <DataGridTextColumn Header="鏇存柊鏃堕棿" Binding="{Binding updateTime}"/>
+ <DataGridTextColumn Binding="{Binding step}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Test.Name}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Binding="{Binding value}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Test.Value}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Binding="{Binding limitUp}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Test.LimitUp}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Binding="{Binding limitDown}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Test.LimitDown}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Binding="{Binding unit}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Test.Unit}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Binding="{Binding result}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Test.Result}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Binding="{Binding updateTime}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Test.TestTime}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
</DataGrid.Columns>
</DataGrid>
- <Grid Background="#f1eded" Grid.Row="2" Height="25">
+ <Grid Background="#f1eded" Grid.Row="4">
<DockPanel>
<StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Margin="0,0,30,0">
<Label Padding="0" FontSize="12"
VerticalAlignment="Center"
-VerticalContentAlignment="Center" Content="鎺㈤拡浣跨敤娆℃暟:"/>
+VerticalContentAlignment="Center" Content="{DynamicResource Ts.ProbeCount}"/>
<Label Padding="0" FontSize="12" Margin="0,0,15,0"
VerticalAlignment="Center"
VerticalContentAlignment="Center" Content="{Binding ProbeCount}"/>
@@ -63,7 +98,7 @@
<Label x:Name="alarmLabel" Padding="0" FontSize="12"
VerticalAlignment="Center"
-VerticalContentAlignment="Center" Content="棰勮娆℃暟:"/>
+VerticalContentAlignment="Center" Content="{DynamicResource Ts.ProbeAlarmCount}"/>
<Label x:Name="alarmValue" Padding="0" FontSize="12"
VerticalAlignment="Center"
VerticalContentAlignment="Center" Content="{Binding ProbeWarn}"/>
@@ -73,7 +108,7 @@
<Label x:Name="probeCountAlarm" Visibility="Collapsed" DockPanel.Dock="Left" Padding="30,0" FontSize="12" Foreground="Red"
VerticalAlignment="Center"
-VerticalContentAlignment="Center" Content="鎺㈤拡浣跨敤宸茶揪鍒伴璀︽鏁帮紝璇锋敞鎰忥紒"/>
+VerticalContentAlignment="Center" Content="{DynamicResource Ts.ProbeAlarm}"/>
</DockPanel>
</Grid>
</Grid>
--
Gitblit v1.9.1