haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-03 07:55:36 +00:00
Code Issues Releases Wiki Activity

update active item interactive (#3268)

Browse Source
This commit is contained in:
杨顺强
2019-04-13 13:35:33 +08:00
committed by Daniel Pan
parent 6c3061e1bf
commit 29b4208659
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,6 +135,7 @@ class DirentListItem extends React.Component {
// on '<tr>'
onDirentClick = (e) => {
// '<td>' is clicked
e.stopPropagation();
if (e.target.tagName == 'TD') {
this.props.onDirentClick(this.props.dirent);
}
@@ -493,7 +494,7 @@ class DirentListItem extends React.Component {
}
</Fragment> :
<Fragment>
{this.state.isOperationShow &&
{(this.state.isOperationShow || (activeDirent && dirent.name === activeDirent.name)) &&
<div className="operations">
<ul className="operation-group">
<li className="operation-group-item">

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

@@ -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' ? <span className="fas fa-caret-up"></span> : <span className="fas fa-caret-down"></span>;
return (
<div className="table-container" onMouseDown={this.onContainerMouseDown} onContextMenu={this.onContainerContextMenu}>
<div className="table-container" onMouseDown={this.onContainerMouseDown} onContextMenu={this.onContainerContextMenu} onClick={this.onContainerClick}>
<table>
<thead onMouseDown={this.onThreadMouseDown} onContextMenu={this.onThreadContextMenu}>
<tr>

1
frontend/src/components/dirent-list-view/dirent-menu.js
View File

@@ -149,6 +149,7 @@ class DirentMenu extends React.Component {
onDropdownToggleClick = (e) => {
e.preventDefault();
e.stopPropagation();
this.toggleOperationMenu();
}