From df5ce2991e3d3941c58f5a30646c4d8b729db38f Mon Sep 17 00:00:00 2001 From: Baorong Li Date: Sat, 31 Mar 2018 15:36:26 +0800 Subject: [PATCH] improve by github.com/sorrycc/blog/issues/66 --- src/models/app.js | 2 +- src/pages/dashboard/{models/dashboard.js => model.js} | 4 ++-- src/pages/login/{models/login.js => model.js} | 2 +- src/pages/login/{services/login.js => service.js} | 0 src/pages/post/index.js | 1 - src/pages/post/{models/post.js => model.js} | 5 ++--- src/pages/post/{services/posts.js => service.js} | 0 src/pages/user/components/List.js | 2 -- src/pages/user/index.js | 1 - src/pages/user/{models/user.js => model.js} | 7 +++---- src/utils/config.js | 2 +- 11 files changed, 10 insertions(+), 16 deletions(-) rename src/pages/dashboard/{models/dashboard.js => model.js} (94%) rename src/pages/login/{models/login.js => model.js} (93%) rename src/pages/login/{services/login.js => service.js} (100%) rename src/pages/post/{models/post.js => model.js} (87%) rename src/pages/post/{services/posts.js => service.js} (100%) rename src/pages/user/{models/user.js => model.js} (91%) diff --git a/src/models/app.js b/src/models/app.js index 49ad4ae..fe4fe87 100644 --- a/src/models/app.js +++ b/src/models/app.js @@ -44,7 +44,7 @@ export default { type: 'updateState', payload: { locationPathname: location.pathname, - locationQuery: queryString.parse(location.search), + locationQuery: location.query, }, }) }) diff --git a/src/pages/dashboard/models/dashboard.js b/src/pages/dashboard/model.js similarity index 94% rename from src/pages/dashboard/models/dashboard.js rename to src/pages/dashboard/model.js index 26ef4fe..0a4c3e7 100644 --- a/src/pages/dashboard/models/dashboard.js +++ b/src/pages/dashboard/model.js @@ -1,8 +1,8 @@ import { parse } from 'qs' import modelExtend from 'dva-model-extend' -import { query } from '../services/dashboard' +import { query } from './services/dashboard' import { model } from 'utils/model' -import * as weatherService from '../services/weather' +import * as weatherService from './services/weather' export default modelExtend(model, { namespace: 'dashboard', diff --git a/src/pages/login/models/login.js b/src/pages/login/model.js similarity index 93% rename from src/pages/login/models/login.js rename to src/pages/login/model.js index 43ff59d..4e0ce9e 100644 --- a/src/pages/login/models/login.js +++ b/src/pages/login/model.js @@ -1,5 +1,5 @@ import { routerRedux } from 'dva/router' -import { login } from '../services/login' +import { login } from './service' export default { namespace: 'login', diff --git a/src/pages/login/services/login.js b/src/pages/login/service.js similarity index 100% rename from src/pages/login/services/login.js rename to src/pages/login/service.js diff --git a/src/pages/post/index.js b/src/pages/post/index.js index 21e09c0..47b87a2 100644 --- a/src/pages/post/index.js +++ b/src/pages/post/index.js @@ -19,7 +19,6 @@ const Index = ({ post, dispatch, loading, location, }) => { const { list, pagination } = post - location.query = queryString.parse(location.search) const { query, pathname } = location const listProps = { diff --git a/src/pages/post/models/post.js b/src/pages/post/model.js similarity index 87% rename from src/pages/post/models/post.js rename to src/pages/post/model.js index c6929b9..36d764d 100644 --- a/src/pages/post/models/post.js +++ b/src/pages/post/model.js @@ -1,7 +1,6 @@ import modelExtend from 'dva-model-extend' -import { query } from '../services/posts' +import { query } from './service' import { pageModel } from 'utils/model' -import queryString from 'query-string' export default modelExtend(pageModel, { @@ -15,7 +14,7 @@ export default modelExtend(pageModel, { type: 'query', payload: { status: 2, - ...queryString.parse(location.search), + ...location.query, }, }) } diff --git a/src/pages/post/services/posts.js b/src/pages/post/service.js similarity index 100% rename from src/pages/post/services/posts.js rename to src/pages/post/service.js diff --git a/src/pages/user/components/List.js b/src/pages/user/components/List.js index 468edb8..2e93d1f 100644 --- a/src/pages/user/components/List.js +++ b/src/pages/user/components/List.js @@ -4,7 +4,6 @@ import { Table, Modal } from 'antd' import classnames from 'classnames' import { DropOption } from 'components' import { Link } from 'react-router-dom' -import queryString from 'query-string' import AnimTableBody from 'components/DataTable/AnimTableBody' import styles from './List.less' @@ -13,7 +12,6 @@ const { confirm } = Modal const List = ({ onDeleteItem, onEditItem, isMotion, location, ...tableProps }) => { - location.query = queryString.parse(location.search) const handleMenuClick = (record, e) => { if (e.key === '1') { diff --git a/src/pages/user/index.js b/src/pages/user/index.js index 814eea6..367010c 100644 --- a/src/pages/user/index.js +++ b/src/pages/user/index.js @@ -13,7 +13,6 @@ import Modal from './components/Modal' const User = ({ location, dispatch, user, loading, }) => { - location.query = queryString.parse(location.search) const { query, pathname } = location const { list, pagination, currentItem, modalVisible, modalType, isMotion, selectedRowKeys, diff --git a/src/pages/user/models/user.js b/src/pages/user/model.js similarity index 91% rename from src/pages/user/models/user.js rename to src/pages/user/model.js index 206752f..e51bd61 100644 --- a/src/pages/user/models/user.js +++ b/src/pages/user/model.js @@ -1,9 +1,8 @@ /* global window */ import modelExtend from 'dva-model-extend' -import queryString from 'query-string' import { config } from 'utils' -import { create, remove, update } from '../services/user' -import * as usersService from '../services/users' +import { create, remove, update } from './services/user' +import * as usersService from './services/users' import { pageModel } from 'utils/model' const { query } = usersService @@ -24,7 +23,7 @@ export default modelExtend(pageModel, { setup ({ dispatch, history }) { history.listen((location) => { if (location.pathname === '/user') { - const payload = queryString.parse(location.search) || { page: 1, pageSize: 10 } + const payload = location.query || { page: 1, pageSize: 10 } dispatch({ type: 'query', payload, diff --git a/src/utils/config.js b/src/utils/config.js index 5f4ad56..e9a7bbf 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -4,7 +4,7 @@ const APIV2 = '/api/v2' module.exports = { name: 'AntD Admin', prefix: 'antdAdmin', - footerText: 'Ant Design Admin © 2017 zuiidea', + footerText: 'Ant Design Admin © 2018 zuiidea', logo: '/logo.svg', iconFontCSS: '/iconfont.css', iconFontJS: '/iconfont.js',