From 7bf89fd93bc487e8445d6d85bb527251b7371a04 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 12 五月 2025 13:14:11 +0800
Subject: [PATCH] 优化项目；
---
Plugin.TsExecution/SingleControl.xaml | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/Plugin.TsExecution/SingleControl.xaml b/Plugin.TsExecution/SingleControl.xaml
index cf3ad24..77ef0cd 100644
--- a/Plugin.TsExecution/SingleControl.xaml
+++ b/Plugin.TsExecution/SingleControl.xaml
@@ -29,6 +29,8 @@
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition/>
+ <RowDefinition Height="Auto"/>
+ <RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid dp:GridHelper.InnerBorder="1" dp:GridHelper.Space="5"
@@ -106,9 +108,14 @@
<DataGrid Grid.Row="2" Style="{StaticResource DefaultDataGrid}"
pu:DataGridHelper.ColumnHeaderFontSize="12"
pu:DataGridHelper.ColumnHeaderPadding="3"
+ dp:DataGridHelper.ShowRowNumber="True"
+ VirtualizingPanel.IsContainerVirtualizable="True"
+ VirtualizingPanel.IsVirtualizing="True"
+ VirtualizingPanel.VirtualizationMode="Recycling"
RowHeight="20"
FontSize="12"
ColumnHeaderHeight="30"
+ ItemsSource="{Binding Datasource}"
x:Name="table">
<DataGrid.Resources>
<Style TargetType="DataGridCell"
@@ -127,15 +134,18 @@
</DataGrid.Resources>
<DataGrid.Columns>
- <DataGridTemplateColumn Header="#" CanUserResize="False">
+ <!--<DataGridTemplateColumn Header="#" CanUserResize="False">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding Converter={StaticResource rowNumber},
RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
- </DataGridTemplateColumn>
+ </DataGridTemplateColumn>-->
+ <DataGridTextColumn Header="#"
+ Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}"
+ Width="40"/>
<DataGridTextColumn Width="*" Binding="{Binding Name}">
<DataGridTextColumn.Header>
<TextBlock Text="{DynamicResource Test.Name}"/>
@@ -181,5 +191,50 @@
</DataGridTemplateColumn>
</DataGrid.Columns>
</DataGrid>
+ <Grid Grid.Row="3" Height="20" Margin="0">
+ <ProgressBar Grid.Row="3" x:Name="testProcess" />
+ <Label Width="45" DockPanel.Dock="Right" x:Name="testProcessLabel" Padding="0"
+ VerticalContentAlignment="Center"/>
+ </Grid>
+
+ <Grid Background="#f1eded" Grid.Row="4" Height="25">
+ <DockPanel>
+ <Label Padding="0" VerticalContentAlignment="Center" Content="{Binding CurrentStep}"/>
+
+ <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Margin="0,0,5,0">
+ <Label Padding="0" FontSize="12"
+VerticalAlignment="Center"
+VerticalContentAlignment="Center" Content="{DynamicResource Ts.ProbeCount}"/>
+ <Label Padding="0" FontSize="12" Margin="0,0,15,0"
+VerticalAlignment="Center"
+VerticalContentAlignment="Center" Content="{Binding ProbeCount}"/>
+
+ <StackPanel x:Name="probeWarnPanel" Orientation="Horizontal" Visibility="Collapsed">
+ <Label x:Name="alarmLabel" Padding="0" FontSize="12"
+VerticalAlignment="Center"
+VerticalContentAlignment="Center" Content="{DynamicResource Ts.ProbeAlarmCount}"/>
+ <Label x:Name="alarmValue" Padding="0" FontSize="12"
+VerticalAlignment="Center"
+VerticalContentAlignment="Center" Content="{Binding ProbeWarn}"/>
+ </StackPanel>
+
+ <Button Style="{StaticResource LinkButton}" x:Name="clear" Margin="10,0,0,0" Click="Button_Click"
+ Content="{DynamicResource App.Clear}"/>
+ </StackPanel>
+
+ <Label x:Name="probeCountAlarm" Visibility="Collapsed" DockPanel.Dock="Left" Padding="30,0" FontSize="12" Foreground="Red"
+VerticalAlignment="Center"
+VerticalContentAlignment="Center" Content="{DynamicResource Ts.ProbeAlarm}"/>
+ </DockPanel>
+ </Grid>
+ <!--<DockPanel Grid.Row="4">
+ <StatusBar>
+ <StatusBarItem>
+ <Label Padding="0" VerticalContentAlignment="Center" Content="{Binding CurrentStep}"/>
+
+
+ </StatusBarItem>
+ </StatusBar>
+ </DockPanel>-->
</Grid>
</UserControl>
--
Gitblit v1.9.1