Skip to content

Commit 05dbbeb

Browse files
committed
fix: 修复歌曲列表排序状态跨页面串用
1 parent 05a4e59 commit 05dbbeb

10 files changed

Lines changed: 95 additions & 11 deletions

File tree

‎src/components/list/SongList.vue‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script setup lang="ts">
22
import type { Artist, PlaybackContext, Track, TrackSource } from "@shared/types/player";
33
import type { CollectionType } from "@/types/collection";
4-
import type { SortField } from "@/types/list";
4+
import type { SongListSortKey, SongListSortPreference, SortField, SortOrder } from "@/types/list";
55
import { useMediaStore } from "@/stores/media";
66
import { useStatusStore } from "@/stores/status";
77
import { useSettingsStore } from "@/stores/settings";
@@ -35,6 +35,8 @@ const props = withDefaults(
3535
showSize?: boolean;
3636
/** 是否启用排序交互 */
3737
enableSort?: boolean;
38+
/** 排序偏好作用域 */
39+
sortKey?: SongListSortKey;
3840
/** 列表来源 */
3941
source?: TrackSource;
4042
/** 集合类型 */
@@ -57,6 +59,7 @@ const props = withDefaults(
5759
showDuration: true,
5860
showSize: false,
5961
enableSort: false,
62+
sortKey: undefined,
6063
source: "local",
6164
collectionType: undefined,
6265
collectionId: undefined,
@@ -135,8 +138,33 @@ const goAlbum = (item: Track): void => {
135138
});
136139
};
137140
141+
/** 未指定作用域时的组件内排序偏好 */
142+
const localSortPreference = ref<SongListSortPreference>({ field: "none", order: "asc" });
143+
144+
/** 按作用域隔离的排序偏好 */
145+
const sortPreference = computed<SongListSortPreference>({
146+
get: () => (props.sortKey ? status.getSortPreference(props.sortKey) : localSortPreference.value),
147+
set: (value) => {
148+
if (props.sortKey) status.setSortPreference(props.sortKey, value);
149+
else localSortPreference.value = value;
150+
},
151+
});
152+
138153
/** 排序字段 */
139-
const { sortField, sortOrder } = storeToRefs(status);
154+
const sortField = computed<SortField>({
155+
get: () => sortPreference.value.field,
156+
set: (field) => {
157+
sortPreference.value = { ...sortPreference.value, field };
158+
},
159+
});
160+
161+
/** 排序方向 */
162+
const sortOrder = computed<SortOrder>({
163+
get: () => sortPreference.value.order,
164+
set: (order) => {
165+
sortPreference.value = { ...sortPreference.value, order };
166+
},
167+
});
140168
141169
/** 字段文案 key 映射 */
142170
const sortFieldLabelKeyMap: Record<SortField, string> = {

‎src/pages/Artist.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,7 @@ const albumItems = computed<CoverItem[]>(() => {
374374
:show-size="source === 'local'"
375375
:has-more="hasMoreSongs"
376376
:loading-more="loadingMore"
377+
sort-key="artist"
377378
enable-sort
378379
@scroll="handleListScroll"
379380
@change="loadArtist"

‎src/pages/Cloud.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ watch(
166166
:playback-context="playbackContext"
167167
source="netease"
168168
collection-type="cloud"
169+
sort-key="cloud"
169170
enable-sort
170171
/>
171172
</div>

‎src/pages/Collection.vue‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<script setup lang="ts">
22
import type { PlaybackContext, TrackSource } from "@shared/types/player";
33
import type { Collection, CollectionType } from "@/types/collection";
4+
import type { SongListSortKey } from "@/types/list";
45
import type { DropdownMenuItem } from "@/components/ui/SDropdownMenu.vue";
56
import { loadCollection as loadCollectionService } from "@/services/collection";
67
import { getCollectionShareUrl } from "@/utils/format/shareUrl";
@@ -26,6 +27,9 @@ const source = route.params.source as TrackSource;
2627
const type = route.params.type as CollectionType;
2728
const id = route.params.id as string;
2829
30+
/** 按合集类型隔离排序偏好 */
31+
const sortKey = computed<SongListSortKey>(() => `collection.${type}`);
32+
2933
const collection = shallowRef<Collection | null>(null);
3034
const preview = getCoverPreview(route.fullPath);
3135
/** 首屏头部只复用轻量摘要,不将预览数据交给播放和歌单管理逻辑 */
@@ -431,6 +435,7 @@ onBeforeUnmount(() => {
431435
:collection-id="id"
432436
:playback-context="playbackContext"
433437
:can-remove="manage.canManage.value"
438+
:sort-key="sortKey"
434439
enable-sort
435440
@scroll="handleListScroll"
436441
@change="handleTracksRemoved"

‎src/pages/Folders.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ onMounted(async () => {
169169
:items="selectedTracks"
170170
show-album
171171
show-duration
172+
sort-key="folders"
172173
enable-sort
173174
>
174175
<template #topInfo>

‎src/pages/History.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ onMounted(() => {
113113
:search-query="searchQuery"
114114
:playback-context="playbackContext"
115115
:show-size="false"
116+
sort-key="history"
116117
enable-sort
117118
/>
118119
</div>

‎src/pages/Library.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ onUnmounted(() => {
201201
:items="tracks"
202202
:search-query="searchQuery"
203203
:playback-context="playbackContext"
204+
sort-key="library"
204205
enable-sort
205206
show-size
206207
/>

‎src/pages/Liked.vue‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ const handleMoreMenu = (key: string): void => {
179179
:search-query="searchQuery"
180180
:show-size="false"
181181
source="local"
182+
sort-key="liked.local"
182183
enable-sort
183184
/>
184185
</div>
@@ -216,6 +217,7 @@ const handleMoreMenu = (key: string): void => {
216217
:collection-id="user.likedPlaylistId ?? undefined"
217218
:playback-context="playbackContext"
218219
collection-type="playlist"
220+
sort-key="liked.online"
219221
enable-sort
220222
/>
221223
</div>

‎src/stores/status.ts‎

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import type {
77
} from "@shared/types/player";
88
import type { Platform } from "@shared/types/platform";
99
import type { ContentScope } from "@/types/collection";
10-
import type { SortField, SortOrder } from "@/types/list";
10+
import type { SongListSortKey, SongListSortPreference } from "@/types/list";
1111
import type { PersonalFmOptions } from "@shared/types/platform/netease";
1212
import * as queue from "./queue";
1313

@@ -88,10 +88,31 @@ export const useStatusStore = defineStore(
8888
const likedPageTab = ref<ContentScope>("local");
8989
/** 设置弹窗上次手动选择的大分类 */
9090
const settingsCategory = ref("");
91-
/** 歌曲列表排序字段 */
92-
const sortField = ref<SortField>("none");
93-
/** 歌曲列表排序方向 */
94-
const sortOrder = ref<SortOrder>("asc");
91+
/** 各列表作用域的排序偏好,仅保存非默认项 */
92+
const sortPreferences = ref<Partial<Record<SongListSortKey, SongListSortPreference>>>({});
93+
94+
/**
95+
* 读取指定作用域的排序偏好
96+
* @param key - 列表排序作用域
97+
* @returns 排序偏好,未设置时为默认值
98+
*/
99+
const getSortPreference = (key: SongListSortKey): SongListSortPreference =>
100+
sortPreferences.value[key] ?? { field: "none", order: "asc" };
101+
102+
/**
103+
* 写入指定作用域的排序偏好
104+
* @param key - 列表排序作用域
105+
* @param preference - 排序偏好
106+
*/
107+
const setSortPreference = (key: SongListSortKey, preference: SongListSortPreference): void => {
108+
const current = sortPreferences.value[key];
109+
if (current?.field === preference.field && current.order === preference.order) return;
110+
const next = { ...sortPreferences.value };
111+
if (preference.field === "none" && preference.order === "asc") delete next[key];
112+
else next[key] = { ...preference };
113+
sortPreferences.value = next;
114+
};
115+
95116
/** 是否正在播放 */
96117
const isPlaying = computed(() => state.value === "playing");
97118
/** 是否暂停 */
@@ -154,8 +175,9 @@ export const useStatusStore = defineStore(
154175
myPlaylistSource,
155176
likedPageTab,
156177
settingsCategory,
157-
sortField,
158-
sortOrder,
178+
sortPreferences,
179+
getSortPreference,
180+
setSortPreference,
159181
currentTrack,
160182
currentIndex,
161183
currentPlaybackContext,
@@ -177,8 +199,7 @@ export const useStatusStore = defineStore(
177199
"myPlaylistSource",
178200
"likedPageTab",
179201
"settingsCategory",
180-
"sortField",
181-
"sortOrder",
202+
"sortPreferences",
182203
],
183204
},
184205
},

‎src/types/list.ts‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,26 @@ export type SortField =
1313

1414
/** 歌曲列表排序方向 */
1515
export type SortOrder = "asc" | "desc";
16+
17+
/** 歌曲列表排序偏好 */
18+
export interface SongListSortPreference {
19+
field: SortField;
20+
order: SortOrder;
21+
}
22+
23+
/**
24+
* 歌曲列表排序作用域
25+
* 使用固定枚举按页面类型隔离,避免按歌单/专辑实体无限增长
26+
*/
27+
export type SongListSortKey =
28+
| "library"
29+
| "folders"
30+
| "liked.local"
31+
| "liked.online"
32+
| "collection.album"
33+
| "collection.playlist"
34+
| "collection.radio"
35+
| "collection.cloud"
36+
| "artist"
37+
| "history"
38+
| "cloud";

0 commit comments

Comments
 (0)