diff --git a/frontend/src/pages/System/Menu/service.ts b/frontend/src/pages/System/Menu/service.ts index df7d71b6..cc7323a9 100644 --- a/frontend/src/pages/System/Menu/service.ts +++ b/frontend/src/pages/System/Menu/service.ts @@ -7,21 +7,16 @@ const BASE_URL = '/api/v1/menu'; // 获取菜单列表(分页) export const getMenus = (params?: MenuQuery) => request.get>(`${BASE_URL}/page`, { - params, - transform: true + params }); // 获取菜单树 export const getMenuTree = () => - request.get(`${BASE_URL}/tree`, { - transform: true - }); + request.get(`${BASE_URL}/tree`); // 获取当前用户菜单 export const getCurrentUserMenus = () => - request.get(`${BASE_URL}/current`, { - transform: true - }); + request.get(`${BASE_URL}/current`); // 创建菜单 export const createMenu = (data: MenuRequest) => diff --git a/frontend/src/pages/System/User/index.tsx b/frontend/src/pages/System/User/index.tsx index 2da90281..6026488b 100644 --- a/frontend/src/pages/System/User/index.tsx +++ b/frontend/src/pages/System/User/index.tsx @@ -74,15 +74,21 @@ const UserPage: React.FC = () => { try { const values = await form.validateFields(); if (editingUser) { - await handleUpdate(editingUser.id, { + const success = await handleUpdate(editingUser.id, { ...values, version: editingUser.version }); + if (success) { + setModalVisible(false); + fetchUsers(); + } } else { - await handleCreate(values); + const success = await handleCreate(values); + if (success) { + setModalVisible(false); + fetchUsers(); + } } - setModalVisible(false); - fetchUsers(); } catch (error) { console.error('操作失败:', error); } diff --git a/frontend/src/pages/System/User/service.ts b/frontend/src/pages/System/User/service.ts index 60854b7b..3b1f345e 100644 --- a/frontend/src/pages/System/User/service.ts +++ b/frontend/src/pages/System/User/service.ts @@ -7,8 +7,7 @@ const BASE_URL = '/api/v1/user'; // 获取用户列表(分页) export const getUsers = (params?: UserQuery) => request.get>(`${BASE_URL}/page`, { - params, - transform: true + params }); // 创建用户 diff --git a/frontend/src/utils/request.ts b/frontend/src/utils/request.ts index de46cbde..580daa29 100644 --- a/frontend/src/utils/request.ts +++ b/frontend/src/utils/request.ts @@ -11,14 +11,12 @@ export interface Response { export interface RequestOptions extends AxiosRequestConfig { successMessage?: string; errorMessage?: string; - transform?: boolean; retryCount?: number; retryDelay?: number; } // 默认请求配置 const defaultConfig: Partial = { - transform: true, retryCount: 3, retryDelay: 1000, timeout: 30000 @@ -48,7 +46,7 @@ const responseHandler = (response: AxiosResponse>) => { if (res.success && res.code === 200) { config.successMessage && message.success(config.successMessage); - return config.transform ? res.data : res; + return res.data; } else { message.error(config.errorMessage || res.message); return Promise.reject(res); @@ -105,16 +103,16 @@ request.interceptors.response.use(responseHandler, errorHandler); const http = { get: (url: string, config?: RequestOptions) => - request.get>(url, createRequestConfig({transform: true, ...config})), + request.get>(url, createRequestConfig(config)), post: (url: string, data?: any, config?: RequestOptions) => - request.post>(url, data, createRequestConfig({transform: true, ...config})), + request.post>(url, data, createRequestConfig(config)), put: (url: string, data?: any, config?: RequestOptions) => - request.put>(url, data, createRequestConfig({transform: true, ...config})), + request.put>(url, data, createRequestConfig(config)), delete: (url: string, config?: RequestOptions) => - request.delete>(url, createRequestConfig({transform: true, ...config})), + request.delete>(url, createRequestConfig(config)), upload: (url: string, file: File, config?: RequestOptions) => { const formData = new FormData();