From fe9bd17c4c57292e552bc214438f36c1cba1c64d Mon Sep 17 00:00:00 2001 From: yinjianfei <1358009667@qq.com> Date: Sat, 7 Sep 2024 18:03:30 +0800 Subject: [PATCH 1/2] fix-markdown-view --- frontend/src/components/cur-dir-path/dir-path.js | 6 +++--- frontend/src/components/dir-view-mode/dir-column-file.js | 2 +- frontend/src/pages/lib-content-view/lib-content-view.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/cur-dir-path/dir-path.js b/frontend/src/components/cur-dir-path/dir-path.js index c9b1be55a7e..a49082023bb 100644 --- a/frontend/src/components/cur-dir-path/dir-path.js +++ b/frontend/src/components/cur-dir-path/dir-path.js @@ -249,7 +249,7 @@ class DirPath extends React.Component { / )} - {(currentPath === '/' || currentPath === '') ? + {(currentPath === '/' || currentPath === '' || Utils.isMarkdownFile(this.props.currentPath)) ? : {repoName} } - {pathElem} - {this.props.isViewFile && !this.isViewMetadata() && ( + {Utils.isMarkdownFile(this.props.currentPath) ? null : pathElem} + {this.props.isViewFile && !Utils.isMarkdownFile(this.props.currentPath) && !this.isViewMetadata() && ( )} {(this.props.isViewFile && fileTags.length !== 0) && diff --git a/frontend/src/components/dir-view-mode/dir-column-file.js b/frontend/src/components/dir-view-mode/dir-column-file.js index 8ba6afe1c24..91f7ade9159 100644 --- a/frontend/src/components/dir-view-mode/dir-column-file.js +++ b/frontend/src/components/dir-view-mode/dir-column-file.js @@ -52,7 +52,7 @@ class DirColumnFile extends React.Component { render() { const { currentDirent } = this.props; - const { name } = currentDirent; + const { name } = currentDirent || {}; if (this.props.isFileLoadedErr) { return ( diff --git a/frontend/src/pages/lib-content-view/lib-content-view.js b/frontend/src/pages/lib-content-view/lib-content-view.js index ca2015278a7..cb66fd6eb33 100644 --- a/frontend/src/pages/lib-content-view/lib-content-view.js +++ b/frontend/src/pages/lib-content-view/lib-content-view.js @@ -91,7 +91,7 @@ class LibContentView extends React.Component { asyncOperationProgress: 0, asyncOperatedFilesLength: 0, viewId: '0000', - currentDirent: null + currentDirent: {} }; this.oldonpopstate = window.onpopstate; From 92f4b95babdfd5894309f6651df0c792b20c096b Mon Sep 17 00:00:00 2001 From: yinjianfei <1358009667@qq.com> Date: Sat, 7 Sep 2024 18:25:46 +0800 Subject: [PATCH 2/2] fix style --- frontend/src/components/dir-view-mode/dir-column-file.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/dir-view-mode/dir-column-file.css b/frontend/src/components/dir-view-mode/dir-column-file.css index 43bbbf97537..ea223e9b2d9 100644 --- a/frontend/src/components/dir-view-mode/dir-column-file.css +++ b/frontend/src/components/dir-view-mode/dir-column-file.css @@ -27,7 +27,7 @@ .seafile-markdown-viewer-modal-body { padding: 0; - height: 600px; + height: calc(100vh / 2 + 130px); overflow: auto; }