diff --git a/package.json b/package.json index 3c41117..e041d65 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "antd-admin", - "version": "4.3.5", + "version": "4.3.6", "dependencies": { "antd": "^2.11.2", "axios": "^0.16.2", diff --git a/src/models/app.js b/src/models/app.js index 7a205a5..711b13f 100644 --- a/src/models/app.js +++ b/src/models/app.js @@ -99,9 +99,9 @@ export default { } else if (config.openPages && config.openPages.indexOf(locationPathname) < 0) { yield put(routerRedux.push({ pathname: '/login', - query: { + search: queryString.stringify({ from: locationPathname, - }, + }), })) } }, diff --git a/src/routes/post/index.js b/src/routes/post/index.js index 40be20d..4046f99 100644 --- a/src/routes/post/index.js +++ b/src/routes/post/index.js @@ -3,6 +3,7 @@ import PropTypes from 'prop-types' import { connect } from 'dva' import { Tabs } from 'antd' import { routerRedux } from 'dva/router' +import queryString from 'query-string' import List from './List' const TabPane = Tabs.TabPane @@ -24,11 +25,11 @@ const Index = ({ post, dispatch, loading, location }) => { onChange (page) { dispatch(routerRedux.push({ pathname, - query: { + search: queryString.stringify({ ...query, page: page.current, pageSize: page.pageSize, - }, + }), })) }, } @@ -36,9 +37,9 @@ const Index = ({ post, dispatch, loading, location }) => { const handleTabClick = (key) => { dispatch(routerRedux.push({ pathname, - query: { + search: queryString.stringify({ status: key, - }, + }), })) } diff --git a/src/routes/user/index.js b/src/routes/user/index.js index 696d180..7758d7b 100644 --- a/src/routes/user/index.js +++ b/src/routes/user/index.js @@ -45,11 +45,11 @@ const User = ({ location, dispatch, user, loading }) => { const { query, pathname } = location dispatch(routerRedux.push({ pathname, - query: { + search: queryString.stringify({ ...query, page: page.current, pageSize: page.pageSize, - }, + }), })) }, onDeleteItem (id) { @@ -88,20 +88,20 @@ const User = ({ location, dispatch, user, loading }) => { onFilterChange (value) { dispatch(routerRedux.push({ pathname: location.pathname, - query: { + search: queryString.stringify({ ...value, page: 1, pageSize, - }, + }), })) }, onSearch (fieldsValue) { fieldsValue.keyword.length ? dispatch(routerRedux.push({ pathname: '/user', - query: { + search: queryString.stringify({ field: fieldsValue.field, keyword: fieldsValue.keyword, - }, + }), })) : dispatch(routerRedux.push({ pathname: '/user', }))