feat: folder

ui/src/api/admin/workspace/folder.ts

@@ -1,53 +1,37 @@
 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 文件夹。 */
 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 {

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)

ui/src/api/types/workspace-folder.ts → ui/src/api/types/folder.ts

@@ -8,31 +8,20 @@ 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
   name: string
   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
-}

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'

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',