This commit is contained in:
@@ -331,7 +331,29 @@
|
|||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
<!-- TAG BUILDER -->
|
<!-- TAG BUILDER -->
|
||||||
<div v-if="item.uiFieldDataType === 9">TAG BUILDER</div>
|
<div v-if="item.uiFieldDataType === 9">
|
||||||
|
<v-select
|
||||||
|
v-model="item.tempFilterOperator"
|
||||||
|
:items="pickLists.tagFilterOperators"
|
||||||
|
item-text="name"
|
||||||
|
item-value="id"
|
||||||
|
:label="lt('Filter')"
|
||||||
|
prepend-icon="fa-filter"
|
||||||
|
></v-select>
|
||||||
|
|
||||||
|
<gz-tag-picker
|
||||||
|
v-if="item.tempFilterOperator != null"
|
||||||
|
v-model="item.tempFilterValue"
|
||||||
|
></gz-tag-picker>
|
||||||
|
|
||||||
|
<v-btn
|
||||||
|
large
|
||||||
|
block
|
||||||
|
v-if="item.tempFilterOperator != null"
|
||||||
|
@click="addFilterCondition(item)"
|
||||||
|
><v-icon large>fa-plus</v-icon></v-btn
|
||||||
|
>
|
||||||
|
</div>
|
||||||
<!-- ENUM BUILDER -->
|
<!-- ENUM BUILDER -->
|
||||||
<div v-if="item.uiFieldDataType === 10">
|
<div v-if="item.uiFieldDataType === 10">
|
||||||
ENUM BUILDER
|
ENUM BUILDER
|
||||||
@@ -1148,6 +1170,11 @@ function initDataObject(vm) {
|
|||||||
tempFilterToken: null,
|
tempFilterToken: null,
|
||||||
tempFilterValue: null
|
tempFilterValue: null
|
||||||
};
|
};
|
||||||
|
|
||||||
|
//If it's a tag and it's not been set yet it needs to have an empty array to stat with for the picker
|
||||||
|
if (o.uiFieldDataType == 9 && o.tempFilterValue == null) {
|
||||||
|
o.tempFilterValue = [];
|
||||||
|
}
|
||||||
ret.push(o);
|
ret.push(o);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1177,6 +1204,10 @@ function initDataObject(vm) {
|
|||||||
tempFilterToken: null,
|
tempFilterToken: null,
|
||||||
tempFilterValue: null
|
tempFilterValue: null
|
||||||
};
|
};
|
||||||
|
//If it's a tag and it's not been set yet it needs to have an empty array to stat with for the picker
|
||||||
|
if (o.uiFieldDataType == 9 && o.tempFilterValue == null) {
|
||||||
|
o.tempFilterValue = [];
|
||||||
|
}
|
||||||
ret.push(o);
|
ret.push(o);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user