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:
	pom.xml
	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
	ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/components/Editor/index.vue
	ruoyi-ui/src/router/index.js
This commit is contained in:
疯狂的狮子li
2020-09-11 09:17:43 +08:00
parent a41bc230a1 9c0ed9c424
commit 06c4d4d01b
8 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/package.json
View File

@ -58,7 +58,7 @@
"sortablejs": "1.8.4",
"vue": "2.6.10",
"vue-count-to": "1.0.13",
"vue-quill-editor": "3.0.6",
"quill": "1.3.7",
"vue-cropper": "0.4.9",
"vue-router": "3.0.2",
"vue-splitpane": "1.0.4",

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

@ -114,7 +114,7 @@ export default {
</script>
<style>
.editor {
.editor, .ql-toolbar {
white-space: pre-wrap!important;
line-height: normal !important;
}

2
ruoyi-ui/src/router/index.js
View File

@ -19,7 +19,7 @@ import Layout from '@/layout'
* meta : {
roles: ['admin','editor'] // 设置该路由进入的权限，支持多个权限叠加
title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字
icon: 'svg-name' // 设置该路由的图标，对应路径src/icons/svg
icon: 'svg-name' // 设置该路由的图标，对应路径src/assets/icons/svg
breadcrumb: false // 如果设置为false，则不会在breadcrumb面包屑中显示
}
*/