diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx index 9176cf64..fdd987a3 100644 Binary files a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx and b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx differ diff --git a/web/src/main/resources/views/modules/demo/demoFormTabPage.html b/web/src/main/resources/views/modules/demo/demoFormTabPage.html index 9063ac68..1308aaa1 100644 --- a/web/src/main/resources/views/modules/demo/demoFormTabPage.html +++ b/web/src/main/resources/views/modules/demo/demoFormTabPage.html @@ -34,9 +34,9 @@ js.initTabPage('tabpanel1', { height: function () { var windowHeight = $(window).height(), - headerHeight = $('.box-header').outerHeight(), - footerHeight = $('.box-footer').outerHeight(), - height = windowHeight - headerHeight - footerHeight - 3; + headerHeight = $('.box-header').outerHeight() || 0, + footerHeight = $('.box-footer').outerHeight() || 0, + height = windowHeight - headerHeight - footerHeight - 13; return height < 300 ? 300 : height; } }); @@ -53,9 +53,10 @@ b.initTabPage('tabpanel2', { height: function () { var windowHeight = $(window).height(), - headerHeight = $('.box-header').outerHeight(), - footerHeight = $('.box-footer').outerHeight(), - height = windowHeight - headerHeight - footerHeight - 3; + headerHeight = $('.box-header').outerHeight() || 0, + footerHeight = $('.box-footer').outerHeight() || 0, + height = windowHeight - headerHeight - footerHeight - 13; + log(height) return height < 300 ? 300 : height; } });