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

feat: reuse sdoc editor,remove wiki editor

This commit is contained in:
liuhongbo
2024-05-21 10:13:54 +08:00
parent 2e9da8487e
commit 26bab1dfde
3 changed files with 41 additions and 22 deletions

View File

@@ -1,6 +1,6 @@
import React, { Component, Fragment } from 'react'; import React, { Component, Fragment } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { WikiViewer } from '@seafile/sdoc-editor'; import { SdocWikiViewer } from '@seafile/sdoc-editor';
import { gettext, repoID, siteRoot, username, isEditWiki } from '../../utils/constants'; import { gettext, repoID, siteRoot, username, isEditWiki } from '../../utils/constants';
import SeafileMarkdownViewer from '../../components/seafile-markdown-viewer'; import SeafileMarkdownViewer from '../../components/seafile-markdown-viewer';
import Loading from '../../components/loading'; import Loading from '../../components/loading';
@@ -8,7 +8,8 @@ import { Utils } from '../../utils/utils';
// import Search from '../../components/search/search'; // import Search from '../../components/search/search';
import Notification from '../../components/common/notification'; import Notification from '../../components/common/notification';
import Account from '../../components/common/account'; import Account from '../../components/common/account';
import SdocWikiPageViewer from '../../components/sdoc-wiki-page-viewer';
import './wiki.css';
const propTypes = { const propTypes = {
path: PropTypes.string.isRequired, path: PropTypes.string.isRequired,
@@ -162,7 +163,7 @@ class MainPanel extends Component {
/> />
)} */} )} */}
{isViewingFile && Utils.isSdocFile(this.props.path) && ( {isViewingFile && Utils.isSdocFile(this.props.path) && (
<WikiViewer <SdocWikiViewer
document={editorContent} document={editorContent}
showOutline={false} showOutline={false}
showToolbar={false} showToolbar={false}

View File

@@ -1,3 +1,7 @@
body {
overflow: hidden;
}
.wiki-side-panel .panel-top { .wiki-side-panel .panel-top {
background: #fff; background: #fff;
display: flex; display: flex;
@@ -8,7 +12,8 @@
flex: auto; flex: auto;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden; /* for ff */ overflow: hidden;
/* for ff */
border-right: 1px solid #eee; border-right: 1px solid #eee;
} }
@@ -152,20 +157,20 @@ img[src=""] {
flex: 1; flex: 1;
display: flex; display: flex;
min-height: 0; min-height: 0;
/* background-color: hotpink; */
} }
.sdoc-wiki-scroll-container { .sdoc-scroll-container {
display: flex; display: flex;
overflow: auto; overflow: auto;
} }
.sdoc-wiki-scroll-container .sdoc-article-container { .sdoc-scroll-container .sdoc-article-container {
padding-left: 10px; padding-top: 0;
padding-bottom: 0;
width: 100%; width: 100%;
} }
.sdoc-wiki-scroll-container .sdoc-article-container .article .sdoc-header-2 { .sdoc-scroll-container .sdoc-article-container .article .sdoc-header-2 {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
} }
@@ -179,14 +184,14 @@ img[src=""] {
width: 300px; width: 300px;
} }
.wiki-editor { .sdoc-editor-container {
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden; overflow: hidden;
} }
.wiki-editor .wiki-editor-header { .sdoc-editor-container .wiki-editor-header {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: 10px 20px; padding: 10px 20px;
@@ -196,18 +201,18 @@ img[src=""] {
z-index: 1000; z-index: 1000;
} }
.wiki-editor .wiki-editor-header .doc-ops { .sdoc-editor-container .wiki-editor-header .doc-ops {
display: flex; display: flex;
} }
.wiki-editor .wiki-viewer-container { .sdoc-editor-container .wiki-viewer-container {
display: flex; display: flex;
height: 100%; height: 100%;
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
} }
.wiki-editor .wiki-viewer-container .side-file-bar { .sdoc-editor-container .wiki-viewer-container .side-file-bar {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
@@ -215,22 +220,20 @@ img[src=""] {
border-right: 1px solid #e5e5e5; border-right: 1px solid #e5e5e5;
} }
.wiki-editor .wiki-viewer-container .side-file-bar { .sdoc-editor-container .wiki-viewer-container .side-file-bar {
padding: 20px; padding: 20px;
} }
.wiki-editor .wiki-viewer-container .side-file-bar .wiki-go-lib {} .sdoc-editor-container .wiki-viewer-container .side-file-bar .file-list .file-item {
.wiki-editor .wiki-viewer-container .side-file-bar .file-list .file-item {
padding: 20px; padding: 20px;
} }
.wiki-editor .wiki-viewer-container .side-file-bar .file-list .file-item.active { .sdoc-editor-container .wiki-viewer-container .side-file-bar .file-list .file-item.active {
background-color: #e5e5e5; background-color: #e5e5e5;
font-weight: bold; font-weight: bold;
} }
.wiki-editor .sdoc-wiki-outline-container { .sdoc-editor-container .sdoc-wiki-outline-container {
width: 280px; width: 280px;
} }
@@ -267,3 +270,8 @@ img[src=""] {
min-width: 1100px; min-width: 1100px;
width: 100%; width: 100%;
} }
.sdoc-editor-container .sdoc-editor-content .article {
width: 100%;
border: none;
}

View File

@@ -1,5 +1,15 @@
import React from 'react'; import React, { Suspense } from 'react';
import ReactDom from 'react-dom'; import ReactDom from 'react-dom';
import { I18nextProvider } from 'react-i18next';
import Wiki from './pages/wiki2'; import Wiki from './pages/wiki2';
import i18n from './_i18n/i18n-sdoc-editor';
import Loading from './components/loading';
ReactDom.render(<Wiki />, document.getElementById('wrapper')); ReactDom.render(
<I18nextProvider i18n={i18n}>
<Suspense fallback={<Loading />}>
<Wiki />
</Suspense>
</I18nextProvider>,
document.getElementById('wrapper')
);