Skip to content

Commit da0d633

Browse files
committed
refactor: update user option label to use nick_name and fetch member list on mount
1 parent 3b4b658 commit da0d633

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

apps/application/serializers/application.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ def get_query_set(self, instance: Dict, workspace_manage: bool, is_x_pack_ee: bo
308308
user_id = self.data.get('user_id')
309309
desc = instance.get('desc')
310310
name = instance.get('name')
311+
create_user = instance.get('create_user')
311312
if workspace_id is not None:
312313
folder_query_set = folder_query_set.filter(workspace_id=workspace_id)
313314
application_query_set = application_query_set.filter(workspace_id=workspace_id)
@@ -321,6 +322,8 @@ def get_query_set(self, instance: Dict, workspace_manage: bool, is_x_pack_ee: bo
321322
if desc is not None:
322323
folder_query_set = folder_query_set.filter(desc__contains=desc)
323324
application_query_set = application_query_set.filter(desc__contains=desc)
325+
if create_user is not None:
326+
application_query_set = application_query_set.filter(user_id=create_user)
324327
application_custom_sql_query_set = application_query_set
325328
application_query_set = application_query_set.order_by("-update_time")
326329

apps/application/views/application.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717
from application.api.application_api import ApplicationCreateAPI, ApplicationQueryAPI, ApplicationImportAPI, \
1818
ApplicationExportAPI, ApplicationOperateAPI, ApplicationEditAPI, TextToSpeechAPI, SpeechToTextAPI, PlayDemoTextAPI
1919
from application.models import Application
20-
from application.serializers.application import ApplicationSerializer, Query, ApplicationOperateSerializer, \
21-
McpServersSerializer
20+
from application.serializers.application import ApplicationSerializer, Query, ApplicationOperateSerializer
2221
from common import result
2322
from common.auth import TokenAuth
2423
from common.auth.authentication import has_permissions
25-
from common.constants.permission_constants import PermissionConstants, RoleConstants, CompareConstants
24+
from common.constants.permission_constants import PermissionConstants, RoleConstants
2625
from common.log.log import log
2726

2827

ui/src/views/application/index.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
clearable
4444
style="width: 220px"
4545
>
46-
<el-option v-for="u in user_options" :key="u.id" :value="u.id" :label="u.username" />
46+
<el-option v-for="u in user_options" :key="u.id" :value="u.id" :label="u.nick_name" />
4747
</el-select>
4848
</div>
4949
<el-dropdown trigger="click" v-if="permissionPrecise.create()">
@@ -298,6 +298,7 @@ import { isWorkFlow } from '@/utils/application'
298298
import { dateFormat } from '@/utils/time'
299299
import { SourceTypeEnum, ValidType, ValidCount } from '@/enums/common'
300300
import permissionMap from '@/permission'
301+
import WorkspaceApi from '@/api/workspace/workspace'
301302
302303
const router = useRouter()
303304
const route = useRoute()
@@ -529,6 +530,7 @@ function searchHandle() {
529530
function getList() {
530531
const params = {
531532
folder_id: folder.currentFolder?.id || 'default',
533+
[search_type.value]: search_form.value[search_type.value],
532534
}
533535
ApplicationApi.getApplication(paginationConfig, params, loading).then((res) => {
534536
paginationConfig.total = res.data.total
@@ -538,6 +540,10 @@ function getList() {
538540
539541
onMounted(() => {
540542
getFolder(true)
543+
544+
WorkspaceApi.getAllMemberList(user.getWorkspaceId(), loading).then((res) => {
545+
user_options.value = res.data
546+
})
541547
})
542548
</script>
543549

0 commit comments

Comments
 (0)