hhyykk/RuoYi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

升级jquery到最新版3.6.0

Browse Source
This commit is contained in:
RuoYi
2021-08-31 09:43:56 +08:00
parent 489ab40a8c
commit fe31918f76
6 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-admin/src/main/resources/static/ajax/libs/jquery-layout/jquery.layout-latest.js
View File

File diff suppressed because one or more lines are too long

4
ruoyi-admin/src/main/resources/static/js/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -311,7 +311,7 @@ $(function() {
$.modal.loading("数据加载中，请稍后...");
$('.mainContent iframe:visible').load(function () {
$('.mainContent iframe:visible').on('load', function() {
$.modal.closeLoading();
});
@ -342,7 +342,7 @@ $(function() {
if ($(this).parents('.menuTab').hasClass('active')) {
// 当前元素后面有同辈元素，使后面的一个元素处于活动状态
if ($(this).parents('.menuTab').next('.menuTab').size()) {
if ($(this).parents('.menuTab').next('.menuTab').length) {
var activeId = $(this).parents('.menuTab').next('.menuTab:eq(0)').data('id');
$(this).parents('.menuTab').next('.menuTab:eq(0)').addClass('active');
@ -372,7 +372,7 @@ $(function() {
}
// 当前元素后面没有同辈元素，使当前元素的上一个元素处于活动状态
if ($(this).parents('.menuTab').prev('.menuTab').size()) {
if ($(this).parents('.menuTab').prev('.menuTab').length) {
var activeId = $(this).parents('.menuTab').prev('.menuTab:last').data('id');
$(this).parents('.menuTab').prev('.menuTab:last').addClass('active');
$('.mainContent .RuoYi_iframe').each(function() {
@ -631,7 +631,7 @@ $(function() {
var target = $('.RuoYi_iframe[data-id="' + this.data('id') + '"]');
var url = target.attr('src');
$.modal.loading("数据加载中，请稍后...");
target.attr('src', url).load(function () {
target.attr('src', url).on('load', function() {
$.modal.closeLoading();
});
}

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

@ -290,7 +290,7 @@ function createMenuItem(dataUrl, menuName, isRefresh) {
$('.mainContent', topWindow).find('iframe.RuoYi_iframe').hide().parents('.mainContent').append(str1);
window.parent.$.modal.loading("数据加载中，请稍后...");
$('.mainContent iframe:visible', topWindow).load(function () {
$('.mainContent iframe:visible', topWindow).on('load', function() {
window.parent.$.modal.closeLoading();
});