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

 Conflicts:

	ruoyi-ui/package.json

	ruoyi-ui/src/components/RuoYi/Git/index.vue

	ruoyi-ui/src/layout/components/Navbar.vue

	ruoyi-ui/src/main.js

	ruoyi-ui/src/utils/index.js

	ruoyi-ui/src/utils/permission.js

	ruoyi-ui/src/utils/ruoyi.js

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

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

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

	ruoyi-ui/src/views/tool/gen/genInfoForm.vue

	ruoyi/pom.xml

	ruoyi/src/main/java/com/ruoyi/common/constant/GenConstants.java

	ruoyi/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java

	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java

	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java

	ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java

	ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java

	ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java

	ruoyi/src/main/resources/application.yml

	ruoyi/src/main/resources/mybatis/monitor/SysLogininforMapper.xml

	ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml

	ruoyi/src/main/resources/vm/java/controller.java.vm

	ruoyi/src/main/resources/vm/java/domain.java.vm

	ruoyi/src/main/resources/vm/vue/index.vue.vm

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

@@ -49,16 +49,16 @@
       </el-table-column>
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" 
-            type="text" 
-            icon="el-icon-edit" 
+          <el-button size="mini"
+            type="text"
+            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:menu:edit']"
           >修改</el-button>
-          <el-button 
-            size="mini" 
-            type="text" 
-            icon="el-icon-plus" 
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
             @click="handleAdd(scope.row)"
             v-hasPermi="['system:menu:add']"
           >新增</el-button>
@@ -82,6 +82,7 @@
               <treeselect
                 v-model="form.parentId"
                 :options="menuOptions"
+                :normalizer="normalizer"
                 :show-count="true"
                 placeholder="选择上级菜单"
               />
@@ -173,7 +174,7 @@
 </template>
 
 <script>
-import { listMenu, getMenu, treeselect, delMenu, addMenu, updateMenu } from "@/api/system/menu";
+import { listMenu, getMenu, delMenu, addMenu, updateMenu } from "@/api/system/menu";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import IconSelect from "@/components/IconSelect";
@@ -228,16 +229,27 @@ export default {
     getList() {
       this.loading = true;
       listMenu(this.queryParams).then(response => {
-        this.menuList = response.data;
+        this.menuList = this.handleTree(response.data, "menuId");
         this.loading = false;
       });
     },
+    /** 转换菜单数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.menuId,
+        label: node.menuName,
+        children: node.children
+      };
+    },
     /** 查询菜单下拉树结构 */
     getTreeselect() {
-      treeselect().then(response => {
+      listMenu().then(response => {
         this.menuOptions = [];
-        const menu = { id: 0, label: '主类目', children: [] };
-        menu.children = response.data;
+        const menu = { menuId: 0, menuName: '主类目', children: [] };
+        menu.children = this.handleTree(response.data, "menuId");
         this.menuOptions.push(menu);
       });
     },
@@ -334,4 +346,4 @@ export default {
     }
   }
 };
-</script>
+</script>