From db8c2b6ab2a8254d1bfa8d5d0ea7fe3b37edd0e6 Mon Sep 17 00:00:00 2001 From: shanshuirenjia <978987373@qq.com> Date: Wed, 25 May 2022 15:22:43 +0800 Subject: [PATCH] update seafile-editor import method --- frontend/src/components/dialog/readme-dialog.js | 2 +- frontend/src/components/dirent-detail/detail-comments-list.js | 2 +- frontend/src/components/file-content-view/markdown.js | 2 +- frontend/src/components/file-view/comment-panel.js | 2 +- frontend/src/components/index-viewer.js | 2 +- frontend/src/components/markdown-view/comment-dialog.js | 2 +- frontend/src/components/terms-preview-widget.js | 2 +- frontend/src/components/wiki-markdown-viewer.js | 2 +- frontend/src/draft.js | 4 +--- frontend/src/pages/file-history/main-panel.js | 4 +--- .../src/pages/markdown-editor/rich-markdown-editor/index.js | 3 ++- frontend/src/pages/sys-admin/terms-and-conditions/item.js | 2 +- frontend/src/shared-file-view-markdown.js | 2 +- 13 files changed, 14 insertions(+), 17 deletions(-) diff --git a/frontend/src/components/dialog/readme-dialog.js b/frontend/src/components/dialog/readme-dialog.js index b5cec7d408..7b2dd7c8a0 100644 --- a/frontend/src/components/dialog/readme-dialog.js +++ b/frontend/src/components/dialog/readme-dialog.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Button, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap'; -import MarkdownViewer from '@seafile/seafile-editor/dist/viewer/markdown-viewer'; +import { MarkdownViewer } from '@seafile/seafile-editor'; import Loading from '../../components/loading'; import { seafileAPI } from '../../utils/seafile-api'; import { gettext, mediaUrl } from '../../utils/constants'; diff --git a/frontend/src/components/dirent-detail/detail-comments-list.js b/frontend/src/components/dirent-detail/detail-comments-list.js index 1e4bf5881b..4c9e20fd04 100644 --- a/frontend/src/components/dirent-detail/detail-comments-list.js +++ b/frontend/src/components/dirent-detail/detail-comments-list.js @@ -1,7 +1,7 @@ import React, { Fragment } from 'react'; import PropTypes from 'prop-types'; import moment from 'moment'; -import { processor } from '@seafile/seafile-editor/dist/utils/seafile-markdown2html'; +import { processor } from '@seafile/seafile-editor'; import { Button, Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap'; import { gettext, username, siteRoot } from '../../utils/constants'; import { seafileAPI } from '../../utils/seafile-api'; diff --git a/frontend/src/components/file-content-view/markdown.js b/frontend/src/components/file-content-view/markdown.js index 36fb5d6505..fe94c98899 100644 --- a/frontend/src/components/file-content-view/markdown.js +++ b/frontend/src/components/file-content-view/markdown.js @@ -1,5 +1,5 @@ import React from 'react'; -import MarkdownViewer from '@seafile/seafile-editor/dist/viewer/markdown-viewer'; +import { MarkdownViewer } from '@seafile/seafile-editor'; import { mediaUrl } from '../../utils/constants'; import '../../css/md-file-view.css'; diff --git a/frontend/src/components/file-view/comment-panel.js b/frontend/src/components/file-view/comment-panel.js index 3b8a6292e0..8f05db4ecc 100644 --- a/frontend/src/components/file-view/comment-panel.js +++ b/frontend/src/components/file-view/comment-panel.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import moment from 'moment'; -import { processor } from '@seafile/seafile-editor/dist/utils/seafile-markdown2html'; +import { processor } from '@seafile/seafile-editor'; import { Button, Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap'; import { gettext } from '../../utils/constants'; import { seafileAPI } from '../../utils/seafile-api'; diff --git a/frontend/src/components/index-viewer.js b/frontend/src/components/index-viewer.js index 955098f3c8..1109fadf70 100644 --- a/frontend/src/components/index-viewer.js +++ b/frontend/src/components/index-viewer.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { repoID, slug, serviceURL, isPublicWiki } from '../utils/constants'; import { Utils } from '../utils/utils'; -import { deserialize } from '@seafile/seafile-editor/dist/utils/slate2markdown'; +import { deserialize } from '@seafile/seafile-editor'; import'../css/index-viewer.css'; const viewerPropTypes = { diff --git a/frontend/src/components/markdown-view/comment-dialog.js b/frontend/src/components/markdown-view/comment-dialog.js index a73568bb10..9cf30082e9 100644 --- a/frontend/src/components/markdown-view/comment-dialog.js +++ b/frontend/src/components/markdown-view/comment-dialog.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Button } from 'reactstrap'; -import { processor } from '@seafile/seafile-editor/dist/utils/seafile-markdown2html'; +import { processor } from '@seafile/seafile-editor'; import { gettext } from '../../utils/constants'; import '../../css/markdown-viewer/comment-dialog.css'; diff --git a/frontend/src/components/terms-preview-widget.js b/frontend/src/components/terms-preview-widget.js index bf5193c2ba..b25aa154db 100644 --- a/frontend/src/components/terms-preview-widget.js +++ b/frontend/src/components/terms-preview-widget.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { processor } from '@seafile/seafile-editor/dist/utils/seafile-markdown2html'; +import { processor } from '@seafile/seafile-editor'; import Loading from './loading'; const propTypes = { diff --git a/frontend/src/components/wiki-markdown-viewer.js b/frontend/src/components/wiki-markdown-viewer.js index 68121e88cb..d9c55b325f 100644 --- a/frontend/src/components/wiki-markdown-viewer.js +++ b/frontend/src/components/wiki-markdown-viewer.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import MarkdownViewer from '@seafile/seafile-editor/dist/viewer/markdown-viewer'; +import { MarkdownViewer } from '@seafile/seafile-editor'; import { gettext, repoID, slug, serviceURL, isPublicWiki, sharedToken, mediaUrl } from '../utils/constants'; import Loading from './loading'; import { Utils } from '../utils/utils'; diff --git a/frontend/src/draft.js b/frontend/src/draft.js index 12c1b5831f..9a9717a56f 100644 --- a/frontend/src/draft.js +++ b/frontend/src/draft.js @@ -5,11 +5,10 @@ import { Button } from 'reactstrap'; /* eslint-disable */ import Prism from 'prismjs'; /* eslint-enable */ +import { DiffViewer, serialize } from '@seafile/seafile-editor'; import { siteRoot, gettext, draftOriginFilePath, draftFilePath, author, authorAvatar, originFileExists, draftFileExists, draftID, draftFileName, draftRepoID, draftStatus, draftPublishVersion, originFileVersion, filePermission, serviceURL, mediaUrl } from './utils/constants'; import { seafileAPI } from './utils/seafile-api'; import axios from 'axios'; -import DiffViewer from '@seafile/seafile-editor/dist/viewer/diff-viewer'; -import { serialize } from '@seafile/seafile-editor/dist/utils/slate2markdown/serialize'; import Loading from './components/loading'; import ReviewComments from './components/review-list-view/review-comments'; import ReviewCommentDialog from './components/review-list-view/review-comment-dialog.js'; @@ -28,7 +27,6 @@ import './css/toolbar.css'; import './css/dirent-detail.css'; import './css/draft.css'; -require('@seafile/seafile-editor/dist/editor/code-highlight-package'); const URL = require('url-parse'); var moment = require('moment'); diff --git a/frontend/src/pages/file-history/main-panel.js b/frontend/src/pages/file-history/main-panel.js index a0deffffec..723e54cfec 100644 --- a/frontend/src/pages/file-history/main-panel.js +++ b/frontend/src/pages/file-history/main-panel.js @@ -1,11 +1,9 @@ import React from 'react'; import PropTypes from 'prop-types'; import Prism from 'prismjs'; +import { DiffViewer } from '@seafile/seafile-editor'; import Loading from '../../components/loading'; import { mediaUrl } from '../../utils/constants'; -import DiffViewer from '@seafile/seafile-editor/dist/viewer/diff-viewer'; - -require('@seafile/seafile-editor/dist/editor/code-highlight-package'); const contentClass = 'markdown-viewer-render-content'; const propTypes = { diff --git a/frontend/src/pages/markdown-editor/rich-markdown-editor/index.js b/frontend/src/pages/markdown-editor/rich-markdown-editor/index.js index 1843a54e0e..1c9ff559ab 100644 --- a/frontend/src/pages/markdown-editor/rich-markdown-editor/index.js +++ b/frontend/src/pages/markdown-editor/rich-markdown-editor/index.js @@ -92,7 +92,8 @@ class RichMarkdownEditor extends React.Component {