Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3fb8e85645 | ||
|
|
46aeeb228a |
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "ag-grid-react-example",
|
"name": "ag-grid-react-example",
|
||||||
"version": "5.0.0",
|
"version": "5.1.0",
|
||||||
"description": "Example Reach applicaiton using ag-Grid.",
|
"description": "Example Reach applicaiton using ag-Grid.",
|
||||||
"main": "dist/ag-grid-react-example.js",
|
"main": "dist/ag-grid-react-example.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -34,8 +34,8 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"react": "0.14.6",
|
"react": "0.14.6",
|
||||||
"react-dom": "0.14.6",
|
"react-dom": "0.14.6",
|
||||||
"ag-grid": "~5.0.0",
|
"ag-grid": "~5.1.0",
|
||||||
"ag-grid-enterprise": "~5.0.0",
|
"ag-grid-enterprise": "~5.1.0",
|
||||||
"ag-grid-react": "~5.0.0"
|
"ag-grid-react": "~5.1.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,9 +16,9 @@ export default class ColDefFactory {
|
|||||||
{
|
{
|
||||||
headerName: 'Employee',
|
headerName: 'Employee',
|
||||||
children: [
|
children: [
|
||||||
{headerName: "Name", field: "name",
|
{headerName: "Name", field: "name", enableRowGroup: true, enablePivot: true,
|
||||||
width: 150, pinned: true},
|
width: 150, pinned: true},
|
||||||
{headerName: "Country", field: "country", width: 150,
|
{headerName: "Country", field: "country", width: 150, enableRowGroup: true, enablePivot: true,
|
||||||
// not bothering with React for country, as it's a simple HTML string
|
// not bothering with React for country, as it's a simple HTML string
|
||||||
cellRenderer: countryCellRenderer, pinned: true,
|
cellRenderer: countryCellRenderer, pinned: true,
|
||||||
filterParams: {cellRenderer: countryCellRenderer, cellHeight: 20}},
|
filterParams: {cellRenderer: countryCellRenderer, cellHeight: 20}},
|
||||||
@@ -27,13 +27,13 @@ export default class ColDefFactory {
|
|||||||
{
|
{
|
||||||
headerName: 'IT Skills',
|
headerName: 'IT Skills',
|
||||||
children: [
|
children: [
|
||||||
{headerName: "Skills", width: 125, suppressSorting: true, field: 'skills',
|
{headerName: "Skills", width: 125, suppressSorting: true, field: 'skills', enableRowGroup: true, enablePivot: true,
|
||||||
// using ag-Grid's React cellRenderer factory
|
// using ag-Grid's React cellRenderer factory
|
||||||
cellRenderer: reactCellRendererFactory(SkillsCellRenderer),
|
cellRenderer: reactCellRendererFactory(SkillsCellRenderer),
|
||||||
// using ag-Grid's React filter factory
|
// using ag-Grid's React filter factory
|
||||||
filter: reactFilterFactory(SkillsFilter)
|
filter: reactFilterFactory(SkillsFilter)
|
||||||
},
|
},
|
||||||
{headerName: "Proficiency", field: "proficiency", filter: 'number', width: 120,
|
{headerName: "Proficiency", field: "proficiency", filter: 'number', width: 120, enableValue: true,
|
||||||
// using ag-Grid's React cellRenderer factory
|
// using ag-Grid's React cellRenderer factory
|
||||||
cellRenderer: reactCellRendererFactory(ProficiencyCellRenderer),
|
cellRenderer: reactCellRendererFactory(ProficiencyCellRenderer),
|
||||||
// using ag-Grid's React filter factory
|
// using ag-Grid's React filter factory
|
||||||
@@ -56,8 +56,12 @@ export default class ColDefFactory {
|
|||||||
// this is a simple cell renderer, putting together static html, no
|
// this is a simple cell renderer, putting together static html, no
|
||||||
// need to use React for it.
|
// need to use React for it.
|
||||||
function countryCellRenderer(params) {
|
function countryCellRenderer(params) {
|
||||||
|
if (params.value) {
|
||||||
var flag = "<img border='0' width='15' height='10' " +
|
var flag = "<img border='0' width='15' height='10' " +
|
||||||
"style='margin-bottom: 2px' src='http://flags.fmcdn.net/data/flags/mini/"
|
"style='margin-bottom: 2px' src='http://flags.fmcdn.net/data/flags/mini/"
|
||||||
+ RefData.COUNTRY_CODES[params.value] + ".png'>";
|
+ RefData.COUNTRY_CODES[params.value] + ".png'>";
|
||||||
return flag + " " + params.value;
|
return flag + " " + params.value;
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ export default class SkillsCellRenderer extends React.Component {
|
|||||||
var skills = [];
|
var skills = [];
|
||||||
var rowData = this.props.params.data;
|
var rowData = this.props.params.data;
|
||||||
RefData.IT_SKILLS.forEach( (skill) => {
|
RefData.IT_SKILLS.forEach( (skill) => {
|
||||||
if (rowData.skills[skill]) {
|
if (rowData && rowData.skills && rowData.skills[skill]) {
|
||||||
skills.push(<img key={skill} src={'images/skills/' + skill + '.png'} width={16} title={skill} />);
|
skills.push(<img key={skill} src={'images/skills/' + skill + '.png'} width={16} title={skill} />);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user