From cc3e1f2978b2cf4f950a96331280e96910f78bf6 Mon Sep 17 00:00:00 2001 From: MaysWind Date: Sun, 7 Jul 2024 17:28:25 +0800 Subject: [PATCH] code refactor --- src/components/desktop/DateRangeSelectionDialog.vue | 5 ++--- src/components/desktop/DateTimeSelect.vue | 6 +++--- src/components/desktop/MonthRangeSelectionDialog.vue | 7 +++---- src/components/mobile/DateRangeSelectionSheet.vue | 5 ++--- src/components/mobile/DateTimeSelectionSheet.vue | 5 ++--- src/lib/datetime.js | 8 ++++++-- src/lib/i18n.js | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/components/desktop/DateRangeSelectionDialog.vue b/src/components/desktop/DateRangeSelectionDialog.vue index 8abc0e93..ff0431e0 100644 --- a/src/components/desktop/DateRangeSelectionDialog.vue +++ b/src/components/desktop/DateRangeSelectionDialog.vue @@ -63,11 +63,10 @@ import datetimeConstants from '@/consts/datetime.js'; import { arrangeArrayWithNewStartIndex } from '@/lib/common.js'; import { getCurrentUnixTime, - getCurrentDateTime, + getCurrentYear, getUnixTime, getLocalDatetimeFromUnixTime, getTodayFirstUnixTime, - getYear, getDummyUnixTimeForLocalUsage, getActualUnixTimeForStore, getTimezoneOffsetMinutes, @@ -104,7 +103,7 @@ export default { return { yearRange: [ 2000, - getYear(getCurrentDateTime()) + 1 + getCurrentYear() + 1 ], dateRange: [ getLocalDatetimeFromUnixTime(getDummyUnixTimeForLocalUsage(minDate, getTimezoneOffsetMinutes(), getBrowserTimezoneOffsetMinutes())), diff --git a/src/components/desktop/DateTimeSelect.vue b/src/components/desktop/DateTimeSelect.vue index 95c77e10..25a5afa8 100644 --- a/src/components/desktop/DateTimeSelect.vue +++ b/src/components/desktop/DateTimeSelect.vue @@ -45,12 +45,12 @@ import { useUserStore } from '@/stores/user.js'; import { arrangeArrayWithNewStartIndex } from '@/lib/common.js'; import { - getCurrentDateTime, + getCurrentYear, getTimezoneOffsetMinutes, getBrowserTimezoneOffsetMinutes, getLocalDatetimeFromUnixTime, getActualUnixTimeForStore, - getYear, getUnixTime + getUnixTime } from '@/lib/datetime.js'; export default { @@ -68,7 +68,7 @@ export default { return { yearRange: [ 2000, - getYear(getCurrentDateTime()) + 1 + getCurrentYear() + 1 ] } }, diff --git a/src/components/desktop/MonthRangeSelectionDialog.vue b/src/components/desktop/MonthRangeSelectionDialog.vue index 96425f28..79a6c6d2 100644 --- a/src/components/desktop/MonthRangeSelectionDialog.vue +++ b/src/components/desktop/MonthRangeSelectionDialog.vue @@ -75,11 +75,10 @@ import { getYearMonthObjectFromString, getYearMonthStringFromObject, getCurrentUnixTime, - getCurrentDateTime, + getCurrentYear, getThisYearFirstUnixTime, getYearMonthFirstUnixTime, - getYearMonthLastUnixTime, - getYear + getYearMonthLastUnixTime } from '@/lib/datetime.js'; export default { @@ -111,7 +110,7 @@ export default { return { yearRange: [ 2000, - getYear(getCurrentDateTime()) + 1 + getCurrentYear() + 1 ], startTime: minDate, endTime: maxDate diff --git a/src/components/mobile/DateRangeSelectionSheet.vue b/src/components/mobile/DateRangeSelectionSheet.vue index e77120ad..d9ddc21d 100644 --- a/src/components/mobile/DateRangeSelectionSheet.vue +++ b/src/components/mobile/DateRangeSelectionSheet.vue @@ -60,11 +60,10 @@ import datetimeConstants from '@/consts/datetime.js'; import { arrangeArrayWithNewStartIndex } from '@/lib/common.js'; import { getCurrentUnixTime, - getCurrentDateTime, + getCurrentYear, getUnixTime, getLocalDatetimeFromUnixTime, getTodayFirstUnixTime, - getYear, getDummyUnixTimeForLocalUsage, getActualUnixTimeForStore, getTimezoneOffsetMinutes, @@ -100,7 +99,7 @@ export default { return { yearRange: [ 2000, - getYear(getCurrentDateTime()) + 1 + getCurrentYear() + 1 ], dateRange: [ getLocalDatetimeFromUnixTime(getDummyUnixTimeForLocalUsage(minDate, getTimezoneOffsetMinutes(), getBrowserTimezoneOffsetMinutes())), diff --git a/src/components/mobile/DateTimeSelectionSheet.vue b/src/components/mobile/DateTimeSelectionSheet.vue index fe62bd6e..9591463d 100644 --- a/src/components/mobile/DateTimeSelectionSheet.vue +++ b/src/components/mobile/DateTimeSelectionSheet.vue @@ -56,13 +56,12 @@ import datetimeConstants from '@/consts/datetime.js'; import { arrangeArrayWithNewStartIndex } from '@/lib/common.js'; import { getCurrentUnixTime, - getCurrentDateTime, + getCurrentYear, getUnixTime, getBrowserTimezoneOffsetMinutes, getLocalDatetimeFromUnixTime, getActualUnixTimeForStore, getTimezoneOffsetMinutes, - getYear, getTimeValues, getCombinedDateAndTimeValues } from '@/lib/datetime.js'; @@ -97,7 +96,7 @@ export default { mode: 'time', yearRange: [ 2000, - getYear(getCurrentDateTime()) + 1 + getCurrentYear() + 1 ], dateTime: datetime, timeValues: self.getTimeValues(datetime), diff --git a/src/lib/datetime.js b/src/lib/datetime.js index fb70cdf0..f8d31b23 100644 --- a/src/lib/datetime.js +++ b/src/lib/datetime.js @@ -143,8 +143,8 @@ export function getCurrentUnixTime() { return moment().unix(); } -export function getCurrentDateTime() { - return moment(); +export function getCurrentYear() { + return moment().year(); } export function parseDateFromUnixTime(unixTime, utcOffset, currentUtcOffset) { @@ -167,6 +167,10 @@ export function formatTime(dateTime, format) { return moment(dateTime).format(format); } +export function formatCurrentTime(format) { + return moment().format(format); +} + export function getUnixTime(date) { return moment(date).unix(); } diff --git a/src/lib/i18n.js b/src/lib/i18n.js index bf775566..9cad2b3a 100644 --- a/src/lib/i18n.js +++ b/src/lib/i18n.js @@ -24,7 +24,7 @@ import { parseDateFromUnixTime, formatUnixTime, formatTime, - getCurrentDateTime, + formatCurrentTime, getYear, getTimezoneOffset, getTimezoneOffsetMinutes, @@ -398,7 +398,7 @@ function getDateTimeFormats(translateFn, allFormatMap, allFormatArray, localeFor ret.push({ type: datetimeConstants.defaultDateTimeFormatValue, format: defaultFormat, - displayName: `${translateFn('Language Default')} (${formatTime(getCurrentDateTime(), defaultFormat)})` + displayName: `${translateFn('Language Default')} (${formatCurrentTime(defaultFormat)})` }); for (let i = 0; i < allFormatArray.length; i++) { @@ -408,7 +408,7 @@ function getDateTimeFormats(translateFn, allFormatMap, allFormatArray, localeFor ret.push({ type: formatType.type, format: format, - displayName: formatTime(getCurrentDateTime(), format) + displayName: formatCurrentTime(format) }); }