diff --git a/Bootstrap.Admin/Views/Admin/Dicts.cshtml b/Bootstrap.Admin/Views/Admin/Dicts.cshtml
index 5224ebae..9401a45b 100644
--- a/Bootstrap.Admin/Views/Admin/Dicts.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Dicts.cshtml
@@ -9,16 +9,16 @@
 }
 @section query {
     <form class="form-inline">
-        <div class="form-row">
-            <div class="form-group col-sm-6 col-md-5">
+        <div class="row">
+            <div class="form-group col-sm-5 col-md-auto">
                 <label class="control-label" for="txt_dict_cate">字典标签</label>
                 <input type="text" class="form-control" id="txt_dict_cate" data-provide="typeahead" />
             </div>
-            <div class="form-group col-sm-6 col-md-5">
+            <div class="form-group col-sm-5 col-md-auto">
                 <label class="control-label" for="txt_dict_name">字典名称</label>
                 <input type="text" class="form-control" id="txt_dict_name" />
             </div>
-            <div class="form-group col-sm-6 col-md-5">
+            <div class="form-group col-sm-5 col-md-auto">
                 <label class="control-label" for="txt_dict_define">字典类别</label>
                 <div class="dropdown">
                     <button id="txt_dict_define" class="btn btn-success dropdown-select dropdown-toggle" data-toggle="dropdown">全部</button>
@@ -30,7 +30,7 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group col-sm-6 col-md-5">
+            <div class="form-group col-sm-2 col-md-auto flex-md-fill justify-content-md-end">
                 <button type="button" id="btn_query" class="btn btn-primary btn-fill"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
             </div>
         </div>
@@ -51,7 +51,7 @@
     </div>
     <div class="modal-body">
         <form class="form-inline">
-            <div class="form-row">
+            <div class="row">
                 <input type="hidden" id="dictID" data-default-val="0" />
                 <div class="form-group col-12">
                     <label class="control-label" for="dictCate">字典标签</label>
diff --git a/Bootstrap.Admin/Views/Admin/Exceptions.cshtml b/Bootstrap.Admin/Views/Admin/Exceptions.cshtml
index 15a99886..e40634a2 100644
--- a/Bootstrap.Admin/Views/Admin/Exceptions.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Exceptions.cshtml
@@ -18,8 +18,8 @@
     <div class="card-header">查询条件</div>
     <div class="card-body">
         <form class="form-inline">
-            <div class="form-row">
-                <div class="form-group col-sm-6 col-lg-5">
+            <div class="row">
+                <div class="form-group col-sm-auto">
                     <label class="control-label" for="txt_operate_start">起始时间</label>
                     <div class="input-group date form_date">
                         <input id="txt_operate_start" class="form-control" size="16" type="text" value="" readonly>
@@ -31,7 +31,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="form-group col-sm-6 col-lg-5">
+                <div class="form-group col-sm-auto">
                     <label class="control-label" for="txt_operate_end">终止时间</label>
                     <div class="input-group date form_date">
                         <input id="txt_operate_end" class="form-control" size="16" type="text" value="" readonly>
@@ -43,7 +43,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="form-group col-lg-2">
+                <div class="form-group col-sm-auto flex-sm-fill justify-content-sm-end">
                     <label class="sr-only"></label>
                     <button type="button" id="btn_query" class="btn btn-primary btn-fill"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
                 </div>
diff --git a/Bootstrap.Admin/Views/Admin/Groups.cshtml b/Bootstrap.Admin/Views/Admin/Groups.cshtml
index dc5e4024..18d36adb 100644
--- a/Bootstrap.Admin/Views/Admin/Groups.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Groups.cshtml
@@ -8,16 +8,16 @@
 }
 @section query {
     <form class="form-inline">
-        <div class="form-row">
-            <div class="form-group col-sm-6 col-md-5">
+        <div class="row">
+            <div class="form-group col-sm-5 col-md-auto">
                 <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">
+            <div class="form-group col-sm-5 col-md-auto">
                 <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-sm-12 col-md-2">
+            <div class="form-group col-sm-2 col-md-auto flex-md-fill justify-content-md-end">
                 <button type="button" id="btn_query" class="btn btn-primary btn-fill"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
             </div>
         </div>
@@ -46,7 +46,7 @@
     </div>
     <div class="modal-body">
         <form class="form-inline">
-            <div class="form-row">
+            <div class="row">
                 <div class="form-group col-sm-6">
                     <label class="control-label" for="groupName">部门名称</label>
                     <input type="text" class="form-control" id="groupName" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
diff --git a/Bootstrap.Admin/Views/Admin/Logs.cshtml b/Bootstrap.Admin/Views/Admin/Logs.cshtml
index a8064eff..ed298131 100644
--- a/Bootstrap.Admin/Views/Admin/Logs.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Logs.cshtml
@@ -30,12 +30,8 @@
     <div class="card-header">查询条件</div>
     <div class="card-body">
         <form class="form-inline">
-            <div class="form-row">
-                <div class="form-group col-12">
-                    <label class="control-label" for="txt_operate_type">操作类型</label>
-                    <input type="text" class="form-control" id="txt_operate_type" />
-                </div>
-                <div class="form-group col-sm-6 col-lg-5">
+            <div class="row">
+                <div class="form-group col-sm-auto">
                     <label class="control-label" for="txt_operate_start">起始时间</label>
                     <div class="input-group date form_date">
                         <input id="txt_operate_start" class="form-control" size="16" type="text" value="" readonly>
@@ -47,7 +43,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="form-group col-sm-6 col-lg-5">
+                <div class="form-group col-sm-auto">
                     <label class="control-label" for="txt_operate_end">终止时间</label>
                     <div class="input-group date form_date">
                         <input id="txt_operate_end" class="form-control" size="16" type="text" value="" readonly>
@@ -59,7 +55,11 @@
                         </div>
                     </div>
                 </div>
-                <div class="form-group col-lg-2">
+                <div class="form-group col-sm-auto">
+                    <label class="control-label" for="txt_operate_type">操作类型</label>
+                    <input type="text" class="form-control" id="txt_operate_type" />
+                </div>
+                <div class="form-group col-sm-auto flex-sm-fill justify-content-sm-end">
                     <button type="button" id="btn_query" class="btn btn-primary btn-fill"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
                 </div>
             </div>
diff --git a/Bootstrap.Admin/Views/Admin/Menus.cshtml b/Bootstrap.Admin/Views/Admin/Menus.cshtml
index efe557f9..6adf9cee 100644
--- a/Bootstrap.Admin/Views/Admin/Menus.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Menus.cshtml
@@ -13,16 +13,16 @@
 }
 @section query {
     <form class="form-inline">
-        <div class="form-row">
-            <div class="form-group col-sm-12 col-md-5">
+        <div class="row">
+            <div class="form-group col-6 col-md-5 col-xl-auto">
                 <label class="control-label" for="txt_menus_name">菜单名称</label>
                 <input type="text" class="form-control" id="txt_menus_name" />
             </div>
-            <div class="form-group col-sm-12 col-md-5">
+            <div class="form-group col-6 col-md-5 col-xl-auto">
                 <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-6 col-md-5">
+            <div class="form-group col-6 col-md-5 col-xl-auto">
                 <label class="control-label" for="sel_menus_category">菜单类别</label>
                 <div class="dropdown">
                     <button id="sel_menus_category" class="btn btn-success dropdown-select dropdown-toggle" data-toggle="dropdown">全部</button>
@@ -34,7 +34,7 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group col-6 col-md-5">
+            <div class="form-group col-6 col-md-5 col-xl-auto">
                 <label class="control-label" for="sel_menus_category">菜单类型</label>
                 <div class="dropdown">
                     <button id="sel_menus_res" class="btn btn-success dropdown-select dropdown-toggle" data-toggle="dropdown">全部</button>
@@ -46,7 +46,7 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group col-md-2">
+            <div class="form-group col-md-2 col-xl-auto flex-xl-fill justify-content-xl-end">
                 <button type="button" id="btn_query" class="btn btn-primary btn-fill"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
             </div>
         </div>
@@ -73,7 +73,7 @@
     </div>
     <div class="modal-body">
         <form class="form-inline" id="dataForm">
-            <div class="form-row">
+            <div class="row">
                 <div class="form-group col-sm-6">
                     <input type="hidden" id="menuID" data-default-val="0" />
                     <label class="control-label" for="name">菜单名称</label>
diff --git a/Bootstrap.Admin/Views/Admin/Roles.cshtml b/Bootstrap.Admin/Views/Admin/Roles.cshtml
index 10deb31a..304f6c82 100644
--- a/Bootstrap.Admin/Views/Admin/Roles.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Roles.cshtml
@@ -13,16 +13,16 @@
 }
 @section query {
     <form class="form-inline">
-        <div class="form-row">
-            <div class="form-group col-sm-6 col-md-5">
+        <div class="row">
+            <div class="form-group col-sm-5 col-md-auto">
                 <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">
+            <div class="form-group col-sm-5 col-md-auto">
                 <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-sm-12 col-md-2">
+            <div class="form-group col-sm-2 col-md-auto flex-md-fill justify-content-md-end">
                 <button type="button" id="btn_query" class="btn btn-primary btn-fill"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
             </div>
         </div>
@@ -55,7 +55,7 @@
     </div>
     <div class="modal-body">
         <form class="form-inline">
-            <div class="form-row">
+            <div class="row">
                 <div class="form-group col-sm-6">
                     <label class="control-label" for="roleName">角色名称</label>
                     <input type="text" class="form-control" id="roleName" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
diff --git a/Bootstrap.Admin/Views/Admin/Users.cshtml b/Bootstrap.Admin/Views/Admin/Users.cshtml
index 4aa7fc95..fe84b264 100644
--- a/Bootstrap.Admin/Views/Admin/Users.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Users.cshtml
@@ -8,16 +8,16 @@
 }
 @section query {
     <form class="form-inline">
-        <div class="form-row">
-            <div class="form-group col-sm-6 col-md-5">
+        <div class="row">
+            <div class="form-group col-sm-5 col-md-auto">
                 <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">
+            <div class="form-group col-sm-5 col-md-auto">
                 <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-12 col-md-2">
+            <div class="form-group col-sm-2 col-md-auto flex-md-fill justify-content-md-end">
                 <button type="button" id="btn_query" class="btn btn-primary btn-fill"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
             </div>
         </div>
@@ -47,7 +47,7 @@
     <div class="modal-body">
         <form class="form-inline">
             <input type="hidden" id="userID" data-default-val="0" />
-            <div class="form-row">
+            <div class="row">
                 <div class="form-group col-sm-6">
                     <label class="control-label" for="userName">登陆名称</label>
                     <input type="text" class="form-control" id="userName" placeholder="不可为空，50字以内" minlength="4" maxlength="50" remote="api/Register" data-remote-msg="此用户已存在" data-valid="true" />
diff --git a/Bootstrap.Admin/wwwroot/css/theme-responsive.css b/Bootstrap.Admin/wwwroot/css/theme-responsive.css
index 900365a9..c959b8c7 100644
--- a/Bootstrap.Admin/wwwroot/css/theme-responsive.css
+++ b/Bootstrap.Admin/wwwroot/css/theme-responsive.css
@@ -33,6 +33,10 @@
         align-self: flex-end;
         margin-bottom: 2px;
     }
+
+    .input-group.date.form_date {
+        width: 186px;
+    }
 }
 
 @media (min-width: 940px) {
diff --git a/Bootstrap.Client/wwwroot/css/theme-responsive.css b/Bootstrap.Client/wwwroot/css/theme-responsive.css
index 242a79ca..a4098dd4 100644
--- a/Bootstrap.Client/wwwroot/css/theme-responsive.css
+++ b/Bootstrap.Client/wwwroot/css/theme-responsive.css
@@ -33,6 +33,10 @@
         align-self: flex-end;
         margin-bottom: 2px;
     }
+
+    .input-group.date.form_date {
+        width: 186px;
+    }
 }
 
 @media (min-width: 940px) {