Skip to content

Commit 0b3d93e

Browse files
sjbursjbur
authored
Merge branch '26_1' into issue-3609_26_1
2 parents be7b7eb + 80deee7 commit 0b3d93e

1,551 files changed

Lines changed: 13937 additions & 15097 deletions

File tree

Some content is hidden

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

‎apps/demos/Demos/Charts/Area/Angular/app/app.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div id="chart-demo">
22
<dx-chart
3-
title="Population: Age Structure (2018)"
3+
title="Population: Age Structure (2024)"
44
palette="Harmony Light"
55
[dataSource]="populationData"
66
>

‎apps/demos/Demos/Charts/Area/Angular/app/app.service.ts‎

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,30 @@ export class Population {
1111
}
1212

1313
const populationData: Population[] = [{
14-
country: 'China',
15-
y014: 233866959,
16-
y1564: 1170914102,
17-
y65: 171774113,
18-
}, {
1914
country: 'India',
20-
y014: 373419115,
21-
y1564: 882520945,
22-
y65: 76063757,
15+
y014: 351600000,
16+
y1564: 974800000,
17+
y65: 101500000,
2318
}, {
2419
country: 'United States',
25-
y014: 60554755,
26-
y1564: 213172625,
27-
y65: 54835293,
20+
y014: 58600000,
21+
y1564: 219300000,
22+
y65: 60700000,
2823
}, {
29-
country: 'Indonesia',
30-
y014: 65715705,
31-
y1564: 177014815,
32-
y65: 18053690,
24+
country: 'United Kingdom',
25+
y014: 11900000,
26+
y1564: 44200000,
27+
y65: 12000000,
3328
}, {
3429
country: 'Brazil',
35-
y014: 45278034,
36-
y1564: 144391494,
37-
y65: 17190842,
30+
y014: 43200000,
31+
y1564: 151600000,
32+
y65: 24100000,
3833
}, {
39-
country: 'Russia',
40-
y014: 24465156,
41-
y1564: 96123777,
42-
y65: 20412243,
34+
country: 'Canada',
35+
y014: 6000000,
36+
y1564: 26000000,
37+
y65: 7900000,
4338
}];
4439

4540
@Injectable()

