From 272b4934db0628dd6381f3a9ae1034a88a2fe535 Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <dan.wang@fit2cloud.com>
Date: Mon, 24 Aug 2026 20:36:33 +0800
Subject: [PATCH] feat: resource authorization

---
 ui/src/api/admin/system/common.ts             |   6 +-
 .../admin/system/resource-authorization.ts    |  15 +-
 ui/src/api/types/common.ts                    |   2 +-
 ui/src/components/COMPONENT_README.md         |  11 +-
 .../business/folder-tree/FolderFormDialog.vue |   8 +-
 .../business/folder-tree/MoveToDialog.vue     |  10 +-
 .../global/mk-complex-search/index.vue        |  18 +-
 ui/src/components/global/mk-table/index.vue   |   2 +-
 ui/src/layout/LayoutHeader.vue                |   4 +-
 .../index.vue                                 |   2 +-
 ui/src/styles/app.scss                        | 101 ++++++----
 ui/src/styles/element-plus.scss               |  34 ++++
 .../model/create-model/CreateModelDrawer.vue  |  13 +-
 .../create-model/SelectProviderDrawer.vue     |   9 +-
 .../chat/authentication/EditSCANDrawer.vue    |  10 +-
 .../authentication/components/SCANLogin.vue   |   1 -
 .../dialog/CreateGroupMemberDialog.vue        |   9 +-
 .../dialog/CreateOrUpdateGroupDialog.vue      |   9 +-
 .../system/chat/users/UserFromDrawer.vue      |  11 +-
 .../users/dialog/BatchSetUserGroupDialog.vue  |   9 +-
 .../chat/users/dialog/ImportUsersDialog.vue   |   9 +-
 .../chat/users/dialog/UserPwdDialog.vue       |   9 +-
 .../system/identity/groups/GroupsListView.vue | 158 ++++++++-------
 .../groups/dialog/CreateGroupMemberDialog.vue |  13 +-
 .../dialog/CreateOrUpdateGroupDialog.vue      |   9 +-
 .../ResourceAuthorizationView.vue             | 182 +++++++-----------
 .../components/PermissionTable.vue            | 157 +++++----------
 .../resource-authorization/constants.ts       |  30 +--
 .../dialog/BatchSetPermissionDialog.vue       |  54 ++++++
 .../system/identity/roles/AddMemberDrawer.vue |   9 +-
 .../roles/dialog/CreateOrUpdateRoleDialog.vue |   8 +-
 .../system/identity/users/UserFromDrawer.vue  |  11 +-
 .../users/dialog/BatchSetUserRoleDialog.vue   |   9 +-
 .../identity/users/dialog/UserPwdDialog.vue   |   9 +-
 .../identity/workspaces/AddMemberDrawer.vue   |   9 +-
 .../identity/workspaces/WorkspaceListView.vue |   2 +-
 .../dialog/CreateOrUpdateWorkspaceDialog.vue  |   9 +-
 .../authentication/EditSCANDrawer.vue         |  10 +-
 ui/src/views/tool/ToolDebugDrawer.vue         |  11 +-
 .../tool/components/ToolCreateDropdown.vue    |   2 +-
 .../{create-form => form}/ToolFormDrawer.vue  |  17 +-
 .../components/init-field/InitFieldDialog.vue |  11 +-
 .../components/init-field/InitFieldTable.vue  |   0
 .../input-field/InputFieldDialog.vue          |  11 +-
 .../input-field/InputFieldTable.vue           |   0
 .../components/python-code/CodeSetting.vue    |   0
 .../python-code/GenerateCodeDialog.vue        |   0
 47 files changed, 468 insertions(+), 565 deletions(-)
 rename ui/src/layout/{workspace-dropdown => header-workspace-dropdown}/index.vue (96%)
 create mode 100644 ui/src/views/system/identity/resource-authorization/dialog/BatchSetPermissionDialog.vue
 rename ui/src/views/tool/{create-form => form}/ToolFormDrawer.vue (96%)
 rename ui/src/views/tool/{create-form => form}/components/init-field/InitFieldDialog.vue (95%)
 rename ui/src/views/tool/{create-form => form}/components/init-field/InitFieldTable.vue (100%)
 rename ui/src/views/tool/{create-form => form}/components/input-field/InputFieldDialog.vue (95%)
 rename ui/src/views/tool/{create-form => form}/components/input-field/InputFieldTable.vue (100%)
 rename ui/src/views/tool/{create-form => form}/components/python-code/CodeSetting.vue (100%)
 rename ui/src/views/tool/{create-form => form}/components/python-code/GenerateCodeDialog.vue (100%)

diff --git a/ui/src/api/admin/system/common.ts b/ui/src/api/admin/system/common.ts
index b37e83e3c0b..684c8224ae5 100644
--- a/ui/src/api/admin/system/common.ts
+++ b/ui/src/api/admin/system/common.ts
@@ -1,5 +1,5 @@
 import { get } from '../core/request'
-import type { RequestParams, SystemUserOption, WorkspaceMemberOption } from '@/api/types'
+import type { RequestParams, SystemUserOption, CommonUserOption } from '@/api/types'
 
 /** 获取默认密码。 */
 const getDefaultPassword = () => {
@@ -11,9 +11,9 @@ const getAllUsers = (query?: RequestParams) => {
   return get<SystemUserOption[]>('/user/list', query)
 }
 
-/** 获取指定工作空间的成员选项。 */
+/** 获取指定工作空间的普通用户选项。 */
 const getWorkspaceMembers = (workspaceId: string, query?: RequestParams) => {
-  return get<WorkspaceMemberOption[]>(`/workspace/${workspaceId}/user_member`, query)
+  return get<CommonUserOption[]>(`/workspace/${workspaceId}/user_member`, query)
 }
 
 export default {
diff --git a/ui/src/api/admin/system/resource-authorization.ts b/ui/src/api/admin/system/resource-authorization.ts
index 02a4092c74f..1eed87d6d37 100644
--- a/ui/src/api/admin/system/resource-authorization.ts
+++ b/ui/src/api/admin/system/resource-authorization.ts
@@ -6,20 +6,23 @@ import type {
   ResourcePermissionPayload,
 } from '@/api/types'
 
-const prefix = (workspaceId: string, userId: string, resource: ResourceAuthorizationType) =>
-  `/workspace/${workspaceId}/user_resource_permission/user/${userId}/resource/${resource}`
+/** 系统管理资源授权 */
+const prefix = (workspaceId: string) => `/workspace/${workspaceId}/user_resource_permission`
 
-/** 获取工作空间成员对指定类型资源的权限列表。 */
+/** 获取指定空间、指定用户、指定资源类型的权限列表。 */
 const getUserResourcePermissions = (
   workspaceId: string,
   userId: string,
   resource: ResourceAuthorizationType,
   query?: RequestParams,
 ) => {
-  return get<ResourcePermissionItem[]>(prefix(workspaceId, userId, resource), query)
+  return get<ResourcePermissionItem[]>(
+    `${prefix(workspaceId)}/user/${userId}/resource/${resource}`,
+    query,
+  )
 }
 
-/** 更新工作空间成员对指定类型资源的权限。 */
+/** 更新指定空间、指定用户、指定资源类型的权限列表。 */
 const putUserResourcePermissions = (
   workspaceId: string,
   userId: string,
@@ -27,7 +30,7 @@ const putUserResourcePermissions = (
   permissions: ResourcePermissionPayload[],
 ) => {
   return put<ResourcePermissionPayload[], ResourcePermissionPayload[]>(
-    prefix(workspaceId, userId, resource),
+    `${prefix(workspaceId)}/user/${userId}/resource/${resource}`,
     permissions,
   )
 }
diff --git a/ui/src/api/types/common.ts b/ui/src/api/types/common.ts
index 7c8bf5a8179..7f91335b8f4 100644
--- a/ui/src/api/types/common.ts
+++ b/ui/src/api/types/common.ts
@@ -23,7 +23,7 @@ export interface ExportError {
   }
 }
 
-export interface WorkspaceMemberOption {
+export interface CommonUserOption {
   id: string
   nick_name: string
   roles?: string[]
diff --git a/ui/src/components/COMPONENT_README.md b/ui/src/components/COMPONENT_README.md
index 76a04f370e5..024d2288505 100644
--- a/ui/src/components/COMPONENT_README.md
+++ b/ui/src/components/COMPONENT_README.md
@@ -220,16 +220,18 @@ Escape 关闭；这些默认行为可以通过同名 Props 覆盖。Element Plus
 ```
 
 业务 Dialog 和 Drawer 的状态生命周期保持一致：`open()` 先调用 `resetData()`，再回填编辑数据并
-显示浮层；`close()` 先关闭浮层，再调用 `resetData()`；组件同时监听 `closed` 调用
-`resetData()`，确保点击右上角关闭按钮时也完成清理。`resetData()` 应统一重置表单、提交状态、
-临时选项和表单校验，不把清理逻辑散落在 `open()`、取消按钮或提交成功回调中。
+显示浮层；取消、提交成功或其他关闭操作直接将 `v-model` 绑定的可见状态设为 `false`，不额外定义或
+向父组件暴露 `close()`；组件统一监听 `closed` 调用 `resetData()`，确保所有关闭路径都在关闭动画
+结束后完成清理。`resetData()` 应统一重置表单、提交状态、临时选项和表单校验，不把清理逻辑散落在
+`open()`、取消按钮或提交成功回调中。
 
 ### MkComplexSearch
 
 用于在多个字段之间切换搜索条件。`fields` 中的基础字段使用 `@/api/types` 中的
 `OptionItem<string>`；字段包含 `options` 时使用下拉选择，否则使用文本输入。选项字段配置
 `remoteMethod` 后自动启用远程搜索，并由该方法异步加载当前字段的选项。输入或选择完成时，`change` 返回
-`{ [field]: value }`；切换字段或清空条件时返回 `undefined`。
+`{ [field]: value }`；选项字段配置 `multiple: true` 时启用多选并返回值数组。切换字段或清空条件时
+返回 `undefined`。
 
 ```vue
 <MkComplexSearch
@@ -238,6 +240,7 @@ Escape 关闭；这些默认行为可以通过同名 Props 覆盖。Element Plus
     {
       label: '状态',
       value: 'enabled',
+      multiple: true,
       options: [
         { label: '启用', value: true },
         { label: '禁用', value: false },
diff --git a/ui/src/components/business/folder-tree/FolderFormDialog.vue b/ui/src/components/business/folder-tree/FolderFormDialog.vue
index 870b98da9bb..3eab1883eca 100644
--- a/ui/src/components/business/folder-tree/FolderFormDialog.vue
+++ b/ui/src/components/business/folder-tree/FolderFormDialog.vue
@@ -72,10 +72,6 @@ function open(id: string, folder?: FolderItem) {
   visible.value = true
 }
 
-function close() {
-  visible.value = false
-  resetData()
-}
 function resetData() {
   editId.value = ''
   folderForm.desc = ''
@@ -84,7 +80,7 @@ function resetData() {
   folderFormRef.value?.clearValidate()
 }
 
-defineExpose({ close, open })
+defineExpose({ open })
 </script>
 
 <template>
@@ -120,7 +116,7 @@ defineExpose({ close, open })
     </el-form>
 
     <template #footer>
-      <el-button :disabled="loading" @click="close">取消</el-button>
+      <el-button :disabled="loading" @click="visible = false">取消</el-button>
       <el-button type="primary" :loading="loading" @click="handleSubmit">
         {{ editId ? '保存' : '创建' }}
       </el-button>
diff --git a/ui/src/components/business/folder-tree/MoveToDialog.vue b/ui/src/components/business/folder-tree/MoveToDialog.vue
index 23d627a16a7..83fe780996a 100644
--- a/ui/src/components/business/folder-tree/MoveToDialog.vue
+++ b/ui/src/components/business/folder-tree/MoveToDialog.vue
@@ -69,7 +69,7 @@ function handleSubmit() {
 //   })
 //     .then((updatedFolder) => {
 //       MsgSuccess('移动成功')
-//       moveFolderDialogRef.value?.close()
+//       visible.value = false
 //       return loadFolders().then(() => emit('moved', updatedFolder))
 //     })
 //     .finally(() => {
@@ -82,17 +82,13 @@ function open(folder: WorkspaceFolder) {
   visible.value = true
 }
 
-function close() {
-  visible.value = false
-  resetData()
-}
 function resetData() {
   movingFolder.value = undefined
   searchKeyword.value = ''
   selectedTargetId.value = ''
 }
 
-defineExpose({ close, open })
+defineExpose({ open })
 </script>
 
 <template>
@@ -103,7 +99,7 @@ defineExpose({ close, open })
       @select="handleTargetSelect"
     />
     <template #footer>
-      <el-button :disabled="loading" @click="close">取消</el-button>
+      <el-button :disabled="loading" @click="visible = false">取消</el-button>
       <el-button type="primary" :disabled="!canSubmit" :loading="loading" @click="handleSubmit">
         确定
       </el-button>
diff --git a/ui/src/components/global/mk-complex-search/index.vue b/ui/src/components/global/mk-complex-search/index.vue
index 531c682e430..b97587f9b28 100644
--- a/ui/src/components/global/mk-complex-search/index.vue
+++ b/ui/src/components/global/mk-complex-search/index.vue
@@ -5,9 +5,12 @@ import type { OptionItem } from '@/api/types'
 defineOptions({ name: 'MkComplexSearch' })
 
 interface ComplexSearchField extends OptionItem<string> {
+  multiple?: boolean
   remoteMethod?: (query: string) => Promise<unknown> | void
 }
 
+type SearchValue = boolean | number | string
+
 const props = withDefaults(
   defineProps<{
     fields: ComplexSearchField[]
@@ -15,7 +18,7 @@ const props = withDefaults(
   {},
 )
 const emit = defineEmits<{
-  change: [value: Record<string, boolean | number | string> | undefined]
+  change: [value: Record<string, SearchValue | SearchValue[]> | undefined]
 }>()
 
 // 异步搜索
@@ -37,21 +40,23 @@ function handleRemoteSearch(query: string) {
   )
 }
 
-const searchValue = ref('')
 const searchField = ref(props.fields[0]?.value ?? '')
+const searchValue = ref<SearchValue | SearchValue[]>(props.fields[0]?.multiple ? [] : '')
 
 const activeField = computed(() => props.fields.find(({ value }) => value === searchField.value))
 
 function handleFieldChange() {
-  const shouldClearSearch = searchValue.value !== '' && searchValue.value !== undefined
+  const shouldClearSearch = Array.isArray(searchValue.value)
+    ? searchValue.value.length > 0
+    : searchValue.value !== ''
   remoteRequestId += 1
   remoteLoading.value = false
-  searchValue.value = ''
+  searchValue.value = activeField.value?.multiple ? [] : ''
   if (shouldClearSearch) emit('change', undefined)
 }
 
 function handleChange() {
-  if (searchValue.value === '' || searchValue.value === undefined) {
+  if (searchValue.value === '' || (Array.isArray(searchValue.value) && !searchValue.value.length)) {
     emit('change', undefined)
   } else {
     emit('change', { [searchField.value]: searchValue.value })
@@ -82,8 +87,11 @@ function handleChange() {
       class="mk-complex-search__value w-50!"
       clearable
       :loading="remoteLoading"
+      :multiple="activeField.multiple"
       placeholder="请选择"
       filterable
+      collapse-tags
+      collapse-tags-tooltip
       reserve-keyword
       :remote="Boolean(activeField.remoteMethod)"
       :remote-method="handleRemoteSearch"
diff --git a/ui/src/components/global/mk-table/index.vue b/ui/src/components/global/mk-table/index.vue
index a962235ab1e..b28c0e5a975 100644
--- a/ui/src/components/global/mk-table/index.vue
+++ b/ui/src/components/global/mk-table/index.vue
@@ -192,7 +192,7 @@ defineExpose({ clearSelection, tableRef })
     </div>
 
     <footer
-      v-if="selectedRows.length > 0"
+      v-if="selectedRows.length > 0 && $slots.footerBatchActions"
       class="sticky -mb-6 -ml-6 bottom-0 z-10 mt-auto flex shrink-0 items-center border-t bg-white px-6 py-4"
     >
       <div class="mr-4 flex items-center gap-3">
diff --git a/ui/src/layout/LayoutHeader.vue b/ui/src/layout/LayoutHeader.vue
index 86f3ff6a4c7..ccd3ec56535 100644
--- a/ui/src/layout/LayoutHeader.vue
+++ b/ui/src/layout/LayoutHeader.vue
@@ -2,7 +2,7 @@
 import { useRouter } from 'vue-router'
 
 import AvatarDropdown from './avatar-dropdown/index.vue'
-import WorkspaceDropdown from './workspace-dropdown/index.vue'
+import HeaderWorkspaceDropdown from './header-workspace-dropdown/index.vue'
 import { isWorkspace, isSystem } from '@/router/admin/utils'
 import type { LayoutMode } from './types'
 const router = useRouter()
@@ -30,7 +30,7 @@ function switchMode() {
       <div class="flex items-center gap-5 ml-5">
         <el-divider direction="vertical" />
         <!-- 企业版: 工作空间下拉框 -->
-        <WorkspaceDropdown v-if="isWorkspace(mode)" />
+        <HeaderWorkspaceDropdown v-if="isWorkspace(mode)" />
         <span v-if="isSystem(mode)" class="text-lg">系统管理</span>
       </div>
     </div>
diff --git a/ui/src/layout/workspace-dropdown/index.vue b/ui/src/layout/header-workspace-dropdown/index.vue
similarity index 96%
rename from ui/src/layout/workspace-dropdown/index.vue
rename to ui/src/layout/header-workspace-dropdown/index.vue
index 93307df2e6a..01c9c73ab63 100644
--- a/ui/src/layout/workspace-dropdown/index.vue
+++ b/ui/src/layout/header-workspace-dropdown/index.vue
@@ -5,7 +5,7 @@ import WorkspaceDropdown from '@/components/business/workspace-dropdown/index.vu
 import { useStore } from '@/stores'
 import type { WorkspaceItem } from '@/api/types'
 
-defineOptions({ name: 'WorkspaceDropdown' })
+defineOptions({ name: 'HeaderWorkspaceDropdown' })
 const router = useRouter()
 const route = useRoute()
 const { user } = useStore()
diff --git a/ui/src/styles/app.scss b/ui/src/styles/app.scss
index 0eda4da342f..d044c74d6b5 100644
--- a/ui/src/styles/app.scss
+++ b/ui/src/styles/app.scss
@@ -60,42 +60,7 @@ h6 {
   line-height: var(--mk-line-height-base);
 }
 
-/*
-  标题前带竖线样式
-*/
-.mk-title-decoration {
-  position: relative;
-  padding-left: 10px;
-  &:before {
-    position: absolute;
-    left: 2px;
-    top: 50%;
-    transform: translate(-50%, -50%);
-    width: 2px;
-    height: 67%;
-    content: '';
-    background: var(--el-color-primary);
-  }
-}
-
-/*
-  必填文字的星号
-*/
-.mk-required {
-  &:after {
-    content: '*';
-    color: var(--el-color-danger);
-    margin-left: 4px;
-  }
-}
-
-// 资源的card grid布局
-.mk-resource-card-grid {
-  display: grid;
-  gap: 16px;
-  grid-template-columns: repeat(auto-fill, minmax(min(100%, 300px), 1fr));
-}
-
+// Codemirror 编辑器
 .cm-editor {
   --el-scrollbar-bg-color: var(--el-text-color-secondary);
   --el-scrollbar-hover-bg-color: var(--el-text-color-secondary);
@@ -146,6 +111,68 @@ h6 {
     border: none;
   }
   &.cm-focused {
-    outline: none!important;
+    outline: none !important;
+  }
+}
+
+/*
+  标题前带竖线样式
+*/
+.mk-title-decoration {
+  position: relative;
+  padding-left: 10px;
+  &:before {
+    position: absolute;
+    left: 2px;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    width: 2px;
+    height: 67%;
+    content: '';
+    background: var(--el-color-primary);
+  }
+}
+
+/*
+  必填文字的星号
+*/
+.mk-required {
+  &:after {
+    content: '*';
+    color: var(--el-color-danger);
+    margin-left: 4px;
+  }
+}
+
+// 资源的card grid布局
+.mk-resource-card-grid {
+  display: grid;
+  gap: 16px;
+  grid-template-columns: repeat(auto-fill, minmax(min(100%, 300px), 1fr));
+}
+
+// radio-group 垂直排列
+.vertical-radio-group {
+  align-items: stretch;
+  display: flex;
+  flex-direction: column;
+  gap: calc(var(--spacing) * 3);
+  width: 100%;
+
+  :deep(.el-radio) {
+    align-items: flex-start;
+    height: auto;
+    margin-right: 0;
+    white-space: normal;
+  }
+
+  :deep(.el-radio__input) {
+    margin-top: 3px;
+  }
+
+  :deep(.el-radio__label) {
+    line-height: var(--mk-line-height-base);
+    min-width: 0;
+    padding-left: calc(var(--spacing) * 2);
   }
 }
diff --git a/ui/src/styles/element-plus.scss b/ui/src/styles/element-plus.scss
index f47d0818159..ed4a4461a8b 100644
--- a/ui/src/styles/element-plus.scss
+++ b/ui/src/styles/element-plus.scss
@@ -102,6 +102,10 @@
   &.is-plain {
     --el-button-bg-color: transparent !important;
   }
+  &.is-disabled {
+    --el-button-disabled-bg-color: var(--mk-N400);
+    --el-button-disabled-border-color: var(--mk-N400);
+  }
   &--primary {
     --el-button-hover-bg-color: var(--el-color-primary-light-1);
     --el-button-hover-border-color: var(--el-color-primary-light-1);
@@ -806,6 +810,36 @@
     line-height: var(--mk-line-height-base);
     padding: calc(var(--spacing) * 3);
   }
+
+  [class*='el-table__row--level'] .el-table__expand-icon {
+    align-items: center;
+    display: inline-flex;
+    justify-content: center;
+    margin-right: 4px;
+    transform: none;
+
+    &::before {
+      background-color: currentcolor;
+      clip-path: polygon(18.75% 37.5%, 50% 75%, 81.25% 37.5%);
+      content: '';
+      height: 14px;
+      transform: rotate(-90deg);
+      transition: transform var(--el-transition-duration-fast) ease-in-out;
+      width: 14px;
+    }
+
+    > .el-icon {
+      display: none;
+    }
+
+    &--expanded {
+      transform: none;
+
+      &::before {
+        transform: rotate(0);
+      }
+    }
+  }
 }
 .el-table--border {
   border: 1px solid var(--el-table-border-color);
diff --git a/ui/src/views/model/create-model/CreateModelDrawer.vue b/ui/src/views/model/create-model/CreateModelDrawer.vue
index 31d334fbe5d..0c64b7b0ba3 100644
--- a/ui/src/views/model/create-model/CreateModelDrawer.vue
+++ b/ui/src/views/model/create-model/CreateModelDrawer.vue
@@ -90,11 +90,6 @@ function open(provider: ModelProviderItem) {
   loadModelTypes(provider)
 }
 
-function close() {
-  visible.value = false
-  resetData()
-}
-
 function handleProviderSelect(provider: ModelProviderItem) {
   loadModelTypes(provider)
 }
@@ -146,7 +141,7 @@ function handleBaseModelChange() {
 }
 
 function handleBack() {
-  close()
+  visible.value = false
   emit('back')
 }
 
@@ -161,7 +156,7 @@ function handleSubmit() {
     })
       .then(() => {
         MsgSuccess('创建成功')
-        close()
+        visible.value = false
         emit('refresh')
       })
       .finally(() => {
@@ -170,7 +165,7 @@ function handleSubmit() {
   })
 }
 
-defineExpose({ open, close })
+defineExpose({ open })
 </script>
 
 <template>
@@ -295,7 +290,7 @@ defineExpose({ open, close })
     </MkViewLayout>
 
     <template #footer>
-      <el-button :disabled="loading" @click="close">取消</el-button>
+      <el-button :disabled="loading" @click="visible = false">取消</el-button>
       <el-button :disabled="loading" @click="handleBack">上一步</el-button>
       <el-button type="primary" :loading="loading" @click="handleSubmit">保存</el-button>
     </template>
diff --git a/ui/src/views/model/create-model/SelectProviderDrawer.vue b/ui/src/views/model/create-model/SelectProviderDrawer.vue
index 471b3e08307..1404bb9669b 100644
--- a/ui/src/views/model/create-model/SelectProviderDrawer.vue
+++ b/ui/src/views/model/create-model/SelectProviderDrawer.vue
@@ -35,13 +35,8 @@ function loadModelProviders() {
   })
 }
 
-function close() {
-  visible.value = false
-  resetData()
-}
-
 function handleProviderSelect(provider: ModelProviderItem) {
-  close()
+  visible.value = false
   emit('select', provider)
 }
 
@@ -60,7 +55,7 @@ function handleModelTypeChange() {
   //   })
 }
 
-defineExpose({ open, close })
+defineExpose({ open })
 </script>
 
 <template>
diff --git a/ui/src/views/system/chat/authentication/EditSCANDrawer.vue b/ui/src/views/system/chat/authentication/EditSCANDrawer.vue
index 050803798bc..3eaad34d347 100644
--- a/ui/src/views/system/chat/authentication/EditSCANDrawer.vue
+++ b/ui/src/views/system/chat/authentication/EditSCANDrawer.vue
@@ -34,7 +34,7 @@ function submit() {
       .then(() => {
         MsgSuccess('保存成功')
         emit('refresh')
-        close()
+        visible.value = false
       })
       .finally(() => {
         loading.value = false
@@ -47,7 +47,6 @@ function handleValidatePlatform() {
   loading.value = true
   return ChatUserAuthScanApi.putValidateQrLoginPlatform(form)
     .then((res) => {
-      // TODO: 校验判断有误
       res ? MsgSuccess('校验成功') : MsgError('校验失败')
     })
     .finally(() => {
@@ -60,11 +59,6 @@ function open(platform: QrLoginPlatformPayload) {
   visible.value = true
 }
 
-function close() {
-  visible.value = false
-  resetData()
-}
-
 function resetData() {
   Object.assign(form, { key: LOGIN_METHOD.WECOM, isActive: false, config: {} })
   formRef.value?.resetFields()
@@ -98,7 +92,7 @@ defineExpose({ open })
     </el-form>
 
     <template #footer>
-      <el-button @click="close">取消</el-button>
+      <el-button @click="visible = false">取消</el-button>
       <el-button @click="handleValidatePlatform">校验</el-button>
       <el-button type="primary" @click="submit">保存</el-button>
     </template>
diff --git a/ui/src/views/system/chat/authentication/components/SCANLogin.vue b/ui/src/views/system/chat/authentication/components/SCANLogin.vue
index e29ad43db4f..d21228b1eea 100644
--- a/ui/src/views/system/chat/authentication/components/SCANLogin.vue
+++ b/ui/src/views/system/chat/authentication/components/SCANLogin.vue
@@ -97,7 +97,6 @@ function handleValidatePlatform(platform: QrLoginPlatformView) {
   loading.value = true
   return ChatUserAuthScanApi.putValidateQrLoginPlatform(platform)
     .then((res) => {
-      // TODO: 校验判断有误
       res ? MsgSuccess('校验成功') : MsgError('校验失败')
     })
     .finally(() => {
diff --git a/ui/src/views/system/chat/user-groups/dialog/CreateGroupMemberDialog.vue b/ui/src/views/system/chat/user-groups/dialog/CreateGroupMemberDialog.vue
index bc69d7c9ed2..94b289a0546 100644
--- a/ui/src/views/system/chat/user-groups/dialog/CreateGroupMemberDialog.vue
+++ b/ui/src/views/system/chat/user-groups/dialog/CreateGroupMemberDialog.vue
@@ -45,7 +45,7 @@ function submit() {
       .then(() => {
         MsgSuccess('添加成功')
         emit('refresh')
-        close()
+        visible.value = false
       })
       .finally(() => {
         loading.value = false
@@ -53,11 +53,6 @@ function submit() {
   })
 }
 
-function close() {
-  visible.value = false
-  resetData()
-}
-
 function resetData() {
   memberForm.userIds = []
   loading.value = false
@@ -93,7 +88,7 @@ defineExpose({ open })
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="close">取消</el-button>
+      <el-button @click="visible = false">取消</el-button>
       <el-button type="primary" :loading="loading" @click="submit">添加</el-button>
     </template>
   </MkDialog>
diff --git a/ui/src/views/system/chat/user-groups/dialog/CreateOrUpdateGroupDialog.vue b/ui/src/views/system/chat/user-groups/dialog/CreateOrUpdateGroupDialog.vue
index 2eacff28917..19ad9df6842 100644
--- a/ui/src/views/system/chat/user-groups/dialog/CreateOrUpdateGroupDialog.vue
+++ b/ui/src/views/system/chat/user-groups/dialog/CreateOrUpdateGroupDialog.vue
@@ -34,7 +34,7 @@ function submit() {
       .then(() => {
         MsgSuccess(groupForm.id ? '重命名成功' : '创建成功')
         emit('refresh', groupForm?.id || undefined)
-        close()
+        visible.value = false
       })
       .finally(() => {
         loading.value = false
@@ -42,11 +42,6 @@ function submit() {
   })
 }
 
-function close() {
-  visible.value = false
-  resetData()
-}
-
 function resetData() {
   Object.assign(groupForm, { id: undefined, name: '' })
   loading.value = false
@@ -74,7 +69,7 @@ defineExpose({ open })
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="close">取消</el-button>
+      <el-button @click="visible = false">取消</el-button>
       <el-button type="primary" :loading="loading" @click="submit">
         {{ groupForm.id ? '保存' : '创建' }}
       </el-button>
diff --git a/ui/src/views/system/chat/users/UserFromDrawer.vue b/ui/src/views/system/chat/users/UserFromDrawer.vue
index b91a0d80a02..49c1b9088d6 100644
--- a/ui/src/views/system/chat/users/UserFromDrawer.vue
+++ b/ui/src/views/system/chat/users/UserFromDrawer.vue
@@ -94,7 +94,7 @@ async function submitUser() {
           .then(() => {
             MsgSuccess('编辑成功')
             emit('refresh', false)
-            close()
+            drawerVisible.value = false
           })
           .finally(() => {
             userSubmitting.value = false
@@ -111,7 +111,7 @@ async function submitUser() {
           .then(() => {
             MsgSuccess('创建成功')
             emit('refresh', true)
-            close()
+            drawerVisible.value = false
           })
           .finally(() => {
             userSubmitting.value = false
@@ -140,11 +140,6 @@ function open(user?: ChatUser) {
   drawerVisible.value = true
 }
 
-function close() {
-  drawerVisible.value = false
-  resetData()
-}
-
 function resetData() {
   Object.assign(userForm, {
     email: '',
@@ -239,7 +234,7 @@ defineExpose({ open })
     </el-form>
 
     <template #footer>
-      <el-button @click="close">取消</el-button>
+      <el-button @click="drawerVisible = false">取消</el-button>
       <el-button :loading="userSubmitting" type="primary" @click="submitUser">
         {{ submitText }}
       </el-button>
diff --git a/ui/src/views/system/chat/users/dialog/BatchSetUserGroupDialog.vue b/ui/src/views/system/chat/users/dialog/BatchSetUserGroupDialog.vue
index 4cdf580a268..88bdc6ac53d 100644
--- a/ui/src/views/system/chat/users/dialog/BatchSetUserGroupDialog.vue
+++ b/ui/src/views/system/chat/users/dialog/BatchSetUserGroupDialog.vue
@@ -52,7 +52,7 @@ function submitBatchSetUserGroups() {
       .then(() => {
         MsgSuccess('设置成功')
         emit('refresh')
-        close()
+        dialogVisible.value = false
       })
       .finally(() => {
         submitting.value = false
@@ -66,11 +66,6 @@ function open(userIds: string[]) {
   loadUserGroupOptions()
 }
 
-function close() {
-  dialogVisible.value = false
-  resetData()
-}
-
 function resetData() {
   Object.assign(batchGroupForm, { ids: [], is_append: true, user_group_ids: [] })
   submitting.value = false
@@ -120,7 +115,7 @@ defineExpose({ open })
     </el-form>
 
     <template #footer>
-      <el-button @click="close">取消</el-button>
+      <el-button @click="dialogVisible = false">取消</el-button>
       <el-button type="primary" :loading="submitting" @click="submitBatchSetUserGroups">
         保存
       </el-button>
diff --git a/ui/src/views/system/chat/users/dialog/ImportUsersDialog.vue b/ui/src/views/system/chat/users/dialog/ImportUsersDialog.vue
index a50d256145f..46fe61f1f06 100644
--- a/ui/src/views/system/chat/users/dialog/ImportUsersDialog.vue
+++ b/ui/src/views/system/chat/users/dialog/ImportUsersDialog.vue
@@ -76,7 +76,7 @@ function submitImportUsers() {
           `成功导入 ${result.success_count} 个用户${conflictMessage ? `，${conflictMessage}` : ''}`,
         )
         emit('refresh')
-        close()
+        dialogVisible.value = false
       })
       .finally(() => {
         importing.value = false
@@ -89,11 +89,6 @@ function open() {
   loadSyncTypes()
 }
 
-function close() {
-  dialogVisible.value = false
-  resetData()
-}
-
 function resetData() {
   importUsersForm.syncType = ''
   syncTypeOptions.value = []
@@ -137,7 +132,7 @@ defineExpose({ open })
     </el-form>
 
     <template #footer>
-      <el-button @click="close">取消</el-button>
+      <el-button @click="dialogVisible = false">取消</el-button>
       <el-button type="primary" :loading="importing" @click="submitImportUsers">导入</el-button>
     </template>
   </MkDialog>
diff --git a/ui/src/views/system/chat/users/dialog/UserPwdDialog.vue b/ui/src/views/system/chat/users/dialog/UserPwdDialog.vue
index 42d7732538f..436ad0a4cb6 100644
--- a/ui/src/views/system/chat/users/dialog/UserPwdDialog.vue
+++ b/ui/src/views/system/chat/users/dialog/UserPwdDialog.vue
@@ -69,7 +69,7 @@ async function submitPassword() {
       .then(() => {
         MsgSuccess('密码修改成功')
         emit('refresh')
-        close()
+        dialogVisible.value = false
       })
       .finally(() => {
         passwordSubmitting.value = false
@@ -77,11 +77,6 @@ async function submitPassword() {
   })
 }
 
-function close() {
-  dialogVisible.value = false
-  resetData()
-}
-
 function resetData() {
   Object.assign(userPasswordForm, { password: '', re_password: '' })
   passwordSubmitting.value = false
@@ -124,7 +119,7 @@ defineExpose({ open })
     </el-form>
 
     <template #footer>
-      <el-button @click="close">取消</el-button>
+      <el-button @click="dialogVisible = false">取消</el-button>
       <el-button :loading="passwordSubmitting" type="primary" @click="submitPassword">
         保存
       </el-button>
diff --git a/ui/src/views/system/identity/groups/GroupsListView.vue b/ui/src/views/system/identity/groups/GroupsListView.vue
index 4cc030fd67e..9f2e666c32b 100644
--- a/ui/src/views/system/identity/groups/GroupsListView.vue
+++ b/ui/src/views/system/identity/groups/GroupsListView.vue
@@ -15,69 +15,23 @@ import MkSearchList from '@/components/mk-search-list/index.vue'
 import WorkspaceRelationTags from '@/components/business/workspace-relation-tags/index.vue'
 import CreateOrUpdateGroupDialog from './dialog/CreateOrUpdateGroupDialog.vue'
 import CreateGroupMemberDialog from './dialog/CreateGroupMemberDialog.vue'
+import { useStore } from '@/stores'
+const { auth } = useStore()
 
-/* 成员列表相关 */
-const loadingMembers = ref(false)
-const paginationConfig = ref({
-  currentPage: 1,
-  pageSize: 10,
-  total: 0,
-})
-const memberSearchQuery = ref<RequestParams>()
-const memberSearchFields: OptionItem<string>[] = [
-  { label: '用户名', value: 'username' },
-  { label: '姓名', value: 'nick_name' },
-]
-const userGroupMembers = ref<SystemUserGroupMember[]>([])
-function handleMemberSearch(query?: RequestParams) {
-  memberSearchQuery.value = query
-  paginationConfig.value.currentPage = 1
-  loadUserGroupMembers()
-}
-
-const selectedGroupMembers = ref<SystemUserGroupMember[]>([])
-function handleMemberSelectionChange(selection: unknown[]) {
-  selectedGroupMembers.value = selection as SystemUserGroupMember[]
-}
-
-/* 添加成员drawer */
-const memberDialogRef =
-  useTemplateRef<InstanceType<typeof CreateGroupMemberDialog>>('memberDialogRef')
+/* 选择工作空间列表 */
+const selectedWorkspaceId = ref('default')
+const workspaceOptions = ref<WorkspaceItem[]>([])
+const loadingView = ref(false)
 
-function handleOpenMemberDialog() {
-  memberDialogRef.value?.open()
+function handleWorkspaceSelect(workspace: WorkspaceItem) {
+  selectedWorkspaceId.value = workspace.id ?? 'default'
+  loadUserGroups()
 }
 
-function handleRemoveMembers(member?: SystemUserGroupMember) {
-  const group = currentGroup.value
-  const members = member ? [member] : selectedGroupMembers.value
-  if (!group || !members.length) return
-
-  const targetName = member ? member.nick_name || member.username : ''
-  const title = member
-    ? `是否移除成员：${targetName}？`
-    : `是否移除选中的 ${members.length} 个成员？`
-  MsgConfirm(title, '', { confirmButtonText: '移除' })
-    .then(() => {
-      return UserGroupsApi.postRemoveSystemUserGroupMembers(
-        selectedWorkspaceId.value,
-        group.id,
-        members.map(({ system_user_group_relation_id }) => system_user_group_relation_id),
-      ).then(() => {
-        MsgSuccess('移除成功')
-        const removedRelationIds = new Set(
-          members.map(({ system_user_group_relation_id }) => system_user_group_relation_id),
-        )
-        userGroupMembers.value = userGroupMembers.value.filter(
-          ({ system_user_group_relation_id }) =>
-            !removedRelationIds.has(system_user_group_relation_id),
-        )
-        paginationConfig.value.total = userGroupMembers.value.length
-        selectedGroupMembers.value = []
-        loadUserGroups()
-      })
-    })
-    .catch(() => {})
+function loadWorkspaceOptions() {
+  return WorkspaceApi.getSystemWorkspaceList().then((workspaces) => {
+    workspaceOptions.value = workspaces
+  })
 }
 
 /* 选择用户组列表 */
@@ -167,39 +121,83 @@ function loadUserGroupMembers(reset = false) {
     })
 }
 
-/* 选择工作空间列表 */
-const selectedWorkspaceId = ref('default')
-const workspaceOptions = ref<WorkspaceItem[]>([])
-const loadingView = ref(false)
+/* 成员列表相关 */
+const loadingMembers = ref(false)
+const paginationConfig = ref({
+  currentPage: 1,
+  pageSize: 10,
+  total: 0,
+})
+const memberSearchQuery = ref<RequestParams>()
+const memberSearchFields: OptionItem<string>[] = [
+  { label: '用户名', value: 'username' },
+  { label: '姓名', value: 'nick_name' },
+]
+const userGroupMembers = ref<SystemUserGroupMember[]>([])
+function handleMemberSearch(query?: RequestParams) {
+  memberSearchQuery.value = query
+  paginationConfig.value.currentPage = 1
+  loadUserGroupMembers()
+}
 
-function handleWorkspaceSelect(workspace: WorkspaceItem) {
-  selectedWorkspaceId.value = workspace.id ?? 'default'
-  loadUserGroups()
+const selectedGroupMembers = ref<SystemUserGroupMember[]>([])
+function handleMemberSelectionChange(selection: unknown[]) {
+  selectedGroupMembers.value = selection as SystemUserGroupMember[]
 }
 
-function loadWorkspaceOptions() {
-  loadingView.value = true
-  return WorkspaceApi.getSystemWorkspaceList()
-    .then((workspaces) => {
-      workspaceOptions.value = workspaces
+/* 添加成员drawer */
+const memberDialogRef =
+  useTemplateRef<InstanceType<typeof CreateGroupMemberDialog>>('memberDialogRef')
 
-      if (!workspaceOptions.value.some(({ id }) => id === selectedWorkspaceId.value)) {
-        selectedWorkspaceId.value = workspaceOptions.value[0]?.id ?? 'default'
-      }
+function handleOpenMemberDialog() {
+  memberDialogRef.value?.open()
+}
 
-      return loadUserGroups()
-    })
-    .finally(() => {
-      loadingView.value = false
+function handleRemoveMembers(member?: SystemUserGroupMember) {
+  const group = currentGroup.value
+  const members = member ? [member] : selectedGroupMembers.value
+  if (!group || !members.length) return
+
+  const targetName = member ? member.nick_name || member.username : ''
+  const title = member
+    ? `是否移除成员：${targetName}？`
+    : `是否移除选中的 ${members.length} 个成员？`
+  MsgConfirm(title, '', { confirmButtonText: '移除' })
+    .then(() => {
+      return UserGroupsApi.postRemoveSystemUserGroupMembers(
+        selectedWorkspaceId.value,
+        group.id,
+        members.map(({ system_user_group_relation_id }) => system_user_group_relation_id),
+      ).then(() => {
+        MsgSuccess('移除成功')
+        const removedRelationIds = new Set(
+          members.map(({ system_user_group_relation_id }) => system_user_group_relation_id),
+        )
+        userGroupMembers.value = userGroupMembers.value.filter(
+          ({ system_user_group_relation_id }) =>
+            !removedRelationIds.has(system_user_group_relation_id),
+        )
+        paginationConfig.value.total = userGroupMembers.value.length
+        selectedGroupMembers.value = []
+        loadUserGroups()
+      })
     })
+    .catch(() => {})
 }
 
-onMounted(() => loadWorkspaceOptions())
+onMounted(() => {
+  loadingView.value = true
+  Promise.all(auth.isEE ? [loadWorkspaceOptions(), loadUserGroups()] : [loadUserGroups()]).finally(
+    () => {
+      loadingView.value = false
+    },
+  )
+})
 </script>
 
 <template>
   <MkViewLayout class="system-identity-groups" :loading="loadingView">
-    <template #top>
+    <template #top v-if="auth.isEE">
       <WorkspaceDropdown
         v-model="selectedWorkspaceId"
         :options="workspaceOptions"
diff --git a/ui/src/views/system/identity/groups/dialog/CreateGroupMemberDialog.vue b/ui/src/views/system/identity/groups/dialog/CreateGroupMemberDialog.vue
index 44bc48e758e..9e897fef03e 100644
--- a/ui/src/views/system/identity/groups/dialog/CreateGroupMemberDialog.vue
+++ b/ui/src/views/system/identity/groups/dialog/CreateGroupMemberDialog.vue
@@ -3,7 +3,7 @@ import { reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import UserGroupsApi from '@/api/admin/system/user-groups'
 import CommonSystemApi from '@/api/admin/system/common'
-import type { WorkspaceMemberOption } from '@/api/types'
+import type { CommonUserOption } from '@/api/types'
 import { MsgSuccess } from '@/utils/message'
 
 const props = defineProps<{
@@ -22,7 +22,7 @@ const memberForm = reactive<{ userIds: string[] }>({ userIds: [] })
 
 /* 成员选项 */
 const optionsLoading = ref(false)
-const userOptions = ref<WorkspaceMemberOption[]>([])
+const userOptions = ref<CommonUserOption[]>([])
 let searchTimer: ReturnType<typeof setTimeout> | null = null
 function loadUserOptions(query?: string) {
   optionsLoading.value = true
@@ -54,7 +54,7 @@ function submit() {
       .then(() => {
         MsgSuccess('添加成功')
         emit('refresh')
-        close()
+        visible.value = false
       })
       .finally(() => {
         loading.value = false
@@ -67,11 +67,6 @@ function open() {
   loadUserOptions()
 }
 
-function close() {
-  visible.value = false
-  resetData()
-}
-
 function resetData() {
   memberForm.userIds = []
   loading.value = false
@@ -114,7 +109,7 @@ defineExpose({ open })
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="close">取消</el-button>
+      <el-button @click="visible = false">取消</el-button>
       <el-button type="primary" :loading="loading" @click="submit">添加</el-button>
     </template>
   </MkDialog>
diff --git a/ui/src/views/system/identity/groups/dialog/CreateOrUpdateGroupDialog.vue b/ui/src/views/system/identity/groups/dialog/CreateOrUpdateGroupDialog.vue
index 6fed329fd2c..1b3f734a1e3 100644
--- a/ui/src/views/system/identity/groups/dialog/CreateOrUpdateGroupDialog.vue
+++ b/ui/src/views/system/identity/groups/dialog/CreateOrUpdateGroupDialog.vue
@@ -38,7 +38,7 @@ function submit() {
       .then((group) => {
         MsgSuccess(groupForm.id ? '重命名成功' : '创建成功')
         emit('refresh', group)
-        close()
+        visible.value = false
       })
       .finally(() => {
         loading.value = false
@@ -46,11 +46,6 @@ function submit() {
   })
 }
 
-function close() {
-  visible.value = false
-  resetData()
-}
-
 function resetData() {
   Object.assign(groupForm, { name: '' })
   loading.value = false
@@ -78,7 +73,7 @@ defineExpose({ open })
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="close">取消</el-button>
+      <el-button @click="visible = false">取消</el-button>
       <el-button type="primary" :loading="loading" @click="submit">
         {{ groupForm.id ? '保存' : '创建' }}
       </el-button>
diff --git a/ui/src/views/system/identity/resource-authorization/ResourceAuthorizationView.vue b/ui/src/views/system/identity/resource-authorization/ResourceAuthorizationView.vue
index 0b13fd5d09b..3b9b37f7330 100644
--- a/ui/src/views/system/identity/resource-authorization/ResourceAuthorizationView.vue
+++ b/ui/src/views/system/identity/resource-authorization/ResourceAuthorizationView.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
-import { computed, onMounted, ref, watch } from 'vue'
-import { useRoute } from 'vue-router'
+import { onMounted, ref } from 'vue'
 import WorkspaceApi from '@/api/admin/system/workspace'
 import CommonSystemApi from '@/api/admin/system/common'
 import ResourceAuthorizationApi from '@/api/admin/system/resource-authorization'
@@ -9,117 +8,61 @@ import type {
   ResourceAuthorizationType,
   ResourcePermissionItem,
   ResourcePermissionPayload,
-  WorkspaceMemberOption,
+  CommonUserOption,
   WorkspaceItem,
 } from '@/api/types'
-import { perm } from '@/permission'
 import { useStore } from '@/stores'
 import { MsgSuccess } from '@/utils/message'
 import WorkspaceDropdown from '@/components/business/workspace-dropdown/index.vue'
 import MkSearchList from '@/components/mk-search-list/index.vue'
 import PermissionTable from './components/PermissionTable.vue'
-import { RESOURCE_AUTHORIZATION_LABELS } from './constants'
 
-const route = useRoute()
 const { auth } = useStore()
 
-const resourceType = computed<ResourceAuthorizationType>(
-  () => route.meta.resource ?? RESOURCE_TYPE.APPLICATION,
-)
-const resourceLabel = computed(() => RESOURCE_AUTHORIZATION_LABELS[resourceType.value])
-const canEditPermissions = computed(() => {
-  const permissionKey = resourceType.value.toLowerCase() as Lowercase<ResourceAuthorizationType>
-  return perm.authorization[permissionKey].edit()
-})
+const resourceType = ref<ResourceAuthorizationType>(RESOURCE_TYPE.APPLICATION)
 
-/* 工作空间与成员 */
+/* 选择工作空间列表 */
 const loadingView = ref(false)
-const loadingMembers = ref(false)
-const workspaceOptions = ref<WorkspaceItem[]>([])
 const selectedWorkspaceId = ref('default')
-const workspaceMembers = ref<WorkspaceMemberOption[]>([])
-const selectedMemberId = ref('')
+const workspaceOptions = ref<WorkspaceItem[]>([])
 
-function loadWorkspaceOptions() {
-  loadingView.value = true
-  return WorkspaceApi.getSystemWorkspaceList()
-    .then((workspaces) => {
-      workspaceOptions.value = workspaces
-      if (!workspaces.some(({ id }) => id === selectedWorkspaceId.value)) {
-        selectedWorkspaceId.value = workspaces[0]?.id ?? 'default'
-      }
-      return loadWorkspaceMembers()
-    })
-    .finally(() => {
-      loadingView.value = false
-    })
+function handleWorkspaceSelect(workspace: WorkspaceItem) {
+  selectedWorkspaceId.value = workspace.id ?? 'default'
+  loadWorkspaceMembers()
 }
 
-function loadWorkspaceMembers(preferredMemberId?: string) {
-  loadingMembers.value = true
-  return CommonSystemApi.getWorkspaceMembers(selectedWorkspaceId.value)
-    .then((members) => {
-      workspaceMembers.value = members
-      const memberId = preferredMemberId ?? selectedMemberId.value
-      selectedMemberId.value = members.some(({ id }) => id === memberId)
-        ? memberId
-        : (members[0]?.id ?? '')
-      return loadResourcePermissions()
-    })
-    .finally(() => {
-      loadingMembers.value = false
-    })
+function loadWorkspaceOptions() {
+  return WorkspaceApi.getSystemWorkspaceList().then((workspaces) => {
+    workspaceOptions.value = workspaces
+  })
 }
 
-function handleWorkspaceSelect(workspace: WorkspaceItem) {
-  selectedWorkspaceId.value = workspace.id ?? 'default'
-  selectedMemberId.value = ''
-  loadWorkspaceMembers()
+/* 选择用户（普通用户） */
+
+const workspaceMembers = ref<CommonUserOption[]>([])
+const selectedMemberId = ref('')
+
+function loadWorkspaceMembers() {
+  return CommonSystemApi.getWorkspaceMembers(selectedWorkspaceId.value).then((members) => {
+    workspaceMembers.value = members
+    selectedMemberId.value = members[0]?.id ?? ''
+    return loadResourcePermissions()
+  })
 }
 
-function handleMemberSelect(member: WorkspaceMemberOption) {
+function handleMemberSelect(member: CommonUserOption) {
   selectedMemberId.value = member.id
   loadResourcePermissions()
 }
 
-function getMemberRoleText(member: WorkspaceMemberOption) {
+function getMemberRoleText(member: CommonUserOption) {
   return member.roles?.join('，') ?? ''
 }
 
 /* 资源权限 */
 const loadingPermissions = ref(false)
-const savingPermissions = ref(false)
 const resourcePermissions = ref<ResourcePermissionItem[]>([])
 
-function buildResourceTree(resourceItems: ResourcePermissionItem[]) {
-  if (resourceType.value === RESOURCE_TYPE.MODEL) return resourceItems
-
-  const resourceMap = new Map(
-    resourceItems.map((resource) => [
-      resource.id,
-      {
-        ...resource,
-        children: [] as ResourcePermissionItem[],
-        permission:
-          resource.resource_type === 'folder' &&
-          resource.folder_id === null &&
-          resource.permission === RESOURCE_PERMISSION.NOT_AUTH
-            ? RESOURCE_PERMISSION.VIEW
-            : resource.permission,
-      },
-    ]),
-  )
-
-  resourceMap.forEach((resource) => {
-    if (!resource.folder_id) return
-    resourceMap.get(resource.folder_id)?.children?.push(resource)
-  })
-
-  return [...resourceMap.values()].filter(
-    ({ folder_id }) => !folder_id || !resourceMap.has(folder_id),
-  )
-}
-
 function loadResourcePermissions() {
   if (!selectedMemberId.value) {
     resourcePermissions.value = []
@@ -140,10 +83,40 @@ function loadResourcePermissions() {
     })
 }
 
+function buildResourceTree(resourceItems: ResourcePermissionItem[]) {
+  if (resourceType.value === RESOURCE_TYPE.MODEL) return resourceItems
+
+  const resources = resourceItems.map((resource) => ({
+    ...resource,
+    children: [] as ResourcePermissionItem[],
+    permission:
+      !resource.folder_id && resource.permission === RESOURCE_PERMISSION.NOT_AUTH
+        ? RESOURCE_PERMISSION.VIEW
+        : resource.permission,
+  }))
+  const resourceMap = new Map(resources.map((resource) => [resource.id, resource]))
+
+  resources.forEach((resource) => {
+    if (!resource.folder_id) return
+
+    const parentResource = resourceMap.get(resource.folder_id)
+    if (parentResource) {
+      parentResource.children.push(resource)
+    }
+  })
+
+  const defaultRoot = resourceMap.get('default')
+  if (defaultRoot && !defaultRoot.folder_id) return defaultRoot.children
+
+  return resources.filter(({ folder_id }) => !folder_id)
+}
+
+/* 保存权限 */
+
 function handlePermissionsSubmit(permissions: ResourcePermissionPayload[]) {
   if (!selectedMemberId.value) return
 
-  savingPermissions.value = true
+  loadingPermissions.value = true
   ResourceAuthorizationApi.putUserResourcePermissions(
     selectedWorkspaceId.value,
     selectedMemberId.value,
@@ -155,38 +128,35 @@ function handlePermissionsSubmit(permissions: ResourcePermissionPayload[]) {
       return loadResourcePermissions()
     })
     .finally(() => {
-      savingPermissions.value = false
+      loadingPermissions.value = false
     })
 }
 
-watch(resourceType, () => loadResourcePermissions())
-onMounted(() => loadWorkspaceOptions())
+onMounted(() => {
+  loadingView.value = true
+  Promise.all(
+    auth.isEE ? [loadWorkspaceOptions(), loadWorkspaceMembers()] : [loadWorkspaceMembers()],
+  ).finally(() => {
+    loadingView.value = false
+  })
+})
 </script>
 
 <template>
   <MkViewLayout class="system-resource-authorization" :loading="loadingView">
-    <template #top>
-      <div class="flex items-center gap-4">
-        <el-breadcrumb separator="/">
-          <el-breadcrumb-item>资源授权</el-breadcrumb-item>
-          <el-breadcrumb-item>{{ resourceLabel }}</el-breadcrumb-item>
-        </el-breadcrumb>
-        <el-divider v-if="auth.isEE" direction="vertical" />
-        <WorkspaceDropdown
-          v-if="auth.isEE"
-          v-model="selectedWorkspaceId"
-          :options="workspaceOptions"
-          @select="handleWorkspaceSelect"
-        />
-      </div>
+    <template #top v-if="auth.isEE">
+      <WorkspaceDropdown
+        v-model="selectedWorkspaceId"
+        :options="workspaceOptions"
+        @select="handleWorkspaceSelect"
+      />
     </template>
 
     <template #aside="{ Header }">
       <component :is="Header">
-        <h4>成员</h4>
+        <h4>按用户</h4>
       </component>
       <MkSearchList
-        v-loading="loadingMembers"
         :data="workspaceMembers"
         :default-active="selectedMemberId"
         :props="{ label: 'nick_name', value: 'id' }"
@@ -209,18 +179,14 @@ onMounted(() => loadWorkspaceOptions())
 
     <template #default="{ Header }">
       <component :is="Header">
-        <h4>{{ resourceLabel }}权限配置</h4>
+        <h4>资源权限配置</h4>
       </component>
       <PermissionTable
-        v-if="selectedMemberId"
-        v-loading="loadingPermissions || savingPermissions"
-        :allow-role="auth.isEE || auth.isPE"
+        v-loading="loadingPermissions"
         :data="resourcePermissions"
-        :editable="canEditPermissions"
         :resource-type="resourceType"
         @submit="handlePermissionsSubmit"
       />
-      <MkEmpty v-else description="当前工作空间暂无成员" class="mt-20" />
     </template>
   </MkViewLayout>
 </template>
diff --git a/ui/src/views/system/identity/resource-authorization/components/PermissionTable.vue b/ui/src/views/system/identity/resource-authorization/components/PermissionTable.vue
index 8ab8f779495..93c03a684f6 100644
--- a/ui/src/views/system/identity/resource-authorization/components/PermissionTable.vue
+++ b/ui/src/views/system/identity/resource-authorization/components/PermissionTable.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, ref, watch } from 'vue'
+import { computed, ref, useTemplateRef, watch } from 'vue'
 import ProviderApi from '@/api/admin/workspace/model/provider'
 import { RESOURCE_TYPE, RESOURCE_PERMISSION } from '@/api/enums'
 import type {
@@ -13,13 +13,12 @@ import type {
 } from '@/api/types'
 import { resetUrl } from '@/utils/common'
 import { getPermissionOptions } from '../constants'
+import BatchSetPermissionDialog from '../dialog/BatchSetPermissionDialog.vue'
 
 defineOptions({ name: 'ResourcePermissionTable' })
 
 const props = defineProps<{
-  allowRole: boolean
   data: ResourcePermissionItem[]
-  editable: boolean
   resourceType: ResourceAuthorizationType
 }>()
 const emit = defineEmits<{
@@ -30,7 +29,8 @@ const permissionSearchFields = computed<OptionItem<string>[]>(() => [
   { label: '名称', value: 'name' },
   {
     label: '权限',
-    options: getPermissionOptions({ allowRole: props.allowRole }),
+    multiple: true,
+    options: getPermissionOptions(),
     value: 'permission',
   },
 ])
@@ -43,15 +43,15 @@ function handleSearch(query?: RequestParams) {
 
 function filterResourceTree(resources: ResourcePermissionItem[]): ResourcePermissionItem[] {
   const name = typeof searchQuery.value?.name === 'string' ? searchQuery.value.name.trim() : ''
-  const permission = searchQuery.value?.permission as ResourcePermission | undefined
-  if (!name && !permission) return resources
+  const permissions = searchQuery.value?.permission as ResourcePermission[] | undefined
+  if (!name && !permissions?.length) return resources
 
   return resources.flatMap((resource) => {
     const children = filterResourceTree(resource.children ?? [])
     const matchesName = name
       ? resource.name.toLocaleLowerCase().includes(name.toLocaleLowerCase())
       : true
-    const matchesPermission = permission ? resource.permission === permission : true
+    const matchesPermission = permissions?.length ? permissions.includes(resource.permission) : true
 
     return (matchesName && matchesPermission) || children.length ? [{ ...resource, children }] : []
   })
@@ -75,37 +75,6 @@ const expandedResourceIds = computed(() => {
 })
 
 /* 权限选项 */
-function getRowPermissionOptions(resource: ResourcePermissionItem) {
-  const isFolder = resource.resource_type === 'folder'
-  return getPermissionOptions({
-    allowRole: props.allowRole,
-    isFolder,
-    isRootFolder: isFolder && resource.folder_id === null,
-  })
-}
-
-const selectedResources = ref<ResourcePermissionItem[]>([])
-const tableRef = ref<{ clearSelection: () => void }>()
-const batchPermissionOptions = computed(() => {
-  const hasRootFolder = selectedResources.value.some(
-    ({ folder_id, resource_type }) => resource_type === 'folder' && folder_id === null,
-  )
-  const hasFolder = selectedResources.value.some(({ resource_type }) => resource_type === 'folder')
-  return getPermissionOptions({
-    allowRole: props.allowRole,
-    isFolder: hasFolder,
-    isRootFolder: hasRootFolder,
-  })
-})
-
-function handleSelectionChange(selection: unknown[]) {
-  selectedResources.value = selection as ResourcePermissionItem[]
-}
-
-/* 单项授权的目录级联 */
-function collectDescendants(resource: ResourcePermissionItem): ResourcePermissionItem[] {
-  return (resource.children ?? []).flatMap((child) => [child, ...collectDescendants(child)])
-}
 
 function flattenResources(resources: ResourcePermissionItem[]): ResourcePermissionItem[] {
   return resources.flatMap((resource) => [resource, ...flattenResources(resource.children ?? [])])
@@ -132,7 +101,7 @@ function buildPermissionPayload(permission: ResourcePermission, resource: Resour
   ])
 
   if (permission === RESOURCE_PERMISSION.NOT_AUTH && resource.resource_type === 'folder') {
-    collectDescendants(resource).forEach(({ id }) => {
+    flattenResources(resource.children ?? []).forEach(({ id }) => {
       payloadMap.set(id, { permission: RESOURCE_PERMISSION.NOT_AUTH, target_id: id })
     })
   } else if (permission !== RESOURCE_PERMISSION.NOT_AUTH) {
@@ -149,35 +118,31 @@ function handlePermissionChange(permission: ResourcePermission, resource: Resour
 }
 
 /* 批量授权 */
-const batchDialogVisible = ref(false)
-const batchPermission = ref<ResourcePermission>()
+const tableRef = ref<{ clearSelection: () => void }>()
+const batchSelectedResources = ref<ResourcePermissionItem[]>([])
 
-function resetBatchDialog() {
-  batchPermission.value = undefined
+function handleSelectionChange(selection: unknown[]) {
+  batchSelectedResources.value = selection as ResourcePermissionItem[]
 }
 
-function handleOpenBatchDialog() {
-  if (selectedResources.value.length) batchDialogVisible.value = true
-}
+const batchPermissionDialogRef = useTemplateRef<InstanceType<typeof BatchSetPermissionDialog>>(
+  'batchPermissionDialogRef',
+)
 
-function handleCloseBatchDialog() {
-  batchDialogVisible.value = false
-  resetBatchDialog()
+function handleOpenBatchDialog() {
+  batchPermissionDialogRef.value?.open()
 }
 
-function handleBatchSubmit() {
-  if (!batchPermission.value) return
-
+function handleBatchSubmit(permission: ResourcePermission) {
   const payloadMap = new Map<string, ResourcePermissionPayload>()
-  selectedResources.value.forEach((resource) => {
-    buildPermissionPayload(batchPermission.value!, resource).forEach((payload, id) => {
+  batchSelectedResources.value.forEach((resource) => {
+    buildPermissionPayload(permission, resource).forEach((payload, id) => {
       payloadMap.set(id, payload)
     })
   })
   emit('submit', [...payloadMap.values()])
   tableRef.value?.clearSelection()
-  selectedResources.value = []
-  handleCloseBatchDialog()
+  batchSelectedResources.value = []
 }
 
 /* 模型供应商图标 */
@@ -200,7 +165,15 @@ watch(
 
 <template>
   <div class="flex min-h-0 flex-1 flex-col">
-    <div class="mb-4 flex justify-end">
+    <div class="mb-4 flex-between">
+      <el-button
+        type="primary"
+        :disabled="batchSelectedResources.length === 0"
+        @click="handleOpenBatchDialog"
+      >
+        <MkIcon name="icon-lock" />
+        <span>配置权限</span>
+      </el-button>
       <MkComplexSearch :fields="permissionSearchFields" @change="handleSearch" />
     </div>
 
@@ -208,18 +181,18 @@ watch(
       ref="tableRef"
       :data="filteredResources"
       :expand-row-keys="expandedResourceIds"
-      :max-table-height="250"
+      :max-table-height="300"
       show-overflow-tooltip
       @selection-change="handleSelectionChange"
     >
-      <el-table-column v-if="editable" type="selection" width="48" reserve-selection />
-      <el-table-column label="名称" min-width="260" prop="name">
+      <el-table-column type="selection" width="40" reserve-selection />
+      <el-table-column class-name="resource-name-column" label="名称" min-width="260" prop="name">
         <template #default="{ row }: { row: ResourcePermissionItem }">
           <div class="flex min-w-0 items-center gap-2">
             <MkIcon
               v-if="row.resource_type === 'folder'"
               name="icon_file-folder_colorful"
-              :size="20"
+              :size="18"
             />
             <span
               v-else-if="resourceType === RESOURCE_TYPE.MODEL"
@@ -232,73 +205,43 @@ watch(
               :size="20"
               :type="row.tool_type ?? undefined"
             />
+
             <el-avatar
-              v-else-if="resourceType === RESOURCE_TYPE.APPLICATION && row.icon"
+              v-else-if="resourceType === RESOURCE_TYPE.APPLICATION"
               class="bg-transparent!"
               shape="square"
               :size="20"
             >
-              <img :src="resetUrl(row.icon)" alt="" />
+              <img :src="resetUrl(row?.icon, true)" />
             </el-avatar>
-            <MkIcon
-              v-else
-              :name="
-                resourceType === RESOURCE_TYPE.KNOWLEDGE
-                  ? 'icon_book_filled'
-                  : 'icon_robot_filled'
-              "
-              :size="20"
-              class="text-primary!"
-            />
             <span class="min-w-0 truncate" :title="row.name">{{ row.name }}</span>
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="权限" min-width="360">
+      <el-table-column label="操作权限" width="450">
         <template #default="{ row }: { row: ResourcePermissionItem }">
           <el-radio-group
-            :disabled="!editable"
             :model-value="row.permission"
             @change="handlePermissionChange($event as ResourcePermission, row)"
           >
-            <el-radio
-              v-for="permissionOption in getRowPermissionOptions(row)"
+            <template
+              v-for="permissionOption in getPermissionOptions()"
               :key="permissionOption.value"
-              :value="permissionOption.value"
             >
-              {{ permissionOption.label }}
-            </el-radio>
+              <el-radio :value="permissionOption.value">{{ permissionOption.label }}</el-radio>
+            </template>
           </el-radio-group>
         </template>
       </el-table-column>
-
-      <template #footer-batch-actions>
-        <el-button type="primary" @click="handleOpenBatchDialog">配置权限</el-button>
-      </template>
     </MkTable>
 
-    <MkDialog v-model="batchDialogVisible" title="配置权限" width="480" @closed="resetBatchDialog">
-      <el-radio-group v-model="batchPermission" class="flex! flex-col! items-stretch! gap-3">
-        <el-radio
-          v-for="permissionOption in batchPermissionOptions"
-          :key="permissionOption.value"
-          :value="permissionOption.value"
-          class="m-0! h-auto! items-start!"
-        >
-          <div>
-            <p>{{ permissionOption.label }}</p>
-            <p v-if="permissionOption.description" class="text-N600">
-              {{ permissionOption.description }}
-            </p>
-          </div>
-        </el-radio>
-      </el-radio-group>
-      <template #footer>
-        <el-button @click="handleCloseBatchDialog">取消</el-button>
-        <el-button type="primary" :disabled="!batchPermission" @click="handleBatchSubmit">
-          确认
-        </el-button>
-      </template>
-    </MkDialog>
+    <BatchSetPermissionDialog ref="batchPermissionDialogRef" @submit="handleBatchSubmit" />
   </div>
 </template>
+
+<style scoped lang="scss">
+:deep(.resource-name-column .cell) {
+  align-items: center;
+  display: flex;
+}
+</style>
diff --git a/ui/src/views/system/identity/resource-authorization/constants.ts b/ui/src/views/system/identity/resource-authorization/constants.ts
index ebb29cef011..b73d9101157 100644
--- a/ui/src/views/system/identity/resource-authorization/constants.ts
+++ b/ui/src/views/system/identity/resource-authorization/constants.ts
@@ -1,5 +1,7 @@
 import { RESOURCE_TYPE, RESOURCE_PERMISSION } from '@/api/enums'
 import type { OptionItem, ResourceAuthorizationType, ResourcePermission } from '@/api/types'
+import { useStore } from '@/stores'
+const { auth } = useStore()
 
 export const RESOURCE_AUTHORIZATION_LABELS: Record<ResourceAuthorizationType, string> = {
   [RESOURCE_TYPE.APPLICATION]: '智能体',
@@ -12,15 +14,7 @@ interface PermissionOption extends OptionItem<ResourcePermission> {
   description: string
 }
 
-export function getPermissionOptions({
-  allowRole,
-  isFolder = false,
-  isRootFolder = false,
-}: {
-  allowRole: boolean
-  isFolder?: boolean
-  isRootFolder?: boolean
-}): PermissionOption[] {
+export function getPermissionOptions(): PermissionOption[] {
   const permissionOptions: PermissionOption[] = [
     {
       description: '',
@@ -33,22 +27,18 @@ export function getPermissionOptions({
       value: RESOURCE_PERMISSION.VIEW,
     },
     {
-      description: '可对该资源进行修改和删除操作',
+      description: '可对该资源进行删改操作',
       label: '管理',
       value: RESOURCE_PERMISSION.MANAGE,
     },
-  ]
-
-  if (isRootFolder) {
-    return permissionOptions.filter(({ value }) => value !== RESOURCE_PERMISSION.NOT_AUTH)
-  }
-
-  if (allowRole && !isFolder) {
-    permissionOptions.push({
-      description: '根据用户角色决定对该资源的操作权限',
+    {
+      description: '根据用户角色中的权限授权用户对该资源的操作权限',
       label: '按用户角色',
       value: RESOURCE_PERMISSION.ROLE,
-    })
+    },
+  ]
+  if (auth.isCE) {
+    return permissionOptions.filter((item) => item.value !== RESOURCE_PERMISSION.ROLE)
   }
 
   return permissionOptions
diff --git a/ui/src/views/system/identity/resource-authorization/dialog/BatchSetPermissionDialog.vue b/ui/src/views/system/identity/resource-authorization/dialog/BatchSetPermissionDialog.vue
new file mode 100644
index 00000000000..ece3dff46fe
--- /dev/null
+++ b/ui/src/views/system/identity/resource-authorization/dialog/BatchSetPermissionDialog.vue
@@ -0,0 +1,54 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import type { ResourcePermission } from '@/api/types'
+import { getPermissionOptions } from '../constants'
+
+defineOptions({ name: 'BatchSetPermissionDialog' })
+
+const emit = defineEmits<{
+  submit: [permission: ResourcePermission]
+}>()
+
+const visible = ref(false)
+const permission = ref<ResourcePermission>()
+
+function open() {
+  visible.value = true
+}
+
+function resetData() {
+  permission.value = undefined
+}
+
+function handleSubmit() {
+  if (!permission.value) return
+
+  emit('submit', permission.value)
+  visible.value = false
+}
+
+defineExpose({ open })
+</script>
+
+<template>
+  <MkDialog v-model="visible" title="配置权限" @closed="resetData">
+    <el-radio-group v-model="permission" class="vertical-radio-group">
+      <el-radio
+        v-for="permissionOption in getPermissionOptions()"
+        :key="permissionOption.value"
+        :value="permissionOption.value"
+      >
+        <p>{{ permissionOption.label }}</p>
+        <p v-if="permissionOption.description" class="text-N500 mt-1">
+          {{ permissionOption.description }}
+        </p>
+      </el-radio>
+    </el-radio-group>
+    <template #footer>
+      <el-button @click="visible = false">取消</el-button>
+      <el-button type="primary" :disabled="!permission" @click="handleSubmit">确认</el-button>
+    </template>
+  </MkDialog>
+</template>
+
+<style scoped lang="scss"></style>
diff --git a/ui/src/views/system/identity/roles/AddMemberDrawer.vue b/ui/src/views/system/identity/roles/AddMemberDrawer.vue
index 1eb10bf96f5..5e3ffac6d8b 100644
--- a/ui/src/views/system/identity/roles/AddMemberDrawer.vue
+++ b/ui/src/views/system/identity/roles/AddMemberDrawer.vue
@@ -81,7 +81,7 @@ function submit() {
       .then(() => {
         MsgSuccess('添加成功')
         emit('refresh')
-        close()
+        visible.value = false
       })
       .finally(() => {
         loading.value = false
@@ -89,11 +89,6 @@ function submit() {
   })
 }
 
-function close() {
-  visible.value = false
-  resetData()
-}
-
 function resetData() {
   memberForm.members = []
   loading.value = false
@@ -189,7 +184,7 @@ defineExpose({ open })
     </el-form>
 
     <template #footer>
-      <el-button @click="close">取消</el-button>
+      <el-button @click="visible = false">取消</el-button>
       <el-button type="primary" :loading="loading" @click="submit">添加</el-button>
     </template>
   </MkDrawer>
diff --git a/ui/src/views/system/identity/roles/dialog/CreateOrUpdateRoleDialog.vue b/ui/src/views/system/identity/roles/dialog/CreateOrUpdateRoleDialog.vue
index 19e9d7dc519..a344beffc68 100644
--- a/ui/src/views/system/identity/roles/dialog/CreateOrUpdateRoleDialog.vue
+++ b/ui/src/views/system/identity/roles/dialog/CreateOrUpdateRoleDialog.vue
@@ -30,7 +30,7 @@ function submit() {
       .then((role) => {
         MsgSuccess(roleForm.role_id ? '重命名成功' : '创建成功')
         emit('refresh', role)
-        close()
+        visible.value = false
       })
       .finally(() => {
         loading.value = false
@@ -46,10 +46,6 @@ function open(role?: RoleItem) {
   visible.value = true
 }
 
-function close() {
-  visible.value = false
-  resetData()
-}
 function resetData() {
   roleForm.role_id = undefined
   roleForm.role_name = ''
@@ -87,7 +83,7 @@ defineExpose({ open })
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="close">取消</el-button>
+      <el-button @click="visible = false">取消</el-button>
       <el-button type="primary" :loading="loading" @click="submit">{{
         roleForm.role_id ? '保存' : '创建'
       }}</el-button>
diff --git a/ui/src/views/system/identity/users/UserFromDrawer.vue b/ui/src/views/system/identity/users/UserFromDrawer.vue
index 99d19a1e76d..8fce8e28f7c 100644
--- a/ui/src/views/system/identity/users/UserFromDrawer.vue
+++ b/ui/src/views/system/identity/users/UserFromDrawer.vue
@@ -123,7 +123,7 @@ async function submitUser() {
           .then(() => {
             MsgSuccess('编辑成功')
             emit('refresh', false)
-            close()
+            drawerVisible.value = false
           })
           .finally(() => {
             userSubmitting.value = false
@@ -140,7 +140,7 @@ async function submitUser() {
           .then(() => {
             MsgSuccess('创建成功')
             emit('refresh', true)
-            close()
+            drawerVisible.value = false
           })
           .finally(() => {
             userSubmitting.value = false
@@ -178,11 +178,6 @@ function open(user?: SystemUser) {
   drawerVisible.value = true
 }
 
-function close() {
-  drawerVisible.value = false
-  resetData()
-}
-
 function resetData() {
   Object.assign(userForm, {
     email: '',
@@ -342,7 +337,7 @@ defineExpose({ open })
     </el-form>
 
     <template #footer>
-      <el-button @click="close">取消</el-button>
+      <el-button @click="drawerVisible = false">取消</el-button>
       <el-button :loading="userSubmitting" type="primary" @click="submitUser">
         {{ submitText }}
       </el-button>
diff --git a/ui/src/views/system/identity/users/dialog/BatchSetUserRoleDialog.vue b/ui/src/views/system/identity/users/dialog/BatchSetUserRoleDialog.vue
index cb6ca28d9d2..b06dab37443 100644
--- a/ui/src/views/system/identity/users/dialog/BatchSetUserRoleDialog.vue
+++ b/ui/src/views/system/identity/users/dialog/BatchSetUserRoleDialog.vue
@@ -100,7 +100,7 @@ function submitBatchSetUserRoles() {
       .then(() => {
         MsgSuccess('设置成功')
         emit('refresh')
-        close()
+        dialogVisible.value = false
       })
       .finally(() => {
         submitting.value = false
@@ -114,11 +114,6 @@ function open(userIds: string[]) {
   loadRoleSettingOptions()
 }
 
-function close() {
-  dialogVisible.value = false
-  resetData()
-}
-
 function resetData() {
   Object.assign(batchRoleForm, {
     ids: [],
@@ -229,7 +224,7 @@ defineExpose({ open })
     </el-form>
 
     <template #footer>
-      <el-button @click="close">取消</el-button>
+      <el-button @click="dialogVisible = false">取消</el-button>
       <el-button type="primary" :loading="submitting" @click="submitBatchSetUserRoles">
         保存
       </el-button>
diff --git a/ui/src/views/system/identity/users/dialog/UserPwdDialog.vue b/ui/src/views/system/identity/users/dialog/UserPwdDialog.vue
index e8ce29f115c..07301e25ebb 100644
--- a/ui/src/views/system/identity/users/dialog/UserPwdDialog.vue
+++ b/ui/src/views/system/identity/users/dialog/UserPwdDialog.vue
@@ -76,7 +76,7 @@ async function submitPassword() {
           return router.push({ name: 'login' }).then(() => undefined)
         }
         emit('refresh')
-        close()
+        dialogVisible.value = false
       })
       .finally(() => {
         passwordSubmitting.value = false
@@ -84,11 +84,6 @@ async function submitPassword() {
   })
 }
 
-function close() {
-  dialogVisible.value = false
-  resetData()
-}
-
 function resetData() {
   Object.assign(userPasswordForm, { password: '', re_password: '' })
   passwordSubmitting.value = false
@@ -131,7 +126,7 @@ defineExpose({ open })
     </el-form>
 
     <template #footer>
-      <el-button @click="close">取消</el-button>
+      <el-button @click="dialogVisible = false">取消</el-button>
       <el-button :loading="passwordSubmitting" type="primary" @click="submitPassword">
         保存
       </el-button>
diff --git a/ui/src/views/system/identity/workspaces/AddMemberDrawer.vue b/ui/src/views/system/identity/workspaces/AddMemberDrawer.vue
index 5f818d610d3..214d7abf978 100644
--- a/ui/src/views/system/identity/workspaces/AddMemberDrawer.vue
+++ b/ui/src/views/system/identity/workspaces/AddMemberDrawer.vue
@@ -86,7 +86,7 @@ function submit() {
       .then(() => {
         MsgSuccess('添加成功')
         emit('refresh')
-        close()
+        visible.value = false
       })
       .finally(() => {
         loading.value = false
@@ -94,11 +94,6 @@ function submit() {
   })
 }
 
-function close() {
-  visible.value = false
-  resetData()
-}
-
 function resetData() {
   memberForm.members = []
   loading.value = false
@@ -193,7 +188,7 @@ defineExpose({ open })
     </el-form>
 
     <template #footer>
-      <el-button @click="close">取消</el-button>
+      <el-button @click="visible = false">取消</el-button>
       <el-button type="primary" :loading="loading" @click="submit">添加</el-button>
     </template>
   </MkDrawer>
diff --git a/ui/src/views/system/identity/workspaces/WorkspaceListView.vue b/ui/src/views/system/identity/workspaces/WorkspaceListView.vue
index 3bd99aa9800..e1d3dc0ad59 100644
--- a/ui/src/views/system/identity/workspaces/WorkspaceListView.vue
+++ b/ui/src/views/system/identity/workspaces/WorkspaceListView.vue
@@ -266,7 +266,7 @@ onMounted(() => loadWorkspaceOptions())
           :row-key="getWorkspaceMemberRowKey"
           :isSearching="Boolean(memberSearchQuery)"
         >
-          <el-table-column type="selection" width="64" />
+          <el-table-column type="selection" width="40" />
           <el-table-column prop="nick_name" label="姓名" />
           <el-table-column prop="username" label="用户名" />
           <el-table-column prop="role_name" label="角色" class-name="border-l!" />
diff --git a/ui/src/views/system/identity/workspaces/dialog/CreateOrUpdateWorkspaceDialog.vue b/ui/src/views/system/identity/workspaces/dialog/CreateOrUpdateWorkspaceDialog.vue
index c2924a67f97..388f7fb265e 100644
--- a/ui/src/views/system/identity/workspaces/dialog/CreateOrUpdateWorkspaceDialog.vue
+++ b/ui/src/views/system/identity/workspaces/dialog/CreateOrUpdateWorkspaceDialog.vue
@@ -35,7 +35,7 @@ function submit() {
       .then(() => {
         MsgSuccess(workspaceForm.id ? '重命名成功' : '创建成功')
         emit('refresh', workspaceForm?.id || undefined)
-        close()
+        dialogVisible.value = false
       })
       .finally(() => {
         loading.value = false
@@ -43,11 +43,6 @@ function submit() {
   })
 }
 
-function close() {
-  dialogVisible.value = false
-  resetData()
-}
-
 function resetData() {
   Object.assign(workspaceForm, {
     name: '',
@@ -83,7 +78,7 @@ defineExpose({ open })
     </el-form>
 
     <template #footer>
-      <el-button @click="close">取消</el-button>
+      <el-button @click="dialogVisible = false">取消</el-button>
       <el-button type="primary" :loading="loading" @click="submit">
         {{ workspaceForm.id ? '保存' : '创建' }}
       </el-button>
diff --git a/ui/src/views/system/settings/authentication/EditSCANDrawer.vue b/ui/src/views/system/settings/authentication/EditSCANDrawer.vue
index fc9815515f7..9f59706e740 100644
--- a/ui/src/views/system/settings/authentication/EditSCANDrawer.vue
+++ b/ui/src/views/system/settings/authentication/EditSCANDrawer.vue
@@ -34,7 +34,7 @@ function submit() {
       .then(() => {
         MsgSuccess('保存成功')
         emit('refresh')
-        close()
+        visible.value = false
       })
       .finally(() => {
         loading.value = false
@@ -47,7 +47,6 @@ function handleValidatePlatform() {
   loading.value = true
   return AuthScanApi.postValidateQrLoginPlatform(form)
     .then((res) => {
-      // TODO: 校验判断有误
       res ? MsgSuccess('校验成功') : MsgError('校验失败')
     })
     .finally(() => {
@@ -60,11 +59,6 @@ function open(platform: QrLoginPlatformPayload) {
   visible.value = true
 }
 
-function close() {
-  visible.value = false
-  resetData()
-}
-
 function resetData() {
   Object.assign(form, { key: LOGIN_METHOD.WECOM, isActive: false, config: {} })
   formRef.value?.resetFields()
@@ -98,7 +92,7 @@ defineExpose({ open })
     </el-form>
 
     <template #footer>
-      <el-button @click="close">取消</el-button>
+      <el-button @click="visible = false">取消</el-button>
       <el-button @click="handleValidatePlatform">校验</el-button>
       <el-button type="primary" @click="submit">保存</el-button>
     </template>
diff --git a/ui/src/views/tool/ToolDebugDrawer.vue b/ui/src/views/tool/ToolDebugDrawer.vue
index 37d243e670a..c49d841c69a 100644
--- a/ui/src/views/tool/ToolDebugDrawer.vue
+++ b/ui/src/views/tool/ToolDebugDrawer.vue
@@ -89,11 +89,6 @@ function open(tool: ToolPayload) {
   nextTick(() => formRef.value?.clearValidate())
 }
 
-function close() {
-  visible.value = false
-  resetData()
-}
-
 function getInitFieldType(field: ToolInitField) {
   if (field.input_type === 'PasswordInput') return 'password'
   if (field.input_type === 'JsonInput') return 'textarea'
@@ -130,7 +125,7 @@ function handleRun() {
   })
 }
 
-defineExpose({ open, close })
+defineExpose({ open })
 </script>
 
 <template>
@@ -145,7 +140,7 @@ defineExpose({ open, close })
   >
     <template #header>
       <div class="flex items-center gap-1">
-        <el-button link @click="close">
+        <el-button link @click="visible = false">
           <MkIcon :icon="Back" :size="20" />
         </el-button>
         <h4>调试</h4>
@@ -222,7 +217,7 @@ defineExpose({ open, close })
     </section>
 
     <template #footer>
-      <el-button @click="close">返回</el-button>
+      <el-button @click="visible = false">返回</el-button>
       <el-button type="primary" :loading="loading" @click="handleRun">运行</el-button>
     </template>
   </MkDrawer>
diff --git a/ui/src/views/tool/components/ToolCreateDropdown.vue b/ui/src/views/tool/components/ToolCreateDropdown.vue
index f841a3d24d0..266f5e907ca 100644
--- a/ui/src/views/tool/components/ToolCreateDropdown.vue
+++ b/ui/src/views/tool/components/ToolCreateDropdown.vue
@@ -5,7 +5,7 @@ import ToolApi from '@/api/admin/workspace/tool/tool'
 import { TOOL_TYPE } from '@/api/enums'
 import { useStore } from '@/stores'
 import { MsgSuccess } from '@/utils/message'
-import ToolFormDrawer from '@/views/tool/create-form/ToolFormDrawer.vue'
+import ToolFormDrawer from '@/views/tool/form/ToolFormDrawer.vue'
 
 defineOptions({ name: 'ToolCreateDropdown' })
 
diff --git a/ui/src/views/tool/create-form/ToolFormDrawer.vue b/ui/src/views/tool/form/ToolFormDrawer.vue
similarity index 96%
rename from ui/src/views/tool/create-form/ToolFormDrawer.vue
rename to ui/src/views/tool/form/ToolFormDrawer.vue
index 268747ca540..004027db536 100644
--- a/ui/src/views/tool/create-form/ToolFormDrawer.vue
+++ b/ui/src/views/tool/form/ToolFormDrawer.vue
@@ -61,7 +61,7 @@ function handleSubmit() {
     request
       .then(() => {
         MsgSuccess(editId.value ? '保存成功' : '创建成功')
-        close()
+        visible.value = false
         emit('refresh')
       })
       .finally(() => {
@@ -92,22 +92,19 @@ function open(tool?: ToolItem) {
 
 function handleBeforeClose() {
   if (JSON.stringify(toolForm) === originalForm.value) {
-    close()
+    visible.value = false
     return
   }
   MsgConfirm('提示？', '当前的更改尚未保存，确认退出吗？', {
     confirmButtonText: '确认',
     confirmButtonType: 'primary',
   })
-    .then(() => close())
+    .then(() => {
+      visible.value = false
+    })
     .catch(() => {})
 }
 
-function close() {
-  visible.value = false
-  resetData()
-}
-
 function resetData() {
   Object.assign(toolForm, {
     name: '',
@@ -123,7 +120,7 @@ function resetData() {
   formRef.value?.clearValidate()
 }
 
-defineExpose({ open, close })
+defineExpose({ open })
 </script>
 
 <template>
@@ -146,7 +143,7 @@ defineExpose({ open, close })
       <h4 class="mk-title-decoration mb-4">基本信息</h4>
       <el-form-item label="名称" prop="name">
         <div class="flex w-full items-center gap-3">
-          <!-- // TODO -->
+          <!-- // TODO 头像 统一修改组件-->
           <ToolIcon :size="32" />
           <el-input
             v-model="toolForm.name"
diff --git a/ui/src/views/tool/create-form/components/init-field/InitFieldDialog.vue b/ui/src/views/tool/form/components/init-field/InitFieldDialog.vue
similarity index 95%
rename from ui/src/views/tool/create-form/components/init-field/InitFieldDialog.vue
rename to ui/src/views/tool/form/components/init-field/InitFieldDialog.vue
index ffc34b6ed7c..04135c17219 100644
--- a/ui/src/views/tool/create-form/components/init-field/InitFieldDialog.vue
+++ b/ui/src/views/tool/form/components/init-field/InitFieldDialog.vue
@@ -42,11 +42,6 @@ function open(field?: ToolInitField) {
   nextTick(() => formRef.value?.clearValidate())
 }
 
-function close() {
-  visible.value = false
-  resetData()
-}
-
 function resetData() {
   isEdit.value = false
   Object.assign(initFieldForm, {
@@ -65,11 +60,11 @@ function handleSubmit() {
     if (!valid) return
 
     emit('refresh', structuredClone(toRaw(initFieldForm)))
-    close()
+    visible.value = false
   })
 }
 
-defineExpose({ open, close })
+defineExpose({ open })
 </script>
 
 <template>
@@ -114,7 +109,7 @@ defineExpose({ open, close })
       <el-form-item label="必填"><el-switch v-model="initFieldForm.required" /></el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="close">取消</el-button>
+      <el-button @click="visible = false">取消</el-button>
       <el-button type="primary" @click="handleSubmit">{{ isEdit ? '保存' : '添加' }}</el-button>
     </template>
   </MkDialog>
diff --git a/ui/src/views/tool/create-form/components/init-field/InitFieldTable.vue b/ui/src/views/tool/form/components/init-field/InitFieldTable.vue
similarity index 100%
rename from ui/src/views/tool/create-form/components/init-field/InitFieldTable.vue
rename to ui/src/views/tool/form/components/init-field/InitFieldTable.vue
diff --git a/ui/src/views/tool/create-form/components/input-field/InputFieldDialog.vue b/ui/src/views/tool/form/components/input-field/InputFieldDialog.vue
similarity index 95%
rename from ui/src/views/tool/create-form/components/input-field/InputFieldDialog.vue
rename to ui/src/views/tool/form/components/input-field/InputFieldDialog.vue
index f01ec8f9947..95be316b3b9 100644
--- a/ui/src/views/tool/create-form/components/input-field/InputFieldDialog.vue
+++ b/ui/src/views/tool/form/components/input-field/InputFieldDialog.vue
@@ -38,15 +38,10 @@ function handleSubmit() {
   formRef.value?.validate((valid) => {
     if (!valid) return
     emit('refresh', structuredClone(toRaw(inputFieldForm)))
-    close()
+    visible.value = false
   })
 }
 
-function close() {
-  visible.value = false
-  resetData()
-}
-
 function resetData() {
   isEdit.value = false
   Object.assign(inputFieldForm, {
@@ -59,7 +54,7 @@ function resetData() {
   formRef.value?.clearValidate()
 }
 
-defineExpose({ open, close })
+defineExpose({ open })
 </script>
 
 <template>
@@ -110,7 +105,7 @@ defineExpose({ open, close })
       /></el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="close">取消</el-button>
+      <el-button @click="visible = false">取消</el-button>
       <el-button type="primary" @click="handleSubmit">{{ isEdit ? '保存' : '添加' }}</el-button>
     </template>
   </MkDialog>
diff --git a/ui/src/views/tool/create-form/components/input-field/InputFieldTable.vue b/ui/src/views/tool/form/components/input-field/InputFieldTable.vue
similarity index 100%
rename from ui/src/views/tool/create-form/components/input-field/InputFieldTable.vue
rename to ui/src/views/tool/form/components/input-field/InputFieldTable.vue
diff --git a/ui/src/views/tool/create-form/components/python-code/CodeSetting.vue b/ui/src/views/tool/form/components/python-code/CodeSetting.vue
similarity index 100%
rename from ui/src/views/tool/create-form/components/python-code/CodeSetting.vue
rename to ui/src/views/tool/form/components/python-code/CodeSetting.vue
diff --git a/ui/src/views/tool/create-form/components/python-code/GenerateCodeDialog.vue b/ui/src/views/tool/form/components/python-code/GenerateCodeDialog.vue
similarity index 100%
rename from ui/src/views/tool/create-form/components/python-code/GenerateCodeDialog.vue
rename to ui/src/views/tool/form/components/python-code/GenerateCodeDialog.vue