Skip to content

perf: Add user source column to the user list #551

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
fit2cloud-chenyw merged 1 commit into from
Dec 2, 2025
Merged

perf: Add user source column to the user list #551

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: 2 additions & 0 deletions backend/apps/system/api/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ async def pager(

if oidlist:
origin_stmt = origin_stmt.where(UserWsModel.oid.in_(oidlist))
if origins:
origin_stmt = origin_stmt.where(UserModel.origin.in_(origins))
if status is not None:
origin_stmt = origin_stmt.where(UserModel.status == status)
if keyword:
Expand Down
25 changes: 17 additions & 8 deletions frontend/src/views/system/user/User.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,11 @@
</el-table-column>
<el-table-column prop="email" show-overflow-tooltip :label="$t('user.email')" />
<!-- <el-table-column prop="phone" :label="$t('user.phone_number')" width="280" /> -->
<!-- <el-table-column prop="user_source" :label="$t('user.user_source')" width="280" /> -->
<el-table-column prop="origin" :label="$t('user.user_source')" width="120">
<template #default="scope">
<span>{{ formatUserOrigin(scope.row.origin) }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="oid_list"
Expand Down Expand Up @@ -425,13 +429,11 @@ const filterOption = ref<any[]>([
type: 'enum',
option: [
{ id: '0', name: t('user.local_creation') },
// { id: 1, name: 'LDAP' },
// { id: 2, name: 'OIDC' },
// { id: 3, name: 'CAS' },
// { id: 9, name: 'OAuth2' },
// { id: 4, name: t('user.feishu') },
// { id: 5, name: t('user.dingtalk') },
// { id: 6, name: t('user.wechat_for_business') },
{ id: '1', name: 'CAS' },
{ id: '2', name: 'OIDC' },
{ id: '3', name: 'LDAP' },
{ id: '4', name: 'OAuth2' },
{ id: '5', name: 'SAML2' },
],
field: 'origins',
title: t('user.user_source'),
Expand Down Expand Up @@ -824,6 +826,13 @@ const loadDefaultPwd = () => {
}
})
}
const formatUserOrigin = (origin?: number) => {
if (!origin) {
return t('user.local_creation')
}
const originArray = ['CAS', 'OIDC', 'LDAP', 'OAuth2', 'SAML2']
return originArray[origin - 1]
}
onMounted(() => {
workspaceList().then((res) => {
options.value = res || []
Expand Down