Skip to content

Commit 10e9a05

Browse files
Merge pull request #466 from Syncfusion-Content/hotfix/hotfix-v26.1.35
DOCINFRA-2341_merged_using_automation
2 parents 91fa06c + d8652bc commit 10e9a05

File tree

29 files changed

+364
-31
lines changed

29 files changed

+364
-31
lines changed

ej2-react/code-snippet/multicolumn-combobox/columns/column-attribute/app/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function App() {
2424
{ "EmpID": 1017, "Name": "Tom Williams", "Designation": "Developer", "Country": "Ukraine" },
2525
{ "EmpID": 1018, "Name": "Grace", "Designation": "Developer", "Country": "Australia" },
2626
{ "EmpID": 1019, "Name": "Olivia", "Designation": "Team Lead", "Country": "Ireland" },
27-
{ "EmpID": 1020, "Name": "James", "Designation": "Developer", "Country": "China" },
27+
{ "EmpID": 1020, "Name": "James", "Designation": "Developer", "Country": "China" }
2828
];
2929
// maps the appropriate column to fields property
3030
const fields = { text: 'Name', value: 'EmpID' };

ej2-react/code-snippet/multicolumn-combobox/columns/column-attribute/index.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
/* Represents the styles for loader */
23
#loader {
34
color: #008cff;

ej2-react/code-snippet/multicolumn-combobox/columns/column-attribute/index.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
<link href="https://cdn.syncfusion.com/ej2/20.3.56/ej2-react-multicolumn-combobox/styles/material.css" rel="stylesheet" />
1616
<script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.38/system.js"></script>
1717
<script src="systemjs.config.js"></script>
18+
<style>
19+
.e-custom-multicolumn {
20+
font-weight: bolder;
21+
}
22+
</style>
1823
</head>
1924

2025
<body>

