Skip to content

Commit 8519459

Browse files
committed
refactor: update workspace_ids assignment logic for user roles in UserDrawer
1 parent c865003 commit 8519459

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

ui/src/views/system/user-manage/component/UserDrawer.vue

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,22 @@ const submit = async (formEl: FormInstance | undefined) => {
280280
await memberFormContentRef.value?.validate()
281281
}
282282
if (user.isPE() || user.isEE()) {
283-
list.value = list.value.map(item => ({
284-
...item,
285-
workspace_ids: adminRoleList.value.find(item1 => item1.id === item.role_id) ? ['None'] : item.workspace_ids
286-
}))
283+
list.value = list.value.map(item => {
284+
const isAdminRole = adminRoleList.value.find(item1 => item1.id === item.role_id);
285+
286+
// 如果是管理员角色,则设置为 ['None']
287+
if (isAdminRole) {
288+
return {...item, workspace_ids: ['None']};
289+
}
290+
291+
// 如果是普通用户且是 PE 类型,则设置为 ['default']
292+
if (user.isPE()) {
293+
return {...item, workspace_ids: ['default']};
294+
}
295+
296+
// 其他情况保持原样
297+
return item;
298+
});
287299
}
288300
const params = {
289301
...userForm.value,

0 commit comments

Comments
 (0)