diff --git a/src/locales/en-US/pages.ts b/src/locales/en-US/pages.ts index e37cfb5c..867d8092 100644 --- a/src/locales/en-US/pages.ts +++ b/src/locales/en-US/pages.ts @@ -21,4 +21,27 @@ export default { 'pages.login.submit': 'Submit', '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': + 'Umi ui is now released, welcome to use npm run ui to start the experience.', + 'pages.searchTable.createForm.newRule': 'New Rule', + 'pages.searchTable.updateForm.ruleConfig': 'Rule configuration', + 'pages.searchTable.updateForm.basicConfig': 'Basic Information', + 'pages.searchTable.updateForm.ruleName.nameLabel': 'Rule Name', + 'pages.searchTable.updateForm.ruleName.nameRules': 'Please enter the rule name!', + 'pages.searchTable.updateForm.ruleDesc.descLabel': 'Rule Description', + 'pages.searchTable.updateForm.ruleDesc.descPlaceholder': 'Please enter at least five characters', + 'pages.searchTable.updateForm.ruleDesc.descRules': + 'Please enter a rule description of at least five characters!', + 'pages.searchTable.updateForm.ruleProps.title': 'Configure Properties', + 'pages.searchTable.updateForm.object': 'Monitoring Object', + 'pages.searchTable.updateForm.ruleProps.templateLabel': 'Rule Template', + 'pages.searchTable.updateForm.ruleProps.typeLabel': 'Rule Type', + 'pages.searchTable.updateForm.schedulingPeriod.title': 'Set Scheduling Period', + 'pages.searchTable.updateForm.schedulingPeriod.timeLabel': 'Starting Time', + 'pages.searchTable.updateForm.schedulingPeriod.timeRules': 'Please choose a start time!', }; diff --git a/src/locales/zh-CN/pages.ts b/src/locales/zh-CN/pages.ts index e160d9c4..df9f587b 100644 --- a/src/locales/zh-CN/pages.ts +++ b/src/locales/zh-CN/pages.ts @@ -20,4 +20,25 @@ 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 启动体验。', + 'pages.searchTable.createForm.newRule': '新建规则', + 'pages.searchTable.updateForm.ruleConfig': '规则配置', + 'pages.searchTable.updateForm.basicConfig': '基本信息', + 'pages.searchTable.updateForm.ruleName.nameLabel': '规则名称', + 'pages.searchTable.updateForm.ruleName.nameRules': '请输入规则名称!', + 'pages.searchTable.updateForm.ruleDesc.descLabel': '规则描述', + 'pages.searchTable.updateForm.ruleDesc.descPlaceholder': '请输入至少五个字符', + 'pages.searchTable.updateForm.ruleDesc.descRules': '请输入至少五个字符的规则描述!', + 'pages.searchTable.updateForm.ruleProps.title': '配置规则属性', + 'pages.searchTable.updateForm.object': '监控对象', + 'pages.searchTable.updateForm.ruleProps.templateLabel': '规则模板', + 'pages.searchTable.updateForm.ruleProps.typeLabel': '规则类型', + 'pages.searchTable.updateForm.schedulingPeriod.title': '设定调度周期', + 'pages.searchTable.updateForm.schedulingPeriod.timeLabel': '开始时间', + 'pages.searchTable.updateForm.schedulingPeriod.timeRules': '请选择开始时间!', }; diff --git a/src/pages/Admin.tsx b/src/pages/Admin.tsx index 9c343ad7..7270ec78 100644 --- a/src/pages/Admin.tsx +++ b/src/pages/Admin.tsx @@ -2,30 +2,42 @@ 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 { useIntl } from 'umi'; -export default (): React.ReactNode => ( - - - - - Ant Design Pro You - - -

- Want to add more pages? Please refer to{' '} - - use block - - 。 -

-
-); +export default (): React.ReactNode => { + const intl = useIntl(); + return ( + + + + + Ant Design Pro You + + +

+ Want to add more pages? Please refer to{' '} + + use block + + 。 +

+
+ ); +}; diff --git a/src/pages/ListTableList/components/CreateForm.tsx b/src/pages/ListTableList/components/CreateForm.tsx index 2d8b2164..b62f2aa3 100644 --- a/src/pages/ListTableList/components/CreateForm.tsx +++ b/src/pages/ListTableList/components/CreateForm.tsx @@ -1,5 +1,6 @@ import React from 'react'; import { Modal } from 'antd'; +import { useIntl } from 'umi'; interface CreateFormProps { modalVisible: boolean; @@ -8,11 +9,15 @@ interface CreateFormProps { const CreateForm: React.FC = (props) => { const { modalVisible, onCancel } = props; + const intl = useIntl(); return ( onCancel()} footer={null} diff --git a/src/pages/ListTableList/components/UpdateForm.tsx b/src/pages/ListTableList/components/UpdateForm.tsx index 3971bec8..df376fd9 100644 --- a/src/pages/ListTableList/components/UpdateForm.tsx +++ b/src/pages/ListTableList/components/UpdateForm.tsx @@ -8,6 +8,7 @@ import { ProFormRadio, ProFormDateTimePicker, } from '@ant-design/pro-form'; +import { useIntl, FormattedMessage } from 'umi'; import { TableListItem } from '../data.d'; @@ -26,108 +27,178 @@ export interface UpdateFormProps { values: Partial; } -const UpdateForm: React.FC = (props) => ( - { - return ( - props.onCancel()} - > - {dom} - - ); - }} - onFinish={props.onSubmit} - > - = (props) => { + const intl = useIntl(); + return ( + - - - - { + return ( + props.onCancel()} + > + {dom} + + ); }} - title="配置规则属性" + onFinish={props.onSubmit} > - - + + ), + }, + ]} + /> + + ), + min: 5, + }, + ]} + /> + + - - - - - + + + + + - - -); + title={intl.formatMessage({ + id: 'pages.searchTable.updateForm.schedulingPeriod.title', + defaultMessage: '设定调度周期', + })} + > + + ), + }, + ]} + /> + + + + ); +}; export default UpdateForm; diff --git a/src/pages/Welcome.tsx b/src/pages/Welcome.tsx index cf68a154..0c640e93 100644 --- a/src/pages/Welcome.tsx +++ b/src/pages/Welcome.tsx @@ -1,6 +1,7 @@ import React from 'react'; import { PageContainer } from '@ant-design/pro-layout'; import { Card, Alert, Typography } from 'antd'; +import { useIntl, FormattedMessage } from 'umi'; import styles from './Welcome.less'; const CodePreview: React.FC<{}> = ({ children }) => ( @@ -11,46 +12,52 @@ const CodePreview: React.FC<{}> = ({ children }) => ( ); -export default (): React.ReactNode => ( - - - - - 高级表格{' '} - { + const intl = useIntl(); + return ( + + + + + {' '} + + + + + yarn add @ant-design/pro-table + - 欢迎使用 - - - yarn add @ant-design/pro-table - - 高级布局{' '} - - 欢迎使用 - - - yarn add @ant-design/pro-layout - - -); + {' '} + + + + + yarn add @ant-design/pro-layout + + + ); +};