implement custom date/time formatting for Alt + T

This commit is contained in:
iamvann 2025-05-16 23:20:02 +08:00
parent 5da0053f6a
commit d26e8758ca
4 changed files with 65 additions and 22 deletions

View File

@ -73,8 +73,32 @@ function formatDateISO(date) {
return `${date.getFullYear()}-${padNum(date.getMonth() + 1)}-${padNum(date.getDate())}`; return `${date.getFullYear()}-${padNum(date.getMonth() + 1)}-${padNum(date.getDate())}`;
} }
function formatDateTime(date) { // old version
return `${formatDate(date)} ${formatTime(date)}`; // function formatDateTime(date) {
// return `${formatDate(date)} ${formatTime(date)}`;
// }
// In utils.js
// import dayjs from 'dayjs'; // Assuming dayjs is available in this scope
function formatDateTime(date, userSuppliedFormat) {
const DEFAULT_FORMAT = 'YYYY-MM-DD HH:mm';
let formatToUse = DEFAULT_FORMAT;
if (userSuppliedFormat && typeof userSuppliedFormat === 'string' && userSuppliedFormat.trim() !== "") {
formatToUse = userSuppliedFormat.trim();
}
if (!date) {
date = new Date();
}
try {
return dayjs(date).format(formatToUse);
} catch (e) {
console.warn(`Trilium: Day.js encountered an error with format string "${formatToUse}". Falling back to default. Error: ${e.message}`);
return dayjs(date).format(DEFAULT_FORMAT);
}
} }
function localNowDateTime() { function localNowDateTime() {

View File

@ -225,10 +225,29 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
} }
} }
insertDateTimeToTextCommand() { // old version
const date = new Date(); // insertDateTimeToTextCommand() {
const dateString = utils.formatDateTime(date); // const date = new Date();
// const dateString = utils.formatDateTime(date);
// this.addTextToEditor(dateString);
// }
// new version
async insertDateTimeToTextCommand() {
const date = new Date();
let userPreferredFormat = ""; //Default
try {
const allOptions = await server.get('options');
if (allOptions && typeof allOptions.customDateTimeFormatString === 'string') {
userPreferredFormat = allOptions.customDateTimeFormatString;
}
} catch (e) {
console.error("Trilium: Failed to fetch options for custom date/time format. Using default.", e);
}
const dateString = utils.formatDateTime(date, userPreferredFormat);
this.addTextToEditor(dateString); this.addTextToEditor(dateString);
} }

View File

@ -47,7 +47,6 @@ export default class DateTimeFormatOptions extends OptionsWidget {
} }
async optionsLoaded(options) { async optionsLoaded(options) {
//todo: update the key in updateOption
const currentFormat = options.customDateTimeFormatString || ""; const currentFormat = options.customDateTimeFormatString || "";

View File

@ -57,7 +57,8 @@ const ALLOWED_OPTIONS = new Set([
'customSearchEngineName', 'customSearchEngineName',
'customSearchEngineUrl', 'customSearchEngineUrl',
'promotedAttributesOpenInRibbon', 'promotedAttributesOpenInRibbon',
'editedNotesOpenInRibbon' 'editedNotesOpenInRibbon',
'customDateTimeFormatString'
]); ]);
function getOptions() { function getOptions() {