some fixes ^^
This commit is contained in:
@@ -70,13 +70,13 @@ namespace zero.Core.Extensions
|
||||
{
|
||||
if (!query.Search.IsNullOrEmpty() && query.SearchSelector != null)
|
||||
{
|
||||
rawQuery = rawQuery.SearchIf(query.SearchSelector, query.Search, "*", "*");
|
||||
rawQuery = rawQuery.SearchIf(query.SearchSelector, query.Search, "*", "*", Raven.Client.Documents.Queries.SearchOperator.And);
|
||||
}
|
||||
if (!query.Search.IsNullOrEmpty() && query.SearchSelectors.Length > 0)
|
||||
{
|
||||
foreach (var selector in query.SearchSelectors)
|
||||
{
|
||||
rawQuery = rawQuery.SearchIf(selector, query.Search, "*", "*", Raven.Client.Documents.Queries.SearchOperator.Or);
|
||||
rawQuery = rawQuery.SearchIf(selector, query.Search, "*", "*", Raven.Client.Documents.Queries.SearchOperator.And);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -183,6 +183,7 @@
|
||||
{
|
||||
this.configuration.items(this.filter).then(result =>
|
||||
{
|
||||
this.$emit('loaded', result);
|
||||
this.pages = result.totalPages;
|
||||
this.count = result.totalItems;
|
||||
|
||||
@@ -576,6 +577,11 @@
|
||||
}
|
||||
}
|
||||
|
||||
.ui-table-cell .-minor
|
||||
{
|
||||
color: var(--color-text-dim);
|
||||
}
|
||||
|
||||
.ui-table-field-image
|
||||
{
|
||||
border-radius: 3px;
|
||||
|
||||
@@ -30,24 +30,35 @@
|
||||
id: null,
|
||||
loaded: false,
|
||||
active: false,
|
||||
hasErrors: false
|
||||
hasErrors: false,
|
||||
countOutput: 0
|
||||
}),
|
||||
|
||||
watch: {
|
||||
active(val)
|
||||
{
|
||||
this.loaded = true;
|
||||
},
|
||||
count(val)
|
||||
{
|
||||
this.countOutput = val;
|
||||
}
|
||||
},
|
||||
|
||||
mounted ()
|
||||
created()
|
||||
{
|
||||
this.id = Strings.guid();
|
||||
this.loaded = this.active;
|
||||
this.countOutput = this.count;
|
||||
},
|
||||
|
||||
methods: {
|
||||
|
||||
setCount(count)
|
||||
{
|
||||
this.countOutput = count;
|
||||
},
|
||||
|
||||
// set and display errors
|
||||
setErrors(errors, append)
|
||||
{
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
:aria-selected="tab.active" role="tab" @click="select(index)">
|
||||
<i v-if="tab.hasErrors" class="ui-tabs-list-item-error fth-alert-circle"></i>
|
||||
{{ tab.label | localize }}
|
||||
<i v-if="tab.count > 0" class="ui-tabs-list-item-count">{{tab.count}}</i>
|
||||
<i v-if="tab.countOutput > 0" class="ui-tabs-list-item-count">{{tab.countOutput}}</i>
|
||||
</button>
|
||||
</div>
|
||||
<div class="ui-tabs-items">
|
||||
|
||||
Reference in New Issue
Block a user