首頁 探索 說明
註冊 登入
xiongzhu
/
O2OA
1
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

更新web框架

hq_1980@hotmail.com 7 年之前
父節點
29ea3a066c
當前提交
1509a7c88c
共有 39 個文件被更改，包括 694 次插入 和 872 次删除
分割檢視 顯示文件統計
  1. 2 0
      o2web/source/o2_core/compatible.js
  2. 1 1
      o2web/source/o2_core/o2/widget/JavascriptEditor.js
  3. 3 3
      o2web/source/o2_core/o2/widget/ace.js
  4. 6 13
      o2web/source/x_desktop/app.html
  5. 6 9
      o2web/source/x_desktop/appMobile.html
  6. 6 7
      o2web/source/x_desktop/cmsdocMobile.html
  7. 9 47
      o2web/source/x_desktop/cmspreview.html
  8. 6 6
      o2web/source/x_desktop/ddsso.html
  9. 6 7
      o2web/source/x_desktop/forum.html
  10. 7 8
      o2web/source/x_desktop/forumdocMobile.html
  11. 3 3
      o2web/source/x_desktop/index.html
  12. 172 176
      o2web/source/x_desktop/js/app.js
  13. 15 17
      o2web/source/x_desktop/js/appmobile.js
  14. 11 15
      o2web/source/x_desktop/js/cmsDocMobile.js
  15. 2 10
      o2web/source/x_desktop/js/ddsso.js
  16. 3 7
      o2web/source/x_desktop/js/forum.js
  17. 2 6
      o2web/source/x_desktop/js/forumDocMobile.js
  18. 26 19
      o2web/source/x_desktop/js/portal.js
  19. 16 17
      o2web/source/x_desktop/js/portalmobile.js
  20. 27 31
      o2web/source/x_desktop/js/printWork.js
  21. 3 7
      o2web/source/x_desktop/js/weixinsso.js
  22. 3 7
      o2web/source/x_desktop/js/work.js
  23. 3 7
      o2web/source/x_desktop/js/workmobile.js
  24. 3 7
      o2web/source/x_desktop/js/workmobilewithaction.js
  25. 259 264
      o2web/source/x_desktop/js/zhengwuDingdingSso.js
  26. 16 32
      o2web/source/x_desktop/oauth.html
  27. 6 9
      o2web/source/x_desktop/portal.html
  28. 6 9
      o2web/source/x_desktop/portalmobile.html
  29. 7 14
      o2web/source/x_desktop/preview.html
  30. 6 9
      o2web/source/x_desktop/printWork.html
  31. 7 14
      o2web/source/x_desktop/processViewer.html
  32. 6 9
      o2web/source/x_desktop/qiyeweixinsso.html
  33. 4 32
      o2web/source/x_desktop/sso.html
  34. 6 9
      o2web/source/x_desktop/weixinsso.html
  35. 6 9
      o2web/source/x_desktop/work.html
  36. 6 9
      o2web/source/x_desktop/workmobile.html
  37. 6 10
      o2web/source/x_desktop/workmobilewithaction.html
  38. 6 6
      o2web/source/x_desktop/zhengwuDingdingSso.html
  39. 6 7
      o2web/source/x_desktop/zwddssofp.html

+ 2 - 0
o2web/source/o2_core/compatible.js
查看文件 

