haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-02 23:48:47 +00:00
Code Issues Releases Wiki Activity

Active item bug repair (#3260)

Browse Source 
* repair interactive bug

* modify active color

* repair bug
This commit is contained in:
杨顺强
2019-04-13 09:57:44 +08:00
committed by Daniel Pan
parent 8ac5c9be9b
commit fce77f9985
4 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -303,10 +303,14 @@ class DirentListView extends React.Component {
this.handleContextClick(event, id, menuList); this.handleContextClick(event, id, menuList);
} else { } else {
if (this.props.selectedDirentList.length === 1) { if (this.props.selectedDirentList.length === 1) {
let dirent = this.props.selectedDirentList[0]; this.props.onDirentClick(null);
let id = 'dirent-item-menu'; event.preventDefault();
let menuList = this.getDirentItemMenuList(dirent, true); event.persist();
this.handleContextClick(event, id, menuList, dirent); setTimeout(() => {
let id = "dirent-container-menu"
let menuList = [TextTranslation.NEW_FOLDER, TextTranslation.NEW_FILE];
this.handleContextClick(event, id, menuList);
}, 0);
} else { } else {
let id = 'dirents-menu'; let id = 'dirents-menu';
let menuList = [TextTranslation.MOVE, TextTranslation.COPY, TextTranslation.DOWNLOAD, TextTranslation.DELETE]; let menuList = [TextTranslation.MOVE, TextTranslation.COPY, TextTranslation.DOWNLOAD, TextTranslation.DELETE];
@@ -366,12 +370,11 @@ class DirentListView extends React.Component {
} }
onItemContextMenu = (event, dirent) => { onItemContextMenu = (event, dirent) => {
if (this.props.selectedDirentList.length === 0) { this.props.onDirentClick(dirent);
let id = 'dirent-item-menu'; let id = 'dirent-item-menu';
let menuList = this.getDirentItemMenuList(dirent, true); let menuList = this.getDirentItemMenuList(dirent, true);
this.handleContextClick(event, id, menuList, dirent); this.handleContextClick(event, id, menuList, dirent);
} }
}
setDirentItemRef = (index) => item => { setDirentItemRef = (index) => item => {
this.direntItems[index] = item; this.direntItems[index] = item;

3
frontend/src/components/tree-view/tree-view.js
View File

@@ -137,9 +137,6 @@ class TreeView extends React.Component {
} }
handleContextClick = (event, node) => { handleContextClick = (event, node) => {
if (this.props.selectedDirentList.length) {
return;
}
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();

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

@@ -749,12 +749,20 @@ class LibContentView extends React.Component {
dirent.isSelected = false; dirent.isSelected = false;
return dirent; return dirent;
}); });
if (dirent) {
dirent.isSelected = true; dirent.isSelected = true;
this.setState({ this.setState({
direntList: direntList, direntList: direntList,
isDirentSelected: true, isDirentSelected: true,
selectedDirentList: [dirent], selectedDirentList: [dirent],
}) });
} else {
this.setState({
direntList: direntList,
isDirentSelected: false,
selectedDirentList: [],
});
}
} }
onItemClick = (dirent) => { onItemClick = (dirent) => {

2
media/css/seahub_react.css
View File

@@ -908,7 +908,7 @@ table td {
} }
.tr-active { .tr-active {
background-color: #eee !important; background-color: #f2f4f6 !important;
} }
/* table-item reanme-component */ /* table-item reanme-component */