From 040f323e3e6627f4730533a35fc369e93199baef Mon Sep 17 00:00:00 2001 From: JOU Amjs Date: Mon, 15 Jan 2024 22:57:25 +0800 Subject: [PATCH] fix: remove condition of enableDownload or enableUpload --- .vscode/settings.json | 4 ++-- src/requestAdapter.ts | 18 +++++++----------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 45a65b1..0c5816c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,7 +7,7 @@ }, "editor.suggestSelection": "recentlyUsedByPrefix", // 自动补全 "editor.codeActionsOnSave": { - "source.organizeImports": true, - "source.fixAll.eslint": true // 修复所有代码 + "source.organizeImports": "explicit", + "source.fixAll.eslint": "explicit" } } diff --git a/src/requestAdapter.ts b/src/requestAdapter.ts index cf251a0..598653e 100644 --- a/src/requestAdapter.ts +++ b/src/requestAdapter.ts @@ -1,7 +1,7 @@ import { ProgressUpdater } from 'alova'; import axios, { AxiosResponseHeaders } from 'axios'; import { AdapterCreateOptions, AxiosRequestAdapter } from '../typings'; -import { noop, undefinedValue } from './helper'; +import { noop } from './helper'; /** * axios请求适配器 @@ -22,17 +22,13 @@ export default function requestAdapter(options: AdapterCreateOptions = {}) { data: method.data, signal: controller.signal, // `onUploadProgress` 允许为上传处理进度事件 - onUploadProgress: config.enableUpload - ? event => { - uploadHandler(event.loaded, event.total || 1); - } - : undefinedValue, + onUploadProgress: event => { + uploadHandler(event.loaded, event.total || 1); + }, // `onDownloadProgress` 允许为下载处理进度事件 - onDownloadProgress: config.enableDownload - ? event => { - downloadHandler(event.loaded, event.total || 1); - } - : undefinedValue, + onDownloadProgress: event => { + downloadHandler(event.loaded, event.total || 1); + }, ...config });