From 1f1b58f1dbaf16ffad3cef81f6ec9f1460e36e0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=A1=BA=E5=BC=BA?= <ysq9207@126.com>
Date: Sat, 11 Apr 2020 17:54:52 +0800
Subject: [PATCH] improve move copy code (#4522)

---
 frontend/src/components/dirent-list-view/dirent-list-item.js | 2 +-
 frontend/src/pages/lib-content-view/lib-content-view.js      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/dirent-list-view/dirent-list-item.js b/frontend/src/components/dirent-list-view/dirent-list-item.js
index 8431a4062e..79791a78a5 100644
--- a/frontend/src/components/dirent-list-view/dirent-list-item.js
+++ b/frontend/src/components/dirent-list-view/dirent-list-item.js
@@ -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,
diff --git a/frontend/src/pages/lib-content-view/lib-content-view.js b/frontend/src/pages/lib-content-view/lib-content-view.js
index 3244328fe8..930822e9b6 100644
--- a/frontend/src/pages/lib-content-view/lib-content-view.js
+++ b/frontend/src/pages/lib-content-view/lib-content-view.js
@@ -607,6 +607,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();
@@ -639,8 +641,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 = () => {