From cadae90ac3ad82213ca464d2f19d832476be64bd Mon Sep 17 00:00:00 2001 From: kevinadhiguna <43397636+kevinadhiguna@users.noreply.github.com> Date: Tue, 24 Nov 2020 15:49:16 +0700 Subject: [PATCH] feat: add English translation for Search Table screen (#7600) --- src/locales/en-US/pages.ts | 21 +++++++ src/locales/zh-CN/pages.ts | 21 +++++++ src/pages/ListTableList/index.tsx | 100 +++++++++++++++++++++++------- 3 files changed, 121 insertions(+), 21 deletions(-) diff --git a/src/locales/en-US/pages.ts b/src/locales/en-US/pages.ts index 867d8092..43dbdbc6 100644 --- a/src/locales/en-US/pages.ts +++ b/src/locales/en-US/pages.ts @@ -44,4 +44,25 @@ export default { '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!', + 'pages.searchTable.titleDesc': 'Description', + 'pages.searchTable.ruleName': 'Rule name is required', + 'pages.searchTable.titleCallNo': 'Number of Service Calls', + 'pages.searchTable.titleStatus': 'Status', + 'pages.searchTable.nameStatus.default': 'default', + 'pages.searchTable.nameStatus.running': 'running', + 'pages.searchTable.nameStatus.online': 'online', + 'pages.searchTable.nameStatus.abnormal': 'abnormal', + 'pages.searchTable.titleUpdatedAt': 'Last Scheduled at', + 'pages.searchTable.exception': 'Please enter the reason for the exception!', + 'pages.searchTable.titleOption': 'Option', + 'pages.searchTable.config': 'Configuration', + 'pages.searchTable.subscribeAlert': 'Subscribe to alerts', + 'pages.searchTable.title': 'Enquiry Form', + 'pages.searchTable.new': 'New', + 'pages.searchTable.chosen': 'chosen', + 'pages.searchTable.item': 'item', + 'pages.searchTable.totalServiceCalls': 'Total Number of Service Calls', + 'pages.searchTable.tenThousand': '0000', + 'pages.searchTable.batchDeletion': 'bacth deletion', + 'pages.searchTable.batchApproval': 'batch approval', }; diff --git a/src/locales/zh-CN/pages.ts b/src/locales/zh-CN/pages.ts index df9f587b..96298b3a 100644 --- a/src/locales/zh-CN/pages.ts +++ b/src/locales/zh-CN/pages.ts @@ -41,4 +41,25 @@ export default { 'pages.searchTable.updateForm.schedulingPeriod.title': '设定调度周期', 'pages.searchTable.updateForm.schedulingPeriod.timeLabel': '开始时间', 'pages.searchTable.updateForm.schedulingPeriod.timeRules': '请选择开始时间!', + 'pages.searchTable.titleDesc': '描述', + 'pages.searchTable.ruleName': '规则名称为必填项', + 'pages.searchTable.titleCallNo': '服务调用次数', + 'pages.searchTable.titleStatus': '状态', + 'pages.searchTable.nameStatus.default': '关闭', + 'pages.searchTable.nameStatus.running': '运行中', + 'pages.searchTable.nameStatus.online': '已上线', + 'pages.searchTable.nameStatus.abnormal': '异常', + 'pages.searchTable.titleUpdatedAt': '上次调度时间', + 'pages.searchTable.exception': '请输入异常原因!', + 'pages.searchTable.titleOption': '操作', + 'pages.searchTable.config': '配置', + 'pages.searchTable.subscribeAlert': '订阅警报', + 'pages.searchTable.title': '查询表格', + 'pages.searchTable.new': '新建', + 'pages.searchTable.chosen': '已选择', + 'pages.searchTable.item': '项', + 'pages.searchTable.totalServiceCalls': '服务调用次数总计', + 'pages.searchTable.tenThousand': '万', + 'pages.searchTable.batchDeletion': '批量删除', + 'pages.searchTable.batchApproval': '批量审批', }; diff --git a/src/pages/ListTableList/index.tsx b/src/pages/ListTableList/index.tsx index 97221b54..1105a354 100644 --- a/src/pages/ListTableList/index.tsx +++ b/src/pages/ListTableList/index.tsx @@ -1,6 +1,7 @@ import { PlusOutlined } from '@ant-design/icons'; import { Button, Divider, 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 ProTable, { ProColumns, ActionType } from '@ant-design/pro-table'; import ProDescriptions from '@ant-design/pro-descriptions'; @@ -78,16 +79,24 @@ const TableList: React.FC<{}> = () => { const actionRef = useRef(); const [row, setRow] = useState(); const [selectedRowsState, setSelectedRows] = useState([]); + const intl = useIntl(); const columns: ProColumns[] = [ { - title: '规则名称', + title: ( + + ), dataIndex: 'name', tip: '规则名称是唯一的 key', formItemProps: { rules: [ { required: true, - message: '规则名称为必填项', + message: ( + + ), }, ], }, @@ -96,30 +105,56 @@ const TableList: React.FC<{}> = () => { }, }, { - title: '描述', + title: , dataIndex: 'desc', valueType: 'textarea', }, { - title: '服务调用次数', + title: , dataIndex: 'callNo', sorter: true, hideInForm: true, - renderText: (val: string) => `${val} 万`, + renderText: (val: string) => + `${val}${intl.formatMessage({ + id: 'pages.searchTable.tenThousand', + defaultMessage: ' 万 ', + })}`, }, { - title: '状态', + title: , dataIndex: 'status', hideInForm: true, valueEnum: { - 0: { text: '关闭', status: 'Default' }, - 1: { text: '运行中', status: 'Processing' }, - 2: { text: '已上线', status: 'Success' }, - 3: { text: '异常', status: 'Error' }, + 0: { + text: ( + + ), + status: 'Default', + }, + 1: { + text: ( + + ), + status: 'Processing', + }, + 2: { + text: ( + + ), + status: 'Success', + }, + 3: { + text: ( + + ), + status: 'Error', + }, }, }, { - title: '上次调度时间', + title: ( + + ), dataIndex: 'updatedAt', sorter: true, valueType: 'dateTime', @@ -130,13 +165,21 @@ const TableList: React.FC<{}> = () => { return false; } if (`${status}` === '3') { - return ; + return ( + + ); } return defaultRender(item); }, }, { - title: '操作', + title: , dataIndex: 'option', valueType: 'option', render: (_, record) => ( @@ -147,10 +190,12 @@ const TableList: React.FC<{}> = () => { setStepFormValues(record); }} > - 配置 + - 订阅警报 + + + ), }, @@ -159,7 +204,10 @@ const TableList: React.FC<{}> = () => { return ( - headerTitle="查询表格" + headerTitle={intl.formatMessage({ + id: 'pages.searchTable.title', + defaultMessage: '查询表格', + })} actionRef={actionRef} rowKey="key" search={{ @@ -167,7 +215,7 @@ const TableList: React.FC<{}> = () => { }} toolBarRender={() => [ , ]} request={(params, sorter, filter) => queryRule({ ...params, sorter, filter })} @@ -180,9 +228,17 @@ const TableList: React.FC<{}> = () => { - 已选择 {selectedRowsState.length} 项   + {' '} + {selectedRowsState.length}{' '} + +    - 服务调用次数总计 {selectedRowsState.reduce((pre, item) => pre + item.callNo, 0)} 万 + {' '} + {selectedRowsState.reduce((pre, item) => pre + item.callNo, 0)}{' '} + } @@ -194,9 +250,11 @@ const TableList: React.FC<{}> = () => { actionRef.current?.reloadAndRest?.(); }} > - 批量删除 + + + - )} handleModalVisible(false)} modalVisible={createModalVisible}>