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 7b1951b58..483126559 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 @@ -801,22 +801,31 @@ var table = { options.callBack(index, layero); } } - layer.open({ - type: 2, - maxmin: true, - shade: 0.3, - title: _title, - fix: false, - area: [_width + 'px', _height + 'px'], - content: _url, - shadeClose: $.common.isEmpty(options.shadeClose) ? true : options.shadeClose, - skin: options.skin, - btn: $.common.isEmpty(options.btn) ? _btn : options.btn, - yes: options.yes, - cancel: function () { - return true; - } - }); + var btnCallback = {}; + if(options.btn instanceof Array){ + for (var i = 1, len = options.btn.length; i < len; i++) { + var btn = options["btn" + (i + 1)]; + if (btn) { + btnCallback["btn" + (i + 1)] = btn; + } + } + } + layer.open($.extend({ + type: 2, + maxmin: true, + shade: 0.3, + title: _title, + fix: false, + area: [_width + 'px', _height + 'px'], + content: _url, + shadeClose: $.common.isEmpty(options.shadeClose) ? true : options.shadeClose, + skin: options.skin, + btn: $.common.isEmpty(options.btn) ? _btn : options.btn, + yes: options.yes, + cancel: function () { + return true; + } + }, btnCallback)); }, // 弹出层全屏 openFull: function (title, url, width, height) {