Merge pull request #281 from wintsa123/v2

src/views/discover/MediaCardListView.vue

@@ -27,7 +27,6 @@ const isRefreshed = ref(false)
 // 数据列表
 const dataList = ref<MediaInfo[]>([])
 const currData = ref<MediaInfo[]>([])
-
 // 拼装参数
 function getParams() {
   let params = {
@@ -78,6 +77,7 @@ async function fetchData({ done }: { done: any }) {
     } else {
       // 加载一次
       // 设置加载中
+
       loading.value = true
       // 请求API
       currData.value = await api.get(props.apipath, {
@@ -115,15 +115,7 @@ async function fetchData({ done }: { done: any }) {
     <div v-if="dataList.length > 0" class="grid gap-4 grid-media-card mx-3" tabindex="0">
       <MediaCard v-for="data in dataList" :key="data.tmdb_id || data.douban_id" :media="data" />
     </div>
-    <NoDataFound
-      v-if="dataList.length === 0 && isRefreshed"
-      error-code="404"
-      error-title="没有数据"
-      error-description="无法获取到媒体信息。"
-    />
+    <NoDataFound v-if="dataList.length === 0 && isRefreshed" error-code="404" error-title="没有数据"
+      error-description="无法获取到媒体信息。" />
   </VInfiniteScroll>
 </template>
-
-<style lang="scss">
-
-</style>

src/views/discover/MediaCardSlideView.vue

@@ -3,6 +3,7 @@ import api from '@/api'
 import type { MediaInfo } from '@/api/types'
 import MediaCard from '@/components/cards/MediaCard.vue'
 import SlideView from '@/components/slide/SlideView.vue'
+import { registerAbortController } from "@/router";
 
 // 输入参数
 const props = defineProps({
@@ -10,8 +11,9 @@ const props = defineProps({
   linkurl: String,
   title: String,
 })
+let abortController: AbortController | null = null;
 
-provide('rankingPropsKey', reactive({...props}))
+provide('rankingPropsKey', reactive({ ...props }))
 
 // 组件加载完成
 const componentLoaded = ref(false)
@@ -24,8 +26,10 @@ async function fetchData() {
   try {
     if (!props.apipath)
       return
-
-    dataList.value = await api.get(props.apipath)
+    abortController = new AbortController();
+    registerAbortController(abortController);
+    const { signal } = abortController;
+    dataList.value = await api.get(props.apipath, { signal })
     if (dataList.value.length > 0)
       componentLoaded.value = true
   }
@@ -35,23 +39,22 @@ async function fetchData() {
 }
 
 // 加载时获取数据
-onMounted(fetchData)
+onMounted(() => {
+  fetchData();
+});
+onActivated(() => {
+  if (dataList.value.length == 0) {
+    fetchData();
+
+  }
+});
 </script>
 
 <template>
-  <SlideView
-    v-if="componentLoaded"
-  >
+  <SlideView v-if="componentLoaded">
     <template #content>
-      <template
-        v-for="data in dataList"
-        :key="data.tmdb_id || data.douban_id || data.bangumi_id"
-      >
-        <MediaCard
-          :media="data"
-          height="15rem"
-          width="10rem"
-        />
+      <template v-for="data in dataList" :key="data.tmdb_id || data.douban_id || data.bangumi_id">
+        <MediaCard :media="data" height="15rem" width="10rem" />
       </template>
     </template>
   </SlideView>