From f56f57a2364ff5cf1279527c2f130aae88b65ce7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 11 十二月 2020 14:27:54 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/components/Editor/index.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue
index f60366f..77c3062 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;
}
@@ -192,4 +192,4 @@
.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="monospace"]::before {
content: "绛夊瀛椾綋";
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3