Commit 1e32ea2

authored

Support nested data (#15)

fix #14

1 parent 7c424a2 commit 1e32ea2Copy full SHA for 1e32ea2

File tree

+48

-3

lines changed

+48

-3

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,15 @@`
`1`	`1`	`import React from 'react';`
`2`	`2`	`import PropTypes from 'prop-types';`
`3`	`3`
	`4`	`+import _ from './utils';`
`4`	`5`	`import Row from './row';`
`5`	`6`
`6`	`7`	`const Body = ({ columns, data, keyField }) => (`
`7`	`8`	`<tbody>`
`8`	`9`	`{`
`9`	`10`	`data.map((row, index) => (`
`10`	`11`	`<Row`
`11`		`- key={ row[keyField] }`
	`12`	`+ key={ _.get(row,keyField) }`
`12`	`13`	`row={ row }`
`13`	`14`	`rowIndex={ index }`
`14`	`15`	`columns={ columns }`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`	`1`	`import React from 'react';`
`2`	`2`	`import PropTypes from 'prop-types';`
`3`	`3`
	`4`	`+import _ from './utils';`
`4`	`5`
`5`	`6`	`const Cell = ({ row, rowIndex, column }) => {`
`6`		`- let content = row[column.dataField];`
	`7`	`+ let content = _.get(row,column.dataField);`
`7`	`8`	`if (column.formatter) {`
`8`	`9`	`content = column.formatter(content, row, rowIndex, column.formatExtraData);`
`9`	`10`	`}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import React from 'react';`
`2`	`2`	`import PropTypes from 'prop-types';`
`3`	`3`
	`4`	`+import _ from './utils';`
`4`	`5`	`import Cell from './cell';`
`5`	`6`
`6`	`7`	`const Row = ({ row, rowIndex, columns }) => (`
`@@ -9,7 +10,7 @@ const Row = ({ row, rowIndex, columns }) => (`
`9`	`10`	`columns.map(column =>`
`10`	`11`	`(`
`11`	`12`	`<Cell`
`12`		`- key={ row[column.dataField] }`
	`13`	`+ key={ _.get(row,column.dataField) }`
`13`	`14`	`row={ row }`
`14`	`15`	`rowIndex={ rowIndex }`
`15`	`16`	`column={ column }`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,18 @@`
	`1`	`+/* eslint no-empty: 0 */`
	`2`	`+`
	`3`	`+function get(target, field) {`
	`4`	`+ const pathArray = [field]`
	`5`	`+ .join('.')`
	`6`	`+ .replace(/\[/g, '.')`
	`7`	`+ .replace(/\]/g, '')`
	`8`	`+ .split('.');`
	`9`	`+ let result;`
	`10`	`+ try {`
	`11`	`+ result = pathArray.reduce((curr, path) => curr[path], target);`
	`12`	`+ } catch (e) {}`
	`13`	`+ return result;`
	`14`	`+}`
	`15`	`+`
	`16`	`+export default {`
	`17`	`+ get`
	`18`	`+};`

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,24 @@`
	`1`	`+import _ from '../src/utils';`
	`2`	`+`
	`3`	`+describe('Utils', () => {`
	`4`	`+ describe('get', () => {`
	`5`	`+ const data = {`
	`6`	`+ name: 'A',`
	`7`	`+ address: {`
	`8`	`+ road: 'BCD',`
	`9`	`+ postal: '1234-12345',`
	`10`	`+ city: {`
	`11`	`+ name: 'B'`
	`12`	`+ }`
	`13`	`+ }`
	`14`	`+ };`
	`15`	`+`
	`16`	`+ it('should return correct data', () => {`
	`17`	`+ expect(_.get(data, 'name')).toEqual(data.name);`
	`18`	`+ expect(_.get(data, 'address.road')).toEqual(data.address.road);`
	`19`	`+ expect(_.get(data, 'address.city.name')).toEqual(data.address.city.name);`
	`20`	`+ expect(_.get(data, 'address.notExist')).toEqual(undefined);`
	`21`	`+ expect(_.get(data, 'address.not.exist')).toEqual(undefined);`
	`22`	`+ });`
	`23`	`+ });`
	`24`	`+});`

Comments

(0)