manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
thinkgem
2020-06-08 12:41:35 +08:00
parent d2e760dbd6
commit 94102a2ea4
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx
View File

Binary file not shown.

13
web/src/main/resources/views/modules/demo/demoFormTabPage.html
View File

@@ -34,9 +34,9 @@
js.initTabPage('tabpanel1', { js.initTabPage('tabpanel1', {
height: function () { height: function () {
var windowHeight = $(window).height(), var windowHeight = $(window).height(),
headerHeight = $('.box-header').outerHeight(), headerHeight = $('.box-header').outerHeight() || 0,
footerHeight = $('.box-footer').outerHeight(), footerHeight = $('.box-footer').outerHeight() || 0,
height = windowHeight - headerHeight - footerHeight - 3; height = windowHeight - headerHeight - footerHeight - 13;
return height < 300 ? 300 : height; return height < 300 ? 300 : height;
} }
}); });
@@ -53,9 +53,10 @@
b.initTabPage('tabpanel2', { b.initTabPage('tabpanel2', {
height: function () { height: function () {
var windowHeight = $(window).height(), var windowHeight = $(window).height(),
headerHeight = $('.box-header').outerHeight(), headerHeight = $('.box-header').outerHeight() || 0,
footerHeight = $('.box-footer').outerHeight(), footerHeight = $('.box-footer').outerHeight() || 0,
height = windowHeight - headerHeight - footerHeight - 3; height = windowHeight - headerHeight - footerHeight - 13;
log(height)
return height < 300 ? 300 : height; return height < 300 ? 300 : height;
} }
}); });