orga0063
/
BootstrapAdmin11
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改BUG：修复modal Title

This commit is contained in:
Argo-MacBookPro 2018-08-03 17:17:16 +08:00
parent 25dab45e45
commit 1092654414
13 changed files with 59 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bootstrap.Admin/Views/Admin/Dicts.cshtml
View File

@ -49,8 +49,8 @@
}
@section modal {
<div class="modal-header">
<h5 class="modal-title" id="myModalLabel">字典编辑窗口</h5>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="myModalLabel">字典编辑窗口</h4>
</div>
<div class="modal-body">
<form class="form-horizontal">

4
Bootstrap.Admin/Views/Admin/Exceptions.cshtml
View File

@ -69,8 +69,8 @@
<div id="errorList" class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="myModalLabel">程序异常日志窗口</h5>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="myModalLabel">程序异常日志窗口</h4>
</div>
<div class="modal-body">
<form class="form-inline" id="dataForm" name="dataForm"><div class="form-row"></div></form>
@ -85,8 +85,8 @@
</div>
<div id="errorDetail" class="modal-content icon-content">
<div class="modal-header">
<h5 class="modal-title" id="myDetailModalLabel">程序异常日志窗口</h5>
<button type="button" class="close" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="myDetailModalLabel">程序异常日志窗口</h4>
</div>
<div class="modal-body">
<i id="fa-top" class="fa-target"></i>

4
Bootstrap.Admin/Views/Admin/Groups.cshtml
View File

@ -30,7 +30,7 @@
<button id="btn_assignUser" type="button" class="btn btn-info">
<span class="fa fa-user" aria-hidden="true"></span><span class="hidden-tb">指派用户</span>
</button>
<div class="toolbar btn-group dropdown">
<div class="toolbar btn-group">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><i class="fa fa-gear"></i></button>
<div class="dropdown-menu">
@await Html.PartialAsync("_ButtonBarGroup")
@ -41,8 +41,8 @@
}
@section modal {
<div class="modal-header">
<h5 class="modal-title" id="myModalLabel">部门编辑窗口</h5>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="myModalLabel">部门编辑窗口</h4>
</div>
<div class="modal-body">
<form class="form-inline">

82
Bootstrap.Admin/Views/Admin/Menus.cshtml
View File

@ -28,7 +28,7 @@
<button id="sel_menus_category" class="btn btn-success dropdown-toggle" data-toggle="dropdown">
全部
</button>
<ul class="dropdown-menu" role="menu">
<ul class="dropdown-menu">
<li><a href="#" data-val="">全部</a></li>
<li class="divider"></li>
<li><a href="#" data-val="0">系统菜单</a></li>
@ -42,7 +42,7 @@
<button id="sel_menus_res" class="btn btn-success dropdown-toggle" data-toggle="dropdown">
全部
</button>
<ul class="dropdown-menu" role="menu">
<ul class="dropdown-menu">
<li><a href="#" data-val="">全部</a></li>
<li class="divider"></li>
<li><a href="#" data-val="0">菜单</a></li>
@ -60,7 +60,7 @@
<button id="btn_assignRole" type="button" class="btn btn-info">
<span class="fa fa-sitemap" aria-hidden="true"></span><span class="hidden-tb">指派角色</span>
</button>
<div class="toolbar btn-group dropdown">
<div class="toolbar btn-group">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><i class="fa fa-gear"></i></button>
<div class="dropdown-menu">
@await Html.PartialAsync("_ButtonBarGroup")
@ -83,10 +83,10 @@
<label class="control-label" for="name">菜单名称</label>
<div class="input-group">
<input type="text" class="form-control" id="name" name="name" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
<span class="input-group-btn">
<button data-method="clear" class="btn btn-secondary" type="button"><i class="fa fa-remove"></i></button>
<button data-method="sel" class="btn btn-secondary" type="button"><i class="fa fa-edit"></i>全选</button>
</span>
<div class="input-group-append">
<button data-method="clear" class="btn btn-default" type="button"><i class="fa fa-remove"></i></button>
<button data-method="sel" class="btn btn-default" type="button"><i class="fa fa-edit"></i>全选</button>
</div>
</div>
</div>
<div class="form-group col-sm-6">
@ -94,56 +94,56 @@
<label class="control-label" for="parentName">父级菜单</label>
<div class="input-group">
<input type="text" class="form-control" readonly id="parentName" name="parentName" placeholder="请选择...(可为空)，50字以内" maxlength="50" />
<span class="input-group-btn">
<button data-method="clear" class="btn btn-secondary" type="button"><i class="fa fa-remove"></i></button>
<button id="btnMenuParent" class="btn btn-secondary" type="button"><i class="fa fa-hand-o-up"></i>选择</button>
</span>
<div class="input-group-append">
<button data-method="clear" class="btn btn-default" type="button"><i class="fa fa-remove"></i></button>
<button id="btnMenuParent" class="btn btn-default" type="button"><i class="fa fa-hand-o-up"></i>选择</button>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label" for="order">菜单序号</label>
<div class="input-group">
<input type="text" class="form-control digits" id="order" name="order" data-default-val="10" placeholder="默认为10" maxlength="8" data-valid="true" />
<span class="input-group-btn">
<button data-method="clear" class="btn btn-secondary" type="button"><i class="fa fa-remove"></i></button>
<button id="btnMenuOrder" class="btn btn-secondary" type="button"><i class="fa fa-list-ol"></i>调整</button>
</span>
<div class="input-group-append">
<button data-method="clear" class="btn btn-default" type="button"><i class="fa fa-remove"></i></button>
<button id="btnMenuOrder" class="btn btn-default" type="button"><i class="fa fa-list-ol"></i>调整</button>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label" for="icon">菜单图标</label>
<div class="input-group">
<input type="text" class="form-control" readonly id="icon" data-default-val="fa fa-fa" placeholder="请选择...(可为空)，50字以内" maxlength="50" />
<span class="input-group-btn">
<button data-method="clear" class="btn btn-secondary" type="button"><i class="fa fa-remove"></i></button>
<button id="btnIcon" class="btn btn-secondary" type="button"><i class="fa fa-dashboard"></i>选择</button>
</span>
<div class="input-group-append">
<button data-method="clear" class="btn btn-default" type="button"><i class="fa fa-remove"></i></button>
<button id="btnIcon" class="btn btn-default" type="button"><i class="fa fa-dashboard"></i>选择</button>
</div>
</div>
</div>
<div class="form-group col-12">
<label class="control-label" for="url">路径</label>
<input type="text" class="form-control form-control-url" id="url" placeholder="不可为空，4000字以内" maxlength="4000" data-valid="true" />
</div>
<div class="form-group col-sm-6 col-xs-12">
<div class="form-group col-6">
<label class="control-label" for="category">菜单类别</label>
<div class="dropdown lgbDropdown dropdown-toggle">
<a id="category" class="btn btn-success" data-toggle="dropdown" data-default-val="1">
<div class="lgbDropdown">
<button id="category" class="btn btn-success dropdown-toggle" data-toggle="dropdown" data-default-val="1">
<span>外部菜单</span>
</a>
<ul class="dropdown-menu" role="menu">
</button>
<ul class="dropdown-menu">
<li><a href="#" data-val="0">系统菜单</a></li>
<li><a href="#" data-val="1">外部菜单</a></li>
</ul>
</div>
</div>
<div class="form-group col-sm-6 col-xs-12">
<div class="form-group col-6">
<label class="control-label" for="target">目标</label>
<div class="dropdown lgbDropdown dropup">
<a id="target" class="btn btn-info" data-toggle="dropdown" data-default-val="_self">
<div class="lgbDropdown">
<button id="target" class="btn btn-info dropdown-toggle" data-toggle="dropdown" data-default-val="_self">
<span>本窗口</span>
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
</button>
<ul class="dropdown-menu">
<li><a href="#" data-val="_self">本窗口</a></li>
<li><a href="#" data-val="_blank">新窗口</a></li>
<li><a href="#" data-val="_parent">父级窗口</a></li>
@ -151,27 +151,27 @@
</ul>
</div>
</div>
<div class="form-group col-sm-6 col-xs-12">
<div class="form-group col-6">
<label class="control-label" for="isRes">菜单类型</label>
<div class="dropdown lgbDropdown dropup">
<a id="isRes" class="btn btn-success" data-toggle="dropdown" data-default-val="0">
<div class="lgbDropdown">
<button id="isRes" class="btn btn-success dropdown-toggle" data-toggle="dropdown" data-default-val="0">
<span>菜单</span>
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
</button>
<ul class="dropdown-menu">
<li><a href="#" data-val="0">菜单</a></li>
<li><a href="#" data-val="1">资源</a></li>
</ul>
</div>
</div>
<div class="form-group col-sm-6 col-xs-12">
<div class="form-group col-6">
<label class="control-label" for="app">所属应用</label>
<div class="dropdown lgbDropdown dropup">
<a id="app" class="btn btn-info" data-toggle="dropdown" data-default-val="0">
<div class="lgbDropdown">
<button id="app" class="btn btn-info dropdown-toggle" data-toggle="dropdown" data-default-val="0">
<span>未设置</span>
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
</button>
<ul class="dropdown-menu">
@foreach (var kv in Model.Applications)
{
<li><a href="#" data-val="@kv.Key">@kv.Value</a></li>
@ -187,15 +187,15 @@
@await Html.PartialAsync("RoleConfig")
<div id="dialogIcon" class="modal-content icon-content">
<div class="modal-header">
<h5 class="modal-title" id="myIconModalLabel">请选择图标</h5>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="myIconModalLabel">请选择图标</h4>
</div>
<div class="modal-body" data-spy="scroll" data-target=".fa-nav">
<div class="loadIconView"><i class="fa fa-spinner fa-pulse"></i><span>正在加载图标...请稍等</span></div>
</div>
<div class="modal-footer">
<span>被选择的图标</span><i id="pickIcon"></i>
<button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
<button type="button" class="btn btn-primary" id="btnSubmitIcon">保存</button>
</div>
</div>

4
Bootstrap.Admin/Views/Admin/Roles.cshtml
View File

@ -39,7 +39,7 @@
<button id="btn_assignMenu" type="button" class="btn btn-secondary">
<span class="fa fa-dashboard" aria-hidden="true"></span><span class="hidden-tb">指派菜单</span>
</button>
<div class="toolbar btn-group dropdown">
<div class="toolbar btn-group">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><i class="fa fa-gear"></i></button>
<div class="dropdown-menu">
@await Html.PartialAsync("_ButtonBarGroup")
@ -51,8 +51,8 @@
}
@section modal {
<div class="modal-header">
<h5 class="modal-title" id="myModalLabel">角色编辑窗口</h5>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="myModalLabel">角色编辑窗口</h4>
</div>
<div class="modal-body">
<form class="form-inline">

2
Bootstrap.Admin/Views/Admin/Users.cshtml
View File

@ -30,7 +30,7 @@
<button id="btn_assignGroup" type="button" class="btn btn-info">
<span class="fa fa-bank" aria-hidden="true"></span><span class="hidden-tb">指派部门</span>
</button>
<div class="toolbar btn-group dropdown">
<div class="toolbar btn-group">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><i class="fa fa-gear"></i></button>
<div class="dropdown-menu">
@await Html.PartialAsync("_ButtonBarGroup")

2
Bootstrap.Admin/Views/Shared/GroupConfig.cshtml
View File

@ -2,8 +2,8 @@
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="myGroupModalLabel">部门授权窗口</h5>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="myGroupModalLabel">部门授权窗口</h4>
</div>
<div class="modal-body">
<form id="groupForm" class="form-inline"></form>

4
Bootstrap.Admin/Views/Shared/NavigatorConfig.cshtml
View File

@ -1,9 +1,9 @@
<div class="modal fade" id="dialogMenu" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="myMenuModalLabel" aria-hidden="true">
<div id="dialogSubMenu" class="modal-dialog">
<div id="dialogSubMenu" class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="myMenuModalLabel">请选择菜单</h5>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="myMenuModalLabel">请选择菜单</h4>
</div>
<div class="modal-body">
<div class="dd" id="nestable_menu">

2
Bootstrap.Admin/Views/Shared/RoleConfig.cshtml
View File

@ -2,8 +2,8 @@
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="myRoleModalLabel">角色授权窗口</h5>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="myRoleModalLabel">角色授权窗口</h4>
</div>
<div class="modal-body">
<form id="roleForm" class="form-inline">

2
Bootstrap.Admin/Views/Shared/UserConfig.cshtml
View File

@ -2,8 +2,8 @@
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="myUserModalLabel">用户授权窗口</h5>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="myUserModalLabel">用户授权窗口</h4>
</div>
<div class="modal-body">
<form id="userForm" class="form-inline"></form>

14
Bootstrap.Admin/wwwroot/css/admin-responsive.css
View File

@ -32,7 +32,7 @@
}
.form-group .form-control-url {
width: 442px;
width: calc(100% - 90px);
}
}
@ -59,14 +59,6 @@
}
}
@media (max-width: 939px) {
.modal-dialog {
max-width: calc(90%);
margin-left: auto;
margin-right: auto;
}
}
@media (min-width: 940px) {
.hidden-tb {
display: inline;
@ -76,10 +68,6 @@
width: 900px;
max-width: 900px;
}
.form-group .form-control-url {
width: 742px;
}
}
@media (min-height: 414px) {

5
Bootstrap.Admin/wwwroot/css/fa.css
View File

@ -57,13 +57,13 @@
padding-left: 10px;
}
.form-group .input-group .input-group-btn .btn i {
.form-group .input-group .input-group-append .btn i {
color: #187c9a;
width: 22px;
text-align: left;
}
.form-group .input-group .input-group-btn .btn i.fa-remove {
.form-group .input-group .input-group-append .btn i.fa-remove {
width: auto;
}
@ -75,6 +75,7 @@
right: 15px;
z-index: 1051;
display: none;
width: auto;
}
.icon-content .fa-nav {

16
Bootstrap.Admin/wwwroot/js/Longbow.Common.js
View File

@ -120,7 +120,7 @@
contentType: 'application/json',
dataType: 'json',
method: "post",
htmlTemplate: '<div class="form-group checkbox col-md-3 col-sm-4 col-xs-6"><label role="tooltip" title="{3}"><input type="checkbox" value="{0}" {2}/>{1}</label></div>',
htmlTemplate: '<div class="form-group checkbox col-md-3 col-sm-4 col-6"><label role="tooltip" title="{3}"><input type="checkbox" value="{0}" {2}/>{1}</label></div>',
title: "",
swal: true,
modal: null,
@ -437,20 +437,6 @@
}
}
});
//fix bug
$.fn.modal.Constructor.prototype.adjustDialog = function () {
var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight;
this.$element.css({
paddingLeft: !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '',
paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : ''
});
// added by Argo
var $modal_dialog = $(this.$element[0]).find('.modal-dialog');
$modal_dialog.adjustDialog();
};
})(jQuery);
$(function () {