1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 07:01:12 +00:00

Standard loading (#3557)

* Loading circle

* Fix compilation warning

* Change cur-view-content from display:flex to display:block
This commit is contained in:
zxj96
2019-05-28 15:16:27 +08:00
committed by Daniel Pan
parent b0ae1d7812
commit 3959433a8f
6 changed files with 17 additions and 19 deletions

View File

@@ -301,7 +301,7 @@ class FileChooser extends React.Component {
let selectedItemInfo = {
repoID: item.repo_id,
filePath: item.path,
}
};
this.setState({
selectedItemInfo: selectedItemInfo

View File

@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import TreeListView from './tree-list-view'
import TreeListView from './tree-list-view';
import TreeNode from '../../components/tree-view/tree-node';
import Dirent from '../../models/dirent';
@@ -34,10 +34,10 @@ class RepoListItem extends React.Component {
let repoID = this.props.repo.repo_id;
seafileAPI.listDir(repoID, '/').then(res => {
let tree = this.state.treeData.clone();
let direntList = res.data.dirent_list.filter(item => item.type === 'dir')
let direntList = res.data.dirent_list.filter(item => item.type === 'dir');
this.addResponseListToNode(direntList, tree.root);
this.setState({treeData: tree});
})
});
if (this.props.selectedItemInfo.repoID === this.props.repo.repo_id) {
this.setState({isShowChildren: true});
@@ -65,7 +65,7 @@ class RepoListItem extends React.Component {
node = tree.getNodeByPath(node.path);
if (!node.isLoaded) {
seafileAPI.listDir(repoID, node.path).then(res => {
let direntList = res.data.dirent_list.filter(item => item.type === 'dir')
let direntList = res.data.dirent_list.filter(item => item.type === 'dir');
this.addResponseListToNode(direntList, node);
this.setState({treeData: tree});
});

View File

@@ -34,13 +34,13 @@ class SearchedListView extends React.Component {
<tbody>
{this.props.searchResults.map((item, index) => {
return (
<SearchedListItem
key={index}
item={item}
currentItem={this.state.currentItem}
onItemClick={this.onItemClick}
onSearchedItemDoubleClick={this.props.onSearchedItemDoubleClick}
/>);
<SearchedListItem
key={index}
item={item}
currentItem={this.state.currentItem}
onItemClick={this.onItemClick}
onSearchedItemDoubleClick={this.props.onSearchedItemDoubleClick}
/>);
})}
</tbody>
</table>

View File

@@ -19,7 +19,7 @@ class TreeViewItem extends React.Component {
this.state = {
filePath: filePath,
}
};
}
onToggleClick = (e) => {
@@ -62,16 +62,15 @@ class TreeViewItem extends React.Component {
node={item}
onNodeCollapse={this.props.onNodeCollapse}
onNodeExpanded={this.props.onNodeExpanded}
onNodeClick={this.props.onTreeNodeClick}
repo={this.props.repo}
onDirentItemClick={this.props.onDirentItemClick}
selectedRepo={this.props.selectedRepo}
selectedPath={this.props.selectedPath}
fileSuffixes={this.props.fileSuffixes}
/>)
/>);
})}
</div>
)
);
}
render() {
@@ -80,7 +79,7 @@ class TreeViewItem extends React.Component {
let isCurrentPath = this.props.selectedPath === this.state.filePath;
return(
<div className={`file-chooser-item `}>
<div className="file-chooser-item">
<div className={`${node.path === '/'? 'hide': ''}`}>
<span className={`item-toggle fa ${node.isExpanded ? 'fa-caret-down' : 'fa-caret-right'}`} onClick={this.onToggleClick}></span>
<span className={`item-info ${(isCurrentRepo && isCurrentPath) ? 'item-active' : ''}`} onClick={this.onItemClick}>

View File

@@ -21,7 +21,6 @@ class TreeListView extends React.Component {
node={this.props.treeData.root}
onNodeCollapse={this.props.onNodeCollapse}
onNodeExpanded={this.props.onNodeExpanded}
onNodeClick={this.props.onTreeNodeClick}
repo={this.props.repo}
onDirentItemClick={this.props.onDirentItemClick}
selectedRepo={this.props.selectedRepo}