‎apps/demos/Demos/Charts/Area/React/App.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function App() {
2626
<div id="chart-demo">
2727
<Chart
2828
palette="Harmony Light"
29-
title="Population: Age Structure (2018)"
29+
title="Population: Age Structure (2024)"
3030
dataSource={dataSource}
3131
>
3232
<CommonSeriesSettings

‎apps/demos/Demos/Charts/Area/React/data.ts‎

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,28 @@
11
export const dataSource = [{
2-
country: 'China',
3-
y014: 233866959,
4-
y1564: 1170914102,
5-
y65: 171774113,
6-
}, {
72
country: 'India',
8-
y014: 373419115,
9-
y1564: 882520945,
10-
y65: 76063757,
3+
y014: 351600000,
4+
y1564: 974800000,
5+
y65: 101500000,
116
}, {
127
country: 'United States',
13-
y014: 60554755,
14-
y1564: 213172625,
15-
y65: 54835293,
8+
y014: 58600000,
9+
y1564: 219300000,
10+
y65: 60700000,
1611
}, {
17-
country: 'Indonesia',
18-
y014: 65715705,
19-
y1564: 177014815,
20-
y65: 18053690,
12+
country: 'United Kingdom',
13+
y014: 11900000,
14+
y1564: 44200000,
15+
y65: 12000000,
2116
}, {
2217
country: 'Brazil',
23-
y014: 45278034,
24-
y1564: 144391494,
25-
y65: 17190842,
18+
y014: 43200000,
19+
y1564: 151600000,
20+
y65: 24100000,
2621
}, {
27-
country: 'Russia',
28-
y014: 24465156,
29-
y1564: 96123777,
30-
y65: 20412243,
22+
country: 'Canada',
23+
y014: 6000000,
24+
y1564: 26000000,
25+
y65: 7900000,
3126
}];
3227

3328
export const seriesTypeLabel = { 'aria-label': 'Series Type' };

‎apps/demos/Demos/Charts/Area/ReactJs/App.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function App() {
2424
<div id="chart-demo">
2525
<Chart
2626
palette="Harmony Light"
27-
title="Population: Age Structure (2018)"
27+
title="Population: Age Structure (2024)"
2828
dataSource={dataSource}
2929
>
3030
<CommonSeriesSettings

‎apps/demos/Demos/Charts/Area/ReactJs/data.js‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,33 @@
11
export const dataSource = [
2-
{
3-
country: 'China',
4-
y014: 233866959,
5-
y1564: 1170914102,
6-
y65: 171774113,
7-
},
82
{
93
country: 'India',
10-
y014: 373419115,
11-
y1564: 882520945,
12-
y65: 76063757,
4+
y014: 351600000,
5+
y1564: 974800000,
6+
y65: 101500000,
137
},
148
{
159
country: 'United States',
16-
y014: 60554755,
17-
y1564: 213172625,
18-
y65: 54835293,
10+
y014: 58600000,
11+
y1564: 219300000,
12+
y65: 60700000,
1913
},
2014
{
21-
country: 'Indonesia',
22-
y014: 65715705,
23-
y1564: 177014815,
24-
y65: 18053690,
15+
country: 'United Kingdom',
16+
y014: 11900000,
17+
y1564: 44200000,
18+
y65: 12000000,
2519
},
2620
{
2721
country: 'Brazil',
28-
y014: 45278034,
29-
y1564: 144391494,
30-
y65: 17190842,
22+
y014: 43200000,
23+
y1564: 151600000,
24+
y65: 24100000,
3125
},
3226
{
33-
country: 'Russia',
34-
y014: 24465156,
35-
y1564: 96123777,
36-
y65: 20412243,
27+
country: 'Canada',
28+
y014: 6000000,
29+
y1564: 26000000,
30+
y65: 7900000,
3731
},
3832
];
3933
export const seriesTypeLabel = { 'aria-label': 'Series Type' };

‎apps/demos/Demos/Charts/Area/Vue/App.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<DxChart
44
:data-source="dataSource"
55
palette="Harmony Light"
6-
title="Population: Age Structure (2018)"
6+
title="Population: Age Structure (2024)"
77
>
88
<DxCommonSeriesSettings
99
:type="type"

‎apps/demos/Demos/Charts/Area/Vue/data.ts‎

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
11
export const dataSource = [{
2-
country: 'China',
3-
y014: 233866959,
4-
y1564: 1170914102,
5-
y65: 171774113,
6-
}, {
72
country: 'India',
8-
y014: 373419115,
9-
y1564: 882520945,
10-
y65: 76063757,
3+
y014: 351600000,
4+
y1564: 974800000,
5+
y65: 101500000,
116
}, {
127
country: 'United States',
13-
y014: 60554755,
14-
y1564: 213172625,
15-
y65: 54835293,
8+
y014: 58600000,
9+
y1564: 219300000,
10+
y65: 60700000,
1611
}, {
17-
country: 'Indonesia',
18-
y014: 65715705,
19-
y1564: 177014815,
20-
y65: 18053690,
12+
country: 'United Kingdom',
13+
y014: 11900000,
14+
y1564: 44200000,
15+
y65: 12000000,
2116
}, {
2217
country: 'Brazil',
23-
y014: 45278034,
24-
y1564: 144391494,
25-
y65: 17190842,
18+
y014: 43200000,
19+
y1564: 151600000,
20+
y65: 24100000,
2621
}, {
27-
country: 'Russia',
28-
y014: 24465156,
29-
y1564: 96123777,
30-
y65: 20412243,
22+
country: 'Canada',
23+
y014: 6000000,
24+
y1564: 26000000,
25+
y65: 7900000,
3126
}];

‎apps/demos/Demos/Charts/Area/jQuery/data.js‎

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,28 @@
11
const dataSource = [{
2-
country: 'China',
3-
y014: 233866959,
4-
y1564: 1170914102,
5-
y65: 171774113,
6-
}, {
72
country: 'India',
8-
y014: 373419115,
9-
y1564: 882520945,
10-
y65: 76063757,
3+
y014: 351600000,
4+
y1564: 974800000,
5+
y65: 101500000,
116
}, {
127
country: 'United States',
13-
y014: 60554755,
14-
y1564: 213172625,
15-
y65: 54835293,
8+
y014: 58600000,
9+
y1564: 219300000,
10+
y65: 60700000,
1611
}, {
17-
country: 'Indonesia',
18-
y014: 65715705,
19-
y1564: 177014815,
20-
y65: 18053690,
12+
country: 'United Kingdom',
13+
y014: 11900000,
14+
y1564: 44200000,
15+
y65: 12000000,
2116
}, {
2217
country: 'Brazil',
23-
y014: 45278034,
24-
y1564: 144391494,
25-
y65: 17190842,
18+
y014: 43200000,
19+
y1564: 151600000,
20+
y65: 24100000,
2621
}, {
27-
country: 'Russia',
28-
y014: 24465156,
29-
y1564: 96123777,
30-
y65: 20412243,
22+
country: 'Canada',
23+
y014: 6000000,
24+
y1564: 26000000,
25+
y65: 7900000,
3126
}];
3227

3328
const types = ['area', 'stackedarea', 'fullstackedarea'];

‎apps/demos/Demos/Charts/Area/jQuery/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $(() => {
1414
margin: {
1515
bottom: 20,
1616
},
17-
title: 'Population: Age Structure (2018)',
17+
title: 'Population: Age Structure (2024)',
1818
argumentAxis: {
1919
valueMarginsEnabled: false,
2020
},

0 commit comments

Comments
 (0)