From 061911e60ed4e31576c0753c0af9dadea45c41ec Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 29 Nov 2022 12:53:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=AF=8C=E6=96=87=E6=9C=AC=E5=85=AC=E5=85=B1=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E8=AE=BF=E9=97=AE=E8=A1=8C=E9=97=B4=E8=B7=9D=E8=BF=87?=
 =?UTF-8?q?=E5=A4=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/customComponent/DeRichText.vue     | 53 +++++++++++--------
 .../canvas/customComponent/DeRichTextView.vue | 15 ++++--
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/frontend/src/components/canvas/customComponent/DeRichText.vue b/frontend/src/components/canvas/customComponent/DeRichText.vue
index 90f0de9542..96ed01cca2 100644
--- a/frontend/src/components/canvas/customComponent/DeRichText.vue
+++ b/frontend/src/components/canvas/customComponent/DeRichText.vue
@@ -18,8 +18,8 @@
 
 <script>
 import tinymce from 'tinymce/tinymce' // tinymce默认hidden，不引入不显示
-import Editor from '@tinymce/tinymce-vue'// 编辑器引入
-import 'tinymce/themes/silver/theme'// 编辑器主题
+import Editor from '@tinymce/tinymce-vue' // 编辑器引入
+import 'tinymce/themes/silver/theme' // 编辑器主题
 import 'tinymce/icons/default' // 引入编辑器图标icon，不引入则不显示对应图标
 // 引入编辑器插件（基本免费插件都在这儿了）
 import 'tinymce/plugins/advlist' // 高级列表
@@ -29,9 +29,9 @@ import 'tinymce/plugins/image' // 插入编辑图片
 import 'tinymce/plugins/lists' // 列表插件
 import 'tinymce/plugins/charmap' // 特殊字符
 import 'tinymce/plugins/media' // 插入编辑媒体
-import 'tinymce/plugins/wordcount'// 字数统计
-import 'tinymce/plugins/table'// 表格
-import 'tinymce/plugins/contextmenu'// contextmenu
+import 'tinymce/plugins/wordcount' // 字数统计
+import 'tinymce/plugins/table' // 表格
+import 'tinymce/plugins/contextmenu' // contextmenu
 import 'tinymce/plugins/directionality'
 import 'tinymce/plugins/nonbreaking'
 import 'tinymce/plugins/pagebreak'
@@ -173,34 +173,43 @@ export default {
 .rich-main-class {
   width: 100%;
   height: 100%;
-  overflow-y: auto!important;
+  overflow-y: auto !important;
   position: relative;
 }
+
 ::-webkit-scrollbar {
-  width: 0px!important;
-  height: 0px!important;
+  width: 0px !important;
+  height: 0px !important;
 }
+
 ::v-deep ol {
-  display: block!important;
+  display: block !important;
   list-style-type: decimal;
-  margin-block-start: 1em!important;
-  margin-block-end: 1em!important;
-  margin-inline-start: 0px!important;
-  margin-inline-end: 0px!important;
-  padding-inline-start: 40px!important;
+  margin-block-start: 1em !important;
+  margin-block-end: 1em !important;
+  margin-inline-start: 0px !important;
+  margin-inline-end: 0px !important;
+  padding-inline-start: 40px !important;
 }
+
 ::v-deep ul {
-  display: block!important;
+  display: block !important;
   list-style-type: disc;
-  margin-block-start: 1em!important;
-  margin-block-end: 1em!important;
-  margin-inline-start: 0px!important;
-  margin-inline-end: 0px!important;
-  padding-inline-start: 40px!important;
+  margin-block-start: 1em !important;
+  margin-block-end: 1em !important;
+  margin-inline-start: 0px !important;
+  margin-inline-end: 0px !important;
+  padding-inline-start: 40px !important;
 }
+
 ::v-deep li {
-  display: list-item!important;
-  text-align: -webkit-match-parent!important;
+  display: list-item !important;
+  text-align: -webkit-match-parent !important;
+}
+
+::v-deep p {
+  margin: 0px;
+  padding: 0px;
 }
 </style>
 
diff --git a/frontend/src/components/canvas/customComponent/DeRichTextView.vue b/frontend/src/components/canvas/customComponent/DeRichTextView.vue
index 8dfecebff4..7b5f717876 100644
--- a/frontend/src/components/canvas/customComponent/DeRichTextView.vue
+++ b/frontend/src/components/canvas/customComponent/DeRichTextView.vue
@@ -18,8 +18,8 @@
 
 <script>
 import tinymce from 'tinymce/tinymce' // tinymce默认hidden，不引入不显示
-import Editor from '@tinymce/tinymce-vue'// 编辑器引入
-import 'tinymce/themes/silver/theme'// 编辑器主题
+import Editor from '@tinymce/tinymce-vue' // 编辑器引入
+import 'tinymce/themes/silver/theme' // 编辑器主题
 import 'tinymce/icons/default' // 引入编辑器图标icon，不引入则不显示对应图标
 // 引入编辑器插件（基本免费插件都在这儿了）
 import 'tinymce/plugins/advlist' // 高级列表
@@ -29,9 +29,9 @@ import 'tinymce/plugins/image' // 插入编辑图片
 import 'tinymce/plugins/lists' // 列表插件
 import 'tinymce/plugins/charmap' // 特殊字符
 import 'tinymce/plugins/media' // 插入编辑媒体
-import 'tinymce/plugins/wordcount'// 字数统计
-import 'tinymce/plugins/table'// 表格
-import 'tinymce/plugins/contextmenu'// contextmenu
+import 'tinymce/plugins/wordcount' // 字数统计
+import 'tinymce/plugins/table' // 表格
+import 'tinymce/plugins/contextmenu' // contextmenu
 import 'tinymce/plugins/directionality'
 import 'tinymce/plugins/nonbreaking'
 import 'tinymce/plugins/pagebreak'
@@ -272,5 +272,10 @@ export default {
 ::v-deep .base-selected {
   background-color: #b4d7ff
 }
+
+::v-deep p {
+  margin: 0px;
+  padding: 0px;
+}
 </style>