diff --git a/src/components/ui/search.js b/src/components/ui/search.js index 235d56c..7e89ae2 100644 --- a/src/components/ui/search.js +++ b/src/components/ui/search.js @@ -37,14 +37,14 @@ class Search extends React.Component { this.handleSearch() } render () { - const {size, select, selectOptions, selectProps, style} = this.props + const {size, select, selectOptions, selectProps, style, keyword} = this.props const {clearVisible} = this.state return ( {select && } - + {clearVisible && } diff --git a/src/components/users/search.js b/src/components/users/search.js index aad9930..0d2d175 100644 --- a/src/components/users/search.js +++ b/src/components/users/search.js @@ -20,7 +20,7 @@ const search = ({ select: true, selectOptions: [{ value: 'name', name: '姓名' }, { value: 'address', name: '地址' }], selectProps: { - defaultValue: 'name' + defaultValue: field || 'name' }, onSearch: (value) => { onSearch(value) diff --git a/src/routes/users.js b/src/routes/users.js index b4be09b..3361e5a 100644 --- a/src/routes/users.js +++ b/src/routes/users.js @@ -31,9 +31,11 @@ function Users ({ location, dispatch, users }) { loading, pagination: pagination, onPageChange (page) { + const query = location.query dispatch(routerRedux.push({ pathname: '/users', query: { + ...query, page: page.current, pageSize: page.pageSize } @@ -60,6 +62,18 @@ function Users ({ location, dispatch, users }) { field, keyword, onSearch (fieldsValue) { + !!fieldsValue.keyword.length ? + dispatch(routerRedux.push({ + pathname: '/users', + query: { + field: fieldsValue.field, + keyword: fieldsValue.keyword + } + })) : + dispatch(routerRedux.push({ + pathname: '/users' + })) + dispatch({ type: 'users/query', payload: fieldsValue