!21 增加功能:整合 AdminLTE 主题效果

Merge pull request !21 from Argo/dev-AdminLTE2
This commit is contained in:
Argo 2019-08-16 12:47:26 +08:00 committed by Gitee
commit 35a8e84d0f
50 changed files with 6515 additions and 4031 deletions

Binary file not shown.

View File

@ -72,7 +72,7 @@
<span>记住密码自动登录</span>
<input id="remember" name="remember" type="hidden" value="false" />
</div>
<button class="btn btn-lg btn-login btn-block" type="submit">登 </button>
<button class="btn btn-lg btn-login btn-block" type="submit">登 </button>
<div class="login-footer">
<a href="#" data-method="register">申请账号</a>
<a href="#" data-method="forgot">忘记密码</a>
@ -96,14 +96,14 @@
</div>
<div class="modal-body">
<div class="form-group">
<label for="userName">登名称:</label>
<label for="userName">登名称:</label>
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">
<span class="fa fa-user-plus"></span>
</div>
</div>
<input type="text" id="userName" autocomplete="off" class="form-control" placeholder="登账号不可为空" userName="true" minlength="4" maxlength="16" remote="api/Register" data-remote-msg="此用户已存在" data-valid="true" />
<input type="text" id="userName" autocomplete="off" class="form-control" placeholder="登账号不可为空" userName="true" minlength="4" maxlength="16" remote="api/Register" data-remote-msg="此用户已存在" data-valid="true" />
</div>
</div>
<div class="form-group">
@ -173,14 +173,14 @@
</div>
<div class="modal-body">
<div class="form-group">
<label for="f_userName">登账号:</label>
<label for="f_userName">登账号:</label>
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">
<span class="fa fa-user-plus"></span>
</div>
</div>
<input type="text" id="f_userName" autocomplete="off" class="form-control" placeholder="登账号不可为空" minlength="4" maxlength="16" data-valid="true" />
<input type="text" id="f_userName" autocomplete="off" class="form-control" placeholder="登账号不可为空" minlength="4" maxlength="16" data-valid="true" />
</div>
</div>
<div class="form-group">

View File

@ -55,7 +55,7 @@
健康检查结果
</div>
<div class="card-body">
<div class="alert alert-info" role="alert" asp-condition="true">
<div class="alert alert-info" role="alert" asp-condition="@Model.IsDemo">
<p>本功能应用场景为发布后通过调用<b>健康检查</b>进行系统自我检测</p>
<ol>
<li>健康检查接口地址: <a href="~/healths">healths</a></li>

View File

@ -12,6 +12,10 @@
color: #fff;
margin-top: 0;
}
.main-content .main-header {
display: none;
}
</style>
}
@section javascript {

View File

@ -39,7 +39,7 @@
<form class="form-inline">
<div class="row">
<div class="form-group col-sm-6 col-md-auto">
<label class="control-label" for="userName">登名称</label>
<label class="control-label" for="userName">登名称</label>
<input type="text" class="form-control ignore" id="userName" name="userName" value="@Model.UserName" readonly />
</div>
<div class="form-group col-sm-6 col-md-auto">

View File

@ -10,7 +10,7 @@
<form class="form-inline">
<div class="row">
<div class="form-group col-sm-auto">
<label class="control-label" for="txt_search_name">登名称</label>
<label class="control-label" for="txt_search_name">登名称</label>
<input type="text" class="form-control" id="txt_search_name" maxlength="16" />
</div>
<div class="form-group col-sm-auto">
@ -53,7 +53,7 @@
<input type="hidden" id="userID" />
<div class="row">
<div class="form-group col-sm-6">
<label class="control-label" for="userName">登名称</label>
<label class="control-label" for="userName">登名称</label>
<input type="text" class="form-control" id="userName" placeholder="不可为空16字以内" minlength="4" maxlength="16" userName="true" remote="api/Register" data-remote-msg="此用户已存在" data-valid="true" />
</div>
<div class="form-group col-sm-6">
@ -66,7 +66,7 @@
</div>
<div class="form-group col-sm-6">
<label class="control-label" for="confirm">确认密码</label>
<input type="password" class="form-control" id="confirm" placeholder="与登密码一致" maxlength="16" equalTo="#password" data-valid="true" />
<input type="password" class="form-control" id="confirm" placeholder="与登密码一致" maxlength="16" equalTo="#password" data-valid="true" />
</div>
</div>
</form>
@ -91,7 +91,7 @@
</div>
<div class="form-group col-sm-6">
<label class="control-label" for="confirm">确认密码</label>
<input type="password" class="form-control" id="resetConfirm" placeholder="与登密码一致" maxlength="16" equalTo="#resetPassword" data-valid="true" />
<input type="password" class="form-control" id="resetConfirm" placeholder="与登密码一致" maxlength="16" equalTo="#resetPassword" data-valid="true" />
</div>
<div class="form-group col-sm-12">
<label class="control-label" for="resetReason">重置原因</label>

View File

@ -12,6 +12,22 @@
top: 96px;
overflow: hidden;
}
.header {
margin-left: 0 !important;
}
.header nav {
display: block !important;
}
.header .sidebar-toggle-box span {
opacity: 1 !important;
}
.breadcrumb {
border-top: solid 1px #ddd !important;
}
</style>
}
<div class="content-body welcome-bg">

View File

