From 5c9b37e9e628b922379141f31b0c691b77293690 Mon Sep 17 00:00:00 2001 From: wanxp <977741432@qq.com> Date: Thu, 16 Feb 2023 11:39:40 +0800 Subject: [PATCH] feature: search pageable --- .../wanxp/douban/data/search/DoubanSearchFuzzySuggestModal.ts | 4 ++-- src/org/wanxp/lang/locale/zh-cn.ts | 2 +- src/org/wanxp/main.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/wanxp/douban/data/search/DoubanSearchFuzzySuggestModal.ts b/src/org/wanxp/douban/data/search/DoubanSearchFuzzySuggestModal.ts index 30d00fa..84aaa6b 100644 --- a/src/org/wanxp/douban/data/search/DoubanSearchFuzzySuggestModal.ts +++ b/src/org/wanxp/douban/data/search/DoubanSearchFuzzySuggestModal.ts @@ -73,7 +73,7 @@ class DoubanFuzzySuggester extends FuzzySuggestModal const {searchPage} = this.context; let currentPage:SearchPageInfo = searchPage; let result:boolean = false; - switch (item.type) { + switch (item.url) { case NavigateType.previous: currentPage = searchPage.previousPage(); result = true; @@ -89,8 +89,8 @@ class DoubanFuzzySuggester extends FuzzySuggestModal if (result) { const searchPageResult: SearchPage = await Searcher.loadSearchItem(this.searchItem, currentPage.start, this.plugin.settings, this.plugin.settingsManager); - this.updatePageResult(searchPageResult); this.context.searchPage = new SearchPageInfo(searchPageResult.total, currentPage.pageNum, searchPageResult.pageSize); + this.updatePageResult(searchPageResult); } return result; } diff --git a/src/org/wanxp/lang/locale/zh-cn.ts b/src/org/wanxp/lang/locale/zh-cn.ts index 21903dd..163326c 100644 --- a/src/org/wanxp/lang/locale/zh-cn.ts +++ b/src/org/wanxp/lang/locale/zh-cn.ts @@ -259,7 +259,7 @@ export default { '121902': `重置为默认值`, '150102': `[上一页]...`, '150103': `[下一页]...`, - '150104': `[下一页(插件中登录开启此功能)]...`, + '150104': `[下一页]...(请先在插件中登录才能使用此功能)`, //content '200101': `。`, diff --git a/src/org/wanxp/main.ts b/src/org/wanxp/main.ts index 417461a..46f6d1e 100644 --- a/src/org/wanxp/main.ts +++ b/src/org/wanxp/main.ts @@ -115,7 +115,7 @@ export default class DoubanPlugin extends Plugin { this.showStatus(i18nHelper.getMessage('140201', searchTerm)); const resultList:DoubanSearchResultSubject[] = await Searcher.search(searchTerm, this.settings, context.plugin.settingsManager); this.showStatus(i18nHelper.getMessage('140202', resultList.length.toString())); - context.searchPage = new SearchPageInfo(21,0,20); + context.searchPage = new SearchPageInfo(21,-1,20); new DoubanFuzzySuggester(this, context, searchTerm).showSearchList(resultList); } catch (e) { log.error(i18nHelper.getMessage('140206').replace('{0}', e.message), e);