Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
Baorong Li committed Mar 5, 2019
2 parents 5b32607 + 3a6c587 commit 693625b
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 19 deletions.
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "antd-admin",
"version": "5.0.4",
"version": "5.0.5",
"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",
"antd": "^3.13.0",
"antd": "^3.14.0",
"axios": "^0.18.0",
"babel-core": "7.0.0-bridge.0",
"classnames": "^2.2.6",
Expand All @@ -25,13 +25,13 @@
"lodash": "^4.17.11",
"md5": "^2.2.1",
"nprogress": "^0.2.0",
"path-to-regexp": "^3.0.0",
"prop-types": "^15.7.2",
"path-to-regexp": "^2.4.0",
"prop-types": "^15.7.0",
"qs": "^6.6.0",
"rc-tween-one": "^2.2.18",
"rc-tween-one": "^2.3.0",
"react-adsense": "^0.0.6",
"react-countup": "^4.1.0",
"react-draft-wysiwyg": "^1.12.13",
"react-draft-wysiwyg": "^1.13.0",
"react-helmet": "^5.2.0",
"react-highcharts": "^16.0.2",
"react-perfect-scrollbar": "^1.4.2",
Expand All @@ -48,26 +48,26 @@
"babel-plugin-macros": "^2.5.0",
"babel-plugin-module-resolver": "^3.2.0",
"cross-env": "^5.2.0",
"eslint": "^5.14.0",
"eslint": "^5.15.0",
"eslint-config-react-app": "^3.0.5",
"eslint-plugin-flowtype": "^3.4.0",
"eslint-plugin-import": "^2.16.0",
"eslint-plugin-jsx-a11y": "^6.2.0",
"eslint-plugin-react": "^7.1.0",
"husky": "^1.2.0",
"eslint-plugin-jsx-a11y": "^6.2.1",
"eslint-plugin-react": "^7.12.0",
"husky": "^1.3.0",
"less-vars-to-js": "^1.3.0",
"lint-staged": "^8.1.0",
"mockjs": "^1.0.1-beta3",
"module": "^1.2.5",
"prettier": "^1.16.0",
"stylelint": "^9.10.0",
"stylelint-config-prettier": "^4.0.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.11.0"
"puppeteer": "^1.13.0"
},
"lint-staged": {
"src/**/*.js": [
Expand Down Expand Up @@ -105,7 +105,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",
Expand Down
11 changes: 5 additions & 6 deletions src/layouts/PrimaryLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,18 @@ class PrimaryLayout extends PureComponent {

// Localized route name.

const lang = langFromPath(location.pathname);
const lang = langFromPath(location.pathname)
const newRouteList =
lang !== 'en'
lang !== 'en'
? routeList.map(item => {
const { name , ...other } = item
const { name, ...other } = item
return {
...other,
name: ((item[lang] || {}).name || name),
name: (item[lang] || {}).name || name,
}
})
: routeList


// Find a route that matches the pathname.
const currentRoute = newRouteList.find(
_ => _.route && pathMatchRegexp(_.route, location.pathname)
Expand Down Expand Up @@ -148,7 +147,7 @@ class PrimaryLayout extends PureComponent {
</Content>
<BackTop
className={styles.backTop}
target={() => document.querySelector('#primaryLayout>div')}
target={() => document.querySelector('#primaryLayout')}
/>
<GlobalFooter
className={styles.footer}
Expand Down

0 comments on commit 693625b

Please sign in to comment.