innov
/
BootstrapAdmin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev-menu' into dev

This commit is contained in:
Argo Zhang 2019-10-06 20:46:14 +08:00
parent 68d2ac8cb1 d0ae7a5591
commit 00e82fe09f
No known key found for this signature in database
GPG Key ID: 152E398953DDF19F
3 changed files with 63 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/admin/Bootstrap.Admin/Views/Shared/NavigatorConfig.cshtml
View File

@ -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>

57
src/admin/Bootstrap.Admin/wwwroot/css/theme.css
View File

@ -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;
}

16
src/admin/Bootstrap.Admin/wwwroot/js/roles.js
View File

@ -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');
}
});
});