Merge branch 'fix/Core_restful_execption' into 'develop'

Merge of fix/修复_restful方法的 layout 判断有时候可能报错的问题 to develop

See merge request o2oa/o2oa!528

o2web/source/o2_core/o2/o2.core.js

@@ -307,7 +307,7 @@
                 // if (!xToken) xToken = this.getHeader("x-token");
                 var xToken = this.getHeader("x-token");
                 if (xToken){
-                    if (layout){
+                    if (window.layout){
                         if (!layout.session) layout.session = {};
                         layout.session.token = xToken;
                     }