This commit is contained in:
2019-06-24 23:17:23 +00:00
parent c5fad4e58c
commit 2b9be6d9e8
4 changed files with 18 additions and 3 deletions

View File

@@ -99,7 +99,8 @@ export default {
"Leave", "Leave",
"Copy", "Copy",
"Tags", "Tags",
"Customize" "Customize",
"ObjectCustomFieldCustomGrid"
], ],
decimalValidate(required) { decimalValidate(required) {
return { required: required, decimal: [2, this.format().decimalSeparator] }; return { required: required, decimal: [2, this.format().decimalSeparator] };

View File

@@ -1,7 +1,9 @@
<template> <template>
<div> <div>
CUSTOM FIELDS: <span class="v-label v-label--active theme--light">
<span> {{ this.$gzlocale.get("ObjectCustomFieldCustomGrid") }}
</span>
<span class="caption">
{{ value }} {{ value }}
</span> </span>
</div> </div>

View File

@@ -32,6 +32,7 @@ import "@/assets/css/main.css";
//controls //controls
import dateTimeControl from "./components/date-time-control.vue"; import dateTimeControl from "./components/date-time-control.vue";
import tagPicker from "./components/tag-picker.vue"; import tagPicker from "./components/tag-picker.vue";
import customFieldsControl from "./components/custom-fields-control.vue";
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// LIBS AND GLOBAL ITEMS // LIBS AND GLOBAL ITEMS
@@ -152,6 +153,7 @@ Vue.filter("boolastext", function vueFilterBoolAsText(value) {
// //
Vue.component("gz-date-time-picker", dateTimeControl); Vue.component("gz-date-time-picker", dateTimeControl);
Vue.component("gz-tag-picker", tagPicker); Vue.component("gz-tag-picker", tagPicker);
Vue.component("gz-custom-fields", customFieldsControl);
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
//3rd party ui components //3rd party ui components

View File

@@ -161,6 +161,16 @@
@change="onChange('tags')" @change="onChange('tags')"
></gz-tag-picker> ></gz-tag-picker>
</v-flex> </v-flex>
<v-flex xs12 px-2>
<gz-custom-fields
v-model="obj.customFields"
:readonly="this.formState.readOnly"
ref="customFields"
:error-messages="this.$gzform.serverErrors(this, 'customFields')"
@change="onChange('customFields')"
></gz-custom-fields>
</v-flex>
</v-layout> </v-layout>
<!-- <v-layout align-left justify-center row wrap mt-5> <!-- <v-layout align-left justify-center row wrap mt-5>
<v-flex xs6 sm4> FORMtags: {{ obj.tags }} </v-flex> <v-flex xs6 sm4> FORMtags: {{ obj.tags }} </v-flex>