From b1ef8d423f192dea34b28ae87b2f4f44fe433905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B8=85?= <qixian.cs@outlook.com>
Date: Thu, 12 Jul 2018 14:06:19 +0800
Subject: [PATCH] bugfix: Fix trigger page

---
 config/config.js                            |  2 +-
 src/components/GlobalHeader/RightContent.js |  2 +-
 src/models/login.js                         |  2 ++
 src/pages/404.js                            |  7 +++++
 src/pages/layouts/BasicLayout.js            | 32 ++++-----------------
 src/utils/request.js                        | 17 ++++-------
 6 files changed, 22 insertions(+), 40 deletions(-)
 create mode 100644 src/pages/404.js

diff --git a/config/config.js b/config/config.js
index 142710c4..2c46f30e 100644
--- a/config/config.js
+++ b/config/config.js
@@ -95,7 +95,7 @@ export default {
         { path: '/exception/403', component: './Exception/403' },
         { path: '/exception/404', component: './Exception/404' },
         { path: '/exception/500', component: './Exception/500' },
-
+        { path: '/exception/trigger', component: './Exception/triggerException' },
         // account
         {
           path: '/account/center',
diff --git a/src/components/GlobalHeader/RightContent.js b/src/components/GlobalHeader/RightContent.js
index 4373a3d6..bff034a9 100644
--- a/src/components/GlobalHeader/RightContent.js
+++ b/src/components/GlobalHeader/RightContent.js
@@ -18,7 +18,6 @@ export default class GlobalHeaderRight extends PureComponent {
       if (newNotice.datetime) {
         newNotice.datetime = moment(notice.datetime).fromNow();
       }
-      // transform id to item key
       if (newNotice.id) {
         newNotice.key = newNotice.id;
       }
@@ -154,6 +153,7 @@ export default class GlobalHeaderRight extends PureComponent {
         )}
         <Button
           size="small"
+          ghost={theme === 'dark'}
           onClick={() => {
             this.changLang();
           }}
diff --git a/src/models/login.js b/src/models/login.js
index 7daa1f02..426c9e86 100644
--- a/src/models/login.js
+++ b/src/models/login.js
@@ -40,9 +40,11 @@ export default {
         yield put(routerRedux.replace(redirect || '/'));
       }
     },
+
     *getCaptcha({ payload }, { call }) {
       yield call(getFakeCaptcha, payload);
     },
+
     *logout(_, { put }) {
       yield put({
         type: 'changeLoginStatus',
diff --git a/src/pages/404.js b/src/pages/404.js
new file mode 100644
index 00000000..0a3d8766
--- /dev/null
+++ b/src/pages/404.js
@@ -0,0 +1,7 @@
+import React from 'react';
+import { Link } from 'dva/router';
+import Exception from 'components/Exception';
+
+export default () => (
+  <Exception type="404" style={{ minHeight: 500, height: '80%' }} linkElement={Link} />
+);
diff --git a/src/pages/layouts/BasicLayout.js b/src/pages/layouts/BasicLayout.js
index f58df60a..34162184 100644
--- a/src/pages/layouts/BasicLayout.js
+++ b/src/pages/layouts/BasicLayout.js
@@ -29,6 +29,7 @@ const { check } = Authorized;
  * @param {Object} routerData 路由配置
  */
 const getBreadcrumbNameMap = memoizeOne((meun, router) => {
+  console.log(meun, router);
   const routerMap = {};
   const mergeMeunAndRouter = meunData => {
     meunData.forEach(meunItem => {
@@ -71,6 +72,7 @@ class BasicLayout extends React.PureComponent {
   constructor(props) {
     super(props);
     const { routerData, menuData } = this.props;
+    this.getPageTitle = memoizeOne(this.getPageTitle);
     this.breadcrumbNameMap = getBreadcrumbNameMap(menuData, routerData);
   }
 
@@ -148,19 +150,14 @@ class BasicLayout extends React.PureComponent {
   };
 
   render() {
-    // TODO remove old router code
     const {
       isMobile,
-      // redirectData,
-      // routerData,
       silderTheme,
       layout: PropsLayout,
       children,
       location: { pathname },
     } = this.props;
     const isTop = PropsLayout === 'topmenu';
-    // const bashRedirect = this.getBashRedirect();
-    // const myRedirectData = redirectData || [];
     const layout = (
       <Layout>
         {isTop && !isMobile ? null : (
@@ -174,33 +171,14 @@ class BasicLayout extends React.PureComponent {
         )}
         <Layout style={this.getLayoutStyle()}>
           <Header handleMenuCollapse={this.handleMenuCollapse} logo={logo} {...this.props} />
-          <Content style={this.getContentStyle()}>
-            {children}
-            {/* <Switch> TODO remove
-              {myRedirectData.map(item => (
-                <Redirect key={item.from} exact from={item.from} to={item.to} />
-              ))}
-              {getRoutes(match.path, routerData).map(item => (
-                <AuthorizedRoute
-                  key={item.key}
-                  path={item.path}
-                  component={item.component}
-                  exact={item.exact}
-                  authority={item.authority}
-                  redirectPath="/exception/403"
-                />
-              ))}
-              <Redirect exact from="/" to={bashRedirect} />
-              <Route render={NotFound} />
-            </Switch> */}
-          </Content>
+          <Content style={this.getContentStyle()}>{children}</Content>
           <Footer />
         </Layout>
       </Layout>
     );
-    const getPageTitle = memoizeOne(this.getPageTitle);
+
     return (
-      <DocumentTitle title={getPageTitle(pathname)}>
+      <DocumentTitle title={this.getPageTitle(pathname)}>
         <ContainerQuery query={query}>
           {params => (
             <Context.Provider value={this.getContext()}>
diff --git a/src/utils/request.js b/src/utils/request.js
index b094a12c..6caaf5ea 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,11 +1,6 @@
 import fetch from 'dva/fetch';
 import { notification } from 'antd';
-import { routerRedux } from 'dva/router';
-
-// TODO set store
-// import store from '../global';
-// use global store
-const store = window.g_app._store
+import router from 'umi/router';
 
 const codeMessage = {
   200: '服务器成功返回请求的数据。',
@@ -81,24 +76,24 @@ export default function request(url, options) {
       return response.json();
     })
     .catch(e => {
-      const { dispatch } = store;
       const status = e.name;
       if (status === 401) {
-        dispatch({
+        /* eslint-disable no-underscore-dangle */
+        window.g_app._store.dispatch({
           type: 'login/logout',
         });
         return;
       }
       if (status === 403) {
-        dispatch(routerRedux.push('/exception/403'));
+        router.push('/exception/403');
         return;
       }
       if (status <= 504 && status >= 500) {
-        dispatch(routerRedux.push('/exception/500'));
+        router.push('/exception/500');
         return;
       }
       if (status >= 404 && status < 422) {
-        dispatch(routerRedux.push('/exception/404'));
+        router.push('/exception/404');
       }
     });
 }
-- 
GitLab