From 006c98e5650b530e5220f279c1e803fefe69d40d Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 25 十一月 2025 15:47:33 +0800
Subject: [PATCH] 优化一些东西；

---
 Plugin.TsExecution/SingleControl.xaml |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Plugin.TsExecution/SingleControl.xaml b/Plugin.TsExecution/SingleControl.xaml
index 11d834d..613494d 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>
@@ -339,12 +339,11 @@
 
             <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='15,1093,15,22'}"
-            FontSize="{Binding ActualWidth,
-            ElementName=control,
-Converter={StaticResource fc}, ConverterParameter='15,1093,15,20'}"
+Converter={StaticResource fc}, ConverterParameter='11,1093,14'}"
+            FontSize="{DynamicResource tableFontSize}"
                   pu:DataGridHelper.ColumnHeaderPadding="3"
                   dp:DataGridHelper.ShowRowNumber="True"
                   VirtualizingPanel.IsContainerVirtualizable="True"
@@ -352,9 +351,8 @@
                   VirtualizingPanel.VirtualizationMode="Recycling"
                   RowHeight="{StaticResource nanD}"
                   ColumnHeaderHeight="{Binding ActualWidth,ElementName=control,
-Converter={StaticResource fc}, ConverterParameter='30,1093,-1,45'}"
-                  ItemsSource="{Binding Datasource}"
-                  x:Name="table">
+Converter={StaticResource fc}, ConverterParameter='32,1093,30,45'}"
+                  ItemsSource="{Binding Datasource}" x:Name="table">
                 <DataGrid.Resources>
                     <Style TargetType="DataGridCell" 
        BasedOn="{StaticResource {x:Static pu:StyleKeys.DataGridCellStyle}}">
@@ -369,50 +367,52 @@
                         <Setter Property="Padding" Value="5"/>
                         <Setter Property="BorderThickness" Value="0"/>
                     </Style>
+
+                    <Style TargetType="ScrollBar" BasedOn="{StaticResource ScrollStyle_Mobile}"/>
                 </DataGrid.Resources>
 
                 <DataGrid.Columns>
                     <DataGridTextColumn Header="#" 
                                         ElementStyle="{StaticResource TableTextBlock}"
                         Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}" 
-                                    Width="60"/>
-                    <DataGridTextColumn Width="*" Binding="{Binding Name}" 
+                                    Width="0.4*"/>
+                    <DataGridTextColumn Width="2.5*" Binding="{Binding Name}" 
                                         ElementStyle="{StaticResource TableTextBlock}">
                         <DataGridTextColumn.Header>
                             <TextBlock Text="{DynamicResource Test.Name}"/>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Width="100" Binding="{Binding Unit}" 
+                    <DataGridTextColumn Width="0.8*" Binding="{Binding Unit}" 
                                         ElementStyle="{StaticResource TableTextBlock}">
                         <DataGridTextColumn.Header>
                             <TextBlock Text="{DynamicResource Test.Unit}"/>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Width="*" Binding="{Binding Value}" 
+                    <DataGridTextColumn Width="2*" Binding="{Binding Value}" 
                                         ElementStyle="{StaticResource TableTextBlock}">
                         <DataGridTextColumn.Header>
                             <TextBlock Text="{DynamicResource Test.Value}"/>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Width="*" Binding="{Binding LimitDown}" 
+                    <DataGridTextColumn Width="1.5*" Binding="{Binding LimitDown}" 
                                         ElementStyle="{StaticResource TableTextBlock}">
                         <DataGridTextColumn.Header>
                             <TextBlock Text="{DynamicResource Test.LimitDown}"/>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Width="*" Binding="{Binding LimitUp}" 
+                    <DataGridTextColumn Width="1.5*" Binding="{Binding LimitUp}" 
                                         ElementStyle="{StaticResource TableTextBlock}">
                         <DataGridTextColumn.Header>
                             <TextBlock Text="{DynamicResource Test.LimitUp}"/>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Width="180" Binding="{Binding ConsumeTime}"
+                    <DataGridTextColumn Width="0.6*" Binding="{Binding ConsumeTime}"
                     ElementStyle="{StaticResource TableTextBlock}">
                         <DataGridTextColumn.Header>
                             <TextBlock Text="{DynamicResource Test.ConsumeTime}"/>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTemplateColumn Width="120">
+                    <DataGridTemplateColumn Width="1*">
                         <DataGridTemplateColumn.Header>
                             <TextBlock Text="{DynamicResource Test.Result}"/>
                         </DataGridTemplateColumn.Header>

--
Gitblit v1.9.1