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

Modify some format

Browse Source
This commit is contained in:
zxj96
2019-04-24 10:24:09 +08:00
parent 301effa623
commit 9c3c63c743
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/dir-view-mode/dir-column-nav.js
View File

@@ -248,7 +248,7 @@ class DirColumnNav extends React.Component {
})); }));
} }
handleScroll = (e) => { stopTreeScrollPropagation = (e) => {
e.stopPropagation(); e.stopPropagation();
} }
@@ -257,7 +257,7 @@ class DirColumnNav extends React.Component {
const select = this.props.inResizing ? 'none' : ''; const select = this.props.inResizing ? 'none' : '';
return ( return (
<Fragment> <Fragment>
<div className="dir-content-nav" role="navigation" style={{flex: (flex), userSelect: select}} onScroll={this.handleScroll}> <div className="dir-content-nav" role="navigation" style={{flex: (flex), userSelect: select}} onScroll={this.stopTreeScrollPropagation}>
{this.props.isTreeDataLoading ? {this.props.isTreeDataLoading ?
(<Loading/>) : (<Loading/>) :
(<TreeView (<TreeView

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

@@ -523,6 +523,7 @@ class DirentListView extends React.Component {
render() { render() {
const { direntList, sortBy, sortOrder } = this.props; const { direntList, sortBy, sortOrder } = this.props;
if (this.props.isDirentListLoading) { if (this.props.isDirentListLoading) {
return (<Loading />); return (<Loading />);
} }

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

@@ -227,8 +227,6 @@ class LibContentContainer extends React.Component {
onItemsCopy={this.props.onItemsCopy} onItemsCopy={this.props.onItemsCopy}
onItemsDelete={this.props.onItemsDelete} onItemsDelete={this.props.onItemsDelete}
onFileTagChanged={this.props.onFileTagChanged} onFileTagChanged={this.props.onFileTagChanged}
itemShownLimit={this.props.itemShownLimit}
onPageScroll={this.props.onPageScroll}
/> />
)} )}
{this.props.currentMode === 'grid' && ( {this.props.currentMode === 'grid' && (
@@ -260,8 +258,6 @@ class LibContentContainer extends React.Component {
isDirentDetailShow={this.props.isDirentDetailShow} isDirentDetailShow={this.props.isDirentDetailShow}
onItemRename={this.props.onItemRename} onItemRename={this.props.onItemRename}
onFileTagChanged={this.props.onFileTagChanged} onFileTagChanged={this.props.onFileTagChanged}
itemShownLimit={this.props.itemShownLimit}
onPageScroll={this.props.onPageScroll}
/> />
)} )}
{this.props.currentMode === 'column' && ( {this.props.currentMode === 'column' && (
@@ -322,8 +318,6 @@ class LibContentContainer extends React.Component {
onItemsCopy={this.props.onItemsCopy} onItemsCopy={this.props.onItemsCopy}
onItemsDelete={this.props.onItemsDelete} onItemsDelete={this.props.onItemsDelete}
onFileTagChanged={this.props.onFileTagChanged} onFileTagChanged={this.props.onFileTagChanged}
itemShownLimit={this.props.itemShownLimit}
onPageScroll={this.props.onPageScroll}
/> />
)} )}
</Fragment> </Fragment>