This commit is contained in:
2020-02-20 18:12:24 +00:00
parent 9af85a9a64
commit 0542f2c982

View File

@@ -147,11 +147,19 @@
></v-radio> ></v-radio>
</v-radio-group> </v-radio-group>
<v-divider class="mx-4 my-5"></v-divider> <v-divider class="mx-4 my-5"></v-divider>
<!-- BUILDER FOR EACH TYPE Tag, decimal,currency, bool, integer, string, datetime --> <!-- ******** BUILDER FOR EACH TYPE Tag, decimal,currency, bool, integer, string, datetime ******** -->
<!-- DATETIME BUILDER --> <!-- DATETIME BUILDER @change="dateTokenChanged(item)"-->
<div v-if="item.uiFieldDataType === 1"> <div v-if="item.uiFieldDataType === 1">
<v-btn text><v-icon>fa-plus</v-icon></v-btn> <v-btn text><v-icon>fa-plus</v-icon></v-btn>
<v-select <v-select
v-model="item.tempToken"
:items="pickLists.dateFilterTokens"
item-text="name"
item-value="id"
:label="lt('Filter')"
></v-select>
<v-select
v-if="item.tempToken == '*select*'"
v-model="item.tempOperator" v-model="item.tempOperator"
:items="pickLists.dateFilterOperators" :items="pickLists.dateFilterOperators"
item-text="name" item-text="name"
@@ -280,7 +288,6 @@ export default {
fieldDefinitions: [], fieldDefinitions: [],
effectiveListView: undefined, effectiveListView: undefined,
concurrencyToken: undefined, concurrencyToken: undefined,
pickLists: { pickLists: {
dateFilterOperators: [ dateFilterOperators: [
{ name: this.lt("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" }, { name: this.lt("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" },
@@ -815,7 +822,8 @@ function initDataObject(vm) {
isCustomField: fld.isCustomField, isCustomField: fld.isCustomField,
sort: lvItem.sort || null, sort: lvItem.sort || null,
filter: lvItem.filter || { any: false, items: [] }, filter: lvItem.filter || { any: false, items: [] },
tempOperator: null tempOperator: null,
tempToken: null
}; };
ret.push(o); ret.push(o);
} }
@@ -842,7 +850,8 @@ function initDataObject(vm) {
isCustomField: fld.isCustomField, isCustomField: fld.isCustomField,
sort: null, sort: null,
filter: { any: false, items: [] }, filter: { any: false, items: [] },
tempOperator: null tempOperator: null,
tempToken: null
}; };
ret.push(o); ret.push(o);
} }