@ -92,6 +92,18 @@
<span id="userDisplayName" data-userName="@Model.UserName" class="username text-truncate d-inline-block">@Model.DisplayName</span>
</a>
<div class="dropdown-menu dropdown-menu-right">
<div class="dropdown-item">
<div class="d-flex flex-fill align-items-center">
<img src="@Url.Content(Model.Icon)">
<div class="flex-fill">
<div class="d-flex">
<span class="d-inline-block font-weight-bold flex-fill">@Model.DisplayName</span>
<span class="text-success"><i class="fa fa-star"></i></span>
</div>
<div class="text-sm">登录名:@Model.UserName</div>
</div>
</div>
</div>
<div class="dropdown-item">
<a href="~/Admin/Profiles"><i class=" fa fa-suitcase"></i>个人中心</a>
<a href="~/Admin/Index"><i class="fa fa-cog"></i>设置</a>

View File

@ -1,11 +1,26 @@
@model NavigatorBarModel
<aside>
<div class="bg"></div>
<div class="nav-brand justify-content-center">
<a href="~/Admin/Index">
<img src="~/favicon.png" />
<span>@Model.Title</span>
</a>
</div>
<div class="nav-header flex-fill align-items-center">
<a href="~/Admin/Profiles">
<img src="@Url.Content(Model.Icon)" />
<span class="d-inline-block font-weight-bold flex-fill">@Model.DisplayName</span>
</a>
</div>
<!-- sidebar menu start-->
<ul class="sidebar nav nav-pills flex-column flex-nowrap">
<div class="sidebar">
<ul class="nav-sidebar nav nav-pills flex-column flex-nowrap">
@foreach (var menu in Model.Navigations)
{
@await Html.PartialAsync("SubNavItem", menu)
}
</ul>
</div>
<!-- sidebar menu end-->
</aside>

View File

