Commit 20c01e08 authored by xiaohu's avatar xiaohu

1.add list search layout

parent 5ef482ed
...@@ -2,7 +2,7 @@ import React from 'react'; ...@@ -2,7 +2,7 @@ import React from 'react';
import { List, Card, Icon, Dropdown, Menu, Avatar, Tooltip } from 'antd'; import { List, Card, Icon, Dropdown, Menu, Avatar, Tooltip } from 'antd';
import numeral from 'numeral'; import numeral from 'numeral';
import { formatWan } from '../../../utils/utils'; import { formatWan } from '../../../utils/utils';
import stylesApplications from '../../List/Applications.less'; import stylesApplications from '../../List/Search/Applications.less';
export default props => { export default props => {
const { list } = props; const { list } = props;
......
import React from 'react'; import React from 'react';
import { List, Icon, Avatar, Tag } from 'antd'; import { List, Icon, Avatar, Tag } from 'antd';
import moment from 'moment'; import moment from 'moment';
import stylesArticles from '../../List/Articles.less'; import stylesArticles from '../../List/Search/Articles.less';
import styles from './Articles.less'; import styles from './Articles.less';
export default props => { export default props => {
......
...@@ -2,7 +2,7 @@ import React from 'react'; ...@@ -2,7 +2,7 @@ import React from 'react';
import { List, Card } from 'antd'; import { List, Card } from 'antd';
import moment from 'moment'; import moment from 'moment';
import AvatarList from '../../../components/AvatarList'; import AvatarList from '../../../components/AvatarList';
import stylesProjects from '../../List/Projects.less'; import stylesProjects from '../../List/Search/Projects.less';
export default props => { export default props => {
const { list } = props; const { list } = props;
......
...@@ -5,7 +5,7 @@ import { Row, Col, Form, Card, Select, Icon, Avatar, List, Tooltip, Dropdown, Me ...@@ -5,7 +5,7 @@ import { Row, Col, Form, Card, Select, Icon, Avatar, List, Tooltip, Dropdown, Me
import TagSelect from 'components/TagSelect'; import TagSelect from 'components/TagSelect';
import StandardFormRow from 'components/StandardFormRow'; import StandardFormRow from 'components/StandardFormRow';
import { formatWan } from '../../utils/utils'; import { formatWan } from '../../../utils/utils';
import styles from './Applications.less'; import styles from './Applications.less';
......
@import '~antd/lib/style/themes/default.less'; @import '~antd/lib/style/themes/default.less';
@import '../../utils/utils.less'; @import '../../../utils/utils.less';
.filterCardList { .filterCardList {
margin-bottom: -24px; margin-bottom: -24px;
......
@import '~antd/lib/style/themes/default.less'; @import '~antd/lib/style/themes/default.less';
@import '../../utils/utils.less'; @import '../../../utils/utils.less';
.listContent { .listContent {
.description { .description {
......
@import '~antd/lib/style/themes/default.less'; @import '~antd/lib/style/themes/default.less';
@import '../../utils/utils.less'; @import '../../../utils/utils.less';
.coverCardList { .coverCardList {
margin-bottom: -24px; margin-bottom: -24px;
......
import React, { Component } from 'react'; import React, { Component } from 'react';
import { routerRedux, Route, Switch } from 'dva/router'; import { routerRedux } from 'dva/router';
import { connect } from 'dva'; import { connect } from 'dva';
import { Input } from 'antd'; import { Input } from 'antd';
import PageHeaderLayout from '../../layouts/PageHeaderLayout'; import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
import { getRoutes } from '../../utils/utils';
@connect() @connect()
export default class SearchList extends Component { export default class SearchList extends Component {
handleTabChange = key => { handleTabChange = key => {
const { dispatch, match } = this.props; const { dispatch, match } = this.props;
switch (key) { switch (key) {
case 'articles': case 'Articles':
dispatch(routerRedux.push(`${match.url}/articles`)); dispatch(routerRedux.push(`${match.url}/Articles`));
break; break;
case 'applications': case 'Applications':
dispatch(routerRedux.push(`${match.url}/applications`)); dispatch(routerRedux.push(`${match.url}/Applications`));
break; break;
case 'projects': case 'Projects':
dispatch(routerRedux.push(`${match.url}/projects`)); dispatch(routerRedux.push(`${match.url}/Projects`));
break; break;
default: default:
break; break;
...@@ -27,15 +26,15 @@ export default class SearchList extends Component { ...@@ -27,15 +26,15 @@ export default class SearchList extends Component {
render() { render() {
const tabList = [ const tabList = [
{ {
key: 'articles', key: 'Articles',
tab: '文章', tab: '文章',
}, },
{ {
key: 'applications', key: 'Applications',
tab: '应用', tab: '应用',
}, },
{ {
key: 'projects', key: 'Projects',
tab: '项目', tab: '项目',
}, },
]; ];
...@@ -52,8 +51,7 @@ export default class SearchList extends Component { ...@@ -52,8 +51,7 @@ export default class SearchList extends Component {
</div> </div>
); );
const { match, routerData, location } = this.props; const { match, children, location } = this.props;
const routes = getRoutes(match.path, routerData);
return ( return (
<PageHeaderLayout <PageHeaderLayout
...@@ -63,11 +61,12 @@ export default class SearchList extends Component { ...@@ -63,11 +61,12 @@ export default class SearchList extends Component {
tabActiveKey={location.pathname.replace(`${match.path}/`, '')} tabActiveKey={location.pathname.replace(`${match.path}/`, '')}
onTabChange={this.handleTabChange} onTabChange={this.handleTabChange}
> >
<Switch> {children}
{/* <Switch>
{routes.map(item => ( {routes.map(item => (
<Route key={item.key} path={item.path} component={item.component} exact={item.exact} /> <Route key={item.key} path={item.path} component={item.component} exact={item.exact} />
))} ))}
</Switch> </Switch> */}
</PageHeaderLayout> </PageHeaderLayout>
); );
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment