Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP
This commit is contained in:
commit
bf6b05b189
4 files changed
+16
-2
No files matched your search
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -44,6 +44,7 @@ namespace Audit.ViewModel
|
||||
////}
|
||||
|
||||
SimpleIoc.Default.Register<MainViewModel>();
|
||||
SimpleIoc.Default.Register<LogViewModel>();
|
||||
}
|
||||
|
||||
public MainViewModel Main
|
||||
@@ -54,6 +55,13 @@ namespace Audit.ViewModel
|
||||
}
|
||||
}
|
||||
|
||||
public LogViewModel Login
|
||||
{
|
||||
get
|
||||
{
|
||||
return ServiceLocator.Current.GetInstance<LogViewModel>();
|
||||
}
|
||||
}
|
||||
public static void Cleanup()
|
||||
{
|
||||
// TODO Clear the ViewModels
|
||||
|
||||
Reference in new issue
Block a user