From d0ae7a5591f127a990c7c6ca39d0d289b8af988a Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Sun, 6 Oct 2019 20:02:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(#I12YKG):=20=E8=A7=92=E8=89=B2=E5=AF=B9?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=8E=88=E6=9D=83=E5=BC=B9=E7=AA=97=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#Comment
comment #I12YKG

#Issue
link #I12YKG
---
 .../Views/Shared/NavigatorConfig.cshtml       | 14 +++++
 .../Bootstrap.Admin/wwwroot/css/theme.css     | 57 +++++++++++--------
 src/admin/Bootstrap.Admin/wwwroot/js/roles.js | 16 ++++++
 3 files changed, 63 insertions(+), 24 deletions(-)

diff --git a/src/admin/Bootstrap.Admin/Views/Shared/NavigatorConfig.cshtml b/src/admin/Bootstrap.Admin/Views/Shared/NavigatorConfig.cshtml
index b7c8d0bb..5e2e6ec2 100644
--- a/src/admin/Bootstrap.Admin/Views/Shared/NavigatorConfig.cshtml
+++ b/src/admin/Bootstrap.Admin/Views/Shared/NavigatorConfig.cshtml
@@ -11,6 +11,20 @@
                 </div>
             </div>
             <div class="modal-footer">
+                <div class="flex-fill d-none d-sm-block">
+                    <div class="custom-control custom-radio custom-control-inline">
+                        <input type="radio" id="customRadioInline1" name="customRadioInline" checked class="custom-control-input" value="all">
+                        <label class="custom-control-label" for="customRadioInline1">全部</label>
+                    </div>
+                    <div class="custom-control custom-radio custom-control-inline">
+                        <input type="radio" id="customRadioInline2" name="customRadioInline" class="custom-control-input" value="system">
+                        <label class="custom-control-label" for="customRadioInline2">系统菜单</label>
+                    </div>
+                    <div class="custom-control custom-radio custom-control-inline">
+                        <input type="radio" id="customRadioInline3" name="customRadioInline" class="custom-control-input" value="custom">
+                        <label class="custom-control-label" for="customRadioInline3">外部菜单</label>
+                    </div>
+                </div>
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">
                     <i class="fa fa-times"></i>
                     <span>关闭</span>
diff --git a/src/admin/Bootstrap.Admin/wwwroot/css/theme.css b/src/admin/Bootstrap.Admin/wwwroot/css/theme.css
index da18d00e..7226abf7 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/css/theme.css
+++ b/src/admin/Bootstrap.Admin/wwwroot/css/theme.css
@@ -554,38 +554,38 @@ input.pending {
         box-shadow: none;
     }
 
-    .card-header {
-        padding: 0.5rem 1rem;
+.card-header {
+    padding: 0.5rem 1rem;
+}
+
+.card .card-header a {
+    color: #797979;
+}
+
+    .card .card-header a[data-toggle="collapse"] {
+        display: block;
     }
 
-    .card .card-header a {
-        color: #797979;
-    }
-
-        .card .card-header a[data-toggle="collapse"] {
-            display: block;
+        .card .card-header a[data-toggle="collapse"] i {
+            transition: all .25s linear;
         }
 
-            .card .card-header a[data-toggle="collapse"] i {
-                transition: all .25s linear;
-            }
-
-            .card .card-header a[data-toggle="collapse"].collapsed i {
-                transform: rotate(-90deg);
-            }
-
-        .card .card-header a.fa {
-            transition: color .3s linear;
+        .card .card-header a[data-toggle="collapse"].collapsed i {
+            transform: rotate(-90deg);
         }
 
-            .card .card-header a.fa:hover {
-                color: #333;
-            }
-
-    .card .card-header i + span {
-        margin-left: 6px;
+    .card .card-header a.fa {
+        transition: color .3s linear;
     }
 
+        .card .card-header a.fa:hover {
+            color: #333;
+        }
+
+.card .card-header i + span {
+    margin-left: 6px;
+}
+
 .card-body .bootstrap-table {
     margin-top: -10px;
 }
@@ -940,3 +940,12 @@ label[for] {
     display: inline-block;
     margin-left: 0;
 }
+
+.custom-control-label {
+    color: #333;
+    font-weight: bold;
+}
+
+    .custom-control-label:before, .custom-control-label::after {
+        top: 3px;
+    }
diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/roles.js b/src/admin/Bootstrap.Admin/wwwroot/js/roles.js
index 62fc46e4..99d02b0a 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/js/roles.js
+++ b/src/admin/Bootstrap.Admin/wwwroot/js/roles.js
@@ -155,4 +155,20 @@ $(function () {
             });
         }).children('.radio').hide();
     });
+
+    // 菜单弹窗过滤条件
+    $('.custom-radio').on('click', ':radio', function (e) {
+        var filter = $(this).val();
+        if (filter === 'all') {
+            $nestMenu.find('[data-category]').removeClass('d-none');
+        }
+        else if (filter === 'system') {
+            $nestMenu.find('[data-category]').addClass('d-none');
+            $nestMenu.find('[data-category="0"]').removeClass('d-none');
+        }
+        else if (filter === 'custom') {
+            $nestMenu.find('[data-category]').addClass('d-none');
+            $nestMenu.find('[data-category="1"]').removeClass('d-none');
+        }
+    });
 });
\ No newline at end of file