Skip to content

Commit b0cf951

Browse files
authored
Merge pull request #10 from pkamphuis/echarts_60
update to Echarts 6.0.0
2 parents cc1273e + e5b2209 commit b0cf951

File tree

204 files changed

+8698
-699
lines changed

Some content is hidden

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

204 files changed

+8698
-699
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
Blazor wrapper for [Apache ECharts](https://echarts.apache.org/en/index.html).
44

5-
- Supports .NET >= 6.0
6-
- Ships with echarts 5.6.0
5+
- Supports .NET >= 10.0
6+
- Ships with echarts 6.0.0
77
- `Apache-2.0` Licensed (same as echarts)
88
- Lots of examples in the `Vizor.ECharts.Demo` project
99
- Refer to the official echarts [cheat sheet](https://echarts.apache.org/en/cheat-sheet.html) for a quick introduction

TypePatternAnalysisReport.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
# Type Pattern Analysis Report
2-
Generated: 2026-01-11 19:10:00
2+
Generated: 2026-01-18 19:10:10
33

44
## Summary
5-
- Total properties analyzed: 37348
6-
- ✅ Fully supported: 37330 (100%)
5+
- Total properties analyzed: 39020
6+
- ✅ Fully supported: 38990 (99,9%)
77
- ⚠️ Partially supported: 2 (0%)
8-
- ❌ Unsupported: 16 (0%)
8+
- ❌ Unsupported: 28 (0,1%)
99
- 🔍 Requires investigation: 0 (0%)
1010

1111
## Unsupported Patterns (Sorted by Frequency)
1212

13-
### array,enum,number (4 occurrences)
13+
### enum (10 occurrences)
14+
**Examples**: geo.preserveAspectAlign, geo.preserveAspectVerticalAlign, dividerLineStyle.cap
15+
**Suggestion**: Add enum type mapping: AddMappedEnumType(new MappedEnumType("{propName}", typeof(???)), "{parentName}");
16+
17+
### array,enum,number (6 occurrences)
1418
**Examples**: crossStyle.type, crossStyle.type, crossStyle.type
1519
**Suggestion**: Pattern 'array,enum,number' is complex - investigate if typed accessor pattern is appropriate
1620

src/Vizor.ECharts.BindingGenerator/Types/TypePatternRegistry.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ internal class TypePatternRegistry
4040
{ "function,number,string", typeof(NumberOrStringOrFunction) },
4141
// Vector types (new in ECharts 5.6.0) - all represent array of 2 elements
4242
{ "array,vector", typeof(NumberOrNumberArray) }, // can be array or 2-element vector
43-
{ "array,percentvector", typeof(NumberOrNumberArray) }, // can be array or 2-element percentvector
43+
{ "array,percentvector", typeof(NumberOrStringArray) }, // can be array or 2-element percentvector
4444
{ "array,number,vector", typeof(NumberOrNumberArray) }, // number or array or vector
4545
// Icon types - Icon class handles both IconType enum and string URLs
4646
{ "icon,string", typeof(Icon) }, // icon type or string URL
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
@page "/example/chords/chord-style"
2+
3+
@using Vizor.ECharts;
4+
@using Vizor.ECharts.Samples.Areas.Chords;
5+
6+
<PageHeader Title="Chord Style" SourceLink="@typeof(ChordStyleChart)" />
7+
8+
<ChordStyleChart />

src/Vizor.ECharts.Demo/Areas/ThemeRiver/ThemeRiverSimple.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
@using Vizor.ECharts;
44
@using Vizor.ECharts.Samples.Areas.ThemeRiver;
55

6-
<PageHeader Title="Simple Scatter Chart" SourceLink="@typeof(SimpleThemeRiverChart)" />
6+
<PageHeader Title="Simple Theme River Chart" SourceLink="@typeof(SimpleThemeRiverChart)" />
77

88
<SimpleThemeRiverChart />

src/Vizor.ECharts.Demo/Pages/_Host.cshtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-geWF76RCwLtnZ8qwWowPQNguL3RmwHVBC9FhGdlKrxdiJJigb/j/68SIy3Te4Bkz" crossorigin="anonymous"></script>
4141
<script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.25.0/prism.min.js"></script>
4242
<script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.25.0/plugins/autoloader/prism-autoloader.min.js"></script>
43-
4443
<!-- Use vizor-echarts-bundle-min.js in PROD -->
4544
<!-- Use vizor-echarts-min.js if you want to include echarts and all plugins manually -->
4645
<script src="_content/Vizor.ECharts/js/vizor-echarts-bundle.js"></script>

src/Vizor.ECharts.Demo/Shared/SideNav.razor

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,32 @@
393393
</div>
394394
</li>
395395

396+
<!-- Chords -->
397+
<li class="mb-1">
398+
<button class="btn btn-toggle d-inline-flex align-items-center border-0" data-bs-toggle="collapse" data-bs-target="#chords-collapse" aria-expanded="true">
399+
400+
<svg width="24" height="24" viewBox="0 0 176 176" class="icon icon-tabler icon-tabler-chart-area-filled" xmlns="http://www.w3.org/2000/svg" troke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
401+
@* <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-chart-area-filled" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"> *@
402+
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
403+
<path d="M87.9999 10.8165C99.0624 10.8165 109.995 13.2002 120.053 17.8053C130.112 22.4104 139.06 29.1288 146.288 37.503C105.486 72.7224 97.5426 108.853 119.809 157.939C109.734 162.509 98.7936 164.854 87.7311 164.816C76.6687 164.777 65.7444 162.355 55.7021 157.715C78.3106 108.786 87.9999 64.7164 87.9999 10.8165Z" fill="currentColor" fill-opacity="0.8" stroke-width="0"></path>
404+
@* <path d="M146.288 37.503C155.955 48.7024 162.191 62.4496 164.25 77.1001C110.875 84.6015 70.5133 102.91 29.7113 138.13C20.0443 126.93 13.8083 113.183 11.7493 98.5327C65.1246 91.0313 105.486 72.7224 146.288 37.503Z" fill="currentColor" fill-opacity="0.8" stroke-width="0"></path>
405+
<path d="M55.7021 157.715C49.0216 154.628 42.8181 150.6 37.2808 145.752C72.7842 105.197 66.9966 78.2003 17.9888 55.7628C21.0523 49.0715 25.0592 42.854 29.8873 37.2999C70.5661 72.6614 78.3105 108.786 55.7021 157.715Z" fill="currentColor" fill-opacity="0.8" stroke-width="0"></path>
406+
<path d="M11.7494 98.5327C10.2098 87.5779 11.0487 76.4199 14.2092 65.8184C65.8627 81.217 110.875 84.6015 164.251 77.1001C165.79 88.0549 164.951 99.2129 161.791 109.814C110.137 94.4158 65.1247 91.0313 11.7494 98.5327Z" fill="currentColor" fill-opacity="0.8" stroke-width="0"></path> *@
407+
<path d="M29.8875 37.2999C42.0673 23.2886 58.8992 14.1496 77.2837 11.5658C84.7851 64.9412 110.137 94.4158 161.791 109.814C156.487 127.606 144.934 142.882 129.259 152.83C100.378 107.32 70.5662 72.6614 29.8875 37.2999Z" fill="currentColor" fill-opacity="0.8" stroke-width="0"></path>
408+
<path d="M88 5.49998C88 4.74682 88.1547 4.0017 88.4545 3.31078C88.7543 2.61986 89.1928 1.99787 89.7428 1.48337C90.2928 0.968866 90.9426 0.572811 91.652 0.319753C92.3614 0.0666959 93.1152 -0.0379728 93.8666 0.012235C111.88 1.21579 129.087 7.93045 143.155 19.2456C157.222 30.5606 167.469 45.9286 172.506 63.2652C177.543 80.6017 177.125 99.0679 171.311 116.159C165.496 133.251 154.565 148.14 140.001 158.808C139.394 159.253 138.701 159.569 137.967 159.735C137.232 159.902 136.471 159.916 135.731 159.776C134.991 159.636 134.287 159.346 133.664 158.923C133.041 158.501 132.511 157.954 132.107 157.318L129.259 152.83C143.337 143.895 154.135 130.632 160.029 115.034C165.923 99.436 166.595 82.3463 161.943 66.3341C157.291 50.3218 147.567 36.2523 134.232 26.2407C120.898 16.2291 104.674 10.8165 88 10.8165V5.49998Z" fill="currentColor" stroke-width="0"></path>
409+
<path d="M122.005 162.781C122.316 163.466 122.483 164.209 122.496 164.962C122.508 165.715 122.366 166.463 122.077 167.158C121.789 167.854 121.361 168.483 120.819 169.007C120.278 169.53 119.635 169.937 118.929 170.202C104.966 175.444 89.8995 177.051 75.1446 174.872C60.3896 172.693 46.4306 166.8 34.5783 157.746C33.9799 157.289 33.4817 156.713 33.1146 156.056C32.7476 155.398 32.5195 154.672 32.4445 153.923C32.3696 153.173 32.4494 152.416 32.6789 151.699C32.9084 150.982 33.2829 150.319 33.779 149.753L37.2808 145.752C48.4124 155.497 62.1157 161.829 76.7515 163.99C91.3872 166.152 106.336 164.051 119.809 157.939L122.005 162.781Z" fill="currentColor" stroke-width="0"></path>
410+
<path d="M25.6868 141.604C25.1167 142.096 24.4515 142.466 23.7326 142.69C23.0137 142.915 22.2564 142.989 21.5075 142.909C20.7586 142.829 20.0342 142.596 19.3791 142.224C18.724 141.852 18.1522 141.35 17.6992 140.748C10.0081 130.534 4.63537 118.765 1.95507 106.263C-0.725234 93.7603 -0.648751 80.8239 2.17919 68.3539C2.34576 67.6194 2.66142 66.9269 3.10659 66.3194C3.55175 65.7119 4.11696 65.2023 4.76715 64.8222C5.41735 64.4421 6.13869 64.1996 6.88646 64.1097C7.63423 64.0198 8.39248 64.0844 9.11424 64.2995L14.2092 65.8184C10.5168 78.2041 10.0015 91.3199 12.7107 103.957C15.4199 116.594 21.2664 128.346 29.7114 138.13L25.6868 141.604Z" fill="currentColor" stroke-width="0"></path>
411+
<path d="M13.155 53.5497C12.4702 53.2362 11.8571 52.7853 11.3537 52.2251C10.8503 51.665 10.4673 51.0073 10.2285 50.293C9.98962 49.5788 9.90002 48.823 9.96523 48.0727C10.0304 47.3224 10.2491 46.5934 10.6075 45.9311C16.6936 34.6858 25.1571 24.9018 35.4091 17.2602C45.6611 9.61866 57.4552 4.30301 69.9705 1.68328C70.7077 1.52897 71.4687 1.52771 72.2064 1.67958C72.9441 1.83144 73.6427 2.1332 74.259 2.56614C74.8753 2.99908 75.396 3.55399 75.7891 4.19646C76.1821 4.83893 76.439 5.55527 76.5438 6.3011L77.2837 11.5658C64.4852 13.3646 52.3453 18.3559 41.9829 26.0797C31.6206 33.8036 23.369 44.0116 17.9889 55.7628L13.155 53.5497Z" fill="currentColor" stroke-width="0"></path>
412+
</svg>
413+
<span class="ms-1">Chords</span>
414+
</button>
415+
<div class="collapse" id="chords-collapse" style="">
416+
<ul class="btn-toggle-nav list-unstyled fw-normal pb-1 ps-5">
417+
<li><a href="/example/chords/chord-style" class="link-dark d-inline-flex text-decoration-none">Chord style</a></li>
418+
</ul>
419+
</div>
420+
</li>
421+
396422

397423

398424
<!-- Misc Concepts -->
Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
@using Vizor.ECharts;
2+
3+
<Vizor.ECharts.EChart Options="@options" Width="800px" Height="600" />
4+
5+
@code {
6+
7+
// see https://echarts.apache.org/examples/en/editor.html?c=chord-style
8+
9+
private ChartOptions options = new()
10+
{
11+
Tooltip = new Tooltip()
12+
{
13+
Show = true,
14+
@* Trigger = "item",
15+
Formatter = "{a} : {b}" *@
16+
},
17+
Legend = new Legend()
18+
{
19+
Show = true,
20+
@* Data = new string[] { "A", "B", "C", "D", "E", "F" } *@
21+
},
22+
Series = new()
23+
{
24+
new ChordSeries()
25+
{
26+
PadAngle = 1,
27+
Center = new("50%", "50%"),
28+
Radius = new("70%", "80%"),
29+
Data = new ChordSeriesData[]
30+
{
31+
new ChordSeriesData() { Name = "A" },
32+
new ChordSeriesData() { Name = "B" },
33+
new ChordSeriesData() { Name = "C" },
34+
new ChordSeriesData() { Name = "D" },
35+
new ChordSeriesData() { Name = "E" },
36+
new ChordSeriesData() { Name = "F" }
37+
},
38+
Emphasis = new Emphasis()
39+
{
40+
Focus = "self",
41+
},
42+
Label = new ()
43+
{
44+
Show = true,
45+
Position = LabelPosition.Inside,
46+
FontWeight = FontWeight.Bold,
47+
Color = "#fff"
48+
},
49+
LineStyle = new LineStyle()
50+
{
51+
Color = "gradient",
52+
Opacity = 0.3
53+
},
54+
ItemStyle = new ItemStyle()
55+
{
56+
BorderColor = "#fff",
57+
BorderWidth = 2,
58+
BorderRadius = new BorderRadius(10,15,0,0)
59+
},
60+
Links = new List<ChordSeriesLink>()
61+
{
62+
new ChordSeriesLink() { Source = "A", Target = "B", Value= 14 },
63+
new ChordSeriesLink() { Source = "A", Target = "C", Value = 8 },
64+
new ChordSeriesLink() { Source = "B", Target = "C", Value = 20 },
65+
new ChordSeriesLink() { Source = "B", Target = "E", Value = 15 },
66+
new ChordSeriesLink() { Source = "C", Target = "B", Value = 8 },
67+
new ChordSeriesLink() { Source = "C", Target = "E", Value = 3 },
68+
new ChordSeriesLink() { Source = "D", Target = "A", Value = 12 },
69+
new ChordSeriesLink() { Source = "D", Target = "B", Value = 3 },
70+
new ChordSeriesLink() { Source = "E", Target = "A", Value = 15 },
71+
new ChordSeriesLink() { Source = "E", Target = "C", Value = 5 },
72+
new ChordSeriesLink() { Source = "F", Target = "C", Value = 5 },
73+
new ChordSeriesLink() { Source = "G", Target = "A", Value = 6 },
74+
new ChordSeriesLink() { Source = "G", Target = "B", Value = 8 },
75+
new ChordSeriesLink() { Source = "G", Target = "D", Value = 4 }
76+
}
77+
}
78+
}
79+
};
80+
}

src/Vizor.ECharts.Tests/Unit/Generator/GeneratorCoverageTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void ScanForTODOMarkersInGeneratedCode()
4444
Console.WriteLine(message);
4545
}
4646

47-
Assert.AreEqual(101, todoCount, "Generated code should have no TODO markers");
47+
Assert.AreEqual(115, todoCount, "Generated code should have no TODO markers");
4848
}
4949

5050
[TestMethod]

src/Vizor.ECharts/Options/DataZoom/Generated/IDataZoom.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// AUTO GENERATED - DO NOT EDIT - All changes will be lost
2-
// ECharts Version: 5.6.0
2+
// ECharts Version: 6.0.0
33
// http://www.datahint.eu/
44

55
using System.Text.Json.Serialization;

0 commit comments

Comments
 (0)