haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-10 19:29:56 +00:00
Code Issues Releases Wiki Activity

File history improve (#2707)

Browse Source
This commit is contained in:
杨顺强
2018-12-25 10:39:57 +08:00
committed by Daniel Pan
parent fbc9f2a9de
commit e1524f01a5
10 changed files with 218 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
frontend/src/components/history-list-view/history-list-view.js
View File

@@ -2,25 +2,41 @@ import React from 'react';
import PropTypes from 'prop-types';
import HisotyListItem from './history-list-item';
import Loading from '../loading';
import axios from 'axios';
import editUtilties from '../../utils/editor-utilties';
import URLDecorator from '../../utils/url-decorator';
import { filePath } from '../../utils/constants';
const propTypes = {
hasMore: PropTypes.bool.isRequired,
isReloadingData: PropTypes.bool.isRequired,
isItemFrezeed: PropTypes.bool.isRequired,
historyList: PropTypes.array.isRequired,
currentItem: PropTypes.object,
reloadMore: PropTypes.func.isRequired,
onMenuControlClick: PropTypes.func.isRequired,
onHistoryItemClick: PropTypes.func.isRequired,
setDiffContent: PropTypes.func.isRequired,
onItemClick: PropTypes.func.isRequired,
};
class HistoryListView extends React.Component {
constructor(props) {
super(props);
this.state = {
isItemFreezed: false,
currentItem: null,
};
}
componentDidMount = () => {
let historyList = this.props.historyList;
if (historyList.length > 0) {
this.setState({currentItem: historyList[0]});
if (historyList === 1) {
this.props.onItemClick(historyList[0]);
} else {
this.props.onItemClick(historyList[0], historyList[1]);
}
}
}
onFreezedItemToggle = () => {
this.setState({isItemFreezed: !this.state.isItemFreezed});
}
onScrollHandler = (event) => {
const clientHeight = event.target.clientHeight;
const scrollHeight = event.target.scrollHeight;
@@ -32,46 +48,30 @@ class HistoryListView extends React.Component {
}
}
componentDidMount() {
let historyList = this.props.historyList;
if (historyList.length > 1) {
let downLoadURL = URLDecorator.getUrl({type: 'download_historic_file', filePath: filePath, objID: historyList[0].rev_file_id});
let downLoadURL1 = URLDecorator.getUrl({type: 'download_historic_file', filePath: filePath, objID: historyList[1].rev_file_id});
axios.all([
editUtilties.getFileContent(downLoadURL),
editUtilties.getFileContent(downLoadURL1)
]).then(axios.spread((res1, res2) => {
this.props.setDiffContent(res1.data, res2.data);
}));
onItemClick = (item, currentIndex) => {
this.setState({currentItem: item});
if (currentIndex !== this.props.historyList.length) {
let preItem = this.props.historyList[currentIndex + 1];
this.props.onItemClick(item, preItem);
} else {
let downLoadURL = URLDecorator.getUrl({type: 'download_historic_file', filePath: filePath, objID: historyList[0].rev_file_id});
axios.all([
editUtilties.getFileContent(downLoadURL),
]).then(axios.spread((res1) => {
this.props.setDiffContent(res1.data, '');
}));
this.props.onItemClick(item);
}
}
render() {
return (
<ul className="history-list-container" onScroll={this.onScrollHandler}>
{this.props.historyList.map((item, index, historyList) => {
let preItemIndex = index + 1;
if (preItemIndex === historyList.length) {
preItemIndex = index;
}
{this.props.historyList.map((item, index) => {
return (
<HisotyListItem
key={index}
item={item}
isFirstItem={index === 0}
preCommitID={historyList[preItemIndex].rev_file_id}
currentItem={this.props.currentItem}
isItemFrezeed={this.props.isItemFrezeed}
onMenuControlClick={this.props.onMenuControlClick}
onHistoryItemClick={this.props.onHistoryItemClick}
index={index}
currentItem={this.state.currentItem}
isItemFreezed={this.state.isItemFreezed}
onItemClick={this.onItemClick}
onItemRestore={this.props.onItemRestore}
onFreezedItemToggle={this.onFreezedItemToggle}
/>
);
})}