-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #25 from soenneker/master
Cleanup, updates, lang update
- Loading branch information
Showing
40 changed files
with
1,930 additions
and
1,992 deletions.
There are no files selected for viewing
62 changes: 30 additions & 32 deletions
62
DataTables.Blazor.Demo.Server/Controllers/ValuesController.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,40 @@ | ||
| using Microsoft.AspNetCore.Mvc; | ||
| using DataTables.Blazor.Demo.Server.Controllers; | ||
|
|
||
| namespace DataTables.Blazor.Demo.Server.Controllers | ||
| namespace DataTables.Blazor.Demo.Server.Controllers; | ||
|
|
||
| [ApiController] | ||
| [Route("api/[controller]")] | ||
| public class ValuesController : ControllerBase | ||
| { | ||
| [ApiController] | ||
| [Route("api/[controller]")] | ||
| public class ValuesController : ControllerBase | ||
| public ValuesController() | ||
| { | ||
| public ValuesController() | ||
| { | ||
| } | ||
| } | ||
|
|
||
| [HttpGet] | ||
| public object Get(int draw, int start, int length) | ||
| { | ||
| var ien = start + length; | ||
| [HttpGet] | ||
| public object Get(int draw, int start, int length) | ||
| { | ||
| var ien = start + length; | ||
|
|
||
| var range = new List<object>(); | ||
| for (var i = start; i < ien; i++) | ||
| var range = new List<object>(); | ||
| for (var i = start; i < ien; i++) | ||
| { | ||
| range.Add(new | ||
| { | ||
| range.Add(new | ||
| { | ||
| Id = i, | ||
| FirstName = $"FN{i}", | ||
| LastName = $"LN{i}", | ||
| Email = $"{i}@mail.com" | ||
| }); | ||
| } | ||
| Id = i, | ||
| FirstName = $"FN{i}", | ||
| LastName = $"LN{i}", | ||
| Email = $"{i}@mail.com" | ||
| }); | ||
| } | ||
|
|
||
| Thread.Sleep(50); | ||
| Thread.Sleep(50); | ||
|
|
||
| return new | ||
| { | ||
| draw = draw, | ||
| data = range, | ||
| recordsTotal = 5000000, | ||
| recordsFiltered = 5000000 | ||
| }; | ||
| } | ||
| return new | ||
| { | ||
| draw = draw, | ||
| data = range, | ||
| recordsTotal = 5000000, | ||
| recordsFiltered = 5000000 | ||
| }; | ||
| } | ||
| } | ||
| } |
22 changes: 11 additions & 11 deletions
22
DataTables.Blazor.Demo.Server/DataTables.Blazor.Demo.Server.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net7.0</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <TargetFramework>net7.0</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.1" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.5" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\DataTables.Blazor.Demo\DataTables.Blazor.Demo.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\DataTables.Blazor.Demo\DataTables.Blazor.Demo.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,22 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net7.0</TargetFramework> | ||
|
|
||
| <IsPackable>false</IsPackable> | ||
| <IsPublishable>false</IsPublishable> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <TargetFramework>net7.0</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <IsPackable>false</IsPackable> | ||
| <IsPublishable>false</IsPublishable> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.1" /> | ||
| <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.1" PrivateAssets="all" /> | ||
| <PackageReference Include="RazorTabs" Version="2.0.0" /> | ||
| <PackageReference Include="System.Net.Http.Json" Version="7.0.0" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.5" /> | ||
| <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.5" | ||
| PrivateAssets="all" /> | ||
| <PackageReference Include="RazorTabs" Version="2.0.0" /> | ||
| <PackageReference Include="System.Net.Http.Json" Version="7.0.1" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\DataTables.Blazor\DataTables.Blazor.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\DataTables.Blazor\DataTables.Blazor.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,22 @@ | ||
|
|
||
| using DataTables.Blazor.Abstractions; | ||
| using DataTables.Blazor.Options; | ||
| using DataTables.Blazor.Options.ExtensionsOptions; | ||
| using Microsoft.AspNetCore.Components; | ||
| using System; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace DataTables.Blazor.Demo.Pages | ||
| { | ||
| public partial class ExtensionsPage : ComponentBase | ||
| { | ||
| DataTableOptions scrollerDemoOptions = new DataTableOptions | ||
| namespace DataTables.Blazor.Demo.Pages; | ||
|
|
||
| public partial class ExtensionsPage : ComponentBase | ||
| { | ||
| DataTableOptions scrollerDemoOptions = new DataTableOptions | ||
| { | ||
| ServerSide = true, | ||
| DeferRender = true, | ||
| ScrollY = "200", | ||
| Ordering = false, | ||
| Searching = false, | ||
| Scroller = new ScrollerOptions() | ||
| { | ||
| ServerSide = true, | ||
| DeferRender = true, | ||
| ScrollY = "200", | ||
| Ordering = false, | ||
| Searching = false, | ||
| Scroller = new ScrollerOptions() | ||
| { | ||
| LoadingIndicator = true, | ||
| DisplayBuffer = "15" | ||
| } | ||
| }; | ||
| } | ||
| } | ||
| LoadingIndicator = true, | ||
| DisplayBuffer = "15" | ||
| } | ||
| }; | ||
| } |
Oops, something went wrong.