From aa44bbb9532dfd965d54e85a38e74eca8126706e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=84=9A=E9=81=93?= <tingzhao.ytz@antfin.com>
Date: Wed, 4 Jul 2018 10:54:21 +0800
Subject: [PATCH] add layout

---
 config/config.js           | 60 ++++++++++++++++++++++++++++++++++++++
 src/layouts/BasicLayout.js | 19 +++++++-----
 src/layouts/index.js       | 12 ++++++++
 3 files changed, 84 insertions(+), 7 deletions(-)
 create mode 100644 src/layouts/index.js

diff --git a/config/config.js b/config/config.js
index 8b620a18..60fed500 100644
--- a/config/config.js
+++ b/config/config.js
@@ -8,6 +8,7 @@ export default {
   // add for transfer to umi
   plugins: [
     'umi-plugin-dva',
+    // TODO 决定是否使用约定路由，如果使用配置路由那么 umi-plugin-routes 可以去掉了
     [
       'umi-plugin-routes',
       {
@@ -17,6 +18,65 @@ export default {
   ],
   disableServiceWorker: true,
 
+  // 路由配置
+  // TODO ./src/pages 太冗余了
+  // routes: [{
+  //   path: '/',
+  //   component: './src/layouts/BasicLayout',
+  //   indexRoute: { redirect: '/dashboard/analysis' },
+  //   childRoutes: [
+
+  //     // dashboard
+  //     { path: 'dashboard/analysis', component: './src/pages/Dashboard/Analysis' },
+  //     { path: 'dashboard/monitor', component: './src/pages/Dashboard/Monitor' },
+  //     { path: 'dashboard/workplace', component: './src/pages/Dashboard/Workplace' },
+
+  //     // forms
+  //     { path: 'form/basic-form', component: './src/pages/Forms/BasicForm' },
+  //     {
+  //       path: 'form/step-form',
+  //       component: './src/pages/Forms/StepForm',
+  //       indexRoute: { redirect: '/form/step-form/info' },
+  //       childRoutes: [
+  //         { path: 'info', component: './src/pages/Forms/StepForm/Step1' },
+  //         { path: 'confirm', component: './src/pages/Forms/StepForm/Step2' },
+  //         { path: 'result', component: './src/pages/Forms/StepForm/Step3' },
+  //       ],
+  //     },
+  //     { path: 'form/advanced-form', component: './src/pages/Forms/AdvancedForm' },
+
+  //     // list
+  //     { path: 'list/table-list', component: './src/pages/List/TableList' },
+  //     { path: 'list/table-list', component: './src/pages/List/TableList' },
+  //     { path: 'list/basic-list', component: './src/pages/List/BasicList' },
+  //     { path: 'list/card-list', component: './src/pages/List/CardList' },
+  //     {
+  //       path: 'list/search',
+  //       component: './src/pages/List/List',
+  //       indexRoute: { redirect: '/list/search/projects' },
+  //       childRoutes: [
+  //         { path: 'articles', component: './src/pages/List/Articles' },
+  //         { path: 'projects', component: './src/pages/List/Projects' },
+  //         { path: 'applications', component: './src/pages/List/Applications' },
+  //       ],
+  //     },
+
+  //     // profile
+  //     { path: 'profile/basic', component: './src/pages/Profile/BasicProfile' },
+  //     { path: 'profile/advanced', component: './src/pages/Profile/AdvancedProfile' },
+
+  //     // result
+  //     { path: 'result/success', component: './src/pages/Result/Success' },
+  //     { path: 'result/fail', component: './src/pages/Result/Error' },
+
+  //     // exception
+  //     { path: 'exception/403', component: './src/pages/Exception/403' },
+  //     { path: 'exception/404', component: './src/pages/Exception/404' },
+  //     { path: 'exception/500', component: './src/pages/Exception/500' },
+
+  // //   ],
+  // }],
+
   // copy from old webpackrc.js
 
   // entry: 'src/index.js', // TODO remove
diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js
index 7fda5f12..f2de429f 100644
--- a/src/layouts/BasicLayout.js
+++ b/src/layouts/BasicLayout.js
@@ -1,3 +1,5 @@
+/* eslint-disable no-unused-vars */
+// TODO remove eslint-disable
 import React from 'react';
 import { Layout } from 'antd';
 import DocumentTitle from 'react-document-title';
@@ -137,17 +139,19 @@ class BasicLayout extends React.PureComponent {
   };
 
   render() {
+    // TODO remove old router code
     const {
       isMobile,
-      redirectData,
-      routerData,
+      // redirectData,
+      // routerData,
       silderTheme,
       layout: PropsLayout,
-      match,
+      children,
+      // match,
     } = this.props;
     const isTop = PropsLayout === 'topmenu';
-    const bashRedirect = this.getBashRedirect();
-    const myRedirectData = redirectData || [];
+    // const bashRedirect = this.getBashRedirect();
+    // const myRedirectData = redirectData || [];
     const layout = (
       <Layout>
         {isTop && !isMobile ? null : (
@@ -162,7 +166,8 @@ class BasicLayout extends React.PureComponent {
         <Layout style={this.getLayoutStyle()}>
           <Header handleMenuCollapse={this.handleMenuCollapse} logo={logo} {...this.props} />
           <Content style={this.getContentStyle()}>
-            <Switch>
+            {children}
+            {/* <Switch> TODO remove
               {myRedirectData.map(item => (
                 <Redirect key={item.from} exact from={item.from} to={item.to} />
               ))}
@@ -178,7 +183,7 @@ class BasicLayout extends React.PureComponent {
               ))}
               <Redirect exact from="/" to={bashRedirect} />
               <Route render={NotFound} />
-            </Switch>
+            </Switch> */}
           </Content>
           <Footer />
         </Layout>
diff --git a/src/layouts/index.js b/src/layouts/index.js
new file mode 100644
index 00000000..87d75060
--- /dev/null
+++ b/src/layouts/index.js
@@ -0,0 +1,12 @@
+import React from 'react';
+import BasecLayout from './BasicLayout';
+
+// TODO routerData menuData etc...
+export default props => {
+  const { location, children } = props;
+  return (
+    <BasecLayout routerData={{}} menuData={[]} location={location}>
+      {children}
+    </BasecLayout>
+  );
+};
-- 
GitLab