diff --git a/AuditData.cs b/AuditData.cs index 9975fb1..c9231d1 100644 --- a/AuditData.cs +++ b/AuditData.cs @@ -10,6 +10,8 @@ namespace Audit { public class AuditData : ObservableObject { + public static AuditData Instance = new Lazy(() => new AuditData()).Value; + private UserAccount useraccount = null; public UserAccount UserAccount diff --git a/ViewModel/LogViewModel.cs b/ViewModel/LogViewModel.cs index 0f0c8f8..23426d6 100644 --- a/ViewModel/LogViewModel.cs +++ b/ViewModel/LogViewModel.cs @@ -1,4 +1,6 @@ -using System; +using GalaSoft.MvvmLight; +using Models; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -6,7 +8,8 @@ using System.Threading.Tasks; namespace Audit.ViewModel { - internal class LogViewModel + public class LogViewModel : ViewModelBase { + public UserAccount UserAccount { get; set; } = AuditData.Instance.UserAccount; } } diff --git a/ViewModel/ViewModelLocator.cs b/ViewModel/ViewModelLocator.cs index 49c1065..3445fe6 100644 --- a/ViewModel/ViewModelLocator.cs +++ b/ViewModel/ViewModelLocator.cs @@ -44,6 +44,7 @@ namespace Audit.ViewModel ////} SimpleIoc.Default.Register(); + SimpleIoc.Default.Register(); } public MainViewModel Main @@ -54,6 +55,13 @@ namespace Audit.ViewModel } } + public LogViewModel Login + { + get + { + return ServiceLocator.Current.GetInstance(); + } + } public static void Cleanup() { // TODO Clear the ViewModels diff --git a/Windows/LogWindow.xaml b/Windows/LogWindow.xaml index 3f8788e..7c4530b 100644 --- a/Windows/LogWindow.xaml +++ b/Windows/LogWindow.xaml @@ -5,6 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:Audit.Windows" mc:Ignorable="d" + DataContext="{Binding Source ={StaticResource Locator},Path=Login}" Title="登录" Height="200" Width="300" WindowStartupLocation="CenterScreen" ResizeMode="NoResize">