diff --git a/JianGongYun/MainWindow.xaml b/JianGongYun/MainWindow.xaml index 3816e38..5ede3f5 100644 --- a/JianGongYun/MainWindow.xaml +++ b/JianGongYun/MainWindow.xaml @@ -33,6 +33,6 @@ - + diff --git a/JianGongYun/ViewModel/MainViewModel.cs b/JianGongYun/ViewModel/MainViewModel.cs index 23d3b23..9272af9 100644 --- a/JianGongYun/ViewModel/MainViewModel.cs +++ b/JianGongYun/ViewModel/MainViewModel.cs @@ -17,11 +17,11 @@ namespace JianGongYun.ViewModel /// /// 实用案例 /// - private UserControl _MainInfo = new MainInfo(); - public UserControl MainInfo + private UserControl _TeachingInfo = new TeachingInfo(); + public UserControl TeachingInfo { - get { return _MainInfo; } - set { Set(ref _MainInfo, value); } + get { return _TeachingInfo; } + set { Set(ref _TeachingInfo, value); } } } diff --git a/JianGongYun/ViewModel/ModuleViewModel/PracticalCaseViewModel.cs b/JianGongYun/ViewModel/ModuleViewModel/PracticalCaseViewModel.cs index 51197cc..ff916c5 100644 --- a/JianGongYun/ViewModel/ModuleViewModel/PracticalCaseViewModel.cs +++ b/JianGongYun/ViewModel/ModuleViewModel/PracticalCaseViewModel.cs @@ -39,7 +39,7 @@ namespace JianGongYun.ViewModel.ModuleViewModel set { Set(ref _ControlList, value); } } - private CollectionViewSource _AllControl; + private CollectionViewSource _AllControl=new CollectionViewSource(); /// /// 所有控件 /// diff --git a/JianGongYun/Views/MainInfo.xaml b/JianGongYun/Views/TeachingInfo.xaml similarity index 98% rename from JianGongYun/Views/MainInfo.xaml rename to JianGongYun/Views/TeachingInfo.xaml index 9d0ead6..586c7fc 100644 --- a/JianGongYun/Views/MainInfo.xaml +++ b/JianGongYun/Views/TeachingInfo.xaml @@ -1,4 +1,4 @@ - - /// MainInfo.xaml 的交互逻辑 + /// TeachingInfo.xaml 的交互逻辑 /// - public partial class MainInfo : UserControl + public partial class TeachingInfo : UserControl { - public MainInfo() + public TeachingInfo() { InitializeComponent(); } diff --git a/JianGongYun/Views/Window2.xaml.cs b/JianGongYun/Views/Window2.xaml.cs index f3662c9..289ef25 100644 --- a/JianGongYun/Views/Window2.xaml.cs +++ b/JianGongYun/Views/Window2.xaml.cs @@ -16,7 +16,7 @@ namespace JianGongYun.Views /// Window1.xaml 的交互逻辑 /// public partial class Window2 : UserControl - { + { public Window2() { InitializeComponent();