Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage

Help.xaml

@@ -9,7 +9,7 @@
     <Grid>
         <Rectangle HorizontalAlignment="Center" Height="165" Margin="0,20,0,0" VerticalAlignment="Top" Width="170">
             <Rectangle.Fill>
-                <ImageBrush ImageSource="/sunlight_sc.png"/>
+                <ImageBrush ImageSource="/sunlight_logo.jpg"/>
             </Rectangle.Fill>
         </Rectangle>
         <Label Content="化学品单据管理客户端" HorizontalAlignment="Left" Height="35" Margin="55,210,0,0" VerticalAlignment="Top" Width="175" FontSize="16"/>

MainWindow.xaml

@@ -31,10 +31,10 @@
             </MenuItem>
             <MenuItem Header="_查询" FontSize="16"/>
         </Menu>
-        <DataGrid x:Name="DataGridMachines" AlternationCount="2" IsReadOnly="True" 
-                  Margin="5,300,5,100" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" 
+        <DataGrid x:Name="Selectio" AlternationCount="2" IsReadOnly="True" 
+                  Margin="5,300,5,100" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30"
                   HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" 
-                  BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" CanUserReorderColumns="False" Background="White">
+                  BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" CanUserReorderColumns="False" Background="White" SelectionMode="Single">
             <DataGrid.RowStyle >
                 <Style TargetType="{x:Type DataGridRow}">
                     <Style.Triggers>

formula_manage.csproj

@@ -113,6 +113,11 @@
   <ItemGroup>
     <Resource Include="sunlight_sc.png" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="sunlight_logo.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="sunlight_logotext.jpg" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>