DeforaNetworks/corteza
DeforaNetworks/corteza
3
0
Fork 0
Code

Fix reseting record list filter

Browse Source
This commit is contained in:
Jože Fortun 2024-10-15 13:43:59 +02:00
parent 2a8682c234
commit fc3d64d448
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/web/compose/src/components/Common/RecordListFilter.vue
View File

@ -615,6 +615,10 @@ export default {
processFilter () { processFilter () {
return this.componentFilter.map(({ groupCondition, filter = [], name }) => { return this.componentFilter.map(({ groupCondition, filter = [], name }) => {
filter = filter.map(({ record, ...f }) => { filter = filter.map(({ record, ...f }) => {
if (!f.name) {
return
}
if (record) { if (record) {
f.value = record[f.name] || record.values[f.name] f.value = record[f.name] || record.values[f.name]
} }
@ -627,10 +631,10 @@ export default {
} }
return f return f
}) }).filter(f => f)
return { groupCondition, filter, name } return { groupCondition, filter, name }
}) }).filter(({ filter }) => filter.length)
}, },
onSave (close = true, type = 'filter') { onSave (close = true, type = 'filter') {

13
client/web/compose/src/components/PageBlocks/RecordListBase.vue
View File

@ -1139,11 +1139,16 @@ export default {
}, },
onFilter (filter = []) { onFilter (filter = []) {
filter.forEach(f => { if (filter.length) {
f.name = this.$t('recordList.customFilter') filter.forEach(f => {
}) f.name = this.$t('recordList.customFilter')
})
this.activeFilters = [this.$t('recordList.customFilter')]
} else {
this.activeFilters = []
}
this.activeFilters = [this.$t('recordList.customFilter')]
this.recordListFilter = filter this.recordListFilter = filter
this.setStorageRecordListFilter() this.setStorageRecordListFilter()
this.refresh(true) this.refresh(true)