chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add ImageAttach

Browse Source
This commit is contained in:
NaBian committed 2020-06-06 23:23:40 +08:00
1 parent 8e34fc1d29
commit d9959fab38
21 files changed
+131 -50
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Shared/HandyControlDemo_Shared/ViewModel/Main/ItemsDisplayViewModel.cs
+16 -4
View File
@@ -7,12 +7,24 @@ namespace HandyControlDemo.ViewModel
{
public class ItemsDisplayViewModel : DemoViewModelBase<AvatarModel>
{
public ItemsDisplayViewModel(Func<List<AvatarModel>> getDatAction)
public ItemsDisplayViewModel(Func<List<AvatarModel>> getDataAction)
{
#if NET40
Task.Factory.StartNew(() => DataList = getDatAction?.Invoke());
#if !NET40
Task.Factory.StartNew(() => DataList = getDataAction?.Invoke()).ContinueWith(obj => DataGot = true);
#else
Task.Run(() => DataList = getDatAction?.Invoke());
Task.Run(() => DataList = getDataAction?.Invoke()).ContinueWith(obj => DataGot = true);
#endif
}
private bool _dataGot;
public bool DataGot
{
get => _dataGot;
#if NET40
set => Set(nameof(DataGot), ref _dataGot, value);
#else
set => Set(ref _dataGot, value);
#endif
}
}
src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs
+1 -1
View File
@@ -176,8 +176,8 @@ namespace HandyControlDemo.ViewModel
private void OpenPracticalDemo()
{
Messenger.Default.Send<object>(null, MessageToken.ClearLeftSelected);
Messenger.Default.Send(true, MessageToken.FullSwitch);
Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.PracticalDemo}"), MessageToken.LoadShowContent);
Messenger.Default.Send(true, MessageToken.FullSwitch);
}
#endregion
src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs
+1 -2
View File
@@ -19,7 +19,6 @@ namespace HandyControlDemo.ViewModel
SimpleIoc.Default.Register<ImageBrowserDemoViewModel>();
SimpleIoc.Default.Register<ComboBoxDemoViewModel>();
SimpleIoc.Default.Register<WindowDemoViewModel>();
SimpleIoc.Default.Register(() => new ItemsDisplayViewModel(dataService.GetContributorDataList), "Contributors");
SimpleIoc.Default.Register(() => new ItemsDisplayViewModel(dataService.GetBlogDataList), "Blogs");
SimpleIoc.Default.Register(() => new ItemsDisplayViewModel(dataService.GetProjectDataList), "Projects");
SimpleIoc.Default.Register(() => new ItemsDisplayViewModel(dataService.GetWebsiteDataList), "Websites");
@@ -58,7 +57,7 @@ namespace HandyControlDemo.ViewModel
public WindowDemoViewModel WindowDemo => SimpleIoc.Default.GetInstance<WindowDemoViewModel>();
public ItemsDisplayViewModel ContributorsView => SimpleIoc.Default.GetInstance<ItemsDisplayViewModel>("Contributors");
public ItemsDisplayViewModel ContributorsView => new ItemsDisplayViewModel(SimpleIoc.Default.GetInstance<DataService>().GetContributorDataList);
public ItemsDisplayViewModel BlogsView => SimpleIoc.Default.GetInstance<ItemsDisplayViewModel>("Blogs");