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

MainWindow.xaml

@@ -122,8 +122,8 @@
         <Button Content="保存" HorizontalAlignment="Left" Height="40" Width="80" Margin="15,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="save" IsTabStop="False" Focusable ="False"/>
         <Button Content="删除" HorizontalAlignment="Left" Height="40" Width="80" Margin="100,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="delete" IsTabStop="False" Focusable ="False"/>
 
-        <Grid  Height="255" Margin="410,35,5,0" VerticalAlignment="Top" Background="#FFF7F7F7" >
-            <ContentControl x:Name="Deputy" />
+        <Grid Grid.Column="1">
+            <ContentControl x:Name="Deputy" Height="255" Margin="410,35,5,0" VerticalAlignment="Top" Background="#FFF7F7F7" />
         </Grid>
 
     </Grid>

MainWindow.xaml.cs

@@ -147,9 +147,7 @@ namespace formula_manage
 
         private void Button_Technology(object sender, RoutedEventArgs e)
         {
-           // Window Deputy = new Window();  //支持导航预设工艺窗口
-           // Deputy.Content = new View.ViewProcess();  
-          //  Deputy.Show();  //打开窗口
+            Deputy.Content = new View.ViewProcess();  //打开工艺选择
         }
     }
 }

View/ViewProcess.xaml

@@ -1,18 +1,16 @@
-<Page x:Class="formula_manage.View.ViewProcess"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:formula_manage.View"
-      mc:Ignorable="d" 
-      d:DesignHeight="150" d:DesignWidth="405"
-      Title="ViewProcess">
-
+<UserControl x:Class="formula_manage.View.ViewProcess"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:formula_manage.View"
+             mc:Ignorable="d" 
+             d:DesignHeight="150" d:DesignWidth="405">
     <Grid>
         <DataGrid x:Name="edit" AlternationCount="2" IsReadOnly="False" 
-            Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=30}" 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" SelectionMode="Single">
+      Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=30}" 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" SelectionMode="Single">
             <DataGrid.RowStyle >
                 <Style TargetType="{x:Type DataGridRow}">
                     <Style.Triggers>
@@ -52,6 +50,5 @@
                 <DataGridTextColumn Header="备注" Width="400" FontSize="15" MinWidth="100" CanUserReorder="False"/>
             </DataGrid.Columns>
         </DataGrid>
-
     </Grid>
-</Page>
+</UserControl>

View/ViewProcess.xaml.cs

@@ -18,7 +18,7 @@ namespace formula_manage.View
     /// <summary>
     /// ViewProcess.xaml 的交互逻辑
     /// </summary>
-    public partial class ViewProcess : Page
+    public partial class ViewProcess : UserControl
     {
         public ViewProcess()
         {