From bce955a1e10e94ead1f4d04906a8d25e32fc24c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Thu, 12 May 2022 23:39:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseController/BaseCrudController.cs      |   6 +-
 .../yi-sqlsugar-dev.db                        | Bin 102400 -> 102400 bytes
 Yi.Vue2.x/src/components/ccTable.vue          |  15 ++--
 Yi.Vue2.x/src/components/ccTreeview.vue       |   6 +-
 Yi.Vue2.x/src/layouts/default/Drawer.vue      |  28 ++-----
 Yi.Vue2.x/src/util/btnHandle.js               |  77 ++++++++++++++++++
 Yi.Vue2.x/src/util/menuDic.js                 |  26 ------
 Yi.Vue2.x/src/views/AdmRole.vue               |   4 +
 Yi.Vue2.x/src/views/AdmUser.vue               |  22 ++---
 9 files changed, 111 insertions(+), 73 deletions(-)
 create mode 100644 Yi.Vue2.x/src/util/btnHandle.js
 delete mode 100644 Yi.Vue2.x/src/util/menuDic.js

diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs
index f51a85ef..0566c588 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs
@@ -32,7 +32,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        [Permission($"{nameof(T)}:get:list")]
+        [Permission($"{nameof(T)}:get")]
         [HttpGet]
         public virtual async Task<Result> GetById(long id)
         {
@@ -43,7 +43,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// 列表查询
         /// </summary>
         /// <returns></returns>
-        [Permission($"{nameof(T)}:get:list")]
+        [Permission($"{nameof(T)}:get")]
         [HttpPost]
         public virtual async Task<Result> GetList(QueryCondition queryCondition)
         {
@@ -55,7 +55,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// </summary>
         /// <param name="queryCondition"></param>
         /// <returns></returns>
-        [Permission($"{nameof(T)}:get:list")]
+        [Permission($"{nameof(T)}:get")]
         [HttpPost]
         public virtual async  Task<Result> PageList(QueryPageCondition queryCondition)
         {
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
index 1027981e67f46af140bcda9ec907caf2580439ab..293aa5df7f8e05faa002e10cfae34a59a3f84f81 100644
GIT binary patch
delta 3177
zcmb7GTWl0n7@o7!ot@pewsh%bi_)x3sMzV;XJ-Wo67@kNXw(oylVxXxCM_+c+m)hD
zON?nC7%!C3sJIYKNK|M<XpAN(i6$C-@xjE#7Xz#kL`~!s^~`0r<IHRWPtDgo-}(OY
z{kNH}V$)UZl?=G>YR{(l1%!Lx<cx9F0M)@YZNwtNe8n7OHZ$$?PxLXmNUx!;Q6Ezk
zY8?g0ugOE?7BWpNp6OkEiZJ!I6oz5Q-3Wps>Hdz#)*WD5)7X<Y=I>=~tYqO|kr%}Q
zUKtR?)uNP_)V!>6iXiK)Au8*mt~qv~IhFOO=8`Pq<7VbAH0LrQS=vWse_n=42dO4Y
zEpgM`_b>BWD#&F?A2oS+87di~5+2orCbwVTvrNcDh?`oHZU1Fx8EPs-O*W`mqjNKi
zxW8F$lR>Wa?|RVP8!Q1lbS!@l=-wVYmIxkWv870gf2=ytJlj~1YRyB1P$2Qpv8z#m
zv;>c_s4tM?Z!8lC8l+l<4H1FFLdV{Q#~ukf0)oe2yVct+TYTzltf?a@1VP%E4l6MY
z`d|-VrC<MIFm8IS+eV@o@cNi-^#O+U0h;jviuM7L@&SVMffV5b$&?S^NfIqKR1>)G
zCoJIuam)u=;y!@3_&^Nx0T3flEa^UI;h)U_UA+N4iS)#_BE({<O2iqHx<;QPuTwMR
zA!Y^s9md4pNv%y}k{@EPCH_w8iP@GS@m$Lf@r|e+`!==}y?&;b?TndY83yZ0W-&xU
zHsJ^&P*B1dShcr4sU4jk9~~~`%VS1iqLj`SqsxNlL%kyjoT%`kB8wx&(7@zSsWM;`
z_U_s-S{OG*x^2Z(uA=ElI&-e}?)$%;KH*62EKM}gQ}PjdVvZAeRTFe6La)oG=gB#<
zv9|EpW%FRw(JL6nE$PXes;j&t=wUr<8hNM-hws~DuM*c$XM0?ptzLQaJx9(c4ZCt?
zM0E@Ba(KHY!^e#DgoAH-S;SotUP&@1h^nT^0*u`ZCMO-zb4ROf*1>9dZ)rU5dSyKk
z8WExz&W(_lbDSc|N>0j!y&5q)LV9UugScindahYFrzdK8UguN^7DG-6>uu}w<m$P3
zG~MqmJGb^6J-7Cv^x)+pm(wIMr`hHOyc?q!tPiKG2g~3#Ys(bK3ht~El)NHvd`?g#
z-ifJDERL3UPYmoBeRi;5jM$>1B!dZ%`(+v2VO=SM%zX{6EOW9b@S5b*nvXj$QXZZd
z8XGPpUPRik^?178#9H4B*2=*DP}b}uxYIf}39>7^`|K2P8n41&6zlg%(3{xFxYF$v
zD7~%%GO#@C&l?yv{Jhb`oFMQ{>gv)(*vYtov<$Vo?>$t3@BOIa*AN7lb6wL#(Yjax
zGiLHGWLKXT;5NG-1O3tH$D3$JNrQJwf~Z9F-qVDAH-*=y83Vfvt`O_+et<i+Ze4nt
zz-h9k2wFs04ie)CRgV|nv%-02-QBgfr?Un=53B#zBPVOK3zyCxug#ox3=o%0mN{O~
zb=|$a?p$eKY0%F0(C%kOpJ!e7KG+A{`+gtDwlzXi;0t9jC#hC!3iKuR((Xxa%B!n-
zE@55CoWzT&py}32Q{c~1YKLRM_LX*-!=b*hF@oH0t4rrk)sB4XRC!~lM-{r77vYqU
z6jh5D;0ufU!E|i<HhYc-@^~v_+@1@(r1NfZ{eMR+oO=O04A35W&ff0*Ed3XKk^YhX
zhW?yBO`o9W;JSa@S@%Wn%e=>1mCowQc)*FK+XGICb-BQ8`A!cw^QOZEu1zaF;Cxi3
K7jC=^Q1BnrM%9V{

delta 1630
zcmaJ>OKclO7@o1cv+H%%V~8EK3B^g>0xtD>clKp(RY0VOQ)#GFE<9AnHX@=)ke{)U
zh>cLiQz@@5pb8}_>f=(PL}?^0t&osVr6O@8SD;B%6%O=-)WWRotTztjWc~6t-+c3Z
z-~Nqx)R;%7hTz4I9~xyY0&)LXGq;k1^T{2&umtcA_<ei?hl9TazYb=Dj|sPhrR9;~
z)5762&m)Au0RT7<iRH@YzYqB%=*7E>PlxPz#}WEVBtjCBmXK1zvSJcqYDCl(J?-y3
zYW;H%4vzG~xNR`=2{>p?)gXJ!;bMD1A=H(T{bSeL_m_csk6MeAf13<u8|)T^z0|AL
z*9!}IT|ySV_#YwO-lJCL$^Q`I*#<j9Vb<|FM8~`4!d?{3!^tK4@`~rahVTFY9?t@N
z2e0Ebd>voK%lI7r5`TziY3Nz}>D44N+sT^m^CH*@p7Xl~mU9h=bqx%14L-&-czv$H
z<8=+t6YwH`=N=#kg;nnuycbQPBnUHyKwyoZ4={LExE;LQcSmUUeSrG|73MqU5dSDE
z_|KvS`<H(|`_A%6D9pr50!Dke2m%Ti<p6kmS0t9TUZBCOe|F)<yQ}M$7S>OlEai(O
zYpf1qaywy7Gi4&C4MS3NWimIB$YitA<*8C)e0nCC$xW7v`9iS|Bbkd>0~NT(*CMzz
z1BVVc1QHQtU6bTgs)rykSw2ykc;iH#t%K(ecBMtFvlTefruw-C2ZBU0C5bfo2QZ>A
z>#GXf*ZtSpHv<QFDJ5#EuBIen{Y?+Euj96;-PKJ|*UE56bwnwesHZhaHDtG_Y^L}c
zmjisur_sr9%Q0)N3LkFY_eu@M`a2xDsVJgm5J}b2)~{9Aj0XzfN0-CVC{2!AbR7Qe
z%EFE2w=IKg9=**&WRn=8N*&Vlw5_FB$`ndT+t`VzSEniGPc3Uk?Og++*!rddhr6%u
zr`}K<DOJ}=s@&fe{8Y^?_?RP@Xre(3dXMgYbiS5%u4}^3mX<tYx8&Nh^t0KRJM;TT
zpSxN@lZid(_(_)=eL`B+EL4Yk<JI668ri04ZGnyRpKQFh<f5_5wrQzm5=B&XL)Mj)
zb+Qis+~XS$V6>BqaGlo5m=d)<<D2JB-&|O6>h?%miK?2iPMe?*gS7funaEcYIU4Ku
zbf%C?uCBca8=jq;Y)9MG<$&Yva0L#=ZPu;pTTYp(BBoW6Rt%$?((2{6;B(L$4&Jrc
S28`1^aXo173ClAF@BIsUd!DWU

diff --git a/Yi.Vue2.x/src/components/ccTable.vue b/Yi.Vue2.x/src/components/ccTable.vue
index aa4ae38b..0428165b 100644
--- a/Yi.Vue2.x/src/components/ccTable.vue
+++ b/Yi.Vue2.x/src/components/ccTable.vue
@@ -24,7 +24,7 @@
         ></v-text-field>
 
         <v-btn
-          v-if="axiosUrls.add != null"
+          v-if="btnEnable.add==true"
           color="primary"
           dark
           class="mb-2 mx-2"
@@ -35,7 +35,7 @@
 
         <!-- 添加提示框 -->
         <v-dialog
-          v-if="axiosUrls.add != null"
+          v-if="btnEnable.add ==true"
           v-model="dialog"
           max-width="500px"
         >
@@ -72,7 +72,7 @@
         </v-dialog>
 
         <v-btn
-          v-if="axiosUrls.del != null"
+          v-if="btnEnable.del == true"
           color="secondary"
           class="mb-2"
           @click="deleteItem(null)"
@@ -87,14 +87,14 @@
       <slot name="action" :item="item"></slot>
 
       <v-icon
-        v-if="axiosUrls.update != null"
+        v-if="btnEnable.update ==true"
         small
         class="mr-2"
         @click="editItem(item)"
       >
         mdi-pencil
       </v-icon>
-      <v-icon v-if="axiosUrls.del != null" small @click="deleteItem(item)">
+      <v-icon v-if="btnEnable.del ==true" small @click="deleteItem(item)">
         mdi-delete
       </v-icon>
     </template>
@@ -119,6 +119,9 @@ export default {
     axiosUrls: {
       type: Object,
     },
+    btnEnable: {
+      type: Object,
+    },
   },
   data: () => ({
     page: 1,
@@ -166,7 +169,7 @@ export default {
       });
     },
     initialize() {
-      if(this.axiosUrls.get!=undefined && this.axiosUrls.get!=null )
+      if(this.btnEnable.get==true )
       {
          this.dataInit(this.axiosUrls.get)
       }
diff --git a/Yi.Vue2.x/src/components/ccTreeview.vue b/Yi.Vue2.x/src/components/ccTreeview.vue
index 4fe46133..b3987808 100644
--- a/Yi.Vue2.x/src/components/ccTreeview.vue
+++ b/Yi.Vue2.x/src/components/ccTreeview.vue
@@ -107,9 +107,9 @@ export default {
     editedIndex: -1,
     defaultItem: {
       menuIcon: "mdi-view-dashboard",
-      permissionCode: "test",
-      menuName: "管理",
-      router:"/",
+      permissionCode: "",
+      menuName: "",
+      router:"",
       parentId: 0,
       MenuType:0
     },
diff --git a/Yi.Vue2.x/src/layouts/default/Drawer.vue b/Yi.Vue2.x/src/layouts/default/Drawer.vue
index bbaf372e..980c08e0 100644
--- a/Yi.Vue2.x/src/layouts/default/Drawer.vue
+++ b/Yi.Vue2.x/src/layouts/default/Drawer.vue
@@ -1,15 +1,6 @@
 <template>
-  <v-navigation-drawer
-    id="default-drawer"
-    v-model="$store.state.home.drawer"
-    :dark="dark"
-    :right="$vuetify.rtl"
-    :src="drawerImage ? image : ''"
-    :mini-variant.sync="$store.state.home.mini"
-    mini-variant-width="80"
-    app
-    width="260"
-  >
+  <v-navigation-drawer id="default-drawer" v-model="$store.state.home.drawer" :dark="dark" :right="$vuetify.rtl"
+    :src="drawerImage ? image : ''" :mini-variant.sync="$store.state.home.mini" mini-variant-width="80" app width="260">
     <template v-if="drawerImage" #img="props">
       <v-img :key="image" :gradient="gradient" v-bind="props" />
     </template>
@@ -24,13 +15,7 @@
 
     <template #append>
       <div class="pa-4 text-center">
-        <app-btn
-          class="text-none mb-4"
-          color="white"
-          href="https://vuetifyjs.com"
-          small
-          text
-        >
+        <app-btn class="text-none mb-4" color="white" href="https://vuetifyjs.com" small text>
           Documentation
         </app-btn>
 
@@ -54,11 +39,14 @@ import { toTree } from "@/util/menuHandle";
 export default {
   methods: {
     init() {
-      this.items=toTree( store.state.user.user.menus);
+      const menus = store.state.user.user.menus.filter((m) => {
+        return m.menuType == 0;
+      });
+      this.items = toTree(menus);
     },
     logout() {
       this.$store.dispatch("Logout")
-   this.$router.push({ path: "/login/" });
+      this.$router.push({ path: "/login/" });
     },
   },
   created() {
diff --git a/Yi.Vue2.x/src/util/btnHandle.js b/Yi.Vue2.x/src/util/btnHandle.js
new file mode 100644
index 00000000..b9e080a4
--- /dev/null
+++ b/Yi.Vue2.x/src/util/btnHandle.js
@@ -0,0 +1,77 @@
+import store from '../store/index'
+//匹配按钮，判断是否有按钮存在
+
+function getBtn(par) {
+    var axiosEnable = {
+        get: false,
+        update: false,
+        del: false,
+        add: false,
+    };
+    const per = store.state.user.per;
+    switch (par) {
+        case "user":
+            per.forEach(p => {
+                if(p=="user:get")
+                {
+                    axiosEnable.get=true;
+                }
+                else if(p=="user:update")
+                {
+                    axiosEnable.update=true;
+                }
+                else if(p=="user:del")
+                {
+                    axiosEnable.del=true;
+                }
+                else if(p=="user:add")
+                {
+                    axiosEnable.add=true;
+                }
+            });
+            break;
+        case "role":
+            if(p=="role:get")
+            {
+                axiosEnable.get=true;
+            }
+            else if(p=="role:update")
+            {
+                axiosEnable.update=true;
+            }
+            else if(p=="role:del")
+            {
+                axiosEnable.del=true;
+            }
+            else if(p=="role:add")
+            {
+                axiosEnable.add=true;
+            }    
+        break;
+        case "menu":
+            if(p=="menu:get")
+            {
+                axiosEnable.get=true;
+            }
+            else if(p=="menu:update")
+            {
+                axiosEnable.update=true;
+            }
+            else if(p=="menu:del")
+            {
+                axiosEnable.del=true;
+            }
+            else if(p=="menu:add")
+            {
+                axiosEnable.add=true;
+            }    
+        break;
+
+
+        default: console.log("未发现合法路由")
+    }
+    return axiosEnable;
+}
+
+
+export  {getBtn};
diff --git a/Yi.Vue2.x/src/util/menuDic.js b/Yi.Vue2.x/src/util/menuDic.js
deleted file mode 100644
index d999c68a..00000000
--- a/Yi.Vue2.x/src/util/menuDic.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import store from '../store/index'
-//匹配按钮，判断是否有按钮存在
-const btnDic =
-{
-    "user:get": "/",
-    "user:add": "/",
-    "user:update": "/",
-    "user:del": "/",
-}
-
-
- function getBtn(par) {
-     const per=[];
-    switch(par){
-        case "user":
-         
-
-
-
-        break;
-        default:console.log("未发现合法路由")
-    }
-}
-
-
-export default { menuDic, btnDic };
diff --git a/Yi.Vue2.x/src/views/AdmRole.vue b/Yi.Vue2.x/src/views/AdmRole.vue
index 9af21e41..9239517d 100644
--- a/Yi.Vue2.x/src/views/AdmRole.vue
+++ b/Yi.Vue2.x/src/views/AdmRole.vue
@@ -7,17 +7,20 @@
       :defaultItem="defaultItem"
       :headers="headers"
       :axiosUrls="axiosUrls"
+      :btnEnable="btnEnable"
     >
     </ccTable>
   </material-card>
 </template>
 <script>
+import { getBtn } from "../util/btnHandle";
 export default {
   created() {
     this.init();
   },
   methods: {
     init() {
+            this.btnEnable = getBtn("user")
      this.axiosUrls = {
         get: "/role/GetList",
         update: "/role/Update",
@@ -30,6 +33,7 @@ export default {
     start: true,
     axiosUrls: {
     },
+    btnEnable:{},
     headers: [
       // { text: "编号", align: "start", value: "id" },
            { text: "角色编号", value: "roleCode", sortable: false },
diff --git a/Yi.Vue2.x/src/views/AdmUser.vue b/Yi.Vue2.x/src/views/AdmUser.vue
index 9544f223..914c08d0 100644
--- a/Yi.Vue2.x/src/views/AdmUser.vue
+++ b/Yi.Vue2.x/src/views/AdmUser.vue
@@ -3,22 +3,13 @@
     <template #title>
       用户管理 — <small class="text-body-1">用户可拥有多个角色</small>
     </template>
-    <ccCombobox
-      headers="设置角色"
-      :items="roleItems"
-      @select="getSelect"
-      itemText="roleName"
-    >
+    <ccCombobox headers="设置角色" :items="roleItems" @select="getSelect" itemText="roleName">
       <template v-slot:save>
         <v-btn @click="setRole" color="blue darken-1" text> 保存</v-btn>
       </template>
     </ccCombobox>
-    <ccTable
-      :defaultItem="defaultItem"
-      :headers="headers"
-      :axiosUrls="axiosUrls"
-      @selected="getTableSelect"
-    >
+    <ccTable :defaultItem="defaultItem" :headers="headers" :axiosUrls="axiosUrls" :btnEnable="btnEnable"
+      @selected="getTableSelect">
       <template v-slot:action="{ item }">
         <v-icon small class="mr-2" @click="showItem(item)"> mdi-eye </v-icon>
       </template>
@@ -28,6 +19,7 @@
 <script>
 import userApi from "../api/userApi";
 import roleApi from "../api/roleApi";
+import { getBtn } from "../util/btnHandle";
 export default {
   created() {
     this.init();
@@ -61,7 +53,7 @@ export default {
     },
     init() {
       //这里可以遍历后台的菜单code，根据对应的菜单code来给axiosUrls的增删改查赋值即可
-
+      this.btnEnable = getBtn("user")
       this.axiosUrls = {
         get: "/user/GetList",
         update: "/user/Update",
@@ -70,8 +62,7 @@ export default {
       };
 
       roleApi.getList().then((resp) => {
-        console.log(resp.data)
-        this.roleItems=JSON.parse(JSON.stringify(resp.data));
+        this.roleItems = JSON.parse(JSON.stringify(resp.data));
       });
     },
     setRole() {
@@ -99,6 +90,7 @@ export default {
     },
   },
   data: () => ({
+    btnEnable: [],
     TableSelect: [],
     select: [],
     roleItems: [],