From 12e606635c42ea20f4b7c2bdda5204237a4b4c96 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 02 三月 2026 16:14:49 +0800
Subject: [PATCH] 优化
---
Plugin.TsExecution/SingleControl.xaml | 78 ++++++++++++++-------------------------
1 files changed, 28 insertions(+), 50 deletions(-)
diff --git a/Plugin.TsExecution/SingleControl.xaml b/Plugin.TsExecution/SingleControl.xaml
index ff6a19b..905a810 100644
--- a/Plugin.TsExecution/SingleControl.xaml
+++ b/Plugin.TsExecution/SingleControl.xaml
@@ -29,14 +29,14 @@
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="5"/>
<Setter Property="FontSize" Value="{Binding ActualWidth,ElementName=control,
-Converter={StaticResource fc}, ConverterParameter='20,1093,20'}"/>
+Converter={StaticResource fc}, ConverterParameter='25,1093'}"/>
</Style>
<Style TargetType="TextBlock" x:Key="baseText">
<Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Padding" Value="0,0,2,0"/>
<Setter Property="FontSize" Value="{Binding ActualWidth,ElementName=control,
-Converter={StaticResource fc}, ConverterParameter='20,1093,20'}"/>
+Converter={StaticResource fc}, ConverterParameter='25,1093'}"/>
</Style>
<Brush x:Key="passedColor">#beed00</Brush>
</ResourceDictionary>
@@ -51,8 +51,8 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
- <Grid dp:GridHelper.InnerBorder="1" dp:GridHelper.Space="5"
- dp:GridHelper.InnerBorderBrush="{StaticResource CommonBoarder}">
+ <Grid dp:GridHelper.InnerBorder="1" dp:GridHelper.Space="2"
+ dp:GridHelper.InnerBorderBrush="{DynamicResource CommonBoarder}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition/>
@@ -74,10 +74,10 @@
<Setter Property="Background" Value="Gold"/>
</DataTrigger>
<DataTrigger Binding="{Binding Status}" Value="Failed">
- <Setter Property="Background" Value="{StaticResource DangerColor}"/>
+ <Setter Property="Background" Value="{DynamicResource DangerColor}"/>
</DataTrigger>
<DataTrigger Binding="{Binding Status}" Value="Failed">
- <Setter Property="Background" Value="{StaticResource DangerColor}"/>
+ <Setter Property="Background" Value="{DynamicResource DangerColor}"/>
</DataTrigger>
<DataTrigger Binding="{Binding Status}" Value="Ready">
<Setter Property="Background" Value="DeepSkyBlue"/>
@@ -108,11 +108,11 @@
</DataTrigger>
<DataTrigger Binding="{Binding Status}" Value="Failed">
<Setter Property="Content" Value=""/>
- <Setter Property="Background" Value="{StaticResource DangerColor}"/>
+ <Setter Property="Background" Value="{DynamicResource DangerColor}"/>
</DataTrigger>
<DataTrigger Binding="{Binding Status}" Value="Failed">
<Setter Property="Content" Value=""/>
- <Setter Property="Background" Value="{StaticResource DangerColor}"/>
+ <Setter Property="Background" Value="{DynamicResource DangerColor}"/>
</DataTrigger>
<DataTrigger Binding="{Binding Status}" Value="Ready">
<Setter Property="Content" Value=""/>
@@ -160,7 +160,7 @@
</Label>
</Grid>
- <Grid Grid.Row="2" x:Name="simplePanel" dp:GridHelper.Space="5" dp:GridHelper.SpaceIgnore="TOP">
+ <Grid Grid.Row="2" x:Name="simplePanel" dp:GridHelper.Space="2" dp:GridHelper.SpaceIgnore="TOP">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition Height="Auto"/>
@@ -180,7 +180,7 @@
<Setter Property="Foreground" Value="#000"/>
</DataTrigger>
<DataTrigger Binding="{Binding Status}" Value="Failed">
- <Setter Property="Background" Value="{StaticResource DangerColor}"/>
+ <Setter Property="Background" Value="{DynamicResource DangerColor}"/>
<Setter Property="Content" Value="--FAIL--"/>
<Setter Property="Foreground" Value="#000"/>
</DataTrigger>
@@ -326,7 +326,7 @@
<Setter TargetName="text" Property="Foreground" Value="#000"/>
</DataTrigger>
<DataTrigger Binding="{Binding Result}" Value="Failed">
- <Setter TargetName="border" Property="Background" Value="{StaticResource DangerColor}"/>
+ <Setter TargetName="border" Property="Background" Value="{DynamicResource DangerColor}"/>
<Setter TargetName="text" Property="Foreground" Value="#000"/>
</DataTrigger>
</DataTemplate.Triggers>
@@ -337,16 +337,8 @@
</ListView.View>
</ListView>-->
- <DataGrid Grid.Row="0" Style="{StaticResource DefaultDataGrid}"
- Margin="5,0,5,5"
- pu:DataGridHelper.ColumnHeaderFontWeight="Normal"
- pu:DataGridHelper.ColumnHeaderFontSize="{Binding ActualWidth,
- ElementName=control,
-Converter={StaticResource fc}, ConverterParameter='11,1093,14'}"
- FontSize="{Binding ActualWidth,
- ElementName=control,
-Converter={StaticResource fc}, ConverterParameter='11,1093,14'}"
- pu:DataGridHelper.ColumnHeaderPadding="3"
+ <DataGrid Grid.Row="0" Style="{StaticResource DefaultDataGrid}" Margin="2,0,2,2"
+ FontSize="{DynamicResource tableFontSize}"
dp:DataGridHelper.ShowRowNumber="True"
VirtualizingPanel.IsContainerVirtualizable="True"
VirtualizingPanel.IsVirtualizing="True"
@@ -354,60 +346,46 @@
RowHeight="{StaticResource nanD}"
ColumnHeaderHeight="{Binding ActualWidth,ElementName=control,
Converter={StaticResource fc}, ConverterParameter='32,1093,30,45'}"
+ HorizontalScrollBarVisibility="Disabled"
ItemsSource="{Binding Datasource}" x:Name="table">
- <DataGrid.Resources>
- <Style TargetType="DataGridCell"
- BasedOn="{StaticResource {x:Static pu:StyleKeys.DataGridCellStyle}}">
- <Setter Property="Background" Value="Transparent"/>
- <Setter Property="Padding" Value="2"/>
- <Setter Property="BorderThickness" Value="0"/>
- <Setter Property="Background" Value="Transparent"/>
- </Style>
-
- <Style TargetType="DataGridColumnHeader"
-BasedOn="{StaticResource {x:Static pu:StyleKeys.DataGridColumnHeaderStyle}}">
- <Setter Property="Padding" Value="5"/>
- <Setter Property="BorderThickness" Value="0"/>
- </Style>
- </DataGrid.Resources>
<DataGrid.Columns>
<DataGridTextColumn Header="#"
- ElementStyle="{StaticResource TableTextBlock}"
- Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}"
- Width="0.4*"/>
+ ElementStyle="{StaticResource TableTextBlock}"
+ Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}"
+ Width="0.4*"/>
<DataGridTextColumn Width="2.5*" Binding="{Binding Name}"
- ElementStyle="{StaticResource TableTextBlock}">
+ ElementStyle="{StaticResource TableTextBlock}">
<DataGridTextColumn.Header>
<TextBlock Text="{DynamicResource Test.Name}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<DataGridTextColumn Width="0.8*" Binding="{Binding Unit}"
- ElementStyle="{StaticResource TableTextBlock}">
+ ElementStyle="{StaticResource TableTextBlock}">
<DataGridTextColumn.Header>
<TextBlock Text="{DynamicResource Test.Unit}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<DataGridTextColumn Width="2*" Binding="{Binding Value}"
- ElementStyle="{StaticResource TableTextBlock}">
+ ElementStyle="{StaticResource TableTextBlock}">
<DataGridTextColumn.Header>
<TextBlock Text="{DynamicResource Test.Value}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<DataGridTextColumn Width="1.5*" Binding="{Binding LimitDown}"
- ElementStyle="{StaticResource TableTextBlock}">
+ ElementStyle="{StaticResource TableTextBlock}">
<DataGridTextColumn.Header>
<TextBlock Text="{DynamicResource Test.LimitDown}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<DataGridTextColumn Width="1.5*" Binding="{Binding LimitUp}"
- ElementStyle="{StaticResource TableTextBlock}">
+ ElementStyle="{StaticResource TableTextBlock}">
<DataGridTextColumn.Header>
<TextBlock Text="{DynamicResource Test.LimitUp}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<DataGridTextColumn Width="0.6*" Binding="{Binding ConsumeTime}"
- ElementStyle="{StaticResource TableTextBlock}">
+ ElementStyle="{StaticResource TableTextBlock}">
<DataGridTextColumn.Header>
<TextBlock Text="{DynamicResource Test.ConsumeTime}"/>
</DataGridTextColumn.Header>
@@ -427,7 +405,7 @@
<Setter TargetName="text" Property="Foreground" Value="#000"/>
</DataTrigger>
<DataTrigger Binding="{Binding Result}" Value="Failed">
- <Setter TargetName="border" Property="Background" Value="{StaticResource DangerColor}"/>
+ <Setter TargetName="border" Property="Background" Value="{DynamicResource DangerColor}"/>
<Setter TargetName="text" Property="Foreground" Value="#000"/>
</DataTrigger>
</DataTemplate.Triggers>
@@ -450,7 +428,7 @@
<StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Margin="0,0,5,0">
<!--<Button FontSize="12" x:Name="scannerSetting"
- Margin="0,0,10,0" Click="Button_Click" Content="鎵爜鏋缃�">
+ Margin="0,0,10,0" Click="Button_Click" Content="{DynamicResource App.ScannerSetting}">
<Button.Style>
<Style TargetType="Button" BasedOn="{StaticResource LinkButton}">
<Style.Triggers>
@@ -508,7 +486,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition />
</Grid.ColumnDefinitions>
- <Border Padding="10,5,0,5" Grid.ColumnSpan="2" Background="{StaticResource WarningColor}"
+ <Border Padding="10,5,0,5" Grid.ColumnSpan="2" Background="{DynamicResource WarningColor}"
CornerRadius="5,5,0,0">
<Label Padding="0" Margin="0" Foreground="#FFF" Content="{DynamicResource App.Warn}"/>
</Border>
@@ -526,7 +504,7 @@
<Button Style="{StaticResource ModalButton}"
x:Name="continuePauseBtn"
Click="Button_Click"
- Background="{StaticResource WarningColor}"
+ Background="{DynamicResource WarningColor}"
Tag="OK" Content="{DynamicResource App.Continue}"/>
</StackPanel>
</Grid>
@@ -546,7 +524,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition />
</Grid.ColumnDefinitions>
- <Border Padding="10,5,0,5" Grid.ColumnSpan="2" Background="{StaticResource PrimaryColor}"
+ <Border Padding="10,5,0,5" Grid.ColumnSpan="2" Background="{DynamicResource PrimaryColor}"
CornerRadius="5,5,0,0">
<Label Padding="0" Margin="0" Foreground="#FFF" Content="璇锋壂鐮�"/>
</Border>
--
Gitblit v1.9.1