Merge develop and update to 5.0.0-beta

2026-10-19 16:14:37 +00:00 · 2018-05-25 17:20:20 +08:00
parent ba96ebb874 a1b9c0c33d
commit c3eef53e4d
154 changed files with 777 additions and 1002 deletions
@@ -0,0 +1,22 @@
+{
+  "presets": [
+    "umi/babel"
+  ],
+  "plugins": [
+    [
+      "babel-plugin-module-resolver",
+      {
+        "alias": {
+          "components": "./src/components",
+          "utils": "./src/utils",
+          "config": "./src/utils/config",
+          "enums": "./src/utils/enums",
+          "services": "./src/services",
+          "models": "./src/models",
+          "routes": "./src/routes",
+          "themes": "./src/themes"
+        }
+      }
+    ]
+  ]
+}
@@ -1,5 +1,5 @@
 {
-  "extends": "airbnb",
+  "extends": "umi",
  "rules": {
    "arrow-body-style": [0, "never"],
    "comma-dangle": [2, "always-multiline"],
@@ -44,17 +44,5 @@
    "react/no-danger": 0,
    "react/jsx-first-prop-new-line": 0,
    "react/jsx-filename-extension": 0
-  },
-  "parser": "babel-eslint",
-  "parserOptions": {
-    "sourceType": "module",
-    "ecmaVersion": 8,
-    "ecmaFeatures": {
-      "jsx": true,
-      "experimentalObjectRestSpread": true
-    }
-  },
-  "settings": {
-    "import/resolver": "node"
-    }
+  }
 }
@@ -2,6 +2,7 @@ dist
 node_modules
 yarn.lock
 npm-debug.log
+
 # ide
 .idea

@@ -9,3 +10,7 @@ npm-debug.log
 .DS_Store
 .AppleDouble
 .LSOverride
+
+# umi
+.umi
+.umi-production
@@ -1,57 +0,0 @@
-const path = require('path')
-const { version } = require('./package.json')
-
-const svgSpriteDirs = [
-  path.resolve(__dirname, 'src/svg/'),
-  require.resolve('antd').replace(/index\.js$/, '')
-]
-
-export default {
-  entry: 'src/index.js',
-  svgSpriteLoaderDirs: svgSpriteDirs,
-  theme: "./theme.config.js",
-  publicPath: `/${version}/`,
-  outputPath: `./dist/${version}`,
-  // 接口代理示例
-  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",
-        "transform-runtime",
-        [
-          "import", {
-            "libraryName": "antd",
-            "style": true
-          }
-        ]
-      ]
-    },
-    production: {
-      extraBabelPlugins: [
-        "transform-runtime",
-        [
-          "import", {
-            "libraryName": "antd",
-            "style": true
-          }
-        ]
-      ]
-    }
-  },
-  dllPlugin: {
-    exclude: ["babel-runtime", "roadhog", "cross-env"],
-    include: ["dva/router", "dva/saga", "dva/fetch"]
-  }
-}
@@ -1,5 +0,0 @@
-const mock = {}
-require('fs').readdirSync(require('path').join(__dirname + '/src/mock')).forEach(function(file) {
-	Object.assign(mock, require('./src/mock/' + file))
-})
-module.exports = mock
@@ -0,0 +1,26 @@
+
+export default {
+  plugins: [
+    'umi-plugin-dva',
+    [
+      'umi-plugin-routes',
+      {
+        exclude: [
+          /model\.(j|t)sx?$/,
+          /service\.(j|t)sx?$/,
+          /models\//,
+          /components\//,
+          /services\//,
+          /chart\/Container\.js$/,
+        ],
+      },
+    ],
+    [
+      'umi-plugin-dll',
+      {
+        exclude: [],
+        include: ["dva", "dva/router", "dva/saga", "dva/fetch", "antd/es"],
+      },
+    ],
+  ],
+}
@@ -0,0 +1,8 @@
+
+export default {
+  ...require('./mock/common'),
+  ...require('./mock/dashboard'),
+  ...require('./mock/menu'),
+  ...require('./mock/post'),
+  ...require('./mock/user'),
+}
@@ -0,0 +1,32 @@
+import { resolve } from 'path';
+
+export default {
+  theme: "./theme.config.js",
+  // 接口代理示例
+  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" }
+    // }
+  },
+  alias: {
+    themes: resolve(__dirname, './src/themes'),
+    components: resolve(__dirname,"./src/components"),
+    utils: resolve(__dirname,"./src/utils"),
+    config: resolve(__dirname,"./src/utils/config"),
+    enums: resolve(__dirname,"./src/utils/enums"),
+    services: resolve(__dirname,"./src/services"),
+    models: resolve(__dirname,"./src/models"),
+    routes: resolve(__dirname,"./src/routes"),
+  },
+  urlLoaderExcludes: [
+    /\.svg$/,
+  ],
+  ignoreMomentLocale: true,
+}
@@ -108,8 +108,13 @@ git clone https://github.com/zuiidea/antd-admin.git
 进入目录安装依赖:

 ```bash
+<<<<<<< HEAD
 #开始前请确保没有安装roadhog、webpack到NPM全局目录, 国内用户推荐yarn或者cnpm
 npm i 或者 yarn install
+=======
+#开始前请确保没有安装roadhog、webpack到NPM全局目录
+yarn install或者 npm i 
+>>>>>>> develop
 ```

 开发：
