diff --git a/BlazorGridExamples/Program.cs b/BlazorGridExamples/Program.cs index 8b9855a..7b86b79 100644 --- a/BlazorGridExamples/Program.cs +++ b/BlazorGridExamples/Program.cs @@ -26,13 +26,16 @@ typeof(IgbCarouselModule), typeof(IgbCategoryChartModule), typeof(IgbPieChartModule), - typeof(IgbSelectModule)); + typeof(IgbSelectModule), + typeof(IgbDropdownModule), + typeof(IgbPivotGridModule), + typeof(IgbPivotDataSelectorModule)); // Register Data Services for samples builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); -builder.Services.AddScoped(); +builder.Services.AddScoped(); await builder.Build().RunAsync(); diff --git a/BlazorGridExamples/wwwroot/scripts/shell-interop.js b/BlazorGridExamples/wwwroot/scripts/shell-interop.js index 2944f6d..750168b 100644 --- a/BlazorGridExamples/wwwroot/scripts/shell-interop.js +++ b/BlazorGridExamples/wwwroot/scripts/shell-interop.js @@ -24,6 +24,29 @@ window.shellInterop = { openTab: function (url) { window.open(url, '_blank', 'noopener'); }, + shrinkSelectorSearch: function () { + const apply = () => { + const sel = document.querySelector('#sales-section igc-pivot-data-selector'); + if (!sel) return; + const deep = (root, fn) => { + for (const el of root.querySelectorAll('*')) { + fn(el); + if (el.shadowRoot) deep(el.shadowRoot, fn); + } + }; + deep(sel, (el) => { + if (el.tagName === 'INPUT' && el.placeholder === 'Search') { + el.style.setProperty('font-size', '13px', 'important'); + } else if (el.className && ('' + el.className).includes('header-title')) { + el.style.setProperty('font-size', '14px', 'important'); + el.style.setProperty('font-weight', '700', 'important'); + } + }); + }; + apply(); + let n = 0; + const iv = setInterval(() => { apply(); if (++n > 15) clearInterval(iv); }, 300); + }, registerFullscreenListener: function (dotnetRef) { const handler = () => { const isFs = !!(document.fullscreenElement || document.webkitFullscreenElement); diff --git a/samples/SalesGrid/ExampleJsInterop.cs b/samples/SalesGrid/ExampleJsInterop.cs deleted file mode 100644 index 5630056..0000000 --- a/samples/SalesGrid/ExampleJsInterop.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Microsoft.JSInterop; - -namespace SalesGrid -{ - // This class provides an example of how JavaScript functionality can be wrapped - // in a .NET class for easy consumption. The associated JavaScript module is - // loaded on demand when first needed. - // - // This class can be registered as scoped DI service and then injected into Blazor - // components for use. - - public class ExampleJsInterop(IJSRuntime jsRuntime) : IAsyncDisposable - { - private readonly Lazy> moduleTask = new(() => jsRuntime.InvokeAsync( - "import", "./_content/SalesGrid/exampleJsInterop.js").AsTask()); - - public async ValueTask Prompt(string message) - { - var module = await moduleTask.Value; - return await module.InvokeAsync("showPrompt", message); - } - - public async ValueTask DisposeAsync() - { - if (moduleTask.IsValueCreated) - { - var module = await moduleTask.Value; - await module.DisposeAsync(); - } - } - } -} diff --git a/samples/SalesGrid/Models/PivotSalesData.cs b/samples/SalesGrid/Models/PivotSalesData.cs new file mode 100644 index 0000000..db4873e --- /dev/null +++ b/samples/SalesGrid/Models/PivotSalesData.cs @@ -0,0 +1,27 @@ +using System.Text.Json.Serialization; + +namespace SalesGrid.Models; + +public class PivotSalesDataItem +{ + [JsonPropertyName("Country")] + public string Country { get; set; } = ""; + + [JsonPropertyName("Store")] + public string Store { get; set; } = ""; + + [JsonPropertyName("Brand")] + public string Brand { get; set; } = ""; + + [JsonPropertyName("Sale")] + public double Sale { get; set; } + + [JsonPropertyName("Cost")] + public double Cost { get; set; } + + [JsonPropertyName("Date")] + public string Date { get; set; } = ""; + + [JsonIgnore] + public double Profit => Sale - Cost; +} diff --git a/samples/SalesGrid/Models/SalesData.cs b/samples/SalesGrid/Models/SalesData.cs deleted file mode 100644 index f3ea933..0000000 --- a/samples/SalesGrid/Models/SalesData.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System.Globalization; -using System.Text.Json; -using System.Text.Json.Serialization; - -namespace SalesGrid.Models; - -// Matches the source dataset at -// https://www.infragistics.com/grid-examples-data/data/sales/sales.json -public class SalesData -{ - [JsonPropertyName("Store")] - public string? Store { get; set; } - - [JsonPropertyName("Brand")] - public string? Brand { get; set; } - - [JsonPropertyName("Country")] - public string? Country { get; set; } - - [JsonPropertyName("Sale")] - public double Sale { get; set; } - - [JsonPropertyName("Cost")] - public double Cost { get; set; } - - [JsonPropertyName("Date")] - [JsonConverter(typeof(FlexibleDateTimeConverter))] - public DateTime Date { get; set; } - - // Derived locally (not present in the source JSON). - [JsonIgnore] - public double Profit { get; set; } -} - -// The source dates use the non-ISO "M/d/yyyy" form (e.g. "2/9/2018"), which the -// default System.Text.Json DateTime reader rejects. This converter accepts both. -public class FlexibleDateTimeConverter : JsonConverter -{ - private static readonly string[] Formats = - { - "M/d/yyyy", "MM/dd/yyyy", "yyyy-MM-dd", "yyyy-MM-ddTHH:mm:ss.fffZ" - }; - - public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - var s = reader.GetString(); - if (DateTime.TryParse(s, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal, out var dt)) - { - return dt; - } - foreach (var f in Formats) - { - if (DateTime.TryParseExact(s, f, CultureInfo.InvariantCulture, DateTimeStyles.None, out dt)) - { - return dt; - } - } - return default; - } - - public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options) - => writer.WriteStringValue(value.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture)); -} diff --git a/samples/SalesGrid/SalesGrid.csproj b/samples/SalesGrid/SalesGrid.csproj index fd2f805..1f84417 100644 --- a/samples/SalesGrid/SalesGrid.csproj +++ b/samples/SalesGrid/SalesGrid.csproj @@ -4,6 +4,11 @@ net10.0 enable enable + + $(NoWarn);BL0005 diff --git a/samples/SalesGrid/SalesGridComponent.razor b/samples/SalesGrid/SalesGridComponent.razor index 5842399..c7e2ad4 100644 --- a/samples/SalesGrid/SalesGridComponent.razor +++ b/samples/SalesGrid/SalesGridComponent.razor @@ -1,84 +1,202 @@ -@using SalesGrid.Services +@using System.Linq @using SalesGrid.Models +@using SalesGrid.Services @using IgniteUI.Blazor.Controls -@inject SalesService SalesService -@implements IDisposable +@using Microsoft.JSInterop +@inject SalesDataService SalesData +@inject HttpClient Http +@inject IJSRuntime JS -
- @if (isLoading) - { -
-