升级jquery到最新版3.6.0

pull/327/head
RuoYi 2021-08-31 09:43:56 +08:00
parent 489ab40a8c
commit fe31918f76
6 changed files with 11 additions and 27 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

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();
});
}

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();
});

View File

@ -19,7 +19,7 @@
<div th:fragment="footer">
<script th:inline="javascript"> var ctx = [[@{/}]]; var lockscreen = [[${session.lockscreen}]]; if(lockscreen){window.top.location=ctx+"lockscreen";} </script>
<a id="scroll-up" href="#" class="btn btn-sm display"><i class="fa fa-angle-double-up"></i></a>
<script th:src="@{/js/jquery.min.js}"></script>
<script th:src="@{/js/jquery.min.js?v=3.6.0}"></script>
<script th:src="@{/js/bootstrap.min.js}"></script>
<!-- bootstrap-table 表格插件 -->
<script th:src="@{/ajax/libs/bootstrap-table/bootstrap-table.min.js?v=20210602}"></script>

View File

@ -169,7 +169,7 @@
<script type="text/javascript">
var cropper;
var croppable = false;
$(window).load(function() {
$(window).on('load', function() {
var image = document.getElementById('avatar');
cropper = new Cropper(image, {
aspectRatio: 1,