This commit is contained in:
2020-02-06 00:55:04 +00:00
parent 4e51b26258
commit 38ec953b25
4 changed files with 46 additions and 25 deletions

View File

@@ -55,6 +55,7 @@
ref="theTimePicker"
scrollable
ampm-in-title
:format="ampmFormat"
v-model="timeOnly"
>
<v-spacer></v-spacer>
@@ -103,7 +104,8 @@ export default {
oldDate: null,
dlgdate: false,
dlgtime: false,
defaultLocale: window.$gz.locale.getFirstBrowserLanguage().split("-", 1)[0]
defaultLocale: window.$gz.locale.getFirstBrowserLanguage().split("-", 1)[0],
ampmFormat: window.$gz.locale.format().hour12 ? "ampm" : "24hr"
}),
props: {
label: String,

View File

@@ -445,7 +445,7 @@ function buildRecords(listData, columndefinitions, filters) {
var display = column.v;
switch (dataType) {
case 1: //datetime format to shortdatetime
display = filters.shortdatelocalized(display);
display = filters.shortdateandtimelocalized(display);
break;
case 2: //date only
display = filters.shortdateonlylocalized(display);