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:
commit
01c34b837d
|
@ -163,7 +163,7 @@
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item v-if="form.menuType != 'M'" label="权限标识">
|
<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-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
|
|
|
@ -573,6 +573,7 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { isArray } from 'util'
|
import { isArray } from 'util'
|
||||||
|
import draggable from 'vuedraggable'
|
||||||
import TreeNodeDialog from './TreeNodeDialog'
|
import TreeNodeDialog from './TreeNodeDialog'
|
||||||
import { isNumberStr } from '@/utils/index'
|
import { isNumberStr } from '@/utils/index'
|
||||||
import IconsDialog from './IconsDialog'
|
import IconsDialog from './IconsDialog'
|
||||||
|
@ -595,6 +596,7 @@ const dateTimeFormat = {
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
|
draggable,
|
||||||
TreeNodeDialog,
|
TreeNodeDialog,
|
||||||
IconsDialog
|
IconsDialog
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue