@electerm/electerm-react 1.40.16 → 1.40.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -240,7 +240,7 @@ export default class TransferConflictStore extends Component {
|
|
|
240
240
|
} else {
|
|
241
241
|
toFile = await this.checkExist(typeTo, toPath, sessionId)
|
|
242
242
|
}
|
|
243
|
-
if (fromFile.isDirectory) {
|
|
243
|
+
if (fromFile.isDirectory && typeFrom !== typeTo) {
|
|
244
244
|
const props = {
|
|
245
245
|
sftp: window.sftps[sessionId]
|
|
246
246
|
}
|
|
@@ -380,12 +380,12 @@ export default class TransportAction extends Component {
|
|
|
380
380
|
})
|
|
381
381
|
this.inst.startTime = t
|
|
382
382
|
this.inst.started = true
|
|
383
|
-
if (
|
|
383
|
+
if (typeFrom === typeTo) {
|
|
384
|
+
return this.mvOrCp()
|
|
385
|
+
} else if (unzip && inited) {
|
|
384
386
|
this.unzipFile()
|
|
385
387
|
} else if (zip && inited) {
|
|
386
388
|
this.zipTransfer()
|
|
387
|
-
} else if (typeFrom === typeTo) {
|
|
388
|
-
return this.mvOrCp()
|
|
389
389
|
} else if (isDirectory && expanded && this.isTransferAction(action)) {
|
|
390
390
|
return this.mkdir()
|
|
391
391
|
.then(this.onEnd)
|