@@ -117,7 +122,7 @@ npm i 或者 yarn install
 ```bash
 npm run build:dll #第一次npm run dev时需运行此命令，使开发时编译更快
 npm run dev
-打开 http://localhost:8000
+打开 http://localhost:8000 #端口在package.json中cross-env后加上 PORT=8000指定
 ```

 构建：
@@ -1,5 +1,5 @@
 const Mock = require('mockjs')
-const config = require('../utils/config')
+const config = require('../src/utils/config')

 const queryArray = (array, key, keyAlias = 'key') => {
  if (!(array instanceof Array)) {
@@ -1,7 +1,7 @@
-import { color } from '../utils/theme'
+import { color } from '../src/utils/theme'

 const Mock = require('mockjs')
-const config = require('../utils/config')
+const config = require('../src/utils/config')

 const { apiPrefix } = config

@@ -1,6 +1,6 @@
 const qs = require('qs')
 const Mock = require('mockjs')
-const config = require('../utils/config')
+const config = require('../src/utils/config')

 const { apiPrefix } = config

@@ -1,74 +1,65 @@
 {
  "private": true,
  "name": "antd-admin",
-  "version": "4.3.9",
+  "version": "5.0.0-beta",
  "dependencies": {
-    "antd": "^3.5.1",
+    "@babel/polyfill": "^7.0.0-beta.44",
+    "antd": "^3.5.3",
    "axios": "^0.18.0",
-    "babel-polyfill": "^6.26.0",
    "classnames": "^2.2.5",
-    "cross-env": "^5.0.5",
    "d3-shape": "^1.2.0",
+    "draftjs-to-html": "^0.8.4",
    "draftjs-to-markdown": "^0.5.1",
-    "dva": "^2.2.3",
-    "dva-loading": "^2.0.0",
+    "dva-model-extend": "^0.1.2",
    "echarts": "^4.1.0",
-    "echarts-for-react": "^2.0.8",
+    "echarts-for-react": "^2.0.11",
    "echarts-gl": "^1.1.1",
    "echarts-liquidfill": "^2.0.0",
-    "ejs-loader": "^0.3.0",
-    "highcharts-exporting": "^0.1.2",
-    "highcharts-more": "^0.1.2",
-    "history": "^4.7.2",
-    "js-beautify": "^1.6.14",
+    "highcharts-exporting": "^0.1.7",
+    "highcharts-more": "^0.1.7",
    "jsonp": "^0.2.1",
-    "less-vars-to-js": "^1.1.2",
-    "lodash": "^4.17.4",
-    "mockjs": "^1.0.1-beta3",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.isequal": "^4.5.0",
    "nprogress": "^0.2.0",
-    "path-to-regexp": "^2.1.0",
-    "prop-types": "^15.5.10",
-    "qs": "^6.5.0",
+    "path-to-regexp": "^2.2.0",
+    "prop-types": "^15.6.1",
+    "qs": "^6.5.2",
    "query-string": "^5.1.1",
-    "rc-tween-one": "^1.7.3",
-    "react": "^16.3.2",
-    "react-countup": "^3.0.2",
-    "react-dom": "^16.3.2",
+    "rc-tween-one": "^1.7.8",
+    "react-adsense": "^0.0.5",
+    "react-countup": "^3.0.3",
    "react-draft-wysiwyg": "^1.12.13",
    "react-helmet": "^5.2.0",
    "react-highcharts": "^16.0.2",
    "recharts": "^1.0.0-beta.10"
  },
  "devDependencies": {
-    "babel-eslint": "^8.1.0",
    "babel-plugin-dev-expression": "^0.2.1",
-    "babel-plugin-dva-hmr": "^0.4.0",
-    "babel-plugin-import": "^1.1.1",
-    "babel-plugin-transform-runtime": "^6.9.0",
-    "babel-runtime": "^6.9.2",
-    "copy-webpack-plugin": "^4.0.1",
-    "draftjs-to-html": "^0.8.1",
-    "dva-model-extend": "^0.1.1",
-    "eslint": "^4.1.1",
-    "eslint-config-airbnb": "^16.1.0",
-    "eslint-import-resolver-node": "^0.3.1",
-    "eslint-loader": "^2.0.0",
-    "eslint-plugin-import": "^2.6.1",
-    "eslint-plugin-jsx-a11y": "^6.0.2",
-    "eslint-plugin-react": "^7.1.0",
-    "html-webpack-plugin": "^3.2.0",
-    "redbox-react": "^1.2.10",
-    "roadhog": "1.3.1"
+    "babel-plugin-module-resolver": "^3.1.0",
+    "cross-env": "^5.1.6",
+    "eslint": "^4.19.1",
+    "eslint-config-umi": "^0.1.4",
+    "eslint-plugin-flowtype": "^2.47.1",
+    "eslint-plugin-import": "^2.12.0",
+    "eslint-plugin-jsx-a11y": "^6.0.3",
+    "eslint-plugin-react": "^7.8.2",
+    "js-beautify": "^1.7.5",
+    "less-vars-to-js": "^1.1.2",
+    "mockjs": "^1.0.1-beta3",
+    "svg-sprite-loader": "^3.7.3",
+    "umi": "^1.3.4",
+    "umi-plugin-dll": "^0.2.1",
+    "umi-plugin-dva": "^0.7.3",
+    "umi-plugin-routes": "^0.1.4"
  },
  "pre-commit": [
    "lint"
  ],
  "scripts": {
-    "dev": "cross-env BROWSER=none HOST=0.0.0.0 roadhog server",
-    "start": "roadhog buildDll && cross-env BROWSER=none HOST=0.0.0.0 roadhog server",
+    "analyze": "cross-env ANALYZE=1 BABELRC=1 umi build",
+    "start": "cross-env BABELRC=1 COMPILE_ON_DEMAND=none BROWSER=none HOST=0.0.0.0 umi dev",
    "lint": "eslint --fix --ext .js src",
-    "build": "roadhog build",
-    "build:dll": "roadhog buildDll",
-    "build:new": "node version && roadhog build"
+    "build": "cross-env BABELRC=1 umi build",
+    "test": "umi test"
  }
 }
@@ -2,7 +2,8 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { Table } from 'antd'
 import { request } from 'utils'
-import lodash from 'lodash'
+import cloneDeep from 'lodash.clonedeep'
+import isEqual from 'lodash.isequal'
 import './DataTable.less'

 class DataTable extends React.Component {
@@ -31,12 +32,12 @@ class DataTable extends React.Component {
    }
  }

-  componentWillReceiveProps (nextProps) {
-    const staticNextProps = lodash.cloneDeep(nextProps)
+  UNSAFE_componentWillReceiveProps (nextProps) {
+    const staticNextProps = cloneDeep(nextProps)
    delete staticNextProps.columns
    const { columns, ...otherProps } = this.props

-    if (!lodash.isEqual(staticNextProps, otherProps)) {
+    if (!isEqual(staticNextProps, otherProps)) {
      this.props = nextProps
      this.fetch()
    }
@@ -1,92 +1,92 @@
-@import "~themes/vars";
-
-.header {
-  :global {
-    .ant-menu-submenu-title {
-      height: 56px;
-    }
-
-    .ant-menu-horizontal {
-      line-height: 56px;
-
-      & > .ant-menu-submenu:hover {
-        color: #1890ff;
-        background-color: rgba(24, 144, 255, 0.15);
-      }
-    }
-
-    .ant-menu {
-      border-bottom: none;
-      height: 56px;
-    }
-
-    .ant-menu-horizontal > .ant-menu-submenu {
-      top: 0;
-      margin-top: 0;
-    }
-
-    .ant-menu-horizontal > .ant-menu-item,
-    .ant-menu-horizontal > .ant-menu-submenu {
-      border-bottom: none;
-    }
-
-    .ant-menu-horizontal > .ant-menu-item-active,
-    .ant-menu-horizontal > .ant-menu-item-open,
-    .ant-menu-horizontal > .ant-menu-item-selected,
-    .ant-menu-horizontal > .ant-menu-item:hover,
-    .ant-menu-horizontal > .ant-menu-submenu-active,
-    .ant-menu-horizontal > .ant-menu-submenu-open,
-    .ant-menu-horizontal > .ant-menu-submenu-selected,
-    .ant-menu-horizontal > .ant-menu-submenu:hover {
-      border-bottom: none;
-    }
-  }
-  box-shadow: @shadow-2;
-  position: relative;
-  display: flex;
-  justify-content: space-between;
-  height: 56px;
-  z-index: 9;
-  display: flex;
-  align-items: center;
-  background-color: #fff;
-
-  .rightWarpper {
-    display: flex;
-    padding-right: 16px;
-  }
-
-  .button {
-    width: 56px;
-    height: 56px;
-    line-height: 56px;
-    text-align: center;
-    font-size: 18px;
-    cursor: pointer;
-    transition: @transition-ease-in;
-
-    &:hover {
-      color: @primary-color;
-      background-color: fade(@primary-color, 15%);
-    }
-  }
-}
-
-.popovermenu {
-  width: 280px;
-  margin-left: 6px;
-
-  :global .ant-popover-inner-content {
-    padding: 0;
-
-    .ant-menu-inline .ant-menu-item,
-    .ant-menu-vertical .ant-menu-item {
-      border-right: 0;
-    }
-
-    .ant-menu-inline .ant-menu-item-selected,
-    .ant-menu-inline .ant-menu-selected {
-      border-right: 0;
-    }
-  }
-}
+@import "~themes/vars.less";
+
+.header {
+  :global {
+    .ant-menu-submenu-title {
+      height: 56px;
+    }
+
+    .ant-menu-horizontal {
+      line-height: 56px;
+
+      & > .ant-menu-submenu:hover {
+        color: #1890ff;
+        background-color: rgba(24, 144, 255, 0.15);
+      }
+    }
+
+    .ant-menu {
+      border-bottom: none;
+      height: 56px;
+    }
+
+    .ant-menu-horizontal > .ant-menu-submenu {
+      top: 0;
+      margin-top: 0;
+    }
+
+    .ant-menu-horizontal > .ant-menu-item,
+    .ant-menu-horizontal > .ant-menu-submenu {
+      border-bottom: none;
+    }
+
+    .ant-menu-horizontal > .ant-menu-item-active,
+    .ant-menu-horizontal > .ant-menu-item-open,
+    .ant-menu-horizontal > .ant-menu-item-selected,
+    .ant-menu-horizontal > .ant-menu-item:hover,
+    .ant-menu-horizontal > .ant-menu-submenu-active,
+    .ant-menu-horizontal > .ant-menu-submenu-open,
+    .ant-menu-horizontal > .ant-menu-submenu-selected,
+    .ant-menu-horizontal > .ant-menu-submenu:hover {
+      border-bottom: none;
+    }
+  }
+  box-shadow: @shadow-2;
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  height: 56px;
+  z-index: 9;
+  display: flex;
+  align-items: center;
+  background-color: #fff;
+
+  .rightWarpper {
+    display: flex;
+    padding-right: 16px;
+  }
+
+  .button {
+    width: 56px;
+    height: 56px;
+    line-height: 56px;
+    text-align: center;
+    font-size: 18px;
+    cursor: pointer;
+    transition: @transition-ease-in;
+
+    &:hover {
+      color: @primary-color;
+      background-color: fade(@primary-color, 15%);
+    }
+  }
+}
+
+.popovermenu {
+  width: 280px;
+  margin-left: 6px;
+
+  :global .ant-popover-inner-content {
+    padding: 0;
+
+    .ant-menu-inline .ant-menu-item,
+    .ant-menu-vertical .ant-menu-item {
+      border-right: 0;
+    }
+
+    .ant-menu-inline .ant-menu-item-selected,
+    .ant-menu-inline .ant-menu-selected {
+      border-right: 0;
+    }
+  }
+}
@@ -1,188 +1,188 @@
-@import "~themes/vars";
-
-:global {
-  .ant-layout-header {
-    padding: 0;
-  }
-
-  .ant-layout-sider {
-    transition: all 0.3s;
-
-    .ant-menu-root {
-      height: ~"calc(100vh - 144px)";
-      overflow-x: hidden;
-      border-right: none;
-
-      &::-webkit-scrollbar-thumb {
-        background-color: transparent;
-      }
-
-      &:hover {
-        &::-webkit-scrollbar-thumb {
-          background-color: rgba(0, 0, 0, 0.2);
-        }
-      }
-    }
-
-    .ant-menu {
-      .ant-menu-item,
-      .ant-menu-submenu-title {
-        overflow: hidden;
-        white-space: normal;
-      }
-    }
-  }
-
-  .ant-layout-content {
-    padding: 24px;
-  }
-
-  .ant-layout-footer {
-    text-align: center;
-    padding: 0 24px;
-    height: 40px;
-    font-size: 12px;
-    line-height: 40px;
-  }
-
-  .ant-back-top {
-    right: 50px;
-  }
-
-  .ant-switch.ant-switch-large {
-    line-height: 24px;
-    height: 26px;
-
-    &:after,
-    &:before {
-      width: 22px;
-      height: 22px;
-    }
-
-    &.ant-switch-checked:after,
-    &.ant-switch-checked:before {
-      margin-left: -23px;
-    }
-  }
-
-  .flex-vertical-center {
-    display: flex;
-    align-items: center;
-  }
-
-  .ant-form-item {
-    margin-bottom: 12px;
-  }
-}
-
-
-
-.logo {
-  height: 96px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-
-  img {
-    width: 40px;
-    margin-right: 8px;
-  }
-
-  span {
-    vertical-align: text-bottom;
-    font-size: 16px;
-    text-transform: uppercase;
-    display: inline-block;
-    font-weight: 700;
-    color: @primary-color;
-    white-space: nowrap;
-    :local {
-      animation: fadeLeftIn 500ms linear;
-      animation-fill-mode: both;
-    }
-  }
-}
-
-.switchtheme {
-  width: 100%;
-  position: absolute;
-  bottom: 0;
-  height: 48px;
-  background-color: #fff;
-  border-top: solid 1px #f8f8f8;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 0 16px;
-  overflow: hidden;
-  z-index: 9;
-  transition: all 0.3s;
-
-  span {
-    white-space: nowrap;
-    overflow: hidden;
-    font-size: 12px;
-  }
-
-  :global {
-    .anticon {
-      min-width: 14px;
-      margin-right: 4px;
-      font-size: 14px;
-    }
-  }
-}
-
-.bread {
-  margin-bottom: 24px;
-
-  :global {
-    .ant-breadcrumb {
-      display: flex;
-      align-items: center;
-    }
-  }
-}
-
-.dark {
-  .switchtheme {
-    background-color: #000d18;
-    border-color: #001629;
-  }
-}
-
-.light {
-  :global {
-    .ant-layout-sider {
-      background: #fff;
-    }
-  }
-}
-@media (max-width: 767px) {
-  .bread {
-    margin-bottom: 12px;
-  }
-
-  :global {
-    .ant-layout-content {
-      padding: 12px;
-    }
-
-    .ant-back-top {
-      right: 20px;
-      bottom: 20px;
-    }
-  }
-}
-
-@keyframes fadeLeftIn {
-  0% {
-    transform: translateX(5px);
-    opacity: 0;
-  }
-
-  100% {
-    transform: translateX(0);
-    opacity: 1;
-  }
-}
+@import "~themes/vars.less";
+
+:global {
+  .ant-layout-header {
+    padding: 0;
+  }
+
+  .ant-layout-sider {
+    transition: all 0.3s;
+
+    .ant-menu-root {
+      height: ~"calc(100vh - 144px)";
+      overflow-x: hidden;
+      border-right: none;
+
+      &::-webkit-scrollbar-thumb {
+        background-color: transparent;
+      }
+
+      &:hover {
+        &::-webkit-scrollbar-thumb {
+          background-color: rgba(0, 0, 0, 0.2);
+        }
+      }
+    }
+
+    .ant-menu {
+      .ant-menu-item,
+      .ant-menu-submenu-title {
+        overflow: hidden;
+        white-space: normal;
+      }
+    }
+  }
+
+  .ant-layout-content {
+    padding: 24px;
+  }
+
+  .ant-layout-footer {
+    text-align: center;
+    padding: 0 24px;
+    height: 40px;
+    font-size: 12px;
+    line-height: 40px;
+  }
+
+  .ant-back-top {
+    right: 50px;
+  }
+
+  .ant-switch.ant-switch-large {
+    line-height: 24px;
+    height: 26px;
+
+    &:after,
+    &:before {
+      width: 22px;
+      height: 22px;
+    }
+
+    &.ant-switch-checked:after,
+    &.ant-switch-checked:before {
+      margin-left: -23px;
+    }
+  }
+
+  .flex-vertical-center {
+    display: flex;
+    align-items: center;
+  }
+
+  .ant-form-item {
+    margin-bottom: 12px;
+  }
+}
+
+
+
+.logo {
+  height: 96px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  img {
+    width: 40px;
+    margin-right: 8px;
+  }
+
+  span {
+    vertical-align: text-bottom;
+    font-size: 16px;
+    text-transform: uppercase;
+    display: inline-block;
+    font-weight: 700;
+    color: @primary-color;
+    white-space: nowrap;
+    :local {
+      animation: fadeLeftIn 500ms linear;
+      animation-fill-mode: both;
+    }
+  }
+}
+
+.switchtheme {
+  width: 100%;
+  position: absolute;
+  bottom: 0;
+  height: 48px;
+  background-color: #fff;
+  border-top: solid 1px #f8f8f8;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 16px;
+  overflow: hidden;
+  z-index: 9;
+  transition: all 0.3s;
+
+  span {
+    white-space: nowrap;
+    overflow: hidden;
+    font-size: 12px;
+  }
+
+  :global {
+    .anticon {
+      min-width: 14px;
+      margin-right: 4px;
+      font-size: 14px;
+    }
+  }
+}
+
+.bread {
+  margin-bottom: 24px;
+
+  :global {
+    .ant-breadcrumb {
+      display: flex;
+      align-items: center;
+    }
+  }
+}
+
+.dark {
+  .switchtheme {
+    background-color: #000d18;
+    border-color: #001629;
+  }
+}
+
+.light {
+  :global {
+    .ant-layout-sider {
+      background: #fff;
+    }
+  }
+}
+@media (max-width: 767px) {
+  .bread {
+    margin-bottom: 12px;
+  }
+
+  :global {
+    .ant-layout-content {
+      padding: 12px;
+    }
+
+    .ant-back-top {
+      right: 20px;
+      bottom: 20px;
+    }
+  }
+}
+
+@keyframes fadeLeftIn {
+  0% {
+    transform: translateX(5px);
+    opacity: 0;
+  }
+
+  100% {
+    transform: translateX(0);
+    opacity: 1;
+  }
+}
@@ -5,6 +5,9 @@ import { Link } from 'react-router-dom'
 import { arrayToTree, queryArray } from 'utils'
 import pathToRegexp from 'path-to-regexp'

+const { SubMenu } = Menu
+let openKeysFlag = false
+
 const Menus = ({
  siderFold, darkTheme, navOpenKeys, changeOpenKeys, menu, location,
 }) => {
@@ -20,7 +23,7 @@ const Menus = ({
          levelMap[item.id] = item.mpid
        }
        return (
-          <Menu.SubMenu
+          <SubMenu
            key={item.id}
            title={<span>
              {item.icon && <Icon type={item.icon} />}
@@ -28,7 +31,7 @@ const Menus = ({
            </span>}
          >
            {getMenus(item.children, siderFoldN)}
-          </Menu.SubMenu>
+          </SubMenu>
        )
      }
      return (
@@ -62,6 +65,7 @@ const Menus = ({
  }

  const onOpenChange = (openKeys) => {
+    if (navOpenKeys.length) changeOpenKeys([]), openKeysFlag = true
    const latestOpenKey = openKeys.find(key => !navOpenKeys.includes(key))
    const latestCloseKey = navOpenKeys.find(key => !openKeys.includes(key))
    let nextOpenKeys = []
@@ -85,6 +89,7 @@ const Menus = ({
  let defaultSelectedKeys
  for (let item of menu) {
    if (item.route && pathToRegexp(item.route).exec(location.pathname)) {
+      if (!navOpenKeys.length && item.mpid && !openKeysFlag) changeOpenKeys([String(item.mpid)])
      currentMenu = item
      break
    }
@@ -1,16 +1,16 @@
-@import "~themes/vars";
-
-.contentInner{
-  background: #fff;
-  padding: 24px;
-  box-shadow: @shadow-1;
-  min-height: ~"calc(100vh - 198px)";
-  position: relative;
-}
-
-@media (max-width: 767px) {
-  .contentInner {
-    padding: 12px;
-    min-height: ~"calc(100vh - 160px)";
-  }
-}
+@import "~themes/vars.less";
+
+.contentInner{
+  background: #fff;
+  padding: 24px;
+  box-shadow: @shadow-1;
+  min-height: ~"calc(100vh - 198px)";
+  position: relative;
+}
+
+@media (max-width: 767px) {
+  .contentInner {
+    padding: 12px;
+    min-height: ~"calc(100vh - 160px)";
+  }
+}
@@ -0,0 +1 @@
+import '@babel/polyfill'
@@ -1,25 +0,0 @@
-import { message } from 'antd'
-import dva from 'dva'
-import createLoading from 'dva-loading'
-import createHistory from 'history/createBrowserHistory'
-import 'babel-polyfill'
-
-// 1. Initialize
-const app = dva({
-  ...createLoading({
-    effects: true,
-  }),
-  history: createHistory(),
-  onError (error) {
-    message.error(error.message)
-  },
-})
-
-// 2. Model
-app.model(require('./models/app'))
-
-// 3. Router
-app.router(require('./router'))
-
-// 4. Start
-app.start('#root')
@@ -10,7 +10,7 @@ import { BackTop, Layout } from 'antd'
 import { classnames, config } from 'utils'
 import { Helmet } from 'react-helmet'
 import { withRouter } from 'dva/router'
-import Error from './error'
+import Error from '../pages/404'
 import '../themes/index.less'
 import './app.less'

@@ -1,72 +1,72 @@
-@import "~themes/vars";
-
-:global {
-  #nprogress {
-    pointer-events: none;
-
-    .bar {
-      background: @primary-color;
-      position: fixed;
-      z-index: 1024;
-      top: 0;
-      left: 0;
-      right: 0;
-      width: 100%;
-      height: 2px;
-    }
-
-    .peg {
-      display: block;
-      position: absolute;
-      right: 0;
-      width: 100px;
-      height: 100%;
-      box-shadow: 0 0 10px @primary-color,0 0 5px @primary-color;
-      opacity: 1.0;
-      transform: rotate(3deg) translate(0px,-4px);
-    }
-
-    .spinner {
-      display: block;
-      position: fixed;
-      z-index: 1031;
-      top: 15px;
-      right: 15px;
-    }
-
-    .spinner-icon {
-      width: 18px;
-      height: 18px;
-      box-sizing: border-box;
-      border: solid 2px transparent;
-      border-top-color: @primary-color;
-      border-left-color: @primary-color;
-      border-radius: 50%;
-
-      :local {
-        animation: nprogress-spinner 400ms linear infinite;
-      }
-    }
-  }
-
-  .nprogress-custom-parent {
-    overflow: hidden;
-    position: relative;
-
-    #nprogress {
-      .bar,
-      .spinner {
-        position: absolute;
-      }
-    }
-  }
-}
-@keyframes nprogress-spinner {
-  0% {
-    transform: rotate(0deg);
-  }
-
-  100% {
-    transform: rotate(360deg);
-  }
-}
+@import "~themes/vars.less";
+
+:global {
+  #nprogress {
+    pointer-events: none;
+
+    .bar {
+      background: @primary-color;
+      position: fixed;
+      z-index: 1024;
+      top: 0;
+      left: 0;
+      right: 0;
+      width: 100%;
+      height: 2px;
+    }
+
+    .peg {
+      display: block;
+      position: absolute;
+      right: 0;
+      width: 100px;
+      height: 100%;
+      box-shadow: 0 0 10px @primary-color,0 0 5px @primary-color;
+      opacity: 1.0;
+      transform: rotate(3deg) translate(0px,-4px);
+    }
+
+    .spinner {
+      display: block;
+      position: fixed;
+      z-index: 1031;
+      top: 15px;
+      right: 15px;
+    }
+
+    .spinner-icon {
+      width: 18px;
+      height: 18px;
+      box-sizing: border-box;
+      border: solid 2px transparent;
+      border-top-color: @primary-color;
+      border-left-color: @primary-color;
+      border-radius: 50%;
+
+      :local {
+        animation: nprogress-spinner 400ms linear infinite;
+      }
+    }
+  }
+
+  .nprogress-custom-parent {
+    overflow: hidden;
+    position: relative;
+
+    #nprogress {
+      .bar,
+      .spinner {
+        position: absolute;
+      }
+    }
+  }
+}
+@keyframes nprogress-spinner {
+  0% {
+    transform: rotate(0deg);
+  }
+
+  100% {
+    transform: rotate(360deg);
+  }
+}
@@ -0,0 +1,14 @@
+import { LocaleProvider } from 'antd'
+import enUS from 'antd/lib/locale-provider/en_US'
+import withRouter from 'umi/withRouter'
+import App from './app'
+
+export default withRouter((props) => {
+  return (
+    <LocaleProvider locale={enUS}>
+      <App>
+        { props.children }
+      </App>
+    </LocaleProvider>
+  )
+})
@@ -44,7 +44,7 @@ export default {
          type: 'updateState',
          payload: {
            locationPathname: location.pathname,
-            locationQuery: queryString.parse(location.search),
+            locationQuery: location.query,
          },
        })
      })
@@ -113,6 +113,16 @@ export default {
    }, { call, put }) {
      const data = yield call(logout, parse(payload))
      if (data.success) {
+        yield put({ type: 'updateState', payload: {
+          user: {},
+          permissions: { visit: [] },
+          menu: [{
+              id: 1,
+              icon: 'laptop',
+              name: 'Dashboard',
+              router: '/dashboard',
+            }],
+        }})
        yield put({ type: 'query' })
      } else {
        throw (data)
@@ -1,7 +1,7 @@
 import React from 'react'
 import { Icon } from 'antd'
 import { Page } from 'components'
-import styles from './index.less'
+import styles from './404.less'

 const Error = () => (<Page inner>
  <div className={styles.error}>
@@ -2,7 +2,7 @@ import React from 'react'
 import { Radio } from 'antd'
 import { Page } from 'components'
 import EchartsComponent from './EchartsComponent'
-import styles from './index.less'
+import styles from './page.less'

 const RadioGroup = Radio.Group

@@ -1,7 +1,7 @@
 (function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
+  if (typeof define === 'function' && define.amd) { // eslint-disable-line
    // AMD. Register as an anonymous module.
-    define(['exports', 'echarts'], factory)
+    define(['exports', 'echarts'], factory) // eslint-disable-line
  } else if (typeof exports === 'object' && typeof exports.nodeName !== 'string') {
    // CommonJS
    factory(exports, require('echarts'))
@@ -1,7 +1,7 @@
 (function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
+  if (typeof define === 'function' && define.amd) { // eslint-disable-line
    // AMD. Register as an anonymous module.
-    define(['exports', 'echarts'], factory)
+    define(['exports', 'echarts'], factory) // eslint-disable-line
  } else if (typeof exports === 'object' && typeof exports.nodeName !== 'string') {
    // CommonJS
    factory(exports, require('echarts'))
@@ -2,7 +2,7 @@ import React from 'react'
 import { Radio } from 'antd'
 import { Page } from 'components'
 import ReChartsComponent from './ReChartsComponent'
-import styles from './index.less'
+import styles from './page.less'

 const RadioGroup = Radio.Group

@@ -1,10 +1,11 @@
 import React from 'react'
 import ReactHighcharts from 'react-highcharts'
-import highchartsMore from 'highcharts-more'
-import highchartsExporting from 'highcharts-exporting'
+import HighchartsExporting from 'highcharts-exporting'
+import HighchartsMore from 'highcharts-more'

-highchartsMore(ReactHighcharts.Highcharts)
-highchartsExporting(ReactHighcharts.Highcharts)
+
+HighchartsMore(ReactHighcharts.Highcharts)
+HighchartsExporting(ReactHighcharts.Highcharts)

 const config = {
  chart: {
@@ -2,7 +2,7 @@ import React from 'react'
 import { Radio } from 'antd'
 import { Page } from 'components'
 import HighChartsComponent from './HighChartsComponent'
-import styles from './index.less'
+import styles from './page.less'

 const RadioGroup = Radio.Group

--- a/Show More
+++ b/Show More