mirror of
https://github.com/mayswind/ezbookkeeping.git
synced 2026-05-17 00:12:11 +08:00
calendar display type supports Gregorian with Chinese
This commit is contained in:
+2
-3
@@ -3,7 +3,6 @@ import { defineStore } from 'pinia';
|
||||
|
||||
import { useSettingsStore } from './setting.ts';
|
||||
|
||||
import { CalendarDisplayType, DateDisplayType } from '@/core/calendar.ts';
|
||||
import { type WeekDayValue, WeekDay } from '@/core/datetime.ts';
|
||||
import { FiscalYearStart } from '@/core/fiscalyear.ts';
|
||||
import type { ApplicationCloudSetting } from '@/core/setting.ts';
|
||||
@@ -77,12 +76,12 @@ export const useUserStore = defineStore('user', () => {
|
||||
|
||||
const currentUserCalendarDisplayType = computed<number>(() => {
|
||||
const userInfo = currentUserBasicInfo.value || EMPTY_USER_BASIC_INFO;
|
||||
return isNumber(userInfo.calendarDisplayType) && CalendarDisplayType.valueOf(userInfo.calendarDisplayType) ? userInfo.calendarDisplayType : EMPTY_USER_BASIC_INFO.calendarDisplayType;
|
||||
return userInfo.calendarDisplayType;
|
||||
});
|
||||
|
||||
const currentUserDateDisplayType = computed<number>(() => {
|
||||
const userInfo = currentUserBasicInfo.value || EMPTY_USER_BASIC_INFO;
|
||||
return isNumber(userInfo.dateDisplayType) && DateDisplayType.valueOf(userInfo.dateDisplayType) ? userInfo.dateDisplayType : EMPTY_USER_BASIC_INFO.dateDisplayType;
|
||||
return userInfo.dateDisplayType;
|
||||
});
|
||||
|
||||
const currentUserLongDateFormat = computed<number>(() => {
|
||||
|
||||
Reference in New Issue
Block a user