提交 ad0b8644 编写于 作者: 蔡祥熠

Merge branch 'fix/Process.start_process_exception' into 'develop'

Merge of fix/[流程管理]修复新建流程的时候,有可能会出现[object]字样的问题 to develop

See merge request o2oa/o2oa!878
...@@ -909,6 +909,7 @@ MWF.xApplication.process.TaskCenter.AllApplication = new Class({ ...@@ -909,6 +909,7 @@ MWF.xApplication.process.TaskCenter.AllApplication = new Class({
//this.loadSearch(); //this.loadSearch();
MWF.UD.getDataJson("taskCenter_startTop", function(json){ MWF.UD.getDataJson("taskCenter_startTop", function(json){
this.top5Data = json; this.top5Data = json;
debugger;
if (this.top5Data && this.top5Data.length){ if (this.top5Data && this.top5Data.length){
new Element("div", {"styles": this.css.applicationChildTitleNode, "text": this.app.lp.startTop5}).inject(this.childNode); new Element("div", {"styles": this.css.applicationChildTitleNode, "text": this.app.lp.startTop5}).inject(this.childNode);
var top5ChildNode = new Element("div", {"styles": this.css.applicationChildChildNode}).inject(this.childNode); var top5ChildNode = new Element("div", {"styles": this.css.applicationChildChildNode}).inject(this.childNode);
...@@ -978,8 +979,14 @@ MWF.xApplication.process.TaskCenter.Process = new Class({ ...@@ -978,8 +979,14 @@ MWF.xApplication.process.TaskCenter.Process = new Class({
this.actionNode = new Element("div", {"styles": this.css.processActionNode, "text": this.app.lp.start}).inject(this.node); this.actionNode = new Element("div", {"styles": this.css.processActionNode, "text": this.app.lp.start}).inject(this.node);
this.textNode = new Element("div", {"styles": this.css.processTextNode}).inject(this.node); this.textNode = new Element("div", {"styles": this.css.processTextNode}).inject(this.node);
var appName = "";
if( typeOf( this.data.applicationName ) === "string" ){
appName = this.data.applicationName;
}else if( typeOf( this.data.applicationName ) === "object" && this.data.applicationName.name ){
appName = this.data.applicationName.name;
}
this.textNode.set({ this.textNode.set({
"text": this.data.name+((this.data.applicationName) ? " -- ("+this.data.applicationName+")" : ""), "text": this.data.name+((this.data.applicationName) ? " -- ("+appName+")" : ""),
"title": this.data.name+"-"+this.data.description "title": this.data.name+"-"+this.data.description
}); });
//var _self = this; //var _self = this;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册