From d3f021945e6c1b6a720d564e85eeb2910cad5437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Fri, 20 May 2022 23:27:09 +0800 Subject: [PATCH] fix: use @umijs/fabric new version --- package.json | 4 ++-- src/app.tsx | 10 +++++----- src/components/Footer/index.tsx | 2 +- src/components/HeaderDropdown/index.tsx | 4 ++-- src/components/HeaderSearch/index.tsx | 5 ++--- src/components/NoticeIcon/NoticeIcon.tsx | 6 +++--- src/components/NoticeIcon/NoticeList.tsx | 3 +-- src/components/NoticeIcon/index.tsx | 9 ++++----- src/components/RightContent/AvatarDropdown.tsx | 10 +++++----- src/components/RightContent/index.tsx | 6 +++--- src/components/index.md | 9 ++++----- src/e2e/baseLayout.e2e.spec.ts | 2 +- src/locales/fa-IR.ts | 2 +- src/locales/id-ID.ts | 2 +- src/locales/ja-JP.ts | 6 +++--- src/locales/pt-BR.ts | 2 +- src/locales/zh-CN.ts | 2 +- src/pages/Admin.tsx | 4 ++-- src/pages/TableList/components/UpdateForm.tsx | 10 +++++----- src/pages/TableList/index.tsx | 16 ++++++++-------- src/pages/Welcome.tsx | 6 +++--- src/pages/user/Login/index.tsx | 15 +++++++-------- 22 files changed, 65 insertions(+), 70 deletions(-) diff --git a/package.json b/package.json index 128f493b..9bb5047c 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ ], "dependencies": { "@ant-design/icons": "^4.7.0", - "@ant-design/pro-components": "1.1.0", + "@ant-design/pro-components": "1.1.1", "@umijs/route-utils": "^2.0.0", "antd": "^4.20.0", "classnames": "^2.3.0", @@ -81,7 +81,7 @@ "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", "@types/react-helmet": "^6.1.0", - "@umijs/fabric": "^2.8.0", + "@umijs/fabric": "^2.11.1", "@umijs/openapi": "^1.3.0", "@umijs/plugin-blocks": "^2.2.0", "@umijs/plugin-esbuild": "^1.4.0", diff --git a/src/app.tsx b/src/app.tsx index 63e78141..f72703eb 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -1,12 +1,12 @@ +import Footer from '@/components/Footer'; +import RightContent from '@/components/RightContent'; +import { BookOutlined, LinkOutlined } from '@ant-design/icons'; import type { Settings as LayoutSettings } from '@ant-design/pro-components'; -import { SettingDrawer, PageLoading } from '@ant-design/pro-components'; +import { PageLoading, SettingDrawer } from '@ant-design/pro-components'; import type { RunTimeLayoutConfig } from 'umi'; import { history, Link } from 'umi'; -import RightContent from '@/components/RightContent'; -import Footer from '@/components/Footer'; -import { currentUser as queryCurrentUser } from './services/ant-design-pro/api'; -import { BookOutlined, LinkOutlined } from '@ant-design/icons'; import defaultSettings from '../config/defaultSettings'; +import { currentUser as queryCurrentUser } from './services/ant-design-pro/api'; const isDev = process.env.NODE_ENV === 'development'; const loginPath = '/user/login'; diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx index 49fbbec6..d5b58c7e 100644 --- a/src/components/Footer/index.tsx +++ b/src/components/Footer/index.tsx @@ -1,6 +1,6 @@ -import { useIntl } from 'umi'; import { GithubOutlined } from '@ant-design/icons'; import { DefaultFooter } from '@ant-design/pro-components'; +import { useIntl } from 'umi'; const Footer: React.FC = () => { const intl = useIntl(); diff --git a/src/components/HeaderDropdown/index.tsx b/src/components/HeaderDropdown/index.tsx index 45af90ae..714ff761 100644 --- a/src/components/HeaderDropdown/index.tsx +++ b/src/components/HeaderDropdown/index.tsx @@ -1,7 +1,7 @@ -import type { DropDownProps } from 'antd/es/dropdown'; import { Dropdown } from 'antd'; -import React from 'react'; +import type { DropDownProps } from 'antd/es/dropdown'; import classNames from 'classnames'; +import React from 'react'; import styles from './index.less'; export type HeaderDropdownProps = { diff --git a/src/components/HeaderSearch/index.tsx b/src/components/HeaderSearch/index.tsx index d282de14..2a03b4e2 100644 --- a/src/components/HeaderSearch/index.tsx +++ b/src/components/HeaderSearch/index.tsx @@ -1,11 +1,10 @@ import { SearchOutlined } from '@ant-design/icons'; import type { InputRef } from 'antd'; import { AutoComplete, Input } from 'antd'; -import useMergedState from 'rc-util/es/hooks/useMergedState'; import type { AutoCompleteProps } from 'antd/es/auto-complete'; -import React, { useRef } from 'react'; - import classNames from 'classnames'; +import useMergedState from 'rc-util/es/hooks/useMergedState'; +import React, { useRef } from 'react'; import styles from './index.less'; export type HeaderSearchProps = { diff --git a/src/components/NoticeIcon/NoticeIcon.tsx b/src/components/NoticeIcon/NoticeIcon.tsx index 7a530c05..20607b57 100644 --- a/src/components/NoticeIcon/NoticeIcon.tsx +++ b/src/components/NoticeIcon/NoticeIcon.tsx @@ -1,12 +1,12 @@ import { BellOutlined } from '@ant-design/icons'; import { Badge, Spin, Tabs } from 'antd'; +import classNames from 'classnames'; import useMergedState from 'rc-util/es/hooks/useMergedState'; import React from 'react'; -import classNames from 'classnames'; -import type { NoticeIconTabProps } from './NoticeList'; -import NoticeList from './NoticeList'; import HeaderDropdown from '../HeaderDropdown'; import styles from './index.less'; +import type { NoticeIconTabProps } from './NoticeList'; +import NoticeList from './NoticeList'; const { TabPane } = Tabs; diff --git a/src/components/NoticeIcon/NoticeList.tsx b/src/components/NoticeIcon/NoticeList.tsx index 7afae9fb..f53aa3d4 100644 --- a/src/components/NoticeIcon/NoticeList.tsx +++ b/src/components/NoticeIcon/NoticeList.tsx @@ -1,7 +1,6 @@ import { Avatar, List } from 'antd'; - -import React from 'react'; import classNames from 'classnames'; +import React from 'react'; import styles from './NoticeList.less'; export type NoticeIconTabProps = { diff --git a/src/components/NoticeIcon/index.tsx b/src/components/NoticeIcon/index.tsx index 326a363b..a549dc94 100644 --- a/src/components/NoticeIcon/index.tsx +++ b/src/components/NoticeIcon/index.tsx @@ -1,12 +1,11 @@ -import { useEffect, useState } from 'react'; -import { Tag, message } from 'antd'; +import { getNotices } from '@/services/ant-design-pro/api'; +import { message, Tag } from 'antd'; import { groupBy } from 'lodash'; import moment from 'moment'; +import { useEffect, useState } from 'react'; import { useModel, useRequest } from 'umi'; -import { getNotices } from '@/services/ant-design-pro/api'; - -import NoticeIcon from './NoticeIcon'; import styles from './index.less'; +import NoticeIcon from './NoticeIcon'; export type GlobalHeaderRightProps = { fetchingNotices?: boolean; diff --git a/src/components/RightContent/AvatarDropdown.tsx b/src/components/RightContent/AvatarDropdown.tsx index 1edc225a..83669e9e 100644 --- a/src/components/RightContent/AvatarDropdown.tsx +++ b/src/components/RightContent/AvatarDropdown.tsx @@ -1,13 +1,13 @@ -import React, { useCallback } from 'react'; +import { outLogin } from '@/services/ant-design-pro/api'; import { LogoutOutlined, SettingOutlined, UserOutlined } from '@ant-design/icons'; import { Avatar, Menu, Spin } from 'antd'; -import { history, useModel } from 'umi'; +import type { ItemType } from 'antd/lib/menu/hooks/useItems'; import { stringify } from 'querystring'; +import type { MenuInfo } from 'rc-menu/lib/interface'; +import React, { useCallback } from 'react'; +import { history, useModel } from 'umi'; import HeaderDropdown from '../HeaderDropdown'; import styles from './index.less'; -import { outLogin } from '@/services/ant-design-pro/api'; -import type { MenuInfo } from 'rc-menu/lib/interface'; -import type { ItemType } from 'antd/lib/menu/hooks/useItems'; export type GlobalHeaderRightProps = { menu?: boolean; diff --git a/src/components/RightContent/index.tsx b/src/components/RightContent/index.tsx index 9463b1f1..9696dc22 100644 --- a/src/components/RightContent/index.tsx +++ b/src/components/RightContent/index.tsx @@ -1,9 +1,9 @@ -import { Space } from 'antd'; import { QuestionCircleOutlined } from '@ant-design/icons'; +import { Space } from 'antd'; import React from 'react'; -import { useModel, SelectLang } from 'umi'; -import Avatar from './AvatarDropdown'; +import { SelectLang, useModel } from 'umi'; import HeaderSearch from '../HeaderSearch'; +import Avatar from './AvatarDropdown'; import styles from './index.less'; export type SiderTheme = 'light' | 'dark'; diff --git a/src/components/index.md b/src/components/index.md index 408da93a..d75715c9 100644 --- a/src/components/index.md +++ b/src/components/index.md @@ -17,8 +17,8 @@ sidemenu: false /** * background: '#f0f2f5' */ -import React from 'react'; import Footer from '@/components/Footer'; +import React from 'react'; export default () =>