From d8f222f312a588ffd1d5a32568d7e44a22c9cd23 Mon Sep 17 00:00:00 2001 From: chenkang1 Date: Sat, 1 Jul 2017 16:08:03 +0800 Subject: [PATCH 1/2] fixed:when click breadcrumb back to other page,the left menu displayed the last select item --- src/components/Layout/Menu.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Layout/Menu.js b/src/components/Layout/Menu.js index a9cedcd..a960a0e 100644 --- a/src/components/Layout/Menu.js +++ b/src/components/Layout/Menu.js @@ -108,6 +108,7 @@ const Menus = ({ siderFold, darkTheme, location, handleClickNavMenu, navOpenKeys mode={siderFold ? 'vertical' : 'inline'} theme={darkTheme ? 'dark' : 'light'} onClick={handleClickNavMenu} + selectedKeys={defaultSelectedKeys} defaultSelectedKeys={defaultSelectedKeys} > {menuItems} From 7f091d764209c66bc6ce5519d5d6f77a50a32a99 Mon Sep 17 00:00:00 2001 From: chenkang1 Date: Mon, 3 Jul 2017 14:06:28 +0800 Subject: [PATCH 2/2] fixed:the error request should be capured in catch method --- src/utils/request.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 8a8c853..d33e88f 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -89,12 +89,12 @@ export default function request (options) { return fetch(options).then((response) => { const { statusText, status } = response let data = options.fetchType === 'YQL' ? response.data.query.results.json : response.data - return { + return Promise.resolve({ success: true, message: statusText, statusCode: status, ...data, - } + }) }).catch((error) => { const { response } = error let msg @@ -107,6 +107,6 @@ export default function request (options) { statusCode = 600 msg = error.message || 'Network Error' } - return { success: false, statusCode, message: msg } + return Promise.reject({ success: false, statusCode, message: msg }) }) }