From ba97f80d3330d7d54ed986b2e121093fc47c6259 Mon Sep 17 00:00:00 2001
From: Tanimodori <unknowner2014@gmail.com>
Date: Sun, 26 Jun 2022 12:46:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtinymce=E5=B5=8C=E5=85=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=A4=BA=E4=BE=8B=E9=A1=B5=E9=9D=A2=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C=E9=94=99=E8=AF=AF=EF=BC=8C=E6=B8=85=E7=90=86!importan?=
 =?UTF-8?q?t=EF=BC=8Crevert(vbenjs#1996)=20(#1999)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* revert: "修改tinymce富文本下拉菜单错位的bug (#1996)"

* style: 修复tinymce嵌入表单示例页面换行错误，清理!important
---
 src/design/index.less                     |  6 +++---
 src/views/demo/editor/markdown/Editor.vue |  1 +
 src/views/demo/editor/tinymce/Editor.vue  | 16 +---------------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/design/index.less b/src/design/index.less
index 5db6bdf53..772758691 100644
--- a/src/design/index.less
+++ b/src/design/index.less
@@ -21,8 +21,8 @@ html,
 body {
   width: 100%;
   height: 100%;
-  overflow: visible !important;
-  //overflow-x: hidden !important; // 这个会导致tinymce富文本，下拉菜单错位！！！
+  overflow: visible;
+  overflow-x: hidden;
 
   &.color-weak {
     filter: invert(80%);
@@ -40,5 +40,5 @@ button,
 div,
 svg,
 span {
-  outline: none !important;
+  outline: none;
 }
diff --git a/src/views/demo/editor/markdown/Editor.vue b/src/views/demo/editor/markdown/Editor.vue
index f9728917f..e0dabf63c 100644
--- a/src/views/demo/editor/markdown/Editor.vue
+++ b/src/views/demo/editor/markdown/Editor.vue
@@ -5,6 +5,7 @@
         :labelWidth="100"
         :schemas="schemas"
         :actionColOptions="{ span: 24 }"
+        :baseColProps="{ span: 24 }"
         @submit="handleSubmit"
       />
     </CollapseContainer>
diff --git a/src/views/demo/editor/tinymce/Editor.vue b/src/views/demo/editor/tinymce/Editor.vue
index f64b690bd..c148a3cc2 100644
--- a/src/views/demo/editor/tinymce/Editor.vue
+++ b/src/views/demo/editor/tinymce/Editor.vue
@@ -5,6 +5,7 @@
         :labelWidth="100"
         :schemas="schemas"
         :actionColOptions="{ span: 24 }"
+        :baseColProps="{ span: 24 }"
         @submit="handleSubmit"
       />
     </CollapseContainer>
@@ -41,21 +42,6 @@
         });
       },
     },
-    {
-      field: 'tinymce2',
-      component: 'Input',
-      label: 'tinymce2',
-      defaultValue: 'tinymce2',
-      rules: [{ required: true }],
-      render: ({ model, field }) => {
-        return h(Tinymce, {
-          value: model[field],
-          onChange: (value: string) => {
-            model[field] = value;
-          },
-        });
-      },
-    },
   ];
   export default defineComponent({
     components: { BasicForm, CollapseContainer, PageWrapper },