修复新窗口打开页面关闭弹窗报错

3 years ago · ee9ff26594
parent af7339f3b0
commit ee9ff26594
1 changed files with 4 additions and 2 deletions
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
@ -351,8 +351,10 @@ function calSumWidth(elements) {
 function activeWindow() {
 	var topWindow = $(window.parent.document);
 	var currentId = $('.page-tabs-content', topWindow).find('.active').attr('data-id');
-	var activeWindow = $('.RuoYi_iframe[data-id="' + currentId + '"]', topWindow)[0].contentWindow;
-    return activeWindow;
+	if (!currentId) {
+		return window.parent;
+	}
+    return $('.RuoYi_iframe[data-id="' + currentId + '"]', topWindow)[0].contentWindow;
 }

 /** 密码规则范围验证 */