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

fix deselect markdown file detail (#6780)

Browse Source
This commit is contained in:
Michael An
2024-09-14 15:29:26 +08:00
committed by GitHub
parent 227a9d5a90
commit 7f56426ad8
4 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/components/dir-view-mode/dir-column-view.js
View File

@@ -26,7 +26,6 @@ const propTypes = {
isTreeDataLoading: PropTypes.bool.isRequired, isTreeDataLoading: PropTypes.bool.isRequired,
treeData: PropTypes.object.isRequired, treeData: PropTypes.object.isRequired,
currentNode: PropTypes.object, currentNode: PropTypes.object,
currentDirent: PropTypes.object,
onNodeClick: PropTypes.func.isRequired, onNodeClick: PropTypes.func.isRequired,
onNodeCollapse: PropTypes.func.isRequired, onNodeCollapse: PropTypes.func.isRequired,
onNodeExpanded: PropTypes.func.isRequired, onNodeExpanded: PropTypes.func.isRequired,

15
frontend/src/components/dirent-grid-view/dirent-grid-item.js
View File

@@ -183,18 +183,8 @@ class DirentGridItem extends React.Component {
this.props.onGridItemMouseDown(event); this.props.onGridItemMouseDown(event);
}; };
getFileUrl = (url) => {
let fileUrlArr = url.split('/');
if (fileUrlArr.indexOf('48') !== -1) {
fileUrlArr.splice(fileUrlArr.indexOf('48'), 1, '192');
}
let fileUrl = fileUrlArr.join('/');
return fileUrl;
};
onGridItemContextMenu = (event) => { onGridItemContextMenu = (event) => {
let dirent = this.props.dirent; this.props.onGridItemContextMenu(event, this.props.dirent);
this.props.onGridItemContextMenu(event, dirent);
}; };
getTextRenderWidth = (text, font) => { getTextRenderWidth = (text, font) => {
@@ -245,7 +235,6 @@ class DirentGridItem extends React.Component {
let { dirent, path, repoID } = this.props; let { dirent, path, repoID } = this.props;
let direntPath = Utils.joinPath(path, dirent.name); let direntPath = Utils.joinPath(path, dirent.name);
let iconUrl = Utils.getDirentIcon(dirent, true); let iconUrl = Utils.getDirentIcon(dirent, true);
let fileUrl = dirent.encoded_thumbnail_src ? this.getFileUrl(dirent.encoded_thumbnail_src) : '';
let toolTipID = ''; let toolTipID = '';
let tagTitle = ''; let tagTitle = '';
@@ -289,7 +278,7 @@ class DirentGridItem extends React.Component {
onDrop={this.onGridItemDragDrop} onDrop={this.onGridItemDragDrop}
> >
{(this.canPreview && dirent.encoded_thumbnail_src) ? {(this.canPreview && dirent.encoded_thumbnail_src) ?
<img src={`${siteRoot}${fileUrl}`} className="thumbnail" onClick={this.onItemClick} alt=""/> : <img src={`${siteRoot}${dirent.encoded_thumbnail_src || ''}`} className="thumbnail" onClick={this.onItemClick} alt=""/> :
<img src={iconUrl} width="96" alt='' /> <img src={iconUrl} width="96" alt='' />
} }
{dirent.is_locked && <img className="grid-file-locked-icon" src={lockedImageUrl} alt={lockedMessage} title={lockedInfo}/>} {dirent.is_locked && <img className="grid-file-locked-icon" src={lockedImageUrl} alt={lockedMessage} title={lockedInfo}/>}

10
frontend/src/pages/lib-content-view/lib-content-view.js
View File

@@ -93,7 +93,7 @@ class LibContentView extends React.Component {
asyncOperationProgress: 0, asyncOperationProgress: 0,
asyncOperatedFilesLength: 0, asyncOperatedFilesLength: 0,
viewId: '0000', viewId: '0000',
currentDirent: {} currentDirent: null,
}; };
this.oldonpopstate = window.onpopstate; this.oldonpopstate = window.onpopstate;
@@ -1914,10 +1914,7 @@ class LibContentView extends React.Component {
}; };
onCloseMarkdownViewDialog = () => { onCloseMarkdownViewDialog = () => {
this.setState({ this.setState({ isViewFile: false });
isViewFile: false,
currentDirent: {},
});
}; };
onTreeNodeCollapse = (node) => { onTreeNodeCollapse = (node) => {
@@ -2193,7 +2190,7 @@ class LibContentView extends React.Component {
}; };
render() { render() {
let { currentRepoInfo, userPerm, isCopyMoveProgressDialogShow, isDeleteFolderDialogOpen, currentDirent, let { currentRepoInfo, userPerm, isCopyMoveProgressDialogShow, isDeleteFolderDialogOpen,
path, usedRepoTags } = this.state; path, usedRepoTags } = this.state;
if (this.state.libNeedDecrypt) { if (this.state.libNeedDecrypt) {
return ( return (
@@ -2358,7 +2355,6 @@ class LibContentView extends React.Component {
isSidePanelFolded={this.props.isSidePanelFolded} isSidePanelFolded={this.props.isSidePanelFolded}
isTreePanelShown={this.state.isTreePanelShown} isTreePanelShown={this.state.isTreePanelShown}
currentMode={this.state.currentMode} currentMode={this.state.currentMode}
currentDirent={currentDirent}
path={this.state.path} path={this.state.path}
repoID={this.props.repoID} repoID={this.props.repoID}
currentRepoInfo={this.state.currentRepoInfo} currentRepoInfo={this.state.currentRepoInfo}

2
frontend/src/utils/utils.js
View File

@@ -396,7 +396,7 @@ export const Utils = {
}, },
getDirentIcon: function (dirent, isBig) { getDirentIcon: function (dirent, isBig) {
if (!dirent) return mediaUrl + 'img/file/256/' + Utils.FILEEXT_ICON_MAP['default']; if (!dirent) return '';
let size = Utils.isHiDPI() ? 48 : 24; let size = Utils.isHiDPI() ? 48 : 24;
size = isBig ? 192 : size; size = isBig ? 192 : size;
if (dirent.isDir()) { if (dirent.isDir()) {