导航配置错误

VIZ.Framework.Common/Widgets/NavigationControl/NavigationItemControl.cs

@@ -140,7 +140,7 @@ namespace VIZ.Framework.Common
         private void TryCreateContent()
         {
             // 已经包含内容，则不创建
-            if (this.Content != null)
+            if (this.Content != null && !(this.Content is NavigationConfig))
                 return;
 
             NavigationConfig config = this.DataContext as NavigationConfig;

VIZ.Framework.Module/Setup/Provider/Setup/AppSetup_CatchUnhandledException.cs

@@ -37,6 +37,9 @@ namespace VIZ.Framework.Module
             AppDomain.CurrentDomain.UnhandledException -= CurrentDomain_UnhandledException;
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
 
+            System.Windows.Forms.Application.ThreadException -= Application_ThreadException;
+            System.Windows.Forms.Application.ThreadException += Application_ThreadException;
+
             return true;
         }
 
@@ -66,5 +69,14 @@ namespace VIZ.Framework.Module
             Debug.WriteLine(e.Exception.Message);
             log.Error(e.Exception);
         }
+
+        /// <summary>
+        /// Winform应用程序未处理异常
+        /// </summary>
+        private void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
+        {
+            Debug.WriteLine(e.Exception);
+            log.Error(e.Exception);
+        }
     }
 }

VIZ.Framework.Module/VIZ.Framework.Module.csproj

@@ -63,6 +63,7 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />