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 5e58b3c9..cc0084af 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 ee218ad1..33ccedc8 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 将获得稳定的排序