haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-08 18:30:53 +00:00
Code Issues Releases Wiki Activity

Merge branch '7.0'

Browse Source
This commit is contained in:
shanshuirenjia
2020-04-11 17:58:52 +08:00
parent 9c8347f1a3 1f1b58f1db
commit 138814464f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/dirent-list-view/dirent-list-item.js
View File

@@ -76,7 +76,7 @@ class DirentListItem extends React.PureComponent {
}
componentWillReceiveProps(nextProps) {
if (!nextProps.isItemFreezed) {
if (nextProps.isItemFreezed !== this.props.isItemFreezed && !nextProps.isItemFreezed) {
this.setState({
highlight: false,
isOperationShow: false,

5
frontend/src/pages/lib-content-view/lib-content-view.js
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 = () => {