@ -1,6 +1,6 @@
@model Bootstrap.Security.BootstrapMenu
<li class="nav-item @Model.Active">
<a href="@Url.Content(Model.Url)" class="nav-link @Model.Active" target="@Model.Target"><i class="@Model.Icon"></i>@Model.Name</a>
<a href="@Url.Content(Model.Url)" class="nav-link @Model.Active" target="@Model.Target"><i class="@Model.Icon"></i><span>@Model.Name</span></a>
@if (Model.Menus.Any())
{
@await Html.PartialAsync("SubNavigation", Model.Menus)

View File

@ -6,28 +6,26 @@
<link href="~/lib/toastr.js/toastr.css" rel="stylesheet" />
<link href="~/lib/nprogress/nprogress.css" rel="stylesheet" />
<link href="~/lib/sweetalert/sweetalert2.css" rel="stylesheet" />
<link href="~/lib/scrollbar/jquery.mCustomScrollbar.css" rel="stylesheet" />
<link href="~/lib/overlayscrollbars/OverlayScrollbars.css" rel="stylesheet" />
</environment>
<environment exclude="Development">
<link href="~/lib/toastr.js/toastr.min.css" rel="stylesheet" />
<link href="~/lib/nprogress/nprogress.min.css" rel="stylesheet" />
<link href="~/lib/sweetalert/sweetalert2.min.css" rel="stylesheet" />
<link href="~/lib/scrollbar/jquery.mCustomScrollbar.min.css" rel="stylesheet" />
<link href="~/lib/overlayscrollbars/OverlayScrollbars.min.css" rel="stylesheet" />
</environment>
@RenderSection("css", false)
}
@section javascript {
<environment include="Development">
<script src="~/lib/scrollbar/jquery.mousewheel.js"></script>
<script src="~/lib/scrollbar/jquery.mCustomScrollbar.js"></script>
<script src="~/lib/overlayscrollbars/jquery.overlayScrollbars.js"></script>
<script src="~/lib/signalr/dist/browser/signalr.js"></script>
<script src="~/lib/dcjqaccordion/js/jquery.dcjqaccordion.2.7.js"></script>
<script src="~/lib/sweetalert/sweetalert2.js" rel="stylesheet"></script>
<script src="~/lib/nprogress/nprogress.js"></script>
</environment>
<environment exclude="Development">
<script src="~/lib/scrollbar/jquery.mousewheel.min.js"></script>
<script src="~/lib/scrollbar/jquery.mCustomScrollbar.concat.min.js"></script>
<script src="~/lib/overlayscrollbars/jquery.overlayScrollbars.min.js"></script>
<script src="~/lib/signalr/dist/browser/signalr.min.js"></script>
<script src="~/lib/dcjqaccordion/js/jquery.dcjqaccordion.2.7.min.js"></script>
<script src="~/lib/sweetalert/sweetalert2.min.js" rel="stylesheet"></script>
@ -41,6 +39,12 @@
}
@await Html.PartialAsync("Navigator")
<section id="main-content" class="main-content">
<div class="main-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="@Url.Content("~/Admin/Index")"><i class="fa fa-home"></i>首页</a></li>
<li class="breadcrumb-item d-none"></li>
</ol>
</div>
@RenderBody()
</section>
@section modal {

View File

@ -1,4 +1,8 @@
.navbar-light .navbar-nav .show > .nav-link, .navbar-light .navbar-nav .active > .nav-link, .navbar-light .navbar-nav .nav-link.show, .navbar-light .navbar-nav .nav-link.active {
.sidebar-toggle-box .fa-bars {
color: #007bff;
}
.navbar-light .navbar-nav .show > .nav-link, .navbar-light .navbar-nav .active > .nav-link, .navbar-light .navbar-nav .nav-link.show, .navbar-light .navbar-nav .nav-link.active {
color: rgb(51, 122, 183);
}

View File

@ -0,0 +1,299 @@
#nprogress .spinner {
display: none;
}
.header .nav {
justify-content: flex-end;
}
.header .nav .dropdown, .userinfo {
display: flex;
align-items: center;
height: 54px;
transition: all .3s linear;
cursor: pointer;
margin: 0;
padding: 0 6px;
}
.header nav, userinfo, .userinfo .dropdown-toggle:after {
display: none;
}
.header .sidebar-toggle-box {
cursor: pointer;
}
.header .sidebar-toggle-box span, aside .nav-brand a {
transition: all .3s ease-in-out;
}
.header .badge {
top: 4px;
}
.userinfo .badge {
top: 64px;
}
.userinfo img {
border-radius: 50%;
}
.userinfo .dropdown-toggle, .userinfo .dropdown-toggle:hover, .userinfo.show .dropdown-toggle, .nav [data-toggle="dropdown"], .nav [data-toggle="dropdown"]:hover {
border: none !important;
}
.userinfo .shadow-default, .nav [data-toggle="dropdown"], .nav [data-toggle="dropdown"]:hover {
box-shadow: none;
}
.userinfo .dropdown-item {
border-bottom: solid 1px #e9ecef;
padding: 0.25rem 1.5rem;
}
.userinfo .dropdown-item:first-child {
display: flex;
}
.userinfo .dropdown-item img {
width: 60px;
height: auto;
margin-right: 1rem;
}
.userinfo .dropdown-item a {
padding: 0.25rem 0.625rem;
}
.userinfo .dropdown-item a:hover {
color: #333;
}
.userinfo .dropdown-item a i {
display: inline-block;
margin-right: 10px;
}
.userinfo .dropdown-item:last-child {
border-bottom: none;
}
.userinfo .dropdown-item:last-child a {
background: none;
}
.userinfo.show .dropdown-menu {
margin-top: 8px;
}
aside {
top: 58px;
background-color: #1a2226;
}
aside .bg {
background-color: #337ab7;
height: 3px;
margin: 0 -15px;
}
aside .nav-brand, .sidebar-open aside:hover .nav-brand {
height: 55px;
align-items: center;
border-bottom: solid 1px #ddd;
padding: 0 0.625rem;
}
aside .nav-brand span, .header .sidebar-toggle-box {
font-size: 1.25rem;
font-weight: 700;
white-space: nowrap;
}
aside .nav-brand img, .sidebar-open aside:hover .nav-brand img {
opacity: 0;
visibility: hidden;
width: 2.75rem;
height: auto;
border-radius: 0.42rem;
position: absolute;
top: 9px;
left: 4px;
}
aside .nav-link span {
display: inline-block;
white-space: nowrap;
}
.main-content {
top: 58px;
transition: margin-left .3s linear;
}
.main-header .breadcrumb {
margin-top: -10px;
}
.main-header {
display: block;
margin-bottom: 5px;
}
.main-header .text-dark {
font-size: 1.5rem;
}
.breadcrumb {
border-top: none;
}
/* color */
body {
background: #ecf0f5;
}
.header, aside .nav-brand, .userinfo .dropdown-menu, .userinfo .dropdown-item {
background: #3c8dbc;
}
.header .nav .dropdown:hover, .userinfo:hover {
background-color: rgba(0,0,0,0.1);
}
.sidebar .nav-link {
color: #b8c7ce;
}
.header, .header .breadcrumb-item a, aside .nav-brand a, .sidebar-toggle-box, .userinfo .dropdown-toggle, .nav [data-toggle="dropdown"], .userinfo .dropdown-item, .userinfo .dropdown-item a, .userinfo .dropdown-item:last-child a {
color: #eee;
}
.sidebar-toggle-box:hover, aside .nav-brand a:hover, .userinfo .dropdown-toggle:hover, .userinfo.show .dropdown-toggle, .nav [data-toggle="dropdown"]:hover, .sidebar .nav-link:hover, .userinfo .dropdown-item:hover, .userinfo .dropdown-item a:hover, .userinfo .dropdown-item:last-child a:hover {
color: #fff;
}
.header, aside .nav-brand {
border-bottom: 1px solid #3c8dbc;
}
.card {
border-top-color: #3c8dbc;
color: #444;
}
.card:hover {
border-top-color: #2c6ca2;
}
@media (min-width: 769px) {
.header {
margin-left: 210px;
transition: margin-left .3s linear;
}
.header .sidebar-toggle-box span {
opacity: 0;
}
.sidebar-open .header .sidebar-toggle-box span {
opacity: 1;
}
aside {
top: 0;
}
aside .bg {
display: block;
}
aside .sidebar, .sidebar-open aside:hover .sidebar {
top: 139px;
transition: top .3s linear;
}
aside, aside .nav-header img {
transition: width .3s linear;
}
aside .nav-brand, .sidebar-open aside:hover .nav-brand, aside .nav-header {
display: flex;
}
aside .nav-header {
padding: 0.625rem 0.625rem 0.625rem 0.625rem;
border-bottom: solid 1px rgba(221, 221, 221, 0.5);
}
aside .nav-header a {
white-space: nowrap;
}
aside .nav-header img, .sidebar-open aside:hover .nav-header img {
width: 3.75rem;
height: auto;
border-radius: 50%;
}
aside .nav-header span, .sidebar-open aside:hover .nav-header span {
color: #eee;
margin-left: 0.625rem;
}
aside .sub .nav-link, .userinfo .dropdown-item {
transition: all .3s linear;
}
aside .nav-link span, aside .nav-brand span, aside .nav-header span, aside .nav-brand img {
transition: margin-left .3s linear, opacity .3s ease, visibility .3s ease;
}
.sidebar-open aside:hover {
width: 210px;
z-index: 15;
}
.sidebar-open .header {
margin-left: 3.375rem;
}
.sidebar-open aside {
transform: translate(0);
width: 3.375rem;
}
.sidebar-open aside .nav-item span, .sidebar-open aside .nav-header span, .sidebar-open .nav-brand span {
opacity: 0;
visibility: hidden;
margin-left: -10px;
}
.sidebar-open aside .nav-header img {
width: 2.25rem
}
.sidebar-open aside .nav-brand img, .sidebar-open aside:hover .nav-brand span, .sidebar-open aside:hover .nav-header span, .sidebar-open aside:hover .nav-item span {
opacity: 1;
visibility: visible;
}
.sidebar-open aside:hover .nav-link i + span {
margin-left: 0;
}
.sidebar-open aside .sidebar {
top: 115px;
}
.sidebar-open .main-content {
margin-left: 3.375rem;
transition: margin-left .3s linear;
}
.sidebar-open .sub .nav-link {
padding-left: 0;
}
}

View File

@ -43,7 +43,6 @@
.main-content {
margin-left: 210px;
transition: none;
}
}

