Skip to content

Commit f361b34

Browse files
Integrated latest changes at 06-24-2024 4:30:13 PM
1 parent 0bc697d commit f361b34

File tree

39 files changed

+255
-7282
lines changed

39 files changed

+255
-7282
lines changed

ej2-react/chart/feature-modules.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The available chart modules are
3636
| [`StepAreaSeries`](https://ej2.syncfusion.com/react/documentation/api/chart/stepAreaSeries)| Inject this module to use the step area type series in the chart.|
3737
| [`SplineAreaSeries`](https://ej2.syncfusion.com/react/documentation/api/chart/splineAreaSeries)| Inject this module to use the spline area type series in the chart.|
3838
| [`MultiColoredAreaSeries`](https://ej2.syncfusion.com/react/documentation/api/chart/multiColoredAreaSeries)| Inject this module to use the multi colored area type series in the chart.|
39-
| [`ColumnSeries`](https://ej2.syncfusion.com/react/documentation/api/chart/column)| Inject this module to use the column type series in the chart.||
39+
| [`ColumnSeries`](https://ej2.syncfusion.com/react/documentation/api/chart/column)| Inject this module to use the column type series in the chart.|
4040
| [`RangeColumnSeries`](https://ej2.syncfusion.com/react/documentation/api/chart/rangeColumnSeries)| Inject this module to use the range column type series in the chart.|
4141
| [`StackingColumnSeries`](https://ej2.syncfusion.com/react/documentation/api/chart/stackingColumnSeries)| Inject this module to use the stacking column type series in the chart.|
4242
| [`BarSeries`](https://ej2.syncfusion.com/react/documentation/api/chart/barSeries)| Inject this module to use the bar type series in the chart.|

ej2-react/code-snippet/pivot-table/default-cs299/app/datasource.tsx

Lines changed: 13 additions & 6378 deletions
Large diffs are not rendered by default.

ej2-react/code-snippet/pivot-table/default-cs299/app/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function App() {
5353
document.getElementById('files').value = '';
5454
}
5555
return (<div className='control-pane'>
56-
<div><style>{SAMPLE_CSS}</style><PivotViewComponent id='PivotView' ref={d => pivotObj = d} dataSourceSettings={dataSourceSettings} width={'100%'} height={350} gridSettings={{ columnWidth: 140 }} dataBound={ondataBound.bind(this)}></PivotViewComponent></div><a id="save" class="btn btn-primary">Save</a><div class="fileUpload btn btn-primary"><span>Load</span><input id="files" type="file" class="upload"/></div>
56+
<div><style>{SAMPLE_CSS}</style><PivotViewComponent id='PivotView' ref={d => pivotObj = d} dataSourceSettings={dataSourceSettings} width={'100%'} height={350} dataBound={ondataBound.bind(this)}></PivotViewComponent></div><a id="save" class="btn btn-primary">Save</a><div class="fileUpload btn btn-primary"><span>Load</span><input id="files" type="file" class="upload"/></div>
5757
</div>);
5858
}
5959
;

ej2-react/code-snippet/pivot-table/default-cs299/app/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ function App() {
5858
}
5959

6060
return (<div className='control-pane'><div><style>{SAMPLE_CSS}</style>
61-
<PivotViewComponent id='PivotView' ref={d => pivotObj = d} dataSourceSettings={dataSourceSettings} width={'100%'} height={350}
62-
gridSettings={{ columnWidth: 140 }} dataBound={ondataBound.bind(this)}></PivotViewComponent></div>
61+
<PivotViewComponent id='PivotView' ref={d => pivotObj = d} dataSourceSettings={dataSourceSettings} width={'100%'} height={350} dataBound={ondataBound.bind(this)}></PivotViewComponent></div>
6362
<a id="save" className="btn btn-primary">Save</a><div className="fileUpload btn btn-primary"><span>Load</span><input id="files" type="file" className="upload" /></div>
6463
</div>);
6564
};

ej2-react/code-snippet/pivot-table/getting-started-cs1/app/App.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function App() {
1616
let pivotObj;
1717
return (<PivotViewComponent ref={d => pivotObj = d} id='PivotView' height={350} dataSourceSettings={dataSourceSettings}>
1818
</PivotViewComponent>);
19-
}
20-
;
19+
};
20+
2121
export default App;
22-
ReactDOM.render(<App />, document.getElementById("sample"));
22+
ReactDOM.render(<App />, document.getElementById("root"));
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
2-
31
import * as React from 'react';
42
import * as ReactDOM from "react-dom";
53
import { IDataOptions, IDataSet, PivotViewComponent } from '@syncfusion/ej2-react-pivotview';
64
import { pivotData } from './datasource';
5+
76
function App() {
87
const dataSourceSettings: IDataOptions = {
98
columns: [{ name: 'Date', caption: 'Date' }, { name: 'Product' }],
@@ -15,13 +14,10 @@ function App() {
1514
rows: [{ name: 'Country' }, { name: 'State' }],
1615
values: [{ name: 'Amount', caption: 'Sold Amount' }, { name: 'Quantity', caption: 'Quantity' }]
1716
};
18-
let pivotObj: PivotViewComponent;
19-
return (<PivotViewComponent ref={d => pivotObj = d} id='PivotView' height={350} dataSourceSettings={dataSourceSettings}>
20-
</PivotViewComponent>);
17+
return (
18+
<PivotViewComponent id='PivotView' height={350} dataSourceSettings={dataSourceSettings}></PivotViewComponent>
19+
);
2120
};
2221

2322
export default App;
24-
ReactDOM.render(<App />, document.getElementById("sample"));
25-
26-
27-
23+
ReactDOM.render(<App />, document.getElementById("root"));
Lines changed: 12 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,17 @@
11
export let pivotData = [
22
{ Amount: 2100, Country: "Canada", Date: "FY 2005", Product: "Bike", Quantity: 22, State: "Alberta" },
3-
{ Amount: 1100, Country: "Canada", Date: "FY 2008", Product: "Bike", Quantity: 32, State: "Alberta" },
4-
{ Amount: 3100, Country: "Canada", Date: "FY 2005", Product: "Van", Quantity: 22, State: "Alberta" },
5-
{ Amount: 1600, Country: "Canada", Date: "FY 2006", Product: "Van", Quantity: 32, State: "Alberta" },
6-
{ Amount: 1500, Country: "Canada", Date: "FY 2008", Product: "Van", Quantity: 28, State: "Alberta" },
7-
{ Amount: 1060, Country: "Canada", Date: "FY 2005", Product: "Car", Quantity: 26, State: "Alberta" },
8-
{ Amount: 5100, Country: "Canada", Date: "FY 2006", Product: "Car", Quantity: 21, State: "Alberta" },
9-
{ Amount: 1900, Country: "Canada", Date: "FY 2007", Product: "Car", Quantity: 23, State: "Alberta" },
10-
{ Amount: 1000, Country: "Canada", Date: "FY 2008", Product: "Car", Quantity: 29, State: "Alberta" },
11-
{ Amount: 3100, Country: "Canada", Date: "FY 2006", Product: "Bike", Quantity: 40, State: "Quebec" },
12-
{ Amount: 1500, Country: "Canada", Date: "FY 2007", Product: "Bike", Quantity: 14, State: "Quebec" },
13-
{ Amount: 2000, Country: "Canada", Date: "FY 2007", Product: "Van", Quantity: 82, State: "Quebec" },
14-
{ Amount: 4800, Country: "France", Date: "FY 2005", Product: "Car", Quantity: 49, State: "Charente-Maritime" },
15-
{ Amount: 8200, Country: "France", Date: "FY 2006", Product: "Car", Quantity: 38, State: "Charente-Maritime" },
16-
{ Amount: 8100, Country: "France", Date: "FY 2006", Product: "Van", Quantity: 93, State: "Charente-Maritime" },
3+
{ Amount: 1100, Country: "Canada", Date: "FY 2006", Product: "Van", Quantity: 32, State: "Quebec" },
4+
{ Amount: 3100, Country: "Canada", Date: "FY 2007", Product: "Car", Quantity: 22, State: "Alberta" },
5+
{ Amount: 4800, Country: "France", Date: "FY 2005", Product: "Bike", Quantity: 49, State: "Charente-Maritime" },
176
{ Amount: 9100, Country: "France", Date: "FY 2007", Product: "Car", Quantity: 64, State: "Charente-Maritime" },
18-
{ Amount: 2350, Country: "France", Date: "FY 2006", Product: "Bike", Quantity: 46, State: "Essonne" },
19-
{ Amount: 7250, Country: "France", Date: "FY 2005", Product: "Van", Quantity: 43, State: "Gers" },
20-
{ Amount: 9450, Country: "France", Date: "FY 2005", Product: "Bike", Quantity: 49, State: "Gers" },
21-
{ Amount: 1450, Country: "France", Date: "FY 2008", Product: "Bike", Quantity: 49, State: "Gers" },
22-
{ Amount: 1450, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 49, State: "Gers" },
23-
{ Amount: 4250, Country: "France", Date: "FY 2007", Product: "Van", Quantity: 49, State: "Gers" },
24-
{ Amount: 4050, Country: "France", Date: "FY 2007", Product: "Bike", Quantity: 59, State: "Gers" },
25-
{ Amount: 4350, Country: "France", Date: "FY 2008", Product: "Van", Quantity: 23, State: "Gers" },
26-
{ Amount: 4950, Country: "France", Date: "FY 2008", Product: "Car", Quantity: 45, State: "Gers" },
27-
{ Amount: 3400, Country: "Germany", Date: "FY 2005", Product: "Van", Quantity: 78, State: "Bayern" },
28-
{ Amount: 8400, Country: "Germany", Date: "FY 2006", Product: "Van", Quantity: 90, State: "Bayern" },
29-
{ Amount: 9400, Country: "Germany", Date: "FY 2007", Product: "Car", Quantity: 45, State: "Bayern" },
30-
{ Amount: 7200, Country: "Germany", Date: "FY 2008", Product: "Van", Quantity: 92, State: "Bayern" },
31-
{ Amount: 3400, Country: "Germany", Date: "FY 2008", Product: "Bike", Quantity: 24, State: "Bayern" },
32-
{ Amount: 5330, Country: "Germany", Date: "FY 2005", Product: "Car", Quantity: 45, State: "Hamburg" },
33-
{ Amount: 5900, Country: "Germany", Date: "FY 2005", Product: "Bike", Quantity: 20, State: "Saarland" },
34-
{ Amount: 5800, Country: "Germany", Date: "FY 2006", Product: "Bike", Quantity: 58, State: "Saarland" },
35-
{ Amount: 5700, Country: "Germany", Date: "FY 2006", Product: "Car", Quantity: 39, State: "Saarland" },
36-
{ Amount: 8500, Country: "Germany", Date: "FY 2007", Product: "Bike", Quantity: 62, State: "Saarland" },
37-
{ Amount: 2300, Country: "Germany", Date: "FY 2007", Product: "Van", Quantity: 49, State: "Saarland" },
38-
{ Amount: 5200, Country: "Germany", Date: "FY 2008", Product: "Car", Quantity: 48, State: "Saarland" },
7+
{ Amount: 2350, Country: "France", Date: "FY 2008", Product: "Van", Quantity: 46, State: "Gers" },
8+
{ Amount: 3400, Country: "Germany", Date: "FY 2005", Product: "Bike", Quantity: 78, State: "Bayern" },
9+
{ Amount: 8400, Country: "Germany", Date: "FY 2006", Product: "Van", Quantity: 90, State: "Hamburg" },
10+
{ Amount: 7200, Country: "Germany", Date: "FY 2008", Product: "Car", Quantity: 92, State: "Bayern" },
3911
{ Amount: 1040, Country: "United Kingdom", Date: "FY 2005", Product: "Bike", Quantity: 47, State: "England" },
40-
{ Amount: 1450, Country: "United Kingdom", Date: "FY 2005", Product: "Car", Quantity: 42, State: "England" },
41-
{ Amount: 5150, Country: "United Kingdom", Date: "FY 2005", Product: "Van", Quantity: 53, State: "England" },
42-
{ Amount: 1500, Country: "United Kingdom", Date: "FY 2006", Product: "Bike", Quantity: 24, State: "England" },
43-
{ Amount: 7430, Country: "United Kingdom", Date: "FY 2006", Product: "Car", Quantity: 56, State: "England" },
44-
{ Amount: 4720, Country: "United Kingdom", Date: "FY 2006", Product: "Van", Quantity: 50, State: "England" },
45-
{ Amount: 3480, Country: "United Kingdom", Date: "FY 2007", Product: "Bike", Quantity: 45, State: "England" },
46-
{ Amount: 3380, Country: "United Kingdom", Date: "FY 2007", Product: "Car", Quantity: 75, State: "England" },
47-
{ Amount: 5820, Country: "United Kingdom", Date: "FY 2007", Product: "Van", Quantity: 39, State: "England" },
48-
{ Amount: 2820, Country: "United States", Date: "FY 2007", Product: "Car", Quantity: 39, State: "England" },
49-
{ Amount: 4820, Country: "United Kingdom", Date: "FY 2008", Product: "Bike", Quantity: 72, State: "England" },
50-
{ Amount: 1520, Country: "United Kingdom", Date: "FY 2008", Product: "Car", Quantity: 93, State: "England" },
51-
{ Amount: 1450, Country: "United Kingdom", Date: "FY 2008", Product: "Van", Quantity: 84, State: "England" },
52-
{ Amount: 4930, Country: "United States", Date: "FY 2006", Product: "Van", Quantity: 59, State: "Alabama" },
53-
{ Amount: 6250, Country: "United States", Date: "FY 2008", Product: "Bike", Quantity: 94, State: "Alabama" },
12+
{ Amount: 1500, Country: "United Kingdom", Date: "FY 2006", Product: "Van", Quantity: 24, State: "England" },
13+
{ Amount: 4820, Country: "United Kingdom", Date: "FY 2008", Product: "Car", Quantity: 72, State: "England" },
5414
{ Amount: 1520, Country: "United States", Date: "FY 2006", Product: "Bike", Quantity: 53, State: "North Carolina" },
55-
{ Amount: 150, Country: "United States", Date: "FY 2008", Product: "Van", Quantity: 61, State: "North Carolina" },
56-
{ Amount: 3200, Country: "United States", Date: "FY 2005", Product: "Bike", Quantity: 47, State: "South Carolina" },
57-
{ Amount: 3320, Country: "United States", Date: "FY 2005", Product: "Car", Quantity: 49, State: "South Carolina" },
58-
{ Amount: 6300, Country: "United States", Date: "FY 2005", Product: "Van", Quantity: 45, State: "South Carolina" },
59-
{ Amount: 4300, Country: "United States", Date: "FY 2006", Product: "Car", Quantity: 94, State: "South Carolina" },
60-
{ Amount: 7200, Country: "United States", Date: "FY 2007", Product: "Bike", Quantity: 40, State: "South Carolina" },
61-
{ Amount: 3900, Country: "United States", Date: "FY 2007", Product: "Van", Quantity: 43, State: "South Carolina" },
62-
];
63-
15+
{ Amount: 3320, Country: "United States", Date: "FY 2007", Product: "Car", Quantity: 49, State: "South Carolina" },
16+
{ Amount: 6300, Country: "United States", Date: "FY 2008", Product: "Van", Quantity: 45, State: "South Carolina" },
17+
];

0 commit comments

Comments
 (0)