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

order file-chooser list (#2791)

Browse Source
This commit is contained in:
杨顺强
2019-01-09 14:40:36 +08:00
committed by Daniel Pan
parent 9c230cc5db
commit 300251b5b1
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/file-chooser/dirent-list-item.js
View File

@@ -2,6 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { seafileAPI } from '../../utils/seafile-api'; import { seafileAPI } from '../../utils/seafile-api';
import Dirent from '../../models/dirent'; import Dirent from '../../models/dirent';
import { Utils } from '../../utils/utils';
const propTypes = { const propTypes = {
isShowFile: PropTypes.bool, isShowFile: PropTypes.bool,
@@ -52,6 +53,7 @@ class DirentListItem extends React.Component {
direntList.push(dirent); direntList.push(dirent);
} }
} }
direntList = Utils.sortDirents(direntList, 'name', 'asc');
this.setState({ this.setState({
hasRequest: true, hasRequest: true,
direntList: direntList, direntList: direntList,

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

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
import { seafileAPI } from '../../utils/seafile-api'; import { seafileAPI } from '../../utils/seafile-api';
import Dirent from '../../models/dirent'; import Dirent from '../../models/dirent';
import DirentListItem from './dirent-list-item'; import DirentListItem from './dirent-list-item';
import { Utils } from '../../utils/utils';
const propTypes = { const propTypes = {
isShowFile: PropTypes.bool, isShowFile: PropTypes.bool,
@@ -29,14 +30,14 @@ class DirentListView extends React.Component {
if (this.props.isShowFile === true) { if (this.props.isShowFile === true) {
let dirent = new Dirent(item); let dirent = new Dirent(item);
direntList.push(dirent); direntList.push(dirent);
} else {
if (item.type === 'dir') {
let dirent = new Dirent(item);
direntList.push(dirent);
}
} }
else if (item.type === 'dir') { direntList = Utils.sortDirents(direntList, 'name', 'asc');
let dirent = new Dirent(item); this.setState({direntList: direntList});
direntList.push(dirent);
}
this.setState({
direntList: direntList,
});
}); });
}); });
} }

2
frontend/src/components/file-chooser/file-chooser.js
View File

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
import RepoListView from './repo-list-view'; import RepoListView from './repo-list-view';
import { seafileAPI } from '../../utils/seafile-api'; import { seafileAPI } from '../../utils/seafile-api';
import { gettext } from '../../utils/constants'; import { gettext } from '../../utils/constants';
import { Utils } from '../../utils/utils';
import RepoInfo from '../../models/repo-info'; import RepoInfo from '../../models/repo-info';
import '../../css/file-chooser.css'; import '../../css/file-chooser.css';
@@ -63,6 +64,7 @@ class FileChooser extends React.Component {
repoList.push(repos[i]); repoList.push(repos[i]);
repoIdList.push(repos[i].repo_id); repoIdList.push(repos[i].repo_id);
} }
repoList = Utils.sortRepos(repoList, 'name', 'asc');
this.setState({ this.setState({
repoList: repoList, repoList: repoList,
isOtherRepoShow: !this.state.isOtherRepoShow, isOtherRepoShow: !this.state.isOtherRepoShow,