Skip to content

Commit 3e87b36

Browse files
joadanjoadan
committed
Merge chandle stick
2 parents 126f669 + 89aa8bb commit 3e87b36

File tree

77 files changed

+1669
-834
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1669
-834
lines changed

‎docs/BlazorApexCharts.Docs.Wasm/Program.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
using BlazorApexCharts.Docs.Services;
22
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
3-
using Microsoft.Extensions.Configuration;
43
using Microsoft.Extensions.DependencyInjection;
5-
using Microsoft.Extensions.Logging;
64
using System;
7-
using System.Collections.Generic;
85
using System.Net.Http;
96
using System.Net.Http.Headers;
10-
using System.Text;
117
using System.Threading.Tasks;
128

139
namespace BlazorApexCharts.Docs.Wasm
@@ -21,7 +17,7 @@ public static async Task Main(string[] args)
2117

2218
builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
2319
builder.Services.AddDocs();
24-
20+
2521
builder.Services.AddHttpClient("GitHub", client => client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("TabBlazor", "1")));
2622
builder.Services.AddScoped<ICodeSnippetService, GitHubSnippetService>();
2723
await builder.Build().RunAsync();

‎docs/BlazorApexCharts.Docs/BlazorApexCharts.Docs.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13+
<PackageReference Include="Bogus" Version="33.1.1" />
1314
<PackageReference Include="ColorCode.HTML" Version="2.0.10" />
1415
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.9" />
1516
<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />

‎docs/BlazorApexCharts.Docs/Components/AreaCharts/AreaFill.razor

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
<ChartContainer>
22
<ApexChart TItem="Order"
33
Title="Scatter Sample"
4-
ChartType="@ChartType.Area"
4+
55
Options=options>
66

7-
<ApexSeries TItem="Order"
7+
<ApexPointSeries TItem="Order"
88
Items="orders"
9+
SeriesType="@SeriesType.Area"
910
Name="Gross Value"
1011
XValue="@(e => e.Country)"
1112
YAggregate="@(e => e.Sum(e => e.GrossValue))"
1213
OrderByDescending="e=>e.Y" />
1314

14-
<ApexSeries TItem="Order"
15+
<ApexPointSeries TItem="Order"
1516
Items="orders"
17+
SeriesType="@SeriesType.Area"
1618
Name="Net Value"
1719
XValue="@(e => e.Country)"
1820
YAggregate="@(e => e.Sum(e => e.NetValue))"

‎docs/BlazorApexCharts.Docs/Components/AreaCharts/Basic.razor

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<ChartContainer>
22
<ApexChart TItem="Order"
3-
Title="Scatter Sample"
4-
ChartType="@ChartType.Area">
3+
Title="Scatter Sample">
54

6-
<ApexSeries TItem="Order"
5+
<ApexPointSeries TItem="Order"
76
Items="orders"
7+
SeriesType="@SeriesType.Area"
88
Name="Gross Value"
99
XValue="@(e => e.Country)"
1010
YAggregate="@(e => e.Sum(e => e.GrossValue))"
1111
OrderByDescending="e=>e.Y" />
1212

13-
<ApexSeries TItem="Order"
13+
<ApexPointSeries TItem="Order"
1414
Items="orders"
15+
SeriesType="@SeriesType.Area"
1516
Name="Net Value"
1617
XValue="@(e => e.Country)"
1718
YAggregate="@(e => e.Sum(e => e.NetValue))"

‎docs/BlazorApexCharts.Docs/Components/BarCharts/BarCharts.razor

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@
1313
<Horizontal />
1414
</Snippet>
1515
</CodeSnippet>
16-
16+
1717
<CodeSnippet Title=Stacked ClassName=@typeof(Stacked).ToString()>
1818
<Snippet>
1919
<Stacked />
2020
</Snippet>
2121
</CodeSnippet>
2222

23-
<CodeSnippet Title="Stacked 100%" ClassName=@typeof(Stacked100).ToString()>
23+
<CodeSnippet Title="Stacked 100%" ClassName=@typeof(Stacked100).ToString()>
2424
<Snippet>
2525
<Stacked100 />
2626
</Snippet>
2727
</CodeSnippet>
2828

