diff --git a/src/layouts/BasicLayout.tsx b/src/layouts/BasicLayout.tsx index 33d94ff2833d76ab64bc71c47ef3c449f21cba7a..03d86f36c97710cfc81593e20296e0cb9e038e29 100644 --- a/src/layouts/BasicLayout.tsx +++ b/src/layouts/BasicLayout.tsx @@ -12,13 +12,13 @@ import logo from '../assets/logo.svg'; import Authorized from '@/utils/Authorized'; import { formatMessage } from 'umi-plugin-react/locale'; import { - BasicLayout as BasicLayoutComponents, - BasicLayoutProps as BasicLayoutComponentsProps, + BasicLayout as ProLayoutComponents, + BasicLayoutProps as ProLayoutComponentsProps, MenuDataItem, Settings, } from '@ant-design/pro-layout'; import Link from 'umi/link'; -export interface BasicLayoutProps extends BasicLayoutComponentsProps, ConnectProps { +export interface BasicLayoutProps extends ProLayoutComponentsProps, ConnectProps { breadcrumbNameMap: { [path: string]: MenuDataItem; }; @@ -68,7 +68,7 @@ const BasicLayout: React.FC = props => { }); return ( - { @@ -93,7 +93,7 @@ const BasicLayout: React.FC = props => { {...settings} > {children} - + ); }; diff --git a/src/pages/Welcome.tsx b/src/pages/Welcome.tsx index 1f78bed0fda63b325a19ff1d092e034e24970532..cad44f13486bd2b2ee8758d6d2249343039352b3 100644 --- a/src/pages/Welcome.tsx +++ b/src/pages/Welcome.tsx @@ -2,9 +2,9 @@ import React from 'react'; export default () => (

- 想要添加更多页面?请参考{' '} + Want to add more pages? Please refer to{' '} - umi 区块 + umi block

diff --git a/src/typings.d.ts b/src/typings.d.ts index ae32dca52c4ccf907d122be66ae701874e6d7263..d32d9d232c9174f587886558cf95622bb82e99f6 100644 --- a/src/typings.d.ts +++ b/src/typings.d.ts @@ -1,3 +1,7 @@ +declare module 'slash2'; +declare module 'antd-pro-merge-less'; +declare module 'antd-theme-webpack-plugin'; + declare module '*.css'; declare module '*.less'; declare module '*.scss'; @@ -15,12 +19,7 @@ declare module 'react-copy-to-clipboard'; declare module 'react-fittext'; declare module '@antv/data-set'; declare module 'nzh/cn'; -declare var APP_TYPE: string; -declare module 'memoize-one' { - function memoizeOne any>( - resultFn: T, - isEqual?: (a: any, b: any, index: number) => boolean, - ): T; - export default memoizeOne; -} +// preview.pro.ant.design only do not use in your production ; +// preview.pro.ant.design 专用环境变量,请不要在你的项目中使用它。 +declare let ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: 'site' | undefined; diff --git a/typings.d.ts b/typings.d.ts deleted file mode 100644 index d8a1fecb911f26a90c019494bdac9ec4bddca97e..0000000000000000000000000000000000000000 --- a/typings.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -declare module 'slash2'; -declare module 'antd-pro-merge-less'; -declare module 'antd-theme-webpack-plugin'; - -declare let ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: 'site' | undefined;