From 06ff59d14d3835a9d182dec98f2312f8b596658b Mon Sep 17 00:00:00 2001 From: zhengzhou Date: Mon, 23 Nov 2020 18:22:34 +0800 Subject: [PATCH] fix upload failed process --- src/services/system.js | 7 ++++--- src/views/main_web/workspace/workspace.new.vue | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/services/system.js b/src/services/system.js index b5968abe..34921b7d 100644 --- a/src/services/system.js +++ b/src/services/system.js @@ -302,10 +302,11 @@ const system = { // {"size":"","currentSize":"","unit":"","process":100,"hash":"QmPJ9i4z5UdoQpLH1DrkhZiTZra2rGicXiPabiLw4LvTmX"} uploadFile.FileSize = +size; uploadFile.IpfsCid = hash; + const copyUploadFile = { ...uploadFile }; if(!maybeFile) { - delete uploadFile.Id; + delete copyUploadFile.Id; } - const res = await fetchApi(`file/${maybeFile ? 'updateFile' : 'addFile'}`, uploadFile); + const res = await fetchApi(`file/${maybeFile ? 'updateFile' : 'addFile'}`, copyUploadFile); wrapErrorHint(res); if(res.Code !== 0) { resolveError(res, uploadFile); @@ -320,7 +321,7 @@ const system = { } }); socket.on('error', e => { - onErrorHandler(e, uploadFile); + resolveError(e, uploadFile); }); } diff --git a/src/views/main_web/workspace/workspace.new.vue b/src/views/main_web/workspace/workspace.new.vue index 237756fb..13a00ba9 100644 --- a/src/views/main_web/workspace/workspace.new.vue +++ b/src/views/main_web/workspace/workspace.new.vue @@ -782,8 +782,6 @@ export default { const { fileName, extension: fileExtension, relativePath } = uploadTask; const extensionedFileName = fileExtension ? `${fileName}.${fileExtension}`: fileName; const distFileRelativePath = `${folderPath ? `${folderPath}\\`:''}${relativePath ? `${relativePath}`:''}`.replace(/(\\)+/g, '/'); - debugger; - // todo return workFileList.some(iFile => distFileRelativePath === iFile.relativePath && `${iFile.archName}${iFile.extension ? `.${iFile.extension}` : ''}` === extensionedFileName) }); if(ifHaveRepeatFile) {