Sic-Software
/
Sic.Framework
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修正系统配置界面的DataGrid可能太宽的问题。

This commit is contained in:
SL 2024-07-12 18:42:43 +08:00
parent 9b5b3f6810
commit 397c17c458
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
MECF.Framework.UI.Client/CenterViews/Configs/SystemConfig/SystemConfigView.xaml
View File

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