From 816858f231abd21161b360f17270d284e457ed80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Fri, 13 May 2022 23:08:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   4 ++++
 .../yi-sqlsugar-dev.db                        | Bin 102400 -> 102400 bytes
 Yi.Vue2.x/src/components/ccTreeview.vue       |   4 ++--
 Yi.Vue2.x/src/util/btnHandle.js               |   6 +++++-
 Yi.Vue2.x/src/views/AdmRole.vue               |   2 +-
 Yi.Vue2.x/src/views/AdmRoleMenu.vue           |   3 ++-
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index f94a0bf5..90a3bf87 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,11 @@ Yi框架-一套与SqlSugar一样爽的.Net6低代码开源框架。
 适合.Net6学习、Sqlsugar学习 、项目二次开发。
 集大成者，终究轮子
 
+<<<<<<< Updated upstream
 Yi框架最新版本标签：`v1.1.4`，具体版本可以查看标签迭代
+=======
+Yi框架最新版本标签：`v1.1.6`，具体版本可以查看标签迭代
+>>>>>>> Stashed changes
 
 （项目与Sqlsugar同步更新，但这作者老杰哥代码天天爆肝到凌晨两点，我们也尽量会跟上他的脚步。更新频繁，所以可watching持续关注。）
 
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 293aa5df7f8e05faa002e10cfae34a59a3f84f81..0d52528002dcfd1acbdd64e1b957b75a614b8b48 100644
GIT binary patch
delta 1107
zcmaKrO-lk%6o%){)jQua*I+2qKyp)oVPgeqA7T)+$z_BDhW!uCO|%GV5w}H@{R21F
zKKw0h0{=lD1E!wNRbe&{^Sqq*p1IR(vu2y!CP?otc|dxXwQh}E6}7d~kCQTwiRT>>
zU(Th1Tp_z1KI@zLTs~$p#+0I>=!!q^xab#2yn#F}d7jUzU!5{n{MGrDrxsU&Y!GC!
zTbT_M^`xi^qKW(WNzuljo-1XYan@fv498C!>qt=>M2(vnQQKth|E-AQU6M$lgIRcj
zxDKr<vP^7oW7H#ku~3=O!@yDTGogkqS%p2hhK4Q9#x?5wrPlOKG8`41Z~)#$RI)xN
z)QDh<Q&8jOVMYy#qvCvDuAxfSV`v?rk3z5&UgP0)PS?-6>eOw#mPpcT{QXjMHf3b^
z-^2iT9DwTqa9jYk1HiHYm=*xT1fUx>t&gT^I(Wr208s`Y5(Pjb08|Qqs1{|$;6QKR
I6{41Y0aL=-Z~y=R

delta 965
zcmZY7%}PQ+6bJA-cXYhpcdSHHgUUq)5d<ovR$|aHH|-)Y><Pks)+Sm6wVF+okKo4I
z`#OQp1N5QZIeMB|{<%NSf9}lb^;xgao^oXLoIfU`+xD<c?rW*-^jZCmCsXYFd(h;@
zB$o?KvC$>VTcyfwd9SpebQohs%`mL#*Qw@67hlDCm#kzZ<{A#gTb-<moi4Eeg&GRP
zxF%6iP6{;SFKScSljxA3eNB5v+mDgX$l0E%#pwab&CUqK)yM-7=yX)V?RjV6D%1Mk
zX{%cN!a(S>G*Ug3$AZU5sD!gcXJ@=NdkmPzR4fKC4@g`ipFlR{WyMs&DO8HDYm&}Z
zs!~!_ipwMAT1}0-0D)^IDw%90Y-gc!F*Ik}$)e8p2FZsva*3Bb$_VUe5`~bX5QHfB
z0Scavg6pB+xG2~T3YP8B&b&2Yp-(J<LY$!xi=#keD3}xlV!D*s(GPw6w20aG13I6n
Awg3PC

diff --git a/Yi.Vue2.x/src/components/ccTreeview.vue b/Yi.Vue2.x/src/components/ccTreeview.vue
index b3987808..9a37767d 100644
--- a/Yi.Vue2.x/src/components/ccTreeview.vue
+++ b/Yi.Vue2.x/src/components/ccTreeview.vue
@@ -58,9 +58,9 @@
       </v-icon>
     </template>
       <template v-slot:append="{ item }">
-        <v-btn v-show="item.menuType==1" class="mr-2">权限:{{ item.permissionCode }}</v-btn>
+        <app-btn v-show="item.menuType==1" class="mr-2" color="secondary"> 权限:{{ item.permissionCode }}</app-btn>
         <!-- <v-btn class="mr-2">图标:{{ item.icon }}</v-btn> -->
-        <v-btn v-show="item.menuType!=1" class="mr-2">路由:{{ item.router }}</v-btn>
+        <app-btn v-show="item.menuType==0" class="mr-2" >路由:{{ item.router }}</app-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" color="secondary">接口地址:{{ item.mould.url }}</v-btn> -->
         <!-- <ccCombobox
diff --git a/Yi.Vue2.x/src/util/btnHandle.js b/Yi.Vue2.x/src/util/btnHandle.js
index b9e080a4..e01f989f 100644
--- a/Yi.Vue2.x/src/util/btnHandle.js
+++ b/Yi.Vue2.x/src/util/btnHandle.js
@@ -31,6 +31,7 @@ function getBtn(par) {
             });
             break;
         case "role":
+            per.forEach(p => {
             if(p=="role:get")
             {
                 axiosEnable.get=true;
@@ -46,9 +47,11 @@ function getBtn(par) {
             else if(p=="role:add")
             {
                 axiosEnable.add=true;
-            }    
+            }   
+        }) 
         break;
         case "menu":
+            per.forEach(p => {
             if(p=="menu:get")
             {
                 axiosEnable.get=true;
@@ -65,6 +68,7 @@ function getBtn(par) {
             {
                 axiosEnable.add=true;
             }    
+        })
         break;
 
 
diff --git a/Yi.Vue2.x/src/views/AdmRole.vue b/Yi.Vue2.x/src/views/AdmRole.vue
index 9239517d..8b6a5293 100644
--- a/Yi.Vue2.x/src/views/AdmRole.vue
+++ b/Yi.Vue2.x/src/views/AdmRole.vue
@@ -20,7 +20,7 @@ export default {
   },
   methods: {
     init() {
-            this.btnEnable = getBtn("user")
+            this.btnEnable = getBtn("role")
      this.axiosUrls = {
         get: "/role/GetList",
         update: "/role/Update",
diff --git a/Yi.Vue2.x/src/views/AdmRoleMenu.vue b/Yi.Vue2.x/src/views/AdmRoleMenu.vue
index aa1d5690..837abca6 100644
--- a/Yi.Vue2.x/src/views/AdmRoleMenu.vue
+++ b/Yi.Vue2.x/src/views/AdmRoleMenu.vue
@@ -48,7 +48,8 @@
           item-text="menuName"
         >
           <template v-slot:append="{ item }">
-            <v-btn>权限:{{ item.permissionCode }}</v-btn>
+              <app-btn v-if="item.menuType==0">路由:{{ item.router }}</app-btn>
+            <app-btn v-if="item.menuType==1" color="secondary">权限:{{ item.permissionCode }}</app-btn>
           </template>
         </v-treeview>
       </v-card></v-col