From 4044ed23eafc9d8c8c7b5e82b2b7107cc32345b5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 10 八月 2020 09:38:28 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

---
 ruoyi-ui/src/components/Editor/index.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue
index 91fbc7d..f91b8c4 100644
--- a/ruoyi-ui/src/components/Editor/index.vue
+++ b/ruoyi-ui/src/components/Editor/index.vue
@@ -66,7 +66,6 @@
       content: this.value,
       uploadImgUrl: "",
       editorOption: {
-        placeholder: "",
         theme: "snow", // or 'bubble'
         placeholder: "璇疯緭鍏ュ唴瀹�",
         modules: {
@@ -146,6 +145,7 @@
 
 <style>
 .editor {
+  white-space: pre-wrap!important;
   line-height: normal !important;
   height: 192px;
 }

--
Gitblit v1.9.3