From c18d4bfdd7e4f797c2a86d340864564a3c920795 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Tue, 1 Sep 2026 16:31:52 +0800
Subject: [PATCH] feat: enhance user import functionality with file upload
 support and user group selection

---
 .../api/admin/system/chat-user/chat-user.ts   |  12 +-
 .../admin/system/settings/theme-setting.ts    |   2 +-
 ui/src/api/admin/system/user-manage.ts        |  27 ++-
 .../chat/users/dialog/ImportUsersDialog.vue   |  99 ++++++++-
 .../system/identity/users/UserListView.vue    |   2 +-
 .../users/dialog/ImportUsersDialog.vue        | 194 +++++++++++++-----
 6 files changed, 271 insertions(+), 65 deletions(-)

diff --git a/ui/src/api/admin/system/chat-user/chat-user.ts b/ui/src/api/admin/system/chat-user/chat-user.ts
index 17e64cc8760..fb7537496ef 100644
--- a/ui/src/api/admin/system/chat-user/chat-user.ts
+++ b/ui/src/api/admin/system/chat-user/chat-user.ts
@@ -76,9 +76,15 @@ const getChatUserSyncTypes = () => {
   return get<string[]>(`${prefix}/sync/types`)
 }
 
-/** 从指定来源导入对话用户。 */
-const postSyncChatUsers = (syncType: string) => {
-  return post<undefined, ChatUserSyncResult>(`${prefix}/sync/${syncType}`)
+/** 从指定来源导入对话用户（file 来源需携带 xlsx 文件）。 */
+const postSyncChatUsers = (syncType: string, defaultGroupId?: string, syncFile?: File) => {
+  if (syncFile) {
+    const payload = new FormData()
+    payload.append('xlsx_file', syncFile)
+    if (defaultGroupId) payload.append('default_group_id', defaultGroupId)
+    return post<FormData, ChatUserSyncResult>(`${prefix}/sync/${syncType}`, payload)
+  }
+  return post<{ default_group_id?: string }, ChatUserSyncResult>(`${prefix}/sync/${syncType}`, { default_group_id: defaultGroupId })
 }
 
 export default {
diff --git a/ui/src/api/admin/system/settings/theme-setting.ts b/ui/src/api/admin/system/settings/theme-setting.ts
index 9720cdae350..5a9b3a9f3b3 100644
--- a/ui/src/api/admin/system/settings/theme-setting.ts
+++ b/ui/src/api/admin/system/settings/theme-setting.ts
@@ -3,7 +3,7 @@ import type { ThemeInfo } from '../../auth/types'
 
 /** 保存系统外观主题设置。 */
 const putThemeSetting = (payload: FormData) => {
-  return put<FormData, boolean>('/settings/theme', payload)
+  return put<FormData, boolean>('/display/update', payload)
 }
 
 export default { putThemeSetting }
diff --git a/ui/src/api/admin/system/user-manage.ts b/ui/src/api/admin/system/user-manage.ts
index fff44808db7..3719828d165 100644
--- a/ui/src/api/admin/system/user-manage.ts
+++ b/ui/src/api/admin/system/user-manage.ts
@@ -1,6 +1,6 @@
-import { del, get, post, put } from '../core/request'
+import { del, get, getExportFile, post, put } from '../core/request'
 import type { ResponsePage, ParamsPage, PasswordRequest } from '../core/types'
-import type { Dict, SystemUser, SystemUserPayload, SystemUserUpdateRequest, BatchSetUserRolesRequest, BatchSetUserWorkspaceRolesRequest } from '@/api/types'
+import type { Dict, SystemUser, SystemUserPayload, SystemUserUpdateRequest, BatchSetUserRolesRequest, BatchSetUserWorkspaceRolesRequest, ChatUserSyncResult } from '@/api/types'
 
 const prefix = '/user_manage'
 
@@ -44,4 +44,25 @@ const postBatchSetUserWorkspaceRoles = (payload: BatchSetUserWorkspaceRolesReque
   return post<BatchSetUserWorkspaceRolesRequest, boolean>(`${prefix}/batch/add_role_ee`, payload)
 }
 
-export default { deleteUser, getUserManagePage, postUser, postBatchDeleteUsers, postBatchSetUserRoles, postBatchSetUserWorkspaceRoles, putUser, putUserPassword }
+
+/** 下载系统用户导入模板。 */
+const getUserManageImportTemplate = () => {
+  return getExportFile('user_import_template.xlsx', `${prefix}/template/export`)
+}
+
+/** 获取可导入的系统用户来源。 */
+const getUserManageSyncTypes = () => {
+  return get<string[]>(`${prefix}/sync/types`)
+}
+
+/** 从指定来源同步系统用户（file 来源需携带 xlsx 文件）。 */
+const postSyncSystemUsers = (syncType: string, syncFile?: File, workspaceId?: string, roleId?: string, defaultGroupId?: string) => {
+  const payload = new FormData()
+  if (workspaceId) payload.append('workspace_id', workspaceId)
+  if (roleId) payload.append('role_id', roleId)
+  if (defaultGroupId) payload.append('default_group_id', defaultGroupId)
+  if (syncFile) payload.append('xlsx_file', syncFile)
+  return post<FormData, ChatUserSyncResult>(`${prefix}/sync/${syncType}`, payload)
+}
+
+export default { deleteUser, getUserManageImportTemplate, getUserManagePage, getUserManageSyncTypes, postUser, postBatchDeleteUsers, postBatchSetUserRoles, postBatchSetUserWorkspaceRoles, postSyncSystemUsers, putUser, putUserPassword }
\ No newline at end of file
diff --git a/ui/src/views/system/chat/users/dialog/ImportUsersDialog.vue b/ui/src/views/system/chat/users/dialog/ImportUsersDialog.vue
index c8be4d92e10..f47a6ceb0bf 100644
--- a/ui/src/views/system/chat/users/dialog/ImportUsersDialog.vue
+++ b/ui/src/views/system/chat/users/dialog/ImportUsersDialog.vue
@@ -1,27 +1,40 @@
 <script setup lang="ts">
-import { reactive, ref } from 'vue'
+import { computed, nextTick, reactive, ref } from 'vue'
+import type { FormInstance, FormRules, UploadFile, UploadUserFile } from 'element-plus'
 import ChatUserApi from '@/api/admin/system/chat-user/chat-user'
-import type { ChatUserSyncConflict, OptionItem, LoginMethod } from '@/api/types'
-import type { FormInstance, FormRules } from 'element-plus'
+import ChatUserGroupsApi from '@/api/admin/system/chat-user/chat-user-groups'
+import UserManageApi from '@/api/admin/system/user-manage'
+import type { ChatUserSyncConflict, ListItem, OptionItem, LoginMethod } from '@/api/types'
 import { LOGIN_METHOD } from '@/api/enums'
 import { LOGIN_METHOD_LABELS } from '@/constants'
-import { MsgSuccess } from '@/utils/message'
+import { MsgSuccess, MsgWarning } from '@/utils/message'
+import MkDragUpload from '@/components/mk-drag-upload/index.vue'
 
 defineOptions({ name: 'ImportUsersDialog' })
 
 const emit = defineEmits<{ refresh: [] }>()
 
+const LOCAL_FILE_SOURCE = 'LOCAL_FILE' as const
+
 interface ImportUsersForm {
+  files: UploadUserFile[]
   syncType: string
+  userGroupId: string
 }
 
 const dialogVisible = ref(false)
 
 const importing = ref(false)
 const importUsersFormRef = ref<FormInstance>()
+const dragUploadRef = ref<InstanceType<typeof MkDragUpload>>()
 const syncTypeOptions = ref<OptionItem<string>[]>([])
-const importUsersForm = reactive<ImportUsersForm>({ syncType: '' })
-const importUsersFormRules: FormRules<ImportUsersForm> = { syncType: [{ required: true, message: '请选择用户来源', trigger: 'change' }] }
+const importUsersForm = reactive<ImportUsersForm>({ files: [], syncType: '', userGroupId: '' })
+const importUsersFormRules: FormRules<ImportUsersForm> = {
+  files: [{ required: true, type: 'array', min: 1, message: '请上传文件', trigger: 'change' }],
+  syncType: [{ required: true, message: '请选择用户来源', trigger: 'change' }],
+}
+const isLocalFileSource = computed(() => importUsersForm.syncType === LOCAL_FILE_SOURCE)
+const canImport = computed(() => Boolean(importUsersForm.syncType) && (!isLocalFileSource.value || importUsersForm.files.length > 0))
 
 /* 获取导入用户的来源类型 */
 const syncTypesLoading = ref(false)
@@ -29,7 +42,10 @@ function loadSyncTypes() {
   syncTypesLoading.value = true
   return ChatUserApi.getChatUserSyncTypes()
     .then((syncTypes) => {
-      syncTypeOptions.value = syncTypes.map((syncType) => ({ label: syncType === LOGIN_METHOD.LOCAL ? '系统用户' : LOGIN_METHOD_LABELS[syncType as LoginMethod], value: syncType }))
+      syncTypeOptions.value = [
+        ...syncTypes.map((syncType) => ({ label: syncType === LOGIN_METHOD.LOCAL ? '系统用户' : LOGIN_METHOD_LABELS[syncType as LoginMethod], value: syncType })),
+        { label: '本地文件', value: LOCAL_FILE_SOURCE },
+      ]
       importUsersForm.syncType = syncTypeOptions.value[0]?.value ?? ''
     })
     .finally(() => {
@@ -37,6 +53,37 @@ function loadSyncTypes() {
     })
 }
 
+/* 用户组选项 */
+const userGroupOptionsLoading = ref(false)
+const userGroupOptions = ref<ListItem[]>([])
+function loadUserGroupOptions() {
+  userGroupOptionsLoading.value = true
+  return ChatUserGroupsApi.getChatUserGroups()
+    .then((groups) => {
+      userGroupOptions.value = groups
+    })
+    .finally(() => {
+      userGroupOptionsLoading.value = false
+    })
+}
+
+function handleFileChange(file: UploadFile) {
+  if (!/\.xlsx$/i.test(file.name)) {
+    importUsersForm.files = []
+    dragUploadRef.value?.clearFiles()
+    MsgWarning('仅支持上传 xlsx 格式的文件')
+    return
+  }
+
+  importUsersForm.files = [file]
+  nextTick(() => importUsersFormRef.value?.validateField('files'))
+}
+
+function handleFileRemove() {
+  importUsersForm.files = []
+  nextTick(() => importUsersFormRef.value?.validateField('files'))
+}
+
 function formatConflictMessage(conflicts: ChatUserSyncConflict[]) {
   return conflicts
     .map((conflict) => {
@@ -46,6 +93,10 @@ function formatConflictMessage(conflicts: ChatUserSyncConflict[]) {
     .join('；')
 }
 
+function handleDownloadTemplate() {
+  UserManageApi.getUserManageImportTemplate()
+}
+
 /* 导入用户 */
 function submitImportUsers() {
   if (!importUsersFormRef.value) return
@@ -53,8 +104,9 @@ function submitImportUsers() {
   importUsersFormRef.value.validate((valid) => {
     if (!valid) return
 
+    const syncFile = isLocalFileSource.value ? ((importUsersForm.files[0]?.raw ?? undefined) as File | undefined) : undefined
     importing.value = true
-    return ChatUserApi.postSyncChatUsers(importUsersForm.syncType)
+    return ChatUserApi.postSyncChatUsers(isLocalFileSource.value ? 'file' : importUsersForm.syncType, importUsersForm.userGroupId || undefined, syncFile)
       .then((result) => {
         const conflictMessage = formatConflictMessage(result.conflict_users ?? [])
         MsgSuccess(`成功导入 ${result.success_count} 个用户${conflictMessage ? `，${conflictMessage}` : ''}`)
@@ -70,13 +122,17 @@ function submitImportUsers() {
 function open() {
   dialogVisible.value = true
   loadSyncTypes()
+  loadUserGroupOptions()
 }
 
 function resetData() {
-  importUsersForm.syncType = ''
+  Object.assign(importUsersForm, { files: [], syncType: '', userGroupId: '' })
   syncTypeOptions.value = []
   syncTypesLoading.value = false
+  userGroupOptionsLoading.value = false
+  userGroupOptions.value = []
   importing.value = false
+  dragUploadRef.value?.clearFiles()
   importUsersFormRef.value?.clearValidate()
 }
 
@@ -100,11 +156,34 @@ defineExpose({ open })
           <el-option v-for="syncTypeOption in syncTypeOptions" :key="syncTypeOption.value" :label="syncTypeOption.label" :value="syncTypeOption.value" />
         </el-select>
       </el-form-item>
+
+      <el-form-item v-if="isLocalFileSource" prop="files" :required="false">
+        <template #label>
+          <div class="flex-between w-full">
+            <span>上传文件<span class="ml-1 text-danger">*</span></span>
+            <el-button link type="primary" @click="handleDownloadTemplate">下载模板</el-button>
+          </div>
+        </template>
+        <MkDragUpload
+          ref="dragUploadRef"
+          v-model="importUsersForm.files"
+          accept=".xlsx"
+          tip-text="支持格式：xlsx"
+          @change="handleFileChange"
+          @remove="handleFileRemove"
+        />
+      </el-form-item>
+
+      <el-form-item label="用户组">
+        <el-select v-model="importUsersForm.userGroupId" class="w-full" :loading="userGroupOptionsLoading" clearable filterable placeholder="请选择用户组" fit-input-width>
+          <el-option v-for="userGroup in userGroupOptions" :key="userGroup.id" :label="userGroup.name" :value="userGroup.id" />
+        </el-select>
+      </el-form-item>
     </el-form>
 
     <template #footer>
       <el-button plain @click="dialogVisible = false">取消</el-button>
-      <el-button type="primary" :loading="importing" @click="submitImportUsers">导入</el-button>
+      <el-button type="primary" :loading="importing" :disabled="!canImport" @click="submitImportUsers">导入</el-button>
     </template>
   </MkDialog>
 </template>
diff --git a/ui/src/views/system/identity/users/UserListView.vue b/ui/src/views/system/identity/users/UserListView.vue
index 7483bf116a4..826648810e1 100644
--- a/ui/src/views/system/identity/users/UserListView.vue
+++ b/ui/src/views/system/identity/users/UserListView.vue
@@ -260,7 +260,7 @@ onMounted(() => loadSystemUsers())
     </template>
   </MkViewLayout>
   <UserFromDrawer ref="userFormDrawerRef" @refresh="loadSystemUsers" />
-  <ImportUsersDialog ref="importUsersDialogRef" />
+  <ImportUsersDialog ref="importUsersDialogRef" @refresh="loadSystemUsers" />
   <UserPwdDialog ref="userPwdDialogRef" @refresh="loadSystemUsers(false)" />
   <BatchSetUserRoleDialog ref="batchSetUserRoleDialogRef" @refresh="loadSystemUsers(false)" />
 </template>
diff --git a/ui/src/views/system/identity/users/dialog/ImportUsersDialog.vue b/ui/src/views/system/identity/users/dialog/ImportUsersDialog.vue
index 166ff5e6cfd..7f3f20348b5 100644
--- a/ui/src/views/system/identity/users/dialog/ImportUsersDialog.vue
+++ b/ui/src/views/system/identity/users/dialog/ImportUsersDialog.vue
@@ -1,14 +1,22 @@
 <script setup lang="ts">
-import { computed, nextTick, reactive, ref } from 'vue'
+import { computed, nextTick, reactive, ref, watch } from 'vue'
 import type { FormInstance, FormRules, UploadFile, UploadUserFile } from 'element-plus'
 import { LOGIN_METHOD, ROLE_TYPE } from '@/api/enums'
-import type { RoleType } from '@/api/types'
+import type { ChatUserSyncConflict, ListItem, LoginMethod, RoleType, SystemUserGroup } from '@/api/types'
 import { LOGIN_METHOD_LABELS, ROLE_TYPE_LABELS } from '@/constants'
-import { MsgInfo, MsgWarning } from '@/utils/message'
+import { MsgSuccess, MsgWarning } from '@/utils/message'
+import CurrentUserApi from '@/api/admin/auth/current-user'
+import UserManageApi from '@/api/admin/system/user-manage'
+import UserGroupApi from '@/api/admin/system/user-groups'
+import { useStore } from '@/stores'
 import MkDragUpload from '@/components/mk-drag-upload/index.vue'
 
 defineOptions({ name: 'ImportUsersDialog' })
 
+const emit = defineEmits<{ refresh: [] }>()
+
+const { auth } = useStore()
+
 const LOCAL_FILE_SOURCE = 'LOCAL_FILE' as const
 const DEFAULT_WORKSPACE_ID = 'default'
 
@@ -27,26 +35,8 @@ interface ImportUsersForm {
   workspaceId: string
 }
 
-const sourceOptions: { label: string; value: ImportUserSource }[] = [
-  { label: LOGIN_METHOD_LABELS[LOGIN_METHOD.LDAP], value: LOGIN_METHOD.LDAP },
-  { label: LOGIN_METHOD_LABELS[LOGIN_METHOD.WECOM], value: LOGIN_METHOD.WECOM },
-  { label: LOGIN_METHOD_LABELS[LOGIN_METHOD.DINGTALK], value: LOGIN_METHOD.DINGTALK },
-  { label: LOGIN_METHOD_LABELS[LOGIN_METHOD.LARK], value: LOGIN_METHOD.LARK },
-  { label: '本地文件', value: LOCAL_FILE_SOURCE },
-]
-const roleOptions: RoleType[] = [ROLE_TYPE.USER, ROLE_TYPE.WORKSPACE_MANAGE, ROLE_TYPE.ADMIN]
-const workspaceOptions = [
-  { label: '默认工作空间', value: DEFAULT_WORKSPACE_ID },
-  { label: '研发工作空间', value: 'research-and-development' },
-  { label: '营销工作空间', value: 'marketing' },
-]
-const userGroupOptions = [
-  { label: '用户组 1', value: 'user-group-1' },
-  { label: '用户组 2', value: 'user-group-2' },
-  { label: '产品组', value: 'product-group' },
-]
-
 const dialogVisible = ref(false)
+const importing = ref(false)
 const importUsersFormRef = ref<FormInstance>()
 const dragUploadRef = ref<InstanceType<typeof MkDragUpload>>()
 const importUsersForm = reactive<ImportUsersForm>({ files: [], role: '', source: '', userGroupIds: [], workspaceId: '' })
@@ -68,11 +58,92 @@ const importUsersFormRules: FormRules<ImportUsersForm> = {
   workspaceId: [{ required: true, message: '请选择工作空间', trigger: 'change' }],
 }
 
+const roleOptions: RoleType[] = [ROLE_TYPE.USER, ROLE_TYPE.WORKSPACE_MANAGE, ROLE_TYPE.ADMIN]
+
+/* 可导入来源、角色、工作空间与用户组选项 */
+const sourcesLoading = ref(false)
+const sourceOptions = ref<{ label: string; value: string }[]>([])
+const rolesLoading = ref(false)
+const assignableRoles = ref<ListItem[]>([])
+const workspaceLoading = ref(false)
+const workspaceOptions = ref<ListItem[]>([])
+const userGroupLoading = ref(false)
+const userGroupOptions = ref<SystemUserGroup[]>([])
+
+function loadSourceOptions() {
+  sourcesLoading.value = true
+  return UserManageApi.getUserManageSyncTypes()
+    .then((types) => {
+      sourceOptions.value = [
+        ...types.map((source) => ({ label: source === LOGIN_METHOD.LOCAL ? '系统用户' : LOGIN_METHOD_LABELS[source as LoginMethod], value: source })),
+        { label: '本地文件', value: LOCAL_FILE_SOURCE },
+      ]
+      importUsersForm.source = (sourceOptions.value[0]?.value as ImportUserSource) || ''
+    })
+    .finally(() => {
+      sourcesLoading.value = false
+    })
+}
+
+function loadRoleOptions() {
+  rolesLoading.value = true
+  return CurrentUserApi.getCurrentUserRoleList()
+    .then((roles) => {
+      assignableRoles.value = roles
+    })
+    .finally(() => {
+      rolesLoading.value = false
+    })
+}
+
+function loadWorkspaceOptions() {
+  workspaceLoading.value = true
+  if (!auth.isEE) {
+    workspaceOptions.value = [{ id: DEFAULT_WORKSPACE_ID, name: '默认工作空间' }]
+    importUsersForm.workspaceId ||= DEFAULT_WORKSPACE_ID
+    workspaceLoading.value = false
+    return Promise.resolve()
+  }
+  return CurrentUserApi.getCurrentUserWorkspaceList()
+    .then((workspaces) => {
+      workspaceOptions.value = workspaces
+      importUsersForm.workspaceId ||= workspaces[0]?.id || ''
+    })
+    .finally(() => {
+      workspaceLoading.value = false
+    })
+}
+
+function loadUserGroupOptions() {
+  if (!importUsersForm.workspaceId) {
+    userGroupOptions.value = []
+    return
+  }
+  userGroupLoading.value = true
+  return UserGroupApi.getSystemUserGroups(importUsersForm.workspaceId)
+    .then((groups) => {
+      userGroupOptions.value = groups
+    })
+    .finally(() => {
+      userGroupLoading.value = false
+    })
+}
+
+watch(
+  () => importUsersForm.workspaceId,
+  (workspaceId) => {
+    if (workspaceId) {
+      importUsersForm.userGroupIds = []
+      loadUserGroupOptions()
+    }
+  },
+)
+
 /* 导入用户表单联动 */
 function handleSourceChange(source: ImportUserSource | '') {
   if (source && !importUsersForm.role) {
     importUsersForm.role = ROLE_TYPE.USER
-    importUsersForm.workspaceId = DEFAULT_WORKSPACE_ID
+    importUsersForm.workspaceId = workspaceOptions.value[0]?.id || DEFAULT_WORKSPACE_ID
   }
   if (source !== LOCAL_FILE_SOURCE) {
     importUsersForm.files = []
@@ -86,17 +157,17 @@ function handleRoleChange(role: RoleType | '') {
     importUsersForm.workspaceId = ''
     importUsersForm.userGroupIds = []
   } else if (role) {
-    importUsersForm.workspaceId ||= DEFAULT_WORKSPACE_ID
+    importUsersForm.workspaceId ||= workspaceOptions.value[0]?.id || DEFAULT_WORKSPACE_ID
     if (role !== ROLE_TYPE.USER) importUsersForm.userGroupIds = []
   }
   nextTick(() => importUsersFormRef.value?.clearValidate(['role', 'workspaceId']))
 }
 
 function handleFileChange(file: UploadFile) {
-  if (!/\.xlsx?$/i.test(file.name)) {
+  if (!/\.xlsx$/i.test(file.name)) {
     importUsersForm.files = []
     dragUploadRef.value?.clearFiles()
-    MsgWarning('仅支持上传 xlsx、xls 格式的文件')
+    MsgWarning('仅支持上传 xlsx 格式的文件')
     return
   }
 
@@ -110,7 +181,16 @@ function handleFileRemove() {
 }
 
 function handleDownloadTemplate() {
-  MsgInfo('下载模板将在接口接入后提供')
+  UserManageApi.getUserManageImportTemplate()
+}
+
+function formatConflictMessage(conflicts: ChatUserSyncConflict[]) {
+  return conflicts
+    .map((conflict) => {
+      const conflictLabel = conflict.type === 'username' ? '用户名已存在' : conflict.type === 'nick_name' ? '姓名已存在' : `${conflict.type} 冲突`
+      return `${conflictLabel}：${conflict.users.join('、')}`
+    })
+    .join('；')
 }
 
 function submitImportUsers() {
@@ -118,17 +198,47 @@ function submitImportUsers() {
 
   importUsersFormRef.value.validate((valid) => {
     if (!valid) return
-    MsgInfo('导入接口暂未接入')
+
+    const syncFile = isLocalFileSource.value ? ((importUsersForm.files[0]?.raw ?? undefined) as File | undefined) : undefined
+    const roleId = assignableRoles.value.find((role) => role.type === importUsersForm.role)?.id
+
+    importing.value = true
+    return UserManageApi.postSyncSystemUsers(
+      isLocalFileSource.value ? 'file' : importUsersForm.source,
+      syncFile,
+      importUsersForm.workspaceId || undefined,
+      roleId,
+      importUsersForm.userGroupIds[0],
+    )
+      .then((result) => {
+        const conflictMessage = formatConflictMessage(result.conflict_users ?? [])
+        MsgSuccess(`成功导入 ${result.success_count} 个用户${conflictMessage ? `，${conflictMessage}` : ''}`)
+        emit('refresh')
+        dialogVisible.value = false
+      })
+      .finally(() => {
+        importing.value = false
+      })
   })
 }
 
 function open() {
   resetData()
   dialogVisible.value = true
+  void Promise.all([loadSourceOptions(), loadRoleOptions(), loadWorkspaceOptions()])
 }
 
 function resetData() {
   Object.assign(importUsersForm, { files: [], role: '', source: '', userGroupIds: [], workspaceId: '' })
+  sourceOptions.value = []
+  assignableRoles.value = []
+  workspaceOptions.value = []
+  userGroupOptions.value = []
+  sourcesLoading.value = false
+  rolesLoading.value = false
+  workspaceLoading.value = false
+  userGroupLoading.value = false
+  importing.value = false
   dragUploadRef.value?.clearFiles()
   importUsersFormRef.value?.clearValidate()
 }
@@ -149,7 +259,7 @@ defineExpose({ open })
       @submit.prevent="submitImportUsers"
     >
       <el-form-item label="用户来源" prop="source">
-        <el-select v-model="importUsersForm.source" placeholder="请选择" @change="handleSourceChange">
+        <el-select v-model="importUsersForm.source" placeholder="请选择" :loading="sourcesLoading" @change="handleSourceChange">
           <el-option v-for="sourceOption in sourceOptions" :key="sourceOption.value" :label="sourceOption.label" :value="sourceOption.value" />
         </el-select>
       </el-form-item>
@@ -164,45 +274,35 @@ defineExpose({ open })
         <MkDragUpload
           ref="dragUploadRef"
           v-model="importUsersForm.files"
-          accept=".xlsx,.xls"
-          tip-text="支持格式：xlsx、xls"
+          accept=".xlsx"
+          tip-text="支持格式：xlsx"
           @change="handleFileChange"
           @remove="handleFileRemove"
         />
       </el-form-item>
 
       <el-form-item label="角色" prop="role">
-        <el-select v-model="importUsersForm.role" placeholder="请选择角色" @change="handleRoleChange">
+        <el-select v-model="importUsersForm.role" placeholder="请选择角色" :loading="rolesLoading" @change="handleRoleChange">
           <el-option v-for="roleOption in roleOptions" :key="roleOption" :label="ROLE_TYPE_LABELS[roleOption]" :value="roleOption" />
         </el-select>
       </el-form-item>
 
       <el-form-item v-if="showWorkspace" label="工作空间" prop="workspaceId">
-        <el-select v-model="importUsersForm.workspaceId" placeholder="请选择工作空间">
-          <el-option
-            v-for="workspaceOption in workspaceOptions"
-            :key="workspaceOption.value"
-            :label="workspaceOption.label"
-            :value="workspaceOption.value"
-          />
+        <el-select v-model="importUsersForm.workspaceId" :loading="workspaceLoading" placeholder="请选择工作空间">
+          <el-option v-for="workspaceOption in workspaceOptions" :key="workspaceOption.id" :label="workspaceOption.name" :value="workspaceOption.id" />
         </el-select>
       </el-form-item>
 
       <el-form-item v-if="showUserGroups" label="用户组" prop="userGroupIds">
-        <el-select v-model="importUsersForm.userGroupIds" multiple placeholder="请选择用户组">
-          <el-option
-            v-for="userGroupOption in userGroupOptions"
-            :key="userGroupOption.value"
-            :label="userGroupOption.label"
-            :value="userGroupOption.value"
-          />
+        <el-select v-model="importUsersForm.userGroupIds" :loading="userGroupLoading" multiple placeholder="请选择用户组">
+          <el-option v-for="userGroupOption in userGroupOptions" :key="userGroupOption.id" :label="userGroupOption.name" :value="userGroupOption.id" />
         </el-select>
       </el-form-item>
     </el-form>
 
     <template #footer>
       <el-button plain @click="dialogVisible = false">取消</el-button>
-      <el-button type="primary" :disabled="!canImport" @click="submitImportUsers">导入</el-button>
+      <el-button type="primary" :loading="importing" :disabled="!canImport" @click="submitImportUsers">导入</el-button>
     </template>
   </MkDialog>
 </template>