Merge pull request dvajs#191 from jerexyz/master

fix user-dashboard example bug
iwege · Oct 25, 2016 · 585fd8c · 585fd8c
2 parents 5088b1f + 8db4624
commit 585fd8c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/examples/user-dashboard/src/models/users.js b/examples/user-dashboard/src/models/users.js
@@ -7,6 +7,8 @@ export default {
 
   state: {
     list: [],
+    field: '',
+    keyword: '',
     loading: false,
     total: null,
     current: 1,
@@ -31,6 +33,7 @@ export default {
   effects: {
     *query({ payload }, { call, put }) {
       yield put({ type: 'showLoading' });
+      yield put({ type: 'updateQueryKey', payload });
       const { data } = yield call(query, parse(payload));
       if (data) {
         yield put({
@@ -60,7 +63,13 @@ export default {
       if (data && data.success) {
         yield put({
           type: 'createSuccess',
-          payload,
+          payload: {
+            list: data.data,
+            total: data.page.total,
+            current: data.page.current,
+            field: '',
+            keyword: '',
+          },
         });
       }
     },
@@ -84,8 +93,8 @@ export default {
       return { ...state, loading: true };
     },
     createSuccess(state, action) {
-      const newUser = action.payload;
-      return { ...state, list: [newUser, ...state.list], loading: false };
+      // const newUser = action.payload;
+      return { ...state, ...action.payload, loading: false };
     },
     deleteSuccess(state, action) {
       const id = action.payload;
@@ -111,6 +120,9 @@ export default {
     hideModal(state) {
       return { ...state, modalVisible: false };
     },
+    updateQueryKey(state, action) {
+      return { ...state, ...action.payload };
+    },
   },
 
 };
diff --git a/examples/user-dashboard/src/routes/Users.jsx b/examples/user-dashboard/src/routes/Users.jsx
@@ -9,12 +9,10 @@ import UserModal from '../components/Users/UserModal';
 
 function Users({ location, dispatch, users }) {
   const {
-    loading, list, total, current,
+    loading, list, total, current, field, keyword,
     currentItem, modalVisible, modalType,
     } = users;
 
-  const { field, keyword } = location.query;
-
   const userModalProps = {
     item: modalType === 'create' ? {} : currentItem,
     type: modalType,
@@ -40,7 +38,7 @@ function Users({ location, dispatch, users }) {
     onPageChange(page) {
       dispatch(routerRedux.push({
         pathname: '/users',
-        query: { page },
+        query: { field, keyword, page },
       }));
     },
     onDeleteItem(id) {