|
|
@@ -221,6 +221,53 @@ o2.xDesktop.requireApp = function (module, clazz, callback, async) {
|
|
|
}
|
|
|
};
|
|
|
|
|
|
+ var _openApplicationPC = function (appNames, options, statusObj) {
|
|
|
+ var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
|
|
|
+ switch (appNames) {
|
|
|
+ case "process.Work":
|
|
|
+ var url = "../x_desktop/work.html";
|
|
|
+ if (options.workId) {
|
|
|
+ url += "?workid=" + options.workId;
|
|
|
+ //window.location = o2.filterUrl("../x_desktop/workmobilewithaction.html?workid=" + options.workId + ((layout.debugger) ? "&debugger" : "") + "&redirectlink=" + redirectlink);
|
|
|
+ } else if (options.workCompletedId) {
|
|
|
+ url += "?workcompletedid=" + options.workCompletedId;
|
|
|
+ //window.location = o2.filterUrl("../x_desktop/workmobilewithaction.html?workcompletedid=" + options.workCompletedId + ((layout.debugger) ? "&debugger" : "") + "&redirectlink=" + redirectlink);
|
|
|
+ }
|
|
|
+ var job = (options.jobid || options.jobId || options.job);
|
|
|
+ if (job) url += ((url.indexOf("?")!=-1) ? "&" : "?") + "jobid="+job;
|
|
|
+ url +=((layout.debugger) ? "&debugger" : "");
|
|
|
+
|
|
|
+ if (layout.app.$openWithSelf) {
|
|
|
+ return window.location = o2.filterUrl(url);
|
|
|
+ } else {
|
|
|
+ return window.open(o2.filterUrl(url), par);
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ // case "cms.Document":
|
|
|
+ // _openDocument(appNames, options, statusObj);
|
|
|
+ // break;
|
|
|
+ // case "cms.Module":
|
|
|
+ // _openCms(appNames, options, statusObj);
|
|
|
+ // break;
|
|
|
+ // case "Meeting":
|
|
|
+ // _openMeeting(appNames, options, statusObj);
|
|
|
+ // break;
|
|
|
+ // case "Calendar":
|
|
|
+ // _openCalendar(appNames, options, statusObj);
|
|
|
+ // break;
|
|
|
+ // case "process.TaskCenter":
|
|
|
+ // _openTaskCenter(appNames, options, statusObj);
|
|
|
+ // break;
|
|
|
+ default:
|
|
|
+ //var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
|
|
|
+ if (layout.app.$openWithSelf) {
|
|
|
+ return window.location = o2.filterUrl("../x_desktop/app.html?" + par + ((layout.debugger) ? "&debugger" : ""));
|
|
|
+ } else {
|
|
|
+ return window.open(o2.filterUrl("../x_desktop/app.html?" + par + ((layout.debugger) ? "&debugger" : "")), par);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ };
|
|
|
+
|
|
|
layout.openApplication = function (e, appNames, options, statusObj, inBrowser, taskitem, notCurrent) {
|
|
|
if (appNames.substring(0, 4) === "@url") {
|
|
|
var url = appNames.replace(/\@url\:/i, "");
|
|
|
@@ -235,13 +282,14 @@ o2.xDesktop.requireApp = function (module, clazz, callback, async) {
|
|
|
if (layout.mobile) {
|
|
|
_openApplicationMobile(appNames, options, statusObj);
|
|
|
} else {
|
|
|
- var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
|
|
|
-
|
|
|
- if (layout.app.$openWithSelf) {
|
|
|
- return window.location = o2.filterUrl("../x_desktop/app.html?" + par + ((layout.debugger) ? "&debugger" : ""));
|
|
|
- } else {
|
|
|
- return window.open(o2.filterUrl("../x_desktop/app.html?" + par + ((layout.debugger) ? "&debugger" : "")), par);
|
|
|
- }
|
|
|
+ _openApplicationPC(appNames, options, statusObj);
|
|
|
+ // var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
|
|
|
+ //
|
|
|
+ // if (layout.app.$openWithSelf) {
|
|
|
+ // return window.location = o2.filterUrl("../x_desktop/app.html?" + par + ((layout.debugger) ? "&debugger" : ""));
|
|
|
+ // } else {
|
|
|
+ // return window.open(o2.filterUrl("../x_desktop/app.html?" + par + ((layout.debugger) ? "&debugger" : "")), par);
|
|
|
+ // }
|
|
|
}
|
|
|
} else {
|
|
|
var appPath = appNames.split(".");
|
|
|
@@ -344,7 +392,6 @@ o2.addReady(function () {
|
|
|
loadingNode.destroy();
|
|
|
loadingNode = null;
|
|
|
}
|
|
|
-
|
|
|
};
|
|
|
var _loadProgressBar = function (complete) {
|
|
|
if (loadingNode) {
|
|
|
@@ -362,40 +409,6 @@ o2.addReady(function () {
|
|
|
}
|
|
|
};
|
|
|
|
|
|
- //异步载入必要模块
|
|
|
- layout.config = null;
|
|
|
- var configLoaded = false;
|
|
|
- var lpLoaded = false;
|
|
|
- var commonLoaded = false;
|
|
|
- var lp = o2.session.path + "/lp/" + o2.language + ".js";
|
|
|
-
|
|
|
- if (o2.session.isDebugger && (o2.session.isMobile || layout.mobile)) o2.load("../o2_lib/eruda/eruda.js");
|
|
|
-
|
|
|
- o2.load(lp, function () {
|
|
|
- _loadProgressBar();
|
|
|
- lpLoaded = true;
|
|
|
-
|
|
|
- var modules = ["o2.xDesktop.$all"];
|
|
|
- o2.require(modules, {
|
|
|
- "onSuccess": function () {
|
|
|
- commonLoaded = true;
|
|
|
- if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
|
|
|
- },
|
|
|
- "onEvery": function () {
|
|
|
- _loadProgressBar();
|
|
|
- }
|
|
|
- });
|
|
|
-
|
|
|
- //if (configLoaded && lpLoaded && commonLoaded) _getDistribute(function () { _load(); });
|
|
|
- });
|
|
|
-
|
|
|
- o2.getJSON("../x_desktop/res/config/config.json", function (config) {
|
|
|
- _loadProgressBar();
|
|
|
- layout.config = config;
|
|
|
- configLoaded = true;
|
|
|
- if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
|
|
|
- });
|
|
|
-
|
|
|
var _getDistribute = function (callback) {
|
|
|
if (layout.config.app_protocol === "auto") {
|
|
|
layout.config.app_protocol = window.location.protocol;
|
|
|
@@ -414,51 +427,15 @@ o2.addReady(function () {
|
|
|
var _loadApp = function (json) {
|
|
|
//用户已经登录
|
|
|
layout.user = json.data;
|
|
|
- //layout.session = {};
|
|
|
+ layout.session = layout.session || {};
|
|
|
layout.session.user = json.data;
|
|
|
layout.session.token = json.data.token;
|
|
|
layout.desktop.session = layout.session;
|
|
|
- //(function (layout) {
|
|
|
- // var _loadResource = function (callback) {
|
|
|
- // // var isLoadedA = false;
|
|
|
- // // var isLoadedB = false;
|
|
|
- // //var isLoadedC = false;
|
|
|
- //
|
|
|
- // var modules = [
|
|
|
- // "o2.widget._base",
|
|
|
- // "o2.xDesktop._base"
|
|
|
- // ];
|
|
|
- // //o2.xDesktop.requireApp("Common", "", null, false);
|
|
|
- // //var _check = function () { if (isLoadedA && isLoadedB) if (callback) callback(); };
|
|
|
- //
|
|
|
- // //o2.load(["../o2_lib/mootools/plugin/mBox.min.js"], function () { _loadProgressBar(); isLoadedA = true; _check(); });
|
|
|
- // // o2.require("o2.widget.Common", function () {
|
|
|
- // // _loadProgressBar();
|
|
|
- // o2.require(modules, {
|
|
|
- // "onSuccess": function () {
|
|
|
- // _loadProgressBar();
|
|
|
- // if (callback) callback();
|
|
|
- // //o2.requireApp("Common", "", function () { _loadProgressBar(); isLoadedB = true; _check(); })
|
|
|
- // },
|
|
|
- // "onEvery": function () {
|
|
|
- // _loadProgressBar();
|
|
|
- // }
|
|
|
- // });
|
|
|
- // // });
|
|
|
- // };
|
|
|
-
|
|
|
- // var _loadContent = function () {
|
|
|
- //_loadResource(function () {
|
|
|
- _loadProgressBar(true);
|
|
|
- while (layout.readys && layout.readys.length) {
|
|
|
- layout.readys.shift().apply(window);
|
|
|
- }
|
|
|
-
|
|
|
- //});
|
|
|
- // };
|
|
|
|
|
|
- // _loadContent();
|
|
|
- //})(layout);
|
|
|
+ _loadProgressBar(true);
|
|
|
+ while (layout.readys && layout.readys.length) {
|
|
|
+ layout.readys.shift().apply(window);
|
|
|
+ }
|
|
|
};
|
|
|
|
|
|
//修改支持x-token
|
|
|
@@ -490,85 +467,88 @@ o2.addReady(function () {
|
|
|
}
|
|
|
});
|
|
|
} else {
|
|
|
- //用户未经登录
|
|
|
- //打开登录页面
|
|
|
- // var _loadResource = function (callback) {
|
|
|
- // var isLoadedA = false;
|
|
|
- // var isLoadedB = false;
|
|
|
- // //var isLoadedC = false;
|
|
|
- //
|
|
|
- // //var lp = o2.session.path+"/lp/"+o2.language+".js";
|
|
|
- // var modules = [
|
|
|
- // "o2.xDesktop.desktopInit"
|
|
|
- // ];
|
|
|
- // //o2.xDesktop.requireApp("Common", "", null, false);
|
|
|
- // var _check = function () { if (isLoadedA && isLoadedB) if (callback) callback(); };
|
|
|
- //
|
|
|
- // o2.load(["../o2_lib/mootools/plugin/mBox.min.js"], function () { _loadProgressBar(); isLoadedA = true; _check(); });
|
|
|
- // o2.require("o2.widget.Common", function () {
|
|
|
- // _loadProgressBar();
|
|
|
- // o2.require(modules, {
|
|
|
- // "onSuccess": function () {
|
|
|
- // o2.requireApp("Common", "", function () { isLoadedB = true; _check(); })
|
|
|
- // },
|
|
|
- // "onEvery": function () {
|
|
|
- // _loadProgressBar();
|
|
|
- // }
|
|
|
- // });
|
|
|
- // });
|
|
|
- // };
|
|
|
- //_loadResource(function () {
|
|
|
- _loadProgressBar(true);
|
|
|
- if (layout.yqwx) {
|
|
|
- layout.openLoginQywx();
|
|
|
- } else {
|
|
|
- layout.openLogin();
|
|
|
- }
|
|
|
- //});
|
|
|
+ _loadProgressBar(true);
|
|
|
+ if (layout.yqwx) {
|
|
|
+ layout.openLoginQywx();
|
|
|
+ } else {
|
|
|
+ layout.openLogin();
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
|
|
|
layout.openLogin = function () {
|
|
|
- // o2.require("o2.widget.Common", null, false);
|
|
|
- // o2.require("o2.xDesktop.Authentication", function () {
|
|
|
- layout.authentication = new o2.xDesktop.Authentication({
|
|
|
- "style": "flat",
|
|
|
- "onLogin": _load.bind(layout)
|
|
|
- });
|
|
|
- layout.authentication.loadLogin(document.body);
|
|
|
- var loadingNode = $("browser_loading");
|
|
|
- if (loadingNode) loadingNode.fade("out");
|
|
|
- // });
|
|
|
+ layout.authentication = new o2.xDesktop.Authentication({
|
|
|
+ "style": "flat",
|
|
|
+ "onLogin": _load.bind(layout)
|
|
|
+ });
|
|
|
+ layout.authentication.loadLogin(document.body);
|
|
|
+ var loadingNode = $("browser_loading");
|
|
|
+ if (loadingNode) loadingNode.fade("out");
|
|
|
};
|
|
|
|
|
|
layout.openLoginQywx = function () {
|
|
|
console.log("开始login。。。。。。。。。。。。。");
|
|
|
var uri = locate.href.toURI();
|
|
|
|
|
|
- // MWF.require("MWF.xDesktop.Actions.RestActions", function () {
|
|
|
- console.log("执行单点。。。。。。。。。。");
|
|
|
- var action = new MWF.xDesktop.Actions.RestActions("", "x_organization_assemble_authentication", "");
|
|
|
- action.getActions = function (actionCallback) {
|
|
|
- this.actions = { "sso": { "uri": "/jaxrs/qiyeweixin/code/{code}", "method": "GET" } };
|
|
|
- if (actionCallback) actionCallback();
|
|
|
- };
|
|
|
- action.invoke({
|
|
|
- "name": "sso", "async": true, "parameter": { "code": uri.getData("code") }, "success": function (json) {
|
|
|
- console.log("单点成功。");
|
|
|
- console.log(json);
|
|
|
- //基础数据。。。。
|
|
|
- layout.session.user = json.data;
|
|
|
- //
|
|
|
- _load();
|
|
|
-
|
|
|
- }.bind(this), "failure": function (xhr, text, error) {
|
|
|
- var n = document.getElementById("loaddingArea");
|
|
|
- if (n) { n.destroy(); }
|
|
|
- document.id("layout").set("html", "<div>企业微信单点异常！</div>")
|
|
|
- }.bind(this)
|
|
|
- });
|
|
|
- // });
|
|
|
+ console.log("执行单点。。。。。。。。。。");
|
|
|
+ var action = new MWF.xDesktop.Actions.RestActions("", "x_organization_assemble_authentication", "");
|
|
|
+ action.getActions = function (actionCallback) {
|
|
|
+ this.actions = { "sso": { "uri": "/jaxrs/qiyeweixin/code/{code}", "method": "GET" } };
|
|
|
+ if (actionCallback) actionCallback();
|
|
|
+ };
|
|
|
+ action.invoke({
|
|
|
+ "name": "sso", "async": true, "parameter": { "code": uri.getData("code") }, "success": function (json) {
|
|
|
+ console.log("单点成功。");
|
|
|
+ console.log(json);
|
|
|
+ //基础数据。。。。
|
|
|
+ layout.session.user = json.data;
|
|
|
+ //
|
|
|
+ _load();
|
|
|
+
|
|
|
+ }.bind(this), "failure": function (xhr, text, error) {
|
|
|
+ var n = document.getElementById("loaddingArea");
|
|
|
+ if (n) { n.destroy(); }
|
|
|
+ document.id("layout").set("html", "<div>企业微信单点异常！</div>")
|
|
|
+ }.bind(this)
|
|
|
+ });
|
|
|
};
|
|
|
-
|
|
|
};
|
|
|
+
|
|
|
+ //异步载入必要模块
|
|
|
+ layout.config = null;
|
|
|
+ var configLoaded = false;
|
|
|
+ var lpLoaded = false;
|
|
|
+ var commonLoaded = false;
|
|
|
+ var lp = o2.session.path + "/lp/" + o2.language + ".js";
|
|
|
+
|
|
|
+ if (o2.session.isDebugger && (o2.session.isMobile || layout.mobile)) o2.load("../o2_lib/eruda/eruda.js");
|
|
|
+
|
|
|
+ var loadModuls = function () {
|
|
|
+ _loadProgressBar();
|
|
|
+ lpLoaded = true;
|
|
|
+
|
|
|
+ var modules = ["o2.xDesktop.$all"];
|
|
|
+ o2.require(modules, {
|
|
|
+ "onSuccess": function () {
|
|
|
+ commonLoaded = true;
|
|
|
+ if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
|
|
|
+ },
|
|
|
+ "onEvery": function () {
|
|
|
+ _loadProgressBar();
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!o2.LP){
|
|
|
+ o2.load(lp, loadModuls);
|
|
|
+ }else{
|
|
|
+ loadModuls();
|
|
|
+ }
|
|
|
+
|
|
|
+ o2.getJSON("../x_desktop/res/config/config.json", function (config) {
|
|
|
+ _loadProgressBar();
|
|
|
+ layout.config = config;
|
|
|
+ configLoaded = true;
|
|
|
+ if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
|
|
|
+ });
|
|
|
});
|
胡起