Merge commit '0ac4839e948f7b1d34c90d33f4ece483bd9d2f48'

.umirc.js

@@ -58,7 +58,6 @@ export default {
         dll: {
           include: ['dva', 'dva/router', 'dva/saga', 'dva/fetch', 'antd/es'],
         },
-        // hardSource: /* isMac */ process.platform === 'darwin',
         pwa: {
           manifestOptions: {
             srcPath: 'manifest.json'

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)

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)

docs/zh-cn/deploy.md

@@ -36,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)。
 
 ## 本地验证
 

package.json

@@ -4,8 +4,8 @@
   "private": true,
   "description": "An admin dashboard application demo built upon Ant Design and UmiJS",
   "dependencies": {
-    "@lingui/react": "^2.7.2",
-    "ant-design-pro": "^2.2.0",
+    "@lingui/react": "^2.7.0",
+    "ant-design-pro": "^2.3.0",
     "antd": "^3.14.0",
     "axios": "^0.18.0",
     "babel-core": "7.0.0-bridge.0",
@@ -27,7 +27,7 @@
     "nprogress": "^0.2.0",
     "path-to-regexp": "^2.4.0",
     "prop-types": "^15.7.0",
-    "qs": "^6.6.0",
+    "qs": "^6.7.0",
     "rc-tween-one": "^2.3.0",
     "react-adsense": "^0.0.6",
     "react-countup": "^4.1.0",
@@ -39,9 +39,9 @@
     "store": "^2.0.12"
   },
   "devDependencies": {
-    "@lingui/babel-preset-react": "^2.7.2",
-    "@lingui/cli": "^2.7.2",
-    "@lingui/loader": "^2.7.2",
+    "@lingui/babel-preset-react": "^2.7.0",
+    "@lingui/cli": "^2.7.0",
+    "@lingui/loader": "^2.7.0",
     "babel-eslint": "^10.0.1",
     "babel-plugin-dev-expression": "^0.2.1",
     "babel-plugin-import": "^1.10.0",
@@ -50,7 +50,7 @@
     "cross-env": "^5.2.0",
     "eslint": "^5.15.0",
     "eslint-config-react-app": "^3.0.5",
-    "eslint-plugin-flowtype": "^3.4.0",
+    "eslint-plugin-flowtype": "^3.6.0",
     "eslint-plugin-import": "^2.16.0",
     "eslint-plugin-jsx-a11y": "^6.2.1",
     "eslint-plugin-react": "^7.12.0",
@@ -63,11 +63,8 @@
     "stylelint": "^9.10.0",
     "stylelint-config-prettier": "^5.0.0",
     "stylelint-config-standard": "^18.2.0",
-    "umi": "^2.5.0",
-    "umi-plugin-react": "^1.5.0"
-  },
-  "optionalDependencies": {
-    "puppeteer": "^1.13.0"
+    "umi": "^2.6.0",
+    "umi-plugin-react": "^1.7.0"
   },
   "lint-staged": {
     "src/**/*.js": [

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/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,12 @@ const TwoColProps = {
 
 @withI18n()
 @Form.create()
-class Filter extends PureComponent {
+class Filter extends Component {
+  componentDidUpdate(prevProps, prevState) {
+    if (Object.keys(prevProps.filter).length === 0) {
+      this.handleReset()
+    }
+  }
   handleFields = fields => {
     const { createTime } = fields
     if (createTime.length) {

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'