From f648a6e7f6cdb67be8b3c3d69efdba7acbfc322b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Fri, 20 May 2022 16:35:48 +0800 Subject: [PATCH] chore: use @ant-design/pro-components --- config/defaultSettings.ts | 2 +- package.json | 6 +----- src/app.tsx | 5 ++--- src/components/Footer/index.tsx | 2 +- src/locales/bn-BD/pages.ts | 2 -- src/locales/en-US/pages.ts | 2 -- src/locales/fa-IR/pages.ts | 2 -- src/locales/id-ID/pages.ts | 2 -- src/locales/ja-JP/pages.ts | 2 -- src/locales/pt-BR/pages.ts | 2 -- src/locales/zh-CN/pages.ts | 2 -- src/pages/Admin.tsx | 2 +- src/pages/TableList/components/UpdateForm.tsx | 2 +- src/pages/TableList/index.tsx | 16 ++++++++------ src/pages/Welcome.tsx | 21 ++----------------- src/pages/user/Login/index.tsx | 7 ++++++- 16 files changed, 25 insertions(+), 52 deletions(-) diff --git a/config/defaultSettings.ts b/config/defaultSettings.ts index 15397c6c..e2b22e1f 100644 --- a/config/defaultSettings.ts +++ b/config/defaultSettings.ts @@ -1,4 +1,4 @@ -import { Settings as LayoutSettings } from '@ant-design/pro-layout'; +import { Settings as LayoutSettings } from '@ant-design/pro-components'; const Settings: LayoutSettings & { pwa?: boolean; diff --git a/package.json b/package.json index 52c7c32e..128f493b 100644 --- a/package.json +++ b/package.json @@ -55,11 +55,7 @@ ], "dependencies": { "@ant-design/icons": "^4.7.0", - "@ant-design/pro-card": "^1.19.0", - "@ant-design/pro-descriptions": "^1.10.0", - "@ant-design/pro-form": "^1.64.0", - "@ant-design/pro-layout": "^6.35.0", - "@ant-design/pro-table": "^2.71.0", + "@ant-design/pro-components": "1.1.0", "@umijs/route-utils": "^2.0.0", "antd": "^4.20.0", "classnames": "^2.3.0", diff --git a/src/app.tsx b/src/app.tsx index 58571014..63e78141 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -1,6 +1,5 @@ -import type { Settings as LayoutSettings } from '@ant-design/pro-layout'; -import { SettingDrawer } from '@ant-design/pro-layout'; -import { PageLoading } from '@ant-design/pro-layout'; +import type { Settings as LayoutSettings } from '@ant-design/pro-components'; +import { SettingDrawer, PageLoading } from '@ant-design/pro-components'; import type { RunTimeLayoutConfig } from 'umi'; import { history, Link } from 'umi'; import RightContent from '@/components/RightContent'; diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx index 4336de96..49fbbec6 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-layout'; +import { DefaultFooter } from '@ant-design/pro-components'; const Footer: React.FC = () => { const intl = useIntl(); diff --git a/src/locales/bn-BD/pages.ts b/src/locales/bn-BD/pages.ts index 726bd209..529900af 100644 --- a/src/locales/bn-BD/pages.ts +++ b/src/locales/bn-BD/pages.ts @@ -23,9 +23,7 @@ export default { 'pages.login.submit': 'প্রবেশ করুন', 'pages.login.loginWith': 'লগইন করতে পারেন:', 'pages.login.registerAccount': 'অ্যাকাউন্ট নিবন্ধন করুন', - 'pages.welcome.advancedComponent': 'অ্যাডভান্সড কম্পোনেন্ট', 'pages.welcome.link': 'স্বাগতম', - 'pages.welcome.advancedLayout': 'অ্যাডভান্সড লেআউট', 'pages.welcome.alertMessage': 'দ্রুত এবং শক্তিশালী ভারী শুল্ক উপাদান প্রকাশ করা হয়েছে।', 'pages.admin.subPage.title': 'এই পৃষ্ঠাটি কেবল অ্যাডমিন দ্বারা দেখা যাবে', 'pages.admin.subPage.alertMessage': diff --git a/src/locales/en-US/pages.ts b/src/locales/en-US/pages.ts index 3d617424..3557341c 100644 --- a/src/locales/en-US/pages.ts +++ b/src/locales/en-US/pages.ts @@ -23,9 +23,7 @@ export default { 'pages.login.submit': 'Login', 'pages.login.loginWith': 'Login with :', 'pages.login.registerAccount': 'Register Account', - 'pages.welcome.advancedComponent': 'Advanced Component', 'pages.welcome.link': 'Welcome', - 'pages.welcome.advancedLayout': 'Advanced Layout', 'pages.welcome.alertMessage': 'Faster and stronger heavy-duty components have been released.', 'pages.admin.subPage.title': 'This page can only be viewed by Admin', 'pages.admin.subPage.alertMessage': diff --git a/src/locales/fa-IR/pages.ts b/src/locales/fa-IR/pages.ts index d2782d3d..f5926112 100644 --- a/src/locales/fa-IR/pages.ts +++ b/src/locales/fa-IR/pages.ts @@ -20,9 +20,7 @@ export default { 'pages.login.submit': 'ارسال', 'pages.login.loginWith': 'وارد شوید با :', 'pages.login.registerAccount': 'ثبت نام', - 'pages.welcome.advancedComponent': 'مولفه پیشرفته', 'pages.welcome.link': 'خوش آمدید', - 'pages.welcome.advancedLayout': 'چیدمان پیشرفته', 'pages.welcome.alertMessage': 'اجزای سنگین تر سریعتر و قوی تر آزاد شده اند.', 'pages.admin.subPage.title': 'این صفحه فقط توسط مدیر قابل مشاهده است', 'pages.admin.subPage.alertMessage': diff --git a/src/locales/id-ID/pages.ts b/src/locales/id-ID/pages.ts index ebae874f..9db23144 100644 --- a/src/locales/id-ID/pages.ts +++ b/src/locales/id-ID/pages.ts @@ -21,9 +21,7 @@ export default { 'pages.login.submit': 'Masuk', 'pages.login.loginWith': 'Masuk dengan :', 'pages.login.registerAccount': 'Daftar Akun', - 'pages.welcome.advancedComponent': 'Formulir Lanjutan', 'pages.welcome.link': 'Selamat datang', - 'pages.welcome.advancedLayout': 'Tata letak Lanjutan', 'pages.welcome.alertMessage': 'Komponen heavy-duty yang lebih cepat dan lebih kuat telah dirilis.', 'pages.admin.subPage.title': 'Halaman ini hanya dapat dilihat oleh admin', diff --git a/src/locales/ja-JP/pages.ts b/src/locales/ja-JP/pages.ts index f438dbe6..d8b21956 100644 --- a/src/locales/ja-JP/pages.ts +++ b/src/locales/ja-JP/pages.ts @@ -21,9 +21,7 @@ export default { 'pages.login.submit': 'ログイン', 'pages.login.loginWith': 'その他のログイン方法：', 'pages.login.registerAccount': 'アカウント登録', - 'pages.welcome.advancedComponent': '高度なコンポーネント', 'pages.welcome.link': 'ようこそ', - 'pages.welcome.advancedLayout': '高度なレイアウト', 'pages.welcome.alertMessage': 'より高速で強力な頑丈なコンポーネントがリリースされました。', 'pages.admin.subPage.title': 'このページは管理者のみが表示できます', 'pages.admin.subPage.alertMessage': diff --git a/src/locales/pt-BR/pages.ts b/src/locales/pt-BR/pages.ts index 14f8a8dd..6d297faa 100644 --- a/src/locales/pt-BR/pages.ts +++ b/src/locales/pt-BR/pages.ts @@ -21,9 +21,7 @@ export default { 'pages.login.submit': 'Enviar', 'pages.login.loginWith': 'Login com :', 'pages.login.registerAccount': 'Registra Conta', - 'pages.welcome.advancedComponent': 'Componente Avançado', 'pages.welcome.link': 'Bem-vindo', - 'pages.welcome.advancedLayout': 'Layout Avançado', 'pages.welcome.alertMessage': 'Componentes pesados mais rápidos e mais fortes foram lançados.', 'pages.admin.subPage.title': 'Esta página só pode ser vista pelo Admin', 'pages.admin.subPage.alertMessage': diff --git a/src/locales/zh-CN/pages.ts b/src/locales/zh-CN/pages.ts index adb36f4d..7fa751fa 100644 --- a/src/locales/zh-CN/pages.ts +++ b/src/locales/zh-CN/pages.ts @@ -22,9 +22,7 @@ export default { 'pages.login.submit': '登录', 'pages.login.loginWith': '其他登录方式 :', 'pages.login.registerAccount': '注册账户', - 'pages.welcome.advancedComponent': '高级表格', 'pages.welcome.link': '欢迎使用', - 'pages.welcome.advancedLayout': '高级布局', 'pages.welcome.alertMessage': '更快更强的重型组件，已经发布。', 'pages.admin.subPage.title': ' 这个页面只有 admin 权限才能查看', 'pages.admin.subPage.alertMessage': 'umi ui 现已发布，欢迎使用 npm run ui 启动体验。', diff --git a/src/pages/Admin.tsx b/src/pages/Admin.tsx index d8922fa2..06481fd3 100644 --- a/src/pages/Admin.tsx +++ b/src/pages/Admin.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { HeartTwoTone, SmileTwoTone } from '@ant-design/icons'; import { Card, Typography, Alert } from 'antd'; -import { PageHeaderWrapper } from '@ant-design/pro-layout'; +import { PageHeaderWrapper } from '@ant-design/pro-components'; import { useIntl } from 'umi'; const Admin: React.FC = () => { diff --git a/src/pages/TableList/components/UpdateForm.tsx b/src/pages/TableList/components/UpdateForm.tsx index 058a1dfe..4c866526 100644 --- a/src/pages/TableList/components/UpdateForm.tsx +++ b/src/pages/TableList/components/UpdateForm.tsx @@ -7,7 +7,7 @@ import { StepsForm, ProFormRadio, ProFormDateTimePicker, -} from '@ant-design/pro-form'; +} from '@ant-design/pro-components'; import { useIntl, FormattedMessage } from 'umi'; export type FormValueType = { diff --git a/src/pages/TableList/index.tsx b/src/pages/TableList/index.tsx index 7a5d0caa..a9595ace 100644 --- a/src/pages/TableList/index.tsx +++ b/src/pages/TableList/index.tsx @@ -2,12 +2,16 @@ import { PlusOutlined } from '@ant-design/icons'; import { Button, message, Input, Drawer } from 'antd'; import React, { useState, useRef } from 'react'; import { useIntl, FormattedMessage } from 'umi'; -import { PageContainer, FooterToolbar } from '@ant-design/pro-layout'; -import type { ProColumns, ActionType } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; -import { ModalForm, ProFormText, ProFormTextArea } from '@ant-design/pro-form'; -import type { ProDescriptionsItemProps } from '@ant-design/pro-descriptions'; -import ProDescriptions from '@ant-design/pro-descriptions'; +import { + PageContainer, + FooterToolbar, + ProDescriptions, + ProTable, + ModalForm, + ProFormText, + ProFormTextArea, +} from '@ant-design/pro-components'; +import type { ProColumns, ActionType, ProDescriptionsItemProps } from '@ant-design/pro-components'; import type { FormValueType } from './components/UpdateForm'; import UpdateForm from './components/UpdateForm'; import { rule, addRule, updateRule, removeRule } from '@/services/ant-design-pro/api'; diff --git a/src/pages/Welcome.tsx b/src/pages/Welcome.tsx index 9041b181..f181e15d 100644 --- a/src/pages/Welcome.tsx +++ b/src/pages/Welcome.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { PageContainer } from '@ant-design/pro-layout'; +import { PageContainer } from '@ant-design/pro-components'; import { Card, Alert, Typography } from 'antd'; import { useIntl, FormattedMessage } from 'umi'; import styles from './Welcome.less'; @@ -32,7 +32,6 @@ const Welcome: React.FC = () => { }} /> - {' '} { - yarn add @ant-design/pro-table - - {' '} - - - - - yarn add @ant-design/pro-layout + yarn add @ant-design/pro-components ); diff --git a/src/pages/user/Login/index.tsx b/src/pages/user/Login/index.tsx index 7d0fe352..88c4441a 100644 --- a/src/pages/user/Login/index.tsx +++ b/src/pages/user/Login/index.tsx @@ -8,7 +8,12 @@ import { } from '@ant-design/icons'; import { Alert, message, Tabs } from 'antd'; import React, { useState } from 'react'; -import { ProFormCaptcha, ProFormCheckbox, ProFormText, LoginForm } from '@ant-design/pro-form'; +import { + ProFormCaptcha, + ProFormCheckbox, + ProFormText, + LoginForm, +} from '@ant-design/pro-components'; import { useIntl, history, FormattedMessage, SelectLang, useModel } from 'umi'; import Footer from '@/components/Footer'; import { login } from '@/services/ant-design-pro/api';