Skip to content

Commit b817c6e

Browse files
committed
Fix current filter reset on click
1 parent e356287 commit b817c6e

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

client/web/compose/src/components/Common/FilterToolbox.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,13 @@
7676

7777
<b-td
7878
v-if="getField(filter.name)"
79-
class="align-middle"
8079
style="width: 1%;"
8180
>
8281
<b-button
8382
:id="`${groupIndex}-${index}`"
8483
ref="delete"
8584
variant="outline-extra-light"
86-
class="d-block text-dark border-0 h-full ml-2 px-2"
85+
class="d-block text-dark border-0 h-full ml-2 px-2 mt-1"
8786
@click="deleteFilter(groupIndex, index)"
8887
>
8988
<font-awesome-icon
@@ -486,7 +485,6 @@ export default {
486485
td {
487486
padding: 0;
488487
padding-bottom: 0.5rem;
489-
vertical-align: middle;
490488
}
491489
492490
.btn-add-group {

client/web/compose/src/components/Common/RecordListFilter.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
:selected-field="selectedField"
4242
:namespace="namespace"
4343
:mock.sync="mock"
44+
start-empty
4445
@prevent-close="onValueChange"
4546
/>
4647
</b-card-body>
@@ -306,7 +307,7 @@ export default {
306307
// If no filterGroups, add default
307308
if (!this.componentFilter.length) {
308309
this.componentFilter.push(this.createDefaultFilterGroup(undefined, this.selectedField))
309-
} else if (!this.inFilter) {
310+
} else if (this.selectedField && !this.inFilter) {
310311
this.addFilter(0)
311312
}
312313
},

0 commit comments

Comments
 (0)