From eb15667d21b9ee8016d19536e43aebfa9656090e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Sat, 23 Oct 2021 02:09:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=AF=BC=E8=88=AA=E6=A0=8F?=
 =?UTF-8?q?=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/ccTreeview.vue          |   2 +-
 Yi.Vue/src/layouts/default/Drawer.vue         |  56 +++++++++---------
 Yi.Vue/src/layouts/default/ListGroup.vue      |  26 ++++----
 Yi.Vue/src/layouts/default/ListItem.vue       |   8 +--
 Yi.Vue/src/util/getMould.js                   |   2 -
 6 files changed, 45 insertions(+), 49 deletions(-)

diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db
index 462a5b06de32f497a82fd148e3746c90f7e9f90a..a032b95c837f2ccc686c6fe3789c67f9baa7214d 100644
GIT binary patch
delta 268
zcmZozz|ydQWy1r1MvKi4{goA%E%^3LW-rKP;XA^&Z?m9)8{gyw?^!rZELfQt8BNSL
zpQ^KR1gd#Hnf(Az&0D_bKsEUwHLUDlB`oHfKc5pcWVYaVGnJh&mxYs?;|)+r35UC^
z1vi5{2PcOxBcmusZc3(ZaY<rPNlI#t32RAeafyOCL|PI>y0joAu_V=m1*Ag845)&0
zdLSpG#B^^?MioZR=>?pOAwcRVC!;Emdd<lw2c)>T7-fN!29TN_!p$hYJ%)>M2QyGa
el#fvjNZCNBWIjf1c1})122N4V?Nj*}vl#(N?nAKv

delta 165
zcmZozz|ydQWy1r1MzhTi{goA%&G=4DW-rLyEGQ7hH+jK(md)qt%p8HDpC_{)0EyP~
zZT@^t(2&`TQ+FymBS>T?2a}B1bYD(Jnd#n~j4F&A(+fBmLx9v#PDWKA^_r7W4oGov
yG0Fld4G6W7mr-nc3>V`LW}uiTAEO$OvVl;^e2m)c9Gr#>oT41tr}8moGXem2B`T-@

diff --git a/Yi.Vue/src/components/ccTreeview.vue b/Yi.Vue/src/components/ccTreeview.vue
index 586ba166..0b463960 100644
--- a/Yi.Vue/src/components/ccTreeview.vue
+++ b/Yi.Vue/src/components/ccTreeview.vue
@@ -177,7 +177,7 @@ export default {
       });
     },
     editItem(item) {
-      this.editedIndex = this.desserts.indexOf(item);
+      this.editedIndex = item.id;
       this.editedItem = Object.assign({}, item);
       this.dialog = true;
     },
diff --git a/Yi.Vue/src/layouts/default/Drawer.vue b/Yi.Vue/src/layouts/default/Drawer.vue
index 6e330453..997566e5 100644
--- a/Yi.Vue/src/layouts/default/Drawer.vue
+++ b/Yi.Vue/src/layouts/default/Drawer.vue
@@ -68,67 +68,65 @@ export default {
 
     items: [
       {
-        title: "首页",
+        menu_name: "首页",
         icon: "mdi-view-dashboard",
-        to: "/",
+        router: "/",
       },
       {
-        title: "用户角色管理",
+        menu_name: "用户角色管理",
         icon: "mdi-account",
-        to: "",
+        router: "",
         children: [
           {
-            title: "用户管理",
+            menu_name: "用户管理",
             icon: "mdi-account",
-            to: "/admuser/",
-            children: [
-
-            ],
+            router: "/admuser/",
+             children: null,
           },
           {
-            title: "角色管理",
+            menu_name: "角色管理",
             icon: "mdi-account-tie",
-            to: "/admrole/",
-            children: [],
+            router: "/admrole/",
+            children: null,
           },
         ],
       },
       {
-        title: "菜单接口管理",
+        menu_name: "菜单接口管理",
         icon: "mdi-clipboard-outline",
-        to: "",
+        router: "",
         children: [
           {
-            title: "菜单管理",
+            menu_name: "菜单管理",
             icon: "mdi-account",
-            to: "/admMenu/",
-            children: [],
+            router: "/admMenu/",
+            children: null,
           },
           {
-            title: "接口管理",
+            menu_name: "接口管理",
             icon: "mdi-account",
-            to: "/admMould/",
-            children: [],
+            router: "/admMould/",
+            children: null,
           },
           {
-            title: "角色菜单分配管理",
+            menu_name: "角色菜单分配管理",
             icon: "mdi-account",
-            to: "/admRoleMenu/",
-            children: [],
+            router: "/admRoleMenu/",
+            children: null,
           },
         ],
       },
       {
-        title: "测试路由",
+        menu_name: "测试路由",
         icon: "mdi-clipboard-outline",
-        to: "",
+        router: "",
         children: [
           {
-            title: "用户信息",
+            menu_name: "用户信息",
             icon: "mdi-account",
-            to: "/userinfo/",
-            children: [],
-          }
+            router: "/userinfo/",
+            children: null,
+          },
         ],
       },
     ],
diff --git a/Yi.Vue/src/layouts/default/ListGroup.vue b/Yi.Vue/src/layouts/default/ListGroup.vue
index b0ef2852..3fbcb133 100644
--- a/Yi.Vue/src/layouts/default/ListGroup.vue
+++ b/Yi.Vue/src/layouts/default/ListGroup.vue
@@ -1,7 +1,7 @@
 <template>
   <v-list-group
    
-
+:group="group"
     :prepend-icon="item.icon"
     eager
     v-bind="$attrs"
@@ -19,20 +19,20 @@
         <v-img :src="item.avatar" />
       </v-list-item-avatar>
 
-      <v-list-item-content v-if="item.title">
-        <v-list-item-title v-text="item.title" />
+      <v-list-item-content v-if="item.menu_name">
+        <v-list-item-title v-text="item.menu_name" />
       </v-list-item-content>
     </template>
 
     <template v-for="(child, i) in item.children">
       <default-list-group
-        v-if="child.items"
+        v-if="child.children"
         :key="`sub-group-${i}`"
         :item="child"
       />
 
       <default-list-item
-        v-if="!child.items"
+        v-if="!child.children"
         :key="`child-${i}`"
         :item="child"
       />
@@ -60,11 +60,11 @@
 
     computed: {
  
-      // group () {
-      //   return this.genGroup(this.item.items)
-      // },
+      group () {
+        return this.genGroup(this.item.children)
+      },
       title () {
-        const matches = this.item.title.match(/\b(\w)/g)
+        const matches = this.item.menu_name.match(/\b(\w)/g)
 
         return matches.join('')
       },
@@ -73,12 +73,12 @@
     methods: {
       genGroup (items) {
         return items.reduce((acc, cur) => {
-          if (!cur.to) return acc
+          if (!cur.router) return acc
 
           acc.push(
-            cur.items
-              ? this.genGroup(cur.items)
-              : cur.to.slice(1, -1),
+            cur.children
+              ? this.genGroup(cur.children)
+              : cur.router.slice(1, -1),
           )
 
           return acc
diff --git a/Yi.Vue/src/layouts/default/ListItem.vue b/Yi.Vue/src/layouts/default/ListItem.vue
index a125c4be..16056715 100644
--- a/Yi.Vue/src/layouts/default/ListItem.vue
+++ b/Yi.Vue/src/layouts/default/ListItem.vue
@@ -3,7 +3,7 @@
     :href="item.href"
     :rel="item.href ? 'nofollow' : undefined"
     :target="item.href ? '_blank' : undefined"
-    :to="item.to"
+    :to="item.router"
     active-class="primary white--text"
     link
     class="py-1"
@@ -28,8 +28,8 @@
       <v-icon v-text="item.icon" />
     </v-list-item-icon>
 
-    <v-list-item-content v-if="item.title">
-      <v-list-item-title v-text="item.title" />
+    <v-list-item-content v-if="item.menu_name">
+      <v-list-item-title v-text="item.menu_name" />
     </v-list-item-content>
   </v-list-item>
 </template>
@@ -47,7 +47,7 @@
 
     computed: {
       title () {
-        const matches = this.item.title.match(/\b(\w)/g)
+        const matches = this.item.menu_name.match(/\b(\w)/g)
 
         return matches.join('')
       },
diff --git a/Yi.Vue/src/util/getMould.js b/Yi.Vue/src/util/getMould.js
index 4a07ff48..360c8ae4 100644
--- a/Yi.Vue/src/util/getMould.js
+++ b/Yi.Vue/src/util/getMould.js
@@ -5,13 +5,11 @@ 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);
                 }