Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-30 01:36:24 +01:00
Code Issues Packages Projects Releases Activity

Merge pull request #2072 from vanndoublen/feature/custom-datetime-format

Browse Source 
Feature/custom datetime format
This commit is contained in:
SngAbc
2025-05-31 21:50:26 +08:00
committed by GitHub
parent 3046fe2bf2 f640c9212e
commit e2ac581b14
7 changed files with 129 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/client/src/services/utils.ts
View File

@@ -124,8 +124,23 @@ function formatDateISO(date: Date) {
return `${date.getFullYear()}-${padNum(date.getMonth() + 1)}-${padNum(date.getDate())}`;
}
function formatDateTime(date: Date) {
return `${formatDate(date)} ${formatTime(date)}`;
export function formatDateTime(date: Date, userSuppliedFormat?: string): string {
const DEFAULT_FORMAT = 'YYYY-MM-DD HH:mm';
const formatToUse = (typeof userSuppliedFormat === 'string' && userSuppliedFormat.trim() !== "")
? userSuppliedFormat.trim()
: DEFAULT_FORMAT;
if (!date) {
date = new Date();
}
try {
return dayjs(date).format(formatToUse);
} catch (e: any) {
console.warn(`TriliumNext: Day.js encountered an error with format string "${formatToUse}". Falling back to default. Error: ${e.message}`);
return dayjs(date).format(DEFAULT_FORMAT);
}
}
function localNowDateTime() {