|
|
@@ -634,13 +634,13 @@ const system = { |
|
|
|
if(process !== 100 || !hash) return; |
|
|
|
socket.close(); |
|
|
|
|
|
|
|
let copyFile = cloneDeep(file); |
|
|
|
let copyFile = firstCharToUpperCase(cloneDeep(file)); |
|
|
|
copyFile.ModifyUserId = sessionStorage.userId; |
|
|
|
copyFile.historyPreIpfsCid = historyPreIpfsCid; |
|
|
|
copyFile.historyCurrentIpfsCid = commitHistoryHash; |
|
|
|
copyFile.HistoryPreIpfsCid = historyPreIpfsCid; |
|
|
|
copyFile.HistoryCurrentIpfsCid = commitHistoryHash; |
|
|
|
if(!isConflict) { // 选择本地文件为服务器最新commit |
|
|
|
copyFile.size = +size; |
|
|
|
copyFile.ipfsCid = hash; |
|
|
|
copyFile.Size = +size; |
|
|
|
copyFile.IpfsCid = hash; |
|
|
|
} |
|
|
|
// const copyFile = firstCharToUpperCase({ ...file, size: +size, ModifyUserId: sessionStorage.userId, |
|
|
|
// historyCurrentIpfsCid: commitHistoryHash, |
|
|
@@ -652,8 +652,8 @@ const system = { |
|
|
|
wrapErrorHint(res); |
|
|
|
// if(res.Code === 0) { notify.success(`${archName} 更新成功`); } |
|
|
|
if(isConflict) { // 若选择远端文件为服务器最新commit, 则输出回本地的copyFile需要将ipfsCid换成本地提交的commit |
|
|
|
copyFile.ipfsCid = hash; |
|
|
|
copyFile.size = +size; |
|
|
|
copyFile.IpfsCid = hash; |
|
|
|
copyFile.Size = +size; |
|
|
|
} |
|
|
|
onSuccessHandler(copyFile); |
|
|
|
return; |
|
|
|