root 1 year ago
parent
commit
b53971b089
3 changed files with 22 additions and 7 deletions
  1. 15 0
      js/Controls/Basic.js
  2. 0 0
      js/Controls/Basic.min.js
  3. 7 7
      uform.js

+ 15 - 0
js/Controls/Basic.js

@@ -2113,6 +2113,21 @@ U.UF.UI.form.prototype = {
             _formel.appendChild(_contentel);
         }
         else {
+            //有特殊关闭处理的,需要重新加载
+            if (this.closecallback) {
+                try {
+                    if (this.content.tagName == "IFRAME") {
+                        this.content.src += '';
+                    }
+                    else {
+                        $("iframe", _this.content)[0].src += '';
+                    }
+                }
+                catch (e) {
+
+                }
+
+            }
             _formel = _replaceel;
         }
         //如果没有设置top和left那么居中弹出

File diff suppressed because it is too large
+ 0 - 0
js/Controls/Basic.min.js


+ 7 - 7
uform.js

@@ -10857,13 +10857,13 @@ U.UF.F.windowMinimize = function (el) {
 */
 U.UF.F.closeWindow = function (el, str) {
     var _el = U.selectEl(el); //获取整个窗体的元素
-    //    if (_el[0].style.display != "none" && str == "remove") {//判断窗体是否被隐藏,并且操作指令为remove
-    //        _el.remove(); //移除整个窗体
-    //        _el = null; //移除整个窗体
-    //    }
-    //    else {
-    _el.css("display", "none");
-    //    }
+    if (_el[0].style.display != "none" && str == "remove") {//判断窗体是否被隐藏,并且操作指令为remove
+        _el.remove(); //移除整个窗体
+        _el = null; //移除整个窗体
+    }
+    else {
+        _el.css("display", "none");
+    }
 }
 
 /*

Some files were not shown because too many files changed in this diff