admin/raven-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-01-28 22:55:34 +00:00
parent 7ffbb4c7ce
commit 8a4f7a6741
1 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
ayanova/src/views/ay-customize.vue
View File

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