jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

Browse Source 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-ui/src/components/Editor/index.vue
This commit is contained in:
疯狂的狮子li
2020-09-07 11:31:40 +08:00
parent f69cb567f0 50ac363682
commit ef95cec77f
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-ui/src/components/Editor/index.vue
View File

@ -71,9 +71,9 @@ export default {
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);
}
}
},
@ -192,4 +192,4 @@ export default {
.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="monospace"]::before {
content: "等宽字体";
}
</style>
</style>