SaveInternal | Add ValidateAll

Megabit · Oct 31, 2023 · f60b5b0 · f60b5b0
1 parent f239f68
commit f60b5b0
Showing 1 changed file with 26 additions and 6 deletions.
diff --git a/Source/Extensions/Blazorise.DataGrid/DataGrid.razor.cs b/Source/Extensions/Blazorise.DataGrid/DataGrid.razor.cs
@@ -894,13 +894,8 @@ public async Task Save()
         if ( Data == null || editState == DataGridEditState.None )
             return;
 
-        if ( UseValidation )
+        if ( !await ValidateAll() )
         {
-            var result = PopupVisible
-                ? await dataGridModalRef.ValidateAll()
-                : await dataGridRowEditRef.ValidateAll();
-
-            if ( !result )
                 return;
         }
 
@@ -915,6 +910,23 @@ public async Task Save()
 
         await InvokeAsync( StateHasChanged );
     }
+
+    /// <summary>
+    /// Validates the current edit operation.
+    /// </summary>
+    /// <returns></returns>
+    public async Task<bool> ValidateAll()
+    {
+        if ( UseValidation )
+        {
+            var result = PopupVisible
+                ? await dataGridModalRef.ValidateAll()
+                : await dataGridRowEditRef.ValidateAll();
+
+            return result;
+        }
+        return true;
+    }
 
     /// <summary>
     /// Saves all the tracked batch edit changes.
@@ -936,6 +948,14 @@ internal protected Task SaveBatch()
     /// <returns></returns>
     internal protected async Task SaveInternal()
     {
+        if ( Data == null || editState == DataGridEditState.None )
+            return;
+
+        if ( !await ValidateAll() )
+        {
+            return;
+        }
+
         if ( BatchEdit )
         {
             await SaveBatchItem();