From 01c34b837d1ec89c0789a0a0c837f7b0639ed31a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 03 六月 2021 09:46:33 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

---
 ruoyi-ui/src/views/tool/build/RightPanel.vue |    2 ++
 ruoyi-ui/src/views/system/menu/index.vue     |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue
index 094a706..8d2137a 100644
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/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">
diff --git a/ruoyi-ui/src/views/tool/build/RightPanel.vue b/ruoyi-ui/src/views/tool/build/RightPanel.vue
index 1acdc57..88013a5 100644
--- a/ruoyi-ui/src/views/tool/build/RightPanel.vue
+++ b/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
   },

--
Gitblit v1.9.3