From 3d61fa2414f720db6126aa152b5d1d2559e72728 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Tue, 11 Aug 2026 09:52:50 +0800
Subject: [PATCH] feat: add user group management to user forms and update user
 list view

---
 ui/src/views/system/identity/users/UserFromDrawer.vue | 2 ++
 ui/src/views/system/identity/users/UserListView.vue   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/src/views/system/identity/users/UserFromDrawer.vue b/ui/src/views/system/identity/users/UserFromDrawer.vue
index a587111e9a1..c569a80a87d 100644
--- a/ui/src/views/system/identity/users/UserFromDrawer.vue
+++ b/ui/src/views/system/identity/users/UserFromDrawer.vue
@@ -35,6 +35,7 @@ const userForm = reactive<SystemUserRequest>({
   phone: '',
   role_setting: [{ role_id: '', workspace_ids: [] }],
   username: '',
+  user_group_ids: [],
 })
 
 const drawerTitle = computed(() => (isEdit.value ? '编辑用户' : '创建用户'))
@@ -177,6 +178,7 @@ function resetData() {
     password: '',
     phone: '',
     role_setting: [{ role_id: '', workspace_ids: [] }],
+    user_group_ids: [],
     username: '',
   })
   isEdit.value = false
diff --git a/ui/src/views/system/identity/users/UserListView.vue b/ui/src/views/system/identity/users/UserListView.vue
index 7ec64dcfc50..b85c786cbe7 100644
--- a/ui/src/views/system/identity/users/UserListView.vue
+++ b/ui/src/views/system/identity/users/UserListView.vue
@@ -193,8 +193,8 @@ onMounted(() => loadSystemUsers())
         <template #default="{ row }">
           <MkWorkspaceRelationTags
             :table-render-params="{ property: '用户组', value: '工作空间' }"
-            :tags="row.role_name"
-            :tag-workspace="row.role_workspace"
+            :tags="row.user_group_names"
+            :tag-workspace="row.user_group_workspace"
           />
         </template>
       </el-table-column>