Selaa lähdekoodia

feat: instead of dva/dynamic using react-loadable

Ethan_Wan 7 vuotta sitten
vanhempi
commit
0436777356
2 muutettua tiedostoa jossa 14 lisäystä ja 22 poistoa
  1. 1 0
      package.json
  2. 13 22
      src/router.js

+ 1 - 0
package.json

@@ -79,6 +79,7 @@
     "mockjs": "^1.0.1-beta3",
     "prettier": "1.13.7",
     "pro-download": "^1.0.1",
+    "react-loadable": "^5.4.0",
     "redbox-react": "^1.5.0",
     "regenerator-runtime": "^0.12.0",
     "stylelint": "^9.2.1",

+ 13 - 22
src/router.js

@@ -1,39 +1,30 @@
 import React from 'react';
 import { routerRedux, Route, Switch } from 'dva/router';
-import { Spin } from 'antd';
-import dynamic from 'dva/dynamic';
 import { getRouterData } from './common/router';
 import Authorized from './utils/Authorized';
 import { getQueryPath } from './utils/utils';
-import { LocalComponent } from './locale/localeContext';
-import styles from './index.less';
 
 const { ConnectedRouter } = routerRedux;
 const { AuthorizedRoute } = Authorized;
-dynamic.setDefaultLoadingComponent(() => {
-  return <Spin size="large" className={styles.globalSpin} />;
-});
 
 function RouterConfig({ history, app }) {
   const routerData = getRouterData(app);
   const UserLayout = routerData['/user'].component;
   const BasicLayout = routerData['/'].component;
   return (
-    <LocalComponent>
-      <ConnectedRouter history={history}>
-        <Switch>
-          <Route path="/user" component={UserLayout} />
-          <AuthorizedRoute
-            path="/"
-            render={props => <BasicLayout {...props} />}
-            authority={['admin', 'user']}
-            redirectPath={getQueryPath('/user/login', {
-              redirect: window.location.href,
-            })}
-          />
-        </Switch>
-      </ConnectedRouter>
-    </LocalComponent>
+    <ConnectedRouter history={history}>
+      <Switch>
+        <Route path="/user" component={UserLayout} />
+        <AuthorizedRoute
+          path="/"
+          render={props => <BasicLayout {...props} />}
+          authority={['admin', 'user']}
+          redirectPath={getQueryPath('/user/login', {
+            redirect: window.location.href,
+          })}
+        />
+      </Switch>
+    </ConnectedRouter>
   );
 }