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

修复页签属性refresh为undefined时页面被刷新问题

pull/436/head
RuoYi 2023-01-12 17:31:30 +08:00
parent f1233c85d7
commit c92ed66436
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -440,7 +440,7 @@ $(function() {
$('.mainContent .RuoYi_iframe').each(function() { $('.mainContent .RuoYi_iframe').each(function() {
if ($(this).data('id') == currentId) { if ($(this).data('id') == currentId) {
$(this).show().siblings('.RuoYi_iframe').hide(); $(this).show().siblings('.RuoYi_iframe').hide();
isRefresh = $(this).data('refresh'); isRefresh = $.common.nullToDefault($(this).data('refresh'), false);
return false; return false;
} }
}); });

4
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
View File

@ -1563,6 +1563,10 @@ var table = {
isNotEmpty: function (value) { isNotEmpty: function (value) {
return !$.common.isEmpty(value); return !$.common.isEmpty(value);
}, },
// 如果值是空，则返回指定默认字符串，否则返回字符串本身
nullToDefault: function (value, defaultValue) {
return $.common.isEmpty(value) ? defaultValue : value;
},
// 空对象转字符串 // 空对象转字符串
nullToStr: function(value) { nullToStr: function(value) {
if ($.common.isEmpty(value)) { if ($.common.isEmpty(value)) {