29-
<CodeSnippet Title="Numeric X Axis" ClassName=@typeof(NumericXAxis).ToString()>
29+
<CodeSnippet Title="Numeric X Axis" ClassName=@typeof(NumericXAxis).ToString()>
3030
<Snippet>
3131
<NumericXAxis />
3232
</Snippet>

‎docs/BlazorApexCharts.Docs/Components/BarCharts/Basic.razor

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
<ChartContainer>
22
<ApexChart TItem="Order"
3-
Title="Order Net Value"
4-
ChartType="@ChartType.Bar">
3+
Title="Order Net Value">
54

6-
<ApexSeries TItem="Order"
5+
<ApexPointSeries TItem="Order"
76
Items="Orders"
87
Name="Gross Value"
98
XValue="@(e => e.Country)"
109
YAggregate="@(e => e.Sum(e => e.GrossValue))"
11-
OrderByDescending="e=>e.Y" />
10+
OrderByDescending="e=>e.Y"
11+
SeriesType="SeriesType.Bar"/>
1212

13-
<ApexSeries TItem="Order"
13+
<ApexPointSeries TItem="Order"
1414
Items="Orders"
1515
Name="Net Value"
1616
XValue="@(e => e.Country)"
1717
YAggregate="@(e => e.Sum(e => e.NetValue))"
18-
OrderByDescending="e=>e.Y" />
18+
OrderByDescending="e=>e.Y"
19+
SeriesType="SeriesType.Bar"/>
1920
</ApexChart>
2021
</ChartContainer>
22+
2123
@code {
2224
private List<Order> Orders { get; set; } = SampleData.GetOrders();
2325
}

‎docs/BlazorApexCharts.Docs/Components/BarCharts/Horizontal.razor

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
<ChartContainer>
22
<ApexChart TItem="Order"
33
Title="Order Net Value"
4-
ChartType="@ChartType.Bar"
54
Options=options>
65

7-
<ApexSeries TItem="Order"
6+
<ApexPointSeries TItem="Order"
87
Items="Orders"
98
Name="Gross Value"
109
XValue="@(e => e.Country)"
10+
SeriesType="SeriesType.Bar"
1111
YAggregate="@(e => e.Sum(e => e.GrossValue))"
1212
OrderByDescending="e=>e.Y" />
1313

14-
<ApexSeries TItem="Order"
14+
<ApexPointSeries TItem="Order"
1515
Items="Orders"
1616
Name="Net Value"
17+
SeriesType="SeriesType.Bar"
1718
XValue="@(e => e.Country)"
1819
YAggregate="@(e => e.Sum(e => e.NetValue))"
1920
OrderByDescending="e=>e.Y" />
@@ -36,7 +37,6 @@
3637
}
3738
},
3839
Colors = new List<string> { "#003399", "#e62e00" }
39-
4040
};
4141
}
4242
}

‎docs/BlazorApexCharts.Docs/Components/BarCharts/NumericXAxis.razor

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<ChartContainer>
22
<ApexChart TItem="Order"
33
Title="Order Net Value"
4-
ChartType="@ChartType.Bar"
5-
XAxisType=XaxisType.Numeric
4+
XAxisType=XAxisType.Numeric
65
Options=options>
76

8-
<ApexSeries TItem="Order"
7+
<ApexPointSeries TItem="Order"
98
Items="Orders"
109
Name="Gross Value"
10+
SeriesType="SeriesType.Bar"
1111
XValue="@(e => e.DiscountPrecentage)"
1212
YAggregate="@(e => e.Sum(e => e.GrossValue))"
1313
OrderByDescending="e=>e.Y" />
@@ -28,4 +28,4 @@
2828
Xaxis = new XAxis { DecimalsInFloat = 1 }
2929
};
3030
}
31-
}
31+
}

‎docs/BlazorApexCharts.Docs/Components/BarCharts/Stacked.razor

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
<ChartContainer>
2-
<ApexChart TItem="Order"
3-
Title="Order Net Value"
4-
ChartType="@ChartType.Bar"
5-
Options=options>
2+
<ApexChart TItem="Order"
3+
Title="Order Net Value"
4+
Options=options>
65

