From a7eb07c7a0afb7da1eb9eb1bd902b0cec77921e2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 07 八月 2020 16:07:02 +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 56151f4..7fadf6f 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.2