mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-14 06:57:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix the bug that the time picker for mobile device displays and sets incorrectly when the default time zone is not the browser time zone

Browse Source
This commit is contained in:
MaysWind
2024-03-10 02:34:28 +08:00
parent 8be3fd7ed4
commit 9488b85705
2 changed files with 78 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/mobile/DateTimeSelectionSheet.vue
+4 -4
View File
@@ -52,7 +52,7 @@ import {
getLocalDatetimeFromUnixTime,
getYear,
getTimeValues,
getCombinedDatetimeByDateAndTimeValues
setTimeValuesToDate
} from '@/lib/datetime.js';
import { createInlinePicker } from '@/lib/ui.mobile.js';
@@ -126,6 +126,7 @@ export default {
self.getTimePickerColumns(), self.timeValues, {
change(picker, values) {
self.timeValues = values;
setTimeValuesToDate(self.dateTime, self.timeValues, self.is24Hour, self.isMeridiemIndicatorFirst);
}
});
} else {
@@ -138,7 +139,7 @@ export default {
this.$emit('update:show', false);
},
setCurrentTime() {
this.dateTime = getLocalDatetimeFromUnixTime(getCurrentUnixTime())
this.dateTime = getLocalDatetimeFromUnixTime(getCurrentUnixTime());
this.timeValues = this.getTimeValues(this.dateTime);
if (this.timePickerHolder) {
@@ -150,8 +151,7 @@ export default {
return;
}
const finalDatetime = getCombinedDatetimeByDateAndTimeValues(this.dateTime, this.timeValues, this.is24Hour, this.isMeridiemIndicatorFirst);
const unixTime = getUnixTime(finalDatetime);
const unixTime = getUnixTime(this.dateTime);
if (unixTime < 0) {
this.$toast('Date is too early');
src/lib/datetime.js
+74 -31
View File
@@ -3,6 +3,24 @@ import moment from 'moment';
import dateTimeConstants from '@/consts/datetime.js';
import { isNumber } from './common.js';
export function getTwoDigitsString(value) {
if (value < 10) {
return '0' + value;
} else {
return value.toString();
}
}
export function getHourIn12HourFormat(hour) {
hour = hour % 12;
if (hour === 0) {
hour = 12;
}
return hour;
}
export function isPM(hour) {
if (hour > 11) {
return true;
@@ -151,8 +169,8 @@ export function getMonthName(date) {
return dateTimeConstants.allMonthsArray[dayOfWeek];
}
export function getAMOrPM(date) {
return isPM(moment(date).hour()) ? dateTimeConstants.allMeridiemIndicators.PM : dateTimeConstants.allMeridiemIndicators.AM;
export function getAMOrPM(hour) {
return isPM(hour) ? dateTimeConstants.allMeridiemIndicators.PM : dateTimeConstants.allMeridiemIndicators.AM;
}
export function getHour(date) {
@@ -167,35 +185,6 @@ export function getSecond(date) {
return moment(date).second();
}
export function getTimeValues(date, is24Hour, isMeridiemIndicatorFirst) {
if (is24Hour) {
return moment(date).format('HH mm ss').split(' ');
} else if (/*!is24Hour && */isMeridiemIndicatorFirst) {
return [getAMOrPM(date)].concat(moment(date).format('hh mm ss').split(' '));
} else /* !is24Hour && !isMeridiemIndicatorFirst */ {
return moment(date).format('hh mm ss').split(' ').concat([getAMOrPM(date)]);
}
}
export function getCombinedDatetimeByDateAndTimeValues(date, timeValues, is24Hour, isMeridiemIndicatorFirst) {
const datetime = moment(date);
let time = datetime;
if (is24Hour) {
time = moment(timeValues.join(' '), 'HH mm ss');
} else if (/*!is24Hour && */isMeridiemIndicatorFirst) {
time = moment(timeValues.join(' '), 'A HH mm ss');
} else /* !is24Hour && !isMeridiemIndicatorFirst */ {
time = moment(timeValues.join(' '), 'HH mm ss A');
}
datetime.hour(time.hour());
datetime.minute(time.minute());
datetime.second(time.second());
return datetime;
}
export function getUnixTimeBeforeUnixTime(unixTime, amount, unit) {
return moment.unix(unixTime).subtract(amount, unit).unix();
}
@@ -456,6 +445,60 @@ export function getRecentDateRangeType(allRecentMonthDateRanges, dateType, minTi
return getRecentDateRangeTypeByDateType(allRecentMonthDateRanges, dateTimeConstants.allDateRanges.Custom.type);
}
export function getTimeValues(date, is24Hour, isMeridiemIndicatorFirst) {
const hourMinuteSeconds = [
getTwoDigitsString(is24Hour ? date.getHours() : getHourIn12HourFormat(date.getHours())),
getTwoDigitsString(date.getMinutes()),
getTwoDigitsString(date.getSeconds())
];
if (is24Hour) {
return hourMinuteSeconds;
} else if (/*!is24Hour && */isMeridiemIndicatorFirst) {
return [getAMOrPM(date.getHours())].concat(hourMinuteSeconds);
} else /* !is24Hour && !isMeridiemIndicatorFirst */ {
return hourMinuteSeconds.concat([getAMOrPM(date.getHours())]);
}
}
export function setTimeValuesToDate(date, timeValues, is24Hour, isMeridiemIndicatorFirst) {
let hours = 0;
let minutes = 0;
let seconds = 0;
if (is24Hour) {
hours = parseInt(timeValues[0]);
minutes = parseInt(timeValues[1]);
seconds = parseInt(timeValues[2]);
} else {
let meridiemIndicator;
if (/*!is24Hour && */isMeridiemIndicatorFirst) {
meridiemIndicator = timeValues[0];
hours = parseInt(timeValues[1]);
minutes = parseInt(timeValues[2]);
seconds = parseInt(timeValues[3]);
} else /* !is24Hour && !isMeridiemIndicatorFirst */ {
hours = parseInt(timeValues[0]);
minutes = parseInt(timeValues[1]);
seconds = parseInt(timeValues[2]);
meridiemIndicator = timeValues[3];
}
if (hours === 12) {
hours = 0;
}
if (meridiemIndicator === dateTimeConstants.allMeridiemIndicators.PM) {
hours += 12;
}
}
date.setHours(hours);
date.setMinutes(minutes);
date.setSeconds(seconds);
}
export function isDateRangeMatchFullYears(minTime, maxTime) {
const minDateTime = parseDateFromUnixTime(minTime).set({ second: 0, millisecond: 0 });
const maxDateTime = parseDateFromUnixTime(maxTime).set({ second: 59, millisecond: 999 });