Merge branch 'fix/bug_5.2' into 'release'

修复系统设置-模块部署中，不可见模块的下拉框显示问题,修复表单预览后关闭按钮被遮挡的bug

See merge request o2oa/o2oa!1706

o2web/source/o2_core/o2/widget/Panel.js

@@ -276,7 +276,7 @@ o2.widget.Panel = new Class({
 		
 		this.returnMaxContainerSize = this.container.getSize();
 		
-		var size = $(document.body).getSize();
+		var size = this.container.getOffsetParent().getSize();
 		this.container.setStyles({
 			"position": "absolute",
 			"top": 2,
@@ -483,4 +483,4 @@ o2.widget.Panel = new Class({
 		}).inject(this.bottomNode);
 	}
 });
-o2.widget.Panel.panels = [];
\ No newline at end of file
+o2.widget.Panel.panels = [];

o2web/source/o2_core/o2/xDesktop/Authentication.js

@@ -86,7 +86,7 @@ MWF.xDesktop.Authentication = new Class({
                 this.socket.close();
                 this.socket = null;
             }
-            Cookie.dispose("x-token");
+            //Cookie.dispose("x-token");
             if (layout.session && layout.session.user) layout.session.user.token = "";
             if( callback ){
                 callback()

o2web/source/x_component_Setting/SettingModuleUI.js

@@ -473,9 +473,9 @@ MWF.xApplication.Setting.UIModuleDocument.DeployEdit = new Class({
         this.pathInputNode.set("value", this.data.path);
 
         if (this.data.visible){
-            this.visibleInputNode.getFirst("option").set("checked", true);
+            this.visibleInputNode.getFirst("option").set("selected", true);
         }else{
-            this.visibleInputNode.getLast("option").set("checked", true);
+            this.visibleInputNode.getLast("option").set("selected", true);
         }
 
         // this.widgetNameInputNode.set("value", this.data.widgetName);
@@ -648,4 +648,4 @@ MWF.xApplication.Setting.UIModuleDocument.Deploy.Icon = new Class({
         }
     }
 
-});
\ No newline at end of file
+});