7-
<ApexSeries TItem="Order"
8-
Items="Orders"
9-
Name="Gross Value"
10-
XValue="@(e => e.Country)"
11-
YAggregate="@(e => e.Sum(e => e.GrossValue))"
12-
OrderByDescending="e=>e.Y"
13-
ShowDataLabels/>
6+
<ApexPointSeries TItem="Order"
7+
Items="Orders"
8+
Name="Gross Value"
9+
SeriesType="SeriesType.Bar"
10+
XValue="@(e => e.Country)"
11+
YAggregate="@(e => e.Sum(e => e.GrossValue))"
12+
OrderByDescending="e=>e.Y"
13+
ShowDataLabels />
1414

15-
<ApexSeries TItem="Order"
16-
Items="Orders"
17-
Name="Net Value"
18-
XValue="@(e => e.Country)"
19-
YAggregate="@(e => e.Sum(e => e.NetValue))"
20-
OrderByDescending="e=>e.Y"
21-
ShowDataLabels/>
22-
</ApexChart>
15+
<ApexPointSeries TItem="Order"
16+
Items="Orders"
17+
Name="Net Value"
18+
SeriesType="SeriesType.Bar"
19+
XValue="@(e => e.Country)"
20+
YAggregate="@(e => e.Sum(e => e.NetValue))"
21+
OrderByDescending="e=>e.Y"
22+
ShowDataLabels />
23+
</ApexChart>
2324
</ChartContainer>
2425
@code {
2526
private List<Order> Orders { get; set; } = SampleData.GetOrders();
@@ -31,7 +32,7 @@
3132
{
3233
Chart = new Chart
3334
{
34-
Stacked = true,
35+
Stacked = true,
3536
},
3637
PlotOptions = new PlotOptions
3738
{
@@ -40,7 +41,7 @@
4041
Horizontal = true
4142
}
4243
},
43-
Colors = new List<string> { "#5cb85c", "#d9534f" }
44+
Colors = new List<string> { "#5cb85c", "#d9534f" }
4445
};
4546
}
4647
}

‎docs/BlazorApexCharts.Docs/Components/BarCharts/Stacked100.razor

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
<ChartContainer>
2-
<ApexChart TItem="Order"
3-
Title="Order Net Value"
4-
ChartType="@ChartType.Bar"
5-
Options=options>
2+
<ApexChart TItem="Order"
3+
Title="Order Net Value"
4+
Options=options>
65

7-
<ApexSeries TItem="Order"
8-
Items="Orders"
9-
Name="Gross Value"
10-
XValue="@(e => e.Country)"
11-
YAggregate="@(e => e.Sum(e => e.GrossValue))"
12-
OrderByDescending="e=>e.Y"
13-
ShowDataLabels />
6+
<ApexPointSeries TItem="Order"
7+
Items="Orders"
8+
Name="Gross Value"
9+
SeriesType="SeriesType.Bar"
10+
XValue="@(e => e.Country)"
11+
YAggregate="@(e => e.Sum(e => e.GrossValue))"
12+
OrderByDescending="e=>e.Y"
13+
ShowDataLabels />
1414

15-
<ApexSeries TItem="Order"
16-
Items="Orders"
17-
Name="Net Value"
18-
XValue="@(e => e.Country)"
19-
YAggregate="@(e => e.Sum(e => e.NetValue))"
20-
OrderByDescending="e=>e.Y"
21-
ShowDataLabels />
22-
</ApexChart>
15+
<ApexPointSeries TItem="Order"
16+
Items="Orders"
17+
Name="Net Value"
18+
SeriesType="SeriesType.Bar"
19+
XValue="@(e => e.Country)"
20+
YAggregate="@(e => e.Sum(e => e.NetValue))"
21+
OrderByDescending="e=>e.Y"
22+
ShowDataLabels />
23+
</ApexChart>
2324
</ChartContainer>
2425

2526
@code {

0 commit comments

Comments
 (0)