View File

@ -98,10 +98,20 @@
font-weight: 600;
}
.sidebar-toggle-box .fa-bars {
transition: transform .3s ease-in-out;
width: 20px;
transform-origin: center;
}
.sidebar-open .main-content {
display: none;
}
.sidebar-open .sidebar-toggle-box .fa-bars {
transform: rotate(-90deg);
}
.main-content {
padding: 15px 15px 0 15px;
margin-left: 0;
@ -109,6 +119,7 @@
bottom: 40px;
right: 0;
top: 96px;
transition: margin-left .3s ease-in-out;
}
.main-content > .panel:last-child .panel-body {

View File

@ -94,12 +94,20 @@
}
aside {
transition: none;
transform: translate(0);
width: 210px;
overflow: hidden;
bottom: 40px;
}
aside .sidebar {
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
overflow: hidden;
}
}
@media (min-width: 940px) {

View File

@ -11,12 +11,15 @@ body {
-webkit-overflow-scrolling: touch;
}
aside .bg, aside .nav-brand, aside .nav-header, .header .nav, .userinfo .dropdown-item:first-child {
display: none;
}
.header {
background: #fff;
}
.header .nav {
display: none;
margin-left: 15px;
}
@ -238,12 +241,11 @@ body, .form-control, .dropdown-menu, .btn:not(.btn-lg):not(.btn-xs), .input-grou
}
.sidebar {
padding: 20px 0;
background: inherit;
}
.sidebar .nav-item {
margin: 5px 10px;
margin: 2px 10px;
}
.sidebar .nav-item .nav-link:hover, .sidebar .nav-item .nav-link:focus {
@ -255,9 +257,13 @@ body, .form-control, .dropdown-menu, .btn:not(.btn-lg):not(.btn-xs), .input-grou
color: #FF6C60;
}
.sidebar .nav-sidebar {
margin: 10px 0;
}
.sidebar .nav-link {
color: #aeb2b7;
padding: 15px 10px;
padding: 10px 10px;
transition: background .3s linear, color .3s linear;
display: flex;
align-items: center;
@ -315,14 +321,14 @@ body, .form-control, .dropdown-menu, .btn:not(.btn-lg):not(.btn-xs), .input-grou
}
aside {
transition: transform .4s ease-in-out;
transition: transform .3s ease-in-out;
transform: translate(-100%);
position: absolute;
top: 96px;
bottom: 0;
left: 0;
right: 0;
z-index: 4;
z-index: 5;
background: #2a3542;
}
@ -338,6 +344,10 @@ aside {
padding-right: 6px;
}
.main-header {
display: none;
}
footer {
background: #5b6e84;
color: #fff;
@ -346,7 +356,7 @@ footer {
left: 0;
bottom: 0;
right: 0;
z-index: 1040;
z-index: 4;
display: flex;
}

View File

@ -130,7 +130,7 @@
})(jQuery);
$(function () {
var $sideMenu = $(".sidebar");
var $sideMenu = $(".sidebar ul");
// 临时使用脚本解决多层菜单收缩问题
// Issue https://gitee.com/LongbowEnterprise/dashboard/issues?id=I1067G
@ -139,13 +139,14 @@ $(function () {
var $li = $activeLink.parent('li').addClass('active');
$activeLink = $li.parent().prev().addClass('active');
}
$sideMenu.dcAccordion({
autoExpand: true,
saveState: false
});
// breadcrumb
var $breadNav = $('#breadNav');
var $breadNav = $('#breadNav, .main-header .breadcrumb-item:last');
var arch = $sideMenu.find('a.active').last();
$breadNav.removeClass('d-none').text(arch.text() || $('title').text());
@ -174,23 +175,31 @@ $(function () {
return this;
},
addNiceScroll: function () {
if ($.browser.versions.ios && $(window).width() > 768) {
this.css('overflow', 'auto');
if (!$.browser.versions.ios && $(window).width() > 768) {
this.overlayScrollbars({
className: 'os-theme-light',
scrollbars: {
autoHide: 'leave',
autoHideDelay: 100
},
overflowBehavior: {
x: "hidden",
y: "scroll"
}
else if (!$.browser.versions.ios && $(window).width() > 768) {
this.mCustomScrollbar({ theme: 'minimal', mouseWheel: { scrollAmount: 60 } });
});
}
else {
this.mCustomScrollbar('destroy');
this.css('overflow', 'auto');
}
return this;
}
});
// custom scrollbar
var $sidebar = $('aside').addNiceScroll().autoScrollSidebar({ target: arch.parent(), offsetTop: arch.parent().innerHeight() / 2 });
var $sidebar = $('.sidebar').addNiceScroll().autoScrollSidebar({ target: arch.parent(), offsetTop: arch.parent().innerHeight() / 2 });
$sideMenu.on('click', 'a.dcjq-parent', function () {
return;
var $this = $(this);
if (!$.browser.versions.ios && $(window).width() > 768) {
setTimeout(function () {

View File

@ -16,7 +16,7 @@
$('#main-content').scrollspy({ offset: 150, target: '.fa-nav' });
if (!$.browser.versions.ios) $html.find('.fa-nav .nav').mCustomScrollbar({ theme: 'minimal-dark' });
if (!$.browser.versions.ios) $html.find('.fa-nav .nav').overlayScrollbars({ className: 'os-theme-light', scrollbars: { autoHide: 'leave' } });
}
}
});

View File

@ -17,7 +17,7 @@ $(function () {
return options.pageSize * (options.pageNumber - 1) + index + 1;
}
},
{ title: "登名称", field: "UserName" },
{ title: "登名称", field: "UserName" },
{ title: "登录时间", field: "LoginTime" },
{ title: "主机", field: "Ip" },
{ title: "登录地点", field: "City" },
@ -27,7 +27,7 @@ $(function () {
title: "登录结果", field: "Result", formatter: function (value, row, index) {
var css = value === "登录成功" ? "success" : "danger";
var icon = css === "success" ? "check" : "remove";
return $.format('<span class="badge badge-{0}"><i class="fa fa-{2}"></i>{1}</span>', css, value, icon);
return $.format('<span class="badge badge-md badge-{0}"><i class="fa fa-{2}"></i>{1}</span>', css, value, icon);
}
}
]

View File

@ -277,7 +277,7 @@ $(function () {
$(this).scrollspy({ target: $(this).attr('data-target') });
});
if (!$.browser.versions.ios) $scroll = $html.find('.fa-nav .nav').mCustomScrollbar({ theme: 'minimal-dark' });
if (!$.browser.versions.ios) $scroll = $html.find('.fa-nav .nav').overlayScrollbars({ className: 'os-theme-light', scrollbars: { autoHide: 'leave' } });
}
}
});

View File

@ -7,7 +7,7 @@
showRefresh: false,
showColumns: false,
columns: [
{ title: "登名称", field: "UserName" },
{ title: "登名称", field: "UserName" },
{ title: "显示名称", field: "DisplayName" },
{ title: "说明信息", field: "Description" },
{ title: "注册时间", field: "RegisterTime" },

View File

@ -17,7 +17,7 @@ $(function () {
{
title: "会话Id", field: "ConnectionId"
},
{ title: "登名称", field: "UserName" },
{ title: "登名称", field: "UserName" },
{ title: "显示名称", field: "DisplayName" },
{ title: "登录时间", field: "FirstAccessTime" },
{ title: "访问时间", field: "LastAccessTime" },

View File

@ -1,5 +1,5 @@
$(function () {
var $headerIcon = $('#headerIcon');
var $headerIcon = $('.userinfo img, .nav-header img');
var preIcon = $headerIcon.attr('src');
var $file = $('#fileIcon');
var defFileName = $file.attr('data-file');

View File

@ -90,7 +90,7 @@ $(function () {
sortOrder: "asc",
queryParams: function (params) { return $.extend(params, { name: $("#txt_search_name").val(), displayName: $('#txt_display_name').val() }); }, //传递参数(*
columns: [
{ title: "登名称", field: "UserName", sortable: true },
{ title: "登名称", field: "UserName", sortable: true },
{ title: "显示名称", field: "DisplayName", sortable: true },
{ title: "注册时间", field: "RegisterTime", sortable: true },
{ title: "授权时间", field: "ApprovedTime", sortable: true },

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,221 +0,0 @@
/*!
* jQuery Mousewheel 3.1.13
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* http://jquery.org/license
*/
(function (factory) {
if ( typeof define === 'function' && define.amd ) {
// AMD. Register as an anonymous module.
define(['jquery'], factory);
} else if (typeof exports === 'object') {
// Node/CommonJS style for Browserify
module.exports = factory;
} else {
// Browser globals
factory(jQuery);
}
}(function ($) {
var toFix = ['wheel', 'mousewheel', 'DOMMouseScroll', 'MozMousePixelScroll'],
toBind = ( 'onwheel' in document || document.documentMode >= 9 ) ?
['wheel'] : ['mousewheel', 'DomMouseScroll', 'MozMousePixelScroll'],
slice = Array.prototype.slice,
nullLowestDeltaTimeout, lowestDelta;
if ( $.event.fixHooks ) {
for ( var i = toFix.length; i; ) {
$.event.fixHooks[ toFix[--i] ] = $.event.mouseHooks;
}
}
var special = $.event.special.mousewheel = {
version: '3.1.12',
setup: function() {
if ( this.addEventListener ) {
for ( var i = toBind.length; i; ) {
this.addEventListener( toBind[--i], handler, false );
}
} else {
this.onmousewheel = handler;
}
// Store the line height and page height for this particular element
$.data(this, 'mousewheel-line-height', special.getLineHeight(this));
$.data(this, 'mousewheel-page-height', special.getPageHeight(this));
},
teardown: function() {
if ( this.removeEventListener ) {
for ( var i = toBind.length; i; ) {
this.removeEventListener( toBind[--i], handler, false );
}
} else {
this.onmousewheel = null;
}
// Clean up the data we added to the element
$.removeData(this, 'mousewheel-line-height');
$.removeData(this, 'mousewheel-page-height');
},
getLineHeight: function(elem) {
var $elem = $(elem),
$parent = $elem['offsetParent' in $.fn ? 'offsetParent' : 'parent']();
if (!$parent.length) {
$parent = $('body');
}
return parseInt($parent.css('fontSize'), 10) || parseInt($elem.css('fontSize'), 10) || 16;
},
getPageHeight: function(elem) {
return $(elem).height();
},
settings: {
adjustOldDeltas: true, // see shouldAdjustOldDeltas() below
normalizeOffset: true // calls getBoundingClientRect for each event
}
};
$.fn.extend({
mousewheel: function(fn) {
return fn ? this.bind('mousewheel', fn) : this.trigger('mousewheel');
},
unmousewheel: function(fn) {
return this.unbind('mousewheel', fn);
}
});
function handler(event) {
var orgEvent = event || window.event,
args = slice.call(arguments, 1),
delta = 0,
deltaX = 0,
deltaY = 0,
absDelta = 0,
offsetX = 0,
offsetY = 0;
event = $.event.fix(orgEvent);
event.type = 'mousewheel';
// Old school scrollwheel delta
if ( 'detail' in orgEvent ) { deltaY = orgEvent.detail * -1; }
if ( 'wheelDelta' in orgEvent ) { deltaY = orgEvent.wheelDelta; }
if ( 'wheelDeltaY' in orgEvent ) { deltaY = orgEvent.wheelDeltaY; }
if ( 'wheelDeltaX' in orgEvent ) { deltaX = orgEvent.wheelDeltaX * -1; }
// Firefox < 17 horizontal scrolling related to DOMMouseScroll event
if ( 'axis' in orgEvent && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
deltaX = deltaY * -1;
deltaY = 0;
}
// Set delta to be deltaY or deltaX if deltaY is 0 for backwards compatabilitiy
delta = deltaY === 0 ? deltaX : deltaY;
// New school wheel delta (wheel event)
if ( 'deltaY' in orgEvent ) {
deltaY = orgEvent.deltaY * -1;
delta = deltaY;
}
if ( 'deltaX' in orgEvent ) {
deltaX = orgEvent.deltaX;
if ( deltaY === 0 ) { delta = deltaX * -1; }
}
// No change actually happened, no reason to go any further
if ( deltaY === 0 && deltaX === 0 ) { return; }
// Need to convert lines and pages to pixels if we aren't already in pixels
// There are three delta modes:
// * deltaMode 0 is by pixels, nothing to do
// * deltaMode 1 is by lines
// * deltaMode 2 is by pages
if ( orgEvent.deltaMode === 1 ) {
var lineHeight = $.data(this, 'mousewheel-line-height');
delta *= lineHeight;
deltaY *= lineHeight;
deltaX *= lineHeight;
} else if ( orgEvent.deltaMode === 2 ) {
var pageHeight = $.data(this, 'mousewheel-page-height');
delta *= pageHeight;
deltaY *= pageHeight;
deltaX *= pageHeight;
}
// Store lowest absolute delta to normalize the delta values
absDelta = Math.max( Math.abs(deltaY), Math.abs(deltaX) );
if ( !lowestDelta || absDelta < lowestDelta ) {
lowestDelta = absDelta;
// Adjust older deltas if necessary
if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
lowestDelta /= 40;
}
}
// Adjust older deltas if necessary
if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
// Divide all the things by 40!
delta /= 40;
deltaX /= 40;
deltaY /= 40;
}
// Get a whole, normalized value for the deltas
delta = Math[ delta >= 1 ? 'floor' : 'ceil' ](delta / lowestDelta);
deltaX = Math[ deltaX >= 1 ? 'floor' : 'ceil' ](deltaX / lowestDelta);
deltaY = Math[ deltaY >= 1 ? 'floor' : 'ceil' ](deltaY / lowestDelta);
// Normalise offsetX and offsetY properties
if ( special.settings.normalizeOffset && this.getBoundingClientRect ) {
var boundingRect = this.getBoundingClientRect();
offsetX = event.clientX - boundingRect.left;
offsetY = event.clientY - boundingRect.top;
}
// Add information to the event object
event.deltaX = deltaX;
event.deltaY = deltaY;
event.deltaFactor = lowestDelta;
event.offsetX = offsetX;
event.offsetY = offsetY;
// Go ahead and set deltaMode to 0 since we converted to pixels
// Although this is a little odd since we overwrite the deltaX/Y
// properties with normalized deltas.
event.deltaMode = 0;
// Add event and delta to the front of the arguments
args.unshift(event, delta, deltaX, deltaY);
// Clearout lowestDelta after sometime to better
// handle multiple device types that give different
// a different lowestDelta
// Ex: trackpad = 3 and mouse wheel = 120
if (nullLowestDeltaTimeout) { clearTimeout(nullLowestDeltaTimeout); }
nullLowestDeltaTimeout = setTimeout(nullLowestDelta, 200);
return ($.event.dispatch || $.event.handle).apply(this, args);
}
function nullLowestDelta() {
lowestDelta = null;
}
function shouldAdjustOldDeltas(orgEvent, absDelta) {
// If this is an older event and the delta is divisable by 120,
// then we are assuming that the browser is treating this as an
// older mouse wheel event and that we should divide the deltas
// by 40 to try and get a more usable deltaFactor.
// Side note, this actually impacts the reported scroll distance
// in older browsers and can cause scrolling to be slower than native.
// Turn this off by setting $.event.special.mousewheel.settings.adjustOldDeltas to false.
return special.settings.adjustOldDeltas && orgEvent.type === 'mousewheel' && absDelta % 120 === 0;
}
}));

View File

@ -1,8 +0,0 @@
/*!
* jQuery Mousewheel 3.1.13
*
* Copyright 2015 jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*/
!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?module.exports=a:a(jQuery)}(function(a){function b(b){var g=b||window.event,h=i.call(arguments,1),j=0,l=0,m=0,n=0,o=0,p=0;if(b=a.event.fix(g),b.type="mousewheel","detail"in g&&(m=-1*g.detail),"wheelDelta"in g&&(m=g.wheelDelta),"wheelDeltaY"in g&&(m=g.wheelDeltaY),"wheelDeltaX"in g&&(l=-1*g.wheelDeltaX),"axis"in g&&g.axis===g.HORIZONTAL_AXIS&&(l=-1*m,m=0),j=0===m?l:m,"deltaY"in g&&(m=-1*g.deltaY,j=m),"deltaX"in g&&(l=g.deltaX,0===m&&(j=-1*l)),0!==m||0!==l){if(1===g.deltaMode){var q=a.data(this,"mousewheel-line-height");j*=q,m*=q,l*=q}else if(2===g.deltaMode){var r=a.data(this,"mousewheel-page-height");j*=r,m*=r,l*=r}if(n=Math.max(Math.abs(m),Math.abs(l)),(!f||f>n)&&(f=n,d(g,n)&&(f/=40)),d(g,n)&&(j/=40,l/=40,m/=40),j=Math[j>=1?"floor":"ceil"](j/f),l=Math[l>=1?"floor":"ceil"](l/f),m=Math[m>=1?"floor":"ceil"](m/f),k.settings.normalizeOffset&&this.getBoundingClientRect){var s=this.getBoundingClientRect();o=b.clientX-s.left,p=b.clientY-s.top}return b.deltaX=l,b.deltaY=m,b.deltaFactor=f,b.offsetX=o,b.offsetY=p,b.deltaMode=0,h.unshift(b,j,l,m),e&&clearTimeout(e),e=setTimeout(c,200),(a.event.dispatch||a.event.handle).apply(this,h)}}function c(){f=null}function d(a,b){return k.settings.adjustOldDeltas&&"mousewheel"===a.type&&b%120===0}var e,f,g=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],h="onwheel"in document||document.documentMode>=9?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],i=Array.prototype.slice;if(a.event.fixHooks)for(var j=g.length;j;)a.event.fixHooks[g[--j]]=a.event.mouseHooks;var k=a.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var c=h.length;c;)this.addEventListener(h[--c],b,!1);else this.onmousewheel=b;a.data(this,"mousewheel-line-height",k.getLineHeight(this)),a.data(this,"mousewheel-page-height",k.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var c=h.length;c;)this.removeEventListener(h[--c],b,!1);else this.onmousewheel=null;a.removeData(this,"mousewheel-line-height"),a.removeData(this,"mousewheel-page-height")},getLineHeight:function(b){var c=a(b),d=c["offsetParent"in a.fn?"offsetParent":"parent"]();return d.length||(d=a("body")),parseInt(d.css("fontSize"),10)||parseInt(c.css("fontSize"),10)||16},getPageHeight:function(b){return a(b).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};a.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})});

