diff --git a/.vscode/settings.json b/.vscode/settings.json
index ece7b1f2..b38219bc 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -220,7 +220,7 @@
"commentTranslate.multiLineMerge": true,
"vue.server.hybridMode": true,
"vitest.disableWorkspaceWarning": true,
- "cSpell.words": ["tinymce"],
+ "cSpell.words": ["tinymce", "vditor"],
"typescript.tsdk": "node_modules/typescript/lib",
"editor.linkedEditing": true, // 自动同步更改html标签,
"vscodeCustomCodeColor.highlightValue": "v-access", // v-access显示的颜色
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50d80b7f..1fce2e78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
- 全局表格加上id 方便进行缓存列排序的操作
- 支持菜单名称i18n
- 登录页 验证码登录
+- Markdown编辑/预览组件(基于vditor)
**BUG FIXES**
diff --git a/apps/web-antd/src/views/演示使用自行删除/changelog/index.vue b/apps/web-antd/src/views/演示使用自行删除/changelog/index.vue
new file mode 100644
index 00000000..bd010347
--- /dev/null
+++ b/apps/web-antd/src/views/演示使用自行删除/changelog/index.vue
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
diff --git a/packages/effects/common-ui/package.json b/packages/effects/common-ui/package.json
index 1ce27541..9b99b342 100644
--- a/packages/effects/common-ui/package.json
+++ b/packages/effects/common-ui/package.json
@@ -40,6 +40,7 @@
"@vueuse/integrations": "catalog:",
"codemirror": "^6.0.1",
"qrcode": "catalog:",
+ "vditor": "^3.10.6",
"vue": "catalog:",
"vue-codemirror6": "^1.3.4",
"vue-json-pretty": "^2.4.0",
diff --git a/packages/effects/common-ui/src/components/index.ts b/packages/effects/common-ui/src/components/index.ts
index f9c47709..447f9fe2 100644
--- a/packages/effects/common-ui/src/components/index.ts
+++ b/packages/effects/common-ui/src/components/index.ts
@@ -2,6 +2,7 @@ export * from './captcha';
export * from './code-mirror';
export * from './ellipsis-text';
export * from './json-preview';
+export * from './markdown';
export * from './page';
export * from '@vben-core/form-ui';
export * from '@vben-core/popup-ui';
diff --git a/packages/effects/common-ui/src/components/markdown/editor.vue b/packages/effects/common-ui/src/components/markdown/editor.vue
new file mode 100644
index 00000000..8a64c67c
--- /dev/null
+++ b/packages/effects/common-ui/src/components/markdown/editor.vue
@@ -0,0 +1,129 @@
+
+
+
+
+
diff --git a/packages/effects/common-ui/src/components/markdown/index.ts b/packages/effects/common-ui/src/components/markdown/index.ts
new file mode 100644
index 00000000..dfea14d6
--- /dev/null
+++ b/packages/effects/common-ui/src/components/markdown/index.ts
@@ -0,0 +1,2 @@
+export { default as MarkdownEditor } from './editor.vue';
+export { default as MarkdownPreviewer } from './preview.vue';
diff --git a/packages/effects/common-ui/src/components/markdown/preview.vue b/packages/effects/common-ui/src/components/markdown/preview.vue
new file mode 100644
index 00000000..a0c5cabb
--- /dev/null
+++ b/packages/effects/common-ui/src/components/markdown/preview.vue
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+