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

Merge pull request #6128 from haiwen/fix-sdoc-no-history-style

Browse Source 
fix sdoc history no result style
This commit is contained in:
杨顺强
2024-05-30 10:10:32 +08:00
committed by GitHub
parent 2d6679343b c6f12bc092
commit 3ab4fe82fb
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/pages/sdoc/sdoc-file-history/index.css
View File

@@ -93,11 +93,7 @@
.sdoc-file-history .sdoc-file-history-content .sdoc-file-history-viewer { .sdoc-file-history .sdoc-file-history-content .sdoc-file-history-viewer {
width: 100%; width: 100%;
min-height: 120px; height: calc(100vh - 50px);
flex: 1;
background-color: #fff;
word-break: break-word;
border: 1px solid #e6e6dd;
} }
.sdoc-file-history .sdoc-file-history-container .sdoc-file-history-content .sdoc-editor-content { .sdoc-file-history .sdoc-file-history-container .sdoc-file-history-content .sdoc-editor-content {
@@ -364,10 +360,6 @@
padding: 0; padding: 0;
} }
.sdoc-file-history .sdoc-file-history-content .sdoc-file-history-viewer {
border: none;
}
.markdown-viewer-render-content { .markdown-viewer-render-content {
margin: 20px; margin: 20px;
} }

9
frontend/src/pages/sdoc/sdoc-file-history/index.js
View File

@@ -339,12 +339,15 @@ class SdocFileHistory extends React.Component {
const path = [0, 0, 0]; const path = [0, 0, 0];
const { isShowChanges } = this.state; const { isShowChanges } = this.state;
this.onSelectHistoryVersion(...getCurrentAndLastVersion(path, historyGroups, isShowChanges)); this.onSelectHistoryVersion(...getCurrentAndLastVersion(path, historyGroups, isShowChanges));
} else {
this.setState({ isLoading: false });
} }
}).catch((error) => { }).catch((error) => {
const errorMessage = 'there has an error in server'; const errorMessage = 'there has an error in server';
const isLoading = false; this.setState({
this.setState({ isLoading }); isLoading: false,
this.setState({ sidePanelInitData: { isLoading, errorMessage } }); sidePanelInitData: { isLoading: false, errorMessage }
});
throw Error(errorMessage); throw Error(errorMessage);
}); });
} }