@@ -302,10 +302,11 @@ const system = { | |||||
// {"size":"","currentSize":"","unit":"","process":100,"hash":"QmPJ9i4z5UdoQpLH1DrkhZiTZra2rGicXiPabiLw4LvTmX"} | // {"size":"","currentSize":"","unit":"","process":100,"hash":"QmPJ9i4z5UdoQpLH1DrkhZiTZra2rGicXiPabiLw4LvTmX"} | ||||
uploadFile.FileSize = +size; | uploadFile.FileSize = +size; | ||||
uploadFile.IpfsCid = hash; | uploadFile.IpfsCid = hash; | ||||
const copyUploadFile = { ...uploadFile }; | |||||
if(!maybeFile) { | 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); | wrapErrorHint(res); | ||||
if(res.Code !== 0) { | if(res.Code !== 0) { | ||||
resolveError(res, uploadFile); | resolveError(res, uploadFile); | ||||
@@ -320,7 +321,7 @@ const system = { | |||||
} | } | ||||
}); | }); | ||||
socket.on('error', e => { | socket.on('error', e => { | ||||
onErrorHandler(e, uploadFile); | |||||
resolveError(e, uploadFile); | |||||
}); | }); | ||||
} | } | ||||
@@ -782,8 +782,6 @@ export default { | |||||
const { fileName, extension: fileExtension, relativePath } = uploadTask; | const { fileName, extension: fileExtension, relativePath } = uploadTask; | ||||
const extensionedFileName = fileExtension ? `${fileName}.${fileExtension}`: fileName; | const extensionedFileName = fileExtension ? `${fileName}.${fileExtension}`: fileName; | ||||
const distFileRelativePath = `${folderPath ? `${folderPath}\\`:''}${relativePath ? `${relativePath}`:''}`.replace(/(\\)+/g, '/'); | const distFileRelativePath = `${folderPath ? `${folderPath}\\`:''}${relativePath ? `${relativePath}`:''}`.replace(/(\\)+/g, '/'); | ||||
debugger; | |||||
// todo | |||||
return workFileList.some(iFile => distFileRelativePath === iFile.relativePath && `${iFile.archName}${iFile.extension ? `.${iFile.extension}` : ''}` === extensionedFileName) | return workFileList.some(iFile => distFileRelativePath === iFile.relativePath && `${iFile.archName}${iFile.extension ? `.${iFile.extension}` : ''}` === extensionedFileName) | ||||
}); | }); | ||||
if(ifHaveRepeatFile) { | if(ifHaveRepeatFile) { | ||||