From e5a8088540994ac719cd58c65e37208887e26c58 Mon Sep 17 00:00:00 2001 From: Hakadao Date: Thu, 28 Dec 2023 00:50:52 +0800 Subject: [PATCH] fix: resolve ts errors and warnings --- .../Topbar/components/HistoryPop.vue | 14 +++++++---- src/contentScripts/views/History/History.vue | 25 ++++++++++++------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/components/Topbar/components/HistoryPop.vue b/src/components/Topbar/components/HistoryPop.vue index fa8a72ff..4e055a0d 100644 --- a/src/components/Topbar/components/HistoryPop.vue +++ b/src/components/Topbar/components/HistoryPop.vue @@ -112,16 +112,20 @@ function onClickTab(tabId: number) { */ function getHistoryUrl(item: HistoryItem) { // Video - if (activatedTab.value === 0) + if (activatedTab.value === 0) { return `https://www.bilibili.com/video/${item.history.bvid}` + } // Live - else if (activatedTab.value === 1) + else if (activatedTab.value === 1) { return `//live.bilibili.com/${item.history.oid}` + } // Article - else if (activatedTab.value === 2) - if (item.history.cid == 0) + else if (activatedTab.value === 2) { + if (item.history.cid === 0) return `/read/cv${item.history.oid}` - else return `/read/cv${item.history.cid}` + else + return `/read/cv${item.history.cid}` + } return '' } diff --git a/src/contentScripts/views/History/History.vue b/src/contentScripts/views/History/History.vue index 04badbe4..56f2a842 100644 --- a/src/contentScripts/views/History/History.vue +++ b/src/contentScripts/views/History/History.vue @@ -117,7 +117,7 @@ function searchHistoryList() { } res.data.list.forEach((item: HistorySearchItem) => { - historyList.push(item as HistoryItem) + historyList.push(item as unknown as HistoryItem) }) noMoreContent.value = false @@ -154,23 +154,30 @@ function deleteHistoryItem(index: number, historyItem: HistoryItem) { */ function getHistoryUrl(item: HistoryItem) { // anime - if (item.history.business === 'pgc') + if (item.history.business === 'pgc') { return removeHttpFromUrl(item.uri) + } // video - else if (item.history.business === 'archive') + else if (item.history.business === 'archive') { return removeHttpFromUrl(item.history.bvid) - else if (item.history.business === 'live') + } + else if (item.history.business === 'live') { return `//live.bilibili.com/${item.history.oid}` - else if (item.history.business === 'article') - if (item.history.cid == 0) + } + else if (item.history.business === 'article') { + if (item.history.cid === 0) return `//www.bilibili.com/read/cv${item.history.oid}` - else return `//www.bilibili.com/read/cv${item.history.cid}` + else + return `//www.bilibili.com/read/cv${item.history.cid}` + } return '' } function getHistoryItemCover(item: HistoryItem) { - if (item.history.business === 'article') - return removeHttpFromUrl(`${item.covers[0]}`) + if (item.history.business === 'article') { + if (item.covers) + return removeHttpFromUrl(`${item.covers[0]}`) + } return removeHttpFromUrl(item.cover) }