Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage

MainWindow.xaml

@@ -76,12 +76,12 @@
             <ComboBox HorizontalAlignment="Left" Height="30" Margin="270,110,0,0" Text="" VerticalAlignment="Top" Width="130" FontSize="20" Focusable ="False" IsEditable="True"/>
         </Grid>
 
-        <DataGrid AlternationCount="2" IsReadOnly="False" 
+        <DataGrid x:Name="DetailedGrid" AlternationCount="2" IsReadOnly="False" InitializingNewItem="DataGrid_InitializingNewItem"
-                  Margin="5,300,5,100" d:ItemsSource="{d:SampleData ItemCount=30}" AutoGenerateColumns="False" MinColumnWidth="30"
+                  Margin="5,300,5,100" d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"
                   HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" 
-                  BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" 
+                  BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2"
-                  CanUserAddRows="True" CanUserDeleteRows="True" CanUserSortColumns="False" 
+                  CanUserDeleteRows="True" CanUserSortColumns="False" LoadingRow="DataGrid_LoadingRow"
-                  Background="White" SelectionMode="Single" FontSize="15">
+                  Background="White" SelectionMode="Single" FontSize="15" CanUserResizeRows="False">
             <DataGrid.RowStyle >
                 <Style TargetType="{x:Type DataGridRow}">
                     <Style.Triggers>
@@ -111,7 +111,8 @@
             </DataGrid.CellStyle>
             <DataGrid.Columns>
                 <!--列信息绑定-->
-                <DataGridTextColumn Header="顺序" Width="50" FontSize="15" MaxWidth="50" MinWidth="50" CanUserReorder="False"/>
+                <DataGridTextColumn Header="序列" Width="50" FontSize="15" MaxWidth="50" MinWidth="50" CanUserReorder="False"
+                                    IsReadOnly="True" Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}"/>
                 <DataGridTextColumn Header="原料代码" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
                 <DataGridTextColumn Header="目标饱和度(%)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
                 <DataGridTemplateColumn Header="计算单位" Width="80"  MaxWidth="80" MinWidth="80" CanUserReorder="False">

MainWindow.xaml.cs

@@ -155,6 +155,14 @@ namespace formula_manage
             Deputy.Content = new View.Formula();  //打开配方选择
         }
 
-     
+        private void DataGrid_InitializingNewItem(object sender, InitializingNewItemEventArgs e)
+        {
+           
+        }
+
+        private void DataGrid_LoadingRow(object sender, DataGridRowEventArgs e)
+        {
+            e.Row.Header = e.Row.GetIndex() + 1;
+        }
     }
 }