code refactor

This commit is contained in:
MaysWind
2025-06-07 23:00:35 +08:00
parent a5a526e554
commit ceecd9d524
2 changed files with 11 additions and 11 deletions
@@ -22,7 +22,7 @@ export function useFiscalYearStartSelectionBase(props: FiscalYearStartSelectionB
const dayNames = computed<string[]>(() => arrangeArrayWithNewStartIndex(getAllMinWeekdayNames(), firstDayOfWeek.value)); const dayNames = computed<string[]>(() => arrangeArrayWithNewStartIndex(getAllMinWeekdayNames(), firstDayOfWeek.value));
const displayName = computed<string>(() => { const displayName = computed<string>(() => {
let fy = FiscalYearStart.fromNumber(selectedFiscalYearStart.value); const fy = FiscalYearStart.fromNumber(selectedFiscalYearStart.value);
if ( fy ) { if ( fy ) {
return formatMonthDayToLongDay(fy.toMonthDashDayString()) return formatMonthDayToLongDay(fy.toMonthDashDayString())
@@ -46,7 +46,7 @@ export function useFiscalYearStartSelectionBase(props: FiscalYearStartSelectionB
const userStore = useUserStore(); const userStore = useUserStore();
function selectedDisplayName(dateString: string): string { function selectedDisplayName(dateString: string): string {
let fy = FiscalYearStart.fromMonthDashDayString(dateString); const fy = FiscalYearStart.fromMonthDashDayString(dateString);
if ( fy ) { if ( fy ) {
return formatMonthDayToLongDay(fy.toMonthDashDayString()); return formatMonthDayToLongDay(fy.toMonthDashDayString());
} }
@@ -56,7 +56,7 @@ export function useFiscalYearStartSelectionBase(props: FiscalYearStartSelectionB
function getModelValueToDateString(): string { function getModelValueToDateString(): string {
const input = selectedFiscalYearStart.value; const input = selectedFiscalYearStart.value;
let fy = FiscalYearStart.fromNumber(input); const fy = FiscalYearStart.fromNumber(input);
if ( fy ) { if ( fy ) {
return fy.toMonthDashDayString(); return fy.toMonthDashDayString();
+8 -8
View File
@@ -786,7 +786,7 @@ export function useI18n() {
function getLocalizedDateTimeFormats<T extends DateFormat | TimeFormat>(type: string, allFormatMap: Record<string, T>, allFormatArray: T[], languageDefaultTypeNameKey: string, systemDefaultFormatType: T): LocalizedDateTimeFormat[] { function getLocalizedDateTimeFormats<T extends DateFormat | TimeFormat>(type: string, allFormatMap: Record<string, T>, allFormatArray: T[], languageDefaultTypeNameKey: string, systemDefaultFormatType: T): LocalizedDateTimeFormat[] {
const defaultFormat = getLocalizedDateTimeFormat<T>(type, allFormatMap, allFormatArray, LANGUAGE_DEFAULT_DATE_TIME_FORMAT_VALUE, languageDefaultTypeNameKey, systemDefaultFormatType); const defaultFormat = getLocalizedDateTimeFormat<T>(type, allFormatMap, allFormatArray, LANGUAGE_DEFAULT_DATE_TIME_FORMAT_VALUE, languageDefaultTypeNameKey, systemDefaultFormatType);
const ret: LocalizedDateTimeFormat[] = []; const ret: LocalizedDateTimeFormat[] = [];
ret.push({ ret.push({
type: LANGUAGE_DEFAULT_DATE_TIME_FORMAT_VALUE, type: LANGUAGE_DEFAULT_DATE_TIME_FORMAT_VALUE,
format: defaultFormat, format: defaultFormat,
@@ -806,7 +806,7 @@ export function useI18n() {
return ret; return ret;
} }
function getAllDateRanges(scene: DateRangeScene, includeCustom?: boolean, includeBillingCycle?: boolean): LocalizedDateRange[] { function getAllDateRanges(scene: DateRangeScene, includeCustom?: boolean, includeBillingCycle?: boolean): LocalizedDateRange[] {
const ret: LocalizedDateRange[] = []; const ret: LocalizedDateRange[] = [];
const allDateRanges = DateRange.values(); const allDateRanges = DateRange.values();
@@ -945,7 +945,7 @@ export function useI18n() {
if (!fiscalYearStart) { if (!fiscalYearStart) {
fiscalYearStart = FiscalYearStart.Default.value; fiscalYearStart = FiscalYearStart.Default.value;
} }
let nowFiscalYearRange = getFiscalYearTimeRangeFromUnixTime(now, userStore.currentUserFiscalYearStart); const nowFiscalYearRange = getFiscalYearTimeRangeFromUnixTime(now, userStore.currentUserFiscalYearStart);
const ret: FiscalYearFormat[] = []; const ret: FiscalYearFormat[] = [];
@@ -1427,7 +1427,7 @@ export function useI18n() {
return ''; return '';
} }
} }
function formatDateRange(dateType: number, startTime: number, endTime: number): string { function formatDateRange(dateType: number, startTime: number, endTime: number): string {
if (dateType === DateRange.All.type) { if (dateType === DateRange.All.type) {
return t(DateRange.All.name); return t(DateRange.All.name);
@@ -1496,7 +1496,7 @@ export function useI18n() {
fiscalYearFormat = FiscalYearFormat.Default; fiscalYearFormat = FiscalYearFormat.Default;
} }
let timeRange = getFiscalYearTimeRangeFromUnixTime(unixTime, userStore.currentUserFiscalYearStart); const timeRange = getFiscalYearTimeRangeFromUnixTime(unixTime, userStore.currentUserFiscalYearStart);
return formatTimeRangeToFiscalYearFormat(fiscalYearFormat, timeRange); return formatTimeRangeToFiscalYearFormat(fiscalYearFormat, timeRange);
} }
@@ -1508,7 +1508,7 @@ export function useI18n() {
fiscalYearFormat = FiscalYearFormat.Default; fiscalYearFormat = FiscalYearFormat.Default;
} }
let timeRange = getFiscalYearTimeRangeFromYear(year, userStore.currentUserFiscalYearStart); const timeRange = getFiscalYearTimeRangeFromYear(year, userStore.currentUserFiscalYearStart);
return formatTimeRangeToFiscalYearFormat(fiscalYearFormat, timeRange); return formatTimeRangeToFiscalYearFormat(fiscalYearFormat, timeRange);
} }
@@ -1519,10 +1519,10 @@ export function useI18n() {
if ( !fy ) { if ( !fy ) {
fy = FiscalYearStart.Default; fy = FiscalYearStart.Default;
} }
return formatMonthDayToLongDay(fy.toMonthDashDayString()); return formatMonthDayToLongDay(fy.toMonthDashDayString());
} }
function getTimezoneDifferenceDisplayText(utcOffset: number): string { function getTimezoneDifferenceDisplayText(utcOffset: number): string {
const defaultTimezoneOffset = getTimezoneOffsetMinutes(); const defaultTimezoneOffset = getTimezoneOffsetMinutes();
const offsetTime = getTimeDifferenceHoursAndMinutes(utcOffset - defaultTimezoneOffset); const offsetTime = getTimeDifferenceHoursAndMinutes(utcOffset - defaultTimezoneOffset);