From da0d633121f8e50d0cd69b9a08b89a8d92ccb18d Mon Sep 17 00:00:00 2001 From: CaptainB Date: Wed, 2 Jul 2025 16:43:12 +0800 Subject: [PATCH] refactor: update user option label to use nick_name and fetch member list on mount --- apps/application/serializers/application.py | 3 +++ apps/application/views/application.py | 5 ++--- ui/src/views/application/index.vue | 8 +++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/application/serializers/application.py b/apps/application/serializers/application.py index 83a5bd3f5..3bb5277d5 100644 --- a/apps/application/serializers/application.py +++ b/apps/application/serializers/application.py @@ -308,6 +308,7 @@ class Query(serializers.Serializer): user_id = self.data.get('user_id') desc = instance.get('desc') name = instance.get('name') + create_user = instance.get('create_user') if workspace_id is not None: folder_query_set = folder_query_set.filter(workspace_id=workspace_id) application_query_set = application_query_set.filter(workspace_id=workspace_id) @@ -321,6 +322,8 @@ class Query(serializers.Serializer): if desc is not None: folder_query_set = folder_query_set.filter(desc__contains=desc) application_query_set = application_query_set.filter(desc__contains=desc) + if create_user is not None: + application_query_set = application_query_set.filter(user_id=create_user) application_custom_sql_query_set = application_query_set application_query_set = application_query_set.order_by("-update_time") diff --git a/apps/application/views/application.py b/apps/application/views/application.py index bbd8df2e5..23c17d728 100644 --- a/apps/application/views/application.py +++ b/apps/application/views/application.py @@ -17,12 +17,11 @@ from rest_framework.views import APIView from application.api.application_api import ApplicationCreateAPI, ApplicationQueryAPI, ApplicationImportAPI, \ ApplicationExportAPI, ApplicationOperateAPI, ApplicationEditAPI, TextToSpeechAPI, SpeechToTextAPI, PlayDemoTextAPI from application.models import Application -from application.serializers.application import ApplicationSerializer, Query, ApplicationOperateSerializer, \ - McpServersSerializer +from application.serializers.application import ApplicationSerializer, Query, ApplicationOperateSerializer from common import result from common.auth import TokenAuth from common.auth.authentication import has_permissions -from common.constants.permission_constants import PermissionConstants, RoleConstants, CompareConstants +from common.constants.permission_constants import PermissionConstants, RoleConstants from common.log.log import log diff --git a/ui/src/views/application/index.vue b/ui/src/views/application/index.vue index 19532d8c2..9d0f63e1a 100644 --- a/ui/src/views/application/index.vue +++ b/ui/src/views/application/index.vue @@ -43,7 +43,7 @@ clearable style="width: 220px" > - + @@ -298,6 +298,7 @@ import { isWorkFlow } from '@/utils/application' import { dateFormat } from '@/utils/time' import { SourceTypeEnum, ValidType, ValidCount } from '@/enums/common' import permissionMap from '@/permission' +import WorkspaceApi from '@/api/workspace/workspace' const router = useRouter() const route = useRoute() @@ -529,6 +530,7 @@ function searchHandle() { function getList() { const params = { folder_id: folder.currentFolder?.id || 'default', + [search_type.value]: search_form.value[search_type.value], } ApplicationApi.getApplication(paginationConfig, params, loading).then((res) => { paginationConfig.total = res.data.total @@ -538,6 +540,10 @@ function getList() { onMounted(() => { getFolder(true) + + WorkspaceApi.getAllMemberList(user.getWorkspaceId(), loading).then((res) => { + user_options.value = res.data + }) })