base认证异步

o2web/source/x_component_process_Work/Main.js

@@ -165,13 +165,13 @@ MWF.xApplication.process.Work.Main = new Class({
                         delete this.options.workcompletedid;
                         this.loadWork();
                     }else{
-                        this.close();
+                        //this.close();
                     }
                 }
             }
         }.bind(this);
 
-        if (this.options.form && this.options.form.id){
+        if ((this.options.form && this.options.form.id) || this.options.formid){
             o2.Actions.invokeAsync([
                 {"action": this.action, "name": "loadWorkV2"},
                 {"action": this.action, "name": "getWorkLog"},
@@ -187,7 +187,7 @@ MWF.xApplication.process.Work.Main = new Class({
                     check();
                 }.bind(this), "failure": function(){
                     //this.close();
-                }.bind(this)}, id, id, id, [this.options.form.id]);
+                }.bind(this)}, id, id, id, [this.options.formid || this.options.form.id]);
         }else{
             this.action.lookupFormWithWork(id, function(json){
                 var formId = json.data.id;
@@ -322,10 +322,10 @@ MWF.xApplication.process.Work.Main = new Class({
                     }
                 }
             }else{
-                this.close();
+                //this.close();
             }
         }.bind(this), function(){
-            this.close();
+            //this.close();
         }.bind(this));
     },
     loadWorkByDraft: function(work, data){

o2web/source/x_desktop/js/base.js

@@ -437,11 +437,13 @@ o2.addReady(function () {
     var _load = function () {
         var _loadApp = function (json) {
             //用户已经登录
-            layout.user = json.data;
-            layout.session = layout.session || {};
-            layout.session.user = json.data;
-            layout.session.token = json.data.token;
-            layout.desktop.session = layout.session;
+            if (json){
+                layout.user = json.data;
+                layout.session = layout.session || {};
+                layout.session.user = json.data;
+                layout.session.token = json.data.token;
+                layout.desktop.session = layout.session;
+            }
 
             _loadProgressBar(true);
             while (layout.readys && layout.readys.length) {
@@ -456,27 +458,36 @@ o2.addReady(function () {
             Cookie.write("x-token", options["x-token"]);
         }
 
+        _loadApp();
+
         //先判断用户是否登录
         o2.Actions.get("x_organization_assemble_authentication").getAuthentication(function (json) {
             //已经登录
-            _loadProgressBar();
-            _loadApp(json);
+            //_loadProgressBar();
+
+            layout.user = json.data;
+            layout.session = layout.session || {};
+            layout.session.user = json.data;
+            layout.session.token = json.data.token;
+            layout.desktop.session = layout.session;
+
+            //_loadApp(json);
         }.bind(this), function (json) {
-            _loadProgressBar();
+            //_loadProgressBar();
             //允许匿名访问
             if (layout.anonymous) {
-                _loadProgressBar(true);
-                _loadApp({
-                    data : {
-                        user: "anonymous",
-                        session: {
-                            user: {
-                                name: "anonymous",
-                                roleList: []
-                            }
-                        }
-                    }
-                });
+                //_loadProgressBar(true);
+                // _loadApp({
+                //     data : {
+                //         user: "anonymous",
+                //         session: {
+                //             user: {
+                //                 name: "anonymous",
+                //                 roleList: []
+                //             }
+                //         }
+                //     }
+                // });
             } else {
                 _loadProgressBar(true);
                 if (layout.yqwx) {

o2web/source/x_desktop/workmobile.html

@@ -5,6 +5,7 @@
         <link rel="stylesheet" type="text/css" href="css/style.css" charset="UTF-8" />
         <link rel="stylesheet" href="css/mBoxNotice.css" charset="UTF-8" />
         <link rel="stylesheet" href="css/mBoxTooltip.css" charset="UTF-8" />
+        <link rel="icon" href="data:;">
 
         <script src="../o2_core/o2.min.js"></script>
         <script src="js/base_work.min.js"></script>

o2web/source/x_desktop/workmobilewithaction.html

@@ -6,6 +6,7 @@
     <link rel="stylesheet" type="text/css" href="css/style.css" charset="UTF-8" />
     <link rel="stylesheet" href="css/mBoxNotice.css" charset="UTF-8" />
     <link rel="stylesheet" href="css/mBoxTooltip.css" charset="UTF-8" />
+    <link rel="icon" href="data:;">
 
     <script src="../o2_core/o2.min.js"></script>
     <script src="js/base_work.min.js"></script>