Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/CocoRoboDesktop into beta

js/Controls/Basic.js

@@ -1907,7 +1907,7 @@ U.UF.UI.form.prototype = {
                 _mousedown = _formattr.onmousedown;
                 _formattr.onresize = U.UF.C.apply(this, function () { //当窗体大小发生变化的处理
                     this.size(); //大小变化处理
-                    if (_resizefun) {
+                    if (_resizefun && typeof _resizefun == "function") {
                         _resizefun(); //大小变化回调
                     }
                 });
@@ -1965,7 +1965,7 @@ U.UF.UI.form.prototype = {
                 this.header = _headel; //设置中间的全局变量
             }
             //创建中间
-            _contentel = $$("div", { "style": { "cssText": "width: 100%; position: relative;" } });
+            _contentel = $$("div", { "style": { "cssText": "width: 100%; position: relative; overflow:hidden" } });
             //中间的内容
             _contentattr.usbody = "true";
             //窗体头部属性统一设置