This commit is contained in:
2020-02-07 23:32:22 +00:00
parent 82f2defc7e
commit 9a15ae5cec
11 changed files with 61 additions and 103 deletions

View File

@@ -17,7 +17,8 @@
>
<!-- CURRENCY -->
<div v-if="item.type === 8">
<v-text-field
TODO: CURRENCY CONTROL HERE
<!-- <v-text-field
v-model="_self[item.dataKey]"
:readonly="readOnly"
:prefix="ltFormat().currencySymbol"
@@ -29,7 +30,7 @@
]"
type="number"
step="any"
></v-text-field>
></v-text-field> -->
</div>
<!-- DATE -->
<div v-else-if="item.type === 2">
@@ -104,7 +105,8 @@
</div>
<!-- DECIMAL -->
<div v-else-if="item.type === 7">
<v-text-field
TODO: DECIMAL CONTROL HERE
<!-- <v-text-field
v-model="_self[item.dataKey]"
:readonly="readOnly"
:label="lt(item.fld)"
@@ -117,7 +119,7 @@
:counter="10"
type="number"
step="any"
></v-text-field>
></v-text-field> -->
</div>
<!-- BOOL -->
<div v-else-if="item.type === 6">
@@ -167,9 +169,6 @@ export default {
lt: function(ltkey) {
return window.$gz.locale.get(ltkey);
},
ltFormat() {
return window.$gz.locale.format();
},
form() {
//nothing
return window.$gz.form;

View File

@@ -53,7 +53,7 @@
<v-time-picker
scrollable
ampm-in-title
:format="ampmFormat"
:format="hour12 ? 'ampm' : '24hr'"
v-model="timeOnly"
>
<v-spacer></v-spacer>
@@ -87,9 +87,10 @@ export default {
//cache display format stuff
timeZoneName: window.$gz.locale.getTimeZoneName(),
languageName: window.$gz.locale.getBrowserLanguages(),
hour12: window.$gz.store.state.locale.hour12,
defaultLocale: window.$gz.locale.getBrowserFirstLanguage().split("-", 1)[0],
ampmFormat: window.$gz.locale.format().hour12 ? "ampm" : "24hr"
hour12: window.$gz.locale.getHour12(),
defaultLocale: window.$gz.locale.getBrowserFirstLanguage().split("-", 1)[0]
// ampmFormat: window.$gz.locale.getHour12() ? "ampm" : "24hr"
//:format="ampmFormat"
}),
props: {
label: String,

View File

@@ -331,9 +331,6 @@ export default {
lt(ltKey) {
return window.$gz.locale.get(ltKey);
},
ltFormat() {
return window.$gz.locale.format();
},
getDataFromApi() {
var that = this;

View File

@@ -212,9 +212,6 @@ Actual in inspector browser code:
lt(ltKey) {
return window.$gz.locale.get(ltKey);
},
ltFormat() {
return window.$gz.locale.format();
},
newItem() {
this.$router.push({
name: "inventory-widget-edit",

View File

@@ -17,7 +17,7 @@
<v-time-picker
scrollable
ampm-in-title
:format="ampmFormat"
:format="hour12 ? 'ampm' : '24hr'"
v-model="timeOnly"
>
<v-spacer></v-spacer>
@@ -51,9 +51,8 @@ export default {
//cache display format stuff
timeZoneName: window.$gz.locale.getTimeZoneName(),
languageName: window.$gz.locale.getBrowserLanguages(),
hour12: window.$gz.store.state.locale.hour12,
defaultLocale: window.$gz.locale.getBrowserFirstLanguage().split("-", 1)[0],
ampmFormat: window.$gz.locale.format().hour12 ? "ampm" : "24hr"
hour12: window.$gz.locale.getHour12(),
defaultLocale: window.$gz.locale.getBrowserFirstLanguage().split("-", 1)[0]
}),
props: {
label: String,