diff --git a/docs/configuration.md b/docs/configuration.md index c95e231..54acff7 100644 --- a/docs/configuration.md +++ b/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 @@ -44,20 +44,20 @@ You can do some custom configuration in `/src/utils/config.js`: { 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 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). + > 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 @@ -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 diff --git a/package.json b/package.json index af75c37..eeb9709 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "antd-admin", - "version": "5.0.0", + "version": "5.0.1", "private": true, "description": "An admin dashboard application demo built upon Ant Design and UmiJS", "dependencies": { diff --git a/src/components/Layout/Bread.js b/src/components/Layout/Bread.js index 67cc7d6..db202f5 100644 --- a/src/components/Layout/Bread.js +++ b/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() @@ -24,7 +24,7 @@ class Bread extends PureComponent { return ( {paths.length - 1 !== key ? ( - {content} + {content} ) : ( content )} diff --git a/src/services/api.js b/src/services/api.js index f745bd2..e34b942 100644 --- a/src/services/api.js +++ b/src/services/api.js @@ -8,7 +8,7 @@ export default { queryUser: '/user/:id', queryUserList: '/users', updateUser: 'Patch /user/:id', - createUser: 'POST /user/:id', + createUser: 'POST /user', removeUser: 'DELETE /user/:id', removeUserList: 'POST /users/delete', diff --git a/src/utils/index.js b/src/utils/index.js index 097502a..33bd195 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -246,9 +246,8 @@ export function getLocale() { export function setLocale(language) { if (getLocale() !== language) { umiRouter.push({ - pathname: `/${language}${deLangPrefix(window.location.pathname)}${ - window.location.search - }`, + pathname: `/${language}${deLangPrefix(window.location.pathname)}`, + search: window.location.search, }) } }