From c52ba00f4f1a4ef2e9e50988cd3977e77211105f Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 6 Jul 2020 15:32:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=A0=BC=E5=86=BB?= =?UTF-8?q?=E7=BB=93=E5=88=97=E9=94=99=E4=BD=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extensions/columns/bootstrap-table-fixed-columns.js | 7 +++++-- sql/ry_20200620.sql | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js index 844e14a53..17ff1d330 100644 --- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js +++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js @@ -224,9 +224,12 @@ height: height, top: top + 1 }).show(); - + + var bsHeight = $("#" + table.options.id).find("tr").eq(1).height(); + var fixedHeight = $("#" + table.options.id).parent().prev().find("tr").eq(1).height(); + var resizeHeight = bsHeight > fixedHeight ? bsHeight: fixedHeight; this.$body.find('> tr').each(function (i) { - that.$fixedBody.find('tr:eq(' + i + ')').height($(this).height() - 0.5); + that.$fixedBody.find('tr:eq(' + i + ')').height(i == 0 ? resizeHeight - 1 : resizeHeight); var thattds = this; that.$fixedBody.find('tr:eq(' + i + ')').find('td').each(function (j) { $(this).width($($(thattds).find('td')[j]).width() + 1); diff --git a/sql/ry_20200620.sql b/sql/ry_20200620.sql index c62a0c446..432b2b2dd 100644 --- a/sql/ry_20200620.sql +++ b/sql/ry_20200620.sql @@ -121,7 +121,7 @@ create table sys_role ( -- ---------------------------- -- 初始化-角色信息表数据 -- ---------------------------- -insert into sys_role values('1', '系统管理员', 'admin', 1, 1, '0', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统管理员'); +insert into sys_role values('1', '超级管理员', 'admin', 1, 1, '0', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '超级管理员'); insert into sys_role values('2', '普通角色', 'common', 2, 2, '0', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '普通角色');