diff --git a/client/containers/ProjectGroups/ProjectGroups.js b/client/containers/ProjectGroups/ProjectGroups.js index 86ff4723..3bfcd857 100644 --- a/client/containers/ProjectGroups/ProjectGroups.js +++ b/client/containers/ProjectGroups/ProjectGroups.js @@ -1,5 +1,7 @@ -import React, { Component } from 'react' -import GroupList from '../../components/GroupList/GroupList.js' +import React, { Component } from 'react'; +import GroupList from '../../components/GroupList/GroupList.js'; +import ProjectList from './ProjectList'; +import { Row, Col } from 'antd'; import './ProjectGroups.scss' @@ -10,10 +12,15 @@ export default class ProjectGroups extends Component { render () { return ( -
-
- -
+
+ + + + + + + +
) } diff --git a/client/containers/ProjectGroups/ProjectGroups.scss b/client/containers/ProjectGroups/ProjectGroups.scss index e6b3fbfa..53a31cf5 100644 --- a/client/containers/ProjectGroups/ProjectGroups.scss +++ b/client/containers/ProjectGroups/ProjectGroups.scss @@ -1,4 +1,4 @@ -.groups-left { - width: 250px; - margin: 20px; +.g-doc { + max-width: 11rem; + margin: .24rem auto; } diff --git a/client/containers/ProjectGroups/ProjectList/index.js b/client/containers/ProjectGroups/ProjectList/index.js new file mode 100644 index 00000000..594916a6 --- /dev/null +++ b/client/containers/ProjectGroups/ProjectList/index.js @@ -0,0 +1,46 @@ +import React, { Component } from 'react' +// import PropTypes from 'prop-types' +// import { connect } from 'react-redux' +import { Table } from 'antd' + +const columns = [{ + title: 'Name', + dataIndex: 'name', + key: 'name', + render: text => {text}, +}, { + title: 'Age', + dataIndex: 'age', + key: 'age', +}, { + title: 'Action', + key: 'action', + render: () => ( + + 修改 + + 删除 + + ), +}]; + +const data = [{ + key: '1', + age: 32 +}, { + key: '2', + age: 42 +}, { + key: '3', + age: 32 +}]; + + + +export default class GroupList extends Component { + render() { + return ( + + ); + } +} diff --git a/client/styles/common.scss b/client/styles/common.scss index da060373..da64bdf8 100644 --- a/client/styles/common.scss +++ b/client/styles/common.scss @@ -38,4 +38,5 @@ em { display: -webkit-box; -webkit-box-orient: vertical; height: 100%; + background-color: #ececec; }