Skip to content

o2oa
o2oa

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

通知 333
Star 10
Fork 6
o2oa
o2oa

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

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

Merge branch 'cherry-pick-8880e34a' into 'master' 

修复语言包获取

See merge request o2oa/o2oa!6013
上级 bfe1a476 e3759df2
隐藏空白更改
内联 并排
Showing with 141 addition and 71 deletion
o2web/source/x_component_Empty/$Main/default/style.css
浏览文件 @ c63e4a81
.o2_empty_content{ .hello{
height: 800px; text-align: center;
background-color: #1d5987;
} }
.o2_empty_div1 { h3 {
color: #ffffff; margin: 40px 0 0;
background: url(../x_component_Empty/$Main/default/icons/icon_wugongzuo.png) center center no-repeat; }
width: 300px; ul {
height: 500px; list-style-type: none;
border: 1px solid #ffffff; padding: 0;
}
li {
display: inline-block;
margin: 0 10px;
}
a {
color: #42b983;
}
.logo {
margin-top: 20px;
width: 200px;
height: 200px;
} }
.taskListTable{
width: 800px;
box-sizing: border-box;
border-collapse: collapse;
}
.taskListTable th{
height: 30px;
line-height: 30px;
background-color: #d4e6fb;
}
.taskListTable td{
height: 24px;
line-height: 24px;
}
button {
cursor: pointer;
font-size: 12px;
margin: 10px;
padding: 5px 10px;
color: #ffffff;
background-color: #4a90e2;
border: 1px solid #4a90e2;
border-radius: 100px;
}
\ No newline at end of file
o2web/source/x_component_Empty/$Main/default/taskView.html 0 → 100644
浏览文件 @ c63e4a81
<h3>{{$.lp.taskListTitle}}</h3>
<br>
<table align="center" class="taskListTable" border="1">
<tr>
<th>{{$.lp.taskTitle}}</th>
<th>{{$.lp.taskProcess}}</th>
<th>{{$.lp.taskTime}}</th>
</tr>
{{each $.data}}
<tr>
<td><a href="#" data-o2-events="click:openTask:{{$.work}}">{{$.title}}</a></td>
<td>{{$.processName}}</td>
<td>{{$.startTime}}</td>
</tr>
{{end each}}
</table>
<br>
<button data-o2-events="click:openCalendar">{{$.lp.openCalendar}}</button>
<button data-o2-events="click:openOrganization">{{$.lp.openOrganization}}</button>
<button data-o2-events="click:startProcess">{{$.lp.startProcess}}</button>
<br>
<button data-o2-events="click:openInBrowser">{{$.lp.openInBrowser}}</button>
o2web/source/x_component_Empty/$Main/default/view.html
浏览文件 @ c63e4a81
<div class="o2_empty_content deepColor_bg" data-o2-element="contentNode"> <div class="hello">
<div class="o2_empty_div1" data-o2-element="myNode" data-o2-events="click:loadTask;mouseover:tabover;mouseout:tabout"> <img class="logo" alt="O2OA logo" src="../x_component_Empty/$Main/default/icons/o2logo.png">
<div class="o2_empty_div2">{{$.lp.title}}</div> <h1>{{ $.lp.welcome }}</h1>
<div class="o2_empty_div2">{{$.data.type}}</div> <p>
</div> For more O2OA development document,<br>
check out the
<div data-o2-element="eachNode"> <a href="https://www.o2oa.net/develop.html" target="_blank" rel="noopener">O2OA develop documentation</a>.
{{each ($.data.data)}} </p>
<div data-o2-events="click:clickNode">{{$.title}}</div>
{{end each}}
</div>
<div class="task" data-o2-element="taskListView"></div>
</div> </div>
o2web/source/x_component_Empty/Main.js
浏览文件 @ c63e4a81
...@@ -9,63 +9,68 @@ MWF.xApplication.Empty.Main = new Class({ ...@@ -9,63 +9,68 @@ MWF.xApplication.Empty.Main = new Class({
"name": "Empty", "name": "Empty",
"mvcStyle": "style.css", "mvcStyle": "style.css",
"icon": "icon.png", "icon": "icon.png",
"width": "400",
"height": "700",
"isResize": false,
"isMax": false,
"title": MWF.xApplication.Empty.LP.title "title": MWF.xApplication.Empty.LP.title
}, },
onQueryLoad: function(){ onQueryLoad: function(){
this.lp = MWF.xApplication.Empty.LP; this.lp = MWF.xApplication.Empty.LP;
}, },
loadApplication: function(callback){ loadApplication: function(callback){
//1var url = "../x_component_Empty/$Main/default/view.html";
var url = this.path+this.options.style+"/view.html"; var url = this.path+this.options.style+"/view.html";
var url2 = this.path+this.options.style+"/view2.html"; this.content.loadHtml(url, {"bind": {"lp": this.lp}, "module": this}, function(){
o2.Actions.load("x_processplatform_assemble_surface").TaskAction.listMyPaging(1,20, function(json){ this.loadTaskView();
}.bind(this));
this.content.loadHtml(url, {"bind": {"lp": this.lp, "data": json}, "module": this}, function(){ },
loadTaskView: function(){
o2.Actions.load("x_processplatform_assemble_surface").TaskAction.listMyPaging(1,5, function(json){
debugger;
this.taskListView.loadHtml(this.path+this.options.style+"/taskView.html", {"bind": {"lp": this.lp, "data": json.data}, "module": this}, function(){
this.doSomething(); this.doSomething();
}.bind(this)); }.bind(this));
// this.content.loadHtml(url, {"bind": {"lp": this.lp, "data": json}, "module": this}, function(){
// this.doSomething();
// }.bind(this));
//
// o2.load(["js1", "js2"], {}, function(){}); //js
//
// o2.loadCss //css
// o2.loadHtml("", {"dom": this.content})
// o2.loadAll //js,css,html
//
// o2.loadAll({
// "css": [],
// "js":[],
// "html": []
// },
// )
//
}.bind(this)); }.bind(this));
}, },
doSomething: function(){ doSomething: function(){
}, },
loadTask: function(){ openTask: function(e, data, id){
alert("loadTask"); layout.openApplication(null, "process.Work", {"workid": id});
},
openCalendar: function(){
layout.openApplication(null, "Calendar");
}, },
tabover: function(){ openOrganization: function(){
//alert("tabover"); layout.openApplication(null, "Org");
this.myNode.addClass("mainColor_bg");
}, },
tabout: function(){ openInBrowser: function() {
//alert("tabout") this.openInNewBrowser(true);
this.myNode.removeClass("mainColor_bg");
}, },
clickNode: function(e, data){ startProcess: function(){
alert(data.title); o2.api.page.startProcess();
// const cmpt = this;
// o2.requireApp([["process.TaskCenter", "lp."+o2.language], ["process.TaskCenter", ""]],"", ()=>{
// var obj = {
// "lp": o2.xApplication.process.TaskCenter.LP,
// "content": cmpt.content,
// "addEvent": function(type, fun){
// cmpt.addEvent(type, fun);
// },
// "getAction": function (callback) {
// if (!this.action) {
// this.action = o2.Actions.get("x_processplatform_assemble_surface");
// if (callback) callback();
// } else {
// if (callback) callback();
// }
// },
// "desktop": layout.desktop,
// "refreshAll": function(){},
// "notice": cmpt.notice,
// }
// o2.JSON.get("../x_component_process_TaskCenter/$Main/default/css.wcss", function(data){
// obj.css = data;
// }, false);
//
// if (!cmpt.processStarter) cmpt.processStarter = new o2.xApplication.process.TaskCenter.Starter(obj);
// cmpt.processStarter.load();
// }, true, true);
} }
}); });
o2web/source/x_component_Empty/lp/zh-cn.js
浏览文件 @ c63e4a81
MWF.xApplication.Empty.LP = { MWF.xApplication.Empty.LP = {
"title": "空" "title": "空",
"welcome": "Welcome to O2OA Component",
"taskListTitle": "此处列出您的5个最新待办",
"taskTitle": "标题",
"taskProcess": "流程",
"taskTime": "到达时间",
"openCalendar": "打开日程管理",
"openOrganization": "打开组织管理",
"startProcess": "启动流程",
"openInBrowser": "在新浏览器窗口中打开"
}; };
\ No newline at end of file
o2web/source/x_component_process_Xform/Form.js
浏览文件 @ c63e4a81
...@@ -368,6 +368,7 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class( ...@@ -368,6 +368,7 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class(
}, },
load: function (callback) { load: function (callback) {
this.loadMacro(function () { this.loadMacro(function () {
debugger
this.loadLanguage(function(flag){ this.loadLanguage(function(flag){
if (flag && this.formDataText){ if (flag && this.formDataText){
var data = o2.bindJson(this.formDataText, {"lp": MWF.xApplication.process.Xform.LP.form}); var data = o2.bindJson(this.formDataText, {"lp": MWF.xApplication.process.Xform.LP.form});
...@@ -431,6 +432,7 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class( ...@@ -431,6 +432,7 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class(
}, },
loadLanguage: function(callback){ loadLanguage: function(callback){
//formDataText //formDataText
debugger;
if (this.json.languageType!=="script" && this.json.languageType!=="default"){ if (this.json.languageType!=="script" && this.json.languageType!=="default"){
if (callback) callback(); if (callback) callback();
return true; return true;
...@@ -448,7 +450,11 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class( ...@@ -448,7 +450,11 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class(
if (this.options.macro==="PageContext"){ if (this.options.macro==="PageContext"){
var portal = this.app.portal.id; var portal = this.app.portal.id;
languageJson = this.workAction.getScriptByNameV2(portal, name, function(d){ // languageJson = this.workAction.getScriptByNameV2(portal, name, function(d){
// return this.Macro.exec(d.data.text, this);
// }.bind(this), function(){});
languageJson = this.workAction.getScriptByNameV2(portal, name).then(function(d){
return this.Macro.exec(d.data.text, this); return this.Macro.exec(d.data.text, this);
}.bind(this), function(){}); }.bind(this), function(){});
}else{ }else{
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或