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

js/Controls/Basic.js

@@ -1965,7 +1965,7 @@ U.UF.UI.form.prototype = {
                 this.header = _headel; //设置中间的全局变量
             }
             //创建中间
-            _contentel = $$("div", { "style": { "cssText": "width: 100%; position: relative;" } }, _formel);
+            _contentel = $$("div", { "style": { "cssText": "width: 100%; position: relative;" } });
             //中间的内容
             _contentattr.usbody = "true";
             //窗体头部属性统一设置
@@ -2110,6 +2110,7 @@ U.UF.UI.form.prototype = {
             else {
                 this.parentel.appendChild(_formel);
             }
+            _formel.appendChild(_contentel);
         }
         else {
             _formel = _replaceel;

node/message.js

@@ -2259,10 +2259,10 @@ us.getcscl = function (response, calssid, pageid, userid) {
                 if (ret) {
                     ret[0][0].user = _user; //这里是项目当前所有用户
                     try {
-                        us.cscl[calssid].content = JSON.parse(ret[0][0].data); //把思维网格的内容转化成数组
+                        us.cscl[calssid].content = JSON.parse(ret[0][0].data) || {}; //把思维网格的内容转化成数组
                     }
                     catch (e) {
-                        us.cscl[calssid].content = ret[0][0].data;
+                        us.cscl[calssid].content = ret[0][0].data || {};
                     }
                     response.end(JSON.stringify(ret)); //返回文档内容
                 }