From 42fa24debd8fc63f851fecf9b6e0f93cca62d426 Mon Sep 17 00:00:00 2001 From: Lykin <137850705+tiny-craft@users.noreply.github.com> Date: Thu, 18 Jan 2024 15:16:19 +0800 Subject: [PATCH] perf: ttl value will use unit 'day' when above 1 day #122 --- .../content_value/ContentToolbar.vue | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/frontend/src/components/content_value/ContentToolbar.vue b/frontend/src/components/content_value/ContentToolbar.vue index ba46ecd..6e4bac4 100644 --- a/frontend/src/components/content_value/ContentToolbar.vue +++ b/frontend/src/components/content_value/ContentToolbar.vue @@ -11,10 +11,10 @@ import IconButton from '@/components/common/IconButton.vue' import Copy from '@/components/icons/Copy.vue' import { ClipboardSetText } from 'wailsjs/runtime/runtime.js' import { computed, onUnmounted, reactive, watch } from 'vue' -import { padStart } from 'lodash' import { NIcon, useThemeVars } from 'naive-ui' import { timeout } from '@/utils/promise.js' import AutoRefreshForm from '@/components/common/AutoRefreshForm.vue' +import dayjs from 'dayjs' const props = defineProps({ server: String, @@ -54,20 +54,19 @@ const binaryKey = computed(() => { }) const ttlString = computed(() => { - let s = '' if (props.ttl > 0) { - const hours = Math.floor(props.ttl / 3600) - s += padStart(hours + ':', 3, '0') - const minutes = Math.floor((props.ttl % 3600) / 60) - s += padStart(minutes + ':', 3, '0') - const seconds = Math.floor(props.ttl % 60) - s += padStart(seconds + '', 2, '0') + const dur = dayjs.duration(props.ttl, 'seconds') + const days = dur.days() + if (days > 0) { + return days + i18n.t('common.unit_day') + ' ' + dur.format('HH:mm:ss') + } else { + return dur.format('HH:mm:ss') + } } else if (props.ttl < 0) { - s = '-1' + return i18n.t('interface.forever') } else { - s = '00:00:00' + return '00:00:00' } - return s }) const startAutoRefresh = async () => { @@ -165,7 +164,7 @@ const onTTL = () => { - {{ ttlString === '-1' ? $t('interface.forever') : ttlString }} + {{ ttlString }} TTL{{ `${ttl > 0 ? ': ' + ttl + $t('common.second') : ''}` }}