wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

 Conflicts:
	ruoyi-ui/src/views/system/menu/index.vue
This commit is contained in:
疯狂的狮子li 2021-06-03 09:46:33 +08:00
parent 5cc9b34132 85470a1549
commit 01c34b837d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/views/system/menu/index.vue
View File

@ -163,7 +163,7 @@
</el-col>
<el-col :span="12">
<el-form-item v-if="form.menuType != 'M'" label="权限标识">
<el-input v-model="form.perms" placeholder="请权限标识" maxlength="50" />
<el-input v-model="form.perms" placeholder="请权限标识" maxlength="100" />
</el-form-item>
</el-col>
<el-col :span="12">

2
ruoyi-ui/src/views/tool/build/RightPanel.vue
View File

@ -573,6 +573,7 @@
<script>
import { isArray } from 'util'
import draggable from 'vuedraggable'
import TreeNodeDialog from './TreeNodeDialog'
import { isNumberStr } from '@/utils/index'
import IconsDialog from './IconsDialog'
@ -595,6 +596,7 @@ const dateTimeFormat = {
export default {
components: {
draggable,
TreeNodeDialog,
IconsDialog
},