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

疯狂的狮子li

2021-06-03 01c34b837d1ec89c0789a0a0c837f7b0639ed31a

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


 Conflicts:

	ruoyi-ui/src/views/system/menu/index.vue

 ruoyi-ui/src/views/system/menu/index.vue

@@ -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">

 ruoyi-ui/src/views/tool/build/RightPanel.vue

@@ -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 @@


export default {

  components: {

    draggable,

    TreeNodeDialog,

    IconsDialog

  },