Merge branch 'develop' into fix-bread-link

.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

package.json

@@ -4,9 +4,9 @@
   "private": true,
   "description": "An admin dashboard application demo built upon Ant Design and UmiJS",
   "dependencies": {
-    "@lingui/react": "^2.7.1",
+    "@lingui/react": "^2.7.2",
     "ant-design-pro": "^2.1.1",
-    "antd": "^3.10.7",
+    "antd": "^3.10.9",
     "axios": "^0.18.0",
     "babel-core": "7.0.0-bridge.0",
     "classnames": "^2.2.6",
@@ -27,21 +27,21 @@
     "nprogress": "^0.2.0",
     "path-to-regexp": "^2.4.0",
     "prop-types": "^15.6.2",
-    "qs": "^6.5.2",
-    "rc-tween-one": "^2.2.17",
+    "qs": "^6.6.0",
+    "rc-tween-one": "^2.2.18",
     "react-adsense": "^0.0.6",
     "react-countup": "^4.0.0-alpha.6",
     "react-draft-wysiwyg": "^1.12.13",
     "react-helmet": "^5.2.0",
     "react-highcharts": "^16.0.2",
     "react-perfect-scrollbar": "^1.4.2",
-    "recharts": "^1.3.6",
+    "recharts": "^1.4.1",
     "store": "^2.0.12"
   },
   "devDependencies": {
-    "@lingui/babel-preset-react": "^2.7.1",
-    "@lingui/cli": "^2.7.1",
-    "@lingui/loader": "^2.7.1",
+    "@lingui/babel-preset-react": "^2.7.2",
+    "@lingui/cli": "^2.7.2",
+    "@lingui/loader": "^2.7.2",
     "babel-eslint": "^10.0.1",
     "babel-plugin-dev-expression": "^0.2.1",
     "babel-plugin-import": "^1.10.0",
@@ -54,20 +54,20 @@
     "eslint-plugin-import": "^2.6.0",
     "eslint-plugin-jsx-a11y": "^6.1.1",
     "eslint-plugin-react": "^7.1.0",
-    "husky": "^1.1.4",
+    "husky": "^1.2.0",
     "less-vars-to-js": "^1.3.0",
-    "lint-staged": "^8.0.4",
+    "lint-staged": "^8.1.0",
     "mockjs": "^1.0.1-beta3",
     "module": "^1.2.5",
     "prettier": "^1.15.2",
-    "stylelint": "^9.8.0",
+    "stylelint": "^9.9.0",
     "stylelint-config-prettier": "^4.0.0",
     "stylelint-config-standard": "^18.2.0",
-    "umi": "^2.2.8",
+    "umi": "^2.3.0-beta.3",
     "umi-plugin-react": "^1.2.3"
   },
   "optionalDependencies": {
-    "puppeteer": "^1.10.0"
+    "puppeteer": "^1.11.0"
   },
   "lint-staged": {
     "src/**/*.js": [

src/components/Layout/Menu.js

@@ -89,12 +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={
@@ -104,6 +109,7 @@ class SiderMenu extends PureComponent {
               }
             : undefined
         }
+        {...menuProps}
       >
         {this.generateMenus(menuTree)}
       </Menu>

src/pages/user/index.js

@@ -46,7 +46,7 @@ class User extends PureComponent {
       title: `${
         modalType === 'create' ? i18n.t`Create User` : i18n.t`Update User`
       }`,
-      wrapClassName: 'vertical-center-modal',
+      centered: true,
       onOk(data) {
         dispatch({
           type: `user/${modalType}`,

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;
   }