deadcxap/inpx-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Улучшение работы с параметрами URL

Browse Source
This commit is contained in:
Book Pauk
2022-10-14 15:46:22 +07:00
parent 252376412f
commit e22992fb35
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
client/components/Search/Search.vue
View File

@@ -347,10 +347,10 @@ const componentOptions = {
this.updatePageCount(); this.updatePageCount();
}, },
$route(to) { $route(to) {
this.updateQueryFromRoute(to); this.updateSearchFromRouteQuery(to);
}, },
langDefault() { langDefault() {
this.updateQueryFromRoute(this.$route); this.updateSearchFromRouteQuery(this.$route);
}, },
}, },
}; };
@@ -439,7 +439,7 @@ class Search {
this.$refs.authorInput.focus(); this.$refs.authorInput.focus();
this.setDefaults(); this.setDefaults();
this.updateQueryFromRoute(this.$route); this.updateSearchFromRouteQuery(this.$route);
//чтоб не вызывался лишний refresh //чтоб не вызывался лишний refresh
await utils.sleep(100); await utils.sleep(100);
@@ -453,6 +453,7 @@ class Search {
const settings = this.settings; const settings = this.settings;
this.search.limit = settings.limit; this.search.limit = settings.limit;
this.expanded = _.cloneDeep(settings.expanded); this.expanded = _.cloneDeep(settings.expanded);
this.expandedSeries = _.cloneDeep(settings.expandedSeries); this.expandedSeries = _.cloneDeep(settings.expandedSeries);
this.showCounts = settings.showCounts; this.showCounts = settings.showCounts;
@@ -814,7 +815,7 @@ class Search {
}); });
} }
async updateQueryFromRoute(to) { async updateSearchFromRouteQuery(to) {
if (this.routeUpdating) if (this.routeUpdating)
return; return;
@@ -825,23 +826,26 @@ class Search {
series: query.series || '', series: query.series || '',
title: query.title || '', title: query.title || '',
genre: query.genre || '', genre: query.genre || '',
lang: (query.lang == 'default' ? this.langDefault : query.lang || ''), lang: (typeof(query.lang) == 'string' ? query.lang : this.langDefault),
page: parseInt(query.page, 10) || 1, page: parseInt(query.page, 10) || 1,
limit: parseInt(query.limit, 10) || 20, limit: parseInt(query.limit, 10) || this.search.limit,
}); });
if (this.search.limit > 1000) if (this.search.limit > 1000)
this.search.limit = 1000; this.search.limit = 1000;
} }
updateRouteQuery() { updateRouteQueryFromSearch() {
this.routeUpdating = true; this.routeUpdating = true;
try { try {
const oldQuery = this.$route.query; const oldQuery = this.$route.query;
const query = _.pickBy(this.search); const query = _.pickBy(this.search);
if (this.search.lang == this.langDefault) if (this.search.lang == this.langDefault) {
query.lang = 'default' delete query.lang;
} else {
query.lang = this.search.lang;
}
const diff = diffUtils.getObjDiff(oldQuery, query); const diff = diffUtils.getObjDiff(oldQuery, query);
if (!diffUtils.isEmptyObjDiff(diff)) { if (!diffUtils.isEmptyObjDiff(diff)) {
@@ -1268,7 +1272,7 @@ class Search {
if (!this.ready) if (!this.ready)
return; return;
this.updateRouteQuery(); this.updateRouteQueryFromSearch();
//оптимизация //оптимизация
if (this.abCacheEnabled && this.search.author && this.search.author[0] == '=') { if (this.abCacheEnabled && this.search.author && this.search.author[0] == '=') {