Skip to content

feat: folder sort #7091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wangdan-fit2cloud merged 1 commit into from
Sep 18, 2026
Merged

feat: folder sort #7091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/src/assets/iconfont.js
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 10 additions & 2 deletions ui/src/components/business/folder-tree/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,17 @@ const sortOptions: { label: string; value: FolderSort; divided?: boolean }[] = [
{ label: '按创建时间降序', value: FOLDER_SORT.CREATE_TIME_DESC },
{ label: '按名称升序', value: FOLDER_SORT.NAME_ASC, divided: true },
{ label: '按名称降序', value: FOLDER_SORT.NAME_DESC },
{ label: '按用户拖拽排序', value: FOLDER_SORT.CUSTOM, divided: true },
{ label: '按拖拽排序', value: FOLDER_SORT.CUSTOM, divided: true },
]

const currentSort = ref<FolderSort>(FOLDER_SORT.CREATE_TIME_DESC)
const currentSortIcon = computed(() => {
if (currentSort.value === FOLDER_SORT.CUSTOM) return 'icon_drag_outlined'
if (currentSort.value === FOLDER_SORT.CREATE_TIME_ASC || currentSort.value === FOLDER_SORT.NAME_ASC) {
return 'icon_sort-a-to-z_outlined'
}
return 'icon_sort-z-to-a_outlined'
})

const sortTreeData = computed(() => {
return sortFolders(folderTreeData.value, FOLDER_ENTRY_ID.ALL)
Expand Down Expand Up @@ -354,8 +361,9 @@ defineExpose({ refresh: loadFolders, openCreate: handleOpenCreateFolder })
<div class="flex shrink-0 items-center gap-2 px-4 pb-2">
<MkSearchInput v-model="searchKeyword" class="min-w-0 flex-1" />
<MkDropdown trigger="click" placement="bottom-end">
<!-- 选择文件夹排序方式 -->
<el-button plain class="shrink-0 min-w-8! w-8!">
<MkIcon name="icon_moments-categories_outlined" />
<MkIcon :name="currentSortIcon" />
</el-button>
<template #dropdown>
<MkDropdownMenu class="w-48">
Expand Down
Loading