This commit is contained in:
2020-01-28 22:55:34 +00:00
parent 7ffbb4c7ce
commit 8a4f7a6741

View File

@@ -65,10 +65,10 @@
<v-select
v-if="item.custom"
v-model="item.type"
:items="pickLists.formFieldDataTypes"
:items="pickLists.uiFieldDataTypes"
item-text="name"
item-value="id"
:label="lt('FormfieldDataType')"
:label="lt('UiFieldDataType')"
@change="dataTypeChanged(item)"
></v-select>
</v-card-text>
@@ -95,14 +95,14 @@ export default {
var ltKeysRequired = [
"FormFieldEntryRequired",
"FormFieldVisible",
"FormfieldDataType",
"FormFieldDataTypesCurrency",
"FormFieldDataTypesDateOnly",
"FormFieldDataTypesDateTime",
"FormFieldDataTypesNumber",
"FormFieldDataTypesText",
"FormFieldDataTypesTimeOnly",
"FormFieldDataTypesTrueFalse"
"UiFieldDataType",
"UiFieldDataTypesCurrency",
"UiFieldDataTypesDateOnly",
"UiFieldDataTypesDateTime",
"UiFieldDataTypesNumber",
"UiFieldDataTypesText",
"UiFieldDataTypesTimeOnly",
"UiFieldDataTypesTrueFalse"
];
window.$gz.locale.fetch(ltKeysRequired).then(next);
@@ -150,15 +150,15 @@ export default {
concurrencyToken: undefined,
formCustomTemplateKey: this.$route.params.formCustomTemplateKey,
pickLists: {
formFieldDataTypes: [
{ name: this.lt("FormFieldDataTypesCurrency"), id: "currency" },
{ name: this.lt("FormFieldDataTypesDateOnly"), id: "date" },
{ name: this.lt("FormFieldDataTypesTimeOnly"), id: "time" },
{ name: this.lt("FormFieldDataTypesDateTime"), id: "datetime" },
{ name: this.lt("FormFieldDataTypesText"), id: "text" },
{ name: this.lt("FormFieldDataTypesNumber"), id: "number" },
{ name: this.lt("FormFieldDataTypesTrueFalse"), id: "bool" }
TODO: replace number with more specific new types added
uiFieldDataTypes: [
{ name: this.lt("UiFieldDataTypesDateTime"), id: "1" },
{ name: this.lt("UiFieldDataTypesDateOnly"), id: "2" },
{ name: this.lt("UiFieldDataTypesTimeOnly"), id: "3" },
{ name: this.lt("UiFieldDataTypesText"), id: "4" },
{ name: this.lt("UiFieldDataTypesTrueFalse"), id: "6" },
{ name: this.lt("UiFieldDataTypesInteger"), id: "5" },
{ name: this.lt("UiFieldDataTypesDecimal"), id: "7" },
{ name: this.lt("UiFieldDataTypesCurrency"), id: "8" }
]
},
formState: {
@@ -409,8 +409,6 @@ function initDataObject(vm) {
vm.formCustomTemplateKey
);
}
});
}
@@ -424,18 +422,18 @@ function initDataObject(vm) {
"ObjectCustomFieldVisible": "Visible",
CURRENT (used)
"FormFieldDataTypesCurrency": "Money",
"FormFieldDataTypesDateOnly": "Date",
"FormFieldDataTypesDateTime": "Date & Time",
"FormFieldDataTypesNumber": "Number",
"FormFieldDataTypesText": "Text",
"FormFieldDataTypesTimeOnly": "Time",
"FormFieldDataTypesTrueFalse": "True/False",
"UiFieldDataTypesCurrency": "Money",
"UiFieldDataTypesDateOnly": "Date",
"UiFieldDataTypesDateTime": "Date & Time",
"UiFieldDataTypesNumber": "Number",
"UiFieldDataTypesText": "Text",
"UiFieldDataTypesTimeOnly": "Time",
"UiFieldDataTypesTrueFalse": "True/False",
NEW (used)
"FormFieldEntryRequired" = "Required"
"FormFieldVisible" = "Visible" (copy from ObjectCustomFieldVisible)
"FormfieldDataType" = "Data type" (copy from ObjectCustomFieldDataType)
"UiFieldDataType" = "Data type" (copy from ObjectCustomFieldDataType)
UI: