root 1 year ago
parent
commit
702abda9da
4 changed files with 167 additions and 165 deletions
  1. 6 4
      js/Controls/Basic.js
  2. 0 0
      js/Controls/Basic.min.js
  3. 159 159
      js/Desktop/DeskTop.js
  4. 2 2
      node/message.js

+ 6 - 4
js/Controls/Basic.js

@@ -2104,12 +2104,14 @@ U.UF.UI.form.prototype = {
 
             //如果窗体已经创建,那么直接替换
             if (_replaceel && _replaceel.parentNode != null) {
-                _replaceel.parentNode.replaceChild(_formel, _replaceel);
+                _replaceel.parentNode.removeChild(_replaceel);
+                //.replaceChild(_formel, _replaceel);
             }
             //元素添加到制定的元素中
-            else {
-                this.parentel.appendChild(_formel);
-            }
+            // else {
+            //     this.parentel.appendChild(_formel);
+            // }
+            this.parentel.appendChild(_formel);
         }
         else {
             _formel = _replaceel;

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


File diff suppressed because it is too large
+ 159 - 159
js/Desktop/DeskTop.js


+ 2 - 2
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)); //返回文档内容
                 }

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