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

0 commit comments

Comments
 (0)