diff --git a/package.json b/package.json index e46b6b81..593daba1 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "react-dom": "^16.8.6", "react-helmet": "^5.2.1", "redux": "^4.0.1", - "umi": "^2.8.7", + "umi": "^2.13.0", "umi-plugin-antd-theme": "^1.0.1", "umi-plugin-pro-block": "^1.3.2", "umi-plugin-react": "^1.9.5", diff --git a/src/components/GlobalHeader/AvatarDropdown.tsx b/src/components/GlobalHeader/AvatarDropdown.tsx index 9a7f0218..bcc2ffae 100644 --- a/src/components/GlobalHeader/AvatarDropdown.tsx +++ b/src/components/GlobalHeader/AvatarDropdown.tsx @@ -3,7 +3,7 @@ import { ClickParam } from 'antd/es/menu'; import { FormattedMessage } from 'umi-plugin-react/locale'; import React from 'react'; import { connect } from 'dva'; -import router from 'umi/router'; +import { router } from 'umi'; import { ConnectProps, ConnectState } from '@/models/connect'; import { CurrentUser } from '@/models/user'; diff --git a/src/layouts/BasicLayout.tsx b/src/layouts/BasicLayout.tsx index 7ef557ce..4cf97620 100644 --- a/src/layouts/BasicLayout.tsx +++ b/src/layouts/BasicLayout.tsx @@ -11,7 +11,7 @@ import ProLayout, { DefaultFooter, } from '@ant-design/pro-layout'; import React, { useEffect } from 'react'; -import Link from 'umi/link'; +import { Link } from 'umi'; import { Dispatch } from 'redux'; import { connect } from 'dva'; import { Icon, Result, Button } from 'antd'; diff --git a/src/layouts/UserLayout.tsx b/src/layouts/UserLayout.tsx index 3f668643..ccde893d 100644 --- a/src/layouts/UserLayout.tsx +++ b/src/layouts/UserLayout.tsx @@ -1,6 +1,6 @@ import { DefaultFooter, MenuDataItem, getMenuData, getPageTitle } from '@ant-design/pro-layout'; import { Helmet } from 'react-helmet'; -import Link from 'umi/link'; +import { Link } from 'umi'; import React from 'react'; import { connect } from 'dva'; import { formatMessage } from 'umi-plugin-react/locale'; diff --git a/src/models/login.ts b/src/models/login.ts index ff5d0f1c..1e37a05f 100644 --- a/src/models/login.ts +++ b/src/models/login.ts @@ -1,7 +1,7 @@ import { Reducer } from 'redux'; import { Effect } from 'dva'; import { stringify } from 'querystring'; -import router from 'umi/router'; +import { router } from 'umi'; import { fakeAccountLogin, getFakeCaptcha } from '@/services/login'; import { setAuthority } from '@/utils/authority'; diff --git a/src/pages/404.tsx b/src/pages/404.tsx index 05b0a2da..898bbfc2 100644 --- a/src/pages/404.tsx +++ b/src/pages/404.tsx @@ -1,6 +1,6 @@ import { Button, Result } from 'antd'; import React from 'react'; -import router from 'umi/router'; +import { router } from 'umi'; // 这里应该使用 antd 的 404 result 组件, // 但是还没发布,先来个简单的。 diff --git a/src/pages/Authorized.tsx b/src/pages/Authorized.tsx index e01e3aba..d685a797 100644 --- a/src/pages/Authorized.tsx +++ b/src/pages/Authorized.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import Redirect from 'umi/redirect'; +import { Redirect } from 'umi'; import { connect } from 'dva'; import Authorized from '@/utils/Authorized'; import { getRouteAuthority } from '@/utils/utils'; diff --git a/src/pages/user/login/index.tsx b/src/pages/user/login/index.tsx index 9f5fd6c7..53723744 100644 --- a/src/pages/user/login/index.tsx +++ b/src/pages/user/login/index.tsx @@ -5,7 +5,7 @@ import React, { Component } from 'react'; import { CheckboxChangeEvent } from 'antd/es/checkbox'; import { Dispatch, AnyAction } from 'redux'; import { FormComponentProps } from 'antd/es/form'; -import Link from 'umi/link'; +import { Link } from 'umi'; import { connect } from 'dva'; import { StateType } from '@/models/login'; import LoginComponents from './components/Login';