Skip to content

Commit 7ceba93

Browse files
committed
feat: Support folder sort
1 parent ff2a148 commit 7ceba93

File tree

6 files changed

+422
-23
lines changed

6 files changed

+422
-23
lines changed

apps/application/serializers/application_folder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class ApplicationFolderTreeSerializer(serializers.ModelSerializer):
88

99
class Meta:
1010
model = ApplicationFolder
11-
fields = ['id', 'name', 'desc', 'user_id', 'workspace_id', 'parent_id', 'children']
11+
fields = ['id', 'name', 'desc', 'user_id', 'workspace_id', 'parent_id', 'children','create_time','update_time']
1212

1313
def get_children(self, obj):
1414
return ApplicationFolderTreeSerializer(obj.get_children(), many=True).data

apps/knowledge/serializers/knowledge_folder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class KnowledgeFolderTreeSerializer(serializers.ModelSerializer):
88

99
class Meta:
1010
model = KnowledgeFolder
11-
fields = ['id', 'name', 'desc', 'user_id', 'workspace_id', 'parent_id', 'children']
11+
fields = ['id', 'name', 'desc', 'user_id', 'workspace_id', 'parent_id', 'children', 'create_time','update_time']
1212

1313
def get_children(self, obj):
1414
return KnowledgeFolderTreeSerializer(obj.get_children(), many=True).data

apps/tools/serializers/tool_folder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class ToolFolderTreeSerializer(serializers.ModelSerializer):
1010

1111
class Meta:
1212
model = ToolFolder
13-
fields = ['id', 'name', 'desc', 'user_id', 'workspace_id', 'parent_id', 'children']
13+
fields = ['id', 'name', 'desc', 'user_id', 'workspace_id', 'parent_id', 'children','create_time','update_time']
1414

1515
def get_children(self, obj):
1616
return ToolFolderTreeSerializer(obj.get_children(), many=True).data
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import { t } from '@/locales'
2+
3+
4+
export const SORT_TYPES = {
5+
CREATE_TIME_ASC: 'createTime-asc',
6+
CREATE_TIME_DESC: 'createTime-desc',
7+
NAME_ASC: 'name-asc',
8+
NAME_DESC: 'name-desc',
9+
CUSTOM: 'custom'
10+
} as const
11+
12+
export type SortType = typeof SORT_TYPES[keyof typeof SORT_TYPES]
13+
14+
export const SORT_MENU_CONFIG = [
15+
{
16+
title: 'time',
17+
items: [
18+
{ label: t('components.folder.ascTime', '按创建时间升序'), value: SORT_TYPES.CREATE_TIME_ASC},
19+
{ label: t('components.folder.descTime', '按创建时间降序'), value: SORT_TYPES.CREATE_TIME_DESC },
20+
]
21+
},
22+
{
23+
title: 'name',
24+
items: [
25+
{ label: t('components.folder.ascName', '按名称升序'), value: SORT_TYPES.NAME_ASC },
26+
{ label: t('components.folder.descName', '按名称降序'), value: SORT_TYPES.NAME_DESC },
27+
]
28+
},
29+
{
30+
items: [
31+
{ label: t('components.folder.custom', '按用户拖拽排序'), value: SORT_TYPES.CUSTOM },
32+
]
33+
}
34+
]

0 commit comments

Comments
 (0)