bump antd-admin@5.1.3

inline conditional rendering in some components

.travis.yml

@@ -1,10 +1,10 @@
 language: node_js
 node_js:
-- node
+  - node
 script:
-- npm run build
+  - npm run build
 before_install:
-- |
+  - |
     if [ "$TRAVIS_BRANCH" = "develop" ]; then
       for prefixed_envvar in ${!DEV_*}; do
         eval export ${prefixed_envvar#DEV_}="${!prefixed_envvar}"
@@ -13,11 +13,15 @@ before_install:
       for prefixed_envvar in ${!PROD_*}; do
         eval export ${prefixed_envvar#PROD_}="${!prefixed_envvar}"
       done
+    else
+     for prefixed_envvar in ${!TEST_*}; do
+        eval export ${prefixed_envvar#TEST_}="${!prefixed_envvar}"
+     done
     fi
-- openssl aes-256-cbc -K $encrypted_18b2305b78c9_key -iv $encrypted_18b2305b78c9_iv -in config/id_rsa.enc -out ~/.ssh/id_rsa -d
-- chmod 600 ~/.ssh/id_rsa
-- echo -e "Host $HOST\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
-- yarn global add now
+  - openssl aes-256-cbc -K $encrypted_18b2305b78c9_key -iv $encrypted_18b2305b78c9_iv -in config/id_rsa.enc -out ~/.ssh/id_rsa -d
+  - chmod 600 ~/.ssh/id_rsa
+  - echo -e "Host $HOST\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
+  - yarn global add now
 after_script:
-- scp -o stricthostkeychecking=no -r ./dist root@$HOST:$BUILD_DIR
-- cd ./docs && now -A $DOC_NOW_CONFIG -t $NOW_TOKEN && now alias -A $DOC_NOW_CONFIG -t $NOW_TOKEN
+  - scp -o stricthostkeychecking=no -r ./dist root@$HOST:$BUILD_DIR
+  - cd ./docs && now -A $DOC_NOW_CONFIG -t $NOW_TOKEN && now alias -A $DOC_NOW_CONFIG -t $NOW_TOKEN

.umirc.js

@@ -5,6 +5,7 @@ import { i18n } from './src/utils/config'
 export default {
   ignoreMomentLocale: true,
   targets: { ie: 9 },
+  treeShaking: true,
   plugins: [
     [
       // https://umijs.org/plugin/umi-plugin-react.html
@@ -57,7 +58,11 @@ export default {
         dll: {
           include: ['dva', 'dva/router', 'dva/saga', 'dva/fetch', 'antd/es'],
         },
-        hardSource: /* isMac */ process.platform === 'darwin',
+        pwa: {
+          manifestOptions: {
+            srcPath: 'manifest.json',
+          },
+        },
       },
     ],
   ],

README-zh_CN.md

@@ -71,11 +71,11 @@ npm run start
 
 ## 支持环境
 
-现代浏览器及 IE9。
+现代浏览器。
 
 | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/opera/opera_48x48.png" alt="Opera" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Opera |
 | --------- | --------- | --------- | --------- | --------- | 
-| IE9, IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions| last 2 versions
+|IE11, Edge| last 2 versions| last 2 versions| last 2 versions| last 2 versions
 
 ## 参与贡献  
 

README.md

@@ -9,7 +9,7 @@
 
 <div align="center">
 
-A excellent front-end solution for enterprise applications.
+An excellent front-end solution for enterprise applications.
 
 [![antd](https://img.shields.io/badge/antd-^3.10.0-blue.svg?style=flat-square)](https://github.com/ant-design/ant-design)
 [![umi](https://img.shields.io/badge/umi-^2.2.1-orange.svg?style=flat-square)](https://github.com/umijs/umi)
@@ -71,11 +71,11 @@ npm run start
 
 ## Browsers support
 
-Modern browsers and IE9.
+Modern browsers.
 
 | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/opera/opera_48x48.png" alt="Opera" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Opera |
 | --------- | --------- | --------- | --------- | --------- | 
-| IE9, IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions| last 2 versions
+|IE11, Edge| last 2 versions| last 2 versions| last 2 versions| last 2 versions
 
 ## Contributing
 

docs/API-configuration.md

@@ -0,0 +1,86 @@
+# API configuration
+
+## Why
+
+In the use of `redux` or `dva` projects, we often write functions like the following `service` layer to make the code structure clearer, but it is easy to see that we will write a lot of similar code in `antd -admin@5.0`, using the more concise configuration method to achieve the same function.
+
+```javascript
+Export async function login(data) {
+  Return request({
+    Url: '/api/v1/user/login',
+    Method: 'post',
+    Data,
+  })
+}
+```
+
+## Configuration and use
+
+In the `src/services/api.js` file, you will see the following configuration object, the object's key is used to call the function name, the object's value is the requested `url`, the default request method is `GET`, The format of the value of the other request mode object is `'method url'`.
+
+```javascript
+Export default {
+  ...
+  queryUser: '/user/:id',
+  queryUserList: '/users',
+  updateUser: 'Patch /user/:id',
+  createUser: 'POST /user/:id',
+  removeUser: 'DELETE /user/:id',
+  removeUserList: 'POST /users/delete',
+  ...
+}
+```
+
+Used in other files
+
+```javascript
+Import { queryUser } from 'api'
+
+// in the general file
+...
+queryUser(option).then(data => console.log(data))
+...
+
+/ / Model file
+...
+Yield call(queryUser, option)
+...
+```
+
+## Method to realize
+
+Refer to the `src/services/index.js` file to traverse the api configuration. Each property returns the corresponding encapsulated request function.
+
+```javascript
+Import request from 'utils/request'
+Import { apiPrefix } from 'utils/config'
+
+Import api from './api'
+
+Const gen = params => {
+  Let url = apiPrefix + params
+  Let method = 'GET'
+
+  Const paramsArray = params.split(' ')
+  If (paramsArray.length === 2) {
+    Method = paramsArray[0]
+    Url = apiPrefix + paramsArray[1]
+  }
+
+  Return function(data) {
+    Return request({
+      Url,
+      Data,
+      Method,
+    })
+  }
+}
+
+Const APIFunction = {}
+For (const key in api) {
+  APIFunction[key] = gen(api[key])
+}
+
+Module.exports = APIFunction
+
+```

docs/README.md

@@ -8,7 +8,7 @@
 
 <div align="center">
 
-A excellent front-end solution for enterprise applications.
+An excellent front-end solution for enterprise applications.
 
 [![antd](https://img.shields.io/badge/antd-^3.10.0-blue.svg?style=flat-square)](https://github.com/ant-design/ant-design)
 [![umi](https://img.shields.io/badge/umi-^2.2.1-orange.svg?style=flat-square)](https://github.com/umijs/umi)
@@ -68,11 +68,11 @@ npm run start
 
 ## Browsers support
 
-Modern browsers and IE9.
+Modern browsers.
 
 | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/opera/opera_48x48.png" alt="Opera" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Opera |
 | --------- | --------- | --------- | --------- | --------- | 
-| IE9, IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions| last 2 versions
+|IE11, Edge| last 2 versions| last 2 versions| last 2 versions| last 2 versions
 
 ## Contributing
 

docs/_sidebar.md

@@ -2,6 +2,10 @@
   - [Quick Start](getting-started.md)
 - Customization
   - [Configuration](configuration.md)
+  - [API Configuration](API-configuration.md)
+  - [I18n](i18n.md)
+  - [Layout](layout.md)
+  - [Request](request.md)
 - Guide
   - [Deploy](deploy.md)
 - [Change Log](change-log.md)

docs/configuration.md

@@ -12,7 +12,7 @@ You can do some custom configuration in `/src/utils/config.js`:
 
 - Type： `String`
 
-  Configure the copyright notice to apply to the login page, at the bottom of the `Primay` layout.
+  Configure the copyright notice to apply to the login page, at the bottom of the `Primary` layout.
 
 ## logoPath
 
@@ -24,7 +24,7 @@ You can do some custom configuration in `/src/utils/config.js`:
 
 - Type： `String`
 
-  Configure the prefix of the interface in the project. The interface related documents can be viewed [API configuration]()
+  Configure the prefix of the interface in the project. The interface related documents can be viewed [API configuration](API-configuration.md)
 
 ## fixedHeader
 
@@ -39,25 +39,25 @@ You can do some custom configuration in `/src/utils/config.js`:
   Configuration? Which routes use which layout, unspecified route uses the default layout `Public`, the project currently has `Primary` and `Public` layouts,
      The default configuration is as follows：
   
-    ```js
+    ```javascript
         layouts: [
             {
                 name: 'primary',
                 include: [/.*/],
-                exlude: [/(\/(en|zh))*\/login/],
+                exclude: [/(\/(en|zh))*\/login/],
             },
         ],
     ```
 
     The object properties for each layout are as follows:
 
-    - `name` - The name of the layout;
+    - `name` - The name of the layout;
   
     - `include` - Specifies a list of routing rules that use this layout, which can be a regular expression or a string;
   
-    - `exlude` - Specifies a list of routing rules that do not use this layout, which can be a regular expression or a string.
+    - `exclude` - Specifies a list of routing rules that do not use this layout, which can be a regular expression or a string.
   
- > Note: `exlude` takes precedence over `include`, and the layout behind it has a higher priority than the previous layout. The development process may need to be combined with the layout in the `src/layouts` directory. For details, see [Using Layout]().
+ > Note: `exclude` takes precedence over `include`, and the layout previous it has a higher priority than the behind layout. The development process may need to be combined with the layout in the `src/layouts` directory. For details, see [Using Layout](./layout.md).
 
 ## i18n
 
@@ -65,7 +65,7 @@ You can do some custom configuration in `/src/utils/config.js`:
 
   Configure internationalization, the default configuration is as follows:
 
-  ```js
+  ```javascript
   i18n: {
       languages: [
         {
@@ -91,9 +91,9 @@ You can do some custom configuration in `/src/utils/config.js`:
 
     - `key` - The `key` of the language is applied to the page url to distinguish the language, and also corresponds to the language package folder name in the `src/locales` directory;
 
-    - `title` - The name of the language, at the bottom of the login page, at the top of the `Primay` layout, the language switch is displayed;
+    - `title` - The name of the language, at the bottom of the login page, at the top of the `Primary` layout, the language switch is displayed;
 
-    - `flag` - The path of the flag icon of the language, the language switching display at the top of the `Primay` layout.
+    - `flag` - The path of the flag icon of the language, the language switching display at the top of the `Primary` layout.
 
  ### i18n.defaultLanguage
    

docs/deploy.md

@@ -2,6 +2,8 @@
 
 After the development is completed and verified in the development environment, it needs to be deployed to our users.
 
+![i18n](./_media/term_build.svg)
+
 ## Build
 
 First execute the following command,

docs/i18n.md

@@ -0,0 +1,75 @@
+# globalization
+
+## Add language
+
+Take Japanese as an example.
+
+![i18n](../_media/term_i18n.svg)
+
+1. Add a language pack local file, `ja` is the Japanese language code, and a list of languages ​​that support translation [有道智云](http://ai.youdao.com/docs/doc-trans-api.s#p05), the `src/locales/ja/messages.json` file will be generated after running the following command.
+
+   ```bash 
+   npm run add-locale ja
+   ```
+
+2. Extract the fields in the code that need to be translated, ie `<Trans>?message</Trans>`, `` i18n.t`message `` in the `message` field, run the following command after `src/locales/ja /messages.json` will appear after the extracted field configuration.
+
+   ```bash 
+   npm run extract
+   ```
+
+   You will see the following information:
+
+   ```bash
+   Catalog statistics:
+   ┌─────────────┬─────────────┬─────────┐
+   │ Language    │ Total count │ Missing │
+   ├─────────────┼─────────────┼─────────┤
+   │ en (source) │     52      │    -    │
+   │ ja          │     52      │   52    │
+   │ zh          │     52      │    0    │
+   └─────────────┴─────────────┴─────────┘
+   ```
+
+3. At the same time, we have added the relevant configuration in `src/utils/config.js`.
+
+   ```javascript
+   {
+       ...
+       i18n: {
+           languages: [
+               ...
+               {
+                   key:'ja',
+                   title: '日本語',
+                   flag: '/japanese.svg',
+               },
+           ],
+       },
+   }
+   ```
+
+   > Routing related effects, after the configuration `npm run start` takes effect after restart.
+
+4. Use the built-in commands for automatic translation. You will see the translated configuration in `src/locales/ja/messages.json`.
+
+   ```bash
+   npm run trans:only
+   ```
+
+   You will see the following information:
+
+   ```bash
+   start: en -> ja
+   ...
+   youdao: en -> ja: Unpublished -> 未発表
+   youdao: en -> ja: Update -> 更新
+   youdao: en -> ja: Update User -> ユーザーの更新
+   youdao: en -> ja: Username -> 名
+   ...
+   All translations have been completed.
+   ```
+
+   > `npm run trans` will execute `npm run extract` and `npm run trans:only` in order.
+
+5. Finally, you can adjust the inaccurate fields in `src/locales/ja/messages.json`. Start the development mode `npm run start`, open [http://localhost:7000/ja/login](http://localhost:7000/ja/login) and you will see the Japanese version of the app.

docs/layout.md

@@ -0,0 +1,60 @@
+# Layout
+
+## Add a new layout
+
+Take a new layout named `secondary` as an example to make the route starting with `seconday` use this layout.
+
+1. Add related configuration in `src/utils/config.js`. For details, please refer to [layouts](/configuration?id=layouts).
+
+```javascript
+   layouts: [
+           {
+               name: 'primary',
+               include: [/.*/],
+               exclude: [/(\/(en|zh))*\/login/, /(\/(en|zh))*\/seconday\/(.*)/],
+           },
+           {
+               name: 'secondary',
+               include: [/(\/(en|zh))*\/seconday\/(.*)/],
+           },
+   ],
+```
+
+2. Add the `secondary` layout component to the `src/layouts/BaseLayout.js` file.
+
+```javascript
+   import SecondaryLayout from './SecondaryLayout'
+
+   const LayoutMap = {
+     Primary: PrimaryLayout,
+     Public: PublicLayout,
+     Secondary: SecondaryLayout,
+   }
+```
+
+3. Add the `SecondaryLayout.js` file to the `src/layouts/` directory.
+
+```javascript
+   import React from 'react'
+
+   export default ({ children }) => {
+     Return (
+       <div>
+         <h1>Seconday</h1>
+         {children}
+       </div>
+     )
+   }
+```
+
+4. Add a `seconday/index.js` file to the `src/pages/` directory.
+
+```javascript
+   import React from 'react'
+
+   export default ({ children }) => {
+     Return <div>Seconday page Content</div>
+   }
+```
+
+5. Finally, start the development mode `npm run start`, open [http://localhost:7000/seconday/](http://localhost:7000/seconday/) and you will see the page for the `seconday` layout.

docs/request.md

@@ -0,0 +1,22 @@
+# HTTP request
+
+this project use axios for http service, file located in src/utils/request.js
+
+## Custom Header
+
+As for privilege access or modify cookie, you could add header param by yourself
+
+```
+axios.defaults.headers.common['Authorization'] = 'token'
+```
+
+Or
+
+```
+axios.interceptors.request.use(function (config) {
+  config.headers.token = window.localStorage.getItem('token');
+  return config;
+}, function (error) {
+  return Promise.reject(error);
+});
+```

docs/zh-cn/API-configuration.md

@@ -0,0 +1,86 @@
+# 接口配置
+
+## 为什么
+
+在使用了`redux`或者`dva`项目中，我们经常会写类似下面的`service`层的函数，使代码结构更清晰，但是很容易看出，我们会写很多相似的代码，在`antd-admin@5.0`中，使用了更加简洁的配置方式实现了相同的功能。
+
+```javascript
+export async function login(data) {
+  return request({
+    url: '/api/v1/user/login',
+    method: 'post',
+    data,
+  })
+}
+```
+
+## 配置和使用
+
+在`src/services/api.js`文件中，你会看到如下配置对象，对象的键用于调用时的函数名称，对象的值为请求的`url`，默认请求方式为`GET`，如果是其他请求方式对象的值的格式则为`'method url'`。
+
+```javascript
+export default {
+  ...
+  queryUser: '/user/:id',
+  queryUserList: '/users',
+  updateUser: 'Patch /user/:id',
+  createUser: 'POST /user/:id',
+  removeUser: 'DELETE /user/:id',
+  removeUserList: 'POST /users/delete',
+  ...
+}
+```
+
+在其他文件中使用
+
+```javascript
+import { queryUser } from 'api'
+
+// 一般文件中
+...
+queryUser(option).then(data => console.log(data))
+...
+
+// model文件中
+...
+yield call(queryUser, option)
+...
+```
+
+## 实现方式
+
+参考`src/services/index.js`文件，对api配置进行遍历，每个属性都返回对应的封装后的request函数。
+
+```javascript
+import request from 'utils/request'
+import { apiPrefix } from 'utils/config'
+
+import api from './api'
+
+const gen = params => {
+  let url = apiPrefix + params
+  let method = 'GET'
+
+  const paramsArray = params.split(' ')
+  if (paramsArray.length === 2) {
+    method = paramsArray[0]
+    url = apiPrefix + paramsArray[1]
+  }
+
+  return function(data) {
+    return request({
+      url,
+      data,
+      method,
+    })
+  }
+}
+
+const APIFunction = {}
+for (const key in api) {
+  APIFunction[key] = gen(api[key])
+}
+
+module.exports = APIFunction
+
+```

docs/zh-cn/README.md

@@ -68,11 +68,11 @@ npm run start
 
 ## 支持环境
 
-现代浏览器及 IE9。
+现代浏览器。
 
 | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/opera/opera_48x48.png" alt="Opera" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Opera |
 | --------- | --------- | --------- | --------- | --------- | 
-| IE9, IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions| last 2 versions
+|IE11, Edge| last 2 versions| last 2 versions| last 2 versions| last 2 versions
 
 ## 参与贡献  
 

docs/zh-cn/_sidebar.md

@@ -2,6 +2,10 @@
   - [快速上手](zh-cn/getting-started.md)
 - 定制化
   - [配置项](zh-cn/configuration.md)
+  - [接口配置](zh-cn/API-configuration.md)
+  - [国际化](zh-cn/i18n.md)
+  - [布局](zh-cn/layout.md)
+  - [http 请求](zh-cn/request.md)
 - 指南
   - [部署](zh-cn/deploy.md)
 - [更新日志](zh-cn/change-log.md)

docs/zh-cn/configuration.md

@@ -24,7 +24,7 @@
 
 - 类型： `String`
 
-  配置项目中接口的前缀，接口相关文档可查看 [接口配置化]()
+  配置项目中接口的前缀，接口相关文档可查看 [接口配置](API-configuration.md)
 
 ## fixedHeader
 
@@ -39,12 +39,12 @@
     配置哪些路由使用哪种布局，未指定路由使用默认布局 `Public`，项目中目前有 `Primary` 和 `Public` 两种布局，
     默认配置如下：
   
-    ```js
+    ```javascript
         layouts: [
             {
                 name: 'primary',
                 include: [/.*/],
-                exlude: [/(\/(en|zh))*\/login/],
+                exclude: [/(\/(en|zh))*\/login/],
             },
         ],
     ```
@@ -55,9 +55,9 @@
   
     - `include` - 指定使用该布局的路由规则列表，规则可为正则表达式或者字符串；
   
-    - `exlude` - 指定不使用该布局的路由规则列表，规则可为正则表达式或者字符串。
+    - `exclude` - 指定不使用该布局的路由规则列表，规则可为正则表达式或者字符串。
   
- > 注意：`exlude` 优先级高于 `include`，后面的布局优先级高于前面的布局。开发过程中可能需要结合`src/layouts`目录下的布局使用，具体方法可查看 [使用布局]()。
+ > 注意：`exclude` 优先级高于 `include`，前面的布局优先级高于后面的布局。开发过程中可能需要结合`src/layouts`目录下的布局使用，具体方法可查看 [使用布局](./layout.md)。
 
 ## i18n
 
@@ -65,7 +65,7 @@
 
   配置国际化，默认配置如下：
 
-  ```js
+  ```javascript
   i18n: {
       languages: [
         {

docs/zh-cn/deploy.md

@@ -2,6 +2,8 @@
 
 完成开发并且在开发环境验证之后，就需要部署给我们的用户了。
 
+![i18n](../_media/term_build.svg)
+
 ## 构建
 
 先执行下面的命令，
@@ -34,7 +36,7 @@ File sizes after gzip:
 
 `build` 命令会打包所有的资源，包含 JavaScript, CSS, web fonts, images, html 等。你可以在 `dist/` 目录下找到这些文件。
 
-> 如果  有使用 HashHistory 、 部署 html 到非根目录、静态化等需求，请查看[Umi 部署](https://umijs.org/zh/guide/deploy.html)。
+> 如果有使用 HashHistory 、 部署 html 到非根目录、静态化等需求，请查看[Umi 部署](https://umijs.org/zh/guide/deploy.html)。
 
 ## 本地验证
 

docs/zh-cn/i18n.md

@@ -0,0 +1,75 @@
+# 国际化
+
+## 新增应用语言
+
+以新增日语为例。
+
+![i18n](../_media/term_i18n.svg)
+
+1. 添加语言包本地文件，`ja` 为日语的语言代码，支持翻译的语言列表参考 [有道智云](http://ai.youdao.com/docs/doc-trans-api.s#p05)，运行下面命令后会生成 `src/locales/ja/messages.json` 文件。
+
+   ```bash
+   npm run add-locale ja
+   ```
+
+2. 提取代码中需要翻译的字段，即 `<Trans>message</Trans>`、`` i18n.t`message `` 中 `message` 字段，运行下面命令后 `src/locales/ja/messages.json` 将会出现提取后的字段配置。
+
+   ```bash
+   npm run extract
+   ```
+
+   你将看到如下信息：
+
+   ```bash
+    Catalog statistics:
+    ┌─────────────┬─────────────┬─────────┐
+    │ Language    │ Total count │ Missing │
+    ├─────────────┼─────────────┼─────────┤
+    │ en (source) │     52      │    -    │
+    │ ja          │     52      │   52    │
+    │ zh          │     52      │    0    │
+    └─────────────┴─────────────┴─────────┘
+   ```
+
+3. 与此同时，我们在 `src/utils/config.js` 新增相关配置。
+
+   ```javascript
+   {
+       ...
+       i18n: {
+           languages: [
+               ...
+               {
+                   key:'ja',
+                   title: '日本語',
+                   flag: '/japanese.svg',
+               },
+           ],
+       },
+   }
+   ```
+
+   >  路由相关效果，配置后 `npm run start` 重启后生效。
+
+4. 使用内置的命令进行自动翻译，在 `src/locales/ja/messages.json` 中将会看到翻译后的配置。
+
+   ```bash
+   npm run trans:only
+   ```
+
+   你将看到如下信息：
+
+   ```bash
+   start: en -> ja
+   ...
+   youdao: en -> ja: Unpublished -> 未発表
+   youdao: en -> ja: Update -> 更新
+   youdao: en -> ja: Update User -> ユーザーの更新
+   youdao: en -> ja: Username -> 名
+   ...
+   All translations have been completed.
+   ```
+
+   > `npm run trans` 将会依次执行 `npm run extract` 和 `npm run trans:only`
+
+5. 最后，可以在 `src/locales/ja/messages.json` 中对翻译不准确的的字段进行调整。启动开发模式 `npm run start`，打开 [http://localhost:7000/ja/login](http://localhost:7000/ja/login)，你将看到日语版本的应用。

docs/zh-cn/layout.md

@@ -0,0 +1,60 @@
+# 布局
+
+## 新增布局
+
+以新增名为 `secondary` 的布局为例，使以 `seconday` 开头的路由都使用该布局。
+
+1. 在 `src/utils/config.js` 新增相关配置，参数详细请查看 [layouts](/zh-cn/configuration?id=layouts)。
+
+   ```javascript
+   layouts: [
+           {
+               name: 'primary',
+               include: [/.*/],
+               exclude: [/(\/(en|zh))*\/login/, /(\/(en|zh))*\/seconday\/(.*)/],
+           },
+           {
+               name: 'secondary',
+               include: [/(\/(en|zh))*\/seconday\/(.*)/],
+           },
+   ],
+   ```
+
+2. 在`src/layouts/BaseLayout.js` 文件中新增 `secondary` 布局组件。
+
+   ```javascript
+   import SecondaryLayout from './SecondaryLayout'
+
+   const LayoutMap = {
+     primary: PrimaryLayout,
+     public: PublicLayout,
+     secondary: SecondaryLayout,
+   }
+   ```
+
+3. 在`src/layouts/` 目录中新增 `SecondaryLayout.js` 文件。
+
+   ```javascript
+   import React from 'react'
+
+   export default ({ children }) => {
+     return (
+       <div>
+         <h1>Seconday</h1>
+         {children}
+       </div>
+     )
+   }
+   ```
+
+4. 在`src/pages/` 目录中新增 `seconday/index.js` 文件。
+
+   ```javascript
+   import React from 'react'
+
+   export default ({ children }) => {
+     return <div>Seconday page Content</div>
+   }
+   ```
+
+5. 最后，启动开发模式 `npm run start`，打开 [http://localhost:7000/seconday/](http://localhost:7000/seconday/)，你将看到 `seconday` 布局的页面。

docs/zh-cn/request.md

@@ -0,0 +1,24 @@
+# HTTP请求
+
+本项目使用了axios提供http请求服务，文件在src/utils/request.js
+
+## 自定义Header
+
+为了提供鉴权、修改cookie等服务，可以手动修改Header
+
+```
+axios.defaults.headers.common['Authorization'] = 'token'
+```
+
+或者
+
+```
+// 添加请求拦截器
+axios.interceptors.request.use(function (config) {
+  // 在发送请求之前做些什么
+  config.headers.token = window.localStorage.getItem('token');
+  return config;
+}, function (error) {
+  return Promise.reject(error);
+});
+```

manifest.json

@@ -0,0 +1,36 @@
+{
+  "name": "Antd-Admin",
+  "start_url": ".",
+  "display": "standalone",
+  "background_color": "#fff",
+  "description": "A front-end solution for enterprise applications built upon Ant Design and UmiJS",
+  "icons": [{
+      "src": "logo/logo@96.png",
+      "sizes": "72x72"
+    },
+    {
+      "src": "logo/logo@128.png",
+      "sizes": "128x128"
+    },
+    {
+      "src": "logo/logo@144.png",
+      "sizes": "144x144"
+    },
+    {
+      "src": "logo/logo@152.png",
+      "sizes": "152x152"
+    },
+    {
+      "src": "logo/logo@192.png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "logo/logo@384.png",
+      "sizes": "384x384"
+    },
+    {
+      "src": "logo/logo@512.png",
+      "sizes": "512x512"
+    }
+  ]
+}

mock/_utils.js

@@ -17,25 +17,22 @@ export function randomNumber(min, max) {
 }
 
 export function randomAvatar() {
-  // https://uifaces.co
   const avatarList = [
-    'https://randomuser.me/api/portraits/men/32.jpg',
-    'https://images.pexels.com/photos/415829/pexels-photo-415829.jpeg?h=350&auto=compress&cs=tinysrgb',
-    'https://d3iw72m71ie81c.cloudfront.net/female-17.jpg',
-    'https://randomuser.me/api/portraits/men/35.jpg',
-    'https://pbs.twimg.com/profile_images/835224725815246848/jdMBCxHS.jpg',
-    'https://pbs.twimg.com/profile_images/584098247641300992/N25WgvW_.png',
-    'https://d3iw72m71ie81c.cloudfront.net/male-5.jpg',
-    'https://images.pexels.com/photos/413723/pexels-photo-413723.jpeg?h=350&auto=compress&cs=tinysrgb',
-    'https://randomuser.me/api/portraits/women/44.jpg',
-    'https://randomuser.me/api/portraits/women/68.jpg',
-    'https://randomuser.me/api/portraits/women/65.jpg',
-    'https://randomuser.me/api/portraits/men/43.jpg',
-    'https://tinyfac.es/data/avatars/475605E3-69C5-4D2B-8727-61B7BB8C4699-500w.jpeg',
-    'https://pbs.twimg.com/profile_images/943227488292962306/teiNNAiy.jpg',
-    'https://randomuser.me/api/portraits/men/46.jpg'
+    'photo-1549492864-2ec7d66ffb04.jpeg',
+    'photo-1480535339474-e083439a320d.jpeg',
+    'photo-1523419409543-a5e549c1faa8.jpeg',
+    'photo-1519648023493-d82b5f8d7b8a.jpeg',
+    'photo-1523307730650-594bc63f9d67.jpeg',
+    'photo-1522962506050-a2f0267e4895.jpeg',
+    'photo-1489779162738-f81aed9b0a25.jpeg',
+    'photo-1534308143481-c55f00be8bd7.jpeg',
+    'photo-1519336555923-59661f41bb45.jpeg',
+    'photo-1551438632-e8c7d9a5d1b7.jpeg',
+    'photo-1525879000488-bff3b1c387cf.jpeg',
+    'photo-1487412720507-e7ab37603c6f.jpeg',
+    'photo-1510227272981-87123e259b17.jpeg'
   ]
-  return avatarList[randomNumber(0, avatarList.length - 1)]
+  return `//image.zuiidea.com/${avatarList[randomNumber(0, avatarList.length - 1)]}?imageView2/1/w/200/h/200/format/webp/q/75|imageslim`
 }
 
 export const Constant = {

mock/route.js

@@ -6,14 +6,24 @@ const database = [
     id: '1',
     icon: 'dashboard',
     name: 'Dashboard',
-    zhName: '仪表盘',
+    zh: {
+      name: '仪表盘'
+    },
+    'pt-br': {
+      name: 'Dashboard'
+    },
     route: '/dashboard',
   },
   {
     id: '2',
     breadcrumbParentId: '1',
     name: 'Users',
-    zhName: '用户管理',
+    zh: {
+      name: '用户管理'
+    },
+    'pt-br': {
+      name: 'Usuário'
+    },
     icon: 'user',
     route: '/user',
   },
@@ -21,7 +31,12 @@ const database = [
     id: '7',
     breadcrumbParentId: '1',
     name: 'Posts',
-    zhName: '文章管理',
+    zh: {
+      name: '用户管理'
+    },
+    'pt-br': {
+      name: 'Posts'
+    },
     icon: 'shopping-cart',
     route: '/post',
   },
@@ -30,14 +45,24 @@ const database = [
     menuParentId: '-1',
     breadcrumbParentId: '2',
     name: 'User Detail',
-    zhName: '用户详情',
+    zh: {
+      name: '用户详情'
+    },
+    'pt-br': {
+      name: 'Detalhes do usuário'
+    },
     route: '/user/:id',
   },
   {
     id: '3',
     breadcrumbParentId: '1',
     name: 'Request',
-    zhName: 'Request',
+    zh: {
+      name: 'Request'
+    },
+    'pt-br': {
+      name: 'Requisição'
+    },
     icon: 'api',
     route: '/request',
   },
@@ -45,7 +70,12 @@ const database = [
     id: '4',
     breadcrumbParentId: '1',
     name: 'UI Element',
-    zhName: 'UI组件',
+    zh: {
+      name: 'UI组件'
+    },
+    'pt-br': {
+      name: 'Elementos UI'
+    },
     icon: 'camera-o',
   },
   {
@@ -53,7 +83,12 @@ const database = [
     breadcrumbParentId: '4',
     menuParentId: '4',
     name: 'Editor',
-    zhName: 'Editor',
+    zh: {
+      name: 'Editor'
+    },
+    'pt-br': {
+      name: 'Editor'
+    },
     icon: 'edit',
     route: '/UIElement/editor',
   },
@@ -61,7 +96,12 @@ const database = [
     id: '5',
     breadcrumbParentId: '1',
     name: 'Charts',
-    zhName: 'Charts',
+    zh: {
+      name: 'Charts'
+    },
+    'pt-br': {
+      name: 'Graficos'
+    },
     icon: 'code-o',
   },
   {
@@ -69,7 +109,12 @@ const database = [
     breadcrumbParentId: '5',
     menuParentId: '5',
     name: 'ECharts',
-    zhName: 'ECharts',
+    zh: {
+      name: 'ECharts'
+    },
+    'pt-br': {
+      name: 'ECharts'
+    },
     icon: 'line-chart',
     route: '/chart/ECharts',
   },
@@ -78,7 +123,12 @@ const database = [
     breadcrumbParentId: '5',
     menuParentId: '5',
     name: 'HighCharts',
-    zhName: 'HighCharts',
+    zh: {
+      name: 'HighCharts'
+    },
+    'pt-br': {
+      name: 'HighCharts'
+    },
     icon: 'bar-chart',
     route: '/chart/highCharts',
   },
@@ -87,7 +137,12 @@ const database = [
     breadcrumbParentId: '5',
     menuParentId: '5',
     name: 'Rechartst',
-    zhName: 'Rechartst',
+    zh: {
+      name: 'Rechartst'
+    },
+    'pt-br': {
+      name: 'Rechartst'
+    },
     icon: 'area-chart',
     route: '/chart/Recharts',
   },

package.json

@@ -1,21 +1,21 @@
 {
   "name": "antd-admin",
-  "version": "5.0.0-beta",
-  "private": true,
+  "version": "5.1.3",
+  "license": "MIT",
   "description": "An admin dashboard application demo built upon Ant Design and UmiJS",
   "dependencies": {
-    "@lingui/react": "^2.7.0",
-    "ant-design-pro": "^2.1.0",
-    "antd": "^3.10.0",
-    "axios": "^0.18.0",
-    "babel-core": "7.0.0-bridge.0",
+    "@lingui/react": "^2.8.0",
+    "ant-design-pro": "^2.3.0",
+    "antd": "^3.24.0",
+    "axios": "^0.19.0",
     "classnames": "^2.2.6",
-    "d3-shape": "^1.2.2",
+    "d3-shape": "^1.3.0",
     "draftjs-to-html": "^0.8.4",
     "draftjs-to-markdown": "^0.5.1",
+    "dva": "2.4.1",
     "dva-model-extend": "^0.1.2",
-    "echarts": "^4.2.0-rc.2",
-    "echarts-for-react": "^2.0.15-beta.0",
+    "echarts": "^4.4.0",
+    "echarts-for-react": "^2.0.15-beta.1",
     "echarts-gl": "^1.1.1",
     "echarts-liquidfill": "^2.0.2",
     "enquire-js": "^0.2.1",
@@ -25,49 +25,47 @@
     "lodash": "^4.17.11",
     "md5": "^2.2.1",
     "nprogress": "^0.2.0",
-    "path-to-regexp": "^2.4.0",
-    "prop-types": "^15.6.2",
-    "qs": "^6.5.2",
-    "rc-tween-one": "^2.2.8",
-    "react-adsense": "^0.0.6",
-    "react-countup": "^4.0.0-alpha.6",
-    "react-draft-wysiwyg": "^1.12.13",
+    "path-to-regexp": "^3.1.0",
+    "prop-types": "^15.7.0",
+    "qs": "^6.9.0",
+    "react-adsense": "^0.1.0",
+    "react-countup": "^4.2.0",
+    "react-draft-wysiwyg": "^1.13.0",
     "react-helmet": "^5.2.0",
-    "react-highcharts": "^16.0.2",
-    "react-perfect-scrollbar": "^1.4.0",
-    "recharts": "^1.3.0",
-    "store": "^2.0.12"
+    "react-highcharts": "^16.1.0",
+    "react-perfect-scrollbar": "^1.5.0",
+    "recharts": "^1.8.0",
+    "store": "^2.0.0"
   },
   "devDependencies": {
-    "@lingui/babel-preset-react": "^2.7.0",
-    "@lingui/cli": "^2.7.0",
-    "@lingui/loader": "^2.7.0",
+    "@lingui/babel-preset-react": "^2.8.2",
+    "@lingui/cli": "^2.8.2",
+    "@lingui/loader": "^2.8.2",
+    "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^10.0.1",
     "babel-plugin-dev-expression": "^0.2.1",
-    "babel-plugin-import": "^1.10.0",
-    "babel-plugin-macros": "^2.4.2",
-    "babel-plugin-module-resolver": "^3.1.1",
-    "cross-env": "^5.2.0",
-    "eslint": "^5.7.0",
-    "eslint-config-react-app": "^3.0.4",
-    "eslint-plugin-flowtype": "^3.0.0",
-    "eslint-plugin-import": "^2.6.0",
-    "eslint-plugin-jsx-a11y": "^6.1.1",
-    "eslint-plugin-react": "^7.1.0",
-    "husky": "^1.1.1",
+    "babel-plugin-import": "^1.12.0",
+    "babel-plugin-macros": "^2.6.0",
+    "babel-plugin-module-resolver": "^3.2.0",
+    "cross-env": "^6.0.0",
+    "eslint": "^5.15.0",
+    "eslint-config-react-app": "^4.0.0",
+    "eslint-plugin-flowtype": "^3.11.0",
+    "eslint-plugin-import": "^2.18.0",
+    "eslint-plugin-jsx-a11y": "^6.2.1",
+    "eslint-plugin-react": "^7.14.0",
+    "eslint-plugin-react-hooks": "^1.6.0",
+    "husky": "^2.7.0",
     "less-vars-to-js": "^1.3.0",
-    "lint-staged": "^7.3.0",
+    "lint-staged": "^8.1.0",
     "mockjs": "^1.0.1-beta3",
     "module": "^1.2.5",
-    "prettier": "^1.14.3",
-    "stylelint": "^9.6.0",
-    "stylelint-config-prettier": "^4.0.0",
-    "stylelint-config-standard": "^18.2.0",
-    "umi": "^2.2.1",
-    "umi-plugin-react": "^1.2.0"
-  },
-  "optionalDependencies": {
-    "puppeteer": "^1.9.0"
+    "prettier": "^1.18.0",
+    "stylelint": "^10.0.0",
+    "stylelint-config-prettier": "^5.2.0",
+    "stylelint-config-standard": "^18.3.0",
+    "umi": "^2.10.0",
+    "umi-plugin-react": "^1.12.0"
   },
   "lint-staged": {
     "src/**/*.js": [
@@ -105,7 +103,7 @@
     "lint:style": "stylelint \"src/**/*.less\" --syntax less",
     "start": "umi dev",
     "test": "cross-env BABELRC=none umi test",
-    "prettier": "prettier --write 'src/**/*.(js|less)'",
+    "prettier": "prettier --write 'src/**/*.{js,less}'",
     "precommit": "lint-staged",
     "add-locale": "lingui add-locale",
     "extract": "lingui extract",

public/portugal.svg

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<rect style="fill:#D80027;" width="512" height="512"/>
+<polygon style="fill:#6DA544;" points="196.641,0 196.641,264.348 196.641,512 0,512 0,0 "/>
+<circle style="fill:#FFDA44;" cx="196.641" cy="256" r="96"/>
+<path style="fill:#D80027;" d="M142.638,208v60c0,29.823,24.178,54,54,54s54-24.178,54-54v-60H142.638z"/>
+<path style="fill:#F0F0F0;" d="M196.638,286c-9.925,0-18-8.075-18-18v-24.001h36V268C214.638,277.925,206.563,286,196.638,286z"/>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

scripts/translate.js

@@ -56,9 +56,21 @@ const transform = async ({ from, to, locales, outputPath }) => {
       let res = key
       let way = 'youdao'
       if (key.indexOf('/') !== 0) {
-        res = await youdao({
-          q: key,
-        })
+        const reg = '{([^{}]*)}'
+        const tasks = key
+          .match(new RegExp(`${reg}|((?<=(${reg}|^)).*?(?=(${reg}|$)))`, 'g'))
+          .map(item => {
+            if (new RegExp(reg).test(item)) {
+              return Promise.resolve(item)
+            }
+            return youdao({
+              q: item,
+              from,
+              to,
+            })
+          })
+
+        res = (await Promise.all(tasks)).join('')
       } else {
         res = `/${to + key}`
         way = 'link'

src/components/FilterItem/FilterItem.js

@@ -6,7 +6,7 @@ const FilterItem = ({ label = '', children }) => {
   const labelArray = label.split('')
   return (
     <div className={styles.filterItem}>
-      {labelArray.length > 0 ? (
+      {labelArray.length > 0 && (
         <div className={styles.labelWrap}>
           {labelArray.map((item, index) => (
             <span className="labelText" key={index}>
@@ -14,8 +14,6 @@ const FilterItem = ({ label = '', children }) => {
             </span>
           ))}
         </div>
-      ) : (
-        ''
       )}
       <div className={styles.item}>{children}</div>
     </div>

src/components/Layout/Bread.js

@@ -4,7 +4,7 @@ import { Breadcrumb, Icon } from 'antd'
 import Link from 'umi/navlink'
 import withRouter from 'umi/withRouter'
 import { withI18n } from '@lingui/react'
-import { pathMatchRegexp, queryAncestors } from 'utils'
+import { pathMatchRegexp, queryAncestors, addLangPrefix } from 'utils'
 import styles from './Bread.less'
 
 @withI18n()
@@ -12,23 +12,23 @@ import styles from './Bread.less'
 class Bread extends PureComponent {
   generateBreadcrumbs = paths => {
     return paths.map((item, key) => {
-      const content = (
+      const content = item && (
         <Fragment>
-          {item.icon ? (
-            <Icon type={item.icon} style={{ marginRight: 4 }} />
-          ) : null}
+          {item.icon && <Icon type={item.icon} style={{ marginRight: 4 }} />}
           {item.name}
         </Fragment>
       )
 
       return (
-        <Breadcrumb.Item key={key}>
-          {paths.length - 1 !== key ? (
-            <Link to={item.route || '#'}>{content}</Link>
-          ) : (
-            content
-          )}
-        </Breadcrumb.Item>
+        item && (
+          <Breadcrumb.Item key={key}>
+            {paths.length - 1 !== key ? (
+              <Link to={addLangPrefix(item.route) || '#'}>{content}</Link>
+            ) : (
+              content
+            )}
+          </Breadcrumb.Item>
+        )
       )
     })
   }

src/components/Layout/Header.js

@@ -85,7 +85,7 @@ class Header extends PureComponent {
         trigger="click"
         key="notifications"
         overlayClassName={styles.notificationPopover}
-        getPopupContainer={() => document.querySelector('#layoutHeader')}
+        getPopupContainer={() => document.querySelector('#primaryLayout')}
         content={
           <div className={styles.notification}>
             <List

src/components/Layout/Header.less

@@ -16,7 +16,7 @@
     top: 0;
     right: 0;
     width: ~'calc(100% - 256px)';
-    z-index: 9;
+    z-index: 29;
     transition: width 0.2s;
 
     &.collapsed {

src/components/Layout/Menu.js

@@ -89,13 +89,17 @@ class SiderMenu extends PureComponent {
       ? queryAncestors(menus, currentMenu, 'menuParentId').map(_ => _.id)
       : []
 
+    const menuProps = collapsed
+      ? {}
+      : {
+          openKeys: this.state.openKeys,
+        }
+
     return (
       <Menu
         mode="inline"
         theme={theme}
         onOpenChange={this.onOpenChange}
-        openKeys={this.state.openKeys}
-        inlineCollapsed={collapsed}
         selectedKeys={selectedKeys}
         onClick={
           isMobile
@@ -104,6 +108,7 @@ class SiderMenu extends PureComponent {
               }
             : undefined
         }
+        {...menuProps}
       >
         {this.generateMenus(menuTree)}
       </Menu>
@@ -115,7 +120,6 @@ SiderMenu.propTypes = {
   menus: PropTypes.array,
   theme: PropTypes.string,
   isMobile: PropTypes.bool,
-  collapsed: PropTypes.bool,
   onCollapseChange: PropTypes.func,
 }
 

src/components/Layout/Sider.js

@@ -28,19 +28,19 @@ class Sider extends PureComponent {
         trigger={null}
         collapsible
         collapsed={collapsed}
-        onBreakpoint={isMobile ? null : onCollapseChange}
+        onBreakpoint={!isMobile && onCollapseChange}
         className={styles.sider}
       >
         <div className={styles.brand}>
           <div className={styles.logo}>
             <img alt="logo" src={config.logoPath} />
-            {collapsed ? null : <h1>{config.siteName}</h1>}
+            {!collapsed && <h1>{config.siteName}</h1>}
           </div>
         </div>
 
         <div className={styles.menuContainer}>
           <ScrollBar
-            option={{
+            options={{
               // Disabled horizontal scrolling, https://github.com/utatti/perfect-scrollbar#options
               suppressScrollX: true,
             }}
@@ -54,7 +54,7 @@ class Sider extends PureComponent {
             />
           </ScrollBar>
         </div>
-        {collapsed ? null : (
+        {!collapsed && (
           <div className={styles.switchTheme}>
             <span>
               <Icon type="bulb" />

src/components/Loader/Loader.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import classNames from 'classnames'
 import styles from './Loader.less'
 
-const Loader = ({ spinning = true, fullScreen }) => {
+const Loader = ({ spinning = false, fullScreen }) => {
   return (
     <div
       className={classNames(styles.loader, {

src/layouts/PrimaryLayout.js

@@ -11,6 +11,7 @@ import { enquireScreen, unenquireScreen } from 'enquire-js'
 import { config, pathMatchRegexp, langFromPath } from 'utils'
 import Error from '../pages/404'
 import styles from './PrimaryLayout.less'
+import store from 'store'
 
 const { Content } = Layout
 const { Header, Bread, Sider } = MyLayout
@@ -46,25 +47,23 @@ class PrimaryLayout extends PureComponent {
 
   render() {
     const { app, location, dispatch, children } = this.props
-    const {
-      user,
-      theme,
-      routeList,
-      collapsed,
-      permissions,
-      notifications,
-    } = app
+    const { theme, collapsed, notifications } = app
+    const user = store.get('user') || {}
+    const permissions = store.get('permissions') || {}
+    const routeList = store.get('routeList') || []
     const { isMobile } = this.state
     const { onCollapseChange } = this
 
     // Localized route name.
+
+    const lang = langFromPath(location.pathname)
     const newRouteList =
-      langFromPath(location.pathname) === 'zh'
+      lang !== 'en'
         ? routeList.map(item => {
-            const { zhName, ...other } = item
+            const { name, ...other } = item
             return {
               ...other,
-              name: zhName,
+              name: (item[lang] || {}).name || name,
             }
           })
         : routeList
@@ -145,7 +144,7 @@ class PrimaryLayout extends PureComponent {
             </Content>
             <BackTop
               className={styles.backTop}
-              target={() => document.querySelector('#primaryLayout>div')}
+              target={() => document.querySelector('#primaryLayout')}
             />
             <GlobalFooter
               className={styles.footer}

src/layouts/index.js

@@ -5,12 +5,14 @@ import { I18nProvider } from '@lingui/react'
 import { langFromPath, defaultLanguage } from 'utils'
 import zh_CN from 'antd/lib/locale-provider/zh_CN'
 import en_US from 'antd/lib/locale-provider/en_US'
+import pt_BR from 'antd/lib/locale-provider/pt_BR'
 
 import BaseLayout from './BaseLayout'
 
 const languages = {
   zh: zh_CN,
   en: en_US,
+  'pt-br': pt_BR,
 }
 
 @withRouter
@@ -24,7 +26,7 @@ class Layout extends Component {
   componentDidMount() {
     const language = langFromPath(this.props.location.pathname)
     this.language = language
-    this.loadCatalog(language)
+    language && this.loadCatalog(language)
   }
 
   shouldComponentUpdate(nextProps, nextState) {
@@ -33,7 +35,7 @@ class Layout extends Component {
     const { catalogs } = nextState
 
     if (preLanguage !== language && !catalogs[language]) {
-      this.loadCatalog(language)
+      language && this.loadCatalog(language)
       this.language = language
       return false
     }
@@ -43,8 +45,10 @@ class Layout extends Component {
   }
 
   loadCatalog = async language => {
-    const catalog = await import(/* webpackMode: "lazy", webpackChunkName: "i18n-[index]" */
-    `@lingui/loader!../locales/${language}/messages.json`)
+    const catalog = await import(
+      /* webpackMode: "lazy", webpackChunkName: "i18n-[index]" */
+      `@lingui/loader!../locales/${language}/messages.json`
+    )
 
     this.setState(state => ({
       catalogs: {

src/locales/pt-br/messages.json

@@ -0,0 +1,54 @@
+{
+  "/dashboard": "/dashboard",
+  "Add Param": "Add Parametro",
+  "Address": "Endereço",
+  "Age": "Ano",
+  "Are you sure delete this record?": "Tem certeza de excluir este registro?",
+  "Author": "Autor",
+  "Avatar": "Avatar",
+  "Categories": "Categorias",
+  "Clear notifications": "limpar notificações",
+  "Comments": "Comentarios",
+  "Create": "Criar",
+  "Create User": "Criar Usuário",
+  "CreateTime": "CreateTime",
+  "Dark": "Escuro",
+  "Delete": "Deletar",
+  "Email": "Email",
+  "Female": "Feminino",
+  "Gender": "Genero",
+  "Hi,": "Olá,",
+  "Image": "Imagem",
+  "Light": "Claro",
+  "Male": "masculino",
+  "Name": "Nome",
+  "NickName": "NickName",
+  "Not Found": "Não Encontrado",
+  "Operation": "Operation",
+  "Params": "Parametros",
+  "Password": "Senha",
+  "Phone": "Fone",
+  "Pick an address": "Escolha um endereço",
+  "Please pick an address": "Por favor, escolha um endereço",
+  "Publised": "Publicado",
+  "Publish Date": "Data de publicação",
+  "Reset": "Reset",
+  "Search": "procurar",
+  "Search Name": "Search Name",
+  "Send": "Enviar",
+  "Sign in": "Sign in",
+  "Sign out": "Sign out",
+  "Switch Theme": "Trocar tema",
+  "Tags": "Tags",
+  "The input is not valid E-mail!": "Não é um E-mail valido!",
+  "The input is not valid phone!": "Não é um telefone Valido!",
+  "Title": "Titulo",
+  "Total {total} Items": "Total {total} Items",
+  "Unpublished": "Não publicado",
+  "Update": "Atualizar",
+  "Update User": "Atualizar Usuário",
+  "Username": "Usuário",
+  "Views": "visualizações",
+  "Visibility": "Visibilidade",
+  "You have viewed all notifications.": "Você visualizou todas as notificações."
+}

src/models/app.js

@@ -6,16 +6,22 @@ import store from 'store'
 import { ROLE_TYPE } from 'utils/constant'
 import { queryLayout, pathMatchRegexp } from 'utils'
 import { CANCEL_REQUEST_MESSAGE } from 'utils/constant'
-import { queryRouteList, logoutUser, queryUserInfo } from 'api'
+import api from 'api'
 import config from 'config'
 
+const { queryRouteList, logoutUser, queryUserInfo } = api
+
+const goDashboard = () => {
+  if (pathMatchRegexp(['/', '/login'], window.location.pathname)) {
+    router.push({
+      pathname: '/dashboard',
+    })
+  }
+}
+
 export default {
   namespace: 'app',
   state: {
-    user: {},
-    permissions: {
-      visit: [],
-    },
     routeList: [
       {
         id: '1',
@@ -41,6 +47,9 @@ export default {
     ],
   },
   subscriptions: {
+    setup({ dispatch }) {
+      dispatch({ type: 'query' })
+    },
     setupHistory({ dispatch, history }) {
       history.listen(location => {
         dispatch({
@@ -65,16 +74,17 @@ export default {
         })
       })
     },
-
-    setup({ dispatch }) {
-      dispatch({ type: 'query' })
-    },
   },
   effects: {
     *query({ payload }, { call, put, select }) {
-      const { success, user } = yield call(queryUserInfo, payload)
+      // store isInit to prevent query trigger by refresh
+      const isInit = store.get('isInit')
+      if (isInit) {
+        goDashboard()
+        return
+      }
       const { locationPathname } = yield select(_ => _.app)
-
+      const { success, user } = yield call(queryUserInfo, payload)
       if (success && user) {
         const { list } = yield call(queryRouteList)
         const { permissions } = user
@@ -96,19 +106,11 @@ export default {
             return cases.every(_ => _)
           })
         }
-        yield put({
-          type: 'updateState',
-          payload: {
-            user,
-            permissions,
-            routeList,
-          },
-        })
-        if (pathMatchRegexp('/login', window.location.pathname)) {
-          router.push({
-            pathname: '/dashboard',
-          })
-        }
+        store.set('routeList', routeList)
+        store.set('permissions', permissions)
+        store.set('user', user)
+        store.set('isInit', true)
+        goDashboard()
       } else if (queryLayout(config.layouts, locationPathname) !== 'public') {
         router.push({
           pathname: '/login',
@@ -122,22 +124,10 @@ export default {
     *signOut({ payload }, { call, put }) {
       const data = yield call(logoutUser)
       if (data.success) {
-        yield put({
-          type: 'updateState',
-          payload: {
-            user: {},
-            permissions: { visit: [] },
-            menu: [
-              {
-                id: '1',
-                icon: 'laptop',
-                name: 'Dashboard',
-                zhName: '仪表盘',
-                router: '/dashboard',
-              },
-            ],
-          },
-        })
+        store.set('routeList', [])
+        store.set('permissions', { visit: [] })
+        store.set('user', {})
+        store.set('isInit', false)
         yield put({ type: 'query' })
       } else {
         throw data

src/pages/dashboard/components/completed.js

@@ -73,7 +73,7 @@ function Completed({ data }) {
               return (
                 <div className={styles.tooltip}>
                   <p className={styles.tiptitle}>{content.label}</p>
-                  <ul>{list}</ul>
+                  {content.payload && <ul>{list}</ul>}
                 </div>
               )
             }}

src/pages/dashboard/components/numberCard.js

@@ -22,7 +22,7 @@ function NumberCard({ icon, color, title, number, countUp }) {
             useEasing
             useGrouping
             separator=","
-            {...countUp || {}}
+            {...(countUp || {})}
           />
         </p>
       </div>

src/pages/dashboard/components/sales.js

@@ -73,7 +73,7 @@ function Sales({ data }) {
               return (
                 <div className={styles.tooltip}>
                   <p className={styles.tiptitle}>{content.label}</p>
-                  <ul>{list}</ul>
+                  {content.payload && <ul>{list}</ul>}
                 </div>
               )
             }}

src/pages/dashboard/index.js

@@ -17,6 +17,7 @@ import {
   User,
 } from './components'
 import styles from './index.less'
+import store from 'store'
 
 const bodyStyle = {
   bodyStyle: {
@@ -26,14 +27,14 @@ const bodyStyle = {
 }
 
 @connect(({ app, dashboard, loading }) => ({
-  avatar: app.user.avatar,
-  username: app.user.username,
   dashboard,
   loading,
 }))
 class Dashboard extends PureComponent {
   render() {
-    const { avatar, username, dashboard, loading } = this.props
+    const userDetail = store.get('user')
+    const { avatar, username } = userDetail
+    const { dashboard, loading } = this.props
     const {
       weather,
       sales,
@@ -154,8 +155,6 @@ class Dashboard extends PureComponent {
 }
 
 Dashboard.propTypes = {
-  avatar: PropTypes.string,
-  username: PropTypes.string,
   dashboard: PropTypes.object,
   loading: PropTypes.object,
 }

src/pages/dashboard/model.js

@@ -1,9 +1,11 @@
 import { parse } from 'qs'
 import modelExtend from 'dva-model-extend'
-import { queryDashboard, queryWeather } from 'api'
+import api from 'api'
 import { pathMatchRegexp } from 'utils'
 import { model } from 'utils/model'
 
+const { queryDashboard, queryWeather } = api
+
 export default modelExtend(model, {
   namespace: 'dashboard',
   state: {

src/pages/login/model.js

@@ -1,5 +1,7 @@
 import { router, pathMatchRegexp } from 'utils'
-import { loginUser } from 'api'
+import api from 'api'
+
+const { loginUser } = api
 
 export default {
   namespace: 'login',
@@ -14,7 +16,7 @@ export default {
         const { from } = locationQuery
         yield put({ type: 'app/query' })
         if (!pathMatchRegexp('/login', from)) {
-          if (from === '/') router.push('/dashboard')
+          if (['', '/'].includes(from)) router.push('/dashboard')
           else router.push(from)
         } else {
           router.push('/dashboard')

src/pages/post/index.js

@@ -18,12 +18,23 @@ const EnumPostStatus = {
 @withI18n()
 @connect(({ post, loading }) => ({ post, loading }))
 class Post extends PureComponent {
-  render() {
-    const { post, loading, location, i18n } = this.props
+  handleTabClick = key => {
+    const { pathname } = this.props.location
+
+    router.push({
+      pathname,
+      search: stringify({
+        status: key,
+      }),
+    })
+  }
+
+  get listProps() {
+    const { post, loading, location } = this.props
     const { list, pagination } = post
     const { query, pathname } = location
 
-    const listProps = {
+    return {
       pagination,
       dataSource: list,
       loading: loading.effects['post/query'],
@@ -38,15 +49,11 @@ class Post extends PureComponent {
         })
       },
     }
+  }
 
-    const handleTabClick = key => {
-      router.push({
-        pathname,
-        search: stringify({
-          status: key,
-        }),
-      })
-    }
+  render() {
+    const { location, i18n } = this.props
+    const { query } = location
 
     return (
       <Page inner>
@@ -56,19 +63,19 @@ class Post extends PureComponent {
               ? String(EnumPostStatus.UNPUBLISH)
               : String(EnumPostStatus.PUBLISHED)
           }
-          onTabClick={handleTabClick}
+          onTabClick={this.handleTabClick}
         >
           <TabPane
             tab={i18n.t`Publised`}
             key={String(EnumPostStatus.PUBLISHED)}
           >
-            <List {...listProps} />
+            <List {...this.listProps} />
           </TabPane>
           <TabPane
             tab={i18n.t`Unpublished`}
             key={String(EnumPostStatus.UNPUBLISH)}
           >
-            <List {...listProps} />
+            <List {...this.listProps} />
           </TabPane>
         </Tabs>
       </Page>

src/pages/post/model.js

@@ -1,8 +1,10 @@
 import modelExtend from 'dva-model-extend'
-import { queryPostList } from 'api'
+import api from 'api'
 import { pathMatchRegexp } from 'utils'
 import { pageModel } from 'utils/model'
 
+const { queryPostList } = api
+
 export default modelExtend(pageModel, {
   namespace: 'post',
 

src/pages/user/$id/models/detail.js

@@ -1,5 +1,7 @@
 import { pathMatchRegexp } from 'utils'
-import { queryUser } from 'api'
+import api from 'api'
+
+const { queryUser } = api
 
 export default {
   namespace: 'userDetail',

src/pages/user/components/Filter.js

@@ -1,5 +1,5 @@
 /* global document */
-import React, { PureComponent } from 'react'
+import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import moment from 'moment'
 import { FilterItem } from 'components'
@@ -25,7 +25,7 @@ const TwoColProps = {
 
 @withI18n()
 @Form.create()
-class Filter extends PureComponent {
+class Filter extends Component {
   handleFields = fields => {
     const { createTime } = fields
     if (createTime.length) {

src/pages/user/components/List.js

@@ -26,13 +26,7 @@ class List extends PureComponent {
   }
 
   render() {
-    const {
-      handleMenuClick,
-      onDeleteItem,
-      onEditItem,
-      i18n,
-      ...tableProps
-    } = this.props
+    const { onDeleteItem, onEditItem, i18n, ...tableProps } = this.props
 
     const columns = [
       {
@@ -92,7 +86,7 @@ class List extends PureComponent {
         render: (text, record) => {
           return (
             <DropOption
-              onMenuClick={e => handleMenuClick(record, e)}
+              onMenuClick={e => this.handleMenuClick(record, e)}
               menuOptions={[
                 { key: '1', name: i18n.t`Update` },
                 { key: '2', name: i18n.t`Delete` },

src/pages/user/index.js

@@ -13,46 +13,61 @@ import Modal from './components/Modal'
 @withI18n()
 @connect(({ user, loading }) => ({ user, loading }))
 class User extends PureComponent {
-  render() {
-    const { location, dispatch, user, loading, i18n } = this.props
+  handleRefresh = newQuery => {
+    const { location } = this.props
     const { query, pathname } = location
-    const {
-      list,
-      pagination,
-      currentItem,
-      modalVisible,
-      modalType,
-      selectedRowKeys,
-    } = user
 
-    const handleRefresh = newQuery => {
-      router.push({
-        pathname,
-        search: stringify(
-          {
-            ...query,
-            ...newQuery,
-          },
-          { arrayFormat: 'repeat' }
-        ),
+    router.push({
+      pathname,
+      search: stringify(
+        {
+          ...query,
+          ...newQuery,
+        },
+        { arrayFormat: 'repeat' }
+      ),
+    })
+  }
+
+  handleDeleteItems = () => {
+    const { dispatch, user } = this.props
+    const { list, pagination, selectedRowKeys } = user
+
+    dispatch({
+      type: 'user/multiDelete',
+      payload: {
+        ids: selectedRowKeys,
+      },
+    }).then(() => {
+      this.handleRefresh({
+        page:
+          list.length === selectedRowKeys.length && pagination.current > 1
+            ? pagination.current - 1
+            : pagination.current,
       })
-    }
+    })
+  }
 
-    const modalProps = {
+  get modalProps() {
+    const { dispatch, user, loading, i18n } = this.props
+    const { currentItem, modalVisible, modalType } = user
+
+    return {
       item: modalType === 'create' ? {} : currentItem,
       visible: modalVisible,
+      destroyOnClose: true,
       maskClosable: false,
       confirmLoading: loading.effects[`user/${modalType}`],
       title: `${
         modalType === 'create' ? i18n.t`Create User` : i18n.t`Update User`
       }`,
-      wrapClassName: 'vertical-center-modal',
-      onOk(data) {
+      centered: true,
+      onOk: data => {
         dispatch({
           type: `user/${modalType}`,
           payload: data,
         }).then(() => {
-          handleRefresh()
+          this.handleRefresh()
         })
       },
       onCancel() {
@@ -61,23 +76,28 @@ class User extends PureComponent {
         })
       },
     }
+  }
 
-    const listProps = {
+  get listProps() {
+    const { dispatch, user, loading } = this.props
+    const { list, pagination, selectedRowKeys } = user
+
+    return {
       dataSource: list,
       loading: loading.effects['user/query'],
       pagination,
-      onChange(page) {
-        handleRefresh({
+      onChange: page => {
+        this.handleRefresh({
           page: page.current,
           pageSize: page.pageSize,
         })
       },
-      onDeleteItem(id) {
+      onDeleteItem: id => {
         dispatch({
           type: 'user/delete',
           payload: id,
         }).then(() => {
-          handleRefresh({
+          this.handleRefresh({
             page:
               list.length === 1 && pagination.current > 1
                 ? pagination.current - 1
@@ -106,15 +126,19 @@ class User extends PureComponent {
         },
       },
     }
+  }
 
-    const filterProps = {
+  get filterProps() {
+    const { location, dispatch } = this.props
+    const { query } = location
+
+    return {
       filter: {
         ...query,
       },
-      onFilterChange(value) {
-        handleRefresh({
+      onFilterChange: value => {
+        this.handleRefresh({
           ...value,
-          page: 1,
         })
       },
       onAdd() {
@@ -126,26 +150,15 @@ class User extends PureComponent {
         })
       },
     }
+  }
 
-    const handleDeleteItems = () => {
-      dispatch({
-        type: 'user/multiDelete',
-        payload: {
-          ids: selectedRowKeys,
-        },
-      }).then(() => {
-        handleRefresh({
-          page:
-            list.length === selectedRowKeys.length && pagination.current > 1
-              ? pagination.current - 1
-              : pagination.current,
-        })
-      })
-    }
+  render() {
+    const { user } = this.props
+    const { selectedRowKeys } = user
 
     return (
       <Page inner>
-        <Filter {...filterProps} />
+        <Filter {...this.filterProps} />
         {selectedRowKeys.length > 0 && (
           <Row style={{ marginBottom: 24, textAlign: 'right', fontSize: 13 }}>
             <Col>
@@ -153,7 +166,7 @@ class User extends PureComponent {
               <Popconfirm
                 title="Are you sure delete these items?"
                 placement="left"
-                onConfirm={handleDeleteItems}
+                onConfirm={this.handleDeleteItems}
               >
                 <Button type="primary" style={{ marginLeft: 8 }}>
                   Remove
@@ -162,8 +175,8 @@ class User extends PureComponent {
             </Col>
           </Row>
         )}
-        <List {...listProps} />
-        {modalVisible && <Modal {...modalProps} />}
+        <List {...this.listProps} />
+        <Modal {...this.modalProps} />
       </Page>
     )
   }

src/pages/user/model.js

@@ -1,14 +1,15 @@
-/* global window */
 import modelExtend from 'dva-model-extend'
 import { pathMatchRegexp } from 'utils'
-import {
+import api from 'api'
+import { pageModel } from 'utils/model'
+
+const {
   queryUserList,
   createUser,
   removeUser,
   updateUser,
   removeUserList,
-} from 'api'
-import { pageModel } from 'utils/model'
+} = api
 
 export default modelExtend(pageModel, {
   namespace: 'user',

src/plugins/onError.js

@@ -1,8 +1,13 @@
 import { message } from 'antd'
 
 export default {
-  onError(e) {
+  onError(e, a) {
     e.preventDefault()
-    message.error(e.message)
+    if (e.message) {
+      message.error(e.message)
+    } else {
+      /* eslint-disable */
+      console.error(e)
+    }
   },
 }

src/services/api.js

@@ -1,4 +1,4 @@
-const api = {
+export default {
   queryRouteList: '/routes',
 
   queryUserInfo: '/user',
@@ -8,7 +8,7 @@ const api = {
   queryUser: '/user/:id',
   queryUserList: '/users',
   updateUser: 'Patch /user/:id',
-  createUser: 'POST /user/:id',
+  createUser: 'POST /user',
   removeUser: 'DELETE /user/:id',
   removeUserList: 'POST /users/delete',
 
@@ -16,5 +16,3 @@ const api = {
 
   queryDashboard: '/dashboard',
 }
-
-export default api

src/services/index.js

@@ -35,4 +35,4 @@ APIFunction.queryWeather = params => {
   })
 }
 
-module.exports = APIFunction
+export default APIFunction

src/themes/index.less

@@ -63,21 +63,6 @@ body {
     box-shadow: 0 0 20px rgba(100, 100, 100, 0.2);
   }
 
-  .vertical-center-modal {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    .ant-modal {
-      top: 0;
-
-      .ant-modal-body {
-        max-height: 80vh;
-        overflow-y: auto;
-      }
-    }
-  }
-
   .ant-form-item-control {
     vertical-align: middle;
   }
@@ -101,6 +86,10 @@ body {
   a:focus {
     text-decoration: none;
   }
+
+  .ant-table-layout-fixed table {
+    table-layout: auto;
+  }
 }
 @media (min-width: 1600px) {
   :global {

src/utils/city.js

@@ -4052,4 +4052,4 @@ let DICT_FIXED = (function() {
   return tree(fixed)
 })()
 
-module.exports = DICT_FIXED
+export default DICT_FIXED

src/utils/config.js

@@ -1,6 +1,6 @@
 module.exports = {
   siteName: 'AntD Admin',
-  copyright: 'Ant Design Admin  © 2018 zuiidea',
+  copyright: 'Ant Design Admin  ©2019 zuiidea',
   logoPath: '/logo.svg',
   apiPrefix: '/api/v1',
   fixedHeader: true, // sticky primary layout header
@@ -10,7 +10,7 @@ module.exports = {
     {
       name: 'primary',
       include: [/.*/],
-      exlude: [/(\/(en|zh))*\/login/],
+      exclude: [/(\/(en|zh))*\/login/],
     },
   ],
 
@@ -18,6 +18,11 @@ module.exports = {
   i18n: {
     /* Countrys flags: https://www.flaticon.com/packs/countrys-flags */
     languages: [
+      {
+        key: 'pt-br',
+        title: 'Português',
+        flag: '/portugal.svg',
+      },
       {
         key: 'en',
         title: 'English',

src/utils/constant.js

@@ -4,4 +4,4 @@ export const ROLE_TYPE = {
   DEVELOPER: 'developer',
 }
 
-export const CANCEL_REQUEST_MESSAGE = 'cancle request'
+export const CANCEL_REQUEST_MESSAGE = 'cancel request'

src/utils/index.js

@@ -2,14 +2,18 @@ import { cloneDeep, isString, flow, curry } from 'lodash'
 import umiRouter from 'umi/router'
 import pathToRegexp from 'path-to-regexp'
 import { i18n } from './config'
+import moment from 'moment'
+import 'moment/locale/zh-cn'
 
 export classnames from 'classnames'
 export config from './config'
 export request from './request'
 export { Color } from './theme'
 
-export const { defaultLanguage } = i18n
-export const languages = i18n.languages.map(item => item.key)
+// export const { defaultLanguage } = i18n
+// export const languages = i18n.languages.map(item => item.key)
+export const languages = i18n ? i18n.languages.map(item => item.key) : []
+export const defaultLanguage = i18n ? i18n.defaultLanguage : ''
 
 /**
  * Query objects that specify keys and values in an array where all values are objects.
@@ -59,23 +63,32 @@ export function arrayToTree(
   return result
 }
 
-export const langFromPath = curry(
-  /**
-   * Query language from pathname.
-   * @param   {array}     languages         Specify which languages are currently available.
-   * @param   {string}    defaultLanguage   Specify the default language.
-   * @param   {string}    pathname          Pathname to be queried.
-   * @return  {string}    Return the queryed language.
-   */
-  (languages, defaultLanguage, pathname) => {
-    for (const item of languages) {
-      if (pathname.startsWith(`/${item}/`)) {
-        return item
-      }
+// export const langFromPath = curry(
+//   /**
+//    * Query language from pathname.
+//    * @param   {array}     languages         Specify which languages are currently available.
+//    * @param   {string}    defaultLanguage   Specify the default language.
+//    * @param   {string}    pathname          Pathname to be queried.
+//    * @return  {string}    Return the queryed language.
+//    */
+//   (languages, defaultLanguage, pathname) => {
+//     for (const item of languages) {
+//       if (pathname.startsWith(`/${item}/`)) {
+//         return item
+//       }
+//     }
+//     return defaultLanguage
+//   }
+// )(languages)(defaultLanguage)
+
+export const langFromPath = pathname => {
+  for (const item of languages) {
+    if (pathname.startsWith(`/${item}/`)) {
+      return item
     }
-    return defaultLanguage
   }
-)(languages)(defaultLanguage)
+  return defaultLanguage
+}
 
 export const deLangPrefix = curry(
   /**
@@ -104,11 +117,18 @@ export const deLangPrefix = curry(
  * @return  {string}    Return the pathname after adding the language prefix.
  */
 export function addLangPrefix(pathname) {
+  if (!i18n) {
+    return pathname
+  }
+
   const prefix = langFromPath(window.location.pathname)
   return `/${prefix}${deLangPrefix(pathname)}`
 }
 
 const routerAddLangPrefix = params => {
+  if (!i18n) {
+    return params
+  }
   if (isString(params)) {
     params = addLangPrefix(params)
   } else {
@@ -211,7 +231,7 @@ export function queryLayout(layouts, pathname) {
 
   for (const item of layouts) {
     let include = false
-    let exlude = false
+    let exclude = false
     if (item.include) {
       for (const regepx of item.include) {
         if (isMatch(regepx)) {
@@ -221,16 +241,16 @@ export function queryLayout(layouts, pathname) {
       }
     }
 
-    if (include && item.exlude) {
-      for (const regepx of item.exlude) {
+    if (include && item.exclude) {
+      for (const regepx of item.exclude) {
         if (isMatch(regepx)) {
-          exlude = true
+          exclude = true
           break
         }
       }
     }
 
-    if (include && !exlude) {
+    if (include && !exclude) {
       result = item.name
       break
     }
@@ -245,10 +265,10 @@ export function getLocale() {
 
 export function setLocale(language) {
   if (getLocale() !== language) {
+    moment.locale(language === 'zh' ? 'zh-cn' : language)
     umiRouter.push({
-      pathname: `/${language}${deLangPrefix(window.location.pathname)}${
-        window.location.search
-      }`,
+      pathname: `/${language}${deLangPrefix(window.location.pathname)}`,
+      search: window.location.search,
     })
   }
 }

src/utils/request.js

@@ -33,11 +33,8 @@ export default function request(options) {
     message.error(e.message)
   }
 
-  options.url =
-    method.toLocaleLowerCase() === 'get'
-      ? `${url}${isEmpty(cloneData) ? '' : '?'}${qs.stringify(cloneData)}`
-      : url
-
+  options.url = url
+  options.params = cloneData
   options.cancelToken = new CancelToken(cancel => {
     window.cancelRequest.set(Symbol(Date.now()), {
       pathname: window.location.pathname,