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

add file-diff (#2398)

Browse Source
This commit is contained in:
cainiao222
2018-09-26 02:27:14 -07:00
committed by Daniel Pan
parent 7da4642806
commit 2d490b09cd
7 changed files with 63 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
frontend/src/file-history.js
View File

@@ -6,6 +6,7 @@ import URLDecorator from './utils/url-decorator';
import { processor } from '@seafile/seafile-editor/src/lib/seafile-markdown2html';
import SidePanel from './pages/file-history/side-panel';
import MainPanel from './pages/file-history/main-panel';
import axios from 'axios';
import 'seafile-ui';
import './assets/css/fa-solid.css';
import './assets/css/fa-regular.css';
@@ -23,39 +24,33 @@ class FileHistory extends React.Component {
content: '',
renderingContent: true,
fileOwner: '',
markdownContent: '',
markdownContentOld: ''
};
}
componentDidMount() {
let _this = this;
editUtilties.getFileDownloadLink(filePath).then(res => {
const downLoadUrl = res.data;
editUtilties.getFileContent(downLoadUrl).then((res) => {
let content = res.data;
processor.process(content, function(err, file) {
_this.setState({
renderingContent: false,
content: String(file)
});
});
});
setDiffContent = (markdownContent, markdownContentOld)=> {
this.setState({
renderingContent: false,
markdownContent: markdownContent,
markdownContentOld: markdownContentOld
});
}
onHistoryItemClick = (item) => {
onHistoryItemClick = (item, preCommitID)=> {
let _this = this;
let objID = item.rev_file_id;
let downLoadURL = URLDecorator.getUrl({type: 'download_historic_file', filePath: filePath, objID: objID});
let downLoadURL1 = URLDecorator.getUrl({type: 'download_historic_file', filePath: filePath, objID: preCommitID});
this.setState({renderingContent: true});
editUtilties.getFileContent(downLoadURL).then((res) => {
let content = res.data;
processor.process(content, function(err, file) {
_this.setState({
renderingContent: false,
content: String(file)
});
});
});
axios.all([
editUtilties.getFileContent(downLoadURL),
editUtilties.getFileContent(downLoadURL1)
]).then(axios.spread((res1, res2) => {
this.setDiffContent(res1.data, res2.data);
}));
}
render() {
@@ -64,11 +59,14 @@ class FileHistory extends React.Component {
<SidePanel
fileOwner={this.state.fileOwner}
onHistoryItemClick={this.onHistoryItemClick}
setDiffContent={this.setDiffContent}
/>
<MainPanel
content={this.state.content}
markdownContent={this.state.markdownContent}
markdownContentOld={this.state.markdownContentOld}
renderingContent={this.state.renderingContent}
/>
</div>
);
}