haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 15:09:14 +00:00
Code Issues Releases Wiki Activity

conflict fixed

Browse Source
This commit is contained in:
shanshuirenjia
2020-04-01 11:19:09 +08:00
parent 6181619f0e 54621adb8a
commit e9f3f8ed2e
25 changed files with 369 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
frontend/src/pages/lib-content-view/lib-content-view.js
View File

@@ -77,6 +77,7 @@ class LibContentView extends React.Component {
isSessionExpired: false,
isCopyMoveProgressDialogShow: false,
asyncCopyMoveTaskId: '',
asyncOperationType: 'move',
asyncOperationProgress: 0,
asyncOperatedFilesLength: 0,
};
@@ -632,18 +633,18 @@ class LibContentView extends React.Component {
// toolbar operations
onMoveItems = (destRepo, destDirentPath) => {
let repoID = this.props.repoID;
let direntPaths = this.getSelectedDirentPaths();
let dirNames = this.getSelectedDirentNames();
let selectedDirentList = this.state.selectedDirentList;
if (repoID !== destRepo.repo_id) {
this.setState({
asyncOperatedFilesLength: dirNames.length,
this.setState(() => ({
asyncOperatedFilesLength: selectedDirentList.length,
asyncOperationProgress: 0,
asyncOperationType: 'move',
isCopyMoveProgressDialogShow: true
});
}));
}
let dirNames = this.getSelectedDirentNames();
let direntPaths = this.getSelectedDirentPaths();
seafileAPI.moveDir(repoID, destRepo.repo_id, destDirentPath, this.state.path, dirNames).then(res => {
if (repoID !== destRepo.repo_id) {
this.setState({
@@ -682,17 +683,18 @@ class LibContentView extends React.Component {
onCopyItems = (destRepo, destDirentPath) => {
let repoID = this.props.repoID;
let dirNames = this.getSelectedDirentNames();
let selectedDirentList = this.state.selectedDirentList;
if (repoID !== destRepo.repo_id) {
this.setState({
asyncOperatedFilesLength: dirNames.length,
asyncOperatedFilesLength: selectedDirentList.length,
asyncOperationProgress: 0,
asyncOperationType: 'copy',
isCopyMoveProgressDialogShow: true
});
}
let dirNames = this.getSelectedDirentNames();
seafileAPI.copyDir(repoID, destRepo.repo_id, destDirentPath, this.state.path, dirNames).then(res => {
if (repoID !== destRepo.repo_id) {
this.setState({
@@ -1715,7 +1717,7 @@ class LibContentView extends React.Component {
}
let enableDirPrivateShare = false;
let { currentRepoInfo, userPerm } = this.state;
let { currentRepoInfo, userPerm, isCopyMoveProgressDialogShow } = this.state;
let showShareBtn = Utils.isHasPermissionToShare(currentRepoInfo, userPerm);
let isRepoOwner = currentRepoInfo.owner_email === username;
let isVirtual = currentRepoInfo.is_virtual;
@@ -1860,7 +1862,7 @@ class LibContentView extends React.Component {
)}
</div>
</div>
{this.state.isCopyMoveProgressDialogShow && (
{isCopyMoveProgressDialogShow && (
<CopyMoveDirentProgressDialog
type={this.state.asyncOperationType}
asyncOperatedFilesLength={this.state.asyncOperatedFilesLength}