mirror of
https://github.com/jxxghp/MoviePilot-Frontend.git
synced 2026-09-05 15:36:49 +08:00
feat: add context recovery and search parameter persistence logic for resource page refresh
This commit is contained in:
+61
-6
@@ -39,6 +39,14 @@ interface SearchParams {
|
|||||||
sites: string
|
sites: string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface LastSearchContextResponse {
|
||||||
|
success?: boolean
|
||||||
|
data?: {
|
||||||
|
params?: Partial<SearchParams>
|
||||||
|
results?: Context[]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const resourceSearchParamsStorageKey = 'MP_ResourceSearchParams'
|
const resourceSearchParamsStorageKey = 'MP_ResourceSearchParams'
|
||||||
|
|
||||||
function createSearchParams(query: LocationQuery): SearchParams {
|
function createSearchParams(query: LocationQuery): SearchParams {
|
||||||
@@ -106,10 +114,55 @@ function rememberSearchParams(params: SearchParams) {
|
|||||||
saveStoredSearchParams(nextParams)
|
saveStoredSearchParams(nextParams)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function applyRememberedSearchParams(params?: Partial<SearchParams> | null, syncActive: boolean = false) {
|
||||||
|
const nextParams = normalizeSearchParams(params)
|
||||||
|
if (!hasSearchKeyword(nextParams)) return null
|
||||||
|
|
||||||
|
rememberSearchParams(nextParams)
|
||||||
|
if (syncActive || !hasSearchKeyword(activeSearchParams.value)) {
|
||||||
|
activeSearchParams.value = { ...nextParams }
|
||||||
|
}
|
||||||
|
return nextParams
|
||||||
|
}
|
||||||
|
|
||||||
if (hasSearchKeyword(initialSearchParams)) {
|
if (hasSearchKeyword(initialSearchParams)) {
|
||||||
rememberSearchParams(initialSearchParams)
|
rememberSearchParams(initialSearchParams)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function fetchLastSearchContext() {
|
||||||
|
try {
|
||||||
|
const result = (await api.get('search/last/context')) as LastSearchContextResponse
|
||||||
|
applyRememberedSearchParams(result?.data?.params, true)
|
||||||
|
return Array.isArray(result?.data?.results) ? result.data.results : []
|
||||||
|
} catch (error) {
|
||||||
|
console.warn('读取上次搜索上下文失败,回退到仅加载结果:', error)
|
||||||
|
const results = await api.get('search/last')
|
||||||
|
return (results as unknown as Context[]) || []
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function resolveRefreshSearchParams() {
|
||||||
|
if (hasSearchKeyword(activeSearchParams.value)) {
|
||||||
|
return { ...activeSearchParams.value }
|
||||||
|
}
|
||||||
|
if (lastSearchParams.value && hasSearchKeyword(lastSearchParams.value)) {
|
||||||
|
return { ...lastSearchParams.value }
|
||||||
|
}
|
||||||
|
|
||||||
|
const storedParams = loadStoredSearchParams()
|
||||||
|
if (storedParams) {
|
||||||
|
applyRememberedSearchParams(storedParams, true)
|
||||||
|
return { ...storedParams }
|
||||||
|
}
|
||||||
|
|
||||||
|
await fetchLastSearchContext()
|
||||||
|
if (lastSearchParams.value && hasSearchKeyword(lastSearchParams.value)) {
|
||||||
|
return { ...lastSearchParams.value }
|
||||||
|
}
|
||||||
|
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
// 查询TMDBID或标题
|
// 查询TMDBID或标题
|
||||||
const keyword = computed(() => activeSearchParams.value.keyword)
|
const keyword = computed(() => activeSearchParams.value.keyword)
|
||||||
|
|
||||||
@@ -612,11 +665,9 @@ async function fetchData(options: { force?: boolean; params?: SearchParams } = {
|
|||||||
try {
|
try {
|
||||||
enableFilterAnimation.value = true
|
enableFilterAnimation.value = true
|
||||||
if (!hasSearchKeyword(currentSearchParams)) {
|
if (!hasSearchKeyword(currentSearchParams)) {
|
||||||
// 查询上次搜索结果
|
// 查询上次搜索结果,并同步可重放的搜索参数
|
||||||
const results = await api.get('search/last', {
|
const results = await fetchLastSearchContext()
|
||||||
params: requestToken ? { _ts: requestToken } : undefined,
|
setStreamResults(results || [])
|
||||||
})
|
|
||||||
setStreamResults((results as unknown as Context[]) || [])
|
|
||||||
} else {
|
} else {
|
||||||
resetSearchResults()
|
resetSearchResults()
|
||||||
startLoadingProgress()
|
startLoadingProgress()
|
||||||
@@ -646,11 +697,15 @@ async function fetchData(options: { force?: boolean; params?: SearchParams } = {
|
|||||||
// 重新搜索(使用相同参数重新触发搜索)
|
// 重新搜索(使用相同参数重新触发搜索)
|
||||||
async function refreshSearch() {
|
async function refreshSearch() {
|
||||||
if (isRefreshing.value || progressActive.value) return
|
if (isRefreshing.value || progressActive.value) return
|
||||||
const refreshParams = lastSearchParams.value ?? activeSearchParams.value
|
|
||||||
isRefreshing.value = true
|
isRefreshing.value = true
|
||||||
try {
|
try {
|
||||||
// 重新搜索时退出 AI 视图,其余状态由 fetchData 内部重置
|
// 重新搜索时退出 AI 视图,其余状态由 fetchData 内部重置
|
||||||
showingAiResults.value = false
|
showingAiResults.value = false
|
||||||
|
const refreshParams = await resolveRefreshSearchParams()
|
||||||
|
if (!refreshParams) {
|
||||||
|
console.warn('未找到可用于重新搜索的搜索参数')
|
||||||
|
return
|
||||||
|
}
|
||||||
await fetchData({ force: true, params: refreshParams })
|
await fetchData({ force: true, params: refreshParams })
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('重新搜索失败:', error)
|
console.error('重新搜索失败:', error)
|
||||||
|
|||||||
Reference in New Issue
Block a user