diff --git a/frontend/src/pages/wiki2/index.js b/frontend/src/pages/wiki2/index.js index 0210321a4a9..5d19ea50a6e 100644 --- a/frontend/src/pages/wiki2/index.js +++ b/frontend/src/pages/wiki2/index.js @@ -49,6 +49,7 @@ class Wiki extends Component { can_edit_file: false, seadoc_access_token: '', docUuid: '', + assets_url: '', }; window.onpopstate = this.onpopstate; @@ -206,6 +207,7 @@ class Wiki extends Component { this.removePythonWrapper(); wikiAPI.getWiki2FileContent(wikiId, filePath).then(res => { let data = res.data; + this.setState({ isDataLoading: false, content: data.content, @@ -214,6 +216,7 @@ class Wiki extends Component { latestContributor: data.latest_contributor, can_edit_file: data.can_edit_file, seadoc_access_token: data.seadoc_access_token, + assets_url: data.assets_url, }); }).catch(error => { let errorMsg = Utils.getErrorMsg(error); @@ -592,7 +595,7 @@ class Wiki extends Component { setCurrentPage={this.setCurrentPage} currentPageId={this.state.currentPageId} /> - {} + assets_url={this.state.assets_url} + /> diff --git a/frontend/src/pages/wiki2/main-panel.js b/frontend/src/pages/wiki2/main-panel.js index 36d3d2f4c88..270f91595e6 100644 --- a/frontend/src/pages/wiki2/main-panel.js +++ b/frontend/src/pages/wiki2/main-panel.js @@ -25,6 +25,7 @@ const propTypes = { onLinkClick: PropTypes.func.isRequired, can_edit_file: PropTypes.bool, seadoc_access_token: PropTypes.string, + assets_url: PropTypes.string, }; class MainPanel extends Component { @@ -94,10 +95,11 @@ class MainPanel extends Component { ...config, ...pageOptions, sdocServer, - assetsUrl, + assetsUrl: assetsUrl || props.assets_url, can_edit_file, accessToken: seadoc_access_token, serviceUrl: config.serviceURL, + assets_url: config.assetsUrl, }; return { ...props, docUuid: window.seafile.docUuid }; } @@ -147,7 +149,7 @@ class MainPanel extends Component {
{!this.props.pathExist && errMessage} {this.props.pathExist && this.props.isDataLoading && } - {isViewingFile && Utils.isMarkdownFile(this.props.path) && ( + {/* {isViewingFile && Utils.isMarkdownFile(this.props.path) && ( - )} - {this.props.seadoc_access_token && this.state.docUuid && isViewingFile && Utils.isSdocFile(this.props.path) && ( + )} */} + {isViewingFile && Utils.isSdocFile(this.props.path) && (