Merge branch 'hotfix/修复带发布节点的流程拷贝异常的问题' into 'master'

Merge of hotfix/修复带发布节点的流程拷贝异常的问题 to master

See merge request o2oa/o2oa!1135

o2web/source/x_component_process_Application/Main.js

@@ -1776,6 +1776,13 @@ MWF.xApplication.process.Application.Toolbar = new Class({
 						}).inject(select);
 					}.bind(_self));
 
+					if (json.data.publishList) json.data.publishList.each(function(activity){
+						new Element("option", {
+							"value": activity.id+"#publish",
+							"text": activity.name
+						}).inject(select);
+					}.bind(_self));
+
 					if (json.data.endList) json.data.endList.each(function(activity){
 						new Element("option", {
 							"value": activity.id+"#end",

o2web/source/x_component_process_ApplicationExplorer/Importer.js

@@ -166,6 +166,7 @@ MWF.xApplication.process.ApplicationExplorer.Importer = new Class({
                     process.parallelList.each(function(a){a.process = id;});
                     process.serviceList.each(function(a){a.process = id;});
                     process.splitList.each(function(a){a.process = id;});
+                    if(process.publishList)process.publishList.each(function(a){a.process = id;});
 
                     this.actions.updateProcess(process, function(){
                         this.progressBarTextNode.set("text", "Import Process \""+process.name+"\" ...");

o2web/source/x_component_process_ProcessManager/ProcessExplorer.js

@@ -135,6 +135,7 @@ MWF.xApplication.process.ProcessManager.ProcessExplorer = new Class({
         if (process.splitList) process.splitList.each(function(a){a.process = process.id;});
         if (process.mergeList) process.mergeList.each(function(a){a.process = process.id;});
         if (process.embedList) process.embedList.each(function(a){a.process = process.id;});
+        if (process.publishList) process.publishList.each(function(a){a.process = process.id;});
         if (process.invokeList) process.invokeList.each(function(a){a.process = process.id;});
         if (process.cancelList) process.cancelList.each(function(a){a.process = process.id;});
         if (process.delayList) process.delayList.each(function(a){a.process = process.id;});
@@ -177,6 +178,7 @@ MWF.xApplication.process.ProcessManager.ProcessExplorer = new Class({
         if (process.splitList) process.splitList.each(function(a){oldIds.push(a.id);});
         if (process.mergeList) process.mergeList.each(function(a){oldIds.push(a.id);});
         if (process.embedList) process.embedList.each(function(a){oldIds.push(a.id);});
+        if (process.publishList) process.publishList.each(function(a){oldIds.push(a.id);});
         if (process.invokeList) process.invokeList.each(function(a){oldIds.push(a.id);});
         if (process.cancelList) process.cancelList.each(function(a){oldIds.push(a.id);});
         if (process.delayList) process.delayList.each(function(a){oldIds.push(a.id);});
@@ -412,6 +414,7 @@ MWF.xApplication.process.ProcessManager.ProcessExplorer.Process = new Class({
                 if (process.splitList) process.splitList.each(function(a){oldIds.push(a.id);});
                 if (process.mergeList) process.mergeList.each(function(a){oldIds.push(a.id);});
                 if (process.embedList) process.embedList.each(function(a){oldIds.push(a.id);});
+                if (process.publishList) process.publishList.each(function(a){oldIds.push(a.id);});
                 if (process.invokeList) process.invokeList.each(function(a){oldIds.push(a.id);});
                 if (process.cancelList) process.cancelList.each(function(a){oldIds.push(a.id);});
                 if (process.delayList) process.delayList.each(function(a){oldIds.push(a.id);});

o2web/source/x_component_process_Xform/Form.js

@@ -4098,6 +4098,7 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class(
                             "choiceList",
                             "delayList",
                             "embedList",
+                            "publishList",
                             "endList",
                             "invokeList",
                             "manualList",