diff --git a/package.json b/package.json index bab0f9c69..a5bef089a 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "@types/koa": "^2.13.1", "@types/koa-mount": "^4.0.1", "@types/lodash": "^4.14.169", + "@types/marked": "^4.0.1", "@types/mockjs": "^1.0.3", "@types/node": "^12.6.8", "@types/react": "^17.0.0", diff --git a/packages/client/package.json b/packages/client/package.json index e2754cc11..b0b864232 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -33,7 +33,7 @@ "flat": "^5.0.2", "html-react-parser": "^1.2.7", "lodash": "^4.17.21", - "micromark": "~2.11.0", + "marked": "^4.0.5", "monaco-editor": "^0.25.2", "react-big-calendar": "^0.33.6", "react-helmet": "^6.1.0", diff --git a/packages/client/src/schemas/markdown/index.tsx b/packages/client/src/schemas/markdown/index.tsx index 98f07c613..ab133f2be 100644 --- a/packages/client/src/schemas/markdown/index.tsx +++ b/packages/client/src/schemas/markdown/index.tsx @@ -11,7 +11,6 @@ import { Button, Dropdown, Input as AntdInput, Menu, Modal, Space } from 'antd'; import { InputProps, TextAreaProps } from 'antd/lib/input'; import { Display } from '../display'; import { LoadingOutlined, MenuOutlined, DragOutlined } from '@ant-design/icons'; -import micromark from 'micromark'; import { useDesignable } from '../../components/schema-renderer'; import { useContext, useState } from 'react'; import AddNew from '../add-new'; @@ -23,6 +22,14 @@ import { isGridRowOrCol } from '../grid'; import './style.less'; import { DragHandle } from '../../components/Sortable'; import { useTranslation } from 'react-i18next'; +import { marked } from 'marked'; + +export function markdown(text) { + if (!text) { + return ''; + } + return marked.parse(text); +} export const Markdown: any = connect( AntdInput.TextArea, @@ -45,7 +52,7 @@ export const Markdown: any = connect( let value = (
); return