refs #5609 eliminadas peticiones duplicadas
This commit is contained in:
parent
7c76521b02
commit
d389860704
|
@ -203,7 +203,7 @@ export default class Searchbar extends Component {
|
|||
|
||||
doSearch(filter, source) {
|
||||
if (filter === this.filter && !this.isIndex) return;
|
||||
let promise = this.onSearch({$params: filter});
|
||||
let promise = this.onSearch({$params: filter}, source);
|
||||
promise = promise || this.$q.resolve();
|
||||
promise.then(data => this.onFilter(filter, source, data));
|
||||
this.toBar(filter);
|
||||
|
@ -259,12 +259,6 @@ export default class Searchbar extends Component {
|
|||
|
||||
this.filter = filter;
|
||||
|
||||
if (source == 'removeBar') {
|
||||
delete params[this.toRemove];
|
||||
delete this.model.userParams[this.toRemove];
|
||||
this.model.refresh();
|
||||
}
|
||||
|
||||
if (!filter && this.model)
|
||||
this.model.clear();
|
||||
if (source != 'state')
|
||||
|
@ -279,7 +273,7 @@ export default class Searchbar extends Component {
|
|||
return {id: params.$row.id};
|
||||
}
|
||||
|
||||
onSearch(args) {
|
||||
onSearch(args, source) {
|
||||
if (!this.model) return;
|
||||
let filter = args.$params;
|
||||
|
||||
|
@ -325,6 +319,12 @@ export default class Searchbar extends Component {
|
|||
for (let param in stateFilter.tableQ)
|
||||
params[param] = stateFilter.tableQ[param];
|
||||
|
||||
if (source == 'removeBar') {
|
||||
delete params[this.toRemove];
|
||||
delete this.model.userParams[this.toRemove];
|
||||
delete stateFilter[this.toRemove];
|
||||
}
|
||||
|
||||
const newParams = Object.assign(stateFilter, params);
|
||||
return this.model.applyParams(newParams)
|
||||
.then(() => this.model.data);
|
||||
|
|
Loading…
Reference in New Issue