From 5d73b1d8deebbcc628a9eda3cf83d52f4b7f4ff3 Mon Sep 17 00:00:00 2001
From: Ricky <11748854@qq.com>
Date: Fri, 18 Sep 2020 12:13:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96$.modal.close=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/ruoyi/js/ry-ui.js        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 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 8450dc9d6..858e519e2 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
@@ -722,9 +722,13 @@ var table = {
             	$.modal.alert(content, modal_status.WARNING);
             },
             // 关闭窗体
-            close: function () {
-            	var index = parent.layer.getFrameIndex(window.name);
-                parent.layer.close(index);
+            close: function (index) {
+            	if($.common.isEmpty(index)){
+            		var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+            	} else {
+            		layer.close(index);
+            	}
             },
             // 关闭全部窗体
             closeAll: function () {