From 13287e02eb7ea0a3224db69da46d501da8523529 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 12 Sep 2022 10:34:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B3=E9=97=AD=E7=88=B6?= =?UTF-8?q?=E9=A1=B5=E7=AD=BE=E5=90=8E=E6=8F=90=E4=BA=A4=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E7=9A=84=E9=97=AE=E9=A2=98(I5QBMO)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/static/ruoyi/js/ry-ui.js | 55 ++++++++++--------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index fb3a212e2..88df2a1e2 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -10,7 +10,7 @@ var table = { options: {}, // 设置实例配置 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; if ($.common.isNotEmpty(tableId)) { table.options = table.get(tableId); @@ -221,13 +221,13 @@ var table = { if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) { func = $.inArray(e.type, ['check', 'check-all']) > -1 ? 'union' : 'difference'; var selectedIds = table.rememberSelectedIds[table.options.id]; - if($.common.isNotEmpty(selectedIds)) { + if ($.common.isNotEmpty(selectedIds)) { table.rememberSelectedIds[table.options.id] = _[func](selectedIds, rowIds); } else { table.rememberSelectedIds[table.options.id] = _[func]([], rowIds); } var selectedRows = table.rememberSelecteds[table.options.id]; - if($.common.isNotEmpty(selectedRows)) { + if ($.common.isNotEmpty(selectedRows)) { table.rememberSelecteds[table.options.id] = _[func](selectedRows, rows); } else { table.rememberSelecteds[table.options.id] = _[func]([], rows); @@ -249,7 +249,7 @@ var table = { $(optionsIds).off("click").on("click", '.img-circle', function() { var src = $(this).attr('src'); var target = $(this).data('target'); - if($.common.equals("self", target)) { + if ($.common.equals("self", target)) { var height = $(this).data('height'); var width = $(this).data('width'); top.layer.open({ @@ -363,7 +363,7 @@ var table = { if ($.common.isNotEmpty(pageSize)) { params.pageSize = pageSize; } - if($.common.isNotEmpty(tableId)){ + if ($.common.isNotEmpty(tableId)){ $("#" + tableId).bootstrapTable('refresh', params); } else{ $("#" + table.options.id).bootstrapTable('refresh', params); @@ -493,7 +493,7 @@ var table = { }); if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) { var selectedRows = table.rememberSelecteds[table.options.id]; - if($.common.isNotEmpty(selectedRows)) { + if ($.common.isNotEmpty(selectedRows)) { rows = $.map(table.rememberSelecteds[table.options.id], function (row) { return $.common.getItemField(row, column); }); @@ -522,7 +522,7 @@ var table = { }); if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) { var selectedRows = table.rememberSelecteds[table.options.id]; - if($.common.isNotEmpty(selectedRows)) { + if ($.common.isNotEmpty(selectedRows)) { rows = $.map(selectedRows, function (row) { return $.common.getItemField(row, table.options.columns[1].field); }); @@ -812,7 +812,7 @@ var table = { }, // 获取iframe页的DOM getChildFrame: function (index) { - if($.common.isEmpty(index)){ + if ($.common.isEmpty(index)){ var index = parent.layer.getFrameIndex(window.name); return parent.layer.getChildFrame('body', index); } else { @@ -821,7 +821,7 @@ var table = { }, // 关闭窗体 close: function (index) { - if($.common.isEmpty(index)){ + if ($.common.isEmpty(index)){ var index = parent.layer.getFrameIndex(window.name); parent.layer.close(index); } else { @@ -907,7 +907,7 @@ var table = { } } var btnCallback = {}; - if(options.btn instanceof Array){ + if (options.btn instanceof Array){ for (var i = 1, len = options.btn.length; i < len; i++) { var btn = options["btn" + (i + 1)]; if (btn) { @@ -1095,7 +1095,7 @@ var table = { table.set(); $.modal.confirm("确定删除该条" + table.options.modalName + "信息吗？", function() { 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); } else { var data = { "ids": id }; @@ -1148,7 +1148,7 @@ var table = { // 修改信息 edit: function(id) { 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]; if ($.common.isEmpty(row)) { $.modal.alertWarning("请至少选择一条记录"); @@ -1172,7 +1172,7 @@ var table = { if ($.common.isNotEmpty(id)) { url = table.options.updateUrl.replace("{id}", id); } else { - if(table.options.type == table_type.bootstrapTreeTable) { + if (table.options.type == table_type.bootstrapTreeTable) { var row = $("#" + table.options.id).bootstrapTreeTable('getSelections')[0]; if ($.common.isEmpty(row)) { $.modal.alertWarning("请至少选择一条记录"); @@ -1298,7 +1298,7 @@ var table = { successCallback: function(result) { if (result.code == web_status.SUCCESS) { var parent = activeWindow(); - if($.common.isEmpty(parent.table)) { + if ($.common.isEmpty(parent.table)) { $.modal.msgSuccessReload(result.msg); } else if (parent.table.options.type == table_type.bootstrapTable) { $.modal.close(); @@ -1322,15 +1322,20 @@ var table = { if (result.code == web_status.SUCCESS) { var topWindow = $(window.parent.document); var currentId = $('.page-tabs-content', topWindow).find('.active').attr('data-panel'); - var $contentWindow = $('.RuoYi_iframe[data-id="' + currentId + '"]', topWindow)[0].contentWindow; - $.modal.close(); - $contentWindow.$.modal.msgSuccess(result.msg); - $contentWindow.$(".layui-layer-padding").removeAttr("style"); - if ($contentWindow.table.options.type == table_type.bootstrapTable) { - $contentWindow.$.table.refresh(); - } else if ($contentWindow.table.options.type == table_type.bootstrapTreeTable) { - $contentWindow.$.treeTable.refresh(); + var topWindow = $('.RuoYi_iframe[data-id="' + currentId + '"]', topWindow)[0]; + if ($.common.isNotEmpty(topWindow) && $.common.isNotEmpty(currentId)) { + var $contentWindow = topWindow.contentWindow; + $contentWindow.$.modal.msgSuccess(result.msg); + $contentWindow.$(".layui-layer-padding").removeAttr("style"); + if ($contentWindow.table.options.type == table_type.bootstrapTable) { + $contentWindow.$.table.refresh(); + } else if ($contentWindow.table.options.type == table_type.bootstrapTreeTable) { + $contentWindow.$.treeTable.refresh(); + } + } else { + $.modal.msgSuccess(result.msg); } + $.modal.close(); $.modal.closeTab(); } else if (result.code == web_status.WARNING) { $.modal.alertWarning(result.msg) @@ -1413,7 +1418,7 @@ var table = { var node = tree.getNodesByParam("id", treeId, null)[0]; $.tree.selectByIdName(treeId, node); // 回调tree方法 - if(typeof(options.callBack) === "function"){ + if (typeof(options.callBack) === "function"){ options.callBack(tree); } }); @@ -1502,7 +1507,7 @@ var table = { // 不允许根父节点选择 notAllowParents: function(_tree) { var nodes = _tree.getSelectedNodes(); - if(nodes.length == 0){ + if (nodes.length == 0){ $.modal.msgError("请选择节点后提交"); return false; } @@ -1690,7 +1695,7 @@ var table = { formToJSON: function(formId) { var json = {}; $.each($("#" + formId).serializeArray(), function(i, field) { - if(json[field.name]) { + if (json[field.name]) { json[field.name] += ("," + field.value); } else { json[field.name] = field.value;