Update README.md

Develop

.eslintignore

@@ -1 +1,2 @@
 src/**/*-test.js
+src/public

.eslintrc

@@ -32,6 +32,7 @@
     "react/forbid-prop-types": 0,
     "react/no-string-refs": 0,
     "react/no-find-dom-node": 0,
+    "react/prefer-stateless-function": 0,
     "import/no-extraneous-dependencies": 0,
     "import/prefer-default-export": 0,
     "react/no-danger": 0,

.roadhogrc.js

@@ -7,25 +7,25 @@ const svgSpriteDirs = [
 ]
 
 export default {
-  entry : 'src/index.js',
-  svgSpriteLoaderDirs : svgSpriteDirs,
-  theme : "./theme.config.js",
-  publicPath : `/${version}/`,
-  outputPath : `./dist/${version}`,
+  entry: 'src/index.js',
+  svgSpriteLoaderDirs: svgSpriteDirs,
+  theme: "./theme.config.js",
+  publicPath: `/${version}/`,
+  outputPath: `./dist/${version}`,
   // 接口代理示例
-  // "proxy": {
-  //   "/api/v1": {
-  //     "target": "http://api.zuiidea.com",
-  //     "changeOrigin": true,
-  //     "pathRewrite": { "^/api/v1" : "/v1" }
-  //   },
-  //   "/api/v2": {
-  //     "target": "http://192.168.0.110",
-  //     "changeOrigin": true,
-  //     "pathRewrite": { "^/api/v2" : "/api/v2" }
-  //   }
-  // },
-  env : {
+  proxy: {
+    "/api/v1/weather": {
+      "target": "https://api.seniverse.com/",
+      "changeOrigin": true,
+      "pathRewrite": { "^/api/v1/weather": "/v3/weather" }
+    },
+    // "/api/v2": {
+    //   "target": "http://192.168.0.110",
+    //   "changeOrigin": true,
+    //   "pathRewrite": { "^/api/v2" : "/api/v2" }
+    // }
+  },
+  env: {
     development: {
       extraBabelPlugins: [
         "dva-hmr",
@@ -50,8 +50,8 @@ export default {
       ]
     }
   },
-  dllPlugin : {
-    exclude: ["babel-runtime"],
+  dllPlugin: {
+    exclude: ["babel-runtime", "roadhog", "cross-env"],
     include: ["dva/router", "dva/saga", "dva/fetch"]
   }
 }

README.md

@@ -2,14 +2,14 @@
 
 [![React](https://img.shields.io/badge/react-^15.6.1-brightgreen.svg?style=flat-square)](https://github.com/facebook/react)
 [![Ant Design](https://img.shields.io/badge/ant--design-^2.11.2-yellowgreen.svg?style=flat-square)](https://github.com/ant-design/ant-design)
-[![dva](https://img.shields.io/badge/dva-^1.2.0-orange.svg?style=flat-square)](https://github.com/dvajs/dva)
+[![dva](https://img.shields.io/badge/dva-^2.0.1-orange.svg?style=flat-square)](https://github.com/dvajs/dva)
 
 [![GitHub issues](https://img.shields.io/github/issues/zuiidea/antd-admin.svg?style=flat-square)](https://github.com/zuiidea/antd-admin)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](https://github.com/zuiidea/antd-admin/pulls)
 [![MIT](https://img.shields.io/dub/l/vibe-d.svg?style=flat-square)](http://opensource.org/licenses/MIT)
 [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com)
 
-演示地址 <http://zuiidea.github.io/antd-admin>  \| [备用地址](http://47.92.30.98:8000)
+演示地址 <http://antd-admin.zuiidea.com>
 
 ## 特性
 
@@ -21,6 +21,21 @@
 
 ## 更新日志
 
+
+### 4.3.5
+
+`2017-09-04`
+
+-     更新[dva](https://github.com/dvajs/dva)至`2.0.1`，感谢[@yangbin1994](https://github.com/yangbin1994)的[PR](https://github.com/zuiidea/antd-admin/pull/567)。
+
+### 4.3.4
+
+`2017-09-04`
+
+-     更新[roadhog](https://github.com/sorrycc/roadhog)至`1.2.1`，修复闪屏问题。
+-     修复build css未压缩[#529](https://github.com/zuiidea/antd-admin/issues/529)，classname未Hash[#477](https://github.com/zuiidea/antd-admin/issues/477)。
+-     更新登录成功使用router跳转[#479](https://github.com/zuiidea/antd-admin/issues/479)。
+
 ### 4.3.0
 
 `2017-07-30`
@@ -30,34 +45,8 @@
 -     新增打包时按项目版本号生成文件目录。[#449](https://github.com/zuiidea/antd-admin/issues/449)
 -     更新`eslint`，并适当修改了`.eslintrc`。
 
-### 4.2.3
 
-`2017-07-07`
-
--     新增用户按权限访问。[#384](https://github.com/zuiidea/antd-admin/issues/384)
-
-### 4.2.2
-
-`2017-06-01`
-
--     新增用户管理批量删除。[#320](https://github.com/zuiidea/antd-admin/issues/320)
-
-### 4.2.1
-
-`2017-05-12`
-
--     新增IconFont扩展方案,本地使用方案。[#270](https://github.com/zuiidea/antd-admin/issues/270) [Live](http://47.92.30.98:666/UIElement/iconfont)
--     新增常见场景使用loading。 [dva-loading](https://github.com/dvajs/dva-loading)
-
-### 4.2
-
-`2017-04-28`
-
--     修改user相关API使用`Restful`风格。
--     增加user页面多条件查询。[#266](https://github.com/zuiidea/antd-admin/issues/226)
--     修复菜单默认高亮。[#201](https://github.com/zuiidea/antd-admin/issues/201)
-
-      [More Change Log](https://github.com/zuiidea/antd-admin/wiki/Change-Log)
+[More Change Log](https://github.com/zuiidea/antd-admin/wiki/Change-Log)
 
 ## 开发构建
 
@@ -99,11 +88,16 @@
 
 克隆项目文件:
 
-    git clone https://github.com/zuiidea/antd-admin.git
+```bash
+git clone https://github.com/zuiidea/antd-admin.git
+```
 
 进入目录安装依赖:
 
-    npm i 或者 yarn install
+```bash
+#开始前请确保没有安装roadhog、webpack到NPM全局目录
+npm i 或者 yarn install
+```
 
 开发：
 
@@ -141,7 +135,9 @@ npm run lint
 -   怎么按版本打包，上线时不影响正在访问的用户？ [#449](https://github.com/zuiidea/antd-admin/issues/449)
 -   windows处理CRLF？[参考](http://blog.csdn.net/lysc_forever/article/details/42835203)
 
-        git config --global core.autocrlf false
+    ```bash
+    git config --global core.autocrlf false
+    ```
 
 ## 参考
 

package.json

@@ -1,17 +1,19 @@
 {
   "private": true,
   "name": "antd-admin",
-  "version": "4.3.2",
+  "version": "4.3.5",
   "dependencies": {
     "antd": "^2.11.2",
     "axios": "^0.16.2",
     "babel-polyfill": "^6.23.0",
     "classnames": "^2.2.5",
+    "cross-env": "^5.0.5",
     "d3-shape": "^1.2.0",
     "draftjs-to-markdown": "^0.4.0",
-    "dva": "^1.2.0",
+    "dva": "^2.0.1",
     "dva-loading": "^0.2.0",
     "ejs-loader": "^0.3.0",
+    "history": "^4.7.2",
     "js-beautify": "^1.6.14",
     "jsonp": "^0.2.1",
     "less-vars-to-js": "^1.1.2",
@@ -21,6 +23,7 @@
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.5.10",
     "qs": "^6.5.0",
+    "query-string": "^5.0.0",
     "rc-tween-one": "^1.3.1",
     "react": "^15.6.1",
     "react-countup": "^2.1.1",
@@ -47,13 +50,12 @@
     "eslint-plugin-jsx-a11y": "^6.0.2",
     "eslint-plugin-react": "^7.1.0",
     "html-webpack-plugin": "^2.29.0",
-    "html-webpack-template": "^5.6.0",
     "redbox-react": "^1.2.10",
-    "roadhog": "1.0.0-beta.7"
+    "roadhog": "^1.2.2"
   },
   "pre-commit": ["lint"],
   "scripts": {
-    "dev": "set BROWSER=none&&set HOST=0.0.0.0&&roadhog server",
+    "dev": "cross-env BROWSER=none HOST=0.0.0.0 roadhog server",
     "lint": "eslint --fix --ext .js src",
     "build": "roadhog build",
     "build:dll": "roadhog buildDll",

src/components/Layout/Bread.js

@@ -1,13 +1,12 @@
-/* global location */
 import React from 'react'
 import PropTypes from 'prop-types'
 import { Breadcrumb, Icon } from 'antd'
-import { Link } from 'dva/router'
+import { Link } from 'react-router-dom'
 import pathToRegexp from 'path-to-regexp'
 import { queryArray } from 'utils'
 import styles from './Bread.less'
 
-const Bread = ({ menu }) => {
+const Bread = ({ menu, location }) => {
   // 匹配当前路由
   let pathArray = []
   let current
@@ -49,7 +48,7 @@ const Bread = ({ menu }) => {
     return (
       <Breadcrumb.Item key={key}>
         {((pathArray.length - 1) !== key)
-          ? <Link to={item.route}>
+          ? <Link to={item.route || '#'}>
             {content}
           </Link>
           : content}
@@ -68,6 +67,7 @@ const Bread = ({ menu }) => {
 
 Bread.propTypes = {
   menu: PropTypes.array,
+  location: PropTypes.object,
 }
 
 export default Bread

src/components/Layout/Menu.js

@@ -1,12 +1,11 @@
-/* global location */
 import React from 'react'
 import PropTypes from 'prop-types'
 import { Menu, Icon } from 'antd'
-import { Link } from 'dva/router'
+import { Link } from 'react-router-dom'
 import { arrayToTree, queryArray } from 'utils'
 import pathToRegexp from 'path-to-regexp'
 
-const Menus = ({ siderFold, darkTheme, handleClickNavMenu, navOpenKeys, changeOpenKeys, menu }) => {
+const Menus = ({ siderFold, darkTheme, handleClickNavMenu, navOpenKeys, changeOpenKeys, menu, location }) => {
   // 生成树状
   const menuTree = arrayToTree(menu.filter(_ => _.mpid !== '-1'), 'id', 'mpid')
   const levelMap = {}
@@ -32,7 +31,7 @@ const Menus = ({ siderFold, darkTheme, handleClickNavMenu, navOpenKeys, changeOp
       }
       return (
         <Menu.Item key={item.id}>
-          <Link to={item.route}>
+          <Link to={item.route || '#'}>
             {item.icon && <Icon type={item.icon} />}
             {(!siderFoldN || !menuTree.includes(item)) && item.name}
           </Link>
@@ -103,13 +102,17 @@ const Menus = ({ siderFold, darkTheme, handleClickNavMenu, navOpenKeys, changeOp
     defaultSelectedKeys = getPathArray(menu, currentMenu, 'mpid', 'id')
   }
 
+  if (!defaultSelectedKeys) {
+    defaultSelectedKeys = ['1']
+  }
+
   return (
     <Menu
       {...menuProps}
       mode={siderFold ? 'vertical' : 'inline'}
       theme={darkTheme ? 'dark' : 'light'}
       onClick={handleClickNavMenu}
-      defaultSelectedKeys={defaultSelectedKeys}
+      selectedKeys={defaultSelectedKeys}
     >
       {menuItems}
     </Menu>
@@ -123,6 +126,7 @@ Menus.propTypes = {
   handleClickNavMenu: PropTypes.func,
   navOpenKeys: PropTypes.array,
   changeOpenKeys: PropTypes.func,
+  location: PropTypes.object,
 }
 
 export default Menus

src/components/Loader/Loader.js

@@ -3,8 +3,12 @@ import PropTypes from 'prop-types'
 import classNames from 'classnames'
 import styles from './Loader.less'
 
-const Loader = ({ spinning }) => {
-  return (<div className={classNames(styles.loader, { [styles.hidden]: !spinning })}>
+const Loader = ({ spinning, fullScreen }) => {
+  return (<div className={classNames(styles.loader, {
+    [styles.hidden]: !spinning,
+    [styles.fullScreen]: fullScreen,
+  })}
+  >
     <div className={styles.warpper}>
       <div className={styles.inner} />
       <div className={styles.text} >LOADING</div>
@@ -15,6 +19,7 @@ const Loader = ({ spinning }) => {
 
 Loader.propTypes = {
   spinning: PropTypes.bool,
+  fullScreen: PropTypes.bool,
 }
 
 export default Loader

src/components/Loader/Loader.less

@@ -1,64 +1,68 @@
-.loader {
-  display: block;
-  background-color: #fff;
-  width: 100%;
-  position: fixed;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 100000;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  opacity: 1;
-  text-align: center;
-
-  .warpper {
-    width: 100px;
-    height: 100px;
-    display: inline-flex;
-    flex-direction: column;
-    justify-content: space-around;
-  }
-
-  .inner {
-    width: 48px;
-    height: 48px;
-    margin: 0 auto;
-    text-indent: -12345px;
-    border-top: 1px solid rgba(0, 0, 0, 0.08);
-    border-right: 1px solid rgba(0, 0, 0, 0.08);
-    border-bottom: 1px solid rgba(0, 0, 0, 0.08);
-    border-left: 1px solid rgba(0, 0, 0, 0.7);
-    border-radius: 50%;
-    z-index: 100001;
-
-    :local {
-      animation: spinner 600ms infinite linear;
-    }
-  }
-
-  .text {
-    width: 100px;
-    height: 20px;
-    text-align: center;
-    font-size: 12px;
-    letter-spacing: 4px;
-    color: #000;
-  }
-
-  &.hidden {
-    z-index: -1;
-    opacity: 0;
-    transition: opacity 1s ease 0.5s, z-index 0.1s ease 1.5s;
-  }
-}
-@keyframes spinner {
-  0% {
-    transform: rotate(0deg);
-  }
-
-  100% {
-    transform: rotate(360deg);
-  }
-}
+.loader {
+  display: block;
+  background-color: #fff;
+  width: 100%;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 100000;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  opacity: 1;
+  text-align: center;
+
+  &.fullScreen {
+    position: fixed;
+  }
+
+  .warpper {
+    width: 100px;
+    height: 100px;
+    display: inline-flex;
+    flex-direction: column;
+    justify-content: space-around;
+  }
+
+  .inner {
+    width: 48px;
+    height: 48px;
+    margin: 0 auto;
+    text-indent: -12345px;
+    border-top: 1px solid rgba(0, 0, 0, 0.08);
+    border-right: 1px solid rgba(0, 0, 0, 0.08);
+    border-bottom: 1px solid rgba(0, 0, 0, 0.08);
+    border-left: 1px solid rgba(0, 0, 0, 0.7);
+    border-radius: 50%;
+    z-index: 100001;
+
+    :local {
+      animation: spinner 600ms infinite linear;
+    }
+  }
+
+  .text {
+    width: 100px;
+    height: 20px;
+    text-align: center;
+    font-size: 12px;
+    letter-spacing: 4px;
+    color: #000;
+  }
+
+  &.hidden {
+    z-index: -1;
+    opacity: 0;
+    transition: opacity 1s ease 0.5s, z-index 0.1s ease 1.5s;
+  }
+}
+@keyframes spinner {
+  0% {
+    transform: rotate(0deg);
+  }
+
+  100% {
+    transform: rotate(360deg);
+  }
+}

src/components/Page/Page.js

@@ -0,0 +1,34 @@
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+import classnames from 'classnames'
+import Loader from '../Loader'
+import styles from './Page.less'
+
+export default class Page extends Component {
+  render () {
+    const { className, children, loading = false, inner = false } = this.props
+    const loadingStyle = {
+      height: 'calc(100vh - 184px)',
+      overflow: 'hidden',
+    }
+    return (
+      <div
+        className={classnames(className, {
+          [styles.contentInner]: inner,
+        })}
+        style={loading ? loadingStyle : null}
+      >
+        {loading ? <Loader spinning /> : ''}
+        {children}
+      </div>
+    )
+  }
+}
+
+
+Page.propTypes = {
+  className: PropTypes.string,
+  children: PropTypes.node,
+  loading: PropTypes.bool,
+  inner: PropTypes.bool,
+}

src/components/Page/Page.less

@@ -0,0 +1,14 @@
+@import "~themes/vars";
+
+.contentInner{
+  background: #fff;
+  padding: 24px;
+  box-shadow: @shadow-1;
+  min-height: e("calc(100vh - 184px)");
+}
+@media (max-width: 767px) {
+  .contentInner {
+    padding: 12px;
+    min-height: e("calc(100vh - 160px)");
+  }
+}

src/components/Page/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "Page",
+  "version": "0.0.0",
+  "private": true,
+  "main": "./Page.js"
+}

src/components/index.js

@@ -6,6 +6,7 @@ import Editor from './Editor'
 import FilterItem from './FilterItem'
 import Loader from './Loader'
 import * as Layout from './Layout/index.js'
+import Page from './Page'
 
 import layer from './layer'
 
@@ -19,4 +20,5 @@ export {
   FilterItem,
   Loader,
   layer,
+  Page,
 }

src/entry.ejs

@@ -0,0 +1,25 @@
+<% htmlWebpackPlugin.options.headScripts = htmlWebpackPlugin.options.headScripts || [] %>
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="description" content="A admin dashboard application demo built upon Ant Design and Dva.js">
+  <title>antd admin</title>
+  <!--[if lte IE 10]>
+      <script
+        src="https://as.alipayobjects.com/g/component/??console-polyfill/0.2.2/index.js,media-match/2.0.2/media.match.min.js"></script>
+  <![endif]-->
+  <% for (item of htmlWebpackPlugin.options.headScripts) { %>
+    <script src="<%= item %>"></script>
+  <% } %>
+</head>
+
+<body>
+  <div id="root"></div>
+</body>
+
+
+</html>

src/index.js

@@ -1,7 +1,7 @@
 import { message } from 'antd'
 import dva from 'dva'
 import createLoading from 'dva-loading'
-import { browserHistory } from 'dva/router'
+import createHistory from 'history/createBrowserHistory'
 import 'babel-polyfill'
 
 // 1. Initialize
@@ -9,7 +9,7 @@ const app = dva({
   ...createLoading({
     effects: true,
   }),
-  history: browserHistory,
+  history: createHistory(),
   onError (error) {
     message.error(error.message)
   },

src/models/app.js

@@ -1,152 +1,174 @@
-/* global window */
-/* global document */
-/* global location */
-import { routerRedux } from 'dva/router'
-import { parse } from 'qs'
-import config from 'config'
-import { EnumRoleType } from 'enums'
-import { query, logout } from 'services/app'
-import * as menusService from 'services/menus'
-
-const { prefix } = config
-
-export default {
-  namespace: 'app',
-  state: {
-    user: {},
-    permissions: {
-      visit: [],
-    },
-    menu: [
-      {
-        id: 1,
-        icon: 'laptop',
-        name: 'Dashboard',
-        router: '/dashboard',
-      },
-    ],
-    menuPopoverVisible: false,
-    siderFold: window.localStorage.getItem(`${prefix}siderFold`) === 'true',
-    darkTheme: window.localStorage.getItem(`${prefix}darkTheme`) === 'true',
-    isNavbar: document.body.clientWidth < 769,
-    navOpenKeys: JSON.parse(window.localStorage.getItem(`${prefix}navOpenKeys`)) || [],
-  },
-  subscriptions: {
-
-    setup ({ dispatch }) {
-      dispatch({ type: 'query' })
-      let tid
-      window.onresize = () => {
-        clearTimeout(tid)
-        tid = setTimeout(() => {
-          dispatch({ type: 'changeNavbar' })
-        }, 300)
-      }
-    },
-
-  },
-  effects: {
-
-    * query ({
-      payload,
-    }, { call, put }) {
-      const { success, user } = yield call(query, payload)
-      if (success && user) {
-        const { list } = yield call(menusService.query)
-        const { permissions } = user
-        let menu = list
-        if (permissions.role === EnumRoleType.ADMIN || permissions.role === EnumRoleType.DEVELOPER) {
-          permissions.visit = list.map(item => item.id)
-        } else {
-          menu = list.filter((item) => {
-            const cases = [
-              permissions.visit.includes(item.id),
-              item.mpid ? permissions.visit.includes(item.mpid) || item.mpid === '-1' : true,
-              item.bpid ? permissions.visit.includes(item.bpid) : true,
-            ]
-            return cases.every(_ => _)
-          })
-        }
-        yield put({
-          type: 'updateState',
-          payload: {
-            user,
-            permissions,
-            menu,
-          },
-        })
-        if (location.pathname === '/login') {
-          yield put(routerRedux.push('/dashboard'))
-        }
-      } else if (config.openPages && config.openPages.indexOf(location.pathname) < 0) {
-        let from = location.pathname
-        window.location = `${location.origin}/login?from=${from}`
-      }
-    },
-
-    * logout ({
-      payload,
-    }, { call, put }) {
-      const data = yield call(logout, parse(payload))
-      if (data.success) {
-        yield put({ type: 'query' })
-      } else {
-        throw (data)
-      }
-    },
-
-    * changeNavbar (action, { put, select }) {
-      const { app } = yield (select(_ => _))
-      const isNavbar = document.body.clientWidth < 769
-      if (isNavbar !== app.isNavbar) {
-        yield put({ type: 'handleNavbar', payload: isNavbar })
-      }
-    },
-
-  },
-  reducers: {
-    updateState (state, { payload }) {
-      return {
-        ...state,
-        ...payload,
-      }
-    },
-
-    switchSider (state) {
-      window.localStorage.setItem(`${prefix}siderFold`, !state.siderFold)
-      return {
-        ...state,
-        siderFold: !state.siderFold,
-      }
-    },
-
-    switchTheme (state) {
-      window.localStorage.setItem(`${prefix}darkTheme`, !state.darkTheme)
-      return {
-        ...state,
-        darkTheme: !state.darkTheme,
-      }
-    },
-
-    switchMenuPopver (state) {
-      return {
-        ...state,
-        menuPopoverVisible: !state.menuPopoverVisible,
-      }
-    },
-
-    handleNavbar (state, { payload }) {
-      return {
-        ...state,
-        isNavbar: payload,
-      }
-    },
-
-    handleNavOpenKeys (state, { payload: navOpenKeys }) {
-      return {
-        ...state,
-        ...navOpenKeys,
-      }
-    },
-  },
-}
+/* global window */
+/* global document */
+/* global location */
+import { routerRedux } from 'dva/router'
+import { parse } from 'qs'
+import config from 'config'
+import { EnumRoleType } from 'enums'
+import { query, logout } from 'services/app'
+import * as menusService from 'services/menus'
+import queryString from 'query-string'
+
+const { prefix } = config
+
+export default {
+  namespace: 'app',
+  state: {
+    user: {},
+    permissions: {
+      visit: [],
+    },
+    menu: [
+      {
+        id: 1,
+        icon: 'laptop',
+        name: 'Dashboard',
+        router: '/dashboard',
+      },
+    ],
+    menuPopoverVisible: false,
+    siderFold: window.localStorage.getItem(`${prefix}siderFold`) === 'true',
+    darkTheme: window.localStorage.getItem(`${prefix}darkTheme`) === 'true',
+    isNavbar: document.body.clientWidth < 769,
+    navOpenKeys: JSON.parse(window.localStorage.getItem(`${prefix}navOpenKeys`)) || [],
+    locationPathname: '',
+    locationQuery: {},
+  },
+  subscriptions: {
+
+    setupHistory ({ dispatch, history }) {
+      history.listen((location) => {
+        dispatch({
+          type: 'updateState',
+          payload: {
+            locationPathname: location.pathname,
+            locationQuery: queryString.parse(location.search),
+          },
+        })
+      })
+    },
+
+    setup ({ dispatch }) {
+      dispatch({ type: 'query' })
+      let tid
+      window.onresize = () => {
+        clearTimeout(tid)
+        tid = setTimeout(() => {
+          dispatch({ type: 'changeNavbar' })
+        }, 300)
+      }
+    },
+
+  },
+  effects: {
+
+    * query ({
+      payload,
+    }, { call, put, select }) {
+      const { success, user } = yield call(query, payload)
+      const { locationPathname } = yield select(_ => _.app)
+      if (success && user) {
+        const { list } = yield call(menusService.query)
+        const { permissions } = user
+        let menu = list
+        if (permissions.role === EnumRoleType.ADMIN || permissions.role === EnumRoleType.DEVELOPER) {
+          permissions.visit = list.map(item => item.id)
+        } else {
+          menu = list.filter((item) => {
+            const cases = [
+              permissions.visit.includes(item.id),
+              item.mpid ? permissions.visit.includes(item.mpid) || item.mpid === '-1' : true,
+              item.bpid ? permissions.visit.includes(item.bpid) : true,
+            ]
+            return cases.every(_ => _)
+          })
+        }
+        yield put({
+          type: 'updateState',
+          payload: {
+            user,
+            permissions,
+            menu,
+          },
+        })
+        if (location.pathname === '/login') {
+          yield put(routerRedux.push({
+            pathname: '/dashboard',
+          }))
+        }
+      } else if (config.openPages && config.openPages.indexOf(locationPathname) < 0) {
+        yield put(routerRedux.push({
+          pathname: '/login',
+          query: {
+            from: locationPathname,
+          },
+        }))
+      }
+    },
+
+    * logout ({
+      payload,
+    }, { call, put }) {
+      const data = yield call(logout, parse(payload))
+      if (data.success) {
+        yield put({ type: 'query' })
+      } else {
+        throw (data)
+      }
+    },
+
+    * changeNavbar (action, { put, select }) {
+      const { app } = yield (select(_ => _))
+      const isNavbar = document.body.clientWidth < 769
+      if (isNavbar !== app.isNavbar) {
+        yield put({ type: 'handleNavbar', payload: isNavbar })
+      }
+    },
+
+  },
+  reducers: {
+    updateState (state, { payload }) {
+      return {
+        ...state,
+        ...payload,
+      }
+    },
+
+    switchSider (state) {
+      window.localStorage.setItem(`${prefix}siderFold`, !state.siderFold)
+      return {
+        ...state,
+        siderFold: !state.siderFold,
+      }
+    },
+
+    switchTheme (state) {
+      window.localStorage.setItem(`${prefix}darkTheme`, !state.darkTheme)
+      return {
+        ...state,
+        darkTheme: !state.darkTheme,
+      }
+    },
+
+    switchMenuPopver (state) {
+      return {
+        ...state,
+        menuPopoverVisible: !state.menuPopoverVisible,
+      }
+    },
+
+    handleNavbar (state, { payload }) {
+      return {
+        ...state,
+        isNavbar: payload,
+      }
+    },
+
+    handleNavOpenKeys (state, { payload: navOpenKeys }) {
+      return {
+        ...state,
+        ...navOpenKeys,
+      }
+    },
+  },
+}

src/models/dashboard.js

@@ -1,227 +1,73 @@
-import { parse } from 'qs'
-import { myCity, queryWeather, query } from 'services/dashboard'
-
-// zuimei 摘自 http://www.zuimeitianqi.com/res/js/index.js
-let zuimei = {
-  parseActualData (actual) {
-    let weather = {
-      icon: `http://www.zuimeitianqi.com/res/icon/${zuimei.getIconName(actual.wea, 'big')}`,
-      name: zuimei.getWeatherName(actual.wea),
-      temperature: actual.tmp,
-      dateTime: new Date(actual.PTm).format('MM-dd hh:mm'),
-    }
-    return weather
-  },
-
-  getIconName (wea, flg) {
-    let myDate = new Date()
-    let hour = myDate.getHours()
-    let num = 0
-    if (wea.indexOf('/') !== -1) {
-      let weas = wea.split('/')
-      if (hour < 12) {
-        num = zuimei.replaceIcon(weas[0])
-        if (num < 6) {
-          num = `${num}_${flg}_night.png`
-        } else {
-          num = `${num}_${flg}.png`
-        }
-      } else if (hour >= 12) {
-        num = zuimei.replaceIcon(weas[1])
-        if (hour >= 18) {
-          num = `${num}_${flg}_night.png`
-        } else {
-          num = `${num}_${flg}.png`
-        }
-      }
-    } else if ((hour >= 18 && hour <= 23) || (hour >= 0 && hour <= 6)) {
-      num = `${num}_${flg}_night.png`
-    } else {
-      num = `${num}_${flg}.png`
-    }
-
-    return num
-  },
-
-  replaceIcon (num) {
-    if (num === 21) {
-      num = 7
-    } else if (num === 22) {
-      num = 8
-    } else if (num === 10 || num === 11 || num === 12 || num === 23 || num === 24 || num === 25) {
-      num = 9
-    } else if (num === 13 || num === 15 || num === 26 || num === 27 || num === 34) {
-      num = 14
-    } else if (num === 17 || num === 28) {
-      num = 16
-    } else if (num === 35) {
-      num = 18
-    } else if (num === 31 || num === 32 || num === 33) {
-      num = 20
-    } else if (num === 30) {
-      num = 29
-    }
-
-    return num
-  },
-
-  getWeatherName (wea) {
-    let name = ''
-    if (wea.indexOf('/') !== -1) {
-      let weas = wea.split('/')
-      name = `${zuimei.getWeatherByCode(weas[0])}转${zuimei.getWeatherByCode(weas[1])}`
-    } else {
-      name = zuimei.getWeatherByCode(wea)
-    }
-
-    return name
-  },
-
-  getWeatherByCode (number) {
-    let wea = ''
-    let num = Number(number)
-    if (num === 0) {
-      wea = '晴'
-    } else if (num === 1) {
-      wea = '多云'
-    } else if (num === 2) {
-      wea = '阴'
-    } else if (num === 3) {
-      wea = '阵雨'
-    } else if (num === 4) {
-      wea = '雷阵雨'
-    } else if (num === 5) {
-      wea = '雷阵雨并伴有冰雹'
-    } else if (num === 6) {
-      wea = '雨夹雪'
-    } else if (num === 7) {
-      wea = '小雨'
-    } else if (num === 8) {
-      wea = '中雨'
-    } else if (num === 9) {
-      wea = '大雨'
-    } else if (num === 10) {
-      wea = '暴雨'
-    } else if (num === 11) {
-      wea = '大暴雨'
-    } else if (num === 12) {
-      wea = '特大暴雨'
-    } else if (num === 13) {
-      wea = '阵雪'
-    } else if (num === 14) {
-      wea = '小雪'
-    } else if (num === 15) {
-      wea = '中雪'
-    } else if (num === 16) {
-      wea = '大雪'
-    } else if (num === 17) {
-      wea = '暴雪'
-    } else if (num === 18) {
-      wea = '雾'
-    } else if (num === 19) {
-      wea = '冻雨'
-    } else if (num === 20) {
-      wea = '沙尘暴'
-    } else if (num === 21) {
-      wea = '小雨-中雨'
-    } else if (num === 22) {
-      wea = '中雨-大雨'
-    } else if (num === 23) {
-      wea = '大雨-暴雨'
-    } else if (num === 24) {
-      wea = '暴雨-大暴雨'
-    } else if (num === 25) {
-      wea = '大暴雨-特大暴雨'
-    } else if (num === 26) {
-      wea = '小雪-中雪'
-    } else if (num === 27) {
-      wea = '中雪-大雪'
-    } else if (num === 28) {
-      wea = '大雪-暴雪'
-    } else if (num === 29) {
-      wea = '浮沉'
-    } else if (num === 30) {
-      wea = '扬沙'
-    } else if (num === 31) {
-      wea = '强沙尘暴'
-    } else if (num === 32) {
-      wea = '飑'
-    } else if (num === 33) {
-      wea = '龙卷风'
-    } else if (num === 34) {
-      wea = '若高吹雪'
-    } else if (num === 35) {
-      wea = '轻雾'
-    } else if (num === 53) {
-      wea = '霾'
-    } else if (num === 99) {
-      wea = '未知'
-    }
-
-    return wea
-  },
-}
-
-export default {
-  namespace: 'dashboard',
-  state: {
-    weather: {
-      city: '成都',
-      temperature: '5',
-      name: '晴',
-      icon: 'http://www.zuimeitianqi.com/res/icon/0_big.png',
-      dateTime: new Date().format('MM-dd hh:mm'),
-    },
-    sales: [],
-    quote: {
-      avatar: 'http://img.hb.aicdn.com/bc442cf0cc6f7940dcc567e465048d1a8d634493198c4-sPx5BR_fw236',
-    },
-    numbers: [],
-    recentSales: [],
-    comments: [],
-    completed: [],
-    browser: [],
-    cpu: {},
-    user: {
-      avatar: 'http://img.hb.aicdn.com/bc442cf0cc6f7940dcc567e465048d1a8d634493198c4-sPx5BR_fw236',
-    },
-  },
-  subscriptions: {
-    setup ({ dispatch }) {
-      dispatch({ type: 'query' })
-      dispatch({ type: 'queryWeather' })
-    },
-  },
-  effects: {
-    * query ({
-      payload,
-    }, { call, put }) {
-      const data = yield call(query, parse(payload))
-      yield put({ type: 'queryWeather', payload: { ...data } })
-    },
-    * queryWeather (action, { call, put }) {
-      const myCityResult = yield call(myCity, { flg: 0 })
-      const result = yield call(queryWeather, { cityCode: myCityResult.selectCityCode })
-      const weather = zuimei.parseActualData(result.data.actual)
-      weather.city = myCityResult.selectCityName
-      yield put({ type: 'queryWeatherSuccess',
-        payload: {
-          weather,
-        } })
-    },
-  },
-  reducers: {
-    queryWeatherSuccess (state, action) {
-      return {
-        ...state,
-        ...action.payload,
-      }
-    },
-    queryWeather (state, action) {
-      return {
-        ...state,
-        ...action.payload,
-      }
-    },
-  },
-}
+import { parse } from 'qs'
+import modelExtend from 'dva-model-extend'
+import { query } from 'services/dashboard'
+import { model } from 'models/common'
+import * as weatherService from 'services/weather'
+
+export default modelExtend(model, {
+  namespace: 'dashboard',
+  state: {
+    weather: {
+      city: '深圳',
+      temperature: '30',
+      name: '晴',
+      icon: '//s5.sencdn.com/web/icons/3d_50/2.png',
+    },
+    sales: [],
+    quote: {
+      avatar: 'http://img.hb.aicdn.com/bc442cf0cc6f7940dcc567e465048d1a8d634493198c4-sPx5BR_fw236',
+    },
+    numbers: [],
+    recentSales: [],
+    comments: [],
+    completed: [],
+    browser: [],
+    cpu: {},
+    user: {
+      avatar: 'http://img.hb.aicdn.com/bc442cf0cc6f7940dcc567e465048d1a8d634493198c4-sPx5BR_fw236',
+    },
+  },
+  subscriptions: {
+    setup ({ dispatch, history }) {
+      history.listen(({ pathname }) => {
+        if (pathname === '/dashboard' || pathname === '/') {
+          dispatch({ type: 'query' })
+          dispatch({ type: 'queryWeather' })
+        }
+      })
+    },
+  },
+  effects: {
+    * query ({
+      payload,
+    }, { call, put }) {
+      const data = yield call(query, parse(payload))
+      yield put({
+        type: 'updateState',
+        payload: data,
+      })
+    },
+    * queryWeather ({
+      payload = {},
+    }, { call, put }) {
+      payload.location = 'shenzhen'
+      const result = yield call(weatherService.query, payload)
+      const { success } = result
+      if (success) {
+        const data = result.results[0]
+        const weather = {
+          city: data.location.name,
+          temperature: data.now.temperature,
+          name: data.now.text,
+          icon: `//s5.sencdn.com/web/icons/3d_50/${data.now.code}.png`,
+        }
+        yield put({
+          type: 'updateState',
+          payload: {
+            weather,
+          },
+        })
+      }
+    },
+  },
+})

src/models/login.js

@@ -1,45 +1,29 @@
-import { routerRedux } from 'dva/router'
-import { queryURL } from 'utils'
-import { login } from 'services/login'
-
-export default {
-  namespace: 'login',
-  state: {
-    loginLoading: false,
-  },
-
-  effects: {
-    * login ({
-      payload,
-    }, { put, call }) {
-      yield put({ type: 'showLoginLoading' })
-      const data = yield call(login, payload)
-      yield put({ type: 'hideLoginLoading' })
-      if (data.success) {
-        const from = queryURL('from')
-        yield put({ type: 'app/query' })
-        if (from) {
-          yield put(routerRedux.push(from))
-        } else {
-          yield put(routerRedux.push('/dashboard'))
-        }
-      } else {
-        throw data
-      }
-    },
-  },
-  reducers: {
-    showLoginLoading (state) {
-      return {
-        ...state,
-        loginLoading: true,
-      }
-    },
-    hideLoginLoading (state) {
-      return {
-        ...state,
-        loginLoading: false,
-      }
-    },
-  },
-}
+import { routerRedux } from 'dva/router'
+import { login } from 'services/login'
+
+export default {
+  namespace: 'login',
+
+  state: {},
+
+  effects: {
+    * login ({
+      payload,
+    }, { put, call, select }) {
+      const data = yield call(login, payload)
+      const { locationQuery } = yield select(_ => _.app)
+      if (data.success) {
+        const { from } = locationQuery
+        yield put({ type: 'app/query' })
+        if (from && from !== '/login') {
+          yield put(routerRedux.push(from))
+        } else {
+          yield put(routerRedux.push('/dashboard'))
+        }
+      } else {
+        throw data
+      }
+    },
+  },
+
+}

src/models/post.js

@@ -1,6 +1,7 @@
 import modelExtend from 'dva-model-extend'
 import { query } from 'services/posts'
 import { pageModel } from 'models/common'
+import queryString from 'query-string'
 
 export default modelExtend(pageModel, {
 
@@ -13,7 +14,7 @@ export default modelExtend(pageModel, {
           dispatch({ type: 'query',
             payload: {
               status: 2,
-              ...location.query,
+              ...queryString.parse(location.search),
             } })
         }
       })

src/models/user.js

@@ -1,115 +1,116 @@
-/* global window */
-import modelExtend from 'dva-model-extend'
-import { config } from 'utils'
-import { create, remove, update } from 'services/user'
-import * as usersService from 'services/users'
-import { pageModel } from './common'
-
-const { query } = usersService
-const { prefix } = config
-
-export default modelExtend(pageModel, {
-  namespace: 'user',
-
-  state: {
-    currentItem: {},
-    modalVisible: false,
-    modalType: 'create',
-    selectedRowKeys: [],
-    isMotion: window.localStorage.getItem(`${prefix}userIsMotion`) === 'true',
-  },
-
-  subscriptions: {
-    setup ({ dispatch, history }) {
-      history.listen((location) => {
-        if (location.pathname === '/user') {
-          dispatch({
-            type: 'query',
-            payload: location.query,
-          })
-        }
-      })
-    },
-  },
-
-  effects: {
-
-    * query ({ payload = {} }, { call, put }) {
-      const data = yield call(query, payload)
-      if (data) {
-        yield put({
-          type: 'querySuccess',
-          payload: {
-            list: data.data,
-            pagination: {
-              current: Number(payload.page) || 1,
-              pageSize: Number(payload.pageSize) || 10,
-              total: data.total,
-            },
-          },
-        })
-      }
-    },
-
-    * delete ({ payload }, { call, put, select }) {
-      const data = yield call(remove, { id: payload })
-      const { selectedRowKeys } = yield select(_ => _.user)
-      if (data.success) {
-        yield put({ type: 'updateState', payload: { selectedRowKeys: selectedRowKeys.filter(_ => _ !== payload) } })
-        yield put({ type: 'query' })
-      } else {
-        throw data
-      }
-    },
-
-    * multiDelete ({ payload }, { call, put }) {
-      const data = yield call(usersService.remove, payload)
-      if (data.success) {
-        yield put({ type: 'updateState', payload: { selectedRowKeys: [] } })
-        yield put({ type: 'query' })
-      } else {
-        throw data
-      }
-    },
-
-    * create ({ payload }, { call, put }) {
-      const data = yield call(create, payload)
-      if (data.success) {
-        yield put({ type: 'hideModal' })
-        yield put({ type: 'query' })
-      } else {
-        throw data
-      }
-    },
-
-    * update ({ payload }, { select, call, put }) {
-      const id = yield select(({ user }) => user.currentItem.id)
-      const newUser = { ...payload, id }
-      const data = yield call(update, newUser)
-      if (data.success) {
-        yield put({ type: 'hideModal' })
-        yield put({ type: 'query' })
-      } else {
-        throw data
-      }
-    },
-
-  },
-
-  reducers: {
-
-    showModal (state, { payload }) {
-      return { ...state, ...payload, modalVisible: true }
-    },
-
-    hideModal (state) {
-      return { ...state, modalVisible: false }
-    },
-
-    switchIsMotion (state) {
-      window.localStorage.setItem(`${prefix}userIsMotion`, !state.isMotion)
-      return { ...state, isMotion: !state.isMotion }
-    },
-
-  },
-})
+/* global window */
+import modelExtend from 'dva-model-extend'
+import { config } from 'utils'
+import { create, remove, update } from 'services/user'
+import * as usersService from 'services/users'
+import queryString from 'query-string'
+import { pageModel } from './common'
+
+const { query } = usersService
+const { prefix } = config
+
+export default modelExtend(pageModel, {
+  namespace: 'user',
+
+  state: {
+    currentItem: {},
+    modalVisible: false,
+    modalType: 'create',
+    selectedRowKeys: [],
+    isMotion: window.localStorage.getItem(`${prefix}userIsMotion`) === 'true',
+  },
+
+  subscriptions: {
+    setup ({ dispatch, history }) {
+      history.listen((location) => {
+        if (location.pathname === '/user') {
+          dispatch({
+            type: 'query',
+            payload: queryString.parse(location.search),
+          })
+        }
+      })
+    },
+  },
+
+  effects: {
+
+    * query ({ payload = {} }, { call, put }) {
+      const data = yield call(query, payload)
+      if (data) {
+        yield put({
+          type: 'querySuccess',
+          payload: {
+            list: data.data,
+            pagination: {
+              current: Number(payload.page) || 1,
+              pageSize: Number(payload.pageSize) || 10,
+              total: data.total,
+            },
+          },
+        })
+      }
+    },
+
+    * delete ({ payload }, { call, put, select }) {
+      const data = yield call(remove, { id: payload })
+      const { selectedRowKeys } = yield select(_ => _.user)
+      if (data.success) {
+        yield put({ type: 'updateState', payload: { selectedRowKeys: selectedRowKeys.filter(_ => _ !== payload) } })
+        yield put({ type: 'query' })
+      } else {
+        throw data
+      }
+    },
+
+    * multiDelete ({ payload }, { call, put }) {
+      const data = yield call(usersService.remove, payload)
+      if (data.success) {
+        yield put({ type: 'updateState', payload: { selectedRowKeys: [] } })
+        yield put({ type: 'query' })
+      } else {
+        throw data
+      }
+    },
+
+    * create ({ payload }, { call, put }) {
+      const data = yield call(create, payload)
+      if (data.success) {
+        yield put({ type: 'hideModal' })
+        yield put({ type: 'query' })
+      } else {
+        throw data
+      }
+    },
+
+    * update ({ payload }, { select, call, put }) {
+      const id = yield select(({ user }) => user.currentItem.id)
+      const newUser = { ...payload, id }
+      const data = yield call(update, newUser)
+      if (data.success) {
+        yield put({ type: 'hideModal' })
+        yield put({ type: 'query' })
+      } else {
+        throw data
+      }
+    },
+
+  },
+
+  reducers: {
+
+    showModal (state, { payload }) {
+      return { ...state, ...payload, modalVisible: true }
+    },
+
+    hideModal (state) {
+      return { ...state, modalVisible: false }
+    },
+
+    switchIsMotion (state) {
+      window.localStorage.setItem(`${prefix}userIsMotion`, !state.isMotion)
+      return { ...state, isMotion: !state.isMotion }
+    },
+
+  },
+})

src/models/user/detail.js

@@ -1,4 +1,3 @@
-/* global location */
 import pathToRegexp from 'path-to-regexp'
 import { query } from '../../services/user'
 
@@ -12,8 +11,8 @@ export default {
 
   subscriptions: {
     setup ({ dispatch, history }) {
-      history.listen(() => {
-        const match = pathToRegexp('/user/:id').exec(location.pathname)
+      history.listen(({ pathname }) => {
+        const match = pathToRegexp('/user/:id').exec(pathname)
         if (match) {
           dispatch({ type: 'query', payload: { id: match[1] } })
         }

src/router.js

@@ -1,149 +1,92 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { Router } from 'dva/router'
+import { Switch, Route, Redirect, routerRedux } from 'dva/router'
+import dynamic from 'dva/dynamic'
 import App from 'routes/app'
 
-const registerModel = (app, model) => {
-  if (!(app._models.filter(m => m.namespace === model.namespace).length === 1)) {
-    app.model(model)
-  }
-}
+const { ConnectedRouter } = routerRedux
 
 const Routers = function ({ history, app }) {
+  const error = dynamic({
+    app,
+    component: () => import('./routes/error'),
+  })
   const routes = [
     {
-      path: '/',
-      component: App,
-      getIndexRoute (nextState, cb) {
-        require.ensure([], (require) => {
-          registerModel(app, require('models/dashboard'))
-          cb(null, { component: require('routes/dashboard/') })
-        }, 'dashboard')
-      },
-      childRoutes: [
-        {
-          path: 'dashboard',
-          getComponent (nextState, cb) {
-            require.ensure([], (require) => {
-              registerModel(app, require('models/dashboard'))
-              cb(null, require('routes/dashboard/'))
-            }, 'dashboard')
-          },
-        }, {
-          path: 'user',
-          getComponent (nextState, cb) {
-            require.ensure([], (require) => {
-              registerModel(app, require('models/user'))
-              cb(null, require('routes/user/'))
-            }, 'user')
-          },
-        }, {
-          path: 'user/:id',
-          getComponent (nextState, cb) {
-            require.ensure([], (require) => {
-              registerModel(app, require('models/user/detail'))
-              cb(null, require('routes/user/detail/'))
-            }, 'user-detail')
-          },
-        }, {
-          path: 'login',
-          getComponent (nextState, cb) {
-            require.ensure([], (require) => {
-              registerModel(app, require('models/login'))
-              cb(null, require('routes/login/'))
-            }, 'login')
-          },
-        }, {
-          path: 'request',
-          getComponent (nextState, cb) {
-            require.ensure([], (require) => {
-              cb(null, require('routes/request/'))
-            }, 'request')
-          },
-        }, {
-          path: 'UIElement/iconfont',
-          getComponent (nextState, cb) {
-            require.ensure([], (require) => {
-              cb(null, require('routes/UIElement/iconfont/'))
-            }, 'UIElement-iconfont')
-          },
-        }, {
-          path: 'UIElement/search',
-          getComponent (nextState, cb) {
-            require.ensure([], (require) => {
-              cb(null, require('routes/UIElement/search/'))
-            }, 'UIElement-search')
-          },
-        }, {
-          path: 'UIElement/dropOption',
-          getComponent (nextState, cb) {
-            require.ensure([], (require) => {
-              cb(null, require('routes/UIElement/dropOption/'))
-            }, 'UIElement-dropOption')
-          },
-        }, {
-          path: 'UIElement/layer',
-          getComponent (nextState, cb) {
-            require.ensure([], (require) => {
-              cb(null, require('routes/UIElement/layer/'))
-            }, 'UIElement-layer')
-          },
-        }, {
-          path: 'UIElement/dataTable',
-          getComponent (nextState, cb) {
-            require.ensure([], (require) => {
-              cb(null, require('routes/UIElement/dataTable/'))
-            }, 'UIElement-dataTable')
-          },
-        }, {
-          path: 'UIElement/editor',
-          getComponent (nextState, cb) {
-            require.ensure([], (require) => {
-              cb(null, require('routes/UIElement/editor/'))
-            }, 'UIElement-editor')
-          },
-        }, {
-          path: 'chart/lineChart',
-          getComponent (nextState, cb) {
-            require.ensure([], (require) => {
-              cb(null, require('routes/chart/lineChart/'))
-            }, 'chart-lineChart')
-          },
-        }, {
-          path: 'chart/barChart',
-          getComponent (nextState, cb) {
-            require.ensure([], (require) => {
-              cb(null, require('routes/chart/barChart/'))
-            }, 'chart-barChart')
-          },
-        }, {
-          path: 'chart/areaChart',
-          getComponent (nextState, cb) {
-            require.ensure([], (require) => {
-              cb(null, require('routes/chart/areaChart/'))
-            }, 'chart-areaChart')
-          },
-        }, {
-          path: 'post',
-          getComponent (nextState, cb) {
-            require.ensure([], (require) => {
-              registerModel(app, require('models/post'))
-              cb(null, require('routes/post/'))
-            }, 'post')
-          },
-        }, {
-          path: '*',
-          getComponent (nextState, cb) {
-            require.ensure([], (require) => {
-              cb(null, require('routes/error/'))
-            }, 'error')
-          },
-        },
-      ],
+      path: '/dashboard',
+      models: () => [import('./models/dashboard')],
+      component: () => import('./routes/dashboard/'),
+    }, {
+      path: '/user',
+      models: () => [import('./models/user')],
+      component: () => import('./routes/user/'),
+    }, {
+      path: '/user/:id',
+      models: () => [import('./models/user/detail')],
+      component: () => import('./routes/user/detail/'),
+    }, {
+      path: '/login',
+      models: () => [import('./models/login')],
+      component: () => import('./routes/login/'),
+    }, {
+      path: '/request',
+      component: () => import('./routes/request/'),
+    }, {
+      path: '/UIElement/iconfont',
+      component: () => import('./routes/UIElement/iconfont/'),
+    }, {
+      path: '/UIElement/search',
+      component: () => import('./routes/UIElement/search/'),
+    }, {
+      path: '/UIElement/dropOption',
+      component: () => import('./routes/UIElement/dropOption/'),
+    }, {
+      path: '/UIElement/layer',
+      component: () => import('./routes/UIElement/layer/'),
+    }, {
+      path: '/UIElement/dataTable',
+      component: () => import('./routes/UIElement/dataTable/'),
+    }, {
+      path: '/UIElement/editor',
+      component: () => import('./routes/UIElement/editor/'),
+    }, {
+      path: '/chart/lineChart',
+      component: () => import('./routes/chart/lineChart/'),
+    }, {
+      path: '/chart/barChart',
+      component: () => import('./routes/chart/barChart/'),
+    }, {
+      path: '/chart/areaChart',
+      component: () => import('./routes/chart/areaChart/'),
+    }, {
+      path: '/post',
+      models: () => [import('./models/post')],
+      component: () => import('./routes/post/'),
     },
   ]
 
-  return <Router history={history} routes={routes} />
+  return (
+    <ConnectedRouter history={history}>
+      <App>
+        <Switch>
+          <Route exact path="/" render={() => (<Redirect to="/dashboard" />)} />
+          {
+            routes.map(({ path, ...dynamics }, key) => (
+              <Route key={key}
+                exact
+                path={path}
+                component={dynamic({
+                  app,
+                  ...dynamics,
+                })}
+              />
+            ))
+          }
+          <Route component={error} />
+        </Switch>
+      </App>
+    </ConnectedRouter>
+  )
 }
 
 Routers.propTypes = {

src/routes/app.js

@@ -7,6 +7,7 @@ import { connect } from 'dva'
 import { Layout, Loader } from 'components'
 import { classnames, config } from 'utils'
 import { Helmet } from 'react-helmet'
+import { withRouter } from 'dva/router'
 import '../themes/index.less'
 import './app.less'
 import Error from './error'
@@ -36,6 +37,7 @@ const App = ({ children, dispatch, app, loading, location }) => {
   const headerProps = {
     menu,
     user,
+    location,
     siderFold,
     isNavbar,
     menuPopoverVisible,
@@ -56,6 +58,7 @@ const App = ({ children, dispatch, app, loading, location }) => {
 
   const siderProps = {
     menu,
+    location,
     siderFold,
     darkTheme,
     navOpenKeys,
@@ -70,15 +73,17 @@ const App = ({ children, dispatch, app, loading, location }) => {
 
   const breadProps = {
     menu,
+    location,
   }
   if (openPages && openPages.includes(pathname)) {
     return (<div>
-      <Loader spinning={loading.effects['app/query']} />
+      <Loader fullScreen spinning={loading.effects['app/query']} />
       {children}
     </div>)
   }
   return (
     <div>
+      <Loader fullScreen spinning={loading.effects['app/query']} />
       <Helmet>
         <title>ANTD ADMIN</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -88,7 +93,7 @@ const App = ({ children, dispatch, app, loading, location }) => {
       </Helmet>
       <div className={classnames(styles.layout, { [styles.fold]: isNavbar ? false : siderFold }, { [styles.withnavbar]: isNavbar })}>
         {!isNavbar ? <aside className={classnames(styles.sider, { [styles.light]: !darkTheme })}>
-          <Sider {...siderProps} />
+          {siderProps.menu.length === 0 ? null : <Sider {...siderProps} />}
         </aside> : ''}
         <div className={styles.main}>
           <Header {...headerProps} />
@@ -113,4 +118,4 @@ App.propTypes = {
   loading: PropTypes.object,
 }
 
-export default connect(({ app, loading }) => ({ app, loading }))(App)
+export default withRouter(connect(({ app, loading }) => ({ app, loading }))(App))

src/routes/dashboard/components/weather.js

@@ -1,22 +1,26 @@
 import React from 'react'
 import PropTypes from 'prop-types'
+import { Spin } from 'antd'
 import styles from './weather.less'
 
-function Weather ({ city, icon, dateTime, temperature, name }) {
-  return (<div className={styles.weather}>
-    <div className={styles.left}>
-      <div className={styles.icon}
-        style={{
-          backgroundImage: `url(${icon})`,
-        }}
-      />
-      <p>{name}</p>
-    </div>
-    <div className={styles.right}>
-      <h1 className={styles.temperature}>{`${temperature}°`}</h1>
-      <p className={styles.description}>{city},{dateTime}</p>
-    </div>
-  </div>)
+function Weather ({ city, icon, dateTime, temperature, name, loading }) {
+  return (
+    <Spin spinning={loading}>
+      <div className={styles.weather}>
+        <div className={styles.left}>
+          <div className={styles.icon}
+            style={{
+              backgroundImage: `url(${icon})`,
+            }}
+          />
+          <p>{name}</p>
+        </div>
+        <div className={styles.right}>
+          <h1 className={styles.temperature}>{`${temperature}°`}</h1>
+          <p className={styles.description}>{city},{dateTime}</p>
+        </div>
+      </div>
+    </Spin>)
 }
 
 Weather.propTypes = {
@@ -25,6 +29,7 @@ Weather.propTypes = {
   dateTime: PropTypes.string,
   temperature: PropTypes.string,
   name: PropTypes.string,
+  loading: PropTypes.bool,
 }
 
 export default Weather

src/routes/dashboard/components/weather.less

@@ -18,7 +18,7 @@
       width: 64px;
       height: 64px;
       background-position: center;
-      background-size: cover;
+      background-size: contain;
     }
 
     p {

src/routes/dashboard/index.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types'
 import { connect } from 'dva'
 import { Row, Col, Card } from 'antd'
 import { color } from 'utils'
+import { Page } from 'components'
 import { NumberCard, Quote, Sales, Weather, RecentSales, Comments, Completed, Browser, Cpu, User } from './components'
 import styles from './index.less'
 
@@ -13,92 +14,95 @@ const bodyStyle = {
   },
 }
 
-function Dashboard ({ dashboard }) {
+function Dashboard ({ dashboard, loading }) {
   const { weather, sales, quote, numbers, recentSales, comments, completed, browser, cpu, user } = dashboard
   const numberCards = numbers.map((item, key) => (<Col key={key} lg={6} md={12}>
     <NumberCard {...item} />
   </Col>))
 
   return (
-    <Row gutter={24}>
-      {numberCards}
-      <Col lg={18} md={24}>
-        <Card bordered={false}
-          bodyStyle={{
-            padding: '24px 36px 24px 0',
-          }}
-        >
-          <Sales data={sales} />
-        </Card>
-      </Col>
-      <Col lg={6} md={24}>
-        <Row gutter={24}>
-          <Col lg={24} md={12}>
-            <Card bordered={false}
-              className={styles.weather}
-              bodyStyle={{
-                padding: 0,
-                height: 204,
-                background: color.blue,
-              }}
-            >
-              <Weather {...weather} />
-            </Card>
-          </Col>
-          <Col lg={24} md={12}>
-            <Card bordered={false}
-              className={styles.quote}
-              bodyStyle={{
-                padding: 0,
-                height: 204,
-                background: color.peach,
-              }}
-            >
-              <Quote {...quote} />
-            </Card>
-          </Col>
-        </Row>
-      </Col>
-      <Col lg={12} md={24}>
-        <Card bordered={false} {...bodyStyle}>
-          <RecentSales data={recentSales} />
-        </Card>
-      </Col>
-      <Col lg={12} md={24}>
-        <Card bordered={false} {...bodyStyle}>
-          <Comments data={comments} />
-        </Card>
-      </Col>
-      <Col lg={24} md={24}>
-        <Card bordered={false}
-          bodyStyle={{
-            padding: '24px 36px 24px 0',
-          }}
-        >
-          <Completed data={completed} />
-        </Card>
-      </Col>
-      <Col lg={8} md={24}>
-        <Card bordered={false} {...bodyStyle}>
-          <Browser data={browser} />
-        </Card>
-      </Col>
-      <Col lg={8} md={24}>
-        <Card bordered={false} {...bodyStyle}>
-          <Cpu {...cpu} />
-        </Card>
-      </Col>
-      <Col lg={8} md={24}>
-        <Card bordered={false} bodyStyle={{ ...bodyStyle.bodyStyle, padding: 0 }}>
-          <User {...user} />
-        </Card>
-      </Col>
-    </Row>
+    <Page loading={loading.models.dashboard && sales.length === 0}>
+      <Row gutter={24}>
+        {numberCards}
+        <Col lg={18} md={24}>
+          <Card bordered={false}
+            bodyStyle={{
+              padding: '24px 36px 24px 0',
+            }}
+          >
+            <Sales data={sales} />
+          </Card>
+        </Col>
+        <Col lg={6} md={24}>
+          <Row gutter={24}>
+            <Col lg={24} md={12}>
+              <Card bordered={false}
+                className={styles.weather}
+                bodyStyle={{
+                  padding: 0,
+                  height: 204,
+                  background: color.blue,
+                }}
+              >
+                <Weather {...weather} loading={loading.effects['dashboard/queryWeather']} />
+              </Card>
+            </Col>
+            <Col lg={24} md={12}>
+              <Card bordered={false}
+                className={styles.quote}
+                bodyStyle={{
+                  padding: 0,
+                  height: 204,
+                  background: color.peach,
+                }}
+              >
+                <Quote {...quote} />
+              </Card>
+            </Col>
+          </Row>
+        </Col>
+        <Col lg={12} md={24}>
+          <Card bordered={false} {...bodyStyle}>
+            <RecentSales data={recentSales} />
+          </Card>
+        </Col>
+        <Col lg={12} md={24}>
+          <Card bordered={false} {...bodyStyle}>
+            <Comments data={comments} />
+          </Card>
+        </Col>
+        <Col lg={24} md={24}>
+          <Card bordered={false}
+            bodyStyle={{
+              padding: '24px 36px 24px 0',
+            }}
+          >
+            <Completed data={completed} />
+          </Card>
+        </Col>
+        <Col lg={8} md={24}>
+          <Card bordered={false} {...bodyStyle}>
+            <Browser data={browser} />
+          </Card>
+        </Col>
+        <Col lg={8} md={24}>
+          <Card bordered={false} {...bodyStyle}>
+            <Cpu {...cpu} />
+          </Card>
+        </Col>
+        <Col lg={8} md={24}>
+          <Card bordered={false} bodyStyle={{ ...bodyStyle.bodyStyle, padding: 0 }}>
+            <User {...user} />
+          </Card>
+        </Col>
+      </Row>
+    </Page>
   )
 }
 
 Dashboard.propTypes = {
   dashboard: PropTypes.object,
+  loading: PropTypes.object,
 }
 
-export default connect(({ dashboard }) => ({ dashboard }))(Dashboard)
+export default connect(({ dashboard, loading }) => ({ dashboard, loading }))(Dashboard)

src/routes/login/index.js

@@ -8,15 +8,13 @@ import styles from './index.less'
 const FormItem = Form.Item
 
 const Login = ({
-  login,
+  loading,
   dispatch,
   form: {
     getFieldDecorator,
     validateFieldsAndScroll,
   },
 }) => {
-  const { loginLoading } = login
-
   function handleOk () {
     validateFieldsAndScroll((errors, values) => {
       if (errors) {
@@ -52,7 +50,7 @@ const Login = ({
           })(<Input size="large" type="password" onPressEnter={handleOk} placeholder="Password" />)}
         </FormItem>
         <Row>
-          <Button type="primary" size="large" onClick={handleOk} loading={loginLoading}>
+          <Button type="primary" size="large" onClick={handleOk} loading={loading.effects.login}>
             Sign in
           </Button>
           <p>
@@ -68,8 +66,8 @@ const Login = ({
 
 Login.propTypes = {
   form: PropTypes.object,
-  login: PropTypes.object,
   dispatch: PropTypes.func,
+  loading: PropTypes.object,
 }
 
-export default connect(({ login }) => ({ login }))(Form.create()(Login))
+export default connect(({ loading }) => ({ loading }))(Form.create()(Login))

src/routes/user/List.js

@@ -3,13 +3,16 @@ import PropTypes from 'prop-types'
 import { Table, Modal } from 'antd'
 import classnames from 'classnames'
 import { DropOption } from 'components'
-import { Link } from 'dva/router'
-import AnimTableBody from '../../components/DataTable/AnimTableBody'
+import { Link } from 'react-router-dom'
+import queryString from 'query-string'
+import AnimTableBody from 'components/DataTable/AnimTableBody'
 import styles from './List.less'
 
 const confirm = Modal.confirm
 
 const List = ({ onDeleteItem, onEditItem, isMotion, location, ...tableProps }) => {
+  location.query = queryString.parse(location.search)
+
   const handleMenuClick = (record, e) => {
     if (e.key === '1') {
       onEditItem(record)

src/routes/user/index.js

@@ -3,11 +3,15 @@ import PropTypes from 'prop-types'
 import { routerRedux } from 'dva/router'
 import { connect } from 'dva'
 import { Row, Col, Button, Popconfirm } from 'antd'
+import { Page } from 'components'
+import queryString from 'query-string'
 import List from './List'
 import Filter from './Filter'
 import Modal from './Modal'
 
+
 const User = ({ location, dispatch, user, loading }) => {
+  location.query = queryString.parse(location.search)
   const { list, pagination, currentItem, modalVisible, modalType, isMotion, selectedRowKeys } = user
   const { pageSize } = pagination
 
@@ -125,7 +129,7 @@ const User = ({ location, dispatch, user, loading }) => {
   }
 
   return (
-    <div className="content-inner">
+    <Page inner>
       <Filter {...filterProps} />
       {
         selectedRowKeys.length > 0 &&
@@ -140,7 +144,7 @@ const User = ({ location, dispatch, user, loading }) => {
       }
       <List {...listProps} />
       {modalVisible && <Modal {...modalProps} />}
-    </div>
+    </Page>
   )
 }
 

src/services/dashboard.js

@@ -3,20 +3,6 @@ import { request, config } from 'utils'
 const { api } = config
 const { dashboard } = api
 
-export async function myCity (params) {
-  return request({
-    url: 'http://www.zuimeitianqi.com/zuimei/myCity',
-    data: params,
-  })
-}
-
-export async function queryWeather (params) {
-  return request({
-    url: 'http://www.zuimeitianqi.com/zuimei/queryWeather',
-    data: params,
-  })
-}
-
 export async function query (params) {
   return request({
     url: dashboard,

src/services/weather.js

@@ -0,0 +1,12 @@
+import { request, config } from 'utils'
+
+const { APIV1 } = config
+
+export async function query (params) {
+  params.key = 'i7sau1babuzwhycn'
+  return request({
+    url: `${APIV1}/weather/now.json`,
+    method: 'get',
+    data: params,
+  })
+}

src/utils/config.js

@@ -8,10 +8,11 @@ module.exports = {
   logo: '/logo.png',
   iconFontCSS: '/iconfont.css',
   iconFontJS: '/iconfont.js',
-  YQL: ['http://www.zuimeitianqi.com'],
   CORS: [],
   openPages: ['/login'],
   apiPrefix: '/api/v1',
+  APIV1,
+  APIV2,
   api: {
     userLogin: `${APIV1}/user/login`,
     userLogout: `${APIV1}/user/logout`,
@@ -21,6 +22,7 @@ module.exports = {
     user: `${APIV1}/user/:id`,
     dashboard: `${APIV1}/dashboard`,
     menus: `${APIV1}/menus`,
+    weather: `${APIV1}/weather`,
     v1test: `${APIV1}/test`,
     v2test: `${APIV2}/test`,
   },

src/utils/request.js

@@ -95,13 +95,12 @@ export default function request (options) {
         list: data,
       }
     }
-
-    return {
+    return Promise.resolve({
       success: true,
       message: statusText,
       statusCode: status,
       ...data,
-    }
+    })
   }).catch((error) => {
     const { response } = error
     let msg
@@ -114,6 +113,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 })
   })
 }

webpack.config.js

@@ -1,61 +1,45 @@
 const HtmlWebpackPlugin = require('html-webpack-plugin')
-const HtmlWebpackTemplate = require('html-webpack-template')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
+const webpack = require('webpack')
 
 module.exports = (webpackConfig, env) => {
+  const production = env === 'production'
   // FilenameHash
-  webpackConfig.output.chunkFilename = '[name].[hash].js'
+  webpackConfig.output.chunkFilename = '[name].[chunkhash].js'
 
-  if (env === 'production' && webpackConfig.module) {
+  if (production) {
+    if (webpackConfig.module) {
     // ClassnameHash
-    webpackConfig.module.rules.map((item) => {
-      if (item.use && item.use[0] === 'style') {
-        return item.use.map((iitem) => {
-          if (iitem && iitem.loader === 'css') {
-            iitem.options.localIdentName = '[hash:base64:5]'
-          }
-          return iitem
-        })
-      }
-      return item
-    })
+      webpackConfig.module.rules.map((item) => {
+        if (String(item.test) === '/\\.less$/' || String(item.test) === '/\\.css/') {
+          item.use.filter(iitem => iitem.loader === 'css')[0].options.localIdentName = '[hash:base64:5]'
+        }
+        return item
+      })
+    }
+    webpackConfig.plugins.push(
+      new webpack.LoaderOptionsPlugin({
+        minimize: true,
+        debug: false,
+      })
+    )
   }
 
-  // PreLoaders
-  // webpackConfig.module.preLoaders = [{
-  //   test: /\.js$/,
-  //   enforce: 'pre',
-  //   loader: 'eslint',
-  // }]
-
   webpackConfig.plugins = webpackConfig.plugins.concat([
     new CopyWebpackPlugin([
       {
         from: 'src/public',
-        to: env === 'production' ? '../' : webpackConfig.output.outputPath,
+        to: production ? '../' : webpackConfig.output.outputPath,
       },
     ]),
     new HtmlWebpackPlugin({
-      hash: true,
-      mobile: true,
-      title: 'antd-admin',
-      inject: false,
-      appMountId: 'root',
-      template: `!!ejs-loader!${HtmlWebpackTemplate}`,
-      filename: env === 'production' ? '../index.html' : 'index.html',
-      minify: {
+      template: `${__dirname}/src/entry.ejs`,
+      filename: production ? '../index.html' : 'index.html',
+      minify: production ? {
         collapseWhitespace: true,
-      },
-      scripts: env === 'production' ? null : ['/roadhog.dll.js'],
-      meta: [
-        {
-          name: 'description',
-          content: 'A admin dashboard application demo built upon Ant Design and Dva.js',
-        }, {
-          name: 'viewport',
-          content: 'width=device-width, initial-scale=1.0',
-        },
-      ],
+      } : null,
+      hash: true,
+      headScripts: production ? null : ['/roadhog.dll.js'],
     }),
   ])