diff --git a/Sources/BlazorApp/.vs/BlazorApp/v17/.suo b/Sources/BlazorApp/.vs/BlazorApp/v17/.suo index 522ca5b..2d2fb61 100644 Binary files a/Sources/BlazorApp/.vs/BlazorApp/v17/.suo and b/Sources/BlazorApp/.vs/BlazorApp/v17/.suo differ diff --git a/Sources/BlazorApp/BlazorApp/Components/InventoryComponent.razor b/Sources/BlazorApp/BlazorApp/Components/InventoryComponent.razor index 36718b5..99c6cbf 100644 --- a/Sources/BlazorApp/BlazorApp/Components/InventoryComponent.razor +++ b/Sources/BlazorApp/BlazorApp/Components/InventoryComponent.razor @@ -41,9 +41,11 @@
diff --git a/Sources/BlazorApp/BlazorApp/Components/InventoryComponent.razor.cs b/Sources/BlazorApp/BlazorApp/Components/InventoryComponent.razor.cs index ba45304..fc45937 100644 --- a/Sources/BlazorApp/BlazorApp/Components/InventoryComponent.razor.cs +++ b/Sources/BlazorApp/BlazorApp/Components/InventoryComponent.razor.cs @@ -1,5 +1,6 @@ using BlazorApp.Models; using BlazorApp.Services; +using Blazorise.DataGrid; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; using System.Collections.ObjectModel; @@ -32,19 +33,18 @@ namespace BlazorApp.Components this.RecipeItems = new List { null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null }; } - protected override async Task OnAfterRenderAsync(bool firstRender) + private async Task OnReadData(DataGridReadDataEventArgs e) { - base.OnAfterRenderAsync(firstRender); - - if (!firstRender) + if (e.CancellationToken.IsCancellationRequested) { return; } - Items = await DataService.getAll(); - totalItem = await DataService.Count(); - - StateHasChanged(); + if (!e.CancellationToken.IsCancellationRequested) + { + Items = await DataService.List(e.Page, e.PageSize); + totalItem = await DataService.Count(); + } } private void OnActionsCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e) { diff --git a/Sources/BlazorApp/BlazorApp/Pages/Inventory.razor b/Sources/BlazorApp/BlazorApp/Pages/Inventory.razor index c808087..408173a 100644 --- a/Sources/BlazorApp/BlazorApp/Pages/Inventory.razor +++ b/Sources/BlazorApp/BlazorApp/Pages/Inventory.razor @@ -4,5 +4,5 @@

My Inventory

- + diff --git a/Sources/BlazorApp/BlazorApp/Pages/Inventory.razor.cs b/Sources/BlazorApp/BlazorApp/Pages/Inventory.razor.cs index 62878ad..8269ca5 100644 --- a/Sources/BlazorApp/BlazorApp/Pages/Inventory.razor.cs +++ b/Sources/BlazorApp/BlazorApp/Pages/Inventory.razor.cs @@ -3,6 +3,7 @@ using BlazorApp.Components; using BlazorApp.Models; using BlazorApp.Services; +using Blazorise.DataGrid; using Microsoft.AspNetCore.Components; namespace BlazorApp.Pages @@ -12,6 +13,8 @@ namespace BlazorApp.Pages [Inject] public IDataService DataService { get; set; } + private int totalItem; + public List Items { get; set; } = new List(); protected override async Task OnAfterRenderAsync(bool firstRender) @@ -23,9 +26,22 @@ namespace BlazorApp.Pages return; } - Items = await DataService.getAll(); + Items = await DataService.List(0, await DataService.Count()); StateHasChanged(); } + private async Task OnReadData(DataGridReadDataEventArgs e) + { + if (e.CancellationToken.IsCancellationRequested) + { + return; + } + + if (!e.CancellationToken.IsCancellationRequested) + { + Items = await DataService.List(e.Page, e.PageSize); + totalItem = await DataService.Count(); + } + } } } diff --git a/Sources/BlazorApp/BlazorApp/bin/Debug/net6.0/BlazorApp.dll b/Sources/BlazorApp/BlazorApp/bin/Debug/net6.0/BlazorApp.dll index 1334daa..00b5285 100644 Binary files a/Sources/BlazorApp/BlazorApp/bin/Debug/net6.0/BlazorApp.dll and b/Sources/BlazorApp/BlazorApp/bin/Debug/net6.0/BlazorApp.dll differ diff --git a/Sources/BlazorApp/BlazorApp/bin/Debug/net6.0/BlazorApp.pdb b/Sources/BlazorApp/BlazorApp/bin/Debug/net6.0/BlazorApp.pdb index b0bc780..49923f2 100644 Binary files a/Sources/BlazorApp/BlazorApp/bin/Debug/net6.0/BlazorApp.pdb and b/Sources/BlazorApp/BlazorApp/bin/Debug/net6.0/BlazorApp.pdb differ diff --git a/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/BlazorApp.dll b/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/BlazorApp.dll index 1334daa..00b5285 100644 Binary files a/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/BlazorApp.dll and b/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/BlazorApp.dll differ diff --git a/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/BlazorApp.pdb b/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/BlazorApp.pdb index b0bc780..49923f2 100644 Binary files a/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/BlazorApp.pdb and b/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/BlazorApp.pdb differ diff --git a/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/ref/BlazorApp.dll b/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/ref/BlazorApp.dll index c0bc202..21f25d9 100644 Binary files a/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/ref/BlazorApp.dll and b/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/ref/BlazorApp.dll differ diff --git a/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/refint/BlazorApp.dll b/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/refint/BlazorApp.dll index c0bc202..21f25d9 100644 Binary files a/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/refint/BlazorApp.dll and b/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/refint/BlazorApp.dll differ diff --git a/Sources/BlazorApp/BlazorApp/obj/staticwebassets.pack.sentinel b/Sources/BlazorApp/BlazorApp/obj/staticwebassets.pack.sentinel index 7d20e95..175f313 100644 --- a/Sources/BlazorApp/BlazorApp/obj/staticwebassets.pack.sentinel +++ b/Sources/BlazorApp/BlazorApp/obj/staticwebassets.pack.sentinel @@ -33,3 +33,22 @@ 2.0 2.0 2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0