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-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-ui/src/components/Editor/index.vue
This commit is contained in:
疯狂的狮子li
2020-08-10 09:38:28 +08:00
parent a9f4a4e111 a7eb07c7a0
commit 4044ed23ea
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,6 @@ export default {
content: this.value,
uploadImgUrl: "",
editorOption: {
placeholder: "",
theme: "snow", // or 'bubble'
placeholder: "请输入内容",
modules: {
@ -146,6 +145,7 @@ export default {
<style>
.editor {
white-space: pre-wrap!important;
line-height: normal !important;
height: 192px;
}