From 397c17c4584b675a79e7522cc7b3b92989b1e10f Mon Sep 17 00:00:00 2001
From: SL <123@123.com>
Date: Fri, 12 Jul 2024 18:42:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2=E7=9A=84DataGrid=E5=8F=AF?=
 =?UTF-8?q?=E8=83=BD=E5=A4=AA=E5=AE=BD=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SystemConfig/SystemConfigView.xaml        | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/MECF.Framework.UI.Client/CenterViews/Configs/SystemConfig/SystemConfigView.xaml b/MECF.Framework.UI.Client/CenterViews/Configs/SystemConfig/SystemConfigView.xaml
index bba95b4..e4ce84c 100644
--- a/MECF.Framework.UI.Client/CenterViews/Configs/SystemConfig/SystemConfigView.xaml
+++ b/MECF.Framework.UI.Client/CenterViews/Configs/SystemConfig/SystemConfigView.xaml
@@ -112,10 +112,10 @@
 
             <systemConfig:ConfigValueTemplateSelector.SelectionTemplate>
                 <DataTemplate>
-                    <Grid Width="140">
+                    <Grid>
                         <ComboBox
-                            Width="140"
-                            HorizontalAlignment="Center"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
                             ItemsSource="{Binding Options}"
                             SelectedValue="{Binding StringValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                             <ComboBox.ItemTemplate>
@@ -304,6 +304,7 @@
                 <DataGrid
                     Grid.Row="1"
                     Margin="0,5,0,0"
+                    ColumnWidth="*"
                     HorizontalAlignment="Stretch"
                     AutoGenerateColumns="False"
                     CanUserAddRows="False"
@@ -419,7 +420,7 @@
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
 
-                        <DataGridTemplateColumn MinWidth="120" Header="Unit">
+                        <DataGridTemplateColumn MinWidth="60" Header="Unit">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <TextBlock
@@ -435,7 +436,7 @@
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
 
-                        <DataGridTemplateColumn MinWidth="120" Header="Min">
+                        <DataGridTemplateColumn MinWidth="100" Header="Min">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <TextBlock
@@ -451,7 +452,7 @@
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
 
-                        <DataGridTemplateColumn MinWidth="120" Header="Max">
+                        <DataGridTemplateColumn MinWidth="100" Header="Max">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <TextBlock
@@ -466,7 +467,7 @@
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
-                        <DataGridTemplateColumn MinWidth="120" Header="PreviousValue">
+                        <DataGridTemplateColumn MinWidth="60" Header="PreviousValue">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <TextBlock
@@ -481,7 +482,7 @@
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
-                        <DataGridTemplateColumn MinWidth="200" Header="Value">
+                        <DataGridTemplateColumn MinWidth="60" Header="Value">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <TextBlock
@@ -498,9 +499,9 @@
                         </DataGridTemplateColumn>
 
                         <DataGridTemplateColumn
-                            MinWidth="140"
+                            MinWidth="60"
                             CellTemplateSelector="{StaticResource ConfigValueTemplateSelector}"
-                            Header="Setpoint" />
+                            Header="SetPoint" />
 
                         <DataGridTemplateColumn MinWidth="120">
                             <DataGridTemplateColumn.CellTemplate>