haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-05 08:53:14 +00:00
Code Issues Releases Wiki Activity

transform size

Browse Source
This commit is contained in:
王健辉
2019-04-24 14:49:39 +08:00
parent 11c8aef036
commit ed4ca6bc4e
2 changed files with 53 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
frontend/src/file-history-old.js
View File

@@ -30,8 +30,6 @@ class FileHistory extends React.Component {
filePath: '', filePath: '',
oldFilePath: '', oldFilePath: '',
isLoading: true, isLoading: true,
isError: false,
fileOwner: '',
isReloadingData: false, isReloadingData: false,
}; };
} }
@@ -51,7 +49,7 @@ class FileHistory extends React.Component {
this.setState({isLoading: false}); this.setState({isLoading: false});
throw Error('There is an error in server.'); throw Error('There is an error in server.');
} }
this.initResultState(res.data); this.initNewRecords(res.data);
}); });
} }
@@ -62,56 +60,46 @@ class FileHistory extends React.Component {
this.setState({isLoading: false}); this.setState({isLoading: false});
throw Error('There is an error in server.'); throw Error('There is an error in server.');
} }
this.initResultState(res.data); this.initOldRecords(res.data);
}); });
} }
initResultState(result) { initNewRecords(result) {
this.setState({
historyList: result.data,
currentPage: result.page,
hasMore: result.total_count > (PER_PAGE * this.state.currentPage),
isLoading: false,
});
}
initOldRecords(result) {
if (result.data.length) { if (result.data.length) {
if (useNewAPI) {
this.setState({
historyList: result.data,
currentPage: result.page,
hasMore: result.total_count > (PER_PAGE * this.state.currentPage),
isLoading: false,
isError: false,
fileOwner: result.data[0].creator_email,
});
} else {
this.setState({
historyList: result.data,
nextCommit: result.next_start_commit,
hasMore: result.next_start_commit ? true : false,
filePath: result.data[result.data.length-1].path,
oldFilePath: result.data[result.data.length-1].rev_renamed_old_path,
isLoading: false,
isError: false,
fileOwner: result.data[0].creator_email,
});
}
} else {
this.setState({ this.setState({
historyList: result.data,
nextCommit: result.next_start_commit, nextCommit: result.next_start_commit,
isError: false, filePath: result.data[result.data.length-1].path,
oldFilePath: result.data[result.data.length-1].rev_renamed_old_path,
isLoading: false,
}); });
} else {
this.setState({nextCommit: result.next_start_commit,});
if (this.state.nextCommit) { if (this.state.nextCommit) {
seafileAPI.listOldFileHistoryRecords(historyRepoID, filePath, this.state.nextCommit).then((res) => { seafileAPI.listOldFileHistoryRecords(historyRepoID, filePath, this.state.nextCommit).then((res) => {
this.initResultState(res.data); this.initOldRecords(res.data);
}); });
} }
} }
} }
onScrollHandler = (event) => { onScrollHandler = (event) => {
if (useNewAPI) { const clientHeight = event.target.clientHeight;
const clientHeight = event.target.clientHeight; const scrollHeight = event.target.scrollHeight;
const scrollHeight = event.target.scrollHeight; const scrollTop = event.target.scrollTop;
const scrollTop = event.target.scrollTop; const isBottom = (clientHeight + scrollTop + 1 >= scrollHeight);
const isBottom = (clientHeight + scrollTop + 1 >= scrollHeight); let hasMore = this.state.hasMore;
let hasMore = this.state.hasMore; if (isBottom && hasMore) {
if (isBottom && hasMore) { this.reloadMore();
this.reloadMore();
}
} }
} }
@@ -124,7 +112,7 @@ class FileHistory extends React.Component {
isReloadingData: true, isReloadingData: true,
}); });
editUtilties.listFileHistoryRecords(filePath, currentPage, PER_PAGE).then(res => { editUtilties.listFileHistoryRecords(filePath, currentPage, PER_PAGE).then(res => {
this.updateResultState(res.data); this.updateNewRecords(res.data);
this.setState({isReloadingData: false}); this.setState({isReloadingData: false});
}); });
} else { } else {
@@ -134,12 +122,12 @@ class FileHistory extends React.Component {
this.setState({isReloadingData: true}); this.setState({isReloadingData: true});
if (oldFilePath) { if (oldFilePath) {
seafileAPI.listOldFileHistoryRecords(historyRepoID, oldFilePath, commitID).then((res) => { seafileAPI.listOldFileHistoryRecords(historyRepoID, oldFilePath, commitID).then((res) => {
this.updateResultState(res.data); this.updateOldRecords(res.data);
this.setState({isReloadingData: false}); this.setState({isReloadingData: false});
}); });
} else { } else {
seafileAPI.listOldFileHistoryRecords(historyRepoID, filePath, commitID).then((res) => { seafileAPI.listOldFileHistoryRecords(historyRepoID, filePath, commitID).then((res) => {
this.updateResultState(res.data); this.updateOldRecords(res.data);
this.setState({isReloadingData: false}); this.setState({isReloadingData: false});
}); });
} }
@@ -147,37 +135,29 @@ class FileHistory extends React.Component {
} }
} }
updateResultState(result) { updateNewRecords(result) {
this.setState({
historyList: [...this.state.historyList, ...result.data],
currentPage: result.page,
hasMore: result.total_count > (PER_PAGE * this.state.currentPage),
isLoading: false,
});
}
updateOldRecords(result) {
if (result.data.length) { if (result.data.length) {
if (useNewAPI) {
this.setState({
historyList: [...this.state.historyList, ...result.data],
currentPage: result.page,
hasMore: result.total_count > (PER_PAGE * this.state.currentPage),
isLoading: false,
isError: false,
fileOwner: result.data[0].creator_email
});
} else {
this.setState({
historyList: [...this.state.historyList, ...result.data],
nextCommit: result.next_start_commit,
hasMore: result.next_start_commit ? true : false,
filePath: result.data[result.data.length-1].path,
oldFilePath: result.data[result.data.length-1].rev_renamed_old_path,
isLoading: false,
isError: false,
fileOwner: result.data[0].creator_email,
});
}
} else {
this.setState({ this.setState({
historyList: [...this.state.historyList, ...result.data],
nextCommit: result.next_start_commit, nextCommit: result.next_start_commit,
isError: false, filePath: result.data[result.data.length-1].path,
oldFilePath: result.data[result.data.length-1].rev_renamed_old_path,
isLoading: false,
}); });
} else {
this.setState({nextCommit: result.next_start_commit,});
if (this.state.nextCommit) { if (this.state.nextCommit) {
seafileAPI.listOldFileHistoryRecords(historyRepoID, filePath, this.state.nextCommit).then((res) => { seafileAPI.listOldFileHistoryRecords(historyRepoID, filePath, this.state.nextCommit).then((res) => {
this.updateResultState(res.data); this.updateOldRecords(res.data);
}); });
} }
} }
@@ -197,11 +177,11 @@ class FileHistory extends React.Component {
refershFileList() { refershFileList() {
if (useNewAPI) { if (useNewAPI) {
editUtilties.listFileHistoryRecords(filePath, 1, PER_PAGE).then((res) => { editUtilties.listFileHistoryRecords(filePath, 1, PER_PAGE).then((res) => {
this.initResultState(res.data); this.initNewRecords(res.data);
}); });
} else { } else {
seafileAPI.listOldFileHistoryRecords(historyRepoID, filePath).then((res) => { seafileAPI.listOldFileHistoryRecords(historyRepoID, filePath).then((res) => {
this.initResultState(res.data); this.initOldRecords(res.data);
}); });
} }
} }
@@ -267,7 +247,9 @@ class FileHistory extends React.Component {
</table> </table>
} }
{this.state.isReloadingData && <Loading />} {this.state.isReloadingData && <Loading />}
{this.state.hasMore && <Button className="get-more-btn" onClick={this.reloadMore}>{gettext('More')}</Button>} {this.state.nextCommit && !this.state.isLoading && !this.state.isReloadingData &&
<Button className="get-more-btn" onClick={this.reloadMore}>{gettext('More')}</Button>
}
</div> </div>
</div> </div>
</div> </div>

3
frontend/src/pages/file-history-old/history-item.js
View File

@@ -1,6 +1,7 @@
import React, { Fragment } from 'react'; import React, { Fragment } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import moment from 'moment'; import moment from 'moment';
import { Utils } from '../../utils/utils';
import { gettext, siteRoot, filePath, historyRepoID } from '../../utils/constants'; import { gettext, siteRoot, filePath, historyRepoID } from '../../utils/constants';
import URLDecorator from '../../utils/url-decorator'; import URLDecorator from '../../utils/url-decorator';
@@ -55,7 +56,7 @@ class HistoryItem extends React.Component {
<img className="avatar" src={item.creator_avatar_url}></img>{' '} <img className="avatar" src={item.creator_avatar_url}></img>{' '}
<a href={userProfileURL} target='_blank' className="username">{item.creator_name}</a> <a href={userProfileURL} target='_blank' className="username">{item.creator_name}</a>
</td> </td>
<td>{item.size}</td> <td>{Utils.bytesToSize(item.size)}</td>
<td> <td>
{this.state.active && {this.state.active &&
<span className="attr-action-icon"> <span className="attr-action-icon">