Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix]Fix the run_time calculation to account for missing days. #185

Merged
merged 2 commits into from
Aug 19, 2024
Merged

[Fix]Fix the run_time calculation to account for missing days. #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a686713
[Fix]Fix the run_time calculation to account for missing days.
XIAOKUOAIyang Aug 16, 2024
916697a
[Fix]Correct the key name in the t() call to match that in the resour…
XIAOKUOAIyang Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions seatunnel-ui/src/locales/en_US/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

export default {
success_tips: 'Success',
day: 'd',
hour: 'h',
min: 'm',
second: 's',
Expand Down
1 change: 1 addition & 0 deletions seatunnel-ui/src/locales/zh_CN/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

export default {
success_tips: '操作成功',
day: '天',
hour: '时',
min: '分',
second: '秒',
Expand Down
4 changes: 3 additions & 1 deletion seatunnel-ui/src/utils/time.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

}

4 changes: 2 additions & 2 deletions seatunnel-ui/src/views/virtual-tables/detail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,15 @@ const VirtualTablesDetail = defineComponent({
<NBreadcrumbItem>
{t(
route.params.id
? t('virtualTables.edit_virtual_tables')
? t('virtual_tables.edit_virtual_tables')
: t('virtual_tables.create_virtual_tables')
)}
</NBreadcrumbItem>
</NBreadcrumb>
<NCard
title={t(
route.params.id
? t('virtualTables.edit_virtual_tables')
? t('virtual_tables.edit_virtual_tables')
: t('virtual_tables.create_virtual_tables')
)}
>
Expand Down
4 changes: 2 additions & 2 deletions seatunnel-ui/src/views/virtual-tables/use-detail.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading