1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-07 09:51:26 +00:00

Merge branch '7.0'

This commit is contained in:
shanshuirenjia
2020-04-11 17:58:52 +08:00
2 changed files with 5 additions and 2 deletions

View File

@@ -601,6 +601,8 @@ class LibContentView extends React.Component {
this.deleteTreeNode(this.currentMoveItemPath);
}
this.moveDirent(this.currentMoveItemName);
this.currentMoveItemName = '';
this.currentMoveItemPath = '';
} else {
if (this.state.currentMode === 'column') {
let direntPaths = this.getSelectedDirentPaths();
@@ -633,8 +635,9 @@ class LibContentView extends React.Component {
}
cancelCopyMoveDirent = () => {
let taskId = this.state.asyncCopyMoveTaskId;
let { taskId, direntList } = this.state.asyncCopyMoveTaskId;
seafileAPI.cancelCopyMoveOperation(taskId);
this.setState({direntList: direntList.slice(0)});
}
onMoveProgressDialogToggle = () => {