From c67c7699de2c70112c6aa953cc5068d8f2cbef6c Mon Sep 17 00:00:00 2001
From: WhatAKitty <104xuqiang@163.com>
Date: Thu, 9 Nov 2017 23:39:28 +0800
Subject: [PATCH] Load models on demand

---
 src/common/nav.js | 62 ++++++++++++++++++++++++++++++++++++++++++++++-
 src/index.js      |  7 ++----
 src/router.js     |  7 ++++--
 3 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/src/common/nav.js b/src/common/nav.js
index 3ae76be3..c355a2a1 100644
--- a/src/common/nav.js
+++ b/src/common/nav.js
@@ -3,11 +3,14 @@ import dynamic from 'dva/dynamic';
 const data = [{
   component: app => dynamic({
     app,
+    models: () => [
+      import('../models/user'),
+    ],
     component: () => import('../layouts/BasicLayout'),
   }),
   layout: 'BasicLayout',
   name: '首页', // for breadcrumb
-  path: '',
+  path: '/',
   children: [{
     name: 'Dashboard',
     icon: 'dashboard',
@@ -17,6 +20,9 @@ const data = [{
       path: 'analysis',
       component: app => dynamic({
         app,
+        models: () => [
+          import('../models/chart'),
+        ],
         component: () => import('../routes/Dashboard/Analysis'),
       }),
     }, {
@@ -24,6 +30,9 @@ const data = [{
       path: 'monitor',
       component: app => dynamic({
         app,
+        models: () => [
+          import('../models/monitor'),
+        ],
         component: () => import('../routes/Dashboard/Monitor'),
       }),
     }, {
@@ -31,6 +40,11 @@ const data = [{
       path: 'workplace',
       component: app => dynamic({
         app,
+        models: () => [
+          import('../models/project'),
+          import('../models/activities'),
+          import('../models/chart'),
+        ],
         component: () => import('../routes/Dashboard/Workplace'),
       }),
     }],
@@ -43,6 +57,9 @@ const data = [{
       path: 'basic-form',
       component: app => dynamic({
         app,
+        models: () => [
+          import('../models/form'),
+        ],
         component: () => import('../routes/Forms/BasicForm'),
       }),
     }, {
@@ -50,18 +67,27 @@ const data = [{
       path: 'step-form',
       component: app => dynamic({
         app,
+        models: () => [
+          import('../models/form'),
+        ],
         component: () => import('../routes/Forms/StepForm'),
       }),
       children: [{
         path: 'confirm',
         component: app => dynamic({
           app,
+          models: () => [
+            import('../models/form'),
+          ],
           component: () => import('../routes/Forms/StepForm/Step2'),
         }),
       }, {
         path: 'result',
         component: app => dynamic({
           app,
+          models: () => [
+            import('../models/form'),
+          ],
           component: () => import('../routes/Forms/StepForm/Step3'),
         }),
       }],
@@ -70,6 +96,9 @@ const data = [{
       path: 'advanced-form',
       component: app => dynamic({
         app,
+        models: () => [
+          import('../models/form'),
+        ],
         component: () => import('../routes/Profile/AdvancedProfile'),
       }),
     }],
@@ -82,6 +111,9 @@ const data = [{
       path: 'table-list',
       component: app => dynamic({
         app,
+        models: () => [
+          import('../models/rule'),
+        ],
         component: () => import('../routes/List/TableList'),
       }),
     }, {
@@ -89,6 +121,9 @@ const data = [{
       path: 'basic-list',
       component: app => dynamic({
         app,
+        models: () => [
+          import('../models/list'),
+        ],
         component: () => import('../routes/List/BasicList'),
       }),
     }, {
@@ -96,6 +131,9 @@ const data = [{
       path: 'card-list',
       component: app => dynamic({
         app,
+        models: () => [
+          import('../models/list'),
+        ],
         component: () => import('../routes/List/CardList'),
       }),
     }, {
@@ -103,6 +141,9 @@ const data = [{
       path: 'cover-card-list',
       component: app => dynamic({
         app,
+        models: () => [
+          import('../models/list'),
+        ],
         component: () => import('../routes/List/CoverCardList'),
       }),
     }, {
@@ -110,6 +151,9 @@ const data = [{
       path: 'filter-card-list',
       component: app => dynamic({
         app,
+        models: () => [
+          import('../models/list'),
+        ],
         component: () => import('../routes/List/FilterCardList'),
       }),
     }, {
@@ -117,6 +161,9 @@ const data = [{
       path: 'search',
       component: app => dynamic({
         app,
+        models: () => [
+          import('../models/list'),
+        ],
         component: () => import('../routes/List/SearchList'),
       }),
     }],
@@ -129,6 +176,9 @@ const data = [{
       path: 'basic',
       component: app => dynamic({
         app,
+        models: () => [
+          import('../models/profile'),
+        ],
         component: () => import('../routes/Profile/BasicProfile'),
       }),
     }, {
@@ -136,6 +186,9 @@ const data = [{
       path: 'advanced',
       component: app => dynamic({
         app,
+        models: () => [
+          import('../models/profile'),
+        ],
         component: () => import('../routes/Profile/AdvancedProfile'),
       }),
     }],
@@ -190,6 +243,7 @@ const data = [{
     app,
     component: () => import('../layouts/UserLayout'),
   }),
+  path: '/user',
   layout: 'UserLayout',
   children: [{
     name: '帐户',
@@ -200,6 +254,9 @@ const data = [{
       path: 'login',
       component: app => dynamic({
         app,
+        models: () => [
+          import('../models/login'),
+        ],
         component: () => import('../routes/User/Login'),
       }),
     }, {
@@ -207,6 +264,9 @@ const data = [{
       path: 'register',
       component: app => dynamic({
         app,
+        models: () => [
+          import('../models/register'),
+        ],
         component: () => import('../routes/User/Register'),
       }),
     }, {
diff --git a/src/index.js b/src/index.js
index 3b145434..d2dd78cd 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,5 @@
 import dva from 'dva';
 import 'moment/locale/zh-cn';
-import models from './models';
 import './polyfill';
 import './g2';
 // import { browserHistory } from 'dva/router';
@@ -14,10 +13,8 @@ const app = dva({
 // 2. Plugins
 // app.use({});
 
-// 3. Model move to router
-models.forEach((m) => {
-  app.model(m);
-});
+// 3. Register global model
+app.model(require('./models/global'));
 
 // 4. Router
 app.router(require('./router'));
diff --git a/src/router.js b/src/router.js
index 2fd1aeaa..0000e978 100644
--- a/src/router.js
+++ b/src/router.js
@@ -7,6 +7,9 @@ import dynamic from 'dva/dynamic';
 function RouterConfig({ history, app }) {
   const BasicLayout = dynamic({
     app,
+    models: () => [
+      import('./models/user'),
+    ],
     component: () => import('./layouts/BasicLayout'),
   });
   const UserLayout = dynamic({
@@ -18,8 +21,8 @@ function RouterConfig({ history, app }) {
     <LocaleProvider locale={zhCN}>
       <Router history={history}>
         <Switch>
-          <Route path="/user" component={UserLayout} />
-          <Route path="/" component={BasicLayout} />
+          <Route path="/user" render={props => <UserLayout {...props} app={app} />} />
+          <Route path="/" render={props => <BasicLayout {...props} app={app} />} />
         </Switch>
       </Router>
     </LocaleProvider>
-- 
GitLab