From ac91cf996f239be0fae20a58ae877bb5c843cd2e Mon Sep 17 00:00:00 2001
From: wangbin <737436093@qq.com>
Date: Tue, 15 Dec 2020 21:35:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 JianGongYun/MainWindow.xaml                               | 2 +-
 JianGongYun/ViewModel/MainViewModel.cs                    | 8 ++++----
 .../ViewModel/ModuleViewModel/PracticalCaseViewModel.cs   | 2 +-
 JianGongYun/Views/{MainInfo.xaml => TeachingInfo.xaml}    | 2 +-
 .../Views/{MainInfo.xaml.cs => TeachingInfo.xaml.cs}      | 6 +++---
 JianGongYun/Views/Window2.xaml.cs                         | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename JianGongYun/Views/{MainInfo.xaml => TeachingInfo.xaml} (98%)
 rename JianGongYun/Views/{MainInfo.xaml.cs => TeachingInfo.xaml.cs} (78%)

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 @@
         </Metro:MetroTitleMenu>
     </Metro:MetroWindow.Menu>
     <Grid>
-        <ContentControl Content="{Binding MainInfo}"/>
+        <ContentControl Content="{Binding TeachingInfo}"/>
     </Grid>
 </Metro:MetroWindow>
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
         /// <summary>
         /// 实用案例
         /// </summary>
-        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();
         /// <summary>
         /// 所有控件
         /// </summary>
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 @@
-<UserControl x:Class="JianGongYun.Views.MainInfo"
+<UserControl x:Class="JianGongYun.Views.TeachingInfo"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/JianGongYun/Views/MainInfo.xaml.cs b/JianGongYun/Views/TeachingInfo.xaml.cs
similarity index 78%
rename from JianGongYun/Views/MainInfo.xaml.cs
rename to JianGongYun/Views/TeachingInfo.xaml.cs
index 1895b87..32dad7d 100644
--- a/JianGongYun/Views/MainInfo.xaml.cs
+++ b/JianGongYun/Views/TeachingInfo.xaml.cs
@@ -13,11 +13,11 @@ using System.Windows.Shapes;
 namespace JianGongYun.Views
 {
     /// <summary>
-    /// MainInfo.xaml 的交互逻辑
+    /// TeachingInfo.xaml 的交互逻辑
     /// </summary>
-    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 的交互逻辑
     /// </summary>
     public partial class Window2 : UserControl
-    {
+    { 
         public Window2()
         {
             InitializeComponent();