Просмотр исходного кода

Merge branch 'fix/Common.anonymous_execption' into 'wrdp'

Merge of fix/Common.anonymous_execption 修复匿名访问的时候User数据可能出错的问题 to wrdp

See merge request o2oa/o2oa!2274
胡起 5 лет назад
Родитель
Сommit
01802f5277

+ 1 - 1
o2web/source/x_desktop/js/base.js

@@ -562,7 +562,7 @@ o2.addReady(function () {
         }, function(){
         }, function(){
             //允许匿名访问
             //允许匿名访问
             if (layout.anonymous) {
             if (layout.anonymous) {
-                var data = { user: "anonymous", session: { user: { name: "anonymous", roleList: [] } } };
+                var data = { name: "anonymous", roleList: [] };
                 layout.user = data;
                 layout.user = data;
                 layout.session = layout.session || {};
                 layout.session = layout.session || {};
                 layout.session.user = data;
                 layout.session.user = data;

+ 3 - 6
o2web/source/x_desktop/js/base_simple.js

@@ -158,12 +158,9 @@ o2.addReady(function () {
             if (layout.anonymous) {
             if (layout.anonymous) {
                 _loadProgressBar(true);
                 _loadProgressBar(true);
                 _loadApp({
                 _loadApp({
-                    user: "anonymous",
-                    session: {
-                        user: {
-                            name: "anonymous",
-                            roleList: []
-                        }
+                    data: {
+                        name: "anonymous",
+                        roleList: []
                     }
                     }
                 });
                 });
             } else {
             } else {

+ 3 - 6
o2web/source/x_desktop/js/xbase.js

@@ -399,12 +399,9 @@ o2.addReady(function () {
             if (layout.anonymous) {
             if (layout.anonymous) {
                 _loadProgressBar(true);
                 _loadProgressBar(true);
                 _loadApp({
                 _loadApp({
-                    user: "anonymous",
-                    session: {
-                        user: {
-                            name: "anonymous",
-                            roleList: []
-                        }
+                    data: {
+                        name: "anonymous",
+                        roleList: []
                     }
                     }
                 });
                 });
             } else {
             } else {