Skip to content

o2oa
o2oa

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

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

通知 5
Star 0
Fork 0
o2oa
o2oa

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

未验证 提交 359f60fe 编写于 作者: H huqi1980 提交者： GitHub
浏览文件
操作

Merge pull request #49 from huqi1980/master 

20190828
上级 53dd3307 1c83ba30
展开全部 隐藏空白更改
内联 并排
Showing with 27981 addition and 5166 deletion

要显示的变更太多。

To preserve performance only 1000 of 1000+ files are displayed.
文本差异 电子邮件补丁
o2web/source/o2_core/init.js 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
o2web/source/o2_core/o2.js
浏览文件 @ 359f60fe
......@@ -53,8 +53,8 @@
}
this.o2 = {
"version": {
"v": '2.0.9',
"build": "2018.11.22",
"v": '2.1.4',
"build": "2019.07.31",
"info": "O2OA 活力办公 创意无限. Copyright © 2018, o2oa.net O2 Team All rights reserved."
},
"session": {
......@@ -64,6 +64,7 @@
"language": _lp,
"splitStr": /\s*(?:,|;)\s*/
};
this.wrdp = this.o2;
var _attempt = function(){
for (var i = 0, l = arguments.length; i < l; i++){
......@@ -412,11 +413,28 @@
if (op.dom){
var rex = new RegExp("(.+)(?=\\{)", "g");
var match;
var prefix = "." + uuid + " ";
while ((match = rex.exec(cssText)) !== null) {
var prefix = "." + uuid + " ";
var rule = prefix + match[0];
cssText = cssText.substring(0, match.index) + rule + cssText.substring(rex.lastIndex, cssText.length);
rex.lastIndex = rex.lastIndex + prefix.length;
// var rule = prefix + match[0];
// cssText = cssText.substring(0, match.index) + rule + cssText.substring(rex.lastIndex, cssText.length);
// rex.lastIndex = rex.lastIndex + prefix.length;
var rulesStr = match[0];
if (rulesStr.indexOf(",")!=-1){
var rules = rulesStr.split(/\s*,\s*/g);
rules = rules.map(function(r){
return prefix + r;
});
var rule = rules.join(", ");
cssText = cssText.substring(0, match.index) + rule + cssText.substring(rex.lastIndex, cssText.length);
rex.lastIndex = rex.lastIndex + (prefix.length*rules.length);
}else{
var rule = prefix + match[0];
cssText = cssText.substring(0, match.index) + rule + cssText.substring(rex.lastIndex, cssText.length);
rex.lastIndex = rex.lastIndex + prefix.length;
}
}
}
var style = op.doc.createElement("style");
......@@ -600,85 +618,6 @@
_loadAll(modules, op, cb);
};
//json template
// _parseText = function(html, json){
// var _ht = html;
// var regexp = /(text\{).+?\}/g;
// var r = _ht.match(regexp);
// if(r) if (r.length){
// for (var i=0; i<r.length; i++){
// var text = r[i].substr(0,r[i].lastIndexOf("}"));
// text = text.substr(text.indexOf("{")+1,text.length);
// var value = _jsonText(json ,text);
// _ht = _ht.replace(/(text\{).+?\}/,value);
// }
// }
// return _ht;
// };
// _parseEach = function(html, json){
// var _ht = html;
// var regexp = /(\{each\([\s\S]+\)\})[\s\S]+?(\{endEach\})/g;
// var r = _ht.match(regexp);
// if(r){
// if (r.length){
// for (var i=0; i<r.length; i++){
// var eachItemsStr = r[i].substr(0,r[i].indexOf(")"));
// eachItemsStr = eachItemsStr.substr(eachItemsStr.indexOf("(")+1,eachItemsStr.length);
// var pars = eachItemsStr.split(/,[\s]*/g);
// eachItemsPar = pars[0];
// eachItemsCount = pars[1].toInt();
//
// var eachItems = _jsonText(json ,eachItemsPar);
// if (eachItems) if (eachItemsCount==0) eachItemsCount = eachItems.length;
//
// var eachContentStr = r[i].substr(0,r[i].lastIndexOf("{endEach}"));
// eachContentStr = eachContentStr.substr(eachContentStr.indexOf("}")+1,eachContentStr.length);
//
// var eachContent = [];
// if (eachItems){
// for (var n=0; n<Math.min(eachItems.length, eachItemsCount); n++){
// var item = eachItems[n];
// if (item){
// var tmpEachContentStr = eachContentStr;
// var textReg = /(eachText\{).+?\}/g;
// texts = tmpEachContentStr.match(textReg);
// if (texts){
// if (texts.length){
// for (var j=0; j<texts.length; j++){
// var text = texts[j].substr(0,texts[j].lastIndexOf("}"));
// text = text.substr(text.indexOf("{")+1,text.length);
//
// var value = _jsonText(item ,text);
// tmpEachContentStr = tmpEachContentStr.replace(/(eachText\{).+?\}/,value);
// }
// }
// }
// eachContent.push(tmpEachContentStr);
// }
// }
// }
// _ht = _ht.replace(/(\{each\([\s\S]+\)\})[\s\S]+?(\{endEach\})/,eachContent.join(""));
// }
// }
// }
// return _ht;
// };
// _jsonText = function(json, text){
// var $ = json;
// var f = eval("(x = function($){\n return "+text+";\n})");
// returnValue = f.apply(json, [$]);
// if (returnValue===undefined) returnValue="";
// returnValue = returnValue.toString();
// return returnValue || "";
// };
// var _bindJson = function(str, json){
// return _parseEach(_parseText(str, json), json);
// };
// o2.bindJson = _bindJson;
// String.prototype.bindJson = function(json){
// return _parseEach(_parseText(this, json), json);
// };
var _getIfBlockEnd = function(v){
var rex = /(\{\{if\s+)|(\{\{\s*end if\s*\}\})/gmi;
var rexEnd = /\{\{\s*end if\s*\}\}/gmi;
......@@ -784,6 +723,10 @@
if (type==="boolean") return (!!returnValue);
if (type==="object") return returnValue;
returnValue = returnValue.toString();
returnValue = returnValue.replace(/\&/g, "&amp;");
returnValue = returnValue.replace(/>/g, "&gt;");
returnValue = returnValue.replace(/</g, "&lt;");
returnValue = returnValue.replace(/\"/g, "&quot;");
return returnValue || "";
}catch(e){
if (type==="boolean") return false;
......@@ -799,8 +742,6 @@
return _parseHtml(this, json);
};
//dom ready
var _dom = {
ready: false,
......
o2web/source/o2_core/o2/o2.core.js
浏览文件 @ 359f60fe
......@@ -55,9 +55,9 @@
var _loaded = {};
var _requireJs = function(url, callback, async, compression){
var _requireJs = function(url, callback, async, compression, module){
var key = encodeURIComponent(url);
if (_loaded[key]){o2.runCallback(callback, "success"); return "";}
if (_loaded[key]){o2.runCallback(callback, "success", [module]); return "";}
var jsPath = (compression || !this.o2.session.isDebugger) ? url.replace(/\.js/, ".min.js") : url;
jsPath = (jsPath.indexOf("?")!==-1) ? jsPath+"&v="+this.o2.version.v : jsPath+"?v="+this.o2.version.v;
......@@ -66,8 +66,8 @@
url: jsPath, async: async, method: "get",
onSuccess: function(){
//try{
_loaded[key] = true;
o2.runCallback(callback, "success");
_loaded[key] = true;
o2.runCallback(callback, "success", [module]);
//}catch (e){
// o2.runCallback(callback, "failure", [e]);
//}
......@@ -89,13 +89,14 @@
var loadAsync = (async!==false);
_requireJs(jsPath, callback, loadAsync, compression);
_requireJs(jsPath, callback, loadAsync, compression, module);
};
var _requireSequence = function(fun, module, thisLoaded, thisErrorLoaded, callback, async, compression){
var m = module.shift();
fun(m, {
"onSuccess": function(){
thisLoaded.push(module[i]);
"onSuccess": function(m){
thisLoaded.push(m);
o2.runCallback(callback, "every", [m]);
if (module.length){
_requireSequence(module, thisLoaded, thisErrorLoaded, callback);
}else{
......@@ -115,8 +116,9 @@
var _requireDisarray = function(fun, module, thisLoaded, thisErrorLoaded, callback, async, compression){
for (var i=0; i<module.length; i++){
fun(module[i], {
"onSuccess": function(){
thisLoaded.push(module[i]);
"onSuccess": function(m){
thisLoaded.push(m);
o2.runCallback(callback, "every", [m]);
if ((thisLoaded.length+thisErrorLoaded.length)===module.length){
if (thisErrorLoaded.length){
o2.runCallback(callback, "failure", [thisLoaded, thisErrorLoaded]);
......
o2web/source/o2_core/o2/widget/$AttachmentController/cmcc/css.wcss 0 → 100644
浏览文件 @ 359f60fe
{
"container": {
"border": "1px solid #b6b6b6",
// "height": "180px",
"min-height": "180px",
"background": "#FFF",
"margin-top": "10px",
"overflow": "hidden"
},
"container_min": {
"border": "0px solid #b6b6b6",
"min-height": "30px",
"overflow": "hidden",
"background": "transparent",
"height": "auto"
},
"minActionAreaNode": {
"float": "right",
"height": "26px",
"margin": "2px",
"border": "1px solid #979797",
"border-radius": "3px",
"background-image": "url("+o2.session.path+"/widget/$AttachmentController/default/buttonbg.png)"
},
"minContentNode": {
"margin-right":"150px",
"min-height": "30px",
"overflow": "hidden"
},
"titleNode": {
"height": "30px",
"background-color": "#DDD",
"border-top": "1px solid #FFF",
"border-bottom": "1px solid #b6b6b6",
"line-height": "30px",
"font-weight": "bold",
"padding-left": "10px",
"text-align": "left"
},
"topNode": {
"height": "40px",
"background-image": "url("+o2.session.path+"/widget/$AttachmentController/default/bg.png)",
"border-top": "1px solid #FFF",
"border-bottom": "1px solid #b6b6b6"
},
"actionsBoxNode": {
"overflow": "hidden",
"border-bottom": "1px solid #eaebea",
"float": "left",
"margin-left": "10px",
"margin-top": "5px",
"border-radius": "3px",
"background-image": "url("+o2.session.path+"/widget/$AttachmentController/default/buttonbg.png)"
},
"actionsGroupNode": {
"height": "26px",
"border": "1px solid #979797",
"border-radius": "3px",
"background-image": "url("+o2.session.path+"/widget/$AttachmentController/default/buttonbg.png)"
},
"actionNode": {
"float": "left",
"width": "26px",
"height": "26px",
"cursor": "default"
},
"actionIconNode": {
"width": "26px",
"height": "26px",
"background-repeat": "no-repeat",
"background-position": "center center"
},
"separateNode": {
"width":"1px",
"height": "16px",
"margin-top": "5px",
"margin-left": "5px",
"margin-right": "5px",
"border-left": "1px solid #bcbcbc",
"background-color": "#f1f1f1",
"float": "left"
},
"contentScrollNode": {
"background-color": "#FFF",
"overflow": "hidden",
"min-height": "130px"
},
"contentNode": {
"background-color": "#FFF",
"overflow": "hidden",
"margin-right": "6px"
},
"bottomNode": {
"height": "7px",
"border-top": "1px solid #b6b6b6",
"background-color": "#e8e8e8"
},
"resizeNode": {
"height": "7px",
"cursor": "row-resize"
},
"attachmentNode_icon": {
"width": "90px",
"height": "100px",
"padding": "5px",
"float": "left",
"margin": "10px 0px 10px 10px",
"border-radius": "3px",
//"border": "2px solid #FFF",
"background": "transparent",
"-webkit-user-select": "text",
"-moz-user-select": "text"
},
"attachmentNode_icon_over": {
//"border": "2px solid #cdcfd1",
"background": "#eaf0f5"
},
"attachmentNode_icon_selected": {
//"border": "2px solid #d7e1e8",
"background": "#d7e1e8"
},
"attachmentIconNode": {
"width": "90px",
"height": "66px",
"text-align": "center"
},
"attachmentIconImgAreaNode": {
"width": "64px",
"height": "64px",
"margin": "auto"
},
"attachmentIconImgNode": {
"width": "64px",
"height": "64px"
},
"attachmentTextNode": {
"height": "34px",
"line-height": "17px",
"overflow": "hidden",
"word-break": "break-all",
"text-overflow": "ellipsis",
"text-align": "center"
},
"attachmentNode_sequence": {
"width": "auto",
"height": "30px",
"padding": "0px",
"float": "none",
"border-radius": "0px",
"border": "0px solid #FFF",
"background": "transparent",
"margin": "0px 10px",
"-webkit-user-select": "text",
"-moz-user-select": "text"
},
"attachmentNode_sequence_over": {
"border": "0px solid #cdcfd1",
"background": "#eaf0f5"
},
"attachmentNode_sequence_selected": {
"border": "0px solid #d7e1e8",
"background": "#d7e1e8"
},
"attachmentSeqNode_sequence": {
"width": "30px",
"height": "30px",
"line-height": "30px",
"color": "#666666",
"float": "left",
"text-align": "center"
},
"attachmentTextNode_sequence": {
"height": "30px",
"line-height": "30px",
"margin-left": "70px",
"overflow": "hidden",
"word-break": "break-all",
"text-overflow": "ellipsis",
"text-align": "left"
},
"attachmentNode_list": {
"width": "auto",
"height": "30px",
"padding": "0px",
"float": "none",
"border-radius": "0px",
"border": "0px solid #FFF",
"background": "transparent",
"margin": "0px 10px",
"-webkit-user-select": "text",
"-moz-user-select": "text"
},
"attachmentNode_list_over": {
"border": "0px solid #cdcfd1",
"background": "#eaf0f5"
},
"attachmentNode_list_selected": {
"border": "0px solid #d7e1e8",
"background": "#d7e1e8"
},
"attachmentIconNode_list": {
"width": "40px",
"height": "30px",
"float": "left"
},
"attachmentIconImgAreaNode_list": {
"width": "24px",
"height": "24px",
"margin": "3px 8px"
},
"attachmentIconImgNode_list": {
"width": "24px",
"height": "24px"
},
"attachmentTextNode_list": {
"height": "30px",
"line-height": "30px",
"margin-left": "40px",
"overflow": "hidden",
"word-break": "break-all",
"text-overflow": "ellipsis",
"text-align": "left"
},
"attachmentTextTitleNode_list": {
"height": "30px",
"float": "left",
"width": "30%"
},
"attachmentTextSizeNode_list": {
"height": "30px",
"float": "left",
"width": "15%"
},
"attachmentTextUploaderNode_list": {
"height": "30px",
"float": "left",
"width": "15%"
},
"attachmentTextTimeNode_list": {
"height": "30px",
"float": "left",
"width": "20%"
},
"attachmentTextActivityNode_list": {
"height": "30px",
"float": "left",
"width": "20%"
},
"attachmentNode_preview": {
"width": "180px",
"height": "160px",
"padding": "5px",
"float": "left",
"margin": "10px 5px 10px 5px",
"border-radius": "3px",
//"border": "2px solid #FFF",
"background": "transparent",
"-webkit-user-select": "text",
"-moz-user-select": "text"
},
"attachmentNode_preview_over": {
//"border": "2px solid #cdcfd1",
"background": "#eaf0f5"
},
"attachmentNode_preview_selected": {
//"border": "2px solid #d7e1e8",
"background": "#d7e1e8"
},
"attachmentPreviewIconNode": {
"width": "180px",
"height": "126px",
"text-align": "center"
},
"attachmentPreviewIconImgAreaNode": {
"width": "72px",
"height": "72px",
"margin": "auto"
},
"attachmentPreviewIconImgNode": {
"width": "72px",
"height": "72px",
"margin-top": "22px"
},
"attachmentPreviewAudioNode": {
"width": "180px",
"height": "30px",
"position": "relative",
"top": "-64px",
"opacity": "0.7"
},
"attachmentPreviewVideoNode": {
"width": "180px",
"height": "126px"
},
"attachmentPreviewTextNode": {
"height": "34px",
"line-height": "17px",
"overflow": "hidden",
"word-break": "break-all",
"text-overflow": "ellipsis",
"text-align": "center"
},
"minActionNode": {
"float": "left",
"width": "26px",
"height": "26px",
"margin" : "0px 5px",
"cursor": "default"
},
"minActionIconNode": {
"width": "26px",
"height": "26px",
"background-repeat": "no-repeat",
"background-position": "center center"
},
"minAttachmentNode_sequence": {
"width": "auto",
"height": "30px",
"padding": "0px",
"float": "none",
"border-radius": "0px",
"border": "0px solid #FFF",
"background": "transparent",
"margin": "0px 5px",
"-webkit-user-select": "text",
"-moz-user-select": "text"
},
"minAttachmentNode_sequence_over": {
"border": "0px solid #cdcfd1",
"background-color": "#eaf0f5"
},
"minAttachmentNode_sequence_selected": {
"border": "0px solid #d7e1e8",
"background-color": "#d7e1e8"
},
"minAttachmentNode_list": {
"width": "auto",
"height": "30px",
"padding": "13px 0px 13px 10px",
"float": "left",
"border-radius": "0px",
"border": "0px solid #FFF",
"background": "transparent",
"-webkit-user-select": "text",
"-moz-user-select": "text",
"width" : "48%",
"border-bottom" : "1px dashed #dcdcdc"
},
"minAttachmentSepNode_list" : {
"width" : "1px",
"height" : "30px",
"float" : "right",
"overflow" : "hidden",
"border-right" : "1px dashed #dcdcdc"
},
"minAttachmentNode_list_over": {
//"border": "0px solid #cdcfd1",
//"background-color": "#eaf0f5"
},
"minAttachmentNode_list_selected": {
//"border": "0px solid #d7e1e8",
"background-color": "#d7e1e8"
},
"minAttachmentIconNode_list": {
"width": "30px",
"height": "30px",
"float": "left"
},
"minAttachmentIconImgAreaNode_list": {
"width": "24px",
"height": "24px",
"margin": "3px 3px"
},
"minAttachmentIconImgNode_list": {
"width": "24px",
"height": "24px"
},
"minAttachmentTextNode_list": {
"height": "30px",
"cursor": "default",
"line-height": "30px",
"margin-left": "0px",
"margin-right": "0px",
"overflow": "hidden",
"word-break": "break-all",
"text-overflow": "ellipsis",
"text-align": "left",
"color" : "#0b82ff"
},
"minAttachmentSizeNode_list": {
"height": "30px",
"line-height": "30px",
"margin-left" : "0px",
"margin-right": "6px",
"display" : "inline",
"color" : "#555"
},
"minAttachmentActionAreaNode" : {
"float" : "right",
"overflow" : "hidden"
},
"inputUploadAreaNode": {
"width": "450px",
"height": "160px",
"border-radius": "5px",
"box-shadow": "0px 0px 10px #FFF",
"position": "absolute",
"border": "2px solid #999",
"border-top": "4px solid #5290e5",
"background-color": "#FFF",
"z-index": 100
},
"inputUploadAreaTitleNode": {
"height": "30px",
"line-height": "30px",
"text-align": "center",
"font-weight": "bold",
"font-family": "微软雅黑",
"font-size": "14px"
},
"inputUploadAreaInforNode": {
"height": "24px",
"line-height": "24px",
"text-align": "center",
"color": "#666",
"font-family": "微软雅黑",
"font-size": "12px",
"text-align": "left",
"margin": "10px 20px 0px 20px"
},
"inputUploadAreaInputAreaNode": {
"margin": "0px 20px 20px 20px",
"height": "24px"
},
"inputUploadAreaInputNode": {
"width": "407px",
"height": "23px",
"border": "1px solid #666",
},
"inputUploadActionNode": {
"margin": "0px 20px",
"border-top": "1px solid #999",
},
"inputUploadOkButton": {
"height": "24px",
"width": "80px",
"color": "#FFF",
"background-color": "#42699e",
"border": "1px solid #1e3d67",
"border-radius": "3px",
"float": "right",
"margin-top": "10px",
"margin-left": "10px"
},
"inputUploadCancelButton": {
"height": "24px",
"width": "80px",
"color": "#666",
"background-color": "#DFDFDF",
"border": "1px solid #666",
"border-radius": "3px",
"float": "right",
"margin-top": "10px",
"margin-left": "10px"
}
}
\ No newline at end of file
o2web/source/o2_core/o2/widget/$AttachmentController/default/css.wcss
浏览文件 @ 359f60fe
......@@ -143,7 +143,7 @@
"text-overflow": "ellipsis",
"text-align": "center"
},
attachmentNode_sequence: {
"attachmentNode_sequence": {
"width": "auto",
"height": "30px",
"padding": "0px",
......@@ -312,6 +312,18 @@
},
"minActionNode": {
"float": "left",
"width": "26px",
"height": "26px",
"cursor": "default"
},
"minActionIconNode": {
"width": "26px",
"height": "26px",
"background-repeat": "no-repeat",
"background-position": "center center"
},
"minAttachmentNode_sequence": {
"width": "auto",
"height": "30px",
......@@ -335,21 +347,25 @@
"minAttachmentNode_list": {
"width": "auto",
"height": "30px",
"padding": "0px",
"padding": "0px 10px",
"float": "left",
"border-radius": "0px",
"border": "0px solid #FFF",
"background": "transparent",
"margin": "0px 5px",
"margin": "5px 5px",
"-webkit-user-select": "text",
"-moz-user-select": "text"
"-moz-user-select": "text",
"width" : "47%",
"border-right" : "1px dashed #dcdcdc"
},
"minAttachmentSepNode_list" : {
},
"minAttachmentNode_list_over": {
"border": "0px solid #cdcfd1",
//"border": "0px solid #cdcfd1",
"background-color": "#eaf0f5"
},
"minAttachmentNode_list_selected": {
"border": "0px solid #d7e1e8",
//"border": "0px solid #d7e1e8",
"background-color": "#d7e1e8"
},
"minAttachmentIconNode_list": {
......@@ -371,13 +387,25 @@
"cursor": "default",
"line-height": "30px",
"margin-left": "0px",
"margin-right": "6px",
"margin-right": "0px",
"font-size": "12px",
"overflow": "hidden",
"word-break": "break-all",
"text-overflow": "ellipsis",
"text-align": "left"
},
"minAttachmentSizeNode_list": {
"height": "30px",
"font-size": "12px",
"line-height": "30px",
"margin-left" : "0px",
"margin-right": "6px",
"display" : "inline"
},
"minAttachmentActionAreaNode" : {
"float" : "right",
"overflow" : "hidden"
},
"inputUploadAreaNode": {
"width": "450px",
"height": "160px",
......
o2web/source/o2_core/o2/widget/$Dialog/cmcc_confirm/css.wcss 0 → 100644
浏览文件 @ 359f60fe
{
"from": {
"width": "1px",
"height": "1px",
"position": "absolute",
"top": $(document.body).getSize().y/2,
"left": $(document.body).getSize().x/2,
"border-style": "solid",
"border-color": "#3C76B7",
"border-width": "0px",
"overflow": "hidden",
"background-color": "#fff",
"box-shadow": "0px 0px 20px #999999",
"z-index": "20000",
"padding": "3px" ,
"opacity": 0
},
"to": {
"background-color": "#fff",
"border-style": "solid",
"border-color": "#3C76B7",
"border-width": "0px",
"box-shadow": "0px 0px 20px #999999",
"z-index": "20000",
"overflow": "hidden",
"font-size": "14px",
"height": "60",
"padding": "0px",
"width": "300",
"position": "absolute",
"top": "0",
"left": "0",
"opacity": 1
},
"mark": {
"height": "0",
"width": "0",
"opacity": 0.5,
"position": "absolute",
"top": "0px",
"left": "0px",
"z-index": "19999",
"border-style": "none",
"border-width": "0",
"background-color": "#a1a1a1"
},
"button": {
"border" : "1px solid #1E9FFF",
"background-color" : "#1E9FFF",
"color" : "#fff",
"height" : "28px",
"line-height" : "28px",
"margin": "10px 5px",
"padding" : "0px 15px",
"border-radius" : "2px",
"font-weight" : "400",
"cursor" : "pointer"
},
"button": {
"border" : "1px solid #1E9FFF",
"background-color" : "#1E9FFF",
"color" : "#fff",
"height" : "28px",
"line-height" : "28px",
"margin": "10px 5px",
"padding" : "0px 15px",
"border-radius" : "2px",
"font-weight" : "400",
"cursor" : "pointer"
},
"cancelButton" : {
"border" : "1px solid #f1f4f9",
"background-color" : "#f1f4f9",
"color" : "#333",
"height" : "28px",
"line-height" : "28px",
"margin": "10px 5px",
"padding" : "0px 15px",
"border-radius" : "2px",
"font-weight" : "400",
"cursor" : "pointer"
},
"closeAction": {
"height": "32px",
"width": "32px",
"float": "right",
"cursor": "pointer",
"background": "url("+o2.session.path+"/widget/$Dialog/cmcc/img/close.png) center center no-repeat",
}
}
\ No newline at end of file
o2web/source/o2_core/o2/widget/$Dialog/cmcc_confirm/dialog.html 0 → 100644
浏览文件 @ 359f60fe
<div style="background-color: #f3f3f3;">
<div style="border-top-left-radius: 5px; border-top-right-radius: 5px;overflow:hidden; background-color: #f7f7f7; height: 36px; font-size: 14px; line-height: 36px; font-weight: normal; color: #333333; border-bottom: 0px;cursor: move;" class="MWF_dialod_title">
<div style="height: 36px; float:left; padding-left:20px;" class="MWF_dialod_title_text"></div>
<div style="height: 36px; float:right;" class="MWF_dialod_title_action"></div>
</div>
<div style="margin-top: 3px; background-color: #fff; overflow:hidden;">
<div class="MWF_dialod_content" style="text-align: left; padding: 12px; padding-left: 60px; line-height:20px; background-position: 15px center; background-repeat: no-repeat; background-image: url(data:image/png;base64,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);"></div>
</div>
<div style="height:50px; text-align: right; background-color: #fff;padding-right:10px;" class="MWF_dialod_button">
</div>
<div class="MWF_dialod_bottom" style="border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; background-color: #ffffff; margin-bottom: 3px;">
<div style="height: 8px;"></div>
</div>
</div>
\ No newline at end of file
o2web/source/o2_core/o2/widget/$Dialog/user/css.wcss
浏览文件 @ 359f60fe
......@@ -11,7 +11,7 @@
"overflow": "hidden",
"background-color": "#f3f3f3",
"box-shadow": "0px 0px 20px #999999",
"z-index": "20000",
"z-index": "1000",
"padding": "3px",
......@@ -24,7 +24,7 @@
"border-color": "#3C76B7",
"border-width": "1",
"box-shadow": "0px 0px 20px #999999",
"z-index": "20000",
"z-index": "1000",
"overflow": "hidden",
"font-size": "14px",
"height": "60",
......@@ -43,7 +43,7 @@
"position": "absolute",
"top": "0px",
"left": "0px",
"z-index": "19999",
"z-index": "999",
"border-style": "none",
"border-width": "0",
"background-color": "#CCC"
......
o2web/source/o2_core/o2/widget/$Dialog/view/css.wcss
浏览文件 @ 359f60fe
......@@ -49,8 +49,14 @@
"background-color": "#CCC"
},
"button": {
// "border": "1px solid #999",
// "color": "#333",
// "margin": "0px 5px",
"border": "1px solid #999",
"color": "#333",
"margin": "0px 5px"
"width": "80px",
"padding": "3px",
"border-radius": "5px",
"color": "#333",
"margin": "0px 5px"
}
}
\ No newline at end of file
o2web/source/o2_core/o2/widget/$Dialog/view/dialog.html
浏览文件 @ 359f60fe
......@@ -5,10 +5,9 @@
<div style="margin-top: 0px; overflow-y:auto">
<div class="MWF_dialod_content" style="text-align: left; padding: 0px 10px; line-height:20px;"></div>
</div>
<div style="height:22px; text-align: right;padding-right:10px; margin-top: 20px;" class="MWF_dialod_button">
<div style="height:22px; text-align: right;padding-right:10px; margin-top: 10px;" class="MWF_dialod_button">
</div>
<div class="MWF_dialod_bottom" style="; margin: 5px 0px;">
<div style="height: 8px;"></div>
</div>
</div>
\ No newline at end of file
o2web/source/o2_core/o2/widget/$Menu/cmcc/css.wcss 0 → 100644
浏览文件 @ 359f60fe
{
"container": {
"border-top": "1px solid #738ab5",
"border-left": "1px solid #738ab5",
"border-right": "1px solid #3c5b94",
"border-bottom": "1px solid #3c5b94",
"background-color": "#f7f3f7",
"padding-top": "2px",
"padding-bottom": "2px",
"padding-left": "2px",
"padding-right": "2px",
"overflow": "hidden",
"font-size": "12px",
"display": "none",
"z-index": "999",
"opacity": 0,
"position": "absolute",
"float": "left",
"min-width": "120px",
"box-shadow": "3px 3px 10px #AAA",
"cursor": "default"
},
"menuItem": {
"display":"block",
"position": "static",
"height": "24px",
"line-height": "24px",
"border": "1px solid #f7f3f7",
"background-color": "#f7f3f7"
},
"menuItemImgDiv": {
"display":"block",
"float": "left",
"width": "24px",
"height": "24px",
"text-align": "center"
},
"menuItemImg": {
"height": "16px",
"width": "16px",
"margin-top": "3px"
},
"menuItemSeparator": {
"display":"block",
"float": "left",
"height": "24px",
"width": "1px",
"background-color": "#CCCCCC",
"border-right": "1px solid #FFFFFF",
"overflow": "hidden"
},
"menuItemText": {
"display":"block",
"position": "static",
"height": "24px",
"margin-left": "35px",
"margin-right": "30px",
"line-height": "24px"
},
"menuLine": {
"position": "static",
"display":"block",
"height": "1px",
"overflow": "hidden",
"margin-left": "28px",
"margin-top": "3px",
"margin-bottom": "3px",
"background-color": "#CCCCCC",
"border-bottom": "1px solid #FFFFFF"
},
"menuItemDisable": {
"color": "#999"
},
"menuOver": {
"border": "1px solid #8d9cc3",
//"background-color": "#b5bed6"
"background-color": "#e3e7f1"
},
"menuOut": {
"border": "1px solid #f7f3f7",
"background-color": "#f7f3f7"
},
"menuDown": {
"border": "1px solid #000000",
"background-color": "#c6cde0"
},
"menuUp": {
"border": "1px solid #8d9cc3",
//"background-color": "#b5bed6"
"background-color": "#e3e7f1"
},
"toolbarButtonDownNode": {
"display":"block",
"float": "left",
"padding-left": "2px",
"padding-right": "2px",
"padding-top": "0px",
"height": "18px",
"color": "#ff0000",
"cursor": "pointer"
},
"menuItemSubmenuIcon":{
"background-image": "url("+o2.session.path+"/widget/$Menu/form/submenu.png)",
"height": "16px",
"width": "16px",
"margin-top": "4px",
"float": "right"
}
}
\ No newline at end of file
o2web/source/o2_core/o2/widget/$Tab/orgMobile/css.wcss
浏览文件 @ 359f60fe
......@@ -13,6 +13,9 @@
"display": "none",
"opacity": 0
},
"tabNodeContainerArea" : {
"overflow" : "hidden"
},
"tabNode": {
"position": "relative",
"margin-left": "2px",
......@@ -20,7 +23,7 @@
"float": "left",
"height": "40px",
"cursor": "pointer",
"min-width": "60px",
//"min-width": "60px",
"background": "#ffffff",
"border": "0px"
},
......@@ -45,7 +48,7 @@
"margin-right": "0px",
"float": "left",
"height": "40px",
"min-width": "60px",
//"min-width": "60px",
"background": "#ffffff",
"border-bottom": "2px solid #bf6364"
},
......
o2web/source/o2_core/o2/widget/$Toolbar/cmcc/css.wcss 0 → 100644
浏览文件 @ 359f60fe
{
"container": {
"background-color": "#fff",
"padding-top": "10px",
"padding-bottom": "10px",
"padding-left": "30px",
"padding-right": "2px",
"word-wrap" : "normal",
"word-break" : "keep-all",
"cursor": "pointer",
"overflow": "hidden",
"height": "auto",
"display":"block",
"font-size": "inherit",
"border-top": "0px",
"border-bottom": "2px solid #dcdcdc"
},
"toolbarSeparator": {
"display":"block",
"float": "left",
"margin-bottom": "5px",
"margin-top": "5px",
"height": "22px",
"width": "1px",
"background-color": "#888888",
"border-right": "1px solid #FFFFFF",
"overflow": "hidden"
},
"button": {
"display":"block",
"position": "static",
"float": "left",
"color" : "#fff",
"background-color": "#0b82ff",
"height": "34px",
"margin-right": "10px",
"padding-left": "15px",
"padding-right": "15px",
"cursor": "pointer",
"border-radius": "4px"
},
"buttonImgDiv": {
"display":"block",
"float": "left",
"padding-top": "9px",
"padding-bottom": "1px",
"padding-left": "1px",
"padding-right": "1px",
"cursor": "pointer"
},
"buttonImg": {
"height": "16px",
"width": "16px",
"cursor": "pointer",
"margin-top": "0px"
},
"buttonTextDiv": {
"display":"block",
"float": "left",
"height": "34px",
"padding-left": "2px",
"padding-right": "2px",
"line-height": "34px",
"cursor": "pointer"
},
"buttonDisable": {
"color": "#fff"
},
"buttonImgDivDisable": {
"color": "#fff"
},
"buttonTextDivDisable": {
"color": "#fff"
},
"buttonOver": {
"background-color": "#43ccf6"
},
"buttonOut": {
"background-color": "#0b82ff"
},
"buttonDown": {
"background-color": "#43ccf6"
},
"buttonUp": {
"background-color": "#0b82ff"
},
"toolbarButtonDownNode": {
"display":"block",
"float": "left",
"padding-left": "2px",
"padding-right": "2px",
"padding-top": "5px",
"height": "18px",
"color": "#fff",
"cursor": "pointer"
}
}
\ No newline at end of file
o2web/source/o2_core/o2/widget/$Toolbar/documentEdit/css.wcss 0 → 100644
浏览文件 @ 359f60fe
{
"container": {
"background-color": "#f9f9f9",
"padding-top": "6px",
"padding-bottom": "1px",
"padding-left": "10px",
"padding-right": "2px",
"word-wrap" : "normal",
"word-break" : "keep-all",
"cursor": "pointer",
"overflow": "hidden",
"height": "30px",
"display":"block",
"font-size": "14px"
},
"toolbarSeparator": {
"display":"block",
"float": "left",
"margin-bottom": "5px",
"margin-top": "3px",
"height": "18px",
"width": "1px",
"background-color": "#888888",
"border-right": "1px solid #FFFFFF",
"overflow": "hidden"
},
"button": {
"display":"block",
"position": "static",
"float": "left",
"border": "1px solid #f9f9f9",
"background-color": "#f9f9f9",
"height": "24px",
"margin-right": "8px",
"padding-left": "2px",
"padding-right": "2px",
"cursor": "pointer",
"color": "#333333",
"border-radius": "0px"
},
"buttonImgDiv": {
"display":"block",
"float": "left",
"padding-top": "4px",
"padding-bottom": "1px",
"padding-left": "1px",
"padding-right": "1px",
"cursor": "pointer"
},
"buttonImg": {
"height": "16px",
"width": "16px",
"cursor": "pointer",
"margin-top": "0px"
},
"buttonTextDiv": {
"display":"block",
"float": "left",
"height": "24px",
"padding-left": "2px",
"padding-right": "2px",
"line-height": "24px",
"cursor": "pointer"
},
"buttonDisable": {
"color": "#999"
},
"buttonImgDivDisable": {
"color": "#999"
},
"buttonTextDivDisable": {
"color": "#999"
},
"buttonOver": {
"background-color": "#e7e7e7",
"color": "#333333"
},
"buttonOut": {
"background-color": "#f9f9f9",
"color": "#333333"
},
"buttonDown": {
"background-color": "#dddddd",
//"background-color": "#1f77b4",
"color": "#333333"
},
"buttonUp": {
"background-color": "#e7e7e7",
"color": "#333333"
},
"toolbarButtonDownNode": {
"display":"block",
"float": "left",
"padding-left": "2px",
"padding-right": "2px",
"padding-top": "3px",
"height": "18px",
"color": "#ff0000",
"cursor": "pointer"
}
}
\ No newline at end of file
o2web/source/o2_core/o2/xDesktop/$Layout/o2/top/menu2.png 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
o2web/source/o2_lib/marked/lib/marked.js 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
o2web/source/x_component_Meeting/$Main/qrPrint.html 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
o2web/source/x_component_TeamWork/$Main/appicon.png 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
o2web/source/x_component_TeamWork/$Main/default/icon.png 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
o2web/source/x_component_TeamWork/Common.js 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
o2web/source/x_component_TeamWork/Group.js 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
o2web/source/x_component_TeamWork/GroupSelect.js 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
o2web/source/x_component_TeamWork/Main.js 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
o2web/source/x_component_TeamWork/NewProject.js 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
o2web/source/x_component_TeamWork/Project.js 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
o2web/source/x_component_TeamWork/ProjectList.js 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
o2web/source/x_component_TeamWork/ProjectSetting.js 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
o2web/source/x_component_TeamWork/Task.js 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
o2web/source/x_component_TeamWork/UploadImage.js 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
o2web/source/x_component_TeamWork/lp/zh-cn.js 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
o2web/source/x_component_cms_Xform/Comment.js 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
o2web/source/x_component_cms_Xform/widget/Comment.js 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
o2web/source/x_component_portal_PortalExplorer2/Main.js 0 → 100644
浏览文件 @ 359f60fe
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或