refactor: update user option label to use nick_name and fetch member list on mount
This commit is contained in:
parent
3b4b658934
commit
da0d633121
@ -308,6 +308,7 @@ class Query(serializers.Serializer):
|
|||||||
user_id = self.data.get('user_id')
|
user_id = self.data.get('user_id')
|
||||||
desc = instance.get('desc')
|
desc = instance.get('desc')
|
||||||
name = instance.get('name')
|
name = instance.get('name')
|
||||||
|
create_user = instance.get('create_user')
|
||||||
if workspace_id is not None:
|
if workspace_id is not None:
|
||||||
folder_query_set = folder_query_set.filter(workspace_id=workspace_id)
|
folder_query_set = folder_query_set.filter(workspace_id=workspace_id)
|
||||||
application_query_set = application_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:
|
if desc is not None:
|
||||||
folder_query_set = folder_query_set.filter(desc__contains=desc)
|
folder_query_set = folder_query_set.filter(desc__contains=desc)
|
||||||
application_query_set = application_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_custom_sql_query_set = application_query_set
|
||||||
application_query_set = application_query_set.order_by("-update_time")
|
application_query_set = application_query_set.order_by("-update_time")
|
||||||
|
|
||||||
|
|||||||
@ -17,12 +17,11 @@ from rest_framework.views import APIView
|
|||||||
from application.api.application_api import ApplicationCreateAPI, ApplicationQueryAPI, ApplicationImportAPI, \
|
from application.api.application_api import ApplicationCreateAPI, ApplicationQueryAPI, ApplicationImportAPI, \
|
||||||
ApplicationExportAPI, ApplicationOperateAPI, ApplicationEditAPI, TextToSpeechAPI, SpeechToTextAPI, PlayDemoTextAPI
|
ApplicationExportAPI, ApplicationOperateAPI, ApplicationEditAPI, TextToSpeechAPI, SpeechToTextAPI, PlayDemoTextAPI
|
||||||
from application.models import Application
|
from application.models import Application
|
||||||
from application.serializers.application import ApplicationSerializer, Query, ApplicationOperateSerializer, \
|
from application.serializers.application import ApplicationSerializer, Query, ApplicationOperateSerializer
|
||||||
McpServersSerializer
|
|
||||||
from common import result
|
from common import result
|
||||||
from common.auth import TokenAuth
|
from common.auth import TokenAuth
|
||||||
from common.auth.authentication import has_permissions
|
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
|
from common.log.log import log
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -43,7 +43,7 @@
|
|||||||
clearable
|
clearable
|
||||||
style="width: 220px"
|
style="width: 220px"
|
||||||
>
|
>
|
||||||
<el-option v-for="u in user_options" :key="u.id" :value="u.id" :label="u.username" />
|
<el-option v-for="u in user_options" :key="u.id" :value="u.id" :label="u.nick_name" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</div>
|
</div>
|
||||||
<el-dropdown trigger="click" v-if="permissionPrecise.create()">
|
<el-dropdown trigger="click" v-if="permissionPrecise.create()">
|
||||||
@ -298,6 +298,7 @@ import { isWorkFlow } from '@/utils/application'
|
|||||||
import { dateFormat } from '@/utils/time'
|
import { dateFormat } from '@/utils/time'
|
||||||
import { SourceTypeEnum, ValidType, ValidCount } from '@/enums/common'
|
import { SourceTypeEnum, ValidType, ValidCount } from '@/enums/common'
|
||||||
import permissionMap from '@/permission'
|
import permissionMap from '@/permission'
|
||||||
|
import WorkspaceApi from '@/api/workspace/workspace'
|
||||||
|
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
@ -529,6 +530,7 @@ function searchHandle() {
|
|||||||
function getList() {
|
function getList() {
|
||||||
const params = {
|
const params = {
|
||||||
folder_id: folder.currentFolder?.id || 'default',
|
folder_id: folder.currentFolder?.id || 'default',
|
||||||
|
[search_type.value]: search_form.value[search_type.value],
|
||||||
}
|
}
|
||||||
ApplicationApi.getApplication(paginationConfig, params, loading).then((res) => {
|
ApplicationApi.getApplication(paginationConfig, params, loading).then((res) => {
|
||||||
paginationConfig.total = res.data.total
|
paginationConfig.total = res.data.total
|
||||||
@ -538,6 +540,10 @@ function getList() {
|
|||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
getFolder(true)
|
getFolder(true)
|
||||||
|
|
||||||
|
WorkspaceApi.getAllMemberList(user.getWorkspaceId(), loading).then((res) => {
|
||||||
|
user_options.value = res.data
|
||||||
|
})
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user