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

修复关闭父页签后提交无法跳转的问题(I5QBMO)

pull/413/head
RuoYi 2022-09-12 10:34:00 +08:00
parent d4a33eab94
commit 13287e02eb
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ var table = {
options: {}, options: {},
// 设置实例配置 // 设置实例配置
set: function(id) { set: function(id) {
if($.common.getLength(table.config) > 1 && $.common.isNotEmpty(event)) { if ($.common.getLength(table.config) > 1 && $.common.isNotEmpty(event)) {
var tableId = $.common.isEmpty(id) ? $(event.currentTarget).parents(".bootstrap-table").find("table.table").attr("id") || $(event.currentTarget).parents(".bootstrap-tree-table").find("table.table").attr("id") : id; var tableId = $.common.isEmpty(id) ? $(event.currentTarget).parents(".bootstrap-table").find("table.table").attr("id") || $(event.currentTarget).parents(".bootstrap-tree-table").find("table.table").attr("id") : id;
if ($.common.isNotEmpty(tableId)) { if ($.common.isNotEmpty(tableId)) {
table.options = table.get(tableId); table.options = table.get(tableId);
@ -221,13 +221,13 @@ var table = {
if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) { if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) {
func = $.inArray(e.type, ['check', 'check-all']) > -1 ? 'union' : 'difference'; func = $.inArray(e.type, ['check', 'check-all']) > -1 ? 'union' : 'difference';
var selectedIds = table.rememberSelectedIds[table.options.id]; var selectedIds = table.rememberSelectedIds[table.options.id];
if($.common.isNotEmpty(selectedIds)) { if ($.common.isNotEmpty(selectedIds)) {
table.rememberSelectedIds[table.options.id] = _[func](selectedIds, rowIds); table.rememberSelectedIds[table.options.id] = _[func](selectedIds, rowIds);
} else { } else {
table.rememberSelectedIds[table.options.id] = _[func]([], rowIds); table.rememberSelectedIds[table.options.id] = _[func]([], rowIds);
} }
var selectedRows = table.rememberSelecteds[table.options.id]; var selectedRows = table.rememberSelecteds[table.options.id];
if($.common.isNotEmpty(selectedRows)) { if ($.common.isNotEmpty(selectedRows)) {
table.rememberSelecteds[table.options.id] = _[func](selectedRows, rows); table.rememberSelecteds[table.options.id] = _[func](selectedRows, rows);
} else { } else {
table.rememberSelecteds[table.options.id] = _[func]([], rows); table.rememberSelecteds[table.options.id] = _[func]([], rows);
@ -249,7 +249,7 @@ var table = {
$(optionsIds).off("click").on("click", '.img-circle', function() { $(optionsIds).off("click").on("click", '.img-circle', function() {
var src = $(this).attr('src'); var src = $(this).attr('src');
var target = $(this).data('target'); var target = $(this).data('target');
if($.common.equals("self", target)) { if ($.common.equals("self", target)) {
var height = $(this).data('height'); var height = $(this).data('height');
var width = $(this).data('width'); var width = $(this).data('width');
top.layer.open({ top.layer.open({
@ -363,7 +363,7 @@ var table = {
if ($.common.isNotEmpty(pageSize)) { if ($.common.isNotEmpty(pageSize)) {
params.pageSize = pageSize; params.pageSize = pageSize;
} }
if($.common.isNotEmpty(tableId)){ if ($.common.isNotEmpty(tableId)){
$("#" + tableId).bootstrapTable('refresh', params); $("#" + tableId).bootstrapTable('refresh', params);
} else{ } else{
$("#" + table.options.id).bootstrapTable('refresh', params); $("#" + table.options.id).bootstrapTable('refresh', params);
@ -493,7 +493,7 @@ var table = {
}); });
if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) { if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) {
var selectedRows = table.rememberSelecteds[table.options.id]; var selectedRows = table.rememberSelecteds[table.options.id];
if($.common.isNotEmpty(selectedRows)) { if ($.common.isNotEmpty(selectedRows)) {
rows = $.map(table.rememberSelecteds[table.options.id], function (row) { rows = $.map(table.rememberSelecteds[table.options.id], function (row) {
return $.common.getItemField(row, column); return $.common.getItemField(row, column);
}); });
@ -522,7 +522,7 @@ var table = {
}); });
if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) { if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) {
var selectedRows = table.rememberSelecteds[table.options.id]; var selectedRows = table.rememberSelecteds[table.options.id];
if($.common.isNotEmpty(selectedRows)) { if ($.common.isNotEmpty(selectedRows)) {
rows = $.map(selectedRows, function (row) { rows = $.map(selectedRows, function (row) {
return $.common.getItemField(row, table.options.columns[1].field); return $.common.getItemField(row, table.options.columns[1].field);
}); });
@ -812,7 +812,7 @@ var table = {
}, },
// 获取iframe页的DOM // 获取iframe页的DOM
getChildFrame: function (index) { getChildFrame: function (index) {
if($.common.isEmpty(index)){ if ($.common.isEmpty(index)){
var index = parent.layer.getFrameIndex(window.name); var index = parent.layer.getFrameIndex(window.name);
return parent.layer.getChildFrame('body', index); return parent.layer.getChildFrame('body', index);
} else { } else {
@ -821,7 +821,7 @@ var table = {
}, },
// 关闭窗体 // 关闭窗体
close: function (index) { close: function (index) {
if($.common.isEmpty(index)){ if ($.common.isEmpty(index)){
var index = parent.layer.getFrameIndex(window.name); var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index); parent.layer.close(index);
} else { } else {
@ -907,7 +907,7 @@ var table = {
} }
} }
var btnCallback = {}; var btnCallback = {};
if(options.btn instanceof Array){ if (options.btn instanceof Array){
for (var i = 1, len = options.btn.length; i < len; i++) { for (var i = 1, len = options.btn.length; i < len; i++) {
var btn = options["btn" + (i + 1)]; var btn = options["btn" + (i + 1)];
if (btn) { if (btn) {
@ -1095,7 +1095,7 @@ var table = {
table.set(); table.set();
$.modal.confirm("确定删除该条" + table.options.modalName + "信息吗？", function() { $.modal.confirm("确定删除该条" + table.options.modalName + "信息吗？", function() {
var url = $.common.isEmpty(id) ? table.options.removeUrl : table.options.removeUrl.replace("{id}", id); var url = $.common.isEmpty(id) ? table.options.removeUrl : table.options.removeUrl.replace("{id}", id);
if(table.options.type == table_type.bootstrapTreeTable) { if (table.options.type == table_type.bootstrapTreeTable) {
$.operate.get(url); $.operate.get(url);
} else { } else {
var data = { "ids": id }; var data = { "ids": id };
@ -1148,7 +1148,7 @@ var table = {
// 修改信息 // 修改信息
edit: function(id) { edit: function(id) {
table.set(); table.set();
if($.common.isEmpty(id) && table.options.type == table_type.bootstrapTreeTable) { if ($.common.isEmpty(id) && table.options.type == table_type.bootstrapTreeTable) {
var row = $("#" + table.options.id).bootstrapTreeTable('getSelections')[0]; var row = $("#" + table.options.id).bootstrapTreeTable('getSelections')[0];
if ($.common.isEmpty(row)) { if ($.common.isEmpty(row)) {
$.modal.alertWarning("请至少选择一条记录"); $.modal.alertWarning("请至少选择一条记录");
@ -1172,7 +1172,7 @@ var table = {
if ($.common.isNotEmpty(id)) { if ($.common.isNotEmpty(id)) {
url = table.options.updateUrl.replace("{id}", id); url = table.options.updateUrl.replace("{id}", id);
} else { } else {
if(table.options.type == table_type.bootstrapTreeTable) { if (table.options.type == table_type.bootstrapTreeTable) {
var row = $("#" + table.options.id).bootstrapTreeTable('getSelections')[0]; var row = $("#" + table.options.id).bootstrapTreeTable('getSelections')[0];
if ($.common.isEmpty(row)) { if ($.common.isEmpty(row)) {
$.modal.alertWarning("请至少选择一条记录"); $.modal.alertWarning("请至少选择一条记录");
@ -1298,7 +1298,7 @@ var table = {
successCallback: function(result) { successCallback: function(result) {
if (result.code == web_status.SUCCESS) { if (result.code == web_status.SUCCESS) {
var parent = activeWindow(); var parent = activeWindow();
if($.common.isEmpty(parent.table)) { if ($.common.isEmpty(parent.table)) {
$.modal.msgSuccessReload(result.msg); $.modal.msgSuccessReload(result.msg);
} else if (parent.table.options.type == table_type.bootstrapTable) { } else if (parent.table.options.type == table_type.bootstrapTable) {
$.modal.close(); $.modal.close();
@ -1322,15 +1322,20 @@ var table = {
if (result.code == web_status.SUCCESS) { if (result.code == web_status.SUCCESS) {
var topWindow = $(window.parent.document); var topWindow = $(window.parent.document);
var currentId = $('.page-tabs-content', topWindow).find('.active').attr('data-panel'); var currentId = $('.page-tabs-content', topWindow).find('.active').attr('data-panel');
var $contentWindow = $('.RuoYi_iframe[data-id="' + currentId + '"]', topWindow)[0].contentWindow; var topWindow = $('.RuoYi_iframe[data-id="' + currentId + '"]', topWindow)[0];
$.modal.close(); if ($.common.isNotEmpty(topWindow) && $.common.isNotEmpty(currentId)) {
$contentWindow.$.modal.msgSuccess(result.msg); var $contentWindow = topWindow.contentWindow;
$contentWindow.$(".layui-layer-padding").removeAttr("style"); $contentWindow.$.modal.msgSuccess(result.msg);
if ($contentWindow.table.options.type == table_type.bootstrapTable) { $contentWindow.$(".layui-layer-padding").removeAttr("style");
$contentWindow.$.table.refresh(); if ($contentWindow.table.options.type == table_type.bootstrapTable) {
} else if ($contentWindow.table.options.type == table_type.bootstrapTreeTable) { $contentWindow.$.table.refresh();
$contentWindow.$.treeTable.refresh(); } else if ($contentWindow.table.options.type == table_type.bootstrapTreeTable) {
$contentWindow.$.treeTable.refresh();
}
} else {
$.modal.msgSuccess(result.msg);
} }
$.modal.close();
$.modal.closeTab(); $.modal.closeTab();
} else if (result.code == web_status.WARNING) { } else if (result.code == web_status.WARNING) {
$.modal.alertWarning(result.msg) $.modal.alertWarning(result.msg)
@ -1413,7 +1418,7 @@ var table = {
var node = tree.getNodesByParam("id", treeId, null)[0]; var node = tree.getNodesByParam("id", treeId, null)[0];
$.tree.selectByIdName(treeId, node); $.tree.selectByIdName(treeId, node);
// 回调tree方法 // 回调tree方法
if(typeof(options.callBack) === "function"){ if (typeof(options.callBack) === "function"){
options.callBack(tree); options.callBack(tree);
} }
}); });
@ -1502,7 +1507,7 @@ var table = {
// 不允许根父节点选择 // 不允许根父节点选择
notAllowParents: function(_tree) { notAllowParents: function(_tree) {
var nodes = _tree.getSelectedNodes(); var nodes = _tree.getSelectedNodes();
if(nodes.length == 0){ if (nodes.length == 0){
$.modal.msgError("请选择节点后提交"); $.modal.msgError("请选择节点后提交");
return false; return false;
} }
@ -1690,7 +1695,7 @@ var table = {
formToJSON: function(formId) { formToJSON: function(formId) {
var json = {}; var json = {};
$.each($("#" + formId).serializeArray(), function(i, field) { $.each($("#" + formId).serializeArray(), function(i, field) {
if(json[field.name]) { if (json[field.name]) {
json[field.name] += ("," + field.value); json[field.name] += ("," + field.value);
} else { } else {
json[field.name] = field.value; json[field.name] = field.value;