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

Merge of fix/【流程管理】修复流程application中无标题显示undefined的问题 to develop

See merge request o2oa/o2oa!762

o2web/source/x_component_process_Application/Viewer.js

@@ -976,7 +976,7 @@ MWF.xApplication.process.Application.Viewer.Filter = new Class({
                 }.bind(this)
             });
         }
-        this.titleNode = new Element("div", {"styles": this.css.viewSearchFilterTextNode, "text": this.data.title}).inject(this.node);
+        this.titleNode = new Element("div", {"styles": this.css.viewSearchFilterTextNode, "text": this.data.title || ""}).inject(this.node);
         this.comparisonTitleNode = new Element("div", {"styles": this.css.viewSearchFilterTextNode, "text": this.data.comparisonTitle}).inject(this.node);
         this.valueNode = new Element("div", {"styles": this.css.viewSearchFilterTextNode, "text": "\""+this.data.value+"\""}).inject(this.node);
         this.deleteNode = new Element("div", {"styles": this.css.viewSearchFilterDeleteNode}).inject(this.node);

o2web/source/x_component_process_Application/WorkCompletedExplorer.js

@@ -151,7 +151,7 @@ MWF.xApplication.process.Application.WorkCompletedExplorer.Work = new Class({
         this.workAreaNode =  new Element("div", {"styles": this.css.workItemWorkNode}).inject(this.node);
         //this.otherWorkAreaNode =  new Element("div", {"styles": this.css.workItemWorkNode}).inject(this.node);
 
-        var html = "<div class='area1Node'><div class='checkAreaNode'></div><div class='iconAreaNode'></div><div class='titleAreaNode'><div class='titleAreaTextNode'>"+this.data.title+"</div></div></div>" +
+        var html = "<div class='area1Node'><div class='checkAreaNode'></div><div class='iconAreaNode'></div><div class='titleAreaNode'><div class='titleAreaTextNode'>"+( this.data.title || "" )+"</div></div></div>" +
             "<div class='area2Node'><div class='timeAreaNode'></div><div class='processAreaNode'><div class='processAreaTextNode'>"+this.data.processName+"</div></div></div>" +
             "<div class='area3Node'><div class='actionAreaNode'></div><div class='expireAreaNode'></div><div class='personAreaNode'></div></div>";
         this.workAreaNode.set("html", html);
@@ -198,7 +198,7 @@ MWF.xApplication.process.Application.WorkCompletedExplorer.Work = new Class({
     reload: function(callback){
         this.explorer.actions.getWorkCompleted(this.data.id, function(json){
             this.data = json.data;
-            this.titleAreaTextNode.set("text", this.data.title);
+            this.titleAreaTextNode.set("text", this.data.title || "");
             this.activityAreaTextNode.set("text", this.data.activityName);
 
             this.statusAreaNode.empty();
@@ -222,7 +222,7 @@ MWF.xApplication.process.Application.WorkCompletedExplorer.Work = new Class({
     },
     remove: function(e){
         var lp = this.explorer.app.lp;
-        var text = lp.deleteWork.replace(/{title}/g, this.data.title);
+        var text = lp.deleteWork.replace(/{title}/g, this.data.title || "");
         var _self = this;
         this.workAreaNode.setStyles(this.css.workItemWorkNode_remove);
         this.readyRemove = true;

o2web/source/x_component_process_Application/WorkExplorer.js

@@ -666,7 +666,7 @@ MWF.xApplication.process.Application.WorkExplorer.Work = new Class({
         this.workAreaNode =  new Element("div", {"styles": this.css.workItemWorkNode}).inject(this.node);
         //this.otherWorkAreaNode =  new Element("div", {"styles": this.css.workItemWorkNode}).inject(this.node);
 
-        var html = "<div class='area1Node'><div class='checkAreaNode'></div><div class='iconAreaNode'></div><div class='titleAreaNode'><div class='titleAreaTextNode'>"+this.data.title+"</div></div></div>" +
+        var html = "<div class='area1Node'><div class='checkAreaNode'></div><div class='iconAreaNode'></div><div class='titleAreaNode'><div class='titleAreaTextNode'>"+( this.data.title || "" )+"</div></div></div>" +
             "<div class='area2Node'><div class='statusAreaNode'></div><div class='activityAreaNode'><div class='activityAreaTextNode'>"+this.data.activityName+"</div></div></div>" +
             "<div class='area3Node'><div class='actionAreaNode'></div><div class='expireAreaNode'></div><div class='personAreaNode'></div></div>";
         this.workAreaNode.set("html", html);
@@ -746,7 +746,7 @@ MWF.xApplication.process.Application.WorkExplorer.Work = new Class({
         }else{
             this.explorer.actions.getWork(this.data.id, function(json){
                 this.data = json.data;
-                this.titleAreaTextNode.set("text", this.data.title);
+                this.titleAreaTextNode.set("text", this.data.title || "");
                 this.activityAreaTextNode.set("text", this.data.activityName);
 
                 this.statusAreaNode.empty();
@@ -853,7 +853,7 @@ MWF.xApplication.process.Application.WorkExplorer.Work = new Class({
     },
     processWork: function(e){
         var lp = this.explorer.app.lp;
-        var text = lp.flowWork.replace(/{title}/g, this.data.title);
+        var text = lp.flowWork.replace(/{title}/g, this.data.title || "");
         var _self = this;
         this.workAreaNode.setStyles(this.css.workItemWorkNode_action);
         this.readyFlow = true;
@@ -1105,7 +1105,7 @@ MWF.xApplication.process.Application.WorkExplorer.Work = new Class({
     },
     remove: function(e){
         var lp = this.explorer.app.lp;
-        var text = lp.deleteWork.replace(/{title}/g, this.data.title);
+        var text = lp.deleteWork.replace(/{title}/g, this.data.title || "");
         var _self = this;
         this.workAreaNode.setStyles(this.css.workItemWorkNode_remove);
         this.readyRemove = true;