rename and fix

EasyMicroservices · Nov 11, 2023 · edc120d · edc120d
1 parent 854f18c
commit edc120d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/src/CSharp/EasyMicroservices.UI.Core.Mvvm/BaseViewModel.cs b/src/CSharp/EasyMicroservices.UI.Core.Mvvm/BaseViewModel.cs
@@ -14,7 +14,7 @@ public abstract class BaseViewModel : INotifyPropertyChanged
     /// <summary>
     /// 
     /// </summary>
-    public bool IsBusy
+    public virtual bool IsBusy
     {
         get => _IsBusy;
         set
@@ -41,15 +41,15 @@ public virtual void OnPropertyChanged(string propertyName)
     /// <summary>
     /// 
     /// </summary>
-    public void Busy()
+    public virtual void Busy()
     {
         IsBusy = true;
     }
 
     /// <summary>
     /// 
     /// </summary>
-    public void UnBusy()
+    public virtual void UnBusy()
     {
         IsBusy = false;
     }
@@ -62,7 +62,7 @@ public void UnBusy()
     /// <param name="onSuccess"></param>
     /// <param name="onError"></param>
     /// <returns></returns>
-    public async virtual Task FetchData<TResult>(Func<Task<TResult>> getServerResult, Func<TResult, Task> onSuccess, Func<Exception, Task> onError = default)
+    public async virtual Task ExecuteApi<TResult>(Func<Task<TResult>> getServerResult, Func<TResult, Task> onSuccess, Func<Exception, Task> onError = default)
     {
         try
         {
@@ -95,9 +95,9 @@ public async virtual Task FetchData<TResult>(Func<Task<TResult>> getServerResult
     /// <param name="onSuccess"></param>
     /// <param name="onError"></param>
     /// <returns></returns>
-    public Task FetchData(Func<Task<ErrorContract>> getServerResult, Func<Task> onSuccess, Func<Exception, Task> onError = default)
+    public virtual Task ExecuteApi(Func<Task<ErrorContract>> getServerResult, Func<Task> onSuccess, Func<Exception, Task> onError = default)
     {
-        return FetchData(getServerResult, async (x) =>
+        return ExecuteApi(getServerResult, async (x) =>
         {
             await onSuccess();
         }, onError);

diff --git a/src/CSharp/EasyMicroservices.UI.Core.Mvvm/Commands/RelayCommand.cs b/src/CSharp/EasyMicroservices.UI.Core.Mvvm/Commands/RelayCommand.cs
@@ -17,6 +17,16 @@ public RelayCommand(Action execute, Func<bool> canExecute)
     {
 
     }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="execute"></param>
+    public RelayCommand(Action execute)
+        : this(execute, () => true)
+    {
+
+    }
 }
 
 /// <summary>
@@ -35,4 +45,14 @@ public RelayCommand(Action<T> execute, Func<T, bool> canExecute)
     {
 
     }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="execute"></param>
+    public RelayCommand(Action<T> execute)
+        : this((x) => execute((T)x), (x) => true)
+    {
+
+    }
 }
diff --git a/src/CSharp/EasyMicroservices.UI.Core.Mvvm/EasyMicroservices.UI.Core.Mvvm.csproj b/src/CSharp/EasyMicroservices.UI.Core.Mvvm/EasyMicroservices.UI.Core.Mvvm.csproj
@@ -5,7 +5,7 @@
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.0.0.1</Version>
+    <Version>0.0.0.2</Version>
     <Description>Model View View Model</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>mvvm,mvpvm,modelview,modelviewviewmodel</PackageTags>