github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

修复页签关闭后存在的跳转问题(I8JDIS)

pull/478/head
RuoYi 2023-11-25 15:43:51 +08:00
parent 4933ea6d2f
commit fd4fe83e9f
4 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/resources/static/ruoyi/index.js
View File

@ -353,7 +353,6 @@ $(function() {
var panelUrl = $(this).parents('.menuTab').data('panel');
// 当前元素处于活动状态
if ($(this).parents('.menuTab').hasClass('active')) {
syncMenuTab($('.page-tabs-content').find('.active').attr('data-id'));
// 当前元素后面有同辈元素，使后面的一个元素处于活动状态
if ($(this).parents('.menuTab').next('.menuTab').length) {
@ -432,7 +431,7 @@ $(function() {
});
}
scrollToTab($('.menuTab.active'));
syncMenuTab($('.page-tabs-content').find('.active').attr('data-id'));
syncMenuTab($.common.isNotEmpty(panelUrl) ? panelUrl : $('.page-tabs-content').find('.active').attr('data-id'));
return false;
}

6
ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
View File

@ -5,6 +5,8 @@
var startLayDate;
var endLayDate;
var isScrollToTop = parent.isScrollToTop;
$(function() {
// layer扩展皮肤
@ -288,7 +290,7 @@ function createMenuItem(dataUrl, menuName, isRefresh) {
// 添加选项卡对应的iframe
var str1 = '<iframe class="RuoYi_iframe" name="iframe' + dataIndex + '" width="100%" height="100%" src="' + dataUrl + '" frameborder="0" data-id="' + dataUrl + '" data-panel="' + panelUrl + '" seamless></iframe>';
if (parent.isScrollToTop) {
if (isScrollToTop) {
$('.mainContent', topWindow).find('iframe.RuoYi_iframe').hide().parents('.mainContent').append(str1);
} else {
$('.mainContent', topWindow).find('iframe.RuoYi_iframe').css({"visibility": "hidden", "position": "absolute"}).parents('.mainContent').append(str1);
@ -363,7 +365,7 @@ function activeWindow() {
}
function openToCurrentTab(obj) {
if (parent.isScrollToTop) {
if (isScrollToTop) {
$(obj).show().siblings('.RuoYi_iframe').hide();
} else {
$(obj).css({"visibility": "visible", "position": "static"}).siblings('.RuoYi_iframe').css({"visibility": "hidden", "position": "absolute"});