From 8f145bba3a3bf28cc80d12d410556d3c5e1370d4 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 18 十一月 2020 09:32:15 +0800
Subject: [PATCH] 若依 v3.2.1

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

diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue
index 6eb2687..9054995 100644
--- a/ruoyi-ui/src/components/Editor/index.vue
+++ b/ruoyi-ui/src/components/Editor/index.vue
@@ -71,9 +71,9 @@
     value: {
       handler(val) {
         if (val !== this.currentValue) {
-          this.currentValue = val;
+          this.currentValue = val === null ? "" : val;
           if (this.Quill) {
-            this.Quill.pasteHTML(this.value);
+            this.Quill.pasteHTML(this.currentValue);
           }
         }
       },
@@ -114,7 +114,7 @@
 </script>
 
 <style>
-.editor {
+.editor, .ql-toolbar {
   white-space: pre-wrap!important;
   line-height: normal !important;
 }

--
Gitblit v1.9.2