Skip to content

Commit f18848a

Browse files
Add defatul format to datetime hh:mm
1 parent eaeebf0 commit f18848a

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

src/components/FormDatePicker.vue

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,16 @@ export default {
145145
return this.dataFormat === "datetime";
146146
},
147147
format() {
148-
return this.datepicker ? getUserDateTimeFormat() : getUserDateFormat();
148+
let format = this.datepicker ? getUserDateTimeFormat() : getUserDateFormat();
149+
if (this.datepicker) {
150+
// Check if the format already includes time patterns (hh:mm A or HH:mm)
151+
const hasTimePattern = /[Hh]{1,2}:[mM]{1,2}/.test(format);
152+
if (!hasTimePattern) {
153+
// If forceDateTime is true and no time pattern exists, ensure the format includes hh:mm A
154+
format = format.replace(/[\sHh:msaAzZ]/g, '') + ' hh:mm A';
155+
}
156+
}
157+
return format;
149158
},
150159
classList() {
151160
return {

0 commit comments

Comments
 (0)