From 6687efd887672a80db996d186922868888c67139 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 24 二月 2020 09:56:22 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/views/system/menu/index.vue | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue
index 5476329..3a3fd00 100644
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/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 @@
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 @@
}
}
};
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3