Skip to content

fix: update group_id to group_ids for multi-selection in login settings and authentication handling #7516

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
wxg0103 merged 1 commit into from
Oct 28, 2026
Merged

fix: update group_id to group_ids for multi-selection in login settings and authentication handling #7516

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: 1 addition & 1 deletion ui/src/api/types/system-authentication.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export interface AuthProviderSettingPayload {
export interface LoginAuthSettingPayload {
default_value: string
failed_attempts: number
group_id?: string
group_ids?: string[]
lock_time: number
login_methods: string[]
max_attempts: number
Expand Down
17 changes: 9 additions & 8 deletions ui/src/views/system/settings/authentication/components/LoginSetting.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const loginSettingFields = [
'lock_time',
'role_id',
'workspace_id',
'group_id',
'group_ids',
] as const
const form = reactive<Omit<LoginAuthSettingPayload, 'system_options'>>({
login_methods: [LOGIN_METHOD.LOCAL],
Expand All @@ -33,7 +33,7 @@ const form = reactive<Omit<LoginAuthSettingPayload, 'system_options'>>({
lock_time: 10,
role_id: ROLE_TYPE.USER,
workspace_id: 'default',
group_id: undefined,
group_ids: [],
})
const rules: FormRules<LoginAuthSettingPayload> = {
default_value: [{ required: true, message: '请选择默认登录方式', trigger: 'change' }],
Expand Down Expand Up @@ -102,13 +102,13 @@ function loadRoleSettingOptions() {
function handleRoleChange() {
if (!showWorkspaceSelector.value) {
form.workspace_id = undefined
form.group_id = undefined
form.group_ids = []
userGroups.value = []
}
}

function handleWorkspaceChange() {
form.group_id = undefined
form.group_ids = []
loadUserGroups()
}

Expand All @@ -119,16 +119,17 @@ const userGroups = ref<SystemUserGroup[]>([])
function loadUserGroups() {
if (!form.workspace_id || !showWorkspaceSelector.value) {
userGroups.value = []
form.group_id = undefined
form.group_ids = []
return Promise.resolve()
}

loadingGroups.value = true
return UserGroupsApi.getSystemUserGroups(form.workspace_id)
.then((groups) => {
userGroups.value = groups
if (!groups.some(({ id }) => id === form.group_id)) {
form.group_id = undefined
form.group_ids = (form.group_ids ?? []).filter((id) => groups.some(({ id: groupId }) => groupId === id))
if (!form.group_ids.length) {
form.group_ids = []
}
})
.finally(() => {
Expand Down Expand Up @@ -254,7 +255,7 @@ onMounted(() => {
</el-select>
</el-form-item>
<el-form-item label="用户组" v-if="form.workspace_id">
<el-select filterable clearable v-model="form.group_id" :loading="loadingGroups" placeholder="请选择用户组" class="w-240">
<el-select filterable clearable multiple v-model="form.group_ids" :loading="loadingGroups" placeholder="请选择用户组" class="w-240">
<el-option v-for="userGroup in userGroups" :key="userGroup.id" :label="userGroup.name" :value="userGroup.id" />
</el-select>
</el-form-item>
Expand Down
Loading