This commit is contained in:
2020-02-21 16:19:14 +00:00
parent 298e331012
commit 9ccb418a1e

View File

@@ -193,13 +193,18 @@
prepend-icon="fa-filter" prepend-icon="fa-filter"
></v-select> ></v-select>
<v-text-field <v-text-field
v-if="
item.tempFilterOperator != null &&
item.tempFilterOperator != '*NOVALUE*' &&
item.tempFilterOperator != '*HASVALUE*'
"
v-model="item.tempFilterValue" v-model="item.tempFilterValue"
clearable clearable
></v-text-field> ></v-text-field>
<v-btn <v-btn
large large
block block
v-if="item.tempFilterToken != null" v-if="item.tempFilterOperator != null"
@click="addFilterCondition(item)" @click="addFilterCondition(item)"
><v-icon large>fa-plus</v-icon></v-btn ><v-icon large>fa-plus</v-icon></v-btn
> >
@@ -488,7 +493,7 @@ export default {
filterItem.op = item.tempFilterOperator; filterItem.op = item.tempFilterOperator;
filterItem.value = item.tempFilterValue; filterItem.value = item.tempFilterValue;
//only add if there is both an op and a value //only add if there is both an op and a value
//above here for tokens that isn't a restriction but //above here for tokens that isn't a restriction but
//after passing through those conditions were at a point where there MUST be both //after passing through those conditions were at a point where there MUST be both
if (filterItem.op && filterItem.value) { if (filterItem.op && filterItem.value) {
//display //display
@@ -515,12 +520,12 @@ export default {
} }
var opDisplay = window.$gz._.find( var opDisplay = window.$gz._.find(
this.pickLists.dateFilterOperators, this.pickLists.stringFilterOperators,
{ {
id: filterItem.op id: filterItem.op
} }
).name; ).name;
filterItem.display = opDisplay + " " + valueDisplay; filterItem.display = opDisplay + ' "' + valueDisplay + '"';
filterItemSet = true; filterItemSet = true;
} }