日常更新

Szmedi.RvKits/MEPTools/FacilityInfoProcessView.xaml

@@ -9,8 +9,8 @@
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="设备信息"
-    Width="800"
-    Height="450"
+    Width="900"
+    Height="600"
     d:DataContext="{d:DesignInstance Type=local:FacilityInfoProcessViewModel}"
     mc:Ignorable="d">
     <controls:MaterialWindow.Resources>
@@ -34,13 +34,15 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" MinWidth="200" />
             <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="300" MinWidth="100" />
+            <ColumnDefinition Width="250" MinWidth="100" />
         </Grid.ColumnDefinitions>
-        <GroupBox Header="设备表">
+        <GroupBox materialDesign:GroupBoxAssist.HeaderPadding="4" Header="设备表">
             <DataGrid
                 x:Name="Facilities"
                 Margin="-4"
                 d:ItemsSource="{d:SampleData ItemCount=5}"
+                materialDesign:DataGridAssist.CellPadding="8,0"
+                materialDesign:DataGridAssist.ColumnHeaderPadding="6"
                 AutoGenerateColumns="False"
                 CanUserAddRows="False"
                 FrozenColumnCount="2"
@@ -59,24 +61,19 @@
                     </Style>
                 </DataGrid.RowStyle>
                 <DataGrid.RowDetailsTemplate>
-                    <DataTemplate>
-                        <GroupBox Header="参数列表">
-                            <ItemsControl ItemsSource="{Binding Parameters}">
+                    <DataTemplate DataType="local:FacilityItem">
+                        <GroupBox materialDesign:GroupBoxAssist.HeaderPadding="4" Header="参数列表">
+                            <ItemsControl d:ItemsSource="{d:SampleData ItemCount=5}" ItemsSource="{Binding Parameters}">
                                 <ItemsControl.ItemTemplate>
-                                    <DataTemplate>
-                                        <StackPanel Margin="2" Orientation="Horizontal">
-                                            <TextBlock
-                                                Width="250"
-                                                HorizontalAlignment="Right"
-                                                VerticalAlignment="Center"
-                                                FontWeight="Bold"
-                                                Text="{Binding Name}" />
-                                            <TextBox
-                                                Padding="3"
-                                                VerticalContentAlignment="Center"
-                                                materialDesign:HintAssist.IsFloating="False"
-                                                Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}" />
-                                        </StackPanel>
+                                    <DataTemplate DataType="local:ParameterItem">
+                                        <TextBox
+                                            Padding="2"
+                                            HorizontalAlignment="Left"
+                                            VerticalContentAlignment="Center"
+                                            materialDesign:HintAssist.IsFloating="False"
+                                            materialDesign:TextFieldAssist.PrefixText="{Binding Name, StringFormat={}{0}：}"
+                                            Style="{StaticResource MaterialDesignTextBox}"
+                                            Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}" />
                                     </DataTemplate>
                                 </ItemsControl.ItemTemplate>
                             </ItemsControl>
@@ -87,9 +84,10 @@
 
                     <DataGridCheckBoxColumn Binding="{Binding IsSelected}">
                         <DataGridCheckBoxColumn.Header>
-                            <Border Background="Transparent">
-                                <CheckBox Content="全选" IsChecked="{Binding DataContext.IsAllItemsSelected, RelativeSource={RelativeSource AncestorType=DataGrid}}" />
-                            </Border>
+                            <CheckBox
+                                VerticalContentAlignment="Center"
+                                Content="全选"
+                                IsChecked="{Binding DataContext.IsAllItemsSelected, RelativeSource={RelativeSource AncestorType=DataGrid}}" />
                         </DataGridCheckBoxColumn.Header>
                         <DataGridCheckBoxColumn.HeaderStyle>
                             <Style BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}" TargetType="{x:Type DataGridColumnHeader}">
@@ -224,6 +222,7 @@
         <GroupBox
             Grid.Row="0"
             Grid.Column="2"
+            materialDesign:GroupBoxAssist.HeaderPadding="4"
             Header="构件实例表">
             <Grid>
                 <Grid.RowDefinitions>
@@ -234,6 +233,8 @@
                     x:Name="InstancesDG"
                     Margin="-4"
                     d:ItemsSource="{d:SampleData ItemCount=5}"
+                    materialDesign:DataGridAssist.CellPadding="8,0"
+                    materialDesign:DataGridAssist.ColumnHeaderPadding="6"
                     AutoGenerateColumns="False"
                     CanUserAddRows="False"
                     ItemsSource="{Binding ElementName=Facilities, Path=SelectedItem.Instances}"
@@ -310,7 +311,6 @@
                     </Button>
                     <GridSplitter Width="2" Background="Gray" />
                     <Button
-                        Grid.Row="1"
                         Margin="2,0"
                         Command="{Binding RepickInstancesByRectangleCommand}"
                         CommandParameter="{Binding SelectedFacility.MappedFamily}"