diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index cb3f421a..aa8fdca4 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -4,6 +4,7 @@
- 新增 `v-ripple`水波纹指令
- 新增左侧菜单混合模式
+- 新增 markdown 嵌入表单内示例
### 🐛 Bug Fixes
diff --git a/src/components/Container/src/ScrollContainer.vue b/src/components/Container/src/ScrollContainer.vue
index 71cae31f..fe7c529d 100644
--- a/src/components/Container/src/ScrollContainer.vue
+++ b/src/components/Container/src/ScrollContainer.vue
@@ -4,6 +4,7 @@
:wrapClass="`scrollbar__wrap`"
:viewClass="`scrollbar__view`"
class="scroll-container"
+ v-bind="$attrs"
>
diff --git a/src/components/Markdown/src/index.vue b/src/components/Markdown/src/index.vue
index ccb2cc4c..29af7fef 100644
--- a/src/components/Markdown/src/index.vue
+++ b/src/components/Markdown/src/index.vue
@@ -2,14 +2,25 @@
+
diff --git a/src/components/Transition/src/ExpandTransition.vue b/src/components/Transition/src/ExpandTransition.vue
index 725ccc7a..0fbc06f2 100644
--- a/src/components/Transition/src/ExpandTransition.vue
+++ b/src/components/Transition/src/ExpandTransition.vue
@@ -59,6 +59,8 @@
if (el.scrollHeight !== 0) {
// for safari: add class after set height, or it will jump to zero height suddenly, weired
addClass(el, 'collapse-transition');
+ // in vue3.0.4, transitionProperty is set 'none' to avoid 'v-leave-from' issue
+ el.style.transitionProperty = 'height';
el.style.height = 0;
el.style.paddingTop = 0;
el.style.paddingBottom = 0;
diff --git a/src/locales/types.ts b/src/locales/types.ts
index c9f1a00e..98f14026 100644
--- a/src/locales/types.ts
+++ b/src/locales/types.ts
@@ -1 +1 @@
-export type LocaleType = 'zh_CN' | 'en' | 'ru' | 'ja';
+export type LocaleType = 'zh_CN' | 'en' | 'ru' | 'ja' | 'ko';
diff --git a/src/router/menus/modules/demo/comp.ts b/src/router/menus/modules/demo/comp.ts
index 39c1b9e7..5c1827a2 100644
--- a/src/router/menus/modules/demo/comp.ts
+++ b/src/router/menus/modules/demo/comp.ts
@@ -180,6 +180,16 @@ const menu: MenuModule = {
{
path: 'markdown',
name: t('routes.demo.editor.markdown'),
+ children: [
+ {
+ path: 'index',
+ name: t('routes.demo.editor.tinymceBasic'),
+ },
+ {
+ path: 'editor',
+ name: t('routes.demo.editor.tinymceForm'),
+ },
+ ],
},
{
path: 'tinymce',
diff --git a/src/router/routes/modules/demo/comp.ts b/src/router/routes/modules/demo/comp.ts
index 7f2f06d4..41b3f901 100644
--- a/src/router/routes/modules/demo/comp.ts
+++ b/src/router/routes/modules/demo/comp.ts
@@ -288,12 +288,32 @@ const comp: AppRouteModule = {
children: [
{
path: 'markdown',
+ component: getParentLayout('MarkdownDemo'),
name: 'MarkdownDemo',
- component: () => import('/@/views/demo/editor/Markdown.vue'),
meta: {
title: t('routes.demo.editor.markdown'),
},
+ redirect: '/comp/editor/markdown/index',
+ children: [
+ {
+ path: 'index',
+ name: 'MarkDownBasicDemo',
+ component: () => import('/@/views/demo/editor/markdown/index.vue'),
+ meta: {
+ title: t('routes.demo.editor.tinymceBasic'),
+ },
+ },
+ {
+ path: 'editor',
+ name: 'MarkDownFormDemo',
+ component: () => import('/@/views/demo/editor/markdown/Editor.vue'),
+ meta: {
+ title: t('routes.demo.editor.tinymceForm'),
+ },
+ },
+ ],
},
+
{
path: 'tinymce',
component: getParentLayout('TinymceDemo'),
diff --git a/src/views/demo/editor/markdown/Editor.vue b/src/views/demo/editor/markdown/Editor.vue
new file mode 100644
index 00000000..37283a16
--- /dev/null
+++ b/src/views/demo/editor/markdown/Editor.vue
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/demo/editor/Markdown.vue b/src/views/demo/editor/markdown/index.vue
similarity index 81%
rename from src/views/demo/editor/Markdown.vue
rename to src/views/demo/editor/markdown/index.vue
index dd20ec24..a7bbc115 100644
--- a/src/views/demo/editor/Markdown.vue
+++ b/src/views/demo/editor/markdown/index.vue
@@ -1,7 +1,7 @@