From f18848afb11e1048fde1163694c9f6a5433df24a Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Tue, 9 Sep 2025 11:58:21 -0400 Subject: [PATCH 1/3] Add defatul format to datetime hh:mm --- src/components/FormDatePicker.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/components/FormDatePicker.vue b/src/components/FormDatePicker.vue index f15bb52..84b0b79 100644 --- a/src/components/FormDatePicker.vue +++ b/src/components/FormDatePicker.vue @@ -145,7 +145,16 @@ export default { return this.dataFormat === "datetime"; }, format() { - return this.datepicker ? getUserDateTimeFormat() : getUserDateFormat(); + let format = this.datepicker ? getUserDateTimeFormat() : getUserDateFormat(); + if (this.datepicker) { + // Check if the format already includes time patterns (hh:mm A or HH:mm) + const hasTimePattern = /[Hh]{1,2}:[mM]{1,2}/.test(format); + if (!hasTimePattern) { + // If forceDateTime is true and no time pattern exists, ensure the format includes hh:mm A + format = format.replace(/[\sHh:msaAzZ]/g, '') + ' hh:mm A'; + } + } + return format; }, classList() { return { From 401455ccea04a5cf1cb6360c2a8777ea254719fd Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Tue, 9 Sep 2025 13:17:36 -0400 Subject: [PATCH 2/3] Change condition to format --- src/components/FormDatePicker.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/FormDatePicker.vue b/src/components/FormDatePicker.vue index 84b0b79..458eef5 100644 --- a/src/components/FormDatePicker.vue +++ b/src/components/FormDatePicker.vue @@ -145,16 +145,16 @@ export default { return this.dataFormat === "datetime"; }, format() { - let format = this.datepicker ? getUserDateTimeFormat() : getUserDateFormat(); if (this.datepicker) { + let format = getUserDateTimeFormat(); // Check if the format already includes time patterns (hh:mm A or HH:mm) const hasTimePattern = /[Hh]{1,2}:[mM]{1,2}/.test(format); if (!hasTimePattern) { // If forceDateTime is true and no time pattern exists, ensure the format includes hh:mm A - format = format.replace(/[\sHh:msaAzZ]/g, '') + ' hh:mm A'; + format = `${format.replace(/[\sHh:msaAzZ]/g, '')} hh:mm A`; } } - return format; + return getUserDateFormat(); }, classList() { return { From 7879400091e2254e3480d422a3e462d82fbe649c Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Tue, 9 Sep 2025 13:37:56 -0400 Subject: [PATCH 3/3] Add return format --- src/components/FormDatePicker.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/FormDatePicker.vue b/src/components/FormDatePicker.vue index 458eef5..d7653a8 100644 --- a/src/components/FormDatePicker.vue +++ b/src/components/FormDatePicker.vue @@ -153,6 +153,7 @@ export default { // If forceDateTime is true and no time pattern exists, ensure the format includes hh:mm A format = `${format.replace(/[\sHh:msaAzZ]/g, '')} hh:mm A`; } + return format; } return getUserDateFormat(); },