fix(web): improve request cancellation and dataset upload handling
- Skip error notification for cancelled requests in interceptor - Update progress completion condition from exact match to greater than or equal - Fix progress bar condition to include zero value in range check - Add gradient color to progress bar stroke for better visual feedback - Remove AbortController from tracking after successful file upload - Return true immediately after cancelling upload to allow file removal - Add explicit return statement after successful server file deletion - Improve file removal logic to handle cancelled and failed uploads consistently
This commit is contained in:
@@ -122,6 +122,11 @@ service.interceptors.response.use(
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
(error) => {
|
(error) => {
|
||||||
|
// 如果是取消请求,不显示错误提示
|
||||||
|
if (axios.isCancel(error) || error.name === 'AbortError' || error.code === 'ERR_CANCELED') {
|
||||||
|
return Promise.reject(error);
|
||||||
|
}
|
||||||
|
|
||||||
// 处理网络错误、超时等
|
// 处理网络错误、超时等
|
||||||
let msg = error.response?.data?.error || error.response?.error;
|
let msg = error.response?.data?.error || error.response?.error;
|
||||||
const status = error?.response ? error.response.status : error;
|
const status = error?.response ? error.response.status : error;
|
||||||
|
|||||||
@@ -261,15 +261,15 @@ const CreateDataset = () => {
|
|||||||
dataIndex: 'progress',
|
dataIndex: 'progress',
|
||||||
key: 'progress',
|
key: 'progress',
|
||||||
render: (value: number, record: any) => {
|
render: (value: number, record: any) => {
|
||||||
// value = 1 时完成,0~1 时显示进度条
|
// value >= 1 时完成,0~1 时显示进度条
|
||||||
if (value === 1) {
|
if (value >= 1) {
|
||||||
return (
|
return (
|
||||||
<span className="rb:text-xs rb:border rb:border-[#DFE4ED] rb:bg-[#FBFDFF] rb:rounded rb:items-center rb:text-[#212332] rb:py-1 rb:px-2">
|
<span className="rb:text-xs rb:border rb:border-[#DFE4ED] rb:bg-[#FBFDFF] rb:rounded rb:items-center rb:text-[#212332] rb:py-1 rb:px-2">
|
||||||
<span className="rb:inline-block rb:w-[5px] rb:h-[5px] rb:mr-2 rb:rounded-full" style={{ backgroundColor: '#369F21' }}></span>
|
<span className="rb:inline-block rb:w-[5px] rb:h-[5px] rb:mr-2 rb:rounded-full" style={{ backgroundColor: '#369F21' }}></span>
|
||||||
<span>{t('knowledgeBase.completed')}</span>
|
<span>{t('knowledgeBase.completed')}</span>
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
} else if (value > 0 && value < 1) {
|
} else if (value >= 0 && value < 1) {
|
||||||
// 处理中,显示进度条
|
// 处理中,显示进度条
|
||||||
return (
|
return (
|
||||||
<div className="rb:flex rb:items-center rb:gap-2">
|
<div className="rb:flex rb:items-center rb:gap-2">
|
||||||
@@ -277,7 +277,10 @@ const CreateDataset = () => {
|
|||||||
percent={Math.round(value * 100)}
|
percent={Math.round(value * 100)}
|
||||||
size="small"
|
size="small"
|
||||||
status="active"
|
status="active"
|
||||||
strokeColor="#1677ff"
|
strokeColor={{
|
||||||
|
'0%': '#108ee9',
|
||||||
|
'100%': '#87d068',
|
||||||
|
}}
|
||||||
style={{ width: '120px' }}
|
style={{ width: '120px' }}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -383,6 +386,9 @@ const CreateDataset = () => {
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
.then((res: UploadFileResponse) => {
|
.then((res: UploadFileResponse) => {
|
||||||
|
// 上传成功,移除 AbortController
|
||||||
|
abortControllersRef.current.delete(fileUid);
|
||||||
|
|
||||||
onSuccess?.(res, new XMLHttpRequest());
|
onSuccess?.(res, new XMLHttpRequest());
|
||||||
if (res?.id) {
|
if (res?.id) {
|
||||||
setRechunkFileIds((prev) => {
|
setRechunkFileIds((prev) => {
|
||||||
@@ -578,6 +584,8 @@ const CreateDataset = () => {
|
|||||||
abortController.abort();
|
abortController.abort();
|
||||||
abortControllersRef.current.delete(fileUid);
|
abortControllersRef.current.delete(fileUid);
|
||||||
console.log('已取消上传:', (file as any).name);
|
console.log('已取消上传:', (file as any).name);
|
||||||
|
// 取消上传后直接返回 true,允许移除文件
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 只有当文件已经上传成功(有response.id)时,才删除服务器上的文件
|
// 只有当文件已经上传成功(有response.id)时,才删除服务器上的文件
|
||||||
@@ -586,6 +594,7 @@ const CreateDataset = () => {
|
|||||||
await deleteDocument(file.response.id);
|
await deleteDocument(file.response.id);
|
||||||
setRechunkFileIds(prev => prev.filter(id => id !== file.response.id));
|
setRechunkFileIds(prev => prev.filter(id => id !== file.response.id));
|
||||||
console.log('已删除服务器文件:', file.response.id);
|
console.log('已删除服务器文件:', file.response.id);
|
||||||
|
return true;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('删除文件失败:', error);
|
console.error('删除文件失败:', error);
|
||||||
messageApi.error(t('common.deleteFailed') || '删除文件失败');
|
messageApi.error(t('common.deleteFailed') || '删除文件失败');
|
||||||
@@ -593,7 +602,7 @@ const CreateDataset = () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 允许移除文件(无论是取消上传还是删除成功)
|
// 其他情况(如上传失败的文件)也允许移除
|
||||||
return true;
|
return true;
|
||||||
}} />
|
}} />
|
||||||
)}
|
)}
|
||||||
|
|||||||
Reference in New Issue
Block a user