From 64e6ae4fe48c74fcb252bae9f8c65ddecb5588d3 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 26 Sep 2023 09:15:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Tab=E9=A1=B5=E7=AD=BE?= =?UTF-8?q?=E5=88=87=E6=8D=A2=EF=BC=8C=E4=BC=9A=E6=BB=9A=E5=8A=A8=E5=88=B0?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=A1=B6=E9=83=A8=E9=97=AE=E9=A2=98(I841ER)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/static/ruoyi/index.js | 16 ++++++++-------- .../src/main/resources/static/ruoyi/js/common.js | 6 +++--- .../resources/templates/system/user/user.html | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/index.js b/ruoyi-admin/src/main/resources/static/ruoyi/index.js index 445c7cdf0..b78cd822d 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/index.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/index.js @@ -157,7 +157,7 @@ $(function() { // 显示tab对应的内容区 $('.RuoYi_iframe').each(function() { if ($(this).data('id') == currentId) { - $(this).show().siblings('.RuoYi_iframe').hide(); + $(this).css({"visibility": "visible", "position": "static"}).siblings('.RuoYi_iframe').css({"visibility": "hidden", "position": "absolute"}); } }); $(element).addClass('active').siblings('.menuTab').removeClass('active'); @@ -289,7 +289,7 @@ $(function() { // 显示tab对应的内容区 $('.mainContent .RuoYi_iframe').each(function() { if ($(this).data('id') == dataUrl) { - $(this).show().siblings('.RuoYi_iframe').hide(); + $(this).css({"visibility": "visible", "position": "static"}).siblings('.RuoYi_iframe').css({"visibility": "hidden", "position": "absolute"}); return false; } }); @@ -308,7 +308,7 @@ $(function() { // 添加选项卡对应的iframe var str1 = ''; - $('.mainContent').find('iframe.RuoYi_iframe').hide().parents('.mainContent').append(str1); + $('.mainContent').find('iframe.RuoYi_iframe').css({"visibility": "hidden", "position": "absolute"}).parents('.mainContent').append(str1); $.modal.loading("数据加载中,请稍候..."); @@ -351,7 +351,7 @@ $(function() { $('.mainContent .RuoYi_iframe').each(function() { if ($(this).data('id') == activeId) { - $(this).show().siblings('.RuoYi_iframe').hide(); + $(this).css({"visibility": "visible", "position": "static"}).siblings('.RuoYi_iframe').css({"visibility": "hidden", "position": "absolute"}); return false; } }); @@ -379,7 +379,7 @@ $(function() { $(this).parents('.menuTab').prev('.menuTab:last').addClass('active'); $('.mainContent .RuoYi_iframe').each(function() { if ($(this).data('id') == activeId) { - $(this).show().siblings('.RuoYi_iframe').hide(); + $(this).css({"visibility": "visible", "position": "static"}).siblings('.RuoYi_iframe').css({"visibility": "hidden", "position": "absolute"}); return false; } }); @@ -399,7 +399,7 @@ $(function() { $('.menuTab[data-id="' + panelUrl + '"]').addClass('active').siblings('.menuTab').removeClass('active'); $('.mainContent .RuoYi_iframe').each(function() { if ($(this).data('id') == panelUrl) { - $(this).show().siblings('.RuoYi_iframe').hide(); + $(this).css({"visibility": "visible", "position": "static"}).siblings('.RuoYi_iframe').css({"visibility": "hidden", "position": "absolute"}); return false; } }); @@ -441,7 +441,7 @@ $(function() { // 显示tab对应的内容区 $('.mainContent .RuoYi_iframe').each(function() { if ($(this).data('id') == currentId) { - $(this).show().siblings('.RuoYi_iframe').hide(); + $(this).css({"visibility": "visible", "position": "static"}).siblings('.RuoYi_iframe').css({"visibility": "hidden", "position": "absolute"}); isRefresh = $.common.nullToDefault($(this).data('refresh'), false); return false; } @@ -493,7 +493,7 @@ $(function() { $(this).remove(); }); $('.page-tabs-content').children("[data-id]:first").each(function() { - $('.RuoYi_iframe[data-id="' + $(this).data('id') + '"]').show(); + $('.RuoYi_iframe[data-id="' + $(this).data('id') + '"]').css({"visibility": "visible", "position": "static"}); $(this).addClass("active"); }); $('.page-tabs-content').css("margin-left", "0"); diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js index c00317e2b..ee6830fc2 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js @@ -245,7 +245,7 @@ var closeItem = function(dataId){ $('.menuTab[data-id="' + panelUrl + '"]', topWindow).addClass('active').siblings('.menuTab').removeClass('active'); $('.mainContent .RuoYi_iframe', topWindow).each(function() { if ($(this).data('id') == panelUrl) { - $(this).show().siblings('.RuoYi_iframe').hide(); + $(this).css({"visibility": "visible", "position": "static"}).siblings('.RuoYi_iframe').css({"visibility": "hidden", "position": "absolute"}); return false; } }); @@ -269,7 +269,7 @@ function createMenuItem(dataUrl, menuName, isRefresh) { // 显示tab对应的内容区 $('.mainContent .RuoYi_iframe', topWindow).each(function() { if ($(this).data('id') == dataUrl) { - $(this).show().siblings('.RuoYi_iframe').hide(); + $(this).css({"visibility": "visible", "position": "static"}).siblings('.RuoYi_iframe').css({"visibility": "hidden", "position": "absolute"}); return false; } }); @@ -288,7 +288,7 @@ function createMenuItem(dataUrl, menuName, isRefresh) { // 添加选项卡对应的iframe var str1 = ''; - $('.mainContent', topWindow).find('iframe.RuoYi_iframe').hide().parents('.mainContent').append(str1); + $('.mainContent', topWindow).find('iframe.RuoYi_iframe').css({"visibility": "hidden", "position": "absolute"}).parents('.mainContent').append(str1); window.parent.$.modal.loading("数据加载中,请稍候..."); $('.mainContent iframe:visible', topWindow).on('load', function() { diff --git a/ruoyi-admin/src/main/resources/templates/system/user/user.html b/ruoyi-admin/src/main/resources/templates/system/user/user.html index d91db5de9..3c981df11 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/user.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/user.html @@ -100,7 +100,7 @@ if ($(this).width() < 769) { panehHidden = true; } - $('body').layout({ initClosed: panehHidden, west__size: 185 }); + $('body').layout({ initClosed: panehHidden, west__size: 185, resizeWithWindow: false }); // 回到顶部绑定 if ($.fn.toTop !== undefined) { var opt = {