moved t function to global and misc cleanup

This commit is contained in:
2020-04-04 17:06:25 +00:00
parent 90c388ecc2
commit 43de3c8fb0
20 changed files with 242 additions and 286 deletions

View File

@@ -1,7 +1,7 @@
<template>
<div v-if="templateHasVisibleCustomFields()">
<span class="v-label v-label--active theme--light">
{{ t("ObjectCustomFieldCustomGrid") }}
{{ $ay.t("ObjectCustomFieldCustomGrid") }}
</span>
<div>
<v-row align-center justify-left row wrap>
@@ -20,12 +20,17 @@
<gz-date-time-picker
v-model="_self[item.dataKey]"
:readonly="readOnly"
:label="t(item.fld)"
:label="$ay.t(item.fld)"
:ref="item.fld"
:data-cy="item.fld"
:error-messages="form().serverErrors(parentVM, item.fld)"
:rules="[
form().customFieldsCheck(parentVM, item, _self, t(item.fld))
form().customFieldsCheck(
parentVM,
item,
_self,
$ay.t(item.fld)
)
]"
></gz-date-time-picker>
</div>
@@ -35,12 +40,17 @@
<gz-date-picker
v-model="_self[item.dataKey]"
:readonly="readOnly"
:label="t(item.fld)"
:label="$ay.t(item.fld)"
:ref="item.fld"
:data-cy="item.fld"
:error-messages="form().serverErrors(parentVM, item.fld)"
:rules="[
form().customFieldsCheck(parentVM, item, _self, t(item.fld))
form().customFieldsCheck(
parentVM,
item,
_self,
$ay.t(item.fld)
)
]"
></gz-date-picker>
</div>
@@ -49,12 +59,17 @@
<gz-time-picker
v-model="_self[item.dataKey]"
:readonly="readOnly"
:label="t(item.fld)"
:label="$ay.t(item.fld)"
:ref="item.fld"
:data-cy="item.fld"
:error-messages="form().serverErrors(parentVM, item.fld)"
:rules="[
form().customFieldsCheck(parentVM, item, _self, t(item.fld))
form().customFieldsCheck(
parentVM,
item,
_self,
$ay.t(item.fld)
)
]"
></gz-time-picker>
</div>
@@ -63,12 +78,17 @@
<v-textarea
v-model="_self[item.dataKey]"
:readonly="readOnly"
:label="t(item.fld)"
:label="$ay.t(item.fld)"
:ref="item.fld"
:data-cy="item.fld"
:error-messages="form().serverErrors(parentVM, item.fld)"
:rules="[
form().customFieldsCheck(parentVM, item, _self, t(item.fld))
form().customFieldsCheck(
parentVM,
item,
_self,
$ay.t(item.fld)
)
]"
auto-grow
clearable
@@ -79,12 +99,17 @@
<v-text-field
v-model="_self[item.dataKey]"
:readonly="readOnly"
:label="t(item.fld)"
:label="$ay.t(item.fld)"
:ref="item.fld"
:data-cy="item.fld"
:error-messages="form().serverErrors(parentVM, item.fld)"
:rules="[
form().customFieldsCheck(parentVM, item, _self, t(item.fld))
form().customFieldsCheck(
parentVM,
item,
_self,
$ay.t(item.fld)
)
]"
clearable
:counter="10"
@@ -97,12 +122,17 @@
<v-checkbox
v-model="_self[item.dataKey]"
:readonly="readOnly"
:label="t(item.fld)"
:label="$ay.t(item.fld)"
:ref="item.fld"
:data-cy="item.fld"
:error-messages="form().serverErrors(parentVM, item.fld)"
:rules="[
form().customFieldsCheck(parentVM, item, _self, t(item.fld))
form().customFieldsCheck(
parentVM,
item,
_self,
$ay.t(item.fld)
)
]"
></v-checkbox>
</div>
@@ -111,12 +141,17 @@
<gz-decimal
v-model="_self[item.dataKey]"
:readonly="readOnly"
:label="t(item.fld)"
:label="$ay.t(item.fld)"
:ref="item.fld"
:data-cy="item.fld"
:error-messages="form().serverErrors(parentVM, item.fld)"
:rules="[
form().customFieldsCheck(parentVM, item, _self, t(item.fld))
form().customFieldsCheck(
parentVM,
item,
_self,
$ay.t(item.fld)
)
]"
></gz-decimal>
</div>
@@ -125,12 +160,17 @@
<gz-currency
v-model="_self[item.dataKey]"
:readonly="readOnly"
:label="t(item.fld)"
:label="$ay.t(item.fld)"
:ref="item.fld"
:data-cy="item.fld"
:error-messages="form().serverErrors(parentVM, item.fld)"
:rules="[
form().customFieldsCheck(parentVM, item, _self, t(item.fld))
form().customFieldsCheck(
parentVM,
item,
_self,
$ay.t(item.fld)
)
]"
></gz-currency>
</div>
@@ -166,9 +206,6 @@ export default {
},
methods: {
t: function(tKey) {
return window.$gz.translation.get(tKey);
},
form() {
//nothing
return window.$gz.form;
@@ -433,9 +470,6 @@ export default {
if (!window.$gz._) {
throw "custom-fields-control: $gz._ (lodash) is required and missing";
}
if (!window.$gz.translation) {
throw "custom-fields-control: $gz.translation is required and missing";
}
}
},
created() {