Binary file not shown.

Before

Width:  |  Height:  |  Size: 906 B

View File

@ -12,7 +12,12 @@
<p>这是开源后台管理框架前台系统首页,欢迎使用</p>
<p>点击右上角登录信息下拉菜单中的设置按钮进入 <b>后台管理</b> 或者 <b><a href="@Model.SettingsUrl">直接进入</a></b></p>
<p class="text-danger"><b>由于本系统为演示系统,内部对一些敏感操作进行了限制操作,如一些特殊用户不能删除。</b></p>
<p style="color: #212529;">AdminLTE 样式的后台管理框架 [<a href="http://ba.sdgxgz.com/BA/Admin/Index">传送门</a>]</p>
<p class="text-dark">更新列表</p>
<p>
<ol class="text-dark">
<li>系统新增 AdminLTE 主题</li>
</ol>
</p>
<p>
<button id="btnCaptcha" class="btn btn-success ml-2 ml-md-0"><i class="fa fa-send-o"></i><span>点击我出现行为验证码</span></button>
<div class="card d-none ml-2 ml-md-0" style="padding: 10px; height: 222px;">

View File

@ -94,7 +94,6 @@
}
aside {
transition: none;
transform: translate(0);
width: 210px;
overflow: hidden;

View File

@ -322,7 +322,7 @@ aside {
bottom: 0;
left: 0;
right: 0;
z-index: 4;
z-index: 1080;
background: #2a3542;
}
@ -496,6 +496,10 @@ input.pending {
overflow-y: auto;
}
.nobar .fixed-table-toolbar {
display: none;
}
.card {
margin-bottom: 15px;
box-shadow: 0 0 8px 0 rgba(0,0,0,.075), 0 2px 4px 0 rgba(255,255,255,0);
@ -613,10 +617,6 @@ input.pending {
margin-left: 5px;
}
.bootstrap-table .badge {
padding: 4px 6px;
}
.bootstrap-table .badge .fa {
margin-right: 4px;
}
@ -709,11 +709,19 @@ input.pending {
min-width: unset;
}
.bs-popover-bottom .popover-header::before, .bs-popover-auto[x-placement^="bottom"] .popover-header::before {
border-bottom: 0;
}
.popover {
max-width: 320px;
padding: 0;
}
.popover-body .bootstrap-table {
margin: 0.25rem 0;
}
.popover-content {
max-height: 240px;
overflow-y: auto;
@ -847,3 +855,8 @@ label[for] {
.form-inline .form-group .toggle {
display: block;
}
.badge-md {
font-size: 0.75rem;
padding: 4px 6px;
}

View File

@ -105,10 +105,6 @@
color: #28a745;
}
input.form-control[data-toggle='lgbSelect'] {
width: 210px;
}
.form-select-append {
position: absolute;
height: 100%;

View File

@ -100,7 +100,7 @@ namespace Bootstrap.DataAccess
/// <summary>
/// 通过当前用户名获得后台菜单,层次化后集合
/// </summary>
/// <param name="userName">当前登的用户名</param>
/// <param name="userName">当前登的用户名</param>
/// <param name="activeUrl">当前访问菜单</param>
/// <returns></returns>
public static IEnumerable<BootstrapMenu> RetrieveSystemMenus(string userName, string activeUrl = null)

View File

@ -94,7 +94,7 @@ namespace Bootstrap.DataAccess
/// <summary>
/// 通过当前用户名获得所有菜单
/// </summary>
/// <param name="userName">当前登的用户名</param>
/// <param name="userName">当前登的用户名</param>
/// <returns></returns>
public virtual IEnumerable<BootstrapMenu> RetrieveAllMenus(string userName) => DbHelper.RetrieveAllMenus(userName);
}

View File

@ -80,7 +80,7 @@ namespace Bootstrap.DataAccess
public int IsReset { get; set; }
/// <summary>
/// 验证用户登账号与密码正确
/// 验证用户登账号与密码正确
/// </summary>
/// <param name="userName"></param>
/// <param name="password"></param>

View File

@ -179,6 +179,12 @@
"Code": "blue.css",
"Define": NumberInt(0)
},
{
"Category": "网站样式",
"Name": "AdminLTE",
"Code": "lte.css",
"Define": NumberInt(0)
},
{
"Category": "设备天线",
"Name": "天线1",

View File

@ -25,6 +25,7 @@ INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('头像地址', '头像
INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('头像地址', '头像文件', 'default.jpg', 0);
INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('网站样式', '蓝色样式', 'blue.css', 0);
INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('网站样式', '黑色样式', 'black.css', 0);
INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('网站样式', 'AdminLTE', 'lte.css', 0);
INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('当前样式', '使用样式', 'blue.css', 0);
INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('网站设置', '前台首页', '~/Home/Index', 0);

View File

@ -25,6 +25,7 @@ INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('头像地址', '头像
INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('头像地址', '头像文件', 'default.jpg', 0);
INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('网站样式', '蓝色样式', 'blue.css', 0);
INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('网站样式', '黑色样式', 'black.css', 0);
INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('网站样式', 'AdminLTE', 'lte.css', 0);
INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('当前样式', '使用样式', 'blue.css', 0);
INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('网站设置', '前台首页', '~/Home/Index', 0);

View File

@ -25,6 +25,7 @@ INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('头像地址
INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('头像地址', '头像文件', 'default.jpg', 0);
INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('网站样式', '蓝色样式', 'blue.css', 0);
INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('网站样式', '黑色样式', 'black.css', 0);
INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('网站样式', 'AdminLTE', 'lte.css', 0);
INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('当前样式', '使用样式', 'blue.css', 0);
INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('网站设置', '前台首页', '~/Home/Index', 0);

View File

@ -28,6 +28,7 @@ INSERT [dbo].[Dicts] ([Category], [Name], [Code], [Define]) VALUES (N'头像地
INSERT [dbo].[Dicts] ([Category], [Name], [Code], [Define]) VALUES (N'头像地址', N'头像文件', N'default.jpg', 0)
INSERT [dbo].[Dicts] ([Category], [Name], [Code], [Define]) VALUES (N'网站样式', N'蓝色样式', N'blue.css', 0)
INSERT [dbo].[Dicts] ([Category], [Name], [Code], [Define]) VALUES (N'网站样式', N'黑色样式', N'black.css', 0)
INSERT [dbo].[Dicts] ([Category], [Name], [Code], [Define]) VALUES (N'网站样式', N'AdminLTE', N'lte.css', 0)
INSERT [dbo].[Dicts] ([Category], [Name], [Code], [Define]) VALUES (N'当前样式', N'使用样式', N'blue.css', 0)
INSERT [dbo].[Dicts] ([Category], [Name], [Code], [Define]) VALUES (N'网站设置', N'前台首页', N'~/Home/Index', 0)