Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP
This commit is contained in:
commit
0d830e6909
6 files changed
+50
-3
No files matched your search
@@ -10,6 +10,9 @@ using System.Windows;
|
||||
|
||||
namespace Audit.ViewModel
|
||||
{
|
||||
///<Summary>
|
||||
/// LogViewModel
|
||||
///</Summary>
|
||||
public class LogViewModel : ViewModelBase
|
||||
{
|
||||
/* public AuditData AuditData { get; set; } = AuditData.Instance;
|
||||
|
||||
@@ -47,6 +47,9 @@ namespace Audit.ViewModel
|
||||
SimpleIoc.Default.Register<LogViewModel>();
|
||||
}
|
||||
|
||||
///<Summary>
|
||||
/// MainViewModel
|
||||
///</Summary>
|
||||
public MainViewModel Main
|
||||
{
|
||||
get
|
||||
@@ -54,7 +57,10 @@ namespace Audit.ViewModel
|
||||
return ServiceLocator.Current.GetInstance<MainViewModel>();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
///<Summary>
|
||||
/// LogViewModel
|
||||
///</Summary>
|
||||
public LogViewModel Login
|
||||
{
|
||||
get
|
||||
@@ -62,6 +68,10 @@ namespace Audit.ViewModel
|
||||
return ServiceLocator.Current.GetInstance<LogViewModel>();
|
||||
}
|
||||
}
|
||||
|
||||
///<Summary>
|
||||
/// Cleanup
|
||||
///</Summary>
|
||||
public static void Cleanup()
|
||||
{
|
||||
// TODO Clear the ViewModels
|
||||
|
||||
Reference in new issue
Block a user