ej2-react/code-snippet/multicolumn-combobox/columns/column-checkbox/app/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function App() {
3333

3434
return (
3535
// specifies the tag for render the MultiColumn ComboBox component
36-
<MultiColumnComboBoxComponent id="multicolumn" dataSource={empData} fields={fields} text={text} disabled={true}>
36+
<MultiColumnComboBoxComponent id="multicolumn" dataSource={empData} fields={fields} text={text}>
3737
<ColumnsDirective>
3838
<ColumnDirective field='EmpID' header='Employee ID' width={90} displayAsCheckBox={true}></ColumnDirective>
3939
<ColumnDirective field='Name' header='Name' width={90}></ColumnDirective>

ej2-react/code-snippet/multicolumn-combobox/columns/column-checkbox/app/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function App() {
3333

3434
return (
3535
// specifies the tag for render the MultiColumn ComboBox component
36-
<MultiColumnComboBoxComponent id="multicolumn" dataSource={empData} fields={fields} text={text} disabled={true}>
36+
<MultiColumnComboBoxComponent id="multicolumn" dataSource={empData} fields={fields} text={text}>
3737
<ColumnsDirective>
3838
<ColumnDirective field='EmpID' header='Employee ID' width={90} displayAsCheckBox={true}></ColumnDirective>
3939
<ColumnDirective field='Name' header='Name' width={90}></ColumnDirective>

ej2-react/code-snippet/multicolumn-combobox/columns/column-template/index.css

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,28 @@
77
top: 45%;
88
width: 30%;
99
}
10+
11+
.multicolumn-customize .ename {
12+
opacity: .87;
13+
font-size: 16px;
14+
margin-top: 8px;
15+
}
16+
17+
.multicolumn-customize .country {
18+
opacity: .87;
19+
font-size: 16px;
20+
}
21+
22+
.multicolumn-customize .job {
23+
opacity: .54;
24+
font-size: 14px;
25+
margin-top: 15px;
26+
margin-bottom: 7px;
27+
}
28+
29+
.multicolumn-customize .empImage {
30+
margin: 6px 16px;
31+
float: left;
32+
width: 50px;
33+
height: 50px;
34+
}

ej2-react/code-snippet/multicolumn-combobox/items/cssClass/app/index.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as ReactDOM from 'react-dom';
44

55
function App() {
66
// defined the array of object data
7-
const empData: { [key: string]: Object }[] = [
7+
const empData = [
88
{ "EmpID": 1001, "Name": "Andrew Fuller", "Designation": "Team Lead", "Country": "England" },
99
{ "EmpID": 1002, "Name": "Robert", "Designation": "Developer", "Country": "USA" },
1010
{ "EmpID": 1003, "Name": "Michael", "Designation": "HR", "Country": "Russia" },
@@ -27,9 +27,9 @@ function App() {
2727
{ "EmpID": 1020, "Name": "James", "Designation": "Developer", "Country": "China" },
2828
];
2929
// maps the appropriate column to fields property
30-
const fields: Object = { text: 'Name', value: 'EmpID' };
30+
const fields = { text: 'Name', value: 'EmpID' };
3131
// set text to multicolumn ComboBox input element
32-
const text: string = 'Michael';
32+
const text = 'Michael';
3333

3434
return (
3535
// specifies the tag for render the MultiColumn ComboBox component

ej2-react/code-snippet/multicolumn-combobox/items/cssClass/index.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
width: 30%;
99
}
1010

11-
.e-input-group.e-custom-multi-column {
11+
span.e-control-wrapper.e-custom-multi-column {
1212
color: #ab3243;
1313
background: #32a5ab;
1414
}

ej2-react/code-snippet/multicolumn-combobox/items/cssClass/index.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
<link href="https://cdn.syncfusion.com/ej2/20.3.56/ej2-react-multicolumn-combobox/styles/material.css" rel="stylesheet" />
1616
<script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.38/system.js"></script>
1717
<script src="systemjs.config.js"></script>
18+
<style>
19+
span.e-control-wrapper.e-custom-multi-column {
20+
color: #ab3243;
21+
background: #32a5ab;
22+
}
23+
</style>
1824
</head>
1925

2026
<body>

ej2-react/code-snippet/multicolumn-combobox/items/enableAltRow/app/index.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as ReactDOM from 'react-dom';
44

55
function App() {
66
// defined the array of object data
7-
const empData: { [key: string]: Object }[] = [
7+
const empData = [
88
{ "EmpID": 1001, "Name": "Andrew Fuller", "Designation": "Team Lead", "Country": "England" },
99
{ "EmpID": 1002, "Name": "Robert", "Designation": "Developer", "Country": "USA" },
1010
{ "EmpID": 1003, "Name": "Michael", "Designation": "HR", "Country": "Russia" },
@@ -27,9 +27,9 @@ function App() {
2727
{ "EmpID": 1020, "Name": "James", "Designation": "Developer", "Country": "China" },
2828
];
2929
// maps the appropriate column to fields property
30-
const fields: Object = { text: 'Name', value: 'EmpID' };
30+
const fields = { text: 'Name', value: 'EmpID' };
3131
// set text to multicolumn ComboBox input element
32-
const text: string = 'Michael';
32+
const text = 'Michael';
3333

3434
return (
3535
// specifies the tag for render the MultiColumn ComboBox component

ej2-react/code-snippet/multicolumn-combobox/items/gridLines/app/index.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as ReactDOM from 'react-dom';
44

55
function App() {
66
// defined the array of object data
7-
const empData: { [key: string]: Object }[] = [
7+
const empData = [
88
{ "EmpID": 1001, "Name": "Andrew Fuller", "Designation": "Team Lead", "Country": "England" },
99
{ "EmpID": 1002, "Name": "Robert", "Designation": "Developer", "Country": "USA" },
1010
{ "EmpID": 1003, "Name": "Michael", "Designation": "HR", "Country": "Russia" },
@@ -27,9 +27,9 @@ function App() {
2727
{ "EmpID": 1020, "Name": "James", "Designation": "Developer", "Country": "China" },
2828
];
2929
// maps the appropriate column to fields property
30-
const fields: Object = { text: 'Name', value: 'EmpID' };
30+
const fields = { text: 'Name', value: 'EmpID' };
3131
// set text to multicolumn ComboBox input element
32-
const text: string = 'Michael';
32+
const text = 'Michael';
3333

3434
return (
3535
// specifies the tag for render the MultiColumn ComboBox component

ej2-react/code-snippet/multicolumn-combobox/items/rowHeight/app/index.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as ReactDOM from 'react-dom';
44

55
function App() {
66
// defined the array of object data
7-
const empData: { [key: string]: Object }[] = [
7+
const empData = [
88
{ "EmpID": 1001, "Name": "Andrew Fuller", "Designation": "Team Lead", "Country": "England" },
99
{ "EmpID": 1002, "Name": "Robert", "Designation": "Developer", "Country": "USA" },
1010
{ "EmpID": 1003, "Name": "Michael", "Designation": "HR", "Country": "Russia" },
@@ -27,9 +27,9 @@ function App() {
2727
{ "EmpID": 1020, "Name": "James", "Designation": "Developer", "Country": "China" },
2828
];
2929
// maps the appropriate column to fields property
30-
const fields: Object = { text: 'Name', value: 'EmpID' };
30+
const fields = { text: 'Name', value: 'EmpID' };
3131
// set text to multicolumn ComboBox input element
32-
const text: string = 'Michael';
32+
const text = 'Michael';
3333

3434
return (
3535
// specifies the tag for render the MultiColumn ComboBox component

ej2-react/code-snippet/multicolumn-combobox/items/text/app/index.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as ReactDOM from 'react-dom';
44

55
function App() {
66
// defined the array of object data
7-
const empData: { [key: string]: Object }[] = [
7+
const empData = [
88
{ "EmpID": 1001, "Name": "Andrew Fuller", "Designation": "Team Lead", "Country": "England" },
99
{ "EmpID": 1002, "Name": "Robert", "Designation": "Developer", "Country": "USA" },
1010
{ "EmpID": 1003, "Name": "Michael", "Designation": "HR", "Country": "Russia" },
@@ -27,9 +27,9 @@ function App() {
2727
{ "EmpID": 1020, "Name": "James", "Designation": "Developer", "Country": "China" },
2828
];
2929
// maps the appropriate column to fields property
30-
const fields: Object = { text: 'Name', value: 'EmpID' };
30+
const fields = { text: 'Name', value: 'EmpID' };
3131
// set text to multicolumn ComboBox input element
32-
const text: string = 'Michael';
32+
const text = 'Michael';
3333

3434
return (
3535
// specifies the tag for render the MultiColumn ComboBox component

ej2-react/code-snippet/multicolumn-combobox/sorting/sortOrder/app/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { MultiColumnComboBoxComponent, ColumnsDirective, ColumnDirective } from '@syncfusion/ej2-react-multicolumn-combobox';
1+
import { MultiColumnComboBoxComponent, ColumnsDirective, ColumnDirective, SortOrder } from '@syncfusion/ej2-react-multicolumn-combobox';
22
import * as React from 'react';
33
import * as ReactDOM from 'react-dom';
44

ej2-react/code-snippet/multicolumn-combobox/sorting/sortType/app/index.jsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
2-
3-
import { MultiColumnComboBoxComponent, ColumnsDirective, ColumnDirective } from '@syncfusion/ej2-react-multicolumn-combobox';
1+
import { MultiColumnComboBoxComponent, ColumnsDirective, ColumnDirective, SortOrder} from '@syncfusion/ej2-react-multicolumn-combobox';
42
import * as React from 'react';
53
import * as ReactDOM from 'react-dom';
64

@@ -48,5 +46,3 @@ function App() {
4846
);
4947
}
5048
ReactDOM.render(<App />, document.getElementById('multicolumn'));
51-
52-

ej2-react/code-snippet/multicolumn-combobox/templates/itemTemplate/index.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,9 @@
66
position: absolute;
77
top: 45%;
88
width: 30%;
9+
}
10+
11+
.name, .emp-id, .city {
12+
border-bottom: 1px solid #e0e0e0;
13+
padding: 6px 6px 4px 20px;
914
}

ej2-react/code-snippet/multicolumn-combobox/templates/itemTemplate/index.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
<link href="https://cdn.syncfusion.com/ej2/20.3.56/ej2-react-multicolumn-combobox/styles/material.css" rel="stylesheet" />
1616
<script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.38/system.js"></script>
1717
<script src="systemjs.config.js"></script>
18+
<style>
19+
.name, .emp-id, .city {
20+
border-bottom: 1px solid #e0e0e0;
21+
padding: 6px 6px 4px 20px;
22+
}
23+
</style>
1824
</head>
1925

2026
<body>

ej2-react/code-snippet/multicolumn-combobox/virtualization/remotedata/app/index.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { MultiColumnComboBoxComponent, ColumnsDirective, ColumnDirective } from '@syncfusion/ej2-react-multicolumn-combobox';
2+
import { DataManager, WebApiAdaptor } from '@syncfusion/ej2-data';
23
import * as React from 'react';
34
import * as ReactDOM from 'react-dom';
45

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
@import url('https://cdn.syncfusion.com/ej2/26.1.35/ej2-base/styles/material.css');
2+
@import url('https://cdn.syncfusion.com/ej2/26.1.35/ej2-buttons/styles/material.css');
3+
@import url('https://cdn.syncfusion.com/ej2/26.1.35/ej2-calendars/styles/material.css');
4+
@import url('https://cdn.syncfusion.com/ej2/26.1.35/ej2-dropdowns/styles/material.css');
5+
@import url('https://cdn.syncfusion.com/ej2/26.1.35/ej2-grids/styles/material.css');
6+
@import url('https://cdn.syncfusion.com/ej2/26.1.35/ej2-charts/styles/material.css');
7+
@import url('https://cdn.syncfusion.com/ej2/26.1.35/ej2-inputs/styles/material.css');
8+
@import url('https://cdn.syncfusion.com/ej2/26.1.35/ej2-lists/styles/material.css');
9+
@import url('https://cdn.syncfusion.com/ej2/26.1.35/ej2-navigations/styles/material.css');
10+
@import url('https://cdn.syncfusion.com/ej2/26.1.35/ej2-popups/styles/material.css');
11+
@import url('https://cdn.syncfusion.com/ej2/26.1.35/ej2-splitbuttons/styles/material.css');
12+
@import url('https://cdn.syncfusion.com/ej2/26.1.35/ej2-pivotview/styles/material.css');
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import * as React from 'react';
2+
import { PivotViewComponent } from '@syncfusion/ej2-react-pivotview';
3+
import { pivotData } from './datasource';
4+
import './App.css';
5+
6+
function App() {
7+
const dataSourceSettings = {
8+
columns: [{ name: 'Date', caption: 'Date' }, { name: 'Product' }],
9+
dataSource: pivotData,
10+
expandAll: false,
11+
filters: [],
12+
drilledMembers: [{ name: 'Country', items: ['France'] }],
13+
formatSettings: [{ name: 'Amount', format: 'C0' }],
14+
rows: [{ name: 'Country' }, { name: 'State' }],
15+
values: [{ name: 'Amount', caption: 'Sold Amount' }, { name: 'Quantity', caption: 'Quantity' }]
16+
};
17+
let pivotObj;
18+
return (<PivotViewComponent ref={d => pivotObj = d} id='PivotView' height={350} dataSourceSettings={dataSourceSettings}>
19+
</PivotViewComponent>);
20+
};
21+
22+
export default App;
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import * as React from 'react';
2+
import { IDataOptions, IDataSet, PivotViewComponent } from '@syncfusion/ej2-react-pivotview';
3+
import { pivotData } from './datasource';
4+
import './App.css';
5+
6+
function App() {
7+
const dataSourceSettings: IDataOptions = {
8+
columns: [{ name: 'Date', caption: 'Date' }, { name: 'Product' }],
9+
dataSource: pivotData as IDataSet[],
10+
expandAll: false,
11+
filters: [],
12+
drilledMembers: [{ name: 'Country', items: ['France'] }],
13+
formatSettings: [{ name: 'Amount', format: 'C0' }],
14+
rows: [{ name: 'Country' }, { name: 'State' }],
15+
values: [{ name: 'Amount', caption: 'Sold Amount' }, { name: 'Quantity', caption: 'Quantity' }]
16+
};
17+
let pivotObj: PivotViewComponent;
18+
return (
19+
<PivotViewComponent id='PivotView' ref={ (d: PivotViewComponent) => pivotObj = d } height={350} dataSourceSettings={dataSourceSettings}></PivotViewComponent>
20+
);
21+
};
22+
23+
export default App;
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
export let pivotData = [
2+
{ Amount: 2100, Country: "Canada", Date: "FY 2005", Product: "Bike", Quantity: 22, State: "Alberta" },
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" },
6+
{ Amount: 9100, Country: "France", Date: "FY 2007", Product: "Car", Quantity: 64, State: "Charente-Maritime" },
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" },
11+
{ Amount: 1040, Country: "United Kingdom", Date: "FY 2005", Product: "Bike", Quantity: 47, State: "England" },
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" },
14+
{ Amount: 1520, Country: "United States", Date: "FY 2006", Product: "Bike", Quantity: 53, State: "North Carolina" },
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+
];
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
export let pivotData: { [key: string]: Object }[] = [
2+
{ Amount: 2100, Country: "Canada", Date: "FY 2005", Product: "Bike", Quantity: 22, State: "Alberta" },
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" },
6+
{ Amount: 9100, Country: "France", Date: "FY 2007", Product: "Car", Quantity: 64, State: "Charente-Maritime" },
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" },
11+
{ Amount: 1040, Country: "United Kingdom", Date: "FY 2005", Product: "Bike", Quantity: 47, State: "England" },
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" },
14+
{ Amount: 1520, Country: "United States", Date: "FY 2006", Product: "Bike", Quantity: 53, State: "North Carolina" },
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+
];
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import * as React from 'react';
2+
import * as ReactDOM from 'react-dom';
3+
import App from './App';
4+
5+
const root = ReactDOM.createRoot(
6+
document.getElementById('root') as HTMLElement
7+
);
8+
9+
root.render(
10+
<React.StrictMode>
11+
<App />
12+
</React.StrictMode>
13+
);

0 commit comments

Comments
 (0)