@@ -1,5 +1,6 @@
 
 o2.addReady(function(){
 
     COMMON = {
 
+        "DOM":{},
 
         "setContentPath": function(path){
 
             COMMON.contentPath = path;
 
         },
 
@@ -21,6 +22,7 @@ o2.addReady(function(){
 
         "Request": Request,
 
         "typeOf": o2.typeOf
 
     };
 
+    COMMON.DOM.addReady = o2.addReady;
 
     MWF = o2;
 
     MWF.getJSON = o2.JSON.get;
 
     MWF.getJSONP = o2.JSON.getJsonp;

+ 1 - 1
o2web/source/o2_core/o2/widget/JavascriptEditor.js
查看文件 

@@ -86,7 +86,7 @@ o2.widget.JavascriptEditor = new Class({
 
             //添加自动完成列表
 
             o2.require("o2.xScript.Macro", function(){
 
                 var json = null;
 
-                o2.getJSON("/x_desktop/res/mwf4/package/widget/$JavascriptEditor/environment.json", function(data){ json = data; }, false);
 
+                o2.getJSON("/o2_core/o2/widget/$JavascriptEditor/environment.json", function(data){ json = data; }, false);
 
                 this.Macro = new o2.Macro.FormContext(json);
 
                 exports.addCompleter({
 
                     identifierRegexps: [

+ 3 - 3
o2web/source/o2_core/o2/widget/ace.js
查看文件 

@@ -6,10 +6,10 @@ o2.widget.ace = {
 
         if (!window.ace){
 
             var jsLoaded = false;
 
             var cssLoaded = false;
 
-            COMMON.AjaxModule.loadDom("ace", function(){
 
-                COMMON.AjaxModule.loadDom("ace-tools", function(){
 
+            o2.load("ace", function(){
 
+                //COMMON.AjaxModule.loadDom("ace-tools", function(){
 
                     if (callback) callback();
 
-                }.bind(this))
 
+                //}.bind(this))
 
             }.bind(this));
 
         }else{
 
             if (callback) callback();

+ 6 - 13
o2web/source/x_desktop/app.html
查看文件 

@@ -2,23 +2,16 @@
 
 <html>
 
     <head>
 
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-        <link rel="stylesheet" type="text/css" href="res/css/style.css" charset="UTF-8" />
 
-        <link rel="stylesheet" href="res/css/mBoxNotice.css" charset="UTF-8" />
 
-        <link rel="stylesheet" href="res/css/mBoxTooltip.css" charset="UTF-8" />
 
-        <script src="res/common.js?v=1.1.7"></script>
 
-        <!--<script src="res/framework/mootools/mootools-core-1.4.5-full-nocompat.js"></script>-->
 
-        <!--<script src="res/framework/mootools/mootools-more-1.4.0.1-all_2.js"></script>-->
 
-        <script src="res/framework/mootools/mootools-1.6.0.min.js"></script>
 
-        <script src="res/framework/Decimal.js"></script>
 
-        <script src="res/js/app.js?v=1.1.7"></script>
 
+        <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" />
 
+        <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+        <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
+        <script src="js/app.js?v=2.0.0"></script>
 
 
         <title>O2</title>
 
 
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-        <!--<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />-->
 
-        <!--<meta content="yes" name="apple-mobile-web-app-capable" />-->
 
-        <!--<meta content="black" name="apple-mobile-web-app-status-bar-style" />-->
 
-        <!--<meta content="telephone=no" name="format-detection" />-->
 
     </head>
 
     <body style="overflow: auto; margin:0px; height: 100%;">
 
         <div id="appContent" style="overflow: hidden; height:100%; background-color:#EEE"></div>

+ 6 - 9
o2web/source/x_desktop/appMobile.html
查看文件 

@@ -2,15 +2,12 @@
 
 <html>
 
     <head>
 
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-        <link rel="stylesheet" type="text/css" href="res/css/style.css" charset="UTF-8" />
 
-        <link rel="stylesheet" href="res/css/mBoxNotice.css" charset="UTF-8" />
 
-        <link rel="stylesheet" href="res/css/mBoxTooltip.css" charset="UTF-8" />
 
-        <script src="res/common.js?v=1.1.7"></script>
 
-        <!--<script src="res/framework/mootools/mootools-core-1.4.5-full-nocompat.js"></script>-->
 
-        <!--<script src="res/framework/mootools/mootools-more-1.4.0.1-all_2.js"></script>-->
 
-        <script src="res/framework/mootools/mootools-1.6.0.min.js"></script>
 
-        <script src="res/framework/Decimal.js"></script>
 
-        <script src="res/js/appmobile.js?v=1.1.7"></script>
 
+        <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" />
 
+        <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+        <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
+        <script src="js/appmobile.js?v=2.0.0"></script>
 
 
         <title>OA办公系统</title>
 
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

+ 6 - 7
o2web/source/x_desktop/cmsdocMobile.html
查看文件 

@@ -2,14 +2,13 @@
 
 <html>
 
 <head>
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-    <link rel="stylesheet" type="text/css" href="res/css/style.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="res/css/mBoxNotice.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="res/css/mBoxTooltip.css" charset="UTF-8" />
 
+    <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" />
 
     <!--<script src="res/framework/htmleditor/ckeditor451/ckeditor.js"></script>-->
 
-    <script src="res/common.js?v=1.1.7"></script>
 
-    <script src="res/framework/mootools/mootools-1.6.0.min.js"></script>
 
-    <script src="res/framework/Decimal.js"></script>
 
-    <script src="res/js/cmsDocMobile.js?v=1.1.7"></script>
 
+    <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+    <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
+    <script src="js/cmsDocMobile.js?v=2.0.0"></script>
 
 
     <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
 
     <meta content="yes" name="apple-mobile-web-app-capable" />

+ 9 - 47
o2web/source/x_desktop/cmspreview.html
查看文件 

@@ -2,14 +2,11 @@
 
 <html>
 
 <head>
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-    <link rel="stylesheet" type="text/css" href="/x_desktop/res/css/style.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="/x_desktop/res/css/mBoxNotice.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="/x_desktop/res/css/mBoxTooltip.css" charset="UTF-8" />
 
-    <script src="/x_desktop/res/common.js?v=1.1.7"></script>
 
-    <!--<script src="/x_desktop/res/framework/mootools/mootools-core-1.4.5-full-nocompat.js"></script>-->
 
-    <!--<script src="/x_desktop/res/framework/mootools/mootools-more-1.4.0.1-all_2.js"></script>-->
 
-    <script src="res/framework/mootools/mootools-1.6.0.min.js"></script>
 
-    <script src="res/framework/Decimal.js"></script>
 
+    <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" />
 
+    <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+    <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
 
     <title>FORM PREVIEW</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
@@ -23,12 +20,8 @@
 
             if (mode=="mobile") layout.mobile = true;
 
         }
 
         //layout.desktop = layout;
 
-        COMMON.DOM.addReady(function(){
 
-            COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Notice.js", null, false);
 
-            COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Tooltip.js", null, false);
 
-
 
-            COMMON.setContentPath("/x_desktop");
 
-            COMMON.AjaxModule.load("mwf", function(){
 
+        o2.addReady(function(){
 
+            o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], function(){
 
                 MWF.defaultPath = "/x_desktop"+MWF.defaultPath;
 
                 MWF.loadLP("zh-cn");
 
                 MWF.require("MWF.xDesktop.Layout", function(){
 
@@ -36,7 +29,7 @@
 
 
                     (function(){
 
                         layout.load = function(){
 
-                    //        if (this.isAuthentication()){
 
+                            //        if (this.isAuthentication()){
 
                             var preview = window.frameElement.retrieve("preview");
 
                             layout.desktop = window.frameElement.ownerDocument.window.layout.desktop;
 
 
@@ -63,40 +56,9 @@
 
                                     layout.appForm.load();
 
                                 });
 
                             });
 
-                    //        }
 
+                            //        }
 
                         };
 
 
-//                        layout.authentication = new MWF.xDesktop.Authentication({
 
-//                            "onLogin": layout.load.bind(layout)
 
-//                        });
 
-
 
-//                        layout.isAuthentication = function(){
 
-//                            var returnValue = true;
 
-//                            this.authentication.isAuthenticated(function(json){
 
-//                                this.user = json.data;
 
-//                            }.bind(this), function(){
 
-//                                this.authentication.loadLogin(this.node);
 
-//                                returnValue = false;
 
-//                            }.bind(this));
 
-//                            return returnValue;
 
-//                        };
 
-
 
-//                        layout.getServiceAddress = function(callback){
 
-//                            var uri = "http://"+layout.config.center+"/x_program_center/jaxrs/distribute/assemble";
 
-//                            MWF.restful("get", uri, null, function(json){
 
-//                                this.serviceAddressList = json.data;
 
-//                                if (callback) callback();
 
-//                            }.bind(this));
 
-//                        };
 
-//
 
-//                        MWF.getJSON("res/config/config.json", function(config){
 
-//                            layout.config = config;
 
-//
 
-//                            layout.getServiceAddress(function(){
 
-//                                layout.load();
 
-//                            });
 
-//                        });
 
-
 
                         layout.load();
 
                     })();

+ 6 - 6
o2web/source/x_desktop/ddsso.html
查看文件 

@@ -2,13 +2,13 @@
 
 <html>
 
 <head>
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-    <link rel="stylesheet" type="text/css" href="res/css/style.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="res/css/mBoxNotice.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="res/css/mBoxTooltip.css" charset="UTF-8" />
 
-    <script src="res/common.js?v=1.1.7"></script>
 
-    <script src="res/framework/mootools/mootools-1.6.0.min.js"></script>
 
+    <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" />
 
+    <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+    <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
     <script type="text/javascript" src="res/framework/dingding/dingtalk.js"></script>
 
-    <script src="res/js/ddsso.js?v=1.1.7"></script>
 
+    <script src="js/ddsso.js?v=2.0.0"></script>
 
 
     <title></title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

+ 6 - 7
o2web/source/x_desktop/forum.html
查看文件 

@@ -2,13 +2,12 @@
 
 <html>
 
     <head>
 
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-        <link rel="stylesheet" type="text/css" href="res/css/style.css" charset="UTF-8" />
 
-        <link rel="stylesheet" href="res/css/mBoxNotice.css" charset="UTF-8" />
 
-        <link rel="stylesheet" href="res/css/mBoxTooltip.css" charset="UTF-8" />
 
-        <script src="res/common.js?v=1.1.7"></script>
 
-        <script src="res/framework/mootools/mootools-1.6.0.min.js"></script>
 
-        <script src="res/framework/Decimal.js"></script>
 
-        <script src="res/js/forum.js?v=1.1.7"></script>
 
+        <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" />
 
+        <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+        <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
+        <script src="js/forum.js?v=2.0.0"></script>
 
 
         <title>Forum</title>
 
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

+ 7 - 8
o2web/source/x_desktop/forumdocMobile.html
查看文件 

@@ -2,14 +2,13 @@
 
 <html>
 
 <head>
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-    <link rel="stylesheet" type="text/css" href="res/css/style.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="res/css/mBoxNotice.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="res/css/mBoxTooltip.css" charset="UTF-8" />
 
-    <script src="res/framework/htmleditor/ckeditor451/ckeditor.js"></script>
 
-    <script src="res/common.js?v=1.1.7"></script>
 
-    <script src="res/framework/mootools/mootools-1.6.0.min.js"></script>
 
-    <script src="res/framework/Decimal.js"></script>
 
-    <script src="res/js/forumDocMobile.js?v=1.1.7"></script>
 
+    <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" />
 
+    <script src="../o2_lib/htmleditor/ckeditor/ckeditor.js"></script>
 
+    <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+    <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
+    <script src="js/forumDocMobile.js?v=2.0.0"></script>
 
 
     <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
 
     <meta content="yes" name="apple-mobile-web-app-capable" />

+ 3 - 3
o2web/source/x_desktop/index.html
查看文件 

@@ -6,9 +6,9 @@
 
     <link rel="stylesheet" href="css/mBoxNotice.css" charset="UTF-8" />
 
     <link rel="stylesheet" href="css/mBoxTooltip.css" charset="UTF-8" />
 
 
-    <script src="../o2_core/o2.js?v=1.0.6"></script>
 
-    <script src="../o2_core/compatible.js"></script>
 
-    <script src="js/x.js?v=1.1.7"></script>
 
+    <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+    <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
+    <script src="js/x.js?v=2.0.0"></script>
 
 
     <title>O2</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

+ 172 - 176
o2web/source/x_desktop/js/app.js
查看文件 

@@ -1,194 +1,190 @@
 
 layout = window.layout || {};
 
-var locate = window.location;
 
-layout.protocol = locate.protocol;
 
-var href = locate.href;
 
-if (href.indexOf("debugger")!=-1) layout["debugger"] = true;
 
-layout.session = layout.session || {};
 
-
 
-var uri = new URI(href);
 
-var appNames = uri.getData("app");
 
-var optionsStr = uri.getData("option");
 
-var statusStr = uri.getData("status");
 
-var options = (optionsStr) ? JSON.decode(optionsStr) : null;
 
-var statusObj = (statusStr) ? JSON.decode(statusStr) : null;
 
-
 
 layout.desktop = layout;
 
-COMMON.DOM.addReady(function(){
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Notice.js", null, false);
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Tooltip.js", null, false);
 
-    COMMON.setContentPath("/x_desktop");
 
-    //COMMON.AjaxModule.load("ie_adapter", function(){
 
-        COMMON.AjaxModule.load("mwf", function(){
 
-            MWF.defaultPath = "/x_desktop"+MWF.defaultPath;
 
-            MWF.loadLP("zh-cn");
 
-
 
-            // MWF.require("MWF.widget.Mask", null, false);
 
-            // layout.mask = new MWF.widget.Mask({"style": "desktop"});
 
-            // layout.mask.load();
 
-
 
-            MWF.require("MWF.xDesktop.Layout", function(){
 
-                MWF.require("MWF.xDesktop.Authentication", null, false);
 
-                MWF.xDesktop.requireApp("Common", "", null, false);
 
-                (function(){
 
-                    layout.requireApp = function(appNames, callback, clazzName){
 
+o2.addReady(function(){
 
+    var locate = window.location;
 
+    layout.protocol = locate.protocol;
 
+    var href = locate.href;
 
+    if (href.indexOf("debugger")!=-1) layout["debugger"] = true;
 
+    layout.session = layout.session || {};
 
+
 
+    var uri = new URI(href);
 
+    var appNames = uri.getData("app");
 
+    var optionsStr = uri.getData("option");
 
+    var statusStr = uri.getData("status");
 
+    var options = (optionsStr) ? JSON.decode(optionsStr) : null;
 
+    var statusObj = (statusStr) ? JSON.decode(statusStr) : null;
 
+
 
+    o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], function(){
 
+        MWF.defaultPath = "/x_desktop"+MWF.defaultPath;
 
+        MWF.loadLP("zh-cn");
 
+
 
+        // MWF.require("MWF.widget.Mask", null, false);
 
+        // layout.mask = new MWF.widget.Mask({"style": "desktop"});
 
+        // layout.mask.load();
 
+
 
+        MWF.require("MWF.xDesktop.Layout", function(){
 
+            MWF.require("MWF.xDesktop.Authentication", null, false);
 
+            MWF.xDesktop.requireApp("Common", "", null, false);
 
+            (function(){
 
+                layout.requireApp = function(appNames, callback, clazzName){
 
+                    var appPath = appNames.split(".");
 
+                    var appName = appPath[appPath.length-1];
 
+                    var appObject = "MWF.xApplication."+appNames;
 
+                    var className = clazzName || "Main";
 
+                    var appClass = appObject+"."+className;
 
+                    var appLp = appObject+".lp."+MWF.language;
 
+                    var baseObject = MWF.xApplication;
 
+                    appPath.each(function(path, i){
 
+                        if (i<(appPath.length-1)){
 
+                            baseObject[path] = baseObject[path] || {};
 
+                        }else {
 
+                            baseObject[path] = baseObject[path] || {"options": Object.clone(MWF.xApplication.Common.options)};
 
+                        }
 
+                        baseObject = baseObject[path];
 
+                    }.bind(this));
 
+                    if (!baseObject.options) baseObject.options = Object.clone(MWF.xApplication.Common.options);
 
+
 
+                    //MWF.xDesktop.requireApp(appNames, "lp."+MWF.language, null, false);
 
+                    MWF.xDesktop.requireApp(appNames, "lp."+MWF.language, {
 
+                        "onRequestFailure": function(){
 
+                            MWF.xDesktop.requireApp(appNames, "lp.zh-cn", null, false);
 
+                        }.bind(this),
 
+                        "onSuccess": function(){}.bind(this)
 
+                    }, false);
 
+
 
+                    MWF.xDesktop.requireApp(appNames, clazzName, function(){
 
+                        if (callback) callback(baseObject);
 
+                    });
 
+                    //
 
+                    //MWF.require(appLp, null, false);
 
+                    //MWF.require(appClass, function(){
 
+                    //    if (callback) callback(baseObject);
 
+                    //});
 
+                };
 
+                layout.refreshApp = function(app){
 
+                    var status = app.recordStatus();
 
+
 
+                    var topWindow = window.opener;
 
+                    if (topWindow){
 
+                        topWindow.layout.desktop.openBrowserStatus = status;
 
+                        var appName = topWindow.layout.desktop.openBrowserApp || appNames;
 
+                        var m_status = status;
 
+                        var option = topWindow.layout.desktop.openBrowserOption || options;
 
+                        window.location.reload();
 
+                    }else{
 
+                        statusStr = JSON.encode(status);
 
+                        var port = uri.get("port");
 
+                        var url = uri.get("scheme")+"://"+uri.get("host")+((port) ? ":"+port+"/" : "")+uri.get("directory ")+"?app="+appNames+"&status="+statusStr;
 
+                        window.location = url;
 
+                    }
 
+                    //layout.openApplication(null, appName, option||{}, m_status);
 
+                };
 
+                layout.openApplication = function(e, appNames, options, statusObj){
 
+                    if (layout.app){
 
+                        layout.desktop.openBrowserApp = appNames;
 
+                        layout.desktop.openBrowserStatus = statusObj;
 
+                        layout.desktop.openBrowserOption = options;
 
+                        return window.open("app.html", "_blank");
 
+                    }else{
 
                         var appPath = appNames.split(".");
 
                         var appName = appPath[appPath.length-1];
 
-                        var appObject = "MWF.xApplication."+appNames;
 
-                        var className = clazzName || "Main";
 
-                        var appClass = appObject+"."+className;
 
-                        var appLp = appObject+".lp."+MWF.language;
 
-                        var baseObject = MWF.xApplication;
 
-                        appPath.each(function(path, i){
 
-                            if (i<(appPath.length-1)){
 
-                                baseObject[path] = baseObject[path] || {};
 
-                            }else {
 
-                                baseObject[path] = baseObject[path] || {"options": Object.clone(MWF.xApplication.Common.options)};
 
-                            }
 
-                            baseObject = baseObject[path];
 
+
 
+                        layout.requireApp(appNames, function(appNamespace){
 
+                            this.createNewApplication(e, appNamespace, appName, options, statusObj);
 
+                        }.bind(this));
 
+                    }
 
+                };
 
+                layout.createNewApplication = function(e, appNamespace, appName, options, statusObj){
 
+                    var app = new appNamespace["Main"](this, options);
 
+                    app.desktop = layout;
 
+                    app.inBrowser = true;
 
+                    app.status = statusObj;
 
+                    app.load(true);
 
+
 
+                    var appId = appName;
 
+                    if (options.appId){
 
+                        appId = options.appId;
 
+                    }else{
 
+                        if (appNamespace.options.multitask) appId = appId+"-"+(new MWF.widget.UUID());
 
+                    }
 
+                    app.appId = appId;
 
+                    layout.app = app;
 
+                };
 
+                layout.load = function(){
 
+                    this.isAuthentication(function(){
 
+                        //layout.desktop = layout;
 
+                        MWF.require("MWF.xDesktop.MessageMobile", function(){
 
+                            layout.message = new MWF.xDesktop.MessageMobile();
 
+                            layout.message.load();
 
                         }.bind(this));
 
-                        if (!baseObject.options) baseObject.options = Object.clone(MWF.xApplication.Common.options);
 
-
 
-                        //MWF.xDesktop.requireApp(appNames, "lp."+MWF.language, null, false);
 
-                        MWF.xDesktop.requireApp(appNames, "lp."+MWF.language, {
 
-                            "onRequestFailure": function(){
 
-                                MWF.xDesktop.requireApp(appNames, "lp.zh-cn", null, false);
 
-                            }.bind(this),
 
-                            "onSuccess": function(){}.bind(this)
 
-                        }, false);
 
-
 
-                        MWF.xDesktop.requireApp(appNames, clazzName, function(){
 
-                            if (callback) callback(baseObject);
 
-                        });
 
-                        //
 
-                        //MWF.require(appLp, null, false);
 
-                        //MWF.require(appClass, function(){
 
-                        //    if (callback) callback(baseObject);
 
-                        //});
 
-                    };
 
-                    layout.refreshApp = function(app){
 
-                        var status = app.recordStatus();
 
 
+                        layout.apps = [];
 
+                        this.node = $("layout");
 
                         var topWindow = window.opener;
 
                         if (topWindow){
 
-                            topWindow.layout.desktop.openBrowserStatus = status;
 
                             var appName = topWindow.layout.desktop.openBrowserApp || appNames;
 
-                            var m_status = status;
 
+                            var m_status = topWindow.layout.desktop.openBrowserStatus || statusObj;
 
                             var option = topWindow.layout.desktop.openBrowserOption || options;
 
-                            window.location.reload();
 
-                        }else{
 
-                            statusStr = JSON.encode(status);
 
-                            var port = uri.get("port");
 
-                            var url = uri.get("scheme")+"://"+uri.get("host")+((port) ? ":"+port+"/" : "")+uri.get("directory ")+"?app="+appNames+"&status="+statusStr;
 
-                            window.location = url;
 
-                        }
 
-                        //layout.openApplication(null, appName, option||{}, m_status);
 
-                    };
 
-                    layout.openApplication = function(e, appNames, options, statusObj){
 
-                        if (layout.app){
 
-                            layout.desktop.openBrowserApp = appNames;
 
-                            layout.desktop.openBrowserStatus = statusObj;
 
-                            layout.desktop.openBrowserOption = options;
 
-                            return window.open("app.html", "_blank");
 
-                        }else{
 
-                            var appPath = appNames.split(".");
 
-                            var appName = appPath[appPath.length-1];
 
-
 
-                            layout.requireApp(appNames, function(appNamespace){
 
-                                this.createNewApplication(e, appNamespace, appName, options, statusObj);
 
-                            }.bind(this));
 
-                        }
 
-                    };
 
-                    layout.createNewApplication = function(e, appNamespace, appName, options, statusObj){
 
-                        var app = new appNamespace["Main"](this, options);
 
-                        app.desktop = layout;
 
-                        app.inBrowser = true;
 
-                        app.status = statusObj;
 
-                        app.load(true);
 
-
 
-                        var appId = appName;
 
-                        if (options.appId){
 
-                            appId = options.appId;
 
+                            layout.openApplication(null, appName, option||{}, m_status);
 
+                            //topWindow.layout.desktop.openBrowserApp = null;
 
+                            //topWindow.layout.desktop.openBrowserStatus = null;
 
+                            //topWindow.layout.desktop.openBrowserOption = null;
 
                         }else{
 
-                            if (appNamespace.options.multitask) appId = appId+"-"+(new MWF.widget.UUID());
 
+                            var appName = appNames;
 
+                            var m_status = statusObj;
 
+                            var option = options;
 
+                            layout.openApplication(null, appName, option||{}, m_status);
 
                         }
 
-                        app.appId = appId;
 
-                        layout.app = app;
 
-                    };
 
-                    layout.load = function(){
 
-                        this.isAuthentication(function(){
 
-                            //layout.desktop = layout;
 
-                            MWF.require("MWF.xDesktop.MessageMobile", function(){
 
-                                layout.message = new MWF.xDesktop.MessageMobile();
 
-                                layout.message.load();
 
-                            }.bind(this));
 
-
 
-                            layout.apps = [];
 
-                            this.node = $("layout");
 
-                            var topWindow = window.opener;
 
-                            if (topWindow){
 
-                                var appName = topWindow.layout.desktop.openBrowserApp || appNames;
 
-                                var m_status = topWindow.layout.desktop.openBrowserStatus || statusObj;
 
-                                var option = topWindow.layout.desktop.openBrowserOption || options;
 
-                                layout.openApplication(null, appName, option||{}, m_status);
 
-                                //topWindow.layout.desktop.openBrowserApp = null;
 
-                                //topWindow.layout.desktop.openBrowserStatus = null;
 
-                                //topWindow.layout.desktop.openBrowserOption = null;
 
-                            }else{
 
-                                var appName = appNames;
 
-                                var m_status = statusObj;
 
-                                var option = options;
 
-                                layout.openApplication(null, appName, option||{}, m_status);
 
-                            }
 
-                            //layout.mask.hide();
 
-                        }.bind(this));
 
-                    };
 
-
 
-                    layout.isAuthentication = function(callback){
 
-                        this.authentication = new MWF.xDesktop.Authentication({
 
-                            "onLogin": layout.load.bind(layout)
 
-                        });
 
-
 
-                        var returnValue = true;
 
-                        this.authentication.isAuthenticated(function(json){
 
-                            this.user = json.data;
 
-                            this.session = {};
 
-                            this.session.user = json.data;
 
-                            if (callback) callback();
 
-                        }.bind(this), function(){
 
-                            // if (layout.config.loginPage && layout.config.loginPage.enable && layout.config.loginPage.portal){
 
-                            //     MWF.xDesktop.loadPortal(layout.config.loginPage.portal);
 
-                            //     //window.location = "portal.html?portal="+layout.config.loginPage.portal;
 
-                            // }else{
 
-                            //     //this.getPublicStyleLoad(node);
 
-                            //     this.authentication.loadLogin(document.body);
 
-                            // }
 
-
 
-                            this.authentication.loadLogin(document.body);
 
-                            //if (layout.mask) layout.mask.hide();
 
-                            returnValue = false;
 
-                        }.bind(this));
 
-                        return returnValue;
 
-                    };
 
+                        //layout.mask.hide();
 
+                    }.bind(this));
 
+                };
 
 
-                    MWF.getJSON("res/config/config.json", function(config){
 
-                        layout.config = config;
 
-                        if (layout.config.app_protocol=="auto"){
 
-                            layout.config.app_protocol = window.location.protocol;
 
-                        }
 
-                        MWF.xDesktop.getServiceAddress(layout.config, function(service, center){
 
-                            layout.serviceAddressList = service;
 
-                            layout.centerServer = center;
 
-                            layout.load();
 
-                        }.bind(this));
 
-                        //layout.getServiceAddress(function(){
 
-                        //    layout.load();
 
-                        //});
 
+                layout.isAuthentication = function(callback){
 
+                    this.authentication = new MWF.xDesktop.Authentication({
 
+                        "onLogin": layout.load.bind(layout)
 
                     });
 
 
+                    var returnValue = true;
 
+                    this.authentication.isAuthenticated(function(json){
 
+                        this.user = json.data;
 
+                        this.session = {};
 
+                        this.session.user = json.data;
 
+                        if (callback) callback();
 
+                    }.bind(this), function(){
 
+                        // if (layout.config.loginPage && layout.config.loginPage.enable && layout.config.loginPage.portal){
 
+                        //     MWF.xDesktop.loadPortal(layout.config.loginPage.portal);
 
+                        //     //window.location = "portal.html?portal="+layout.config.loginPage.portal;
 
+                        // }else{
 
+                        //     //this.getPublicStyleLoad(node);
 
+                        //     this.authentication.loadLogin(document.body);
 
+                        // }
 
+
 
+                        this.authentication.loadLogin(document.body);
 
+                        //if (layout.mask) layout.mask.hide();
 
+                        returnValue = false;
 
+                    }.bind(this));
 
+                    return returnValue;
 
+                };
 
+
 
+                MWF.getJSON("res/config/config.json", function(config){
 
+                    layout.config = config;
 
+                    if (layout.config.app_protocol=="auto"){
 
+                        layout.config.app_protocol = window.location.protocol;
 
+                    }
 
+                    MWF.xDesktop.getServiceAddress(layout.config, function(service, center){
 
+                        layout.serviceAddressList = service;
 
+                        layout.centerServer = center;
 
+                        layout.load();
 
+                    }.bind(this));
 
+                    //layout.getServiceAddress(function(){
 
+                    //    layout.load();
 
+                    //});
 
+                });
 
+
 
+
 
+            })();
 
 
-                })();
 
-
 
-            });
 
         });
 
-    //}.bind(this));
 
+    });
 
+
 
 });

+ 15 - 17
o2web/source/x_desktop/js/appmobile.js
查看文件 

@@ -1,25 +1,23 @@
 
 layout = window.layout || {};
 
-var locate = window.location;
 
-layout.protocol = locate.protocol;
 
-var href = locate.href;
 
-if (href.indexOf("debugger")!=-1) layout.debugger = true;
 
-layout.mobile = true;
 
 layout.desktop = layout;
 
-layout.desktop.session = {};
 
-var uri = new URI(href);
 
-var appNames = uri.getData("app");
 
-var optionsStr = (uri.getData("option"));
 
-var statusStr = (uri.getData("status"));
 
 
-var options = (optionsStr) ? JSON.decode(optionsStr) : null;
 
-var statusObj = (statusStr) ? JSON.decode(statusStr) : null;
 
+o2.addReady(function(){
 
+    var locate = window.location;
 
+    layout.protocol = locate.protocol;
 
+    var href = locate.href;
 
+    if (href.indexOf("debugger")!=-1) layout.debugger = true;
 
+    layout.mobile = true;
 
 
-COMMON.DOM.addReady(function(){
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Notice.js", null, false);
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Tooltip.js", null, false);
 
+    layout.desktop.session = {};
 
+    var uri = new URI(href);
 
+    var appNames = uri.getData("app");
 
+    var optionsStr = (uri.getData("option"));
 
+    var statusStr = (uri.getData("status"));
 
 
-    COMMON.setContentPath("/x_desktop");
 
-    COMMON.AjaxModule.load("mwf", function(){
 
+    var options = (optionsStr) ? JSON.decode(optionsStr) : null;
 
+    var statusObj = (statusStr) ? JSON.decode(statusStr) : null;
 
+
 
+    o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], function(){
 
         MWF.defaultPath = "/x_desktop"+MWF.defaultPath;
 
         MWF.loadLP("zh-cn");

+ 11 - 15
o2web/source/x_desktop/js/cmsDocMobile.js
查看文件 

@@ -6,12 +6,8 @@ layout.desktop = layout;
 
 layout.session = layout.session || {};
 
 var href = locate.href;
 
 if (href.indexOf("debugger")!=-1) layout.debugger = true;
 
-COMMON.DOM.addReady(function(){
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Notice.js", null, false);
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Tooltip.js", null, false);
 
-
 
-    COMMON.setContentPath("/x_desktop");
 
-    COMMON.AjaxModule.load("mwf", function(){
 
+o2.addReady(function(){
 
+    o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], function(){
 
         MWF.defaultPath = "/x_desktop"+MWF.defaultPath;
 
         MWF.loadLP("zh-cn");
 
 
@@ -194,15 +190,15 @@ COMMON.DOM.addReady(function(){
 
                     }
 
 
                     this.control = data.control ||  {
 
-                            "allowRead": true,
 
-                            "allowPublishDocument": false,
 
-                            "allowArchiveDocument" : false,
 
-                            "allowRedraftDocument" : false,
 
-                            "allowSave": false,
 
-                            "allowPopularDocument": false,
 
-                            "allowEditDocument":  false,
 
-                            "allowDeleteDocument":  false
 
-                        };
 
+                        "allowRead": true,
 
+                        "allowPublishDocument": false,
 
+                        "allowArchiveDocument" : false,
 
+                        "allowRedraftDocument" : false,
 
+                        "allowSave": false,
 
+                        "allowPopularDocument": false,
 
+                        "allowEditDocument":  false,
 
+                        "allowDeleteDocument":  false
 
+                    };
 
                 };
 
                 layout.openDocument = function(){
 
                     if (this.form){

+ 2 - 10
o2web/source/x_desktop/js/ddsso.js
查看文件 

@@ -5,19 +5,11 @@ var href = locate.href;
 
 if (href.indexOf("debugger")!==-1) layout.debugger = true;
 
 layout.desktop = layout;
 
 layout.session = layout.session || {};
 
-COMMON.DOM.addReady(function(){
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Notice.js", null, false);
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Tooltip.js", null, false);
 
-
 
-    COMMON.setContentPath("/x_desktop");
 
-    COMMON.AjaxModule.load("mwf", function(){
 
+o2.addReady(function(){
 
+    o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], function(){
 
         MWF.defaultPath = "/x_desktop"+MWF.defaultPath;
 
         MWF.loadLP("zh-cn");
 
 
-        // MWF.require("MWF.widget.Mask", null, false);
 
-        // layout.mask = new MWF.widget.Mask({"style": "desktop"});
 
-        // layout.mask.load();
 
-
 
         MWF.require("MWF.xDesktop.Layout", function(){
 
             MWF.require("MWF.xDesktop.Authentication", null, false);

+ 3 - 7
o2web/source/x_desktop/js/forum.js
查看文件 

@@ -5,12 +5,8 @@ layout.protocol = locate.protocol;
 
 var href = locate.href;
 
 layout.session = layout.session || {};
 
 if (href.indexOf("debugger")!=-1) layout.debugger = true;
 
-COMMON.DOM.addReady(function(){
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Notice.js", null, false);
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Tooltip.js", null, false);
 
-
 
-    COMMON.setContentPath("/x_desktop");
 
-    COMMON.AjaxModule.load("mwf", function(){
 
+o2.addReady(function(){
 
+    o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], function(){
 
         MWF.defaultPath = "/x_desktop"+MWF.defaultPath;
 
         MWF.loadLP("zh-cn");
 
 
@@ -140,7 +136,7 @@ COMMON.DOM.addReady(function(){
 
                             var id = urlParams.id;
 
                             //alert(sessionStorage.getItem( appName+id+"options").id)
 
                             //alert(sessionStorage.getItem( appName+id+"status").id)
 
-                           var opt = sessionStorage[ appName+ (id ? id : "") +"options" ];
 
+                            var opt = sessionStorage[ appName+ (id ? id : "") +"options" ];
 
                             if(opt){
 
                                 option = JSON.parse(opt)
 
                             }else if(id){

+ 2 - 6
o2web/source/x_desktop/js/forumDocMobile.js
查看文件 

@@ -6,12 +6,8 @@ layout.protocol = locate.protocol;
 
 var href = locate.href;
 
 layout.session = layout.session || {};
 
 if (href.indexOf("debugger")!=-1) layout.debugger = true;
 
-COMMON.DOM.addReady(function(){
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Notice.js", null, false);
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Tooltip.js", null, false);
 
-
 
-    COMMON.setContentPath("/x_desktop");
 
-    COMMON.AjaxModule.load("mwf", function(){
 
+o2.addReady(function(){
 
+    o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], function(){
 
         MWF.defaultPath = "/x_desktop"+MWF.defaultPath;
 
         MWF.loadLP("zh-cn");

+ 26 - 19
o2web/source/x_desktop/js/portal.js
查看文件 

@@ -1,26 +1,28 @@
 
 layout = window.layout || {};
 
-var locate = window.location;
 
-layout.protocol = locate.protocol;
 
-var href = locate.href;
 
-if (href.indexOf("debugger")!=-1) layout["debugger"] = true;
 
-layout.session = layout.session || {};
 
-//layout.session.user = {};
 
 layout.desktop = layout;
 
 
-var uri = new URI(href);
 
-var appNames = "portal.Portal";
 
-var id = uri.getData("id");
 
-var page = uri.getData("page");
 
-var statusObj = {"portalId": id, "pageId": page};
 
-var options = null;
 
+o2.addReady(function(){
 
 
-layout.desktop = layout;
 
-COMMON.DOM.addReady(function(){
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Notice.js", null, false);
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Tooltip.js", null, false);
 
-    COMMON.setContentPath("/x_desktop");
 
-    //COMMON.AjaxModule.load("ie_adapter", function(){
 
-        COMMON.AjaxModule.load("mwf", function(){
 
+    var locate = window.location;
 
+    layout.protocol = locate.protocol;
 
+    var href = locate.href;
 
+    if (href.indexOf("debugger")!=-1) layout["debugger"] = true;
 
+    layout.session = layout.session || {};
 
+//layout.session.user = {};
 
+    layout.desktop = layout;
 
+
 
+    var uri = new URI(href);
 
+    var appNames = "portal.Portal";
 
+    var id = uri.getData("id");
 
+    var page = uri.getData("page");
 
+    var statusObj = {"portalId": id, "pageId": page};
 
+    var options = null;
 
+
 
+    // COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Notice.js", null, false);
 
+    // COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Tooltip.js", null, false);
 
+
 
+    o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], function(){
 
+        //COMMON.AjaxModule.load("mwf", function(){
 
             MWF.defaultPath = "/x_desktop"+MWF.defaultPath;
 
             MWF.loadLP("zh-cn");
 
 
@@ -189,5 +191,10 @@ COMMON.DOM.addReady(function(){
 
 
             });
 
         });
 
+    //});
 
+
 
+    //COMMON.setContentPath("/x_desktop");
 
+    //COMMON.AjaxModule.load("ie_adapter", function(){
 
+
 
     //}.bind(this));
 
 });

+ 16 - 17
o2web/source/x_desktop/js/portalmobile.js
查看文件 

@@ -1,24 +1,23 @@
 
 layout = window.layout || {};
 
-var locate = window.location;
 
-layout.protocol = locate.protocol;
 
-var href = locate.href;
 
-if (href.indexOf("debugger")!=-1) layout.debugger = true;
 
-layout.mobile = true;
 
 layout.desktop = layout;
 
-layout.session = layout.session || {};
 
-var uri = new URI(href);
 
-var appNames = "portal.Portal";
 
-var id = uri.getData("id");
 
-var page = uri.getData("page");
 
-var statusObj = {"portalId": id, "pageId": page};
 
-var options = null;
 
 
-COMMON.DOM.addReady(function(){
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Notice.js", null, false);
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Tooltip.js", null, false);
 
+o2.addReady(function(){
 
 
-    COMMON.setContentPath("/x_desktop");
 
-    COMMON.AjaxModule.load("mwf", function(){
 
+    var locate = window.location;
 
+    layout.protocol = locate.protocol;
 
+    var href = locate.href;
 
+    if (href.indexOf("debugger")!=-1) layout.debugger = true;
 
+    layout.mobile = true;
 
+
 
+    layout.session = layout.session || {};
 
+    var uri = new URI(href);
 
+    var appNames = "portal.Portal";
 
+    var id = uri.getData("id");
 
+    var page = uri.getData("page");
 
+    var statusObj = {"portalId": id, "pageId": page};
 
+    var options = null;
 
+
 
+    o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], function(){
 
         MWF.defaultPath = "/x_desktop"+MWF.defaultPath;
 
         MWF.loadLP("zh-cn");

+ 27 - 31
o2web/source/x_desktop/js/printWork.js
查看文件 

@@ -5,12 +5,8 @@ var href = locate.href;
 
 if (href.indexOf("debugger")!=-1) layout.debugger = true;
 
 layout.desktop = layout;
 
 layout.session = layout.session || {};
 
-COMMON.DOM.addReady(function(){
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Notice.js", null, false);
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Tooltip.js", null, false);
 
-
 
-    COMMON.setContentPath("/x_desktop");
 
-    COMMON.AjaxModule.load("mwf", function(){
 
+o2.addReady(function(){
 
+    o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], function(){
 
         MWF.defaultPath = "/x_desktop"+MWF.defaultPath;
 
         MWF.loadLP("zh-cn");
 
 
@@ -168,7 +164,7 @@ COMMON.DOM.addReady(function(){
 
                     return null;
 
                 };
 
                 layout.parseData = function(data){
 
-                 //   this.setTitle(this.options.title+"-"+data.work.title);
 
+                    //   this.setTitle(this.options.title+"-"+data.work.title);
 
 
                     this.activity = data.activity;
 
                     this.data = data.data;
 
@@ -184,30 +180,30 @@ COMMON.DOM.addReady(function(){
 
                     this.form = JSON.decode(MWF.decodeJsonString(data.form.data));
 
                 };
 
                 layout.fireEvent = function(){},
 
-                layout.openWork = function(){
 
-                    MWF.xDesktop.requireApp("process.Xform", "Form", function(){
 
-                        this.options.readonly = true;
 
-                        this.appForm = new MWF.APPForm(this.node, this.form, {"readonly": this.options.readonly});
 
-                        this.appForm.businessData = {
 
-                            "data": this.data,
 
-                            "taskList": this.taskList,
 
-                            "work": this.work,
 
-                            "workCompleted": this.workCompleted,
 
-                            "control": this.control,
 
-                            "activity": this.activity,
 
-                            "task": this.currentTask,
 
-                            "workLogList": this.workLogList,
 
-                            "attachmentList": this.attachmentList,
 
-                            "inheritedAttachmentList": this.inheritedAttachmentList,
 
-                            "status": {
 
-                                "readonly": (this.options.readonly) ? true : false
 
-                            }
 
-                        };
 
-                        this.appForm.workAction = this.action;
 
-                        this.appForm.app = this;
 
-                        this.appForm.load();
 
-                    }.bind(this))
 
-                };
 
+                    layout.openWork = function(){
 
+                        MWF.xDesktop.requireApp("process.Xform", "Form", function(){
 
+                            this.options.readonly = true;
 
+                            this.appForm = new MWF.APPForm(this.node, this.form, {"readonly": this.options.readonly});
 
+                            this.appForm.businessData = {
 
+                                "data": this.data,
 
+                                "taskList": this.taskList,
 
+                                "work": this.work,
 
+                                "workCompleted": this.workCompleted,
 
+                                "control": this.control,
 
+                                "activity": this.activity,
 
+                                "task": this.currentTask,
 
+                                "workLogList": this.workLogList,
 
+                                "attachmentList": this.attachmentList,
 
+                                "inheritedAttachmentList": this.inheritedAttachmentList,
 
+                                "status": {
 
+                                    "readonly": (this.options.readonly) ? true : false
 
+                                }
 
+                            };
 
+                            this.appForm.workAction = this.action;
 
+                            this.appForm.app = this;
 
+                            this.appForm.load();
 
+                        }.bind(this))
 
+                    };
 
 
                 layout.isAuthentication = function(){
 
                     layout.authentication = new MWF.xDesktop.Authentication({

+ 3 - 7
o2web/source/x_desktop/js/weixinsso.js
查看文件 

@@ -5,12 +5,8 @@ var href = locate.href;
 
 if (href.indexOf("debugger")!=-1) layout.debugger = true;
 
 layout.desktop = layout;
 
 layout.session = layout.session || {};
 
-COMMON.DOM.addReady(function(){
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Notice.js", null, false);
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Tooltip.js", null, false);
 
-
 
-    COMMON.setContentPath("/x_desktop");
 
-    COMMON.AjaxModule.load("mwf", function(){
 
+o2.addReady(function(){
 
+    o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], function(){
 
         MWF.defaultPath = "/x_desktop"+MWF.defaultPath;
 
         MWF.loadLP("zh-cn");
 
 
@@ -23,7 +19,7 @@ COMMON.DOM.addReady(function(){
 
 
             (function(){
 
                 layout.load = function(){
 
-                    
+
 
                     var uri = href.toURI();
 
                     MWF.require("MWF.xDesktop.Actions.RestActions", function(){
 
                         var action = new MWF.xDesktop.Actions.RestActions("", "x_organization_assemble_authentication", "");

+ 3 - 7
o2web/source/x_desktop/js/work.js
查看文件 

@@ -8,12 +8,8 @@ layout.desktop = layout;
 
 
 var parentWindow = window.opener;
 
 
-COMMON.DOM.addReady(function(){
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Notice.js", null, false);
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Tooltip.js", null, false);
 
-
 
-    COMMON.setContentPath("/x_desktop");
 
-    COMMON.AjaxModule.load("mwf", function(){
 
+o2.addReady(function(){
 
+    o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], function(){
 
         MWF.defaultPath = "/x_desktop"+MWF.defaultPath;
 
         MWF.loadLP("zh-cn");
 
 
@@ -209,7 +205,7 @@ COMMON.DOM.addReady(function(){
 
                     return null;
 
                 };
 
                 layout.parseData = function(data){
 
-                 //   this.setTitle(this.options.title+"-"+data.work.title);
 
+                    //   this.setTitle(this.options.title+"-"+data.work.title);
 
 
                     this.activity = data.activity;
 
                     this.data = data.data;

+ 3 - 7
o2web/source/x_desktop/js/workmobile.js
查看文件 

@@ -7,12 +7,8 @@ if (href.indexOf("debugger")!=-1) layout.debugger = true;
 
 layout.mobile = true;
 
 layout.desktop = layout;
 
 layout.desktop.session = {};
 
-COMMON.DOM.addReady(function(){
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Notice.js", null, false);
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Tooltip.js", null, false);
 
-
 
-    COMMON.setContentPath("/x_desktop");
 
-    COMMON.AjaxModule.load("mwf", function(){
 
+o2.addReady(function(){
 
+    o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], function(){
 
         MWF.defaultPath = "/x_desktop"+MWF.defaultPath;
 
         MWF.loadLP("zh-cn");
 
 
@@ -178,7 +174,7 @@ COMMON.DOM.addReady(function(){
 
                     return null;
 
                 };
 
                 layout.parseData = function(data){
 
-                 //   this.setTitle(this.options.title+"-"+data.work.title);
 
+                    //   this.setTitle(this.options.title+"-"+data.work.title);
 
 
                     this.activity = data.activity;
 
                     this.data = data.data;

+ 3 - 7
o2web/source/x_desktop/js/workmobilewithaction.js
查看文件 

@@ -7,12 +7,8 @@ layout.mobile = true;
 
 layout.desktop = layout;
 
 layout.desktop.session = {};
 
 layout.session = layout.session || {};
 
-COMMON.DOM.addReady(function(){
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Notice.js", null, false);
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Tooltip.js", null, false);
 
-
 
-    COMMON.setContentPath("/x_desktop");
 
-    COMMON.AjaxModule.load("mwf", function(){
 
+o2.addReady(function(){
 
+    o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], function(){
 
         MWF.defaultPath = "/x_desktop"+MWF.defaultPath;
 
         MWF.loadLP("zh-cn");
 
 
@@ -289,7 +285,7 @@ COMMON.DOM.addReady(function(){
 
                     return null;
 
                 };
 
                 layout.parseData = function(data){
 
-                 //   this.setTitle(this.options.title+"-"+data.work.title);
 
+                    //   this.setTitle(this.options.title+"-"+data.work.title);
 
 
                     this.activity = data.activity;
 
                     this.data = data.data;

+ 259 - 264
o2web/source/x_desktop/js/zhengwuDingdingSso.js
查看文件 

@@ -2,284 +2,279 @@ layout = window.layout || {};
 
 var locate = window.location;
 
 layout.protocol = locate.protocol;
 
 layout.mobile = true;
 
-var href = locate.href;
 
-if (href.indexOf("debugger")!==-1) layout.debugger = true;
 
-var uri = new URI(href);
 
-var redirectTo = uri.getData("redirectTo");
 
-var optionsStr = (uri.getData("option"));
 
-var statusStr = (uri.getData("status"));
 
-
 
-var options = (optionsStr) ? JSON.decode(optionsStr) : null;
 
-var statusObj = (statusStr) ? JSON.decode(statusStr) : null;
 
 
 layout.desktop = layout;
 
 layout.session = layout.session || {};
 
 
-COMMON.DOM.addReady(function(){
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Notice.js", null, false);
 
-    COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Tooltip.js", null, false);
 
-
 
-    //dd.ready(function() {
 
-        COMMON.setContentPath("/x_desktop");
 
-        COMMON.AjaxModule.load("mwf", function () {
 
-            MWF.defaultPath = "/x_desktop" + MWF.defaultPath;
 
-            MWF.loadLP("zh-cn");
 
-
 
-            // MWF.require("MWF.widget.Mask", null, false);
 
-            // layout.mask = new MWF.widget.Mask({"style": "desktop"});
 
-            // layout.mask.load();
 
-
 
-            MWF.require("MWF.xDesktop.Layout", function () {
 
-                MWF.xDesktop.requireApp("Common", "", null, false);
 
-                MWF.require("MWF.xDesktop.Authentication", null, false);
 
-
 
-                (function () {
 
-                    layout.requireApp = function(appNames, callback, clazzName){
 
-                        var appPath = appNames.split(".");
 
-                        var appName = appPath[appPath.length-1];
 
-                        var appObject = "MWF.xApplication."+appNames;
 
-                        var className = clazzName || "Main";
 
-                        var appClass = appObject+"."+className;
 
-                        var appLp = appObject+".lp."+MWF.language;
 
-                        var baseObject = MWF.xApplication;
 
-                        appPath.each(function(path, i){
 
-                            if (i<(appPath.length-1)){
 
-                                baseObject[path] = baseObject[path] || {};
 
-                            }else {
 
-                                baseObject[path] = baseObject[path] || {"options": Object.clone(MWF.xApplication.Common.options)};
 
-                            }
 
-                            baseObject = baseObject[path];
 
-                        }.bind(this));
 
-                        if (!baseObject.options) baseObject.options = Object.clone(MWF.xApplication.Common.options);
 
-
 
-                        //MWF.xDesktop.requireApp(appNames, "lp."+MWF.language, null, false);
 
-                        MWF.xDesktop.requireApp(appNames, "lp."+MWF.language, {
 
-                            "onRequestFailure": function(){
 
-                                MWF.xDesktop.requireApp(appNames, "lp.zh-cn", null, false);
 
-                            }.bind(this),
 
-                            "onSuccess": function(){}.bind(this)
 
-                        }, false);
 
-
 
-                        MWF.xDesktop.requireApp(appNames, clazzName, function(){
 
-                            if (callback) callback(baseObject);
 
-                        });
 
-                    };
 
-                    layout.openApplication = function(e, appNames, options, statusObj){
 
-                        if (layout.app){
 
-                            layout.desktop.openBrowserApp = appNames;
 
-                            layout.desktop.openBrowserStatus = statusObj;
 
-                            layout.desktop.openBrowserOption = options;
 
-
 
-                            var optionsStr = JSON.encode(options);
 
-                            var statusStr = JSON.encode(statusObj);
 
-                            //window.open("appMobile.html", "_blank");
 
-                            //layout.openApplication(null, appNames, option||{}, m_status);
 
-                            var title = options.docTitle || "";
 
-                            if (appNames==="process.Work"){
 
-                                var uri = new URI(window.location.href);
 
-                                var redirectlink = uri.getData("redirectlink");
 
-                                if( !redirectlink ){
 
-                                    redirectlink = encodeURIComponent(locate.pathname + locate.search);
 
-                                }else{
 
-                                    redirectlink = encodeURIComponent(redirectlink);
 
-                                }
 
-                                if( options.workId ){
 
-                                    window.location = "workmobilewithaction.html?workid="+options.workId+"&redirectlink="+redirectlink;
 
-                                }else if( options.workCompletedId ){
 
-                                    window.location = "workmobilewithaction.html?workcompletedid="+options.workCompletedId+"&redirectlink="+redirectlink;
 
-                                }
 
+o2.addReady(function(){
 
+    var href = locate.href;
 
+    if (href.indexOf("debugger")!==-1) layout.debugger = true;
 
+    var uri = new URI(href);
 
+    var redirectTo = uri.getData("redirectTo");
 
+    var optionsStr = (uri.getData("option"));
 
+    var statusStr = (uri.getData("status"));
 
+
 
+    var options = (optionsStr) ? JSON.decode(optionsStr) : null;
 
+    var statusObj = (statusStr) ? JSON.decode(statusStr) : null;
 
+
 
+    o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], function(){
 
+        MWF.defaultPath = "/x_desktop" + MWF.defaultPath;
 
+        MWF.loadLP("zh-cn");
 
+
 
+        // MWF.require("MWF.widget.Mask", null, false);
 
+        // layout.mask = new MWF.widget.Mask({"style": "desktop"});
 
+        // layout.mask.load();
 
+
 
+        MWF.require("MWF.xDesktop.Layout", function () {
 
+            MWF.xDesktop.requireApp("Common", "", null, false);
 
+            MWF.require("MWF.xDesktop.Authentication", null, false);
 
+
 
+            (function () {
 
+                layout.requireApp = function(appNames, callback, clazzName){
 
+                    var appPath = appNames.split(".");
 
+                    var appName = appPath[appPath.length-1];
 
+                    var appObject = "MWF.xApplication."+appNames;
 
+                    var className = clazzName || "Main";
 
+                    var appClass = appObject+"."+className;
 
+                    var appLp = appObject+".lp."+MWF.language;
 
+                    var baseObject = MWF.xApplication;
 
+                    appPath.each(function(path, i){
 
+                        if (i<(appPath.length-1)){
 
+                            baseObject[path] = baseObject[path] || {};
 
+                        }else {
 
+                            baseObject[path] = baseObject[path] || {"options": Object.clone(MWF.xApplication.Common.options)};
 
+                        }
 
+                        baseObject = baseObject[path];
 
+                    }.bind(this));
 
+                    if (!baseObject.options) baseObject.options = Object.clone(MWF.xApplication.Common.options);
 
+
 
+                    //MWF.xDesktop.requireApp(appNames, "lp."+MWF.language, null, false);
 
+                    MWF.xDesktop.requireApp(appNames, "lp."+MWF.language, {
 
+                        "onRequestFailure": function(){
 
+                            MWF.xDesktop.requireApp(appNames, "lp.zh-cn", null, false);
 
+                        }.bind(this),
 
+                        "onSuccess": function(){}.bind(this)
 
+                    }, false);
 
+
 
+                    MWF.xDesktop.requireApp(appNames, clazzName, function(){
 
+                        if (callback) callback(baseObject);
 
+                    });
 
+                };
 
+                layout.openApplication = function(e, appNames, options, statusObj){
 
+                    if (layout.app){
 
+                        layout.desktop.openBrowserApp = appNames;
 
+                        layout.desktop.openBrowserStatus = statusObj;
 
+                        layout.desktop.openBrowserOption = options;
 
+
 
+                        var optionsStr = JSON.encode(options);
 
+                        var statusStr = JSON.encode(statusObj);
 
+                        //window.open("appMobile.html", "_blank");
 
+                        //layout.openApplication(null, appNames, option||{}, m_status);
 
+                        var title = options.docTitle || "";
 
+                        if (appNames==="process.Work"){
 
+                            var uri = new URI(window.location.href);
 
+                            var redirectlink = uri.getData("redirectlink");
 
+                            if( !redirectlink ){
 
+                                redirectlink = encodeURIComponent(locate.pathname + locate.search);
 
                             }else{
 
-                                window.location = "appMobile.html?app="+appNames+"&option="+(optionsStr || "")+"&status="+(statusStr || "");
 
+                                redirectlink = encodeURIComponent(redirectlink);
 
+                            }
 
+                            if( options.workId ){
 
+                                window.location = "workmobilewithaction.html?workid="+options.workId+"&redirectlink="+redirectlink;
 
+                            }else if( options.workCompletedId ){
 
+                                window.location = "workmobilewithaction.html?workcompletedid="+options.workCompletedId+"&redirectlink="+redirectlink;
 
                             }
 
                         }else{
 
-                            var appPath = appNames.split(".");
 
-                            var appName = appPath[appPath.length-1];
 
-
 
-                            layout.requireApp(appNames, function(appNamespace){
 
-                                this.createNewApplication(e, appNamespace, appName, options, statusObj);
 
-                            }.bind(this));
 
-                        }
 
-                    };
 
-                    layout.createNewApplication = function(e, appNamespace, appName, options, statusObj){
 
-                        var app = new appNamespace["Main"](this, options);
 
-                        app.desktop = layout;
 
-                        app.inBrowser = true;
 
-                        app.status = statusObj;
 
-                        app.load(true);
 
-
 
-                        var appId = appName;
 
-                        if (options.appId){
 
-                            appId = options.appId;
 
-                        }else{
 
-                            if (appNamespace.options.multitask) appId = appId+"-"+(new MWF.widget.UUID());
 
+                            window.location = "appMobile.html?app="+appNames+"&option="+(optionsStr || "")+"&status="+(statusStr || "");
 
                         }
 
-                        app.appId = appId;
 
-                        layout.app = app;
 
-                    };
 
-
 
-                    layout.load = function () {
 
-                        MWF.require("MWF.xDesktop.MessageMobile", function(){
 
-                            layout.message = new MWF.xDesktop.MessageMobile();
 
-                            layout.message.load();
 
-                        }.bind(this));
 
-
 
-                        var uri = href.toURI();
 
-                        MWF.require("MWF.xDesktop.Actions.RestActions", function () {
 
-                            var action = new MWF.xDesktop.Actions.RestActions("", "x_organization_assemble_authentication", "");
 
-                            action.getActions = function (actionCallback) {
 
-                                this.actions = {
 
-                                    "info": {"uri": "/jaxrs/zhengwudingding/info", "method": "POST"},
 
-                                    "auth": {"uri": "/jaxrs/zhengwudingding/code/{code}"}
 
-                                };
 
-                                if (actionCallback) actionCallback();
 
-                            };
 
-                            action.invoke({
 
-                                "name": "info", "async": true, "data": {"url": href}, "success": function (json) {
 
-                                    // if (redirectTo){
 
-                                    //     document.all.appContent.src = (redirectTo+"&option="+optionsStr);
 
-                                    // }else{
 
-                                    //     document.all.appContent.src = "appMobile.html?app=process.TaskCenter";
 
-                                    // }
 
-                                    //if (document.all.appContentMask) document.all.appContentMask.destroy();
 
-
 
-                                    // debugger;
 
-                                    this.isAuthentication(function(){
 
-                                        var appName = "portal.Portal";
 
-                                        var m_status = statusObj;
 
-                                        var option = options;
 
-                                        layout.openApplication(null, appName, option||{}, m_status);
 
-
 
-                                        if (document.all.appContentMask) document.all.appContentMask.destroy();
 
-                                    }.bind(this));
 
-                                    // return false;
 
-
 
-                                    var _config = json.data;
 
-                                    dd.config({
 
-                                        agentId: _config.agentid,
 
-                                        corpId: _config.corpId,
 
-                                        timeStamp: _config.timeStamp,
 
-                                        nonceStr: _config.nonceStr,
 
-                                        signature: _config.signature,
 
-                                        jsApiList: ['runtime.info']
 
-                                    });
 
-                                    //dd.ready(function() {
 
-                                    dd.biz.navigation.setTitle({
 
-                                        title: ''
 
-                                    });
 
-                                    // dd.runtime.info({
 
-                                    //     onSuccess : function(info) {
 
-                                    //         logger.e('runtime info: ' + JSON.stringify(info));
 
-                                    //     },
 
-                                    //     onFail : function(err) {
 
-                                    //         logger.e('fail: ' + JSON.stringify(err));
 
-                                    //     }
 
-                                    // });
 
-                                    dd.runtime.permission.requestAuthCode({
 
-
 
-                                        corpId: _config.corpId,
 
-                                        onSuccess: function (info) {
 
-                                            action.invoke({
 
-                                                "name": "auth",
 
-                                                "async": true,
 
-                                                "parameter": {"code": info.code},
 
-                                                "success": function (json) {
 
-
 
-                                                    // var appName = appNames;
 
-                                                    // var m_status = statusObj;
 
-                                                    // var option = options;
 
-                                                    // layout.openApplication(null, appName, option||{}, m_status);
 
-
 
-
 
-                                                    // if (redirectTo){
 
-                                                    //     document.all.appContent.src = (redirectTo+"&option="+option);
 
-                                                    // }else{
 
-                                                    //     document.all.appContent.src = "appMobile.html?app=process.TaskCenter";
 
-                                                    // }
 
-                                                    // if (document.all.appContentMask) document.all.appContentMask.destroy();
 
-
 
-                                                    // if (redirectTo){
 
-                                                    //     (redirectTo+"&option="+option).toURI().go();
 
-                                                    // }else{
 
-                                                    //     "appMobile.html?app=process.TaskCenter".toURI().go();
 
-                                                    // }
 
-
 
-                                                }.bind(this),
 
-                                                "failure": function (xhr, text, error) {
 
-                                                    "appMobile.html?app=process.TaskCenter".toURI().go();
 
-                                                }.bind(this)
 
-                                            });
 
-                                        }.bind(this),
 
-                                        onFail: function (err) {
 
-                                        }
 
-                                    });
 
-                                    //});
 
-
 
-                                }.bind(this), "failure": function (xhr, text, error) {
 
-
 
-                                }.bind(this)
 
-                            });
 
-                        }.bind(this));
 
-                    };
 
-
 
-                    layout.isAuthentication = function(callback){
 
-                        this.authentication = new MWF.xDesktop.Authentication({
 
-                            "onLogin": layout.load.bind(layout)
 
-                        });
 
+                    }else{
 
+                        var appPath = appNames.split(".");
 
+                        var appName = appPath[appPath.length-1];
 
 
-                        var returnValue = true;
 
-                        this.authentication.isAuthenticated(function(json){
 
-                            this.user = json.data;
 
-                            this.session = {};
 
-                            this.session.user = json.data;
 
-                            if (callback) callback();
 
-                        }.bind(this), function(){
 
-                            this.authentication.loadLogin(document.body);
 
-                            if (layout.mask) layout.mask.hide();
 
-                            if (document.all.appContentMask) document.all.appContentMask.destroy();
 
-                            returnValue = false;
 
+                        layout.requireApp(appNames, function(appNamespace){
 
+                            this.createNewApplication(e, appNamespace, appName, options, statusObj);
 
                         }.bind(this));
 
-                        return returnValue;
 
-                    };
 
-
 
-                    layout.notice = function (content, type, target, where, offset) {
 
-                        if (!where) where = {"x": "right", "y": "top"};
 
-                        if (!target) target = this.content;
 
-                        if (!type) type = "ok";
 
-                        var noticeTarget = target || $(document.body);
 
-                        var off = offset;
 
-                        if (!off) {
 
-                            off = {
 
-                                x: 10,
 
-                                y: where.y.toString().toLowerCase() == "bottom" ? 10 : 10
 
+                    }
 
+                };
 
+                layout.createNewApplication = function(e, appNamespace, appName, options, statusObj){
 
+                    var app = new appNamespace["Main"](this, options);
 
+                    app.desktop = layout;
 
+                    app.inBrowser = true;
 
+                    app.status = statusObj;
 
+                    app.load(true);
 
+
 
+                    var appId = appName;
 
+                    if (options.appId){
 
+                        appId = options.appId;
 
+                    }else{
 
+                        if (appNamespace.options.multitask) appId = appId+"-"+(new MWF.widget.UUID());
 
+                    }
 
+                    app.appId = appId;
 
+                    layout.app = app;
 
+                };
 
+
 
+                layout.load = function () {
 
+                    MWF.require("MWF.xDesktop.MessageMobile", function(){
 
+                        layout.message = new MWF.xDesktop.MessageMobile();
 
+                        layout.message.load();
 
+                    }.bind(this));
 
+
 
+                    var uri = href.toURI();
 
+                    MWF.require("MWF.xDesktop.Actions.RestActions", function () {
 
+                        var action = new MWF.xDesktop.Actions.RestActions("", "x_organization_assemble_authentication", "");
 
+                        action.getActions = function (actionCallback) {
 
+                            this.actions = {
 
+                                "info": {"uri": "/jaxrs/zhengwudingding/info", "method": "POST"},
 
+                                "auth": {"uri": "/jaxrs/zhengwudingding/code/{code}"}
 
                             };
 
-                        }
 
-
 
-                        new mBox.Notice({
 
-                            type: type,
 
-                            position: where,
 
-                            move: false,
 
-                            target: noticeTarget,
 
-                            delayClose: (type == "error") ? 10000 : 5000,
 
-                            offset: off,
 
-                            content: content
 
+                            if (actionCallback) actionCallback();
 
+                        };
 
+                        action.invoke({
 
+                            "name": "info", "async": true, "data": {"url": href}, "success": function (json) {
 
+                                // if (redirectTo){
 
+                                //     document.all.appContent.src = (redirectTo+"&option="+optionsStr);
 
+                                // }else{
 
+                                //     document.all.appContent.src = "appMobile.html?app=process.TaskCenter";
 
+                                // }
 
+                                //if (document.all.appContentMask) document.all.appContentMask.destroy();
 
+
 
+                                // debugger;
 
+                                this.isAuthentication(function(){
 
+                                    var appName = "portal.Portal";
 
+                                    var m_status = statusObj;
 
+                                    var option = options;
 
+                                    layout.openApplication(null, appName, option||{}, m_status);
 
+
 
+                                    if (document.all.appContentMask) document.all.appContentMask.destroy();
 
+                                }.bind(this));
 
+                                // return false;
 
+
 
+                                var _config = json.data;
 
+                                dd.config({
 
+                                    agentId: _config.agentid,
 
+                                    corpId: _config.corpId,
 
+                                    timeStamp: _config.timeStamp,
 
+                                    nonceStr: _config.nonceStr,
 
+                                    signature: _config.signature,
 
+                                    jsApiList: ['runtime.info']
 
+                                });
 
+                                //dd.ready(function() {
 
+                                dd.biz.navigation.setTitle({
 
+                                    title: ''
 
+                                });
 
+                                // dd.runtime.info({
 
+                                //     onSuccess : function(info) {
 
+                                //         logger.e('runtime info: ' + JSON.stringify(info));
 
+                                //     },
 
+                                //     onFail : function(err) {
 
+                                //         logger.e('fail: ' + JSON.stringify(err));
 
+                                //     }
 
+                                // });
 
+                                dd.runtime.permission.requestAuthCode({
 
+
 
+                                    corpId: _config.corpId,
 
+                                    onSuccess: function (info) {
 
+                                        action.invoke({
 
+                                            "name": "auth",
 
+                                            "async": true,
 
+                                            "parameter": {"code": info.code},
 
+                                            "success": function (json) {
 
+
 
+                                                // var appName = appNames;
 
+                                                // var m_status = statusObj;
 
+                                                // var option = options;
 
+                                                // layout.openApplication(null, appName, option||{}, m_status);
 
+
 
+
 
+                                                // if (redirectTo){
 
+                                                //     document.all.appContent.src = (redirectTo+"&option="+option);
 
+                                                // }else{
 
+                                                //     document.all.appContent.src = "appMobile.html?app=process.TaskCenter";
 
+                                                // }
 
+                                                // if (document.all.appContentMask) document.all.appContentMask.destroy();
 
+
 
+                                                // if (redirectTo){
 
+                                                //     (redirectTo+"&option="+option).toURI().go();
 
+                                                // }else{
 
+                                                //     "appMobile.html?app=process.TaskCenter".toURI().go();
 
+                                                // }
 
+
 
+                                            }.bind(this),
 
+                                            "failure": function (xhr, text, error) {
 
+                                                "appMobile.html?app=process.TaskCenter".toURI().go();
 
+                                            }.bind(this)
 
+                                        });
 
+                                    }.bind(this),
 
+                                    onFail: function (err) {
 
+                                    }
 
+                                });
 
+                                //});
 
+
 
+                            }.bind(this), "failure": function (xhr, text, error) {
 
+
 
+                            }.bind(this)
 
                         });
 
-                    };
 
-
 
-                    MWF.getJSON("res/config/config.json", function (config) {
 
-                        layout.config = config;
 
-                        MWF.xDesktop.getServiceAddress(layout.config, function (service, center) {
 
-                            layout.serviceAddressList = service;
 
-                            layout.centerServer = center;
 
-                            layout.load();
 
-                        }.bind(this));
 
-                        //layout.getServiceAddress(function(){
 
-                        //    layout.load();
 
-                        //});
 
+                    }.bind(this));
 
+                };
 
+
 
+                layout.isAuthentication = function(callback){
 
+                    this.authentication = new MWF.xDesktop.Authentication({
 
+                        "onLogin": layout.load.bind(layout)
 
                     });
 
 
-                })();
 
+                    var returnValue = true;
 
+                    this.authentication.isAuthenticated(function(json){
 
+                        this.user = json.data;
 
+                        this.session = {};
 
+                        this.session.user = json.data;
 
+                        if (callback) callback();
 
+                    }.bind(this), function(){
 
+                        this.authentication.loadLogin(document.body);
 
+                        if (layout.mask) layout.mask.hide();
 
+                        if (document.all.appContentMask) document.all.appContentMask.destroy();
 
+                        returnValue = false;
 
+                    }.bind(this));
 
+                    return returnValue;
 
+                };
 
+
 
+                layout.notice = function (content, type, target, where, offset) {
 
+                    if (!where) where = {"x": "right", "y": "top"};
 
+                    if (!target) target = this.content;
 
+                    if (!type) type = "ok";
 
+                    var noticeTarget = target || $(document.body);
 
+                    var off = offset;
 
+                    if (!off) {
 
+                        off = {
 
+                            x: 10,
 
+                            y: where.y.toString().toLowerCase() == "bottom" ? 10 : 10
 
+                        };
 
+                    }
 
+
 
+                    new mBox.Notice({
 
+                        type: type,
 
+                        position: where,
 
+                        move: false,
 
+                        target: noticeTarget,
 
+                        delayClose: (type == "error") ? 10000 : 5000,
 
+                        offset: off,
 
+                        content: content
 
+                    });
 
+                };
 
+
 
+                MWF.getJSON("res/config/config.json", function (config) {
 
+                    layout.config = config;
 
+                    MWF.xDesktop.getServiceAddress(layout.config, function (service, center) {
 
+                        layout.serviceAddressList = service;
 
+                        layout.centerServer = center;
 
+                        layout.load();
 
+                    }.bind(this));
 
+                    //layout.getServiceAddress(function(){
 
+                    //    layout.load();
 
+                    //});
 
+                });
 
+
 
+            })();
 
 
-            });
 
         });
 
- //   });
 
+    });
 
 });

+ 16 - 32
o2web/source/x_desktop/oauth.html
查看文件 

@@ -4,13 +4,13 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
     <meta charset="UTF-8">
 
     <title></title>
 
-    <link rel="stylesheet" type="text/css" href="res/css/style.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="res/css/mBoxNotice.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="res/css/mBoxTooltip.css" charset="UTF-8" />
 
+    <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" />
 
     <!--<script src="res/framework/mootools/mootools-core-1.4.5-full-nocompat.js"></script>-->
 
     <!--<script src="res/framework/mootools/mootools-more-1.4.0.1-all_2.js"></script>-->
 
-    <script src="res/framework/mootools/mootools-1.6.0.min.js"></script>
 
-    <script src="res/common.js?v=1.1.7"></script>
 
+    <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+    <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
     <script>
 
         
         layout = window.layout || {};
 
@@ -85,38 +85,22 @@
 
             }.bind(this));
 
         };
 
 
-        COMMON.setContentPath("/x_desktop");
 
-        COMMON.AjaxModule.load("mwf", function(){
 
+        o2.load("mwf", function(){
 
             MWF.defaultPath = "/x_desktop"+MWF.defaultPath;
 
             MWF.loadLP("zh-cn");
 
             MWF.require("MWF.xDesktop.Common", null, false);
 
             MWF.require("MWF.xAction.RestActions", null, false);
 
-            COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Notice.js", null, false);
 
-            COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Tooltip.js", null, false);
 
-            MWF.getJSON("res/config/config.json", function (config) {
 
-                layout.config = config;
 
-                MWF.xDesktop.getServiceAddress(config, function (service, center) {
 
-                    layout.serviceAddressList = service;
 
-                    layout.centerServer = center;
 
-                    layout.load();
 
-                }.bind(this));
 
-            }.bind(this));
 
-
 
-
 
 
-//            MWF.require("MWF.xDesktop.Layout", function() {
 
-//                MWF.require("MWF.xDesktop.Authentication", null, false);
 
-//                MWF.getJSON("res/config/config.json", function (config) {
 
-//                    layout.config = config;
 
-//                    MWF.xDesktop.getServiceAddress(config, function (service, center) {
 
-//                        layout.serviceAddressList = service;
 
-//                        layout.centerServer = center;
 
-//                        layout.load();
 
-//                    }.bind(this));
 
-//                });
 
-//
 
-//
 
-//            });
 
+            o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], function(){
 
+                o2.JSON.get("res/config/config.json", function (config) {
 
+                    layout.config = config;
 
+                    MWF.xDesktop.getServiceAddress(config, function (service, center) {
 
+                        layout.serviceAddressList = service;
 
+                        layout.centerServer = center;
 
+                        layout.load();
 
+                    }.bind(this));
 
+                }.bind(this));
 
+            });
 
         });
 
     </script>
 
 </head>

+ 6 - 9
o2web/source/x_desktop/portal.html
查看文件 

@@ -2,15 +2,12 @@
 
 <html>
 
     <head>
 
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-        <link rel="stylesheet" type="text/css" href="res/css/style.css" charset="UTF-8" />
 
-        <link rel="stylesheet" href="res/css/mBoxNotice.css" charset="UTF-8" />
 
-        <link rel="stylesheet" href="res/css/mBoxTooltip.css" charset="UTF-8" />
 
-        <script src="res/common.js?v=1.1.7"></script>
 
-        <!--<script src="res/framework/mootools/mootools-core-1.4.5-full-nocompat.js"></script>-->
 
-        <!--<script src="res/framework/mootools/mootools-more-1.4.0.1-all_2.js"></script>-->
 
-        <script src="res/framework/mootools/mootools-1.6.0_all.js"></script>
 
-        <script src="res/framework/Decimal.js"></script>
 
-        <script src="res/js/portal.js?v=1.1.7"></script>
 
+        <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" />
 
+        <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+        <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
+        <script src="js/portal.js?v=2.0.0"></script>
 
 
         <title>O2</title>

+ 6 - 9
o2web/source/x_desktop/portalmobile.html
查看文件 

@@ -2,15 +2,12 @@
 
 <html>
 
     <head>
 
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-        <link rel="stylesheet" type="text/css" href="res/css/style.css" charset="UTF-8" />
 
-        <link rel="stylesheet" href="res/css/mBoxNotice.css" charset="UTF-8" />
 
-        <link rel="stylesheet" href="res/css/mBoxTooltip.css" charset="UTF-8" />
 
-        <script src="res/common.js?v=1.1.7"></script>
 
-        <!--<script src="res/framework/mootools/mootools-core-1.4.5-full-nocompat.js"></script>-->
 
-        <!--<script src="res/framework/mootools/mootools-more-1.4.0.1-all_2.js"></script>-->
 
-        <script src="res/framework/mootools/mootools-1.6.0_all.js"></script>
 
-        <script src="res/framework/Decimal.js"></script>
 
-        <script src="res/js/portalmobile.js?v=1.1.7"></script>
 
+        <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" />
 
+        <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+        <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
+        <script src="js/portalmobile.js?v=2.0.0"></script>
 
 
         <title>O2</title>

+ 7 - 14
o2web/source/x_desktop/preview.html
查看文件 

@@ -2,14 +2,12 @@
 
 <html>
 
 <head>
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-    <link rel="stylesheet" type="text/css" href="/x_desktop/res/css/style.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="/x_desktop/res/css/mBoxNotice.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="/x_desktop/res/css/mBoxTooltip.css" charset="UTF-8" />
 
+    <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" />
 
     <script src="/x_desktop/res/common.js?v=1.1.7"></script>
 
-    <!--<script src="/x_desktop/res/framework/mootools/mootools-core-1.4.5-full-nocompat.js"></script>-->
 
-    <!--<script src="/x_desktop/res/framework/mootools/mootools-more-1.4.0.1-all_2.js"></script>-->
 
-    <script src="res/framework/mootools/mootools-1.6.0_all.js"></script>
 
-    <script src="res/framework/Decimal.js"></script>
 
+    <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+    <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
 
     <title>FORM PREVIEW</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
@@ -24,13 +22,8 @@
 
         }
 
         layout.session = window.frameElement.ownerDocument.window.layout.session || {};
 
         //layout.desktop = layout;
 
-        COMMON.DOM.addReady(function(){
 
-            COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Notice.js", null, false);
 
-            COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Tooltip.js", null, false);
 
-
 
-            COMMON.setContentPath("/x_desktop");
 
-            COMMON.AjaxModule.load("mwf", function(){
 
-
 
+        o2.addReady(function(){
 
+            o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], function(){
 
                 MWF.getJSON("res/config/config.json", function(config){
 
                     layout.config = config;
 
                     if (layout.config.app_protocol=="auto"){

+ 6 - 9
o2web/source/x_desktop/printWork.html
查看文件 

@@ -2,15 +2,12 @@
 
 <html>
 
     <head>
 
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-        <link rel="stylesheet" type="text/css" href="res/css/style.css" charset="UTF-8" />
 
-        <link rel="stylesheet" href="res/css/mBoxNotice.css" charset="UTF-8" />
 
-        <link rel="stylesheet" href="res/css/mBoxTooltip.css" charset="UTF-8" />
 
-        <script src="res/common.js?v=1.1.7"></script>
 
-        <!--<script src="res/framework/mootools/mootools-core-1.4.5-full-nocompat.js"></script>-->
 
-        <!--<script src="res/framework/mootools/mootools-more-1.4.0.1-all_2.js"></script>-->
 
-        <script src="res/framework/mootools/mootools-1.6.0_all.js"></script>
 
-        <script src="res/js/printWork.js?v=1.1.7"></script>
 
-        <script src="res/framework/Decimal.js"></script>
 
+        <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" />
 
+        <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+        <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
+        <script src="js/printWork.js?v=2.0.2"></script>
 
 
         <title>WORK</title>
 
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

+ 7 - 14
o2web/source/x_desktop/processViewer.html
查看文件 

@@ -2,26 +2,19 @@
 
 <html>
 
 <head>
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-    <link rel="stylesheet" type="text/css" href="/x_desktop/res/css/style.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="/x_desktop/res/css/mBoxNotice.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="/x_desktop/res/css/mBoxTooltip.css" charset="UTF-8" />
 
-    <script src="/x_desktop/res/common.js?v=1.1.7"></script>
 
-    <!--<script src="/x_desktop/res/framework/mootools/mootools-core-1.4.5-full-nocompat.js"></script>-->
 
-    <!--<script src="/x_desktop/res/framework/mootools/mootools-more-1.4.0.1-all_2.js"></script>-->
 
-    <script src="res/framework/mootools/mootools-1.6.0.min.js"></script>
 
-    <script src="res/framework/Decimal.js"></script>
 
+    <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" />
 
+    <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+    <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
 
     <title>FORM PREVIEW</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
 
     <script>
 
         layout = window.layout || {};
 
-        COMMON.DOM.addReady(function(){
 
-            COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Notice.js", null, false);
 
-            COMMON.AjaxModule.load("/x_desktop/res/framework/mootools/plugin/mBox.Tooltip.js", null, false);
 
-
 
-            COMMON.setContentPath("/x_desktop");
 
-            COMMON.AjaxModule.load("mwf", function(){
 
+        o2.addReady(function(){
 
+            o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], function(){
 
                 MWF.defaultPath = "/x_desktop"+MWF.defaultPath;
 
                 MWF.loadLP("zh-cn");
 
                 MWF.require("MWF.xDesktop.Layout", function(){

+ 6 - 9
o2web/source/x_desktop/qiyeweixinsso.html
查看文件 

@@ -2,15 +2,12 @@
 
 <html>
 
 <head>
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-    <link rel="stylesheet" type="text/css" href="res/css/style.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="res/css/mBoxNotice.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="res/css/mBoxTooltip.css" charset="UTF-8" />
 
-    <script src="res/common.js?v=1.1.7"></script>
 
-    <!--<script src="res/framework/mootools/mootools-core-1.4.5-full-nocompat.js"></script>-->
 
-    <!--<script src="res/framework/mootools/mootools-more-1.4.0.1-all_2.js"></script>-->
 
-    <script src="res/framework/mootools/mootools-1.6.0.min.js"></script>
 
-    <script src="res/framework/Decimal.js"></script>
 
-    <script src="res/js/weixinsso.js?v=1.1.7"></script>
 
+    <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" />
 
+    <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+    <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
+    <script src="js/weixinsso.js?v=2.0.0"></script>
 
 
     <title>WORK</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

+ 4 - 32
o2web/source/x_desktop/sso.html
查看文件 

@@ -4,10 +4,8 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
     <meta charset="UTF-8">
 
     <title></title>
 
-    <!--<script src="res/framework/mootools/mootools-core-1.4.5-full-nocompat.js"></script>-->
 
-    <!--<script src="res/framework/mootools/mootools-more-1.4.0.1-all_2.js"></script>-->
 
-    <script src="res/framework/mootools/mootools-1.6.0.min.js"></script>
 
-    <script src="res/common.js?v=1.1.7"></script>
 
+    <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+    <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
     <script>
 
         function getServiceAddress(config, callback){
 
             if (typeOf(config.center)=="object"){
 
@@ -71,29 +69,8 @@
 
             }.bind(this));
 
         }
 
 
-//        function getServiceAddress(config, callback){
 
-//            var host = config.center.host || window.location.host;
 
-//            var port = config.center.port;
 
-//            var uri = "";
 
-//            if (!port || port=="80"){
 
-//                uri = "http://"+host+"/x_program_center/jaxrs/distribute/assemble/source/{source}";
 
-//            }else{
 
-//                uri = "http://"+host+":"+port+"/x_program_center/jaxrs/distribute/assemble/source/{source}";
 
-//            }
 
-//            var currenthost = window.location.hostname;
 
-//            uri = uri.replace(/{source}/g, currenthost);
 
-//            //var uri = "http://"+layout.config.center+"/x_program_center/jaxrs/distribute/assemble";
 
-//            MWF.restful("get", uri, null, function(json){
 
-//                var serviceAddressList = json.data;
 
-//                var addressObj = serviceAddressList["x_organization_assemble_authentication"];
 
-//                var address = "http://"+addressObj.host+(addressObj.port==80 ? "" : ":"+addressObj.port)+addressObj.context;
 
-//
 
-//                if (callback) callback(address);
 
-//            }.bind(this));
 
-//        }
 
-        COMMON.setContentPath("/x_desktop");
 
-        COMMON.AjaxModule.load("mwf", function(){
 
-            MWF.getJSON("res/config/config.json", function(config){
 
+        o2.addReady(function(){
 
+            o2.JSON.get("res/config/config.json", function(config){
 
                 getServiceAddress(config, function(address){
 
                     var uri = new URI(window.location.toString());
 
                     var xtoken = uri.getData("xtoken");
 
@@ -126,13 +103,8 @@
 
                 });
 
             });
 
 
-
 
-            //	MWF.require("MWF.process.RestActions", function(){
 
-            //		layout.restActions = new MWF.process.RestActions(Properties.action);
 
-            //	});
 
         });
 
 
-
 
     </script>
 
 </head>
 
 <body bgcolor="#faebd7" bgcolor="#ffc0cb">

+ 6 - 9
o2web/source/x_desktop/weixinsso.html
查看文件 

@@ -2,15 +2,12 @@
 
 <html>
 
 <head>
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-    <link rel="stylesheet" type="text/css" href="res/css/style.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="res/css/mBoxNotice.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="res/css/mBoxTooltip.css" charset="UTF-8" />
 
-    <script src="res/common.js?v=1.1.7"></script>
 
-    <!--<script src="res/framework/mootools/mootools-core-1.4.5-full-nocompat.js"></script>-->
 
-    <!--<script src="res/framework/mootools/mootools-more-1.4.0.1-all_2.js"></script>-->
 
-    <script src="res/framework/mootools/mootools-1.6.0.min.js"></script>
 
-    <script src="res/framework/Decimal.js"></script>
 
-    <script src="res/js/weixinsso.js?v=1.1.7"></script>
 
+    <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" />
 
+    <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+    <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
+    <script src="js/weixinsso.js?v=2.0.2"></script>
 
 
     <title>WORK</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

+ 6 - 9
o2web/source/x_desktop/work.html
查看文件 

@@ -2,15 +2,12 @@
 
 <html>
 
     <head>
 
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-        <link rel="stylesheet" type="text/css" href="res/css/style.css" charset="UTF-8" />
 
-        <link rel="stylesheet" href="res/css/mBoxNotice.css" charset="UTF-8" />
 
-        <link rel="stylesheet" href="res/css/mBoxTooltip.css" charset="UTF-8" />
 
-        <script src="res/common.js?v=1.1.7"></script>
 
-        <!--<script src="res/framework/mootools/mootools-core-1.4.5-full-nocompat.js"></script>-->
 
-        <!--<script src="res/framework/mootools/mootools-more-1.4.0.1-all_2.js"></script>-->
 
-        <script src="res/framework/mootools/mootools-1.6.0.min.js"></script>
 
-        <script src="res/framework/Decimal.js"></script>
 
-        <script src="res/js/work.js?v=1.1.7"></script>
 
+        <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" />
 
+        <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+        <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
+        <script src="js/work.js?v=2.0.0"></script>
 
 
         <title>WORK</title>
 
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

+ 6 - 9
o2web/source/x_desktop/workmobile.html
查看文件 

@@ -2,16 +2,13 @@
 
 <html>
 
     <head>
 
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-        <link rel="stylesheet" type="text/css" href="res/css/style.css" charset="UTF-8" />
 
-        <link rel="stylesheet" href="res/css/mBoxNotice.css" charset="UTF-8" />
 
-        <link rel="stylesheet" href="res/css/mBoxTooltip.css" charset="UTF-8" />
 
+        <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" />
 
         <!--<script src="res/framework/htmleditor/ckeditor451/ckeditor.js"></script>-->
 
-        <script src="res/common.js?v=1.1.7"></script>
 
-        <!--<script src="res/framework/mootools/mootools-core-1.4.5-full-nocompat.js?22"></script>-->
 
-        <!--<script src="res/framework/mootools/mootools-more-1.4.0.1-all_2.js"></script>-->
 
-        <script src="res/framework/mootools/mootools-1.6.0.min.js"></script>
 
-        <script src="res/framework/Decimal.js"></script>
 
-        <script src="res/js/workmobile.js?v=1.1.7"></script>
 
+        <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+        <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
+        <script src="js/workmobile.js?v=2.0.0"></script>
 
 
         <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
 
         <meta content="yes" name="apple-mobile-web-app-capable" />

+ 6 - 10
o2web/source/x_desktop/workmobilewithaction.html
查看文件 

@@ -2,16 +2,12 @@
 
 <html>
 
     <head>
 
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-        <link rel="stylesheet" type="text/css" href="res/css/style.css" charset="UTF-8" />
 
-        <link rel="stylesheet" href="res/css/mBoxNotice.css" charset="UTF-8" />
 
-        <link rel="stylesheet" href="res/css/mBoxTooltip.css" charset="UTF-8" />
 
-        <!--<script src="res/framework/htmleditor/ckeditor451/ckeditor.js"></script>-->
 
-        <script src="res/common.js?v=1.1.7"></script>
 
-        <!--<script src="res/framework/mootools/mootools-core-1.4.5-full-nocompat.js?22"></script>-->
 
-        <!--<script src="res/framework/mootools/mootools-more-1.4.0.1-all_2.js"></script>-->
 
-        <script src="res/framework/mootools/mootools-1.6.0.min.js"></script>
 
-        <script src="res/framework/Decimal.js"></script>
 
-        <script src="res/js/workmobilewithaction.min.js?v=1.1.7"></script>
 
+        <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" />
 
+        <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+        <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
+        <script src="js/workmobilewithaction.js?v=2.0.0"></script>
 
 
         <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
 
         <meta content="yes" name="apple-mobile-web-app-capable" />

+ 6 - 6
o2web/source/x_desktop/zhengwuDingdingSso.html
查看文件 

@@ -2,13 +2,13 @@
 
 <html>
 
 <head>
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-    <link rel="stylesheet" type="text/css" href="res/css/style.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="res/css/mBoxNotice.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="res/css/mBoxTooltip.css" charset="UTF-8" />
 
-    <script src="res/common.js?v=1.1.7"></script>
 
-    <script src="res/framework/mootools/mootools-1.6.0.min.js"></script>
 
+    <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" />
 
+    <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+    <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
     <script type="text/javascript" src="http://g.alicdn.com/ilw/ding/0.7.3/scripts/dingtalk.js"></script>
 
-    <script src="res/js/zhengwuDingdingSso.js?v=1.1.7"></script>
 
+    <script src="js/zhengwuDingdingSso.js?v=2.0.0"></script>
 
 
     <title></title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

+ 6 - 7
o2web/source/x_desktop/zwddssofp.html
查看文件 

@@ -2,13 +2,12 @@
 
 <html>
 
 <head>
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-    <link rel="stylesheet" type="text/css" href="res/css/style.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="res/css/mBoxNotice.css" charset="UTF-8" />
 
-    <link rel="stylesheet" href="res/css/mBoxTooltip.css" charset="UTF-8" />
 
-    <script src="res/common.js?v=1.1.7"></script>
 
-    <script src="res/framework/mootools/mootools-1.6.0.min.js"></script>
 
-    <script type="text/javascript" src="http://g.alicdn.com/ilw/ding/0.7.3/scripts/dingtalk.js"></script>
 
-    <script src="res/js/zhengwuDingdingSso.js?v=1.1.7"></script>
 
+    <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" />
 
+    <script src="../o2_core/o2.js?v=2.0.0"></script>
 
+    <script src="../o2_core/compatible.js?v=2.0.0"></script>
 
+    <script src="js/zhengwuDingdingSso.js?v=2.0.0"></script>
 
 
     <title></title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />