Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -5885,8 +5885,8 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
                     "style": { "width": "100%", "height": "100%", "overflow": 'hidden' , "display":"none"},
                     "onresize": function () { }
                 }, {
-                    closecallback: function () { }
-                }, { "style": { "height": "36px","isnarrow": false, "isenlarge": false } }).form; //创建窗体
+                    closecallback: function () { },"isnarrow": false, "isenlarge": false
+                }, { "style": { "height": "36px" } }).form; //创建窗体
                 _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/study.png)" }, "name": "课程中心", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
                 break;
             }