diff --git a/seatunnel-ui/src/locales/en_US/common.ts b/seatunnel-ui/src/locales/en_US/common.ts index 092cf9ad9..cfc0284ed 100644 --- a/seatunnel-ui/src/locales/en_US/common.ts +++ b/seatunnel-ui/src/locales/en_US/common.ts @@ -17,6 +17,7 @@ export default { success_tips: 'Success', + day: 'd', hour: 'h', min: 'm', second: 's', diff --git a/seatunnel-ui/src/locales/zh_CN/common.ts b/seatunnel-ui/src/locales/zh_CN/common.ts index 4289aa2c7..0efec1790 100644 --- a/seatunnel-ui/src/locales/zh_CN/common.ts +++ b/seatunnel-ui/src/locales/zh_CN/common.ts @@ -17,6 +17,7 @@ export default { success_tips: '操作成功', + day: '天', hour: '时', min: '分', second: '秒', diff --git a/seatunnel-ui/src/utils/time.ts b/seatunnel-ui/src/utils/time.ts index 20604eda8..507a5b2a6 100644 --- a/seatunnel-ui/src/utils/time.ts +++ b/seatunnel-ui/src/utils/time.ts @@ -19,13 +19,15 @@ import i18n from '@/locales' const { t } = i18n.global export const getRemainTime = (remain: number): any => { if(!remain) return + let d = parseInt(remain / 60 / 60 / 24 + '') let h = parseInt(remain / 60 / 60 % 24 + '') let m = parseInt(remain / 60 % 60 + '') let s = parseInt(remain % 60 + '') + const dText = d > 0 ? `${d}${t('common.day')}` : '' const hText = h > 0 ? `${h}${t('common.hour')}` : '' const mText = m > 0 ? `${m}${t('common.min')}` : '' const sText = s > 0 ? `${s}${t('common.second')}` : '' - return hText + mText + sText + return dText + hText + mText + sText } diff --git a/seatunnel-ui/src/views/virtual-tables/detail.tsx b/seatunnel-ui/src/views/virtual-tables/detail.tsx index 22464e71d..37709ff28 100644 --- a/seatunnel-ui/src/views/virtual-tables/detail.tsx +++ b/seatunnel-ui/src/views/virtual-tables/detail.tsx @@ -80,7 +80,7 @@ const VirtualTablesDetail = defineComponent({ {t( route.params.id - ? t('virtualTables.edit_virtual_tables') + ? t('virtual_tables.edit_virtual_tables') : t('virtual_tables.create_virtual_tables') )} @@ -88,7 +88,7 @@ const VirtualTablesDetail = defineComponent({ diff --git a/seatunnel-ui/src/views/virtual-tables/use-detail.ts b/seatunnel-ui/src/views/virtual-tables/use-detail.ts index bf81fd70e..5a52974d2 100644 --- a/seatunnel-ui/src/views/virtual-tables/use-detail.ts +++ b/seatunnel-ui/src/views/virtual-tables/use-detail.ts @@ -154,11 +154,11 @@ export const useDetail = (id: string) => { state.stepTwo.config = values const flag = state.stepTwo.list.some((item) => item.isEdit) if (flag) { - window.$message.error(t('virtualTables.save_data_tips')) + window.$message.error(t('virtual_tables.save_data_tips')) return } if (state.stepTwo.list.length === 0) { - window.$message.error(t('virtualTables.table_data_required_tips')) + window.$message.error(t('virtual_tables.table_data_required_tips')) return } } finally {