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

修改BUG：更改Query区域排版

This commit is contained in:
Argo-MacBookPro 2018-08-03 14:18:05 +08:00
parent e8356b587e
commit 25dab45e45
9 changed files with 42 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,7 @@
</div>
<div class="modal-body">
<form class="form-horizontal">
<input type="text" class="form-control hidden" id="dictID" data-default-val="0" />
<input type="text" class="form-control d-none" id="dictID" data-default-val="0" />
<div class="form-group">
<label class="control-label col-sm-2" for="dictCate">字典标签</label>
<div class="col-sm-10">

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

@ -9,15 +9,15 @@
@section query {
<form class="form-inline">
<div class="form-row">
<div class="form-group col-md-5">
<div class="form-group col-sm-6 col-md-5">
<label class="control-label" for="txt_search_name">部门名称</label>
<input type="text" class="form-control" id="txt_search_name" />
</div>
<div class="form-group col-md-5">
<div class="form-group col-sm-6 col-md-5">
<label class="control-label" for="txt_group_desc">部门描述</label>
<input type="text" class="form-control" id="txt_group_desc" />
</div>
<div class="form-group col-md-2">
<div class="form-group col-sm-12 col-md-2">
<button type="button" id="btn_query" class="btn btn-primary form-control"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
</div>
</div>
@ -52,7 +52,7 @@
<input type="text" class="form-control" id="groupName" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
</div>
<div class="form-group col-sm-6">
<input type="text" class="form-control hidden" id="groupID" data-default-val="0" />
<input type="text" class="form-control d-none" id="groupID" data-default-val="0" />
<label class="control-label" for="groupDesc">部门描述</label>
<input type="text" class="form-control" id="groupDesc" placeholder="描述信息(可为空)，50字以内" maxlength="50" />
</div>

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

@ -22,13 +22,12 @@
<label class="control-label" for="txt_parent_menus_name">父级菜单</label>
<input type="text" class="form-control" id="txt_parent_menus_name" />
</div>
<div class="form-group col-sm-6 col-md-6 col-lg-5">
<div class="form-group col-6 col-lg-5">
<label class="control-label" for="sel_menus_category">菜单类别</label>
<div class="dropdown lgbDropdown">
<a id="sel_menus_category" class="btn btn-success" data-toggle="dropdown">
<span>全部</span>
<span class="caret"></span>
</a>
<div class="lgbDropdown">
<button id="sel_menus_category" class="btn btn-success dropdown-toggle" data-toggle="dropdown">
全部
</button>
<ul class="dropdown-menu" role="menu">
<li><a href="#" data-val="">全部</a></li>
<li class="divider"></li>
@ -37,13 +36,12 @@
</ul>
</div>
</div>
<div class="form-group col-sm-6 col-md-6 col-lg-5">
<div class="form-group col-6 col-lg-5">
<label class="control-label" for="sel_menus_category">菜单类型</label>
<div class="dropdown lgbDropdown">
<a id="sel_menus_res" class="btn btn-success" data-toggle="dropdown">
<span>全部</span>
<span class="caret"></span>
</a>
<div class="lgbDropdown">
<button id="sel_menus_res" class="btn btn-success dropdown-toggle" data-toggle="dropdown">
全部
</button>
<ul class="dropdown-menu" role="menu">
<li><a href="#" data-val="">全部</a></li>
<li class="divider"></li>
@ -81,7 +79,7 @@
<form class="form-inline" id="dataForm">
<div class="form-row">
<div class="form-group col-sm-6">
<input type="text" class="form-control hidden" id="menuID" name="menuID" data-default-val="0" />
<input type="text" class="form-control d-none" id="menuID" name="menuID" data-default-val="0" />
<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" />
@ -92,7 +90,7 @@
</div>
</div>
<div class="form-group col-sm-6">
<input type="text" class="form-control hidden" id="parentId" data-default-val="0" />
<input type="text" class="form-control d-none" id="parentId" data-default-val="0" />
<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" />
@ -122,16 +120,15 @@
</span>
</div>
</div>
<div class="form-group col-xs-12">
<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">
<label class="control-label" for="category">菜单类别</label>
<div class="dropdown lgbDropdown dropup">
<div class="dropdown lgbDropdown dropdown-toggle">
<a id="category" class="btn btn-success" data-toggle="dropdown" data-default-val="1">
<span>外部菜单</span>
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li><a href="#" data-val="0">系统菜单</a></li>

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

@ -15,15 +15,15 @@
@section query {
<form class="form-inline">
<div class="form-row">
<div class="form-group col-md-5">
<div class="form-group col-sm-6 col-md-5">
<label class="control-label" for="txt_search_name">角色名称</label>
<input type="text" class="form-control" id="txt_search_name" />
</div>
<div class="form-group col-md-5">
<div class="form-group col-sm-6 col-md-5">
<label class="control-label" for="txt_role_desc">角色描述</label>
<input type="text" class="form-control" id="txt_role_desc" />
</div>
<div class="form-group col-md-2">
<div class="form-group col-sm-12 col-md-2">
<button type="button" id="btn_query" class="btn btn-primary form-control"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
</div>
</div>
@ -62,7 +62,7 @@
<input type="text" class="form-control" id="roleName" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
</div>
<div class="form-group col-sm-6">
<input type="text" class="form-control hidden" id="roleID" data-default-val="0" />
<input type="text" class="form-control d-none" id="roleID" data-default-val="0" />
<label class="control-label" for="roleDesc">角色描述</label>
<input type="text" class="form-control" id="roleDesc" placeholder="描述信息(可为空)，50字以内" maxlength="50" />
</div>

5
Bootstrap.Admin/Views/Admin/Settings.cshtml
View File

@ -50,10 +50,9 @@
<div class="card-body">
<form id="CssDataForm" class="form-inline">
<div class="form-group">
<div class="dropdown lgbDropdown">
<div class="lgbDropdown">
<button id="dictCssDefine" class="btn btn-success dropdown-toggle" data-toggle="dropdown" data-default-val="">
<span>默认样式</span>
<span class="caret"></span>
默认样式
</button>
<ul class="dropdown-menu" role="menu" id="cssContainer">
<li><a href="#" data-val="">默认样式</a></li>

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

@ -9,22 +9,16 @@
@section query {
<form class="form-inline">
<div class="form-row">
<div class="col-sm-auto">
<div class="form-group">
<label class="control-label" for="txt_search_name">登陆名称</label>
<input type="text" class="form-control" id="txt_search_name" />
</div>
<div class="form-group col-sm-6 col-md-5">
<label class="control-label" for="txt_search_name">登陆名称</label>
<input type="text" class="form-control" id="txt_search_name" />
</div>
<div class="col-sm-auto">
<div class="form-group">
<label class="control-label" for="txt_display_name">显示名称</label>
<input type="text" class="form-control" id="txt_display_name" />
</div>
<div class="form-group col-sm-6 col-md-5">
<label class="control-label" for="txt_display_name">显示名称</label>
<input type="text" class="form-control" id="txt_display_name" />
</div>
<div class="col-sm-auto">
<div class="form-group">
<button type="button" id="btn_query" class="btn btn-primary"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
</div>
<div class="form-group col-sm-12 col-md-2">
<button type="button" id="btn_query" class="btn btn-primary form-control"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
</div>
</div>
</form>

10
Bootstrap.Admin/wwwroot/css/admin.css
View File

@ -1,12 +1,8 @@
.lgbDropdown {
display: inline-block;
.lgbDropdown .dropdown-menu > li > a:hover {
background: #007AC0;
color: #fff;
}
.lgbDropdown .dropdown-menu > li > a:hover {
background: #007AC0;
color: #fff;
}
.logTs, .logSql, .logDbExcep {
color: red;
font-weight: 600;

4
Bootstrap.Admin/wwwroot/css/site.css
View File

@ -498,3 +498,7 @@ label.dropdown-item:first-child {
.fixed-table-toolbar .bs-bars, .fixed-table-toolbar .search, .fixed-table-toolbar .columns {
line-height: normal;
}
.form-inline .form-row, .form-inline .row {
width: 100%;
}

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

@ -410,7 +410,7 @@
}, options);
settings.url = $.formatUrl(settings.url);
this.bootstrapTable(settings);
$(settings.toolbar).removeClass('hidden').find('.toolbar').on('click', 'a', function (e) {
$(settings.toolbar).removeClass('d-none').find('.toolbar').on('click', 'a', function (e) {
e.preventDefault();
$('#' + $(this).attr('id').replace('tb_', 'btn_')).trigger("click");
}).insertBefore(this.parents('.bootstrap-table').find('.fixed-table-toolbar > .bs-bars'));
@ -431,7 +431,7 @@
$(this).on('click', '.dropdown-menu a', { $parent: $(this) }, function (event) {
event.preventDefault();
var $op = $(this);
event.data.$parent.children('button').attr('data-val', $op.attr('data-val')).children(':first').text($op.text());
event.data.$parent.children('button').attr('data-val', $op.attr('data-val')).text($op.text());
});
});
}