diff --git a/ui/src/api/admin/workspace/folder.ts b/ui/src/api/admin/workspace/folder.ts
index dd9a32282eb..f7afe1cadea 100644
--- a/ui/src/api/admin/workspace/folder.ts
+++ b/ui/src/api/admin/workspace/folder.ts
@@ -1,35 +1,22 @@
 import { del, get, post, put } from '../core/request'
-import type {
-  FolderSource,
-  WorkspaceFolder,
-  WorkspaceFolderCreatePayload,
-  WorkspaceFolderQuery,
-  WorkspaceFolderUpdatePayload,
-} from '@/api/types'
+import type { FolderSource, FolderItem, RequestParams, FolderRequest } from '@/api/types'
 
 const getPrefix = (workspaceId: string, source: FolderSource) =>
   `/workspace/${workspaceId}/${source}/folder`
 
 /** 获取指定资源模块的 Workspace 文件夹树。 */
-const getFolderTree = (workspaceId: string, source: FolderSource, query?: WorkspaceFolderQuery) => {
-  return get<WorkspaceFolder[]>(getPrefix(workspaceId, source), query)
+const getFolderTree = (workspaceId: string, source: FolderSource, query?: RequestParams) => {
+  return get<FolderItem[]>(getPrefix(workspaceId, source), query)
 }
 
 /** 获取指定 Workspace 文件夹详情。 */
 const getFolderDetail = (workspaceId: string, source: FolderSource, folderId: string) => {
-  return get<WorkspaceFolder>(`${getPrefix(workspaceId, source)}/${folderId}`)
+  return get<FolderItem>(`${getPrefix(workspaceId, source)}/${folderId}`)
 }
 
 /** 在指定资源模块中创建 Workspace 文件夹。 */
-const postFolder = (
-  workspaceId: string,
-  source: FolderSource,
-  payload: WorkspaceFolderCreatePayload,
-) => {
-  return post<WorkspaceFolderCreatePayload, WorkspaceFolder>(
-    getPrefix(workspaceId, source),
-    payload,
-  )
+const postFolder = (workspaceId: string, source: FolderSource, payload: FolderRequest) => {
+  return post<FolderRequest, FolderItem>(getPrefix(workspaceId, source), payload)
 }
 
 /** 更新指定 Workspace 文件夹。 */
@@ -37,17 +24,14 @@ const putFolder = (
   workspaceId: string,
   source: FolderSource,
   folderId: string,
-  payload: WorkspaceFolderUpdatePayload,
+  payload: FolderRequest,
 ) => {
-  return put<WorkspaceFolderUpdatePayload, WorkspaceFolder>(
-    `${getPrefix(workspaceId, source)}/${folderId}`,
-    payload,
-  )
+  return put<FolderRequest, FolderItem>(`${getPrefix(workspaceId, source)}/${folderId}`, payload)
 }
 
 /** 删除指定 Workspace 文件夹及其中的资源。 */
 const deleteFolder = (workspaceId: string, source: FolderSource, folderId: string) => {
-  return del<undefined, boolean>(`${getPrefix(workspaceId, source)}/${folderId}`)
+  return del<boolean>(`${getPrefix(workspaceId, source)}/${folderId}`)
 }
 
 export default {
diff --git a/ui/src/api/admin/workspace/tool/tool.ts b/ui/src/api/admin/workspace/tool/tool.ts
index ee215d88bac..302ac29896e 100644
--- a/ui/src/api/admin/workspace/tool/tool.ts
+++ b/ui/src/api/admin/workspace/tool/tool.ts
@@ -10,6 +10,14 @@ import type {
 
 const getPrefix = (workspaceId: string) => `/workspace/${workspaceId}/tool`
 
+/** 获取工具分页列表。 */
+const getToolPage = (workspaceId: string, page: ParamsPage, query?: ToolListQuery) => {
+  return get<ResponsePage<WorkspaceTool>>(
+    `${getPrefix(workspaceId)}/${page.currentPage}/${page.pageSize}`,
+    query,
+  )
+}
+
 /** 获取当前目录下的工具和子文件夹。 */
 const getToolTree = (workspaceId: string, query?: ToolListQuery) => {
   return get<ToolTreeResponse>(getPrefix(workspaceId), query)
@@ -20,14 +28,6 @@ const getToolCatalog = (workspaceId: string, query?: ToolListQuery) => {
   return get<ToolCatalogResponse>(`${getPrefix(workspaceId)}/tool_list`, query)
 }
 
-/** 获取工具分页列表。 */
-const getToolPage = (workspaceId: string, page: ParamsPage, query?: ToolListQuery) => {
-  return get<ResponsePage<WorkspaceTool>>(
-    `${getPrefix(workspaceId)}/${page.currentPage}/${page.pageSize}`,
-    query,
-  )
-}
-
 /** 创建工作空间工具。 */
 const postTool = (workspaceId: string, payload: ToolPayload) => {
   return post<ToolPayload, WorkspaceTool>(getPrefix(workspaceId), payload)
diff --git a/ui/src/api/types/workspace-folder.ts b/ui/src/api/types/folder.ts
similarity index 59%
rename from ui/src/api/types/workspace-folder.ts
rename to ui/src/api/types/folder.ts
index 7245b1d52e0..6e095501632 100644
--- a/ui/src/api/types/workspace-folder.ts
+++ b/ui/src/api/types/folder.ts
@@ -8,8 +8,8 @@ export const FOLDER_SOURCE = {
 
 export type FolderSource = (typeof FOLDER_SOURCE)[keyof typeof FOLDER_SOURCE]
 
-export interface WorkspaceFolder {
-  children?: WorkspaceFolder[]
+export interface FolderItem {
+  children?: FolderItem[]
   create_time?: string
   desc?: string | null
   id: string
@@ -17,22 +17,11 @@ export interface WorkspaceFolder {
   parent_id?: string | null
   update_time?: string
   user_id?: string | null
-  workspace_id: string
+  workspace_id?: string
 }
 
-export interface WorkspaceFolderCreatePayload {
-  desc?: string | null
-  name: string
-  parent_id?: string | null
-}
-
-export interface WorkspaceFolderUpdatePayload {
+export interface FolderRequest {
   desc?: string | null
   name?: string
   parent_id?: string | null
 }
-
-export interface WorkspaceFolderQuery {
-  name?: string
-  [key: string]: unknown
-}
diff --git a/ui/src/api/types/index.ts b/ui/src/api/types/index.ts
index b39aa8fc968..430090e517e 100644
--- a/ui/src/api/types/index.ts
+++ b/ui/src/api/types/index.ts
@@ -11,5 +11,5 @@ export type * from './system-operate-log'
 export * from './system-role'
 export type * from './system-email'
 export * from './workspace-model'
-export * from './workspace-folder'
+export * from './folder'
 export * from './workspace-tool'
diff --git a/ui/src/api/types/workspace-tool.ts b/ui/src/api/types/workspace-tool.ts
index 3234818bf26..1fcaa1b9419 100644
--- a/ui/src/api/types/workspace-tool.ts
+++ b/ui/src/api/types/workspace-tool.ts
@@ -1,6 +1,6 @@
 /** Workspace 工具列表和工具维护共用的业务类型。 */
 
-import type { WorkspaceFolder } from './workspace-folder'
+import type { WorkspaceFolder } from './folder'
 
 export const TOOL_SCOPE = {
   INTERNAL: 'INTERNAL',
diff --git a/ui/src/components/business/folder-tree/VirtualizedTree.vue b/ui/src/components/business/folder-tree/VirtualizedTree.vue
index a0f1be35173..32fd703fe5d 100644
--- a/ui/src/components/business/folder-tree/VirtualizedTree.vue
+++ b/ui/src/components/business/folder-tree/VirtualizedTree.vue
@@ -1,12 +1,13 @@
 <script setup lang="ts">
 import { computed } from 'vue'
+import { CaretBottom } from '@element-plus/icons-vue'
 import { Draggable, dragContext } from '@he-tree/vue'
 import '@he-tree/vue/style/default.css'
-import type { WorkspaceFolder } from '@/api/types'
-
+import type { FolderItem } from '@/api/types'
+import MkListItem from '@/components/mk-search-list/mk-list-item.vue'
 defineOptions({ name: 'FolderVirtualizedTree' })
 
-interface FolderTreeNode extends Omit<WorkspaceFolder, 'children'> {
+interface FolderTreeNode extends Omit<FolderItem, 'children'> {
   children?: FolderTreeNode[]
   disabled?: boolean
 }
@@ -27,34 +28,30 @@ interface DropTargetInfo {
 
 const props = withDefaults(
   defineProps<{
-    canManage?: boolean
+    canEdit?: boolean
     currentNodeKey?: string
-    data?: WorkspaceFolder[]
+    data?: FolderItem[]
     draggable?: boolean
     filterText?: string
-    protectedNodeId?: string
   }>(),
   {
-    canManage: true,
+    canEdit: true,
     currentNodeKey: '',
     data: () => [],
     draggable: false,
     filterText: '',
-    protectedNodeId: '',
   },
 )
 
 const emit = defineEmits<{
-  create: [folder: WorkspaceFolder]
-  delete: [folder: WorkspaceFolder]
-  edit: [folder: WorkspaceFolder]
-  move: [folder: WorkspaceFolder]
-  nodeDrop: [draggingFolder: WorkspaceFolder, targetFolder: WorkspaceFolder, dropType: DropType]
-  select: [folder: WorkspaceFolder]
+  create: [folder: FolderItem]
+  delete: [folder: FolderItem]
+  edit: [folder: FolderItem]
+  move: [folder: FolderItem]
+  nodeDrop: [draggingFolder: FolderItem, targetFolder: FolderItem, dropType: DropType]
+  nodeClick: [folder: FolderItem]
 }>()
 
-const canDrag = computed(() => props.canManage && props.draggable && !props.filterText.trim())
-
 function filterFolders(folders: FolderTreeNode[], keyword: string): FolderTreeNode[] {
   if (!keyword) return folders
 
@@ -91,19 +88,7 @@ function handleNodeClick(stat: FolderStat) {
     stat.open = !stat.open
     return
   }
-  emit('select', stat.data)
-}
-
-function isNodeDraggable(stat: FolderStat) {
-  return !stat.data.disabled && stat.data.id !== props.protectedNodeId
-}
-
-function isNodeDroppable(stat: FolderStat) {
-  return !stat.data.disabled
-}
-
-function getNodeKey(stat: FolderStat) {
-  return stat.data.id
+  emit('nodeClick', stat.data)
 }
 
 function buildNodeDropArgs() {
@@ -142,137 +127,60 @@ function handleAfterDrop() {
 </script>
 
 <template>
-  <div class="h-full min-h-0">
-    <Draggable
-      v-if="filteredTreeData.length"
-      aria-label="文件夹树"
-      class="folder-virtualized-tree"
-      :default-open="false"
-      :disable-drag="!canDrag"
-      :disable-drop="!canDrag"
-      :each-draggable="isNodeDraggable"
-      :each-droppable="isNodeDroppable"
-      :model-value="filteredTreeData"
-      :node-key="getNodeKey"
-      :root-droppable="false"
-      :stat-handler="handleStat"
-      virtualization
-      @after-drop="handleAfterDrop"
-      @click:node="handleNodeClick"
-    >
-      <template #default="{ node, stat }: { node: FolderTreeNode; stat: FolderStat }">
-        <div
-          class="folder-tree-node group flex min-w-0 items-center"
-          :class="{
-            'is-current': currentNodeKey === node.id,
-            'is-disabled': node.disabled,
-          }"
-        >
-          <button
-            type="button"
-            class="folder-tree-arrow flex-center shrink-0"
-            :class="{ 'rotate-90': stat.open }"
-            :style="{ visibility: stat.children.length ? 'visible' : 'hidden' }"
-            aria-label="展开或收起文件夹"
+  <Draggable
+    class="mk-virtualized-tree h-full min-h-0"
+    virtualization
+    :default-open="false"
+    v-bind="$attrs"
+    :model-value="filteredTreeData"
+    @click:node="handleNodeClick"
+    @after-drop="handleAfterDrop"
+    :statHandler="handleStat"
+    :disableDrag="!draggable"
+    :disableDrop="!draggable"
+  >
+    <template #default="{ node, stat }: { node: FolderTreeNode; stat: FolderStat }">
+      <MkListItem :class="currentNodeKey === node.id ? 'is-current' : ''" class="mk-tree-node">
+        <template #default>
+          <MkIcon
             @click.stop="stat.open = !stat.open"
-          >
-            <MkIcon name="icon_right_outlined" :size="16" />
-          </button>
-
-          <div class="flex min-w-0 flex-1 items-center gap-2 pr-2">
-            <MkIcon name="icon_file-folder_colorful" :size="18" />
-            <span class="min-w-0 flex-1 truncate" :title="node.name">{{ node.name }}</span>
-
-            <MkDropdown v-if="canManage" trigger="click" :teleported="false">
-              <el-button text class="group-hover-visible -mr-1" @click.stop>
-                <MkIcon name="icon_more_outlined" />
-              </el-button>
-              <template #dropdown>
-                <MkDropdownMenu>
-                  <MkDropdownItem @click="emit('create', node)">
-                    <template #icon><MkIcon name="icon_add_outlined" /></template>
-                    <span>创建子文件夹</span>
-                  </MkDropdownItem>
-                  <MkDropdownItem @click="emit('edit', node)">
-                    <template #icon><MkIcon name="icon_edit_outlined" /></template>
-                    <span>编辑</span>
-                  </MkDropdownItem>
-                  <MkDropdownItem
-                    :disabled="node.id === protectedNodeId"
-                    @click="emit('move', node)"
-                  >
-                    <template #icon><MkIcon name="icon_right_outlined" /></template>
-                    <span>移动到</span>
-                  </MkDropdownItem>
-                  <MkDropdownItem
-                    divided
-                    :disabled="node.id === protectedNodeId"
-                    @click="emit('delete', node)"
-                  >
-                    <template #icon><MkIcon name="icon_delete-trash_outlined" /></template>
-                    <span>删除</span>
-                  </MkDropdownItem>
-                </MkDropdownMenu>
-              </template>
-            </MkDropdown>
-          </div>
-        </div>
-      </template>
-    </Draggable>
-
-    <p v-else class="pt-20 text-center text-N600">暂无文件夹</p>
-  </div>
+            :icon="CaretBottom"
+            :size="14"
+            :style="{ visibility: stat.children.length ? 'visible' : 'hidden' }"
+            class="text-N600! mr-1.5"
+            :class="{ '-rotate-90': !stat.open }"
+          />
+          <slot name="default" v-bind="{ node, stat }">
+            <span class="min-w-0 truncate" :title="node.name">{{ node.name }}</span>
+          </slot>
+        </template>
+
+        <template #action-dropdown="{ row }">
+          <slot name="action-dropdown" :row="row"></slot>
+        </template>
+      </MkListItem>
+    </template>
+  </Draggable>
 </template>
 
-<style lang="scss" scoped>
-.folder-virtualized-tree {
-  height: 100%;
-  overflow: auto;
-  scrollbar-gutter: stable;
-
-  :deep(.he-tree-drag-placeholder) {
-    background-color: color-mix(in srgb, var(--mk-primary) 10%, transparent);
-    border: 2px dashed var(--mk-primary);
-    border-radius: var(--el-border-radius-base);
-    width: 98%;
+<style lang="scss">
+.mk-virtualized-tree {
+  overflow: auto !important;
+  .mk-tree-node {
+    &:hover {
+      background: none;
+    }
   }
-
-  :deep(.tree-node) {
+  .tree-node {
     border-radius: var(--el-border-radius-base);
-    cursor: pointer;
-    padding: 2px 0;
-  }
-}
-
-.folder-tree-arrow {
-  background: transparent;
-  border: 0;
-  color: var(--mk-N600);
-  height: calc(var(--spacing) * 9);
-  padding: 0;
-  transition: transform 0.2s;
-  width: calc(var(--spacing) * 7);
-}
-
-.folder-tree-node {
-  border-radius: var(--el-border-radius-base);
-  min-height: calc(var(--spacing) * 9);
-  width: 100%;
-
-  &:hover {
-    background-color: color-mix(in srgb, var(--mk-N900) 6%, transparent);
-  }
-
-  &.is-current {
-    background-color: color-mix(in srgb, var(--mk-primary) 10%, transparent);
-    color: var(--mk-primary);
-    font-weight: 500;
-  }
-
-  &.is-disabled {
-    color: var(--mk-N600);
-    cursor: not-allowed;
-    opacity: 0.6;
+    &:hover {
+      background: var(--mk-N900-transparent-10);
+    }
+    &:has(.mk-tree-node.is-current) {
+      background: rgb(var(--mk-primary-rgb) / 10%);
+      color: var(--el-color-primary);
+      font-weight: 500;
+    }
   }
 }
 </style>
diff --git a/ui/src/components/business/folder-tree/index.vue b/ui/src/components/business/folder-tree/index.vue
index e3c92f68d2e..9ef1468f049 100644
--- a/ui/src/components/business/folder-tree/index.vue
+++ b/ui/src/components/business/folder-tree/index.vue
@@ -1,41 +1,55 @@
 <script setup lang="ts">
 import { computed, ref, useTemplateRef, watch } from 'vue'
-import type { FolderSource, WorkspaceFolder } from '@/api/types'
+import type { FolderSource, FolderItem } from '@/api/types'
 import FolderApi from '@/api/admin/workspace/folder'
 import { MsgConfirm, MsgSuccess } from '@/utils/message'
+import MkListItem from '@/components/mk-search-list/mk-list-item.vue'
 import FolderFormDialog from './FolderFormDialog.vue'
 import MoveFolderDialog from './MoveFolderDialog.vue'
-import FolderVirtualizedTree from './VirtualizedTree.vue'
+import VirtualizedTree from './VirtualizedTree.vue'
 import { FOLDER_SORT, type FolderFormSubmit, type FolderMoveSubmit, type FolderSort } from './types'
 
 defineOptions({ name: 'FolderTree' })
 
+const route = useRoute()
+const {
+  params: { workspaceId },
+} = route
+
 const props = withDefaults(
   defineProps<{
-    canManage?: boolean
+    canEdit?: boolean
     hideRoot?: boolean
     source: FolderSource
-    workspaceId: string
   }>(),
   {
-    canManage: true,
+    canEdit: true,
     hideRoot: true,
   },
 )
 
 const emit = defineEmits<{
-  created: [folder: WorkspaceFolder]
-  deleted: [folder: WorkspaceFolder, selectionAffected: boolean]
-  loaded: [folders: WorkspaceFolder[]]
-  moved: [folder: WorkspaceFolder]
-  select: [folder: WorkspaceFolder]
-  updated: [folder: WorkspaceFolder]
+  created: [folder: FolderItem]
+  deleted: [folder: FolderItem, selectionAffected: boolean]
+  loaded: [folders: FolderItem[]]
+  moved: [folder: FolderItem]
+  select: [folder: FolderItem]
+  updated: [folder: FolderItem]
 }>()
 
 defineSlots<{
   beforeTree?: () => unknown
 }>()
 
+const ALL_FOLDER: FolderItem = {
+  name: '全部模型',
+  id: 'default',
+}
+const SHARED_FOLDER: FolderItem = {
+  id: 'shared',
+  name: '共享模型',
+}
+
 const currentNodeKey = defineModel<string>({ default: '' })
 const folderFormDialogRef =
   useTemplateRef<InstanceType<typeof FolderFormDialog>>('folderFormDialogRef')
@@ -43,7 +57,7 @@ const moveFolderDialogRef =
   useTemplateRef<InstanceType<typeof MoveFolderDialog>>('moveFolderDialogRef')
 const loading = ref(false)
 const saving = ref(false)
-const folderTree = ref<WorkspaceFolder[]>([])
+const folderTree = ref<FolderItem[]>([])
 const searchKeyword = ref('')
 const currentSort = ref<FolderSort>(FOLDER_SORT.CREATE_TIME_DESC)
 
@@ -55,21 +69,17 @@ const sortOptions: { label: string; value: FolderSort }[] = [
 ]
 
 const visibleFolders = computed(() => {
-  const rootFolder =
-    folderTree.value.find(({ id }) => id === props.workspaceId) ?? folderTree.value[0]
+  const rootFolder = folderTree.value.find(({ id }) => id === workspaceId) ?? folderTree.value[0]
   const folders =
-    props.hideRoot && rootFolder?.id === props.workspaceId
+    props.hideRoot && rootFolder?.id === workspaceId
       ? (rootFolder.children ?? [])
       : folderTree.value
 
   return sortFolders(folders)
 })
 
-function sortFolders(folders: WorkspaceFolder[]): WorkspaceFolder[] {
-  const compareMethods: Record<
-    FolderSort,
-    (left: WorkspaceFolder, right: WorkspaceFolder) => number
-  > = {
+function sortFolders(folders: FolderItem[]): FolderItem[] {
+  const compareMethods: Record<FolderSort, (left: FolderItem, right: FolderItem) => number> = {
     [FOLDER_SORT.CREATE_TIME_ASC]: (left, right) =>
       new Date(left.create_time ?? 0).getTime() - new Date(right.create_time ?? 0).getTime(),
     [FOLDER_SORT.CREATE_TIME_DESC]: (left, right) =>
@@ -84,7 +94,7 @@ function sortFolders(folders: WorkspaceFolder[]): WorkspaceFolder[] {
   }))
 }
 
-function containsFolder(folder: WorkspaceFolder, folderId: string): boolean {
+function containsFolder(folder: FolderItem, folderId: string): boolean {
   return (
     folder.id === folderId ||
     Boolean(folder.children?.some((child) => containsFolder(child, folderId)))
@@ -94,7 +104,7 @@ function containsFolder(folder: WorkspaceFolder, folderId: string): boolean {
 /* 文件夹树 */
 function loadFolders() {
   loading.value = true
-  return FolderApi.getFolderTree(props.workspaceId, props.source)
+  return FolderApi.getFolderTree(workspaceId, props.source)
     .then((folders) => {
       folderTree.value = folders
       emit('loaded', folders)
@@ -104,34 +114,34 @@ function loadFolders() {
     })
 }
 
-function handleFolderSelect(folder: WorkspaceFolder) {
+function handleFolderSelect(folder: FolderItem) {
   currentNodeKey.value = folder.id
   emit('select', folder)
 }
 
 function handleSortSelect(sort: FolderSort) {
   currentSort.value = sort
-  localStorage.setItem(`folder-sort:${props.workspaceId}:${props.source}`, sort)
+  localStorage.setItem(`folder-sort:${workspaceId}:${props.source}`, sort)
 }
 
 /* 文件夹表单 */
-function handleOpenCreateFolder(parentId = props.workspaceId) {
+function handleOpenCreateFolder(parentId = workspaceId) {
   folderFormDialogRef.value?.open(parentId)
 }
 
-function handleOpenCreateChildFolder(folder: WorkspaceFolder) {
+function handleOpenCreateChildFolder(folder: FolderItem) {
   folderFormDialogRef.value?.open(folder.id)
 }
 
-function handleOpenEditFolder(folder: WorkspaceFolder) {
-  folderFormDialogRef.value?.open(folder.parent_id ?? props.workspaceId, folder)
+function handleOpenEditFolder(folder: FolderItem) {
+  folderFormDialogRef.value?.open(folder.parent_id ?? workspaceId, folder)
 }
 
 function handleFolderSubmit({ folderId, payload }: FolderFormSubmit) {
   saving.value = true
   const request = folderId
-    ? FolderApi.putFolder(props.workspaceId, props.source, folderId, payload)
-    : FolderApi.postFolder(props.workspaceId, props.source, {
+    ? FolderApi.putFolder(workspaceId, props.source, folderId, payload)
+    : FolderApi.postFolder(workspaceId, props.source, {
         ...payload,
         name: payload.name ?? '',
       })
@@ -151,13 +161,13 @@ function handleFolderSubmit({ folderId, payload }: FolderFormSubmit) {
 }
 
 /* 文件夹移动与删除 */
-function handleOpenMoveFolder(folder: WorkspaceFolder) {
+function handleOpenMoveFolder(folder: FolderItem) {
   moveFolderDialogRef.value?.open(folder)
 }
 
 function handleMoveFolder({ folder, targetFolderId }: FolderMoveSubmit) {
   saving.value = true
-  return FolderApi.putFolder(props.workspaceId, props.source, folder.id, {
+  return FolderApi.putFolder(workspaceId, props.source, folder.id, {
     parent_id: targetFolderId,
   })
     .then((updatedFolder) => {
@@ -171,17 +181,17 @@ function handleMoveFolder({ folder, targetFolderId }: FolderMoveSubmit) {
 }
 
 function handleFolderDrop(
-  draggingFolder: WorkspaceFolder,
-  targetFolder: WorkspaceFolder,
+  draggingFolder: FolderItem,
+  targetFolder: FolderItem,
   dropType: 'after' | 'before' | 'inner',
 ) {
   const targetParentId =
-    dropType === 'inner' ? targetFolder.id : (targetFolder.parent_id ?? props.workspaceId)
+    dropType === 'inner' ? targetFolder.id : (targetFolder.parent_id ?? workspaceId)
 
   if (draggingFolder.parent_id === targetParentId) return loadFolders()
 
   saving.value = true
-  return FolderApi.putFolder(props.workspaceId, props.source, draggingFolder.id, {
+  return FolderApi.putFolder(workspaceId, props.source, draggingFolder.id, {
     parent_id: targetParentId,
   })
     .then((updatedFolder) => {
@@ -194,12 +204,12 @@ function handleFolderDrop(
     })
 }
 
-function handleDeleteFolder(folder: WorkspaceFolder) {
+function handleDeleteFolder(folder: FolderItem) {
   MsgConfirm(`确认删除文件夹“${folder.name}”？`, '文件夹内的资源也会被删除，请谨慎操作。')
     .then(() => {
       saving.value = true
       const selectionAffected = containsFolder(folder, currentNodeKey.value)
-      return FolderApi.deleteFolder(props.workspaceId, props.source, folder.id).then(() => {
+      return FolderApi.deleteFolder(workspaceId, props.source, folder.id).then(() => {
         if (selectionAffected) currentNodeKey.value = ''
         MsgSuccess('删除成功')
         return loadFolders().then(() => emit('deleted', folder, selectionAffected))
@@ -211,17 +221,9 @@ function handleDeleteFolder(folder: WorkspaceFolder) {
     })
 }
 
-watch(
-  () => [props.workspaceId, props.source] as const,
-  () => {
-    const storedSort = localStorage.getItem(`folder-sort:${props.workspaceId}:${props.source}`)
-    if (Object.values(FOLDER_SORT).includes(storedSort as FolderSort)) {
-      currentSort.value = storedSort as FolderSort
-    }
-    loadFolders()
-  },
-  { immediate: true },
-)
+onMounted(() => {
+  loadFolders()
+})
 
 defineExpose({ openCreate: handleOpenCreateFolder, refresh: loadFolders })
 </script>
@@ -250,23 +252,74 @@ defineExpose({ openCreate: handleOpenCreateFolder, refresh: loadFolders })
       </MkDropdown>
     </div>
 
-    <slot name="beforeTree" />
+    <div class="px-4">
+      <MkListItem
+        :active="currentNodeKey === SHARED_FOLDER.id"
+        @click="handleFolderSelect(SHARED_FOLDER)"
+      >
+        <MkIcon
+          :name="
+            currentNodeKey === SHARED_FOLDER.id
+              ? 'icon_folder-share_filled'
+              : 'icon_folder_outlined'
+          "
+          :size="18"
+          class="mr-2"
+        />
+        <span>共享模型</span>
+      </MkListItem>
+
+      <el-divider class="my-1!" />
+
+      <MkListItem
+        :active="currentNodeKey === ALL_FOLDER.id"
+        @click="handleFolderSelect(ALL_FOLDER)"
+      >
+        <MkIcon
+          :name="currentNodeKey === ALL_FOLDER.id ? 'icon_card_filled' : 'icon_card_outlined'"
+          :size="18"
+          class="mr-2"
+        />
+        <span>全部模型</span>
+      </MkListItem>
+    </div>
 
     <div class="min-h-0 flex-1 px-4 pb-4">
-      <FolderVirtualizedTree
-        :can-manage="canManage"
-        :current-node-key="currentNodeKey"
+      <VirtualizedTree
+        :canEdit="canEdit"
         :data="visibleFolders"
-        :draggable="canManage"
         :filter-text="searchKeyword"
-        :protected-node-id="workspaceId"
-        @create="handleOpenCreateChildFolder"
-        @delete="handleDeleteFolder"
-        @edit="handleOpenEditFolder"
-        @move="handleOpenMoveFolder"
         @node-drop="handleFolderDrop"
-        @select="handleFolderSelect"
-      />
+        @node-click="handleFolderSelect"
+      >
+        <template #default="{ node }">
+          <MkIcon name="icon_file-folder_colorful" class="mr-2" :size="18" />
+          <span class="min-w-0 flex-1 truncate" :title="node.name">
+            {{ node.name }}
+          </span>
+        </template>
+
+        <template v-if="canEdit" #action-dropdown="{ row }">
+          <MkDropdownMenu>
+            <MkDropdownItem @click="handleOpenEditFolder(row)">
+              <template #icon><MkIcon name="icon_add_outlined" /></template>
+              <span>创建子文件夹</span>
+            </MkDropdownItem>
+            <MkDropdownItem @click="handleOpenEditFolder(row)">
+              <template #icon><MkIcon name="icon_edit_outlined" /></template>
+              <span>编辑</span>
+            </MkDropdownItem>
+            <MkDropdownItem @click="handleOpenEditFolder(row)">
+              <template #icon><MkIcon name="icon_right_outlined" /></template>
+              <span>移动到</span>
+            </MkDropdownItem>
+            <MkDropdownItem divided @click="handleDeleteFolder(row)">
+              <template #icon><MkIcon name="icon_delete-trash_outlined" /></template>
+              <span>删除</span>
+            </MkDropdownItem>
+          </MkDropdownMenu>
+        </template>
+      </VirtualizedTree>
     </div>
 
     <FolderFormDialog ref="folderFormDialogRef" :loading="saving" @submit="handleFolderSubmit" />
diff --git a/ui/src/components/global/mk-filterable-dropdown/index.vue b/ui/src/components/global/mk-filterable-dropdown/index.vue
index 529251512af..d687b72f504 100644
--- a/ui/src/components/global/mk-filterable-dropdown/index.vue
+++ b/ui/src/components/global/mk-filterable-dropdown/index.vue
@@ -93,25 +93,27 @@ function handleItemClick(option: TOption) {
         </div>
 
         <el-scrollbar max-height="200px">
-          <MkDropdownMenu>
-            <MkDropdownItem
-              v-for="option in filteredOptions"
-              :key="getOptionValue(option)"
-              selectable
-              :selected="getOptionValue(option) === selectedValue"
-              @click="handleItemClick(option)"
-            >
-              <slot name="option" :option="option">
-                <span class="block truncate" :title="getOptionLabel(option)">
-                  {{ getOptionLabel(option) }}
-                </span>
-              </slot>
-            </MkDropdownItem>
+          <div class="px-1">
+            <MkDropdownMenu>
+              <MkDropdownItem
+                v-for="option in filteredOptions"
+                :key="getOptionValue(option)"
+                selectable
+                :selected="getOptionValue(option) === selectedValue"
+                @click="handleItemClick(option)"
+              >
+                <slot name="option" :option="option">
+                  <span class="block truncate" :title="getOptionLabel(option)">
+                    {{ getOptionLabel(option) }}
+                  </span>
+                </slot>
+              </MkDropdownItem>
 
-            <MkDropdownItem v-if="filteredOptions.length === 0" disabled>
-              <span class="text-N600">{{ emptyText }}</span>
-            </MkDropdownItem>
-          </MkDropdownMenu>
+              <MkDropdownItem v-if="filteredOptions.length === 0" disabled>
+                <span class="text-N600">{{ emptyText }}</span>
+              </MkDropdownItem>
+            </MkDropdownMenu>
+          </div>
         </el-scrollbar>
       </div>
     </template>
diff --git a/ui/src/styles/element-plus.scss b/ui/src/styles/element-plus.scss
index 19253fbe774..bf61f4c95cb 100644
--- a/ui/src/styles/element-plus.scss
+++ b/ui/src/styles/element-plus.scss
@@ -189,7 +189,7 @@
   }
 }
 .el-cascader-node {
-  border-radius: var(--el-border-radius-small);
+  border-radius: var(--el-border-radius-base);
   padding: 0 calc(var(--spacing) * 8) 0 calc(var(--spacing) * 2);
 
   &__label {
@@ -321,7 +321,7 @@
 .el-dropdown-menu {
   padding: calc(var(--spacing) * 1) 0;
   &__item {
-    border-radius: var(--el-border-radius-small);
+    border-radius: var(--el-border-radius-base);
     color: var(--el-text-color-primary);
     gap: calc(var(--spacing) * 2);
     margin: 0 calc(var(--spacing) * 1);
@@ -600,7 +600,7 @@
     padding: 4px;
   }
   &__item {
-    border-radius: var(--el-border-radius-small);
+    border-radius: var(--el-border-radius-base);
     color: var(--el-text-color-primary);
     padding: 0 calc(var(--spacing) * 8) 0 calc(var(--spacing) * 2);
     max-width: 100%;
diff --git a/ui/src/views/model/ModelView.vue b/ui/src/views/model/ModelView.vue
index d18d9a92c0d..1897f9e930e 100644
--- a/ui/src/views/model/ModelView.vue
+++ b/ui/src/views/model/ModelView.vue
@@ -23,7 +23,10 @@ const DEFAULT_MODEL_PROVIDER: ModelProviderItem = {
 }
 
 const route = useRoute()
-const workspaceId = computed(() => String(route.params.workspaceId))
+const {
+  params: { workspaceId},
+} = route
+
 const loading = ref(false)
 const currentProvider = ref<ModelProviderItem>(DEFAULT_MODEL_PROVIDER)
 const modelProviders = ref<ModelProviderItem[]>([])
@@ -57,7 +60,7 @@ const searchFields = computed(() => [
 function loadCreatorOptions(keyword: string) {
   const request = isShared.value
     ? CommonSystemApi.getAllUsers(keyword ? { nick_name: keyword } : undefined)
-    : CommonApi.getAllUsers(workspaceId.value, keyword ? { nick_name: keyword } : undefined)
+    : CommonApi.getAllUsers(workspaceId, keyword ? { nick_name: keyword } : undefined)
 
   return request.then((users) => {
     creatorOptions.value = users.map(({ id, nick_name }) => ({ label: nick_name, value: id }))
@@ -80,8 +83,8 @@ function loadModels() {
   }
 
   const request = isShared.value
-    ? ModelSharedApi.getModelList(workspaceId.value, modelQuery.value)
-    : ModelApi.getModelList(workspaceId.value, query)
+    ? ModelSharedApi.getModelList(workspaceId, modelQuery.value)
+    : ModelApi.getModelList(workspaceId, query)
 
   return request
     .then((models) => {
diff --git a/ui/src/views/tool/ToolView.vue b/ui/src/views/tool/ToolView.vue
index fa84ea27f8b..461cf47b891 100644
--- a/ui/src/views/tool/ToolView.vue
+++ b/ui/src/views/tool/ToolView.vue
@@ -1,22 +1,19 @@
 <script setup lang="ts">
 import { computed, ref, useTemplateRef, watch } from 'vue'
 import { useRoute } from 'vue-router'
-import type {
-  OptionItem,
-  RequestParams,
-  ToolListQuery,
-  ToolType,
-  WorkspaceFolder,
-  WorkspaceTool,
-} from '@/api/types'
+import type { OptionItem, RequestParams, ToolListQuery, ToolType, WorkspaceTool } from '@/api/types'
 import { FOLDER_SOURCE, TOOL_SCOPE, TOOL_TYPE } from '@/api/types'
 import CommonApi from '@/api/admin/workspace/common'
 import ToolApi from '@/api/admin/workspace/tool/tool'
 import FolderTree from '@/components/business/folder-tree/index.vue'
-import MkListItem from '@/components/mk-search-list/mk-list-item.vue'
 import { MsgConfirm, MsgSuccess } from '@/utils/message'
 import ToolCard from './components/ToolCard.vue'
 
+const route = useRoute()
+const {
+  params: { workspaceId },
+} = route
+
 type ToolNavigation = 'all' | 'shared' | string
 
 const TOOL_TYPE_OPTIONS: OptionItem<ToolType | ''>[] = [
@@ -28,8 +25,6 @@ const TOOL_TYPE_OPTIONS: OptionItem<ToolType | ''>[] = [
   { label: '数据源', value: TOOL_TYPE.DATA_SOURCE },
 ]
 
-const route = useRoute()
-const workspaceId = computed(() => String(route.params.workspaceId))
 const folderTreeRef = useTemplateRef<InstanceType<typeof FolderTree>>('folderTreeRef')
 const loading = ref(false)
 const visibleTools = ref<WorkspaceTool[]>([])
@@ -60,19 +55,20 @@ function getToolListQuery(): ToolListQuery {
 }
 
 /* 工具列表 */
+
+const paginationConfig = ref({
+  currentPage: 1,
+  pageSize: 20,
+  total: 0,
+})
 function loadVisibleTools() {
   loading.value = true
   const query = getToolListQuery()
 
-  const request =
-    activeNavigation.value === 'all' || isShared.value
-      ? ToolApi.getToolCatalog(workspaceId.value, query).then((catalog) =>
-          isShared.value ? catalog.shared_tools : catalog.tools,
-        )
-      : ToolApi.getToolTree(workspaceId.value, {
-          ...query,
-          folder_id: activeNavigation.value,
-        }).then(({ tools }) => tools)
+  const request = ToolApi.getToolPage(workspaceId, paginationConfig.value, {
+    ...query,
+    folder_id: 'default',
+  }).then(({ tools }) => tools)
 
   return request
     .then((tools) => {
@@ -162,14 +158,9 @@ function handleDeleteTool(tool: WorkspaceTool) {
     })
 }
 
-function handleWorkspaceChange() {
-  activeNavigation.value = 'shared'
-  activeTitle.value = '共享工具'
-  selectedToolId.value = ''
+onMounted(() => {
   loadVisibleTools()
-}
-
-watch(workspaceId, handleWorkspaceChange, { immediate: true })
+})
 </script>
 
 <template>
@@ -188,41 +179,8 @@ watch(workspaceId, handleWorkspaceChange, { immediate: true })
         ref="folderTreeRef"
         v-model="activeNavigation"
         :source="FOLDER_SOURCE.TOOL"
-        :workspace-id="workspaceId"
-        @deleted="handleFolderDeleted"
         @select="handleNavigationSelect"
-        @updated="handleFolderUpdated"
       >
-        <template #beforeTree>
-          <div class="px-4">
-            <MkListItem
-              :active="activeNavigation === 'shared'"
-              @click="handleNavigationSelect('shared')"
-            >
-              <MkIcon
-                :name="
-                  activeNavigation === 'shared'
-                    ? 'icon_folder-share_filled'
-                    : 'icon_folder_outlined'
-                "
-                :size="18"
-                class="mr-2"
-              />
-              <span>共享工具</span>
-            </MkListItem>
-
-            <el-divider class="my-1!" />
-
-            <MkListItem :active="activeNavigation === 'all'" @click="handleNavigationSelect('all')">
-              <MkIcon
-                :name="activeNavigation === 'all' ? 'icon_card_filled' : 'icon_card_outlined'"
-                :size="18"
-                class="mr-2"
-              />
-              <span>全部工具</span>
-            </MkListItem>
-          </div>
-        </template>
       </FolderTree>
     </template>