diff --git a/package.json b/package.json index 979373fa..3f93f7ae 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "not ie <= 10" ], "dependencies": { - "@ant-design/pro-layout": "^4.9.11", + "@ant-design/pro-layout": "^4.10.0", "@antv/data-set": "^0.10.2", "antd": "^3.23.6", "classnames": "^2.2.6", diff --git a/src/components/PageLoading/index.tsx b/src/components/PageLoading/index.tsx index 0fa952cc..096c58fa 100644 --- a/src/components/PageLoading/index.tsx +++ b/src/components/PageLoading/index.tsx @@ -1,11 +1,5 @@ -import React from 'react'; -import { Spin } from 'antd'; +import { PageLoading } from '@ant-design/pro-layout'; // loading components from code split // https://umijs.org/plugin/umi-plugin-react.html#dynamicimport -const PageLoading: React.FC = () => ( -
- -
-); export default PageLoading; diff --git a/src/layouts/SecurityLayout.tsx b/src/layouts/SecurityLayout.tsx index 2981fc27..e9de1c26 100644 --- a/src/layouts/SecurityLayout.tsx +++ b/src/layouts/SecurityLayout.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { connect } from 'dva'; +import { PageLoading } from '@ant-design/pro-layout'; import { Redirect } from 'umi'; import { stringify } from 'querystring'; import { ConnectState, ConnectProps } from '@/models/connect'; import { CurrentUser } from '@/models/user'; -import PageLoading from '@/components/PageLoading'; interface SecurityLayoutProps extends ConnectProps { loading?: boolean;