Skip to content

o2oa
o2oa

此号慢热型 / o2oa
与 Fork 源项目一致

Fork自 浙江兰德纵横网络技术股份有限公司 / o2oa

通知 5
Star 0
Fork 0
o2oa
o2oa

体验新版 GitCode，发现更多精彩内容 >>

提交 9a4f76b7 编写于 作者: NoSubject's avatar NoSubject
浏览文件
操作

合并初始化js文件，减少载入请求数

上级 63112884
展开全部 隐藏空白更改
内联 并排
Showing with 1868 addition and 27098 deletion
o2web/gulpfile.js
浏览文件 @ 9a4f76b7
......@@ -12,6 +12,7 @@ var gulp = require('gulp'),
JSFtp = require('jsftp'),
gutil = require('gulp-util'),
fs = require("fs");
concat = require('gulp-concat');
//let uglify = require('gulp-uglify-es').default;
var through2 = require('through2');
......@@ -50,8 +51,9 @@ var options = {};
setOptions(o_options, getEvOptions(o_options.ev));
var appTasks = [];
function getAppTask(path, isMin, thisOptions) {
return function (cb) {
function createDefaultTask(path, isMin, thisOptions) {
gulp.task(path, function (cb) {
//var srcFile = 'source/' + path + '/**/*';
var option = thisOptions || options;
......@@ -132,6 +134,182 @@ function getAppTask(path, isMin, thisOptions) {
.pipe(gulp.dest(dest))
.pipe(gutil.noop());
}
});
}
function createXFormConcatTask(path, isMin, thisOptions) {
gulp.task(path+" : concat", function(){
var option = thisOptions || options;
var src = [
'source/' + path + '/Form.js',
'source/' + path + '/$Module.js',
'source/' + path + '/$Input.js',
'source/' + path + '/Div.js',
'source/' + path + '/Combox.js',
'source/' + path + '/DatagridMobile.js',
'source/' + path + '/DatagridPC.js',
'source/' + path + '/Textfield.js',
'source/' + path + '/Personfield.js',
'source/' + path + '/*.js',
'!source/' + path + '/Office.js'
];
var dest = option.dest+'/' + path + '/';
return gulp.src(src)
.pipe(concat('$all.js'))
.pipe(gulpif((option.upload == 'local' && option.location != ''), gulp.dest(option.location + path + '/')))
.pipe(gulpif((option.upload == 'ftp' && option.host != ''), ftp({
host: option.host,
user: option.user || 'anonymous',
pass: option.pass || '@anonymous',
port: option.port || 21,
remotePath: (option.remotePath || '/') + path
})))
.pipe(gulpif((option.upload == 'sftp' && option.host != ''), sftp({
host: option.host,
user: option.user || 'anonymous',
pass: option.pass || null,
port: option.port || 22,
remotePath: (option.remotePath || '/') + path
})))
.pipe(gulp.dest(dest))
.pipe(uglify())
.pipe(rename({ extname: '.min.js' }))
.pipe(gulpif((option.upload == 'local' && option.location != ''), gulp.dest(option.location + path + '/')))
.pipe(gulpif((option.upload == 'ftp' && option.host != ''), ftp({
host: option.host,
user: option.user || 'anonymous',
pass: option.pass || '@anonymous',
port: option.port || 21,
remotePath: (option.remotePath || '/') + path
})))
.pipe(gulpif((option.upload == 'sftp' && option.host != ''), sftp({
host: option.host,
user: option.user || 'anonymous',
pass: option.pass || null,
port: option.port || 22,
remotePath: (option.remotePath || '/') + path
})))
.pipe(gulp.dest(dest))
});
}
function createO2ConcatTask(path, isMin, thisOptions) {
gulp.task(path+" : concat", function(){
var option = thisOptions || options;
var src = [
'source/o2_lib/mootools/mootools-1.6.0_all.js',
'source/' + path + '/o2.js'
];
var dest = option.dest+'/' + path + '/';
return gulp.src(src)
.pipe(concat('o2.js'))
.pipe(gulpif((option.upload == 'local' && option.location != ''), gulp.dest(option.location + path + '/')))
.pipe(gulpif((option.upload == 'ftp' && option.host != ''), ftp({
host: option.host,
user: option.user || 'anonymous',
pass: option.pass || '@anonymous',
port: option.port || 21,
remotePath: (option.remotePath || '/') + path
})))
.pipe(gulpif((option.upload == 'sftp' && option.host != ''), sftp({
host: option.host,
user: option.user || 'anonymous',
pass: option.pass || null,
port: option.port || 22,
remotePath: (option.remotePath || '/') + path
})))
.pipe(gulp.dest(dest))
.pipe(uglify())
.pipe(rename({ extname: '.min.js' }))
.pipe(gulpif((option.upload == 'local' && option.location != ''), gulp.dest(option.location + path + '/')))
.pipe(gulpif((option.upload == 'ftp' && option.host != ''), ftp({
host: option.host,
user: option.user || 'anonymous',
pass: option.pass || '@anonymous',
port: option.port || 21,
remotePath: (option.remotePath || '/') + path
})))
.pipe(gulpif((option.upload == 'sftp' && option.host != ''), sftp({
host: option.host,
user: option.user || 'anonymous',
pass: option.pass || null,
port: option.port || 22,
remotePath: (option.remotePath || '/') + path
})))
.pipe(gulp.dest(dest))
});
gulp.task(path+".xDesktop : concat", function(){
var option = thisOptions || options;
var src = [
'source/'+path+'/o2/widget/Common.js',
'source/'+path+'/o2/widget/Dialog.js',
'source/'+path+'/o2/widget/UUID.js',
'source/'+path+'/o2/xDesktop/Common.js',
'source/'+path+'/o2/xDesktop/Actions/RestActions.js',
'source/'+path+'/o2/xAction/RestActions.js',
'source/'+path+'/o2/xDesktop/Access.js',
'source/'+path+'/o2/xDesktop/Dialog.js',
'source/'+path+'/o2/xDesktop/Menu.js',
'source/'+path+'/o2/xDesktop/UserData.js',
'source/x_component_Template/MPopupForm.js',
'source/'+path+'/o2/xDesktop/Authentication.js',
'source/'+path+'/o2/xDesktop/Dialog.js',
'source/'+path+'/o2/xDesktop/Window.js',
'source/x_component_Common/Main.js'
];
var dest = option.dest+'/' + path + '/o2/xDesktop/';
return gulp.src(src)
.pipe(concat('$all.js'))
.pipe(gulpif((option.upload == 'local' && option.location != ''), gulp.dest(option.location + path + '/o2/xDesktop/')))
.pipe(gulpif((option.upload == 'ftp' && option.host != ''), ftp({
host: option.host,
user: option.user || 'anonymous',
pass: option.pass || '@anonymous',
port: option.port || 21,
remotePath: (option.remotePath || '/') + path+"/o2/xDesktop/"
})))
.pipe(gulpif((option.upload == 'sftp' && option.host != ''), sftp({
host: option.host,
user: option.user || 'anonymous',
pass: option.pass || null,
port: option.port || 22,
remotePath: (option.remotePath || '/') + path+"/o2/xDesktop/"
})))
.pipe(gulp.dest(dest))
.pipe(uglify())
.pipe(rename({ extname: '.min.js' }))
.pipe(gulpif((option.upload == 'local' && option.location != ''), gulp.dest(option.location + path + '/o2/xDesktop/')))
.pipe(gulpif((option.upload == 'ftp' && option.host != ''), ftp({
host: option.host,
user: option.user || 'anonymous',
pass: option.pass || '@anonymous',
port: option.port || 21,
remotePath: (option.remotePath || '/') + path+"/o2/xDesktop/"
})))
.pipe(gulpif((option.upload == 'sftp' && option.host != ''), sftp({
host: option.host,
user: option.user || 'anonymous',
pass: option.pass || null,
port: option.port || 22,
remotePath: (option.remotePath || '/') + path+"/o2/xDesktop/"
})))
.pipe(gulp.dest(dest))
});
}
function getAppTask(path, isMin, thisOptions) {
if (path==="x_component_process_Xform"){
createDefaultTask(path, isMin, thisOptions);
createXFormConcatTask(path, isMin, thisOptions);
return gulp.series(path, path+" : concat");
}else if (path==="o2_core"){
createDefaultTask(path, isMin, thisOptions);
createO2ConcatTask(path, isMin, thisOptions);
return gulp.series(path, path+" : concat", path+".xDesktop : concat");
}else{
createDefaultTask(path, isMin, thisOptions);
return gulp.series(path);
}
}
......
o2web/package.json
浏览文件 @ 9a4f76b7
......@@ -29,6 +29,7 @@
"devDependencies": {
"gulp": "^4.0.0",
"gulp-changed": "^3.2.0",
"gulp-concat": "^2.6.1",
"gulp-deleted": "^1.0.0",
"gulp-ftp": "^1.1.0",
"gulp-if": "^2.0.2",
......@@ -38,7 +39,7 @@
"gulp-tm-uglify": "3.0.1",
"gulp-uglify-es": "^2.0.0",
"merge-stream": "^1.0.1",
"readline-sync": "^1.4.10",
"minimist": "^1.2.0"
"minimist": "^1.2.0",
"readline-sync": "^1.4.10"
}
}
o2web/source/o2_core/compatible.js 已删除 100644 → 0
浏览文件 @ 63112884
o2.addReady(function(){
COMMON = {
"DOM":{},
"setContentPath": function(path){
COMMON.contentPath = path;
},
"JSON": o2.JSON,
"Browser": Browser,
"Class": o2.Class,
"XML": o2.xml,
"AjaxModule": {
"load": function(urls, callback, async, reload){
o2.load(urls, callback, reload, document);
},
"loadDom": function(urls, callback, async, reload){
o2.load(urls, callback, reload, document);
},
"loadCss": function(urls, callback, async, reload, sourceDoc){
o2.loadCss(urls, document.body, callback, reload, sourceDoc);
}
},
"Request": Request,
"typeOf": o2.typeOf
};
COMMON.Browser.Platform.isMobile = o2.session.isMobile;
COMMON.DOM.addReady = o2.addReady;
MWF = o2;
MWF.getJSON = o2.JSON.get;
MWF.getJSONP = o2.JSON.getJsonp;
MWF.defaultPath = o2.session.path;
});
o2web/source/o2_core/init.js 已删除 100644 → 0
浏览文件 @ 63112884
此差异已折叠。
o2web/source/o2_core/o2.all.js 已删除 100644 → 0
浏览文件 @ 63112884
此差异已折叠。
o2web/source/o2_core/o2.js
浏览文件 @ 9a4f76b7
此差异已折叠。
o2web/source/o2_core/o2/o2.core.js
浏览文件 @ 9a4f76b7
......@@ -86,13 +86,20 @@
var levels = module.split(".");
if (levels[levels.length-1]==="*") levels[levels.length-1] = "package";
levels.shift();
var jsPath = this.o2.session.path;
jsPath +="/"+levels.join("/")+".js";
var loadAsync = (async!==false);
_requireJs(jsPath, callback, loadAsync, compression, module);
var o = o2;
var i = 0;
while (o && i<levels.length){
o = o[levels[i]];
i++
}
if (!o){
var jsPath = this.o2.session.path;
jsPath +="/"+levels.join("/")+".js";
var loadAsync = (async!==false);
_requireJs(jsPath, callback, loadAsync, compression, module);
}else{
o2.runCallback(callback, "success", [module]);
}
}
};
var _requireSequence = function(fun, module, thisLoaded, thisErrorLoaded, callback, async, compression){
......@@ -160,12 +167,25 @@
var module = modules[0];
var clazz = modules[1];
var levels = module.split(".");
//levels.shift();
var root = "x_component_"+levels.join("_");
var clazzName = clazz || "Main";
var path = "../"+root+"/"+clazzName.replace(/\./g, "/")+".js";
var loadAsync = (async!==false);
_requireJs(path, callback, loadAsync, compression);
var o = o2.xApplication;
var i = 0;
while (o && i<levels.length){
o = o[levels[i]];
i++
}
if (o) o = o[clazz || "Main"];
if (!o){
//levels.shift();
var root = "x_component_"+levels.join("_");
var clazzName = clazz || "Main";
var path = "../"+root+"/"+clazzName.replace(/\./g, "/")+".js";
var loadAsync = (async!==false);
_requireJs(path, callback, loadAsync, compression);
}else{
o2.runCallback(callback, "success");
}
};
var _requireApp = function(module, clazz, callback, async, sequence, compression){
var type = typeOf(module);
......
o2web/source/o2_core/o2/o2.more.js
浏览文件 @ 9a4f76b7
/** ***** BEGIN LICENSE BLOCK *****
* |------------------------------------------------------------------------------|
* | O2OA 活力办公 创意无限 o2.core.js |
* | O2OA 活力办公 创意无限 o2.more.js |
* |------------------------------------------------------------------------------|
* | Distributed under the AGPL license: |
* |------------------------------------------------------------------------------|
......
o2web/source/o2_core/o2/widget/Common.js
浏览文件 @ 9a4f76b7
......@@ -26,21 +26,6 @@ o2.widget.Common = new Class({
alert(error + text);
}
});
// var r = new Request({
// url: this.cssPath,
// secure: false,
// async: false,
// method: "get",
// noCache: false,
// onSuccess: function(responseText, responseXML){
// var f = eval("(function(){return function(){\n return "+responseText+"\n}})();");
// this.css = f.apply(this);
// o2.widget.css[key] = this.css;
// }.bind(this),
// onError: function(text, error){
// alert(error + text);
// }
// });
r.send();
}
},
......
o2web/source/x_component_Template/MPopupForm.js
浏览文件 @ 9a4f76b7
var MPopupForm = new Class({
MWF.xApplication.Template = MWF.xApplication.Template || {};
MWF.xApplication.Template.MPopupForm = MPopupForm = new Class({
Extends: MWF.widget.Common,
Implements: [Options, Events],
options: {
......
o2web/source/x_component_process_Work/Main.js
浏览文件 @ 9a4f76b7
......@@ -527,7 +527,11 @@ MWF.xApplication.process.Work.Main = new Class({
this.formNode.empty();
this.formNode.setStyles(this.css.formNode);
MWF.xDesktop.requireApp("process.Xform", "Form", function(){
var uri = window.location.href;
//var cl = (uri.indexOf("$all")!=-1) ? "$all" : "Form";
var cl = "$all";
MWF.xDesktop.requireApp("process.Xform", cl, function(){
//MWF.xDesktop.requireApp("process.Xform", "Form", function(){
this.appForm = new MWF.APPForm(this.formNode, this.form, {});
this.appForm.businessData = {
"data": this.data,
......
o2web/source/x_component_process_Xform/Actionbar.js
浏览文件 @ 9a4f76b7
//MWF.xDesktop.requireApp("process.Xform", "$Module", null, false);
MWF.xDesktop.requireApp("process.Xform", "$Module", null, false);
//MWF.require("MWF.widget.Tree", null, false);
//MWF.require("MWF.widget.Toolbar", null, false);
MWF.xApplication.process.Xform.Actionbar = MWF.APPActionbar = new Class({
......
o2web/source/x_component_process_Xform/Common.js 0 → 100644
浏览文件 @ 9a4f76b7
MWF.xDesktop.requireApp("process.Xform", "$Module", null, false);
MWF.xApplication.process.Xform.Common = MWF.APPCommon = new Class({
Extends: MWF.APP$Module,
_loadUserInterface: function(){
if (this.json.innerHTML){
var nodes = this.node.childNodes;
for (var i=0; i<nodes.length; i++){
if (nodes[i].nodeType===Node.ELEMENT_NODE){
if (!nodes[i].get("MWFtype")){
nodes[i].destroy();
i--;
}
}else{
if (nodes[i].removeNode){
nodes[i].removeNode();
}else{
nodes[i].parentNode.removeChild(nodes[i]);
}
i--;
//nodes[i]
}
}
this.node.appendHTML(this.json.innerHTML);
// if (this.node.get("html") !== this.json.innerHTML){
//this.node.appendHTML(this.json.innerHTML);
// }
}
this.node.setProperties(this.json.properties);
}
});
\ No newline at end of file
o2web/source/x_component_process_Xform/Div.js 0 → 100644
浏览文件 @ 9a4f76b7
MWF.xDesktop.requireApp("process.Xform", "$Module", null, false);
MWF.xApplication.process.Xform.Div = MWF.APPDiv = new Class({
Extends: MWF.APP$Module
});
\ No newline at end of file
o2web/source/x_component_process_Xform/Form.js
浏览文件 @ 9a4f76b7
......@@ -2,7 +2,7 @@ MWF.require(["MWF.widget.Common", "MWF.widget.Identity", "MWF.widget.O2Identity"
MWF.xApplication.process = MWF.xApplication.process || {};
MWF.xApplication.process.Xform = MWF.xApplication.process.Xform || {};
MWF.xDesktop.requireApp("process.Xform", "lp." + MWF.language, null, false);
MWF.xDesktop.requireApp("process.Xform", "Package", null, false);
//MWF.xDesktop.requireApp("process.Xform", "Package", null, false);
MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
Implements: [Options, Events],
......
o2web/source/x_component_process_Xform/Html.js
浏览文件 @ 9a4f76b7
MWF.xDesktop.requireApp("process.Xform", "$Module", null, false);
MWF.xApplication.process.Xform.Html = MWF.APPHtml = new Class({
Extends: MWF.APP$Module,
load: function(){
debugger;
this.source = this._getSource();
if (this.source){
this._loadJsonData();
}else{
debugger;
this.node.appendHTML(this.json.text, "after");
this.node.destory();
}
},
_getSource: function(){
var parent = this.node.getParent();
while(parent && (parent.get("MWFtype")!="source" && parent.get("MWFtype")!="subSource" && parent.get("MWFtype")!="subSourceItem")) parent = parent.getParent();
return (parent) ? parent.retrieve("module") : null;
},
_loadJsonData: function(){
this.node.set("html", "");
this.source = this._getSource();
if (this.source){
if (this.source.data){
this.template = new Template();
this.html = this.template.substitute("{"+this.json.text+"}", this.source.data);
this.node.set("html", this.html);
// if (this.json.jsonText){
// if (this.json.jsonText.code){
// this.text = this.form.Macro.exec(this.json.jsonText.code, this);
// this.node.set("text", this.text);
// }else{
// this.node.set("text", this.text);
// }
// }else{
// this.node.set("text", this.text);
// }
}
}
Extends: MWF.APP$Module,
load: function(){
this.node.insertAdjacentHTML("beforebegin", this.json.text);
this.node.destroy();
}
});
\ No newline at end of file
});
o2web/source/x_component_process_Xform/Image.js 0 → 100644
浏览文件 @ 9a4f76b7
MWF.xDesktop.requireApp("process.Xform", "$Module", null, false);
MWF.xApplication.process.Xform.Image = MWF.APPImage = new Class({
Extends: MWF.APP$Module,
_loadUserInterface: function(){
if (this.json.properties && this.json.properties["src"]){
var value = this.json.properties["src"];
if ((value.indexOf("x_processplatform_assemble_surface")!=-1 || value.indexOf("x_portal_assemble_surface")!=-1 || value.indexOf("x_cms_assemble_control")!=-1)){
var host1 = MWF.Actions.getHost("x_processplatform_assemble_surface");
var host2 = MWF.Actions.getHost("x_portal_assemble_surface");
var host3 = MWF.Actions.getHost("x_cms_assemble_control");
if (value.indexOf("/x_processplatform_assemble_surface")!==-1){
value = value.replace("/x_processplatform_assemble_surface", host1+"/x_processplatform_assemble_surface");
}else if (value.indexOf("x_processplatform_assemble_surface")!==-1){
value = value.replace("x_processplatform_assemble_surface", host1+"/x_processplatform_assemble_surface");
}
if (value.indexOf("/x_portal_assemble_surface")!==-1){
value = value.replace("/x_portal_assemble_surface", host2+"/x_portal_assemble_surface");
}else if (value.indexOf("x_portal_assemble_surface")!==-1){
value = value.replace("x_portal_assemble_surface", host2+"/x_portal_assemble_surface");
}
if (value.indexOf("/x_cms_assemble_control")!==-1){
value = value.replace("/x_cms_assemble_control", host3+"/x_cms_assemble_control");
}else if (value.indexOf("x_cms_assemble_control")!==-1){
value = value.replace("x_cms_assemble_control", host3+"/x_cms_assemble_control");
}
}
try{
this.node.set("src", value);
}catch(e){}
}else if (this.json.srcfile && this.json.srcfile!="none"){
value = this.json.srcfile;
if (typeOf(value)==="object"){
var url = (value.portal) ? MWF.xDesktop.getPortalFileUr(value.id, value.portal) : MWF.xDesktop.getProcessFileUr(value.id, value.application);
this.node.set("src", url);
}else{
var host = MWF.Actions.getHost("x_portal_assemble_surface");
var action = MWF.Actions.get("x_portal_assemble_surface");
var uri = action.action.actions.readFile.uri;
uri = uri.replace("{flag}", value);
uri = uri.replace("{applicationFlag}", this.form.json.application);
value = host+"/x_portal_assemble_surface"+uri;
this.node.set("src", value);
}
}else if (typeOf(this.json.src)=="object"){
var src = MWF.xDesktop.getImageSrc( this.json.src.imageId );
this.node.set("src", src);
}
},
reset: function(){
this._loadUserInterface();
}
});
\ No newline at end of file
o2web/source/x_component_process_Xform/Package.js
浏览文件 @ 9a4f76b7
MWF.xApplication.process.Xform = MWF.xApplication.process.Xform || {};
MWF.xApplication.process.Xform.Package = true;
MWF.require("MWF.xScript.Macro", null, false);
MWF.xDesktop.requireApp("process.Xform", "$Module", null, false);
MWF.xApplication.process.Xform.require = function(callback){
var modules = [
["process.Xform", "Form"],
// ["process.Xform", "Form"],
["process.Xform", "Label"],
["process.Xform", "Textfield"],
["process.Xform", "Number"],
......@@ -40,7 +41,11 @@ MWF.xApplication.process.Xform.require = function(callback){
["process.Xform", "Widget"],
["process.Xform", "Source"],
["process.Xform", "SourceText"],
["process.Xform", "SubSource"]
["process.Xform", "SubSource"],
["process.Xform", "Div"],
["process.Xform", "Common"],
["process.Xform", "Image"],
["process.Xform", "Html"],
];
MWF.xDesktop.requireApp(modules, null, function(){
if (callback) callback();
......@@ -48,138 +53,4 @@ MWF.xApplication.process.Xform.require = function(callback){
};
// MWF.xDesktop.requireApp("process.Xform", "Label", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Textfield", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Number", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Personfield", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Orgfield", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Calendar", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Textarea", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Opinion", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Select", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Radio", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Checkbox", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Button", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Combox", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Address", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Table", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Datagrid", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Tab", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Tree", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Iframe", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Htmleditor", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Office", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Attachment", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Actionbar", null, false);
// MWF.xDesktop.requireApp("process.Xform", "sidebar", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Log", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Monitor", null, false);
// MWF.xDesktop.requireApp("process.Xform", "View", null, false);
// MWF.xDesktop.requireApp("process.Xform", "ViewSelector", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Stat", null, false);
// MWF.xDesktop.requireApp("process.Xform", "ImageClipper", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Subform", null, false);
// MWF.xDesktop.requireApp("process.Xform", "Source", null, false);
// MWF.xDesktop.requireApp("process.Xform", "SourceText", null, false);
// MWF.xDesktop.requireApp("process.Xform", "SubSource", null, false);
MWF.xApplication.process.Xform.Div = MWF.APPDiv = new Class({
Extends: MWF.APP$Module
});
MWF.xApplication.process.Xform.Common = MWF.APPCommon = new Class({
Extends: MWF.APP$Module,
_loadUserInterface: function(){
if (this.json.innerHTML){
var nodes = this.node.childNodes;
for (var i=0; i<nodes.length; i++){
if (nodes[i].nodeType===Node.ELEMENT_NODE){
if (!nodes[i].get("MWFtype")){
nodes[i].destroy();
i--;
}
}else{
if (nodes[i].removeNode){
nodes[i].removeNode();
}else{
nodes[i].parentNode.removeChild(nodes[i]);
}
i--;
//nodes[i]
}
}
this.node.appendHTML(this.json.innerHTML);
// if (this.node.get("html") !== this.json.innerHTML){
//this.node.appendHTML(this.json.innerHTML);
// }
}
this.node.setProperties(this.json.properties);
}
});
//MWF.xApplication.process.Xform.Image = MWF.APPImage = new Class({
// Extends: MWF.APP$Module
//});
MWF.xApplication.process.Xform.Image = MWF.APPImage = new Class({
Extends: MWF.APP$Module,
_loadUserInterface: function(){
if (this.json.properties && this.json.properties["src"]){
var value = this.json.properties["src"];
if ((value.indexOf("x_processplatform_assemble_surface")!=-1 || value.indexOf("x_portal_assemble_surface")!=-1 || value.indexOf("x_cms_assemble_control")!=-1)){
var host1 = MWF.Actions.getHost("x_processplatform_assemble_surface");
var host2 = MWF.Actions.getHost("x_portal_assemble_surface");
var host3 = MWF.Actions.getHost("x_cms_assemble_control");
if (value.indexOf("/x_processplatform_assemble_surface")!==-1){
value = value.replace("/x_processplatform_assemble_surface", host1+"/x_processplatform_assemble_surface");
}else if (value.indexOf("x_processplatform_assemble_surface")!==-1){
value = value.replace("x_processplatform_assemble_surface", host1+"/x_processplatform_assemble_surface");
}
if (value.indexOf("/x_portal_assemble_surface")!==-1){
value = value.replace("/x_portal_assemble_surface", host2+"/x_portal_assemble_surface");
}else if (value.indexOf("x_portal_assemble_surface")!==-1){
value = value.replace("x_portal_assemble_surface", host2+"/x_portal_assemble_surface");
}
if (value.indexOf("/x_cms_assemble_control")!==-1){
value = value.replace("/x_cms_assemble_control", host3+"/x_cms_assemble_control");
}else if (value.indexOf("x_cms_assemble_control")!==-1){
value = value.replace("x_cms_assemble_control", host3+"/x_cms_assemble_control");
}
}
try{
this.node.set("src", value);
}catch(e){}
}else if (this.json.srcfile && this.json.srcfile!="none"){
value = this.json.srcfile;
if (typeOf(value)==="object"){
var url = (value.portal) ? MWF.xDesktop.getPortalFileUr(value.id, value.portal) : MWF.xDesktop.getProcessFileUr(value.id, value.application);
this.node.set("src", url);
}else{
var host = MWF.Actions.getHost("x_portal_assemble_surface");
var action = MWF.Actions.get("x_portal_assemble_surface");
var uri = action.action.actions.readFile.uri;
uri = uri.replace("{flag}", value);
uri = uri.replace("{applicationFlag}", this.form.json.application);
value = host+"/x_portal_assemble_surface"+uri;
this.node.set("src", value);
}
}else if (typeOf(this.json.src)=="object"){
var src = MWF.xDesktop.getImageSrc( this.json.src.imageId );
this.node.set("src", src);
}
},
reset: function(){
this._loadUserInterface();
}
});
MWF.xApplication.process.Xform.Html = MWF.APPHtml = new Class({
Extends: MWF.APP$Module,
load: function(){
debugger;
this.node.insertAdjacentHTML("beforebegin", this.json.text);
this.node.destroy();
}
});
o2web/source/x_component_process_Xform/Source.js
浏览文件 @ 9a4f76b7
MWF.xDesktop.requireApp("process.Xform", "Div", null, false);
MWF.xApplication.process.Xform.Source = MWF.APPSource = new Class({
Extends: MWF.APPDiv,
options: {
......
o2web/source/x_desktop/app.html
浏览文件 @ 9a4f76b7
......@@ -14,9 +14,9 @@
<div id="loaddingArea" style="overflow: hidden;width:0px; height:2px; background-color:#4e82bd; position: absolute; top: 0; z-index: 100"></div>
</div>
<script src="../o2_core/o2.all.js"></script>
<script src="../o2_core/o2.min.js"></script>
<script src="../o2_lib/Decimal.js"></script>
<script src="js/base_all.js"></script>
<script src="js/base.min.js"></script>
<script src="js/app.min.js"></script>
</body>
</html>
o2web/source/x_desktop/appMobile.html
浏览文件 @ 9a4f76b7
......@@ -7,7 +7,6 @@
<link rel="stylesheet" href="css/mBoxTooltip.css" charset="UTF-8" />
<script src="../o2_core/o2.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="../o2_lib/Decimal.js"></script>
<script src="js/base.min.js"></script>
<script src="js/o2m.api.js"></script>
......
o2web/source/x_desktop/cmsdocMobile.html
浏览文件 @ 9a4f76b7
......@@ -8,7 +8,6 @@
<link rel="stylesheet" href="css/mBoxTooltip.css" charset="UTF-8" />
<!--<script src="res/framework/htmleditor/ckeditor451/ckeditor.js"></script>-->
<script src="../o2_core/o2.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="js/o2m.api.js"></script>
<script src="js/cmsDocMobile.min.js"></script>
<script src="../o2_lib/Decimal.js"></script>
......
o2web/source/x_desktop/cmspreview.html
浏览文件 @ 9a4f76b7
......@@ -5,9 +5,7 @@
<link rel="stylesheet" type="text/css" href="css/style.css" charset="UTF-8" />
<link rel="stylesheet" href="css/mBoxNotice.css" charset="UTF-8" />
<link rel="stylesheet" href="css/mBoxTooltip.css" charset="UTF-8" />
<script src="../o2_lib/mootools/mootools-1.6.0.min.js"></script>
<script src="../o2_core/o2.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="../o2_lib/Decimal.js"></script>
<title>FORM PREVIEW</title>
......
o2web/source/x_desktop/ddsso.html
浏览文件 @ 9a4f76b7
......@@ -6,7 +6,6 @@
<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.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script type="text/javascript" src="/o2_lib/dingding/dingtalk.js"></script>
<script src="js/ddsso.js"></script>
<script src="../o2_lib/Decimal.js"></script>
......
o2web/source/x_desktop/forum.html
浏览文件 @ 9a4f76b7
......@@ -6,7 +6,6 @@
<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.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="js/forum.js"></script>
<script src="../o2_lib/Decimal.js"></script>
......
o2web/source/x_desktop/forumdocMobile.html
浏览文件 @ 9a4f76b7
......@@ -7,7 +7,6 @@
<link rel="stylesheet" href="css/mBoxTooltip.css" charset="UTF-8" />
<script src="../o2_lib/htmleditor/ckeditor/ckeditor.js"></script>
<script src="../o2_core/o2.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="js/forumDocMobile.js"></script>
<script src="../o2_lib/Decimal.js"></script>
......
o2web/source/x_desktop/index.html
浏览文件 @ 9a4f76b7
......@@ -66,10 +66,9 @@
}
</script>
<script src="../o2_core/o2.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="js/base.js"></script>
<script src="js/x.js"></script>
<script src="../o2_core/o2.min.js"></script>
<script src="js/base.min.js"></script>
<script src="js/x.min.js"></script>
<script src="../o2_lib/Decimal.js"></script>
</body>
</html>
o2web/source/x_desktop/js/base.js
浏览文件 @ 9a4f76b7
......@@ -71,8 +71,6 @@ o2.xDesktop.requireApp = function (module, clazz, callback, async) {
layout.desktop.apps[app.appId] = app;
}
layout.desktop.appArr.push(app);
layout.desktop.appCurrentList.push(app);
if (!notCurrent) layout.desktop.currentApp = app;
......@@ -338,7 +336,7 @@ o2.addReady(function () {
var loadingNode = $("loaddingArea");
var loadeds = 0;
var loadCount = 16;
var loadCount = 4;
var size = document.body.getSize();
var _closeLoadingNode = function () {
if (loadingNode) {
......@@ -372,22 +370,25 @@ o2.addReady(function () {
o2.load(lp, function () {
_loadProgressBar();
lpLoaded = true;
if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
});
var modules = ["o2.xDesktop.Common", "o2.xDesktop.Actions.RestActions", "o2.xAction.RestActions"];
o2.require(modules, {
"onSuccess": function () {
commonLoaded = true;
if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
},
"onEvery": function () {
_loadProgressBar();
}
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
configLoaded = true;
if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
});
......@@ -413,53 +414,47 @@ o2.addReady(function () {
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.xDesktop.Dialog",
"o2.xDesktop.UserData",
"o2.xDesktop.Access",
"o2.widget.UUID",
"o2.xDesktop.Menu",
"o2.xDesktop.Authentication",
// "o2.xDesktop.shortcut",
"o2.widget.PinYin",
"o2.xDesktop.Access"
// "o2.xDesktop.MessageMobile"
];
//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 () { _loadProgressBar(); isLoadedB = true; _check(); })
},
"onEvery": function () {
_loadProgressBar();
}
});
});
};
var _loadContent = function () {
_loadResource(function () {
//(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);
// _loadContent();
//})(layout);
};
//修改支持x-token
......@@ -491,53 +486,45 @@ 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.Dialog",
"o2.xDesktop.UserData",
"o2.xDesktop.Access",
"o2.widget.UUID",
"o2.xDesktop.Menu",
//"o2.xDesktop.shortcut",
"o2.widget.PinYin",
"o2.xDesktop.Access",
//"o2.xDesktop.MessageMobile"
];
//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 () {
// 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();
}
});
//});
}
});
layout.openLogin = function () {
o2.require("o2.widget.Common", null, false);
o2.require("o2.xDesktop.Authentication", 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)
......@@ -545,14 +532,14 @@ o2.addReady(function () {
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 () {
// MWF.require("MWF.xDesktop.Actions.RestActions", function () {
console.log("执行单点。。。。。。。。。。");
var action = new MWF.xDesktop.Actions.RestActions("", "x_organization_assemble_authentication", "");
action.getActions = function (actionCallback) {
......@@ -574,7 +561,7 @@ o2.addReady(function () {
document.id("layout").set("html", "<div>企业微信单点异常！</div>")
}.bind(this)
});
});
// });
};
};
......
o2web/source/x_desktop/js/base_all.js → o2web/source/x_desktop/js/base_bak.js
浏览文件 @ 9a4f76b7
......@@ -293,38 +293,9 @@ o2.xDesktop.requireApp = function (module, clazz, callback, async) {
layout.openApplication(null, appName, option || {}, m_status);
};
// layout.getAppUrlMapping = function(url){
// return this.getUrlMapping(url, "app");
// };
// layout.getCenterUrlMapping = function(url){
// return this.getUrlMapping(url,"center");
// };
// layout.getWebUrlMapping = function(url){
// return this.getUrlMapping(url, "web");
// };
// layout.getUrlMapping = function(url, type){
// var urlContextMapping = layout.config.urlMapping;
// if (urlContextMapping && urlContextMapping.app){
// var href = url || window.location.href.toString();
//
// for (var k in urlContextMapping[type]){
// var regex = new RegExp(k);
// if (regex.test(href)){
// return urlContextMapping[type][k];
// }
// }
// }
// return "";
// };
})(layout);
o2.addReady(function () {
// layout.desktop = new (new Class({Implements: [Options, Events]}))();
// layout.desktop.openApplication = layout.openApplication;
// layout.desktop.refreshApp = layout.refreshApp;
// layout.desktop.load = layout.load;
//兼容方法
Element.implement({
"makeLnk": function (options) { }
......@@ -367,27 +338,28 @@ o2.addReady(function () {
layout.config = null;
var configLoaded = false;
var lpLoaded = false;
var commonLoaded = false;
var lp = o2.session.path + "/lp/" + o2.language + ".js";
o2.load(lp, function () {
_loadProgressBar();
lpLoaded = true;
if (configLoaded && lpLoaded) _getDistribute(function () { _load(); });
if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
});
var modules = ["o2.xDesktop.Common", "o2.xDesktop.Actions.RestActions", "o2.xAction.RestActions"];
o2.require(modules, {
"onSuccess": function () {
commonLoaded = true;
if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
},
"onEvery": function () {
_loadProgressBar();
}
});
// var modules = ["o2.xDesktop.Common", "o2.xDesktop.Actions.RestActions", "o2.xAction.RestActions"];
// o2.require(modules, {
// "onSuccess": function () {
// commonLoaded = true;
// if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
// },
// "onEvery": function () {
// _loadProgressBar();
// }
// });
o2.getJSON("../x_desktop/res/config/config.json", function (config) {
_loadProgressBar();
layout.config = config;
configLoaded = true;
if (configLoaded && lpLoaded) _getDistribute(function () { _load(); });
configLoaded = true
if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
});
var _getDistribute = function (callback) {
......@@ -427,7 +399,7 @@ o2.addReady(function () {
"o2.xDesktop.Authentication",
// "o2.xDesktop.shortcut",
"o2.widget.PinYin",
"o2.xDesktop.Access"
//"o2.xDesktop.Access"
// "o2.xDesktop.MessageMobile"
];
//o2.xDesktop.requireApp("Common", "", null, false);
......
o2web/source/x_desktop/js/base_simple.js
浏览文件 @ 9a4f76b7
......@@ -50,18 +50,30 @@ o2.addReady(function () {
o2.load(lp, function () {
_loadProgressBar();
lpLoaded = true;
if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
});
var modules = ["o2.xDesktop.Common", "o2.xDesktop.Actions.RestActions", "o2.xAction.RestActions"];
o2.require(modules, {
"onSuccess": function () {
commonLoaded = true;
if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
},
"onEvery": function () {
_loadProgressBar();
}
var modules = ["o2.xDesktop.$all"];
o2.require(modules, {
"onSuccess": function () {
commonLoaded = true;
if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
},
"onEvery": function () {
_loadProgressBar();
}
});
//if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
});
// var modules = ["o2.xDesktop.Common", "o2.xDesktop.Actions.RestActions", "o2.xAction.RestActions"];
// o2.require(modules, {
// "onSuccess": function () {
// commonLoaded = true;
// if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
// },
// "onEvery": function () {
// _loadProgressBar();
// }
// });
o2.getJSON("../x_desktop/res/config/config.json", function (config) {
_loadProgressBar();
layout.config = config;
......@@ -87,53 +99,53 @@ o2.addReady(function () {
layout.user = json.data;
layout.session = {};
layout.session.user = json.data;
(function (layout) {
var _loadResource = function (callback) {
var isLoadedA = false;
var isLoadedB = false;
//var isLoadedC = false;
var modules = [
"o2.xDesktop.Dialog",
"o2.xDesktop.UserData",
"o2.xDesktop.Access",
"o2.widget.UUID",
"o2.xDesktop.Menu",
"o2.xDesktop.Authentication",
// "o2.xDesktop.shortcut",
"o2.widget.PinYin",
"o2.xDesktop.Access"
// "o2.xDesktop.MessageMobile"
];
//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 () { _loadProgressBar(); isLoadedB = true; _check(); })
},
"onEvery": function () {
_loadProgressBar();
}
});
});
};
var _loadContent = function () {
//_loadResource(function () {
// (function (layout) {
// var _loadResource = function (callback) {
// var isLoadedA = false;
// var isLoadedB = false;
// //var isLoadedC = false;
//
// var modules = [
// "o2.xDesktop.Dialog",
// "o2.xDesktop.UserData",
// "o2.xDesktop.Access",
// "o2.widget.UUID",
// "o2.xDesktop.Menu",
// "o2.xDesktop.Authentication",
// // "o2.xDesktop.shortcut",
// "o2.widget.PinYin",
// "o2.xDesktop.Access"
// // "o2.xDesktop.MessageMobile"
// ];
// //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 () { _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);
//
// //});
// };
//
// _loadContent();
// })(layout);
};
//先判断用户是否登录
o2.Actions.get("x_organization_assemble_authentication").getAuthentication(function (json) {
......@@ -157,49 +169,49 @@ o2.addReady(function () {
} else {
//用户未经登录
//打开登录页面
var _loadResource = function (callback) {
var isLoadedA = true;
var isLoadedB = false;
//var isLoadedC = false;
//var lp = o2.session.path+"/lp/"+o2.language+".js";
var modules = [
// "o2.xDesktop.Dialog",
"o2.xDesktop.UserData",
// "o2.xDesktop.Access",
// "o2.widget.UUID",
// "o2.xDesktop.Menu",
// //"o2.xDesktop.shortcut",
// "o2.widget.PinYin",
// "o2.xDesktop.Access",
//"o2.xDesktop.MessageMobile"
];
//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 () {
// var _loadResource = function (callback) {
// var isLoadedA = true;
// var isLoadedB = false;
// //var isLoadedC = false;
//
// //var lp = o2.session.path+"/lp/"+o2.language+".js";
// var modules = [
// // "o2.xDesktop.Dialog",
// "o2.xDesktop.UserData",
// // "o2.xDesktop.Access",
// // "o2.widget.UUID",
// // "o2.xDesktop.Menu",
// // //"o2.xDesktop.shortcut",
// // "o2.widget.PinYin",
// // "o2.xDesktop.Access",
// //"o2.xDesktop.MessageMobile"
// ];
// //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);
layout.openLogin();
});
//});
}
});
layout.openLogin = function () {
o2.require("o2.widget.Common", null, false);
o2.require("o2.xDesktop.Authentication", 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)
......@@ -207,7 +219,7 @@ o2.addReady(function () {
layout.authentication.loadLogin(document.body);
var loadingNode = $("browser_loading");
if (loadingNode) loadingNode.fade("out");
});
//});
};
};
});
......
o2web/source/x_desktop/js/base_simple_anonymous.js
浏览文件 @ 9a4f76b7
......@@ -48,15 +48,26 @@ o2.addReady(function () {
var lp = o2.session.path + "/lp/" + o2.language + ".js";
o2.load(lp, function () {
lpLoaded = true;
if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
});
var modules = ["o2.xDesktop.Common", "o2.xDesktop.Actions.RestActions", "o2.xAction.RestActions"];
o2.require(modules, {
"onSuccess": function () {
commonLoaded = true;
if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
}
var modules = ["o2.xDesktop.$all"];
o2.require(modules, {
"onSuccess": function () {
commonLoaded = true;
if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
},
"onEvery": function () {
_loadProgressBar();
}
});
//if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
});
// var modules = ["o2.xDesktop.Common", "o2.xDesktop.Actions.RestActions", "o2.xAction.RestActions"];
// o2.require(modules, {
// "onSuccess": function () {
// commonLoaded = true;
// if (configLoaded && commonLoaded && lpLoaded) _getDistribute(function () { _load(); });
// }
// });
o2.getJSON("../x_desktop/res/config/config.json", function (config) {
layout.config = config;
configLoaded = true
......@@ -80,48 +91,48 @@ o2.addReady(function () {
// layout.user = json.data;
// layout.session = {};
// layout.session.user = json.data;
(function (layout) {
var _loadResource = function (callback) {
var isLoadedA = false;
var isLoadedB = false;
//var isLoadedC = false;
var modules = [
"o2.xDesktop.Dialog",
"o2.xDesktop.UserData",
"o2.xDesktop.Access",
"o2.widget.UUID",
"o2.xDesktop.Menu",
"o2.xDesktop.Authentication",
// "o2.xDesktop.shortcut",
"o2.widget.PinYin",
"o2.xDesktop.Access"
// "o2.xDesktop.MessageMobile"
];
//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 () { isLoadedA = true; _check(); });
o2.require("o2.widget.Common", function () {
o2.require(modules, {
"onSuccess": function () {
o2.requireApp("Common", "", function () { isLoadedB = true; _check(); })
}
});
});
};
var _loadContent = function () {
//_loadResource(function () {
// (function (layout) {
// var _loadResource = function (callback) {
// var isLoadedA = false;
// var isLoadedB = false;
// //var isLoadedC = false;
//
// var modules = [
// "o2.xDesktop.Dialog",
// "o2.xDesktop.UserData",
// "o2.xDesktop.Access",
// "o2.widget.UUID",
// "o2.xDesktop.Menu",
// "o2.xDesktop.Authentication",
// // "o2.xDesktop.shortcut",
// "o2.widget.PinYin",
// "o2.xDesktop.Access"
// // "o2.xDesktop.MessageMobile"
// ];
// //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 () { isLoadedA = true; _check(); });
// o2.require("o2.widget.Common", function () {
// o2.require(modules, {
// "onSuccess": function () {
// o2.requireApp("Common", "", function () { isLoadedB = true; _check(); })
// }
// });
// });
// };
//
// var _loadContent = function () {
// //_loadResource(function () {
while (layout.readys && layout.readys.length) {
layout.readys.shift().apply(window);
}
//});
};
_loadContent();
})(layout);
//
// //});
// };
//
// _loadContent();
// })(layout);
};
// var json = {
// user: "anonymous",
......
o2web/source/x_desktop/oauth.html
浏览文件 @ 9a4f76b7
......@@ -12,7 +12,6 @@
<!-- <script src="res/framework/mootools/mootools-more-1.4.0.1-all_2.js"></script>-->
<script src="../o2_core/o2.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="../o2_lib/Decimal.js"></script>
<script src="js/base_simple_anonymous.js"></script>
<script>
......
o2web/source/x_desktop/oauth2.html
浏览文件 @ 9a4f76b7
......@@ -6,8 +6,7 @@
<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"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="../o2_core/o2.min.js"></script>
<script src="js/base_simple.min.js"></script>
<script src="js/oauth2.js"></script>
......
o2web/source/x_desktop/portal.html
浏览文件 @ 9a4f76b7
......@@ -6,8 +6,7 @@
<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"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="../o2_core/o2.min.js"></script>
<script src="../o2_lib/Decimal.js"></script>
<script src="js/base.min.js"></script>
<script src="js/portal.min.js"></script>
......
o2web/source/x_desktop/portalmobile.html
浏览文件 @ 9a4f76b7
......@@ -6,7 +6,6 @@
<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.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="../o2_lib/Decimal.js"></script>
<script src="js/base.min.js"></script>
<script src="js/portal.min.js"></script>
......
o2web/source/x_desktop/preview.html
浏览文件 @ 9a4f76b7
......@@ -6,9 +6,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.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="../o2_lib/Decimal.js"></script>
<script src="js/base.js"></script>
<script src="js/base.min.js"></script>
<title>FORM PREVIEW</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
......
o2web/source/x_desktop/printWork.html
浏览文件 @ 9a4f76b7
......@@ -6,8 +6,7 @@
<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.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="js/base.js"></script>
<script src="js/base.min.js"></script>
<script src="js/printWork.js"></script>
<script src="../o2_lib/Decimal.js"></script>
......
o2web/source/x_desktop/printcmsdoc.html
浏览文件 @ 9a4f76b7
......@@ -6,8 +6,7 @@
<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.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="js/base.js"></script>
<script src="js/base.min.js"></script>
<script src="js/printCMSDoc.js"></script>
<script src="../o2_lib/Decimal.js"></script>
......
o2web/source/x_desktop/processViewer.html
浏览文件 @ 9a4f76b7
......@@ -6,7 +6,6 @@
<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.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="../o2_lib/Decimal.js"></script>
<title>FORM PREVIEW</title>
......
o2web/source/x_desktop/qiyeweixinsso.html
浏览文件 @ 9a4f76b7
......@@ -6,7 +6,6 @@
<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.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="js/weixinsso.js"></script>
<script src="../o2_lib/Decimal.js"></script>
......
o2web/source/x_desktop/qywxstartprocess.html
浏览文件 @ 9a4f76b7
......@@ -9,7 +9,6 @@
<script>layout.yqwx = true;</script>
<script src="../o2_core/o2.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="../o2_lib/Decimal.js"></script>
<script src="js/base.min.js"></script>
<script src="js/qywxStartProcess.min.js"></script>
......
o2web/source/x_desktop/res/config/config.json
浏览文件 @ 9a4f76b7
......@@ -19,5 +19,11 @@
"enable": false,
"portal": "b82d7669-85d6-4c10-8151-c4d1f18ba6ef",
"page": ""
},
"urlMapping": {
"172.16.96.134:20030": "172.16.96.134/tzgsoa/center",
"172.16.96.134:20020": "172.16.96.134/tzgsoa/app",
"ng.o2oa.net:20030": "ng.o2oa.net/tzgsoa/center",
"ng.o2oa.net:20020": "ng.o2oa.net/tzgsoa/app"
}
}
\ No newline at end of file
o2web/source/x_desktop/smapsso.html
浏览文件 @ 9a4f76b7
......@@ -5,7 +5,6 @@
<meta charset="UTF-8">
<title>登录中...</title>
<script src="../o2_core/o2.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="../o2_lib/Decimal.js"></script>
<script>
function getServiceAddress(config, callback){
......
o2web/source/x_desktop/sso.html
浏览文件 @ 9a4f76b7
......@@ -5,7 +5,6 @@
<meta charset="UTF-8">
<title></title>
<script src="../o2_core/o2.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="../o2_lib/Decimal.js"></script>
<script>
function getServiceAddress(config, callback){
......
o2web/source/x_desktop/weixinsso.html
浏览文件 @ 9a4f76b7
......@@ -6,7 +6,6 @@
<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.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="js/weixinsso.js"></script>
<script src="../o2_lib/Decimal.js"></script>
......
o2web/source/x_desktop/work.html
浏览文件 @ 9a4f76b7
......@@ -7,10 +7,9 @@
<link rel="stylesheet" href="css/mBoxTooltip.css" charset="UTF-8" />
<script src="../o2_core/o2.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="../o2_lib/Decimal.js"></script>
<script src="js/base.js"></script>
<script src="js/work.js"></script>
<script src="js/base.min.js"></script>
<script src="js/work.min.js"></script>
<title>WORK</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
......
o2web/source/x_desktop/workmobile.html
浏览文件 @ 9a4f76b7
......@@ -7,11 +7,10 @@
<link rel="stylesheet" href="css/mBoxTooltip.css" charset="UTF-8" />
<script src="../o2_core/o2.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="../o2_lib/Decimal.js"></script>
<script src="js/o2m.api.js"></script>
<script src="js/base.js"></script>
<script src="js/work.js"></script>
<script src="js/base.min.js"></script>
<script src="js/work.min.js"></script>
<script>layout.mobile = true;</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" />
......
o2web/source/x_desktop/workmobilewithaction.html
浏览文件 @ 9a4f76b7
......@@ -8,7 +8,6 @@
<link rel="stylesheet" href="css/mBoxTooltip.css" charset="UTF-8" />
<script src="../o2_core/o2.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script src="../o2_lib/Decimal.js"></script>
<script src="js/o2m.api.js"></script>
<script src="js/base.min.js"></script>
......
o2web/source/x_desktop/zhengwuDingdingSso.html
浏览文件 @ 9a4f76b7
......@@ -6,7 +6,6 @@
<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.min.js"></script>
<script src="../o2_core/compatible.min.js"></script>
<script type="text/javascript" src="http://g.alicdn.com/ilw/ding/0.7.3/scripts/dingtalk.js"></script>
<script src="js/zhengwuDingdingSso.js"></script>
<script src="../o2_lib/Decimal.js"></script>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或