fix: 再次修复歌曲切换时导致自定义页面消失的问题

QingXia-Ela · Aug 1, 2024 · fa98198 · fa98198
1 parent 5012dbb
commit fa98198
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/pages/playlist/components/RightDetails/components/MiddleSplit/index.tsx b/src/pages/playlist/components/RightDetails/components/MiddleSplit/index.tsx
@@ -6,6 +6,7 @@ import NavSearch from '@/components/Input';
 import { useStore } from '@nanostores/react';
 import $PlayListState from '@/store/pages/playlist';
 import SirenStore from '@/store/SirenStore';
+import navigate from '@/router/utils/navigate';
 
 interface RightDetailsMiddleSplitProps {
   onSearch?: (keyword: string) => void;
@@ -32,10 +33,13 @@ const RightDetailsMiddleSplit: FunctionComponent<
   }, [searchValue]);
 
   const play = () => {
-    SirenStore.dispatch({
-      type: 'musicPlay/toAlbum',
-      cid: store.currentAlbumInfo.cid!,
-    });
+    let cid = store.currentAlbumData[0].cid
+    if (cid) {
+      SirenStore.dispatch({
+        type: 'player/selectSong',
+        cid,
+      });
+    }
   };
   return (
     <div className={Styles.middle_control}>

diff --git a/src/router/index.tsx b/src/router/index.tsx
@@ -19,12 +19,6 @@ const routes: RouteItem[] = [
     component: Download,
     name: '下载',
   },
-  // {
-  //   type: 'vanilla',
-  //   name: '正在播放',
-  //   element: document.createElement('a'),
-  //   addToNav: true,
-  // },
 ];
 
 export default routes;
diff --git a/src/store/models/router/index.ts b/src/store/models/router/index.ts
@@ -1,6 +1,7 @@
 import { atom } from 'nanostores';
 import SirenStore from '@/store/SirenStore';
 import SirenRouter from '@/router/SirenRouter';
+import routes from '@/router';
 
 // var a = require("@mui/material")
 
@@ -31,8 +32,10 @@ SirenStore.subscribe(() => {
     // 音乐切换时，路由也会变化，会导致自定义路由页退出展示
     // 发生音乐切换时，路由变化为 `/last/route` -> `/music/cid`
     // 因此假如下一个跳转页面是音乐页面则需要拦截此次操作
-    if (!currentPath.match(namespaceMusicPath))
+    // @ts-expect-error: path always compareable
+    if (!currentPath.match(namespaceMusicPath) && !routes.some((route) => route.path === currentPath)) {
       $customRouter.set({ ...$customRouter.get(), path });
+    }
   }
 });
 

diff --git a/src/types/SirenStore/index.ts b/src/types/SirenStore/index.ts
@@ -114,7 +114,6 @@ const initalProps = {
       belong: '',
       coverUrl: '',
       coverDeUrl: null,
-      songs: [],
     },
   },
   loading: {