测试模块

block2014 · Apr 15, 2019 · 7574c22 · 7574c22
1 parent d08eacd
commit 7574c22
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Xky.XModule.Demo/Panel.xaml b/Xky.XModule.Demo/Panel.xaml
@@ -29,8 +29,8 @@
                     <UserControl:MyProgressbar  Width="200" TrackBrush="#373d45" IndicatorBrush="#d76a00" Maximum="100" Value="60"/>
                 </StackPanel>
                 <StackPanel Margin="0,50,0,0" Orientation="Horizontal" HorizontalAlignment="Right">
-                    <UserControl:MyButton Background="#454c56" Width="50" Height="32" Margin="0,0,20,0" Text="取消" Click="Button_Click" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-                    <UserControl:MyButton Width="100" Height="32" Margin="0,0,0,0" Text="执行" Click="Button_Click" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+                    <UserControl:MyButton Background="#454c56" Width="50" Height="32" Margin="0,0,20,0" Text="取消" Click="btn_cancel_Click" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+                    <UserControl:MyButton Width="100" Height="32" Margin="0,0,0,0" Text="执行" Click="btn_ok_Click" VerticalAlignment="Center" HorizontalAlignment="Right"/>
                 </StackPanel>
             </StackPanel>
 

diff --git a/Xky.XModule.Demo/Panel.xaml.cs b/Xky.XModule.Demo/Panel.xaml.cs
@@ -40,7 +40,7 @@ private void btn_file_Click(object sender, RoutedEventArgs e)
             }
 
         }
-        private void Button_Click(object sender, RoutedEventArgs e)
+        private void btn_ok_Click(object sender, RoutedEventArgs e)
         {
             if (text_filename.Text.Length == 0)
             {
@@ -49,5 +49,11 @@ private void Button_Click(object sender, RoutedEventArgs e)
             else { Client.CloseDialogPanel();}
 
         }
+        private void btn_cancel_Click(object sender, RoutedEventArgs e)
+        {
+
+         Client.CloseDialogPanel(); 
+
+        }
     }
 }