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

Column detail bug repair (#3286)

Browse Source 
* repair detail bug

* repair add related file in detial panel bug
This commit is contained in:
杨顺强
2019-04-16 18:21:02 +08:00
committed by Daniel Pan
parent 9323c3a758
commit 538d289fd7
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/components/dirent-detail/detail-list-view.js
View File

@@ -54,10 +54,18 @@ class DetailListView extends React.Component {
} }
getDirentPath = () => { getDirentPath = () => {
if (Utils.isMarkdownFile(this.props.path)) {
return this.props.path; // column mode: view file
}
let { dirent, path } = this.props; let { dirent, path } = this.props;
return Utils.joinPath(path, dirent.name); return Utils.joinPath(path, dirent.name);
} }
onRelatedFileChange = () => {
let direntPath = this.getDirentPath();
this.props.onRelatedFileChange(this.props.dirent, direntPath);
}
onListRelatedFileToggle = () => { onListRelatedFileToggle = () => {
this.setState({ this.setState({
showRelatedFileDialog: true, showRelatedFileDialog: true,
@@ -138,7 +146,7 @@ class DetailListView extends React.Component {
filePath={direntPath} filePath={direntPath}
relatedFiles={relatedFiles} relatedFiles={relatedFiles}
toggleCancel={this.toggleCancel} toggleCancel={this.toggleCancel}
onRelatedFileChange={this.props.onRelatedFileChange} onRelatedFileChange={this.onRelatedFileChange}
dirent={this.props.dirent} dirent={this.props.dirent}
viewMode="list_related_file" viewMode="list_related_file"
/> />

6
frontend/src/components/dirent-detail/dirent-details.js
View File

@@ -104,9 +104,7 @@ class DirentDetail extends React.Component {
} }
} }
onRelatedFileChange = () => { onRelatedFileChange = (dirent, direntPath) => {
let { dirent, path } = this.props;
let direntPath = Utils.joinPath(path, dirent.name);
this.updateDetailView(dirent, direntPath); this.updateDetailView(dirent, direntPath);
} }
@@ -119,7 +117,7 @@ class DirentDetail extends React.Component {
let smallIconUrl = dirent ? Utils.getDirentIcon(dirent) : Utils.getDirentIcon(folderDirent); let smallIconUrl = dirent ? Utils.getDirentIcon(dirent) : Utils.getDirentIcon(folderDirent);
let bigIconUrl = dirent ? Utils.getDirentIcon(dirent, true) : Utils.getDirentIcon(folderDirent, true); let bigIconUrl = dirent ? Utils.getDirentIcon(dirent, true) : Utils.getDirentIcon(folderDirent, true);
const isImg = Utils.imageCheck(dirent.name); const isImg = dirent ? Utils.imageCheck(dirent.name) : Utils.imageCheck(folderDirent.name);
if (isImg) { if (isImg) {
bigIconUrl = '/' + dirent.encoded_thumbnail_src; bigIconUrl = '/' + dirent.encoded_thumbnail_src;
smallIconUrl = '/' + dirent.encoded_thumbnail_src; smallIconUrl = '/' + dirent.encoded_thumbnail_src;