From e229b32a5c2f7cc846a5679ab26c613b500bbf93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Fri, 22 Oct 2021 21:19:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Yi.Framework.ApiMicroservice/YIDB.db      | Bin 69632 -> 69632 bytes
 Yi.Vue/src/components/ccTable.vue             |  10 +-
 Yi.Vue/src/components/ccTreeview.vue          |   1 +
 Yi.Vue/src/layouts/default/Drawer.vue         |   4 +-
 Yi.Vue/src/util/getMould.js                   |  35 ++--
 Yi.Vue/src/views/AdmRole.vue                  | 180 ++++++++++--------
 6 files changed, 130 insertions(+), 100 deletions(-)

diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db
index 42d8c6cf64c091bd1673dc026bf8cdf7eb8280c2..462a5b06de32f497a82fd148e3746c90f7e9f90a 100644
GIT binary patch
delta 488
zcmZozz|ydQWdn-=A1i-51OFTTtNi=;7xA}m78EGuua{(HWf0cqNJ-7nFUrqJ)ptqF
z@yRSM2?DaESXdb(wK+-)QW8s2!IGh1CP+?{8K_O2BR#bQqRl-OtVNWGl|fpbGchFv
zq`oAzxI`aB2r;rUh{|(<m~b&(1_lNe{>^L-xA=L?IGLHn8FTYXb5dA0zwwt)kTK&s
z#lZiE|2zLD{<r)u_#gA%<G;y&h5tO?L%utc<q8y-_^wU1E6`)%yTEq}=#enK$qU}I
z2%DI(GBYxon1V<?6BcF$M&r#7>y#at&G<e~W<QX?%f$DW?+4#!eldPQeg&YudOi`5
zDl-sa3L>DI*w6npU^e5_oyyLb%E396Gn3PsQx~XyCr7=E88?GG2M32RBZDYMZc3(Z
zaY<rP2{0f`KwgtE#V4y}0+Cf^1R4R?`(pW|7oD4)uUq(hLK~lcVoEMJtTl{*YB@PL
YRT&s$k<<z!Db{y{sNKGwlhKh40O^;HKmY&$

delta 165
zcmV;W09yZmpag)R1h51!2m%k)01xaB)w2;Gs1K2#As!V11ppf#2w`Moa&K&9bY*jN
zFLY&dbP@pt02Lnyv-3ag4-7I10|OTUZEtmKWCFA7PZ%H?G7jMY5Bv}J5AqM~59kl$
z58e;i57ZCO4&jp^a3GUHa4xeE5Oof-;eI1Q12PW>lLx?Hvv0tJ4w0Z7vj@-pFat6P
Tzm*38WwQ|wQwg`f2?0R{TunE8

diff --git a/Yi.Vue/src/components/ccTable.vue b/Yi.Vue/src/components/ccTable.vue
index e3ae25d6..aa241eb4 100644
--- a/Yi.Vue/src/components/ccTable.vue
+++ b/Yi.Vue/src/components/ccTable.vue
@@ -24,7 +24,7 @@
           ></v-text-field>
 
           <v-btn
-            v-if="axiosUrls.hasOwnProperty('add')"
+            v-if="axiosUrls.add!=''"
             color="primary"
             dark
             class="mb-2 mx-2"
@@ -35,7 +35,7 @@
 
           <!-- 添加提示框 -->
           <v-dialog
-            v-if="axiosUrls.hasOwnProperty('add')"
+            v-if="axiosUrls.add!=''"
             v-model="dialog"
             max-width="500px"
           >
@@ -72,7 +72,7 @@
           </v-dialog>
 
           <v-btn
-            v-if="axiosUrls.hasOwnProperty('del')"
+            v-if="axiosUrls.del!=''"
           color="secondary"
            
             class="mb-2"
@@ -89,7 +89,7 @@
         <slot name="action" :item="item"></slot>
 
         <v-icon
-          v-if="axiosUrls.hasOwnProperty('update')"
+          v-if="axiosUrls.update!=''"
           small
           class="mr-2"
           @click="editItem(item)"
@@ -97,7 +97,7 @@
           mdi-pencil
         </v-icon>
         <v-icon
-          v-if="axiosUrls.hasOwnProperty('del')"
+          v-if="axiosUrls.del!=''"
           small
           @click="deleteItem(item)"
         >
diff --git a/Yi.Vue/src/components/ccTreeview.vue b/Yi.Vue/src/components/ccTreeview.vue
index 6e451953..586ba166 100644
--- a/Yi.Vue/src/components/ccTreeview.vue
+++ b/Yi.Vue/src/components/ccTreeview.vue
@@ -103,6 +103,7 @@ export default {
       icon: "mdi-start",
       router: "test",
       menu_name: "测试",
+      is_show:1
     },
   }),
   computed: {
diff --git a/Yi.Vue/src/layouts/default/Drawer.vue b/Yi.Vue/src/layouts/default/Drawer.vue
index cc2aae85..6e330453 100644
--- a/Yi.Vue/src/layouts/default/Drawer.vue
+++ b/Yi.Vue/src/layouts/default/Drawer.vue
@@ -81,7 +81,9 @@ export default {
             title: "用户管理",
             icon: "mdi-account",
             to: "/admuser/",
-            children: [],
+            children: [
+
+            ],
           },
           {
             title: "角色管理",
diff --git a/Yi.Vue/src/util/getMould.js b/Yi.Vue/src/util/getMould.js
index 2f9e05a8..4a07ff48 100644
--- a/Yi.Vue/src/util/getMould.js
+++ b/Yi.Vue/src/util/getMould.js
@@ -1,17 +1,24 @@
-function getUrl(menuList, menuStr) {
-    for (var i = 0; i < menuList.length; i++) {
-        if (menuList[i].menu_name == menuStr) {
-            console.log(handUrl(menuList[i]))
-            return 1;
-        } else {
-            if (menuList[i].children != undefined) {
-                getUrl(menuList[i].children, menuStr);
-            }
+var start = true;
 
+function getUrl(menuList, menuStr) {
+
+    if (start) {
+        for (var i = 0; i < menuList.length; i++) {
+            if (menuList[i].menu_name == menuStr) {
+                alert(777)
+                start = false;
+                console.log(handUrl(menuList[i]))
+                return handUrl(menuList[i])
+            } else {
+                if (menuList[i].children != undefined && start) {
+                    alert(666)
+                    getUrl(menuList[i].children, menuStr);
+                }
+
+            }
         }
     }
-}
-
+};
 
 function handUrl(menu) {
     var axiosUrls = {
@@ -42,4 +49,8 @@ function handUrl(menu) {
     });
     return axiosUrls;
 }
-export default { getUrl }
\ No newline at end of file
+
+export {
+    getUrl,
+    handUrl
+}
\ No newline at end of file
diff --git a/Yi.Vue/src/views/AdmRole.vue b/Yi.Vue/src/views/AdmRole.vue
index 61a79ed7..ad8d7578 100644
--- a/Yi.Vue/src/views/AdmRole.vue
+++ b/Yi.Vue/src/views/AdmRole.vue
@@ -12,93 +12,109 @@
   </material-card>
 </template>
 <script>
-import getUrl from '../util/getMould'
+import {handUrl} from '../util/getMould'
 export default {
-  created(){
-this.init();
+  created() {
+    this.init();
   },
-  methods:{
-init(){
-  const resp=  [
-      {
-        menu_name: "首页",
-        icon: "mdi-view-dashboard",
-        to: "/",
-      },
-      {
-        menu_name: "用户角色管理",
-        icon: "mdi-account",
-        to: "",
-        children: [
-          {
-            menu_name: "用户管理",
-            icon: "mdi-account",
-            to: "/admuser/",
-            children: [
-              {
-                menu_name: "get",
-                 icon: "mdi-account",
-                 to: "/admrole/",
-                 mould:{
-                   mould_name:"get",
-                   url: "666666无敌",
-                 }
-                
-              }
-            ],
-          },
-          {
-            menu_name: "角色管理",
-            icon: "mdi-account-tie",
-            to: "/admrole/",
-            children: [],
-          },
-        ],
-      },
-      {
-        menu_name: "菜单接口管理",
-        icon: "mdi-clipboard-outline",
-        to: "",
-        children: [
-          {
-            menu_name: "菜单管理",
-            icon: "mdi-account",
-            to: "/admMenu/",
-            children: [],
-          },
-          {
-            menu_name: "接口管理",
-            icon: "mdi-account",
-            to: "/admMould/",
-            children: [],
-          },
-          {
-            menu_name: "角色菜单分配管理",
-            icon: "mdi-account",
-            to: "/admRoleMenu/",
-            children: [],
-          },
-        ],
-      },
-      {
-        menu_name: "测试路由",
-        icon: "mdi-clipboard-outline",
-        to: "",
-        children: [
-          {
-            menu_name: "用户信息",
-            icon: "mdi-account",
-            to: "/userinfo/",
-            children: [],
+  methods: {
+    recursiveFun(menuList, menuStr) {
+      if (this.start) {
+        this.getUrlFun(menuList, menuStr);
+      }
+    },
+    getUrlFun(menuList, menuStr) {
+      for (var i = 0; i < menuList.length; i++) {
+        if (menuList[i].menu_name == menuStr) {
+          this.start = false;
+        this.axiosUrls= handUrl(menuList[i]);
+        } else {
+          if (menuList[i].children != undefined && this.start) {
+            this.recursiveFun(menuList[i].children, menuStr);
           }
-        ],
-      },
-    ];
-var mytest= getUrl.getUrl(resp,"用户管理")
-console.log(mytest);
-}
+        }
+      }
+    },
+    init() {
+      const resp = [
+        {
+          menu_name: "首页",
+          icon: "mdi-view-dashboard",
+          to: "/",
+        },
+        {
+          menu_name: "用户角色管理",
+          icon: "mdi-account",
+          to: "",
+          children: [
+            {
+              menu_name: "用户管理",
+              icon: "mdi-account",
+              to: "/admuser/",
+              children: [
+                {
+                  menu_name: "",
+                  icon: "mdi-account",
+                  to: "/admrole/",
+                  mould: {
+                    mould_name: "get",
+                    url: "/role/getrole",
+                  },
+                },
+              ],
+            },
+            {
+              menu_name: "角色管理",
+              icon: "mdi-account-tie",
+              to: "/admrole/",
+              children: [],
+            },
+          ],
+        },
+        {
+          menu_name: "菜单接口管理",
+          icon: "mdi-clipboard-outline",
+          to: "",
+          children: [
+            {
+              menu_name: "菜单管理",
+              icon: "mdi-account",
+              to: "/admMenu/",
+              children: [],
+            },
+            {
+              menu_name: "接口管理",
+              icon: "mdi-account",
+              to: "/admMould/",
+              children: [],
+            },
+            {
+              menu_name: "角色菜单分配管理",
+              icon: "mdi-account",
+              to: "/admRoleMenu/",
+              children: [],
+            },
+          ],
+        },
+        {
+          menu_name: "测试路由",
+          icon: "mdi-clipboard-outline",
+          to: "",
+          children: [
+            {
+              menu_name: "用户信息",
+              icon: "mdi-account",
+              to: "/userinfo/",
+              children: [],
+            },
+          ],
+        },
+      ];
+      this.recursiveFun(resp, "用户管理");
+    },
   },
   data: () => ({
+    start: true,
     axiosUrls: {
       get: "role/getrole",
       update: "role/updaterole",