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 a3593b9723..80c134e645 100644
--- a/frontend/src/components/dirent-list-view/dirent-list-item.js
+++ b/frontend/src/components/dirent-list-view/dirent-list-item.js
@@ -135,6 +135,7 @@ class DirentListItem extends React.Component {
// on '
'
onDirentClick = (e) => {
// '' is clicked
+ e.stopPropagation();
if (e.target.tagName == 'TD') {
this.props.onDirentClick(this.props.dirent);
}
@@ -493,7 +494,7 @@ class DirentListItem extends React.Component {
}
:
- {this.state.isOperationShow &&
+ {(this.state.isOperationShow || (activeDirent && dirent.name === activeDirent.name)) &&
-
diff --git a/frontend/src/components/dirent-list-view/dirent-list-view.js b/frontend/src/components/dirent-list-view/dirent-list-view.js
index 1091124c1c..a9e13eee60 100644
--- a/frontend/src/components/dirent-list-view/dirent-list-view.js
+++ b/frontend/src/components/dirent-list-view/dirent-list-view.js
@@ -306,6 +306,12 @@ class DirentListView extends React.Component {
}
// table-container contextmenu handle
+ onContainerClick = () => {
+ if (this.state.activeDirent) {
+ this.onDirentClick(null);
+ }
+ }
+
onContainerMouseDown = (event) => {
this.onMouseDown(event);
}
@@ -448,18 +454,18 @@ class DirentListView extends React.Component {
contextmenuList = this.props.showShareBtn ? [SHARE, DOWNLOAD, DELETE, 'Divider'] : [DOWNLOAD, DELETE, 'Divider'];
}
- let { RENAME, MOVE, COPY, PERMISSION, DETAILS, OPEN_VIA_CLIENT, LOCK, UNLOCK, COMMENT, HISTORY, ACCESS_LOG } = TextTranslation;
+ let { RENAME, MOVE, COPY, PERMISSION, OPEN_VIA_CLIENT, LOCK, UNLOCK, COMMENT, HISTORY, ACCESS_LOG } = TextTranslation;
if (type === 'dir' && permission === 'rw') {
if (can_set_folder_perm) {
- menuList = [...contextmenuList, RENAME, MOVE, COPY, 'Divider', PERMISSION, DETAILS, 'Divider', OPEN_VIA_CLIENT];
+ menuList = [...contextmenuList, RENAME, MOVE, COPY, 'Divider', PERMISSION, 'Divider', OPEN_VIA_CLIENT];
} else {
- menuList = [...contextmenuList, RENAME, MOVE, COPY, 'Divider', DETAILS, 'Divider', OPEN_VIA_CLIENT];
+ menuList = [...contextmenuList, RENAME, MOVE, COPY, 'Divider', OPEN_VIA_CLIENT];
}
return menuList;
}
if (type === 'dir' && permission === 'r') {
- menuList = currentRepoInfo.encrypted ? [...contextmenuList, COPY, DETAILS] : [DETAILS];
+ menuList = currentRepoInfo.encrypted ? [...contextmenuList, COPY] : [];
return menuList;
}
@@ -487,7 +493,6 @@ class DirentListView extends React.Component {
if (fileAuditEnabled) {
menuList.push(ACCESS_LOG);
}
- menuList.push(DETAILS);
menuList.push('Divider');
menuList.push(OPEN_VIA_CLIENT);
return menuList;
@@ -502,7 +507,6 @@ class DirentListView extends React.Component {
menuList.push(COMMENT);
}
menuList.push(HISTORY);
- menuList.push(DETAILS);
return menuList;
}
}
@@ -520,7 +524,7 @@ class DirentListView extends React.Component {
const sortIcon = sortOrder == 'asc' ? : ;
return (
-
+
diff --git a/frontend/src/components/dirent-list-view/dirent-menu.js b/frontend/src/components/dirent-list-view/dirent-menu.js
index 61304afd94..370fdd51a0 100644
--- a/frontend/src/components/dirent-list-view/dirent-menu.js
+++ b/frontend/src/components/dirent-list-view/dirent-menu.js
@@ -149,6 +149,7 @@ class DirentMenu extends React.Component {
onDropdownToggleClick = (e) => {
e.preventDefault();
+ e.stopPropagation();
this.toggleOperationMenu();
}
diff --git a/frontend/src/css/layout.css b/frontend/src/css/layout.css
index 3c0677b15b..987ea4bc9f 100644
--- a/frontend/src/css/layout.css
+++ b/frontend/src/css/layout.css
@@ -117,6 +117,7 @@
.table-container {
flex: 1;
+ padding-bottom: 20rem;
}
.cur-view-content .article {
|