From dacf0bfe66a96a0a27dd9bcde59b3aab0425d36d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 25 Feb 2019 20:02:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=A8=E6=A0=BC=E7=9A=84?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css | 6 +++++-
 ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js   | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
index 5e58b3c9b..cc0084af8 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
@@ -198,7 +198,7 @@ label.error {
 .i-checks label.error, .check-box label.error, .radio-box label.error {
 	right: auto;
 	width: 150px;
-	left: 297px;
+	left: 210px;
 	top: 1px;
 	max-width: none;
 }
@@ -501,6 +501,10 @@ label {
 	border: 1px solid #ddd!important
 }
 
+.fixed-table-container thead th  >.both{ 
+    display: inline-block
+}
+
 /** 首页样式 **/
 .ax_close_max {
 	position: fixed;
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index ee218ad1e..33ccedc8a 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -14,6 +14,7 @@
             init: function(options) {
                 $.table._option = options;
                 $.table._params = $.common.isEmpty(options.queryParams) ? $.table.queryParams : options.queryParams;
+                _height = $.common.isEmpty(options.height) ? undefined : options.height;
                 _sidePagination = $.common.isEmpty(options.sidePagination) ? "server" : options.pagination;
                 _sortOrder = $.common.isEmpty(options.sortOrder) ? "asc" : options.sortOrder;
                 _sortName = $.common.isEmpty(options.sortName) ? "" : options.sortName;
@@ -30,6 +31,7 @@
                     contentType: "application/x-www-form-urlencoded",   // 编码类型
                     method: 'post',                                     // 请求方式（*）
                     cache: false,                                       // 是否使用缓存
+                    height: _height,                                    // 表格的高度
                     striped: _striped,                                  // 是否显示行间隔色
                     sortable: true,                                     // 是否启用排序
                     sortStable: true,                                   // 设置为 true 将获得稳定的排序