1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-17 15:53:28 +00:00

12.0 change sdoc content (#6121)

* fix warnings in 12.0

* get wiki sdoc content from sdoc server

* optimize code

* change page search params

* Add repo_name for wiki name

---------

Co-authored-by: ‘JoinTyang’ <yangtong1009@163.com>
This commit is contained in:
Michael An
2024-05-29 11:51:52 +08:00
committed by GitHub
parent b76bad303a
commit 96aa207802
9 changed files with 177 additions and 58 deletions

View File

@@ -12,7 +12,7 @@ const propTypes = {
pathExist: PropTypes.bool.isRequired,
isViewFile: PropTypes.bool.isRequired,
isDataLoading: PropTypes.bool.isRequired,
content: PropTypes.string,
editorContent: PropTypes.object,
permission: PropTypes.string,
lastModified: PropTypes.string,
latestContributor: PropTypes.string,
@@ -103,13 +103,11 @@ class MainPanel extends Component {
render() {
const errMessage = (<div className="message err-tip">{gettext('Folder does not exist.')}</div>);
const { content, permission, pathExist, isDataLoading, isViewFile } = this.props;
const { permission, pathExist, isDataLoading, isViewFile } = this.props;
const isViewingFile = pathExist && !isDataLoading && isViewFile;
const editorContent = content && JSON.parse(content);
const isReadOnly = !(permission === 'rw');
return (
<div className="wiki2-main-panel">
<div className="main-panel-hide hide">{this.props.content}</div>
<div className='wiki2-main-panel-north'>
<WikiTopNav
config={this.props.config}
@@ -125,7 +123,7 @@ class MainPanel extends Component {
{this.props.pathExist && this.props.isDataLoading && <Loading />}
{isViewingFile && Utils.isSdocFile(this.props.path) && (
<SdocWikiViewer
document={editorContent}
document={this.props.editorContent}
showOutline={false}
showToolbar={false}
docUuid={this.state.docUuid}