From 99b64f48b0b46c26c963615d86e741ce223d3ec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Tue, 19 Oct 2021 19:07:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=AF=B9=E6=8E=A5=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/RoleController.cs             |   2 +-
 .../Yi.Framework.ApiMicroservice/YIDB.db      | Bin 65536 -> 65536 bytes
 Yi.Vue/src/api/roleApi.js                     |   7 ++
 Yi.Vue/src/components/ccTreeview.vue          |   5 +-
 Yi.Vue/src/views/AdmRoleMenu.vue              |  67 ++++++++++--------
 5 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs
index 179135cc..ecd5cceb 100644
--- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs
+++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs
@@ -75,7 +75,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
             return Result.Success();
         }
         [HttpGet]
-        public async Task<Result> GetMenuByRloeIds(int roleId)
+        public async Task<Result> GetMenuByRloe(int roleId)
         {
             var menuList =await _roleService.GetMenusByRoleId(roleId);
             return Result.Success().SetData(menuList);
diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db
index 62b8f9b65fcc8d8e3e5844bc3ef2df5ffb8c2e8d..8dd99a73a1ae619992098e33244e5756cb57e622 100644
GIT binary patch
delta 677
zcmXX^O=uHA6rRb>?C$I)^X)21g`k25FS=bNpa+lMbMvSa6!9R4&8eUUPu{95h#o|#
zP*GIWmGq#d0X2x&s#U}vXe?GNF^blof(rU(A_L!>dHde`zW3hN>!My4*WOlnn$K0&
zt#wk>&AbD<3aXpO(NVR!oQ7=8isg*^K4bfL@7p+B8#-94?HR6BDixjkBZ<RRc4A~8
zuO4zaSNV>^SNTAINrvB8z#QJ-2R`FDrqISD)jSU^iw@^P$k3QVHZ{5>3eYeK-|-$V
z&_pATj*lVo1UG@jzAc1V`|P&z2c|H=@d+Kgq=ct<h`YFh33I6aY3vmsO{vg?gR(><
ziLjJ$pE45CBWEn7OD2-QFXpO9N_uH20!m95BUc<?p2)^IKH?rVavRU^2sd#B<K__A
zF$}qaE1trdL2Z>LqGWCSUwI@#`#A~vZs}PYNf-FWJRbS>t)(Q|5?^J5V-?UV)xFGX
zZ7S$qzO{8jyH;bGFHSGx8&bp!f3So_8pZ<NVHU4w(2r>#_t8QF*KrvaForWYl~tZ>
zb`j$iGLn6f+H@FCvz47Aw7rv^^@PpN_HvKfZF0P(i8iU!G#=n9t)ycP<(<P$;V2FR
z+DH*4i$#l}aR=rqJ&V-d5|h5Yo7R*Gux$ls8|gpsg$CNiJpCK9w9OgfxP*Q+i?s5Y
GzsWy-?w26|

delta 492
zcmW+yO-mb56rJn5H($XyiA1U3LKKpnW8GAW%eoWds$2g;w-wa<1Ca;fMg%u*RMe@Z
zR0;uU7LjP1NU@Y=47MmX6^&o`0ea_c?s?~4-nr+Vd|u@9V(l<TL0HfAcAJ6cDEr-5
zm`X0XEnR_Xynhk)jHgZ2KG7NGCM+T&d^@>HX$NHk4>&;`zi^E+?4ul}x;LT9)3111
zjHg%liyzoU1HVyZ%~h!4!ch9kuu&rXM}!01;~3vj;=dm-A`>Q2R!EN_Bc#oclG0*G
zN(k2^HzOr8UmAvCxk=%0E9>Es6}Jih*h>|Eu!B2n^S%|lu?5A735^-yX-r95V^UhM
z1i6%PHTR{~rB2<<Iv#Hc{HC%CFT>Y`4S#0T37flZ)E}V3z$0$a<SR~agc^Qw0(&Uo
zD+<`cN33HROIXA_=Acynw*mIE=BtiqiVQUyW!0y>R#l1y)3@xsN}N`MHLAGa%py+X
v3x?xMMM76EuF}@kf-qfj^*i<}VyeA5sKmBzaE?=sp~mr6Sn4xW<*Dx(e4K)c

diff --git a/Yi.Vue/src/api/roleApi.js b/Yi.Vue/src/api/roleApi.js
index 599f9fb2..e6736bd6 100644
--- a/Yi.Vue/src/api/roleApi.js
+++ b/Yi.Vue/src/api/roleApi.js
@@ -12,5 +12,12 @@ export default {
             method: 'post',
             data: { ids1: roleList, ids2: menuList }
         })
+    },
+    getMenuByRloe(roleId) {
+        return myaxios({
+            url: `/Role/getMenuByRloe?roleId=${roleId}`,
+            method: 'get'
+
+        })
     }
 }
\ No newline at end of file
diff --git a/Yi.Vue/src/components/ccTreeview.vue b/Yi.Vue/src/components/ccTreeview.vue
index 5e055930..fd153ef0 100644
--- a/Yi.Vue/src/components/ccTreeview.vue
+++ b/Yi.Vue/src/components/ccTreeview.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <app-btn  dark class="ma-4" @click="dialog = true"> 添加新项 </app-btn>
-    <app-btn dark class="ma-4"  color="secondary" @click="deleteItem(null)">
+    <app-btn dark class="my-4"  color="secondary" @click="deleteItem(null)">
       删除所选
     </app-btn>
     
@@ -39,6 +39,7 @@
     </v-dialog>
 
     <v-treeview
+    open-on-click
       selectable
       :items="desserts"
       :selection-type="selectionType"
@@ -52,6 +53,8 @@
         <v-btn class="mr-2">编号:{{ item.id }}</v-btn>
         <v-btn class="mr-2">图标:{{ item.icon }}</v-btn>
         <v-btn class="mr-2">路由:{{ item.router }}</v-btn>
+        <v-btn v-if="item.mould" class="mr-2">接口名:{{ item.mould.mould_name }}</v-btn>
+        <v-btn  v-if="item.mould" class="mr-2">接口地址:{{ item.mould.url }}</v-btn>
         <ccCombobox
           headers="设置接口权限"
           itemText="mould_name"
diff --git a/Yi.Vue/src/views/AdmRoleMenu.vue b/Yi.Vue/src/views/AdmRoleMenu.vue
index 6ff74daf..058a67fc 100644
--- a/Yi.Vue/src/views/AdmRoleMenu.vue
+++ b/Yi.Vue/src/views/AdmRoleMenu.vue
@@ -1,14 +1,18 @@
 <template>
   <v-row>
     <v-col cols="12">
-<material-card color="primary" icon="mdi-account-outline">
-    <template #title>
-      角色菜单分配管理 — <small class="text-body-1">你可以在这里多角色分配多菜单</small>
-    </template><app-btn  class="ma-4" @click="setMenu">确定分配</app-btn></material-card>
+      <material-card color="primary" icon="mdi-account-outline">
+        <template #title>
+          角色菜单分配管理 —
+          <small class="text-body-1"
+            >你可以在这里多角色分配多菜单/选中一个可查看</small
+          > </template
+        ><app-btn class="ma-4" @click="setMenu">确定分配</app-btn
+        ><app-btn class="my-4"  color="secondary" @click="clear">清空选择</app-btn></material-card
+      >
     </v-col>
     <v-col cols="12" md="4" lg="4">
       <v-card class="mx-auto" width="100%">
-        
         <v-treeview
           selectable
           :items="RoleItems"
@@ -25,6 +29,7 @@
     <v-col cols="12" md="8" lg="8">
       <v-card class="mx-auto" width="100%">
         <v-treeview
+          open-on-click
           selectable
           :items="Menuitems"
           selection-type="leaf"
@@ -47,36 +52,40 @@ import roleApi from "../api/roleApi";
 import menuApi from "../api/menuApi";
 export default {
   created() {
- this.init();
+    this.init();
   },
-watch: {
-     selectionRole:{
-         handler(val, oldVal){
-              if(val.length==1)
-              {
-                ////
-                this.selectionMenu=[{id:38},{id:39}]
-              }
-         },
-         deep:true
-     },
+  watch: {
+    selectionRole: {
+      handler(val, oldVal) {
+        if (val.length == 1) {
+          roleApi.getMenuByRloe(val[0].id).then((resp) => {
+            this.selectionMenu = resp.data;
+          });
+        }
+      },
+      deep: true,
+    },
   },
   methods: {
-    setMenu(){
-     var roleIds=[];
-     var menuIds=[];
-     this.selectionRole.forEach((ele)=>{
-       roleIds.push(ele.id)
-     })
-     this.selectionMenu.forEach((ele)=>{
-       menuIds.push(ele.id)
-     })
-      roleApi.setMenuByRole(roleIds,menuIds).then(resp=>{
-                this.$dialog.notify.info(resp.msg, {
+    clear() {
+      this.selectionMenu = [];
+      this.selectionRole = [];
+    },
+    setMenu() {
+      var roleIds = [];
+      var menuIds = [];
+      this.selectionRole.forEach((ele) => {
+        roleIds.push(ele.id);
+      });
+      this.selectionMenu.forEach((ele) => {
+        menuIds.push(ele.id);
+      });
+      roleApi.setMenuByRole(roleIds, menuIds).then((resp) => {
+        this.$dialog.notify.info(resp.msg, {
           position: "top-right",
           timeout: 5000,
         });
-      })
+      });
     },
     init() {
       roleApi.getRole().then((resp) => {