Compare commits

...

10 Commits
4.0.1 ... 5.2.0

Author SHA1 Message Date
ceolter
bc2a8d959c release 5.2.x 2016-08-18 09:38:28 +01:00
ceolter
3fb8e85645 release 5.1.x 2016-08-12 17:09:29 +01:00
ceolter
46aeeb228a fixed rendering issues when grouping was set 2016-07-28 16:10:08 +01:00
ceolter
44c06b41e3 release of 5.0.0 2016-07-10 11:19:28 +01:00
ceolter
f984c4175b Merge remote-tracking branch 'origin/master' 2016-06-23 11:11:14 +01:00
ceolter
d94d79c1b1 release of 5.0.0-alpha.0 2016-06-23 11:11:05 +01:00
Niall Crosby
cd7c199f4d Merge pull request #9 from cumanacr/master
fix: filename references
2016-06-01 10:01:49 +01:00
Cristian Umaña
49fca88d58 fix: filename references 2016-05-30 13:53:15 -06:00
ceolter
a22d3da8ce release of 4.2.x 2016-05-27 17:23:27 +01:00
Ceolter
c6d9f41393 changes to match v4.0.0 of ag-Grid 2016-04-25 20:30:04 +01:00
5 changed files with 19 additions and 15 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "ag-grid-react-example",
"version": "4.0.0",
"version": "5.2.0",
"description": "Example Reach applicaiton using ag-Grid.",
"main": "dist/ag-grid-react-example.js",
"scripts": {
@@ -34,8 +34,8 @@
"dependencies": {
"react": "0.14.6",
"react-dom": "0.14.6",
"ag-grid": "4.0.x",
"ag-grid-enterprise": "4.0.x",
"ag-grid-react": "4.0.x"
"ag-grid": "~5.2.0",
"ag-grid-enterprise": "~5.2.0",
"ag-grid-react": "~5.2.0"
}
}

View File

@@ -16,9 +16,9 @@ export default class ColDefFactory {
{
headerName: 'Employee',
children: [
{headerName: "Name", field: "name",
{headerName: "Name", field: "name", enableRowGroup: true, enablePivot: 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
cellRenderer: countryCellRenderer, pinned: true,
filterParams: {cellRenderer: countryCellRenderer, cellHeight: 20}},
@@ -27,13 +27,13 @@ export default class ColDefFactory {
{
headerName: 'IT Skills',
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
cellRenderer: reactCellRendererFactory(SkillsCellRenderer),
// using ag-Grid's React filter factory
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
cellRenderer: reactCellRendererFactory(ProficiencyCellRenderer),
// 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
// need to use React for it.
function countryCellRenderer(params) {
var flag = "<img border='0' width='15' height='10' " +
"style='margin-bottom: 2px' src='http://flags.fmcdn.net/data/flags/mini/"
+ RefData.COUNTRY_CODES[params.value] + ".png'>";
return flag + " " + params.value;
if (params.value) {
var flag = "<img border='0' width='15' height='10' " +
"style='margin-bottom: 2px' src='http://flags.fmcdn.net/data/flags/mini/"
+ RefData.COUNTRY_CODES[params.value] + ".png'>";
return flag + " " + params.value;
} else {
return null;
}
}

View File

@@ -7,7 +7,7 @@ export default class SkillsCellRenderer extends React.Component {
var skills = [];
var rowData = this.props.params.data;
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} />);
}
});

View File

@@ -2,7 +2,7 @@
import ReactDOM from 'react-dom';
import React from 'react';
import MyApp from './MyApp.jsx';
import MyApp from './myApp.jsx';
// is there a better way of doing this?
import 'ag-grid-root/dist/styles/ag-grid.css';
import 'ag-grid-root/dist/styles/theme-fresh.css';

View File

@@ -4,7 +4,7 @@ import {AgGridReact} from 'ag-grid-react';
import RefData from './RefData';
import RowDataFactory from './RowDataFactory';
import ColDefFactory from './ColDefFactory.jsx';
import './MyApp.css';
import './myApp.css';
// take this line out if you do not want to use ag-Grid-Enterprise
import 'ag-grid-enterprise';