From 3d012017435faf21235e3f7bf9d662767e80cd1d Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Tue, 14 Jul 2020 17:31:13 +0800
Subject: [PATCH] update

Former-commit-id: 768fa86ed1b5b97d316a454821d5dfbeb9245005
Former-commit-id: c18538e27c27a9fd341a3938521d5cd44658ea32
---
 .../WebMVC/wwwroot/router/shared/layout.html  | 72 +++++++++++--------
 1 file changed, 43 insertions(+), 29 deletions(-)

diff --git a/projects/WebMVC/wwwroot/router/shared/layout.html b/projects/WebMVC/wwwroot/router/shared/layout.html
index 3716a7bf..d9a67fd2 100644
--- a/projects/WebMVC/wwwroot/router/shared/layout.html
+++ b/projects/WebMVC/wwwroot/router/shared/layout.html
@@ -35,7 +35,7 @@
                 <nav class="mt-2">
                     <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">
                         <li class="nav-item">
-                            <router-link to="/" :class="isPageActive('/','/router/product.html','/router/device.html')">
+                            <router-link to="/" :class="getPageClass('/','/router/product.html','/router/device.html')">
                                 <i class="fa fa-folder nav-icon"></i>
                                 <p>
                                     产品
@@ -43,7 +43,7 @@
                             </router-link>
                         </li>
                         <li class="nav-item">
-                            <router-link to="/router/nodes.html" :class="isPageActive('/router/nodes.html','/router/node.html')">
+                            <router-link to="/router/nodes.html" :class="getPageClass('/router/nodes.html','/router/node.html')">
                                 <i class="fa fa-cube nav-icon"></i>
                                 <p>
                                     节点
@@ -51,7 +51,7 @@
                             </router-link>
                         </li>
                         <li class="nav-item" v-if="hasPermission('Read-Setting')">
-                            <router-link to="/router/admin/home.html" :class="isPageActive('/router/admin/home.html')">
+                            <router-link to="/router/admin/home.html" :class="getPageClass('/router/admin/home.html')">
                                 <i class="fa fa-folder nav-icon"></i>
                                 <p>
                                     控制台
@@ -59,36 +59,44 @@
                             </router-link>
                         </li>
                         <li class="nav-item" v-if="hasPermission('Read-Setting')">
-                            <router-link :key="$route.fullPath" to="/router/shared/list.html?entity=Setting" :class="isEntityActive('Setting')">
+                            <router-link :key="$route.fullPath" to="/router/shared/list.html?entity=Setting" :class="getLinkClass('Setting')">
                                 <i class="fa fa-folder nav-icon"></i>
                                 <p>
                                     设置
                                 </p>
                             </router-link>
                         </li>
-                        <li class="nav-item" v-if="hasPermission('Read-User')">
-                            <router-link :key="$route.fullPath" to="/router/shared/list.html?entity=User" :class="isEntityActive('User')">
-                                <i class="far fa-circle nav-icon"></i>
-                                <p>
-                                    用户管理
-                                </p>
-                            </router-link>
-                        </li>
-                        <li class="nav-item" v-if="hasPermission('Read-Role')">
-                            <router-link :key="$route.fullPath" to="/router/shared/list.html?entity=Role" :class="isEntityActive('Role')">
-                                <i class="far fa-circle nav-icon"></i>
-                                <p>
-                                    角色管理
-                                </p>
-                            </router-link>
-                        </li>
-                        <li class="nav-item" v-if="hasPermission('Read-Permission')">
-                            <router-link :key="$route.fullPath" to="/router/shared/list.html?entity=Permission" :class="isEntityActive('Permission')">
-                                <i class="far fa-circle nav-icon"></i>
-                                <p>
-                                    权限管理
-                                </p>
-                            </router-link>
+                        <li :class="getGroupLiClass('User','Role','Permission')" v-if="hasPermission('Read-User')||hasPermission('Read-Role')||hasPermission('Read-Permission')">
+                            <a href="javascript:;" :class="getGroupLinkClass('User','Role','Permission')">
+                                <i class="fa fa-user"></i>
+                                <p>用户管理<i class="right fas fa-angle-left"></i></p>
+                            </a>
+                            <ul class="nav nav-treeview">
+                                <li class="nav-item" v-if="hasPermission('Read-User')">
+                                    <router-link :key="$route.fullPath" to="/router/shared/list.html?entity=User" :class="getLinkClass('User')">
+                                        <i class="far fa-circle nav-icon"></i>
+                                        <p>
+                                            用户管理
+                                        </p>
+                                    </router-link>
+                                </li>
+                                <li class="nav-item" v-if="hasPermission('Read-Role')">
+                                    <router-link :key="$route.fullPath" to="/router/shared/list.html?entity=Role" :class="getLinkClass('Role')">
+                                        <i class="far fa-circle nav-icon"></i>
+                                        <p>
+                                            角色管理
+                                        </p>
+                                    </router-link>
+                                </li>
+                                <li class="nav-item" v-if="hasPermission('Read-Permission')">
+                                    <router-link :key="$route.fullPath" to="/router/shared/list.html?entity=Permission" :class="getLinkClass('Permission')">
+                                        <i class="far fa-circle nav-icon"></i>
+                                        <p>
+                                            权限管理
+                                        </p>
+                                    </router-link>
+                                </li>
+                            </ul>
                         </li>
                     </ul>
                 </nav>
@@ -164,7 +172,7 @@
             hasPermission(permission) {
                 return Enumerable.from(this.model.permissions).any(o => o == permission);
             },
-            isPageActive() {
+            getPageClass() {
                 var cls = 'nav-link';
                 for (var i = 0; i < arguments.length; i++) {
                     if (this.$route.path == arguments[i]) {
@@ -173,12 +181,18 @@
                 }
                 return cls;
             },
-            isEntityActive(entity) {
+            getLinkClass(entity) {
                 var cls = 'nav-link';
                 if (this.$route.query.entity === entity) {
                     return cls + ' active';
                 }
                 return cls;
+            },
+            getGroupLiClass() {
+                return 'nav-item has-treeview' + Enumerable.from(arguments).any(o => o === this.$route.query.entity) ? ' menu-open' : '';
+            },
+            getGroupLinkClass() {
+                return 'nav-link' + Enumerable.from(arguments).any(o => o === this.$route.query.entity) ? ' active' : '';;
             }
         }
     }