diff --git a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar index 40e3a0a9..0fe32f6b 100644 Binary files a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar and b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar differ diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java index 9d35d9fd..23eb877a 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java @@ -2995,7 +2995,7 @@ public class ProcessPublishWeb extends ActionWeb { JSONObject jb = new JSONObject(); PALRepositoryModel pModel=PALRepositoryCache.getCache().get(relatedRowMap.get(j).getString("RELATIONFILEID")); if(pModel!=null){ - String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+ pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+_uc.getSessionId(); + String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+ pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+_uc.getSessionId() + "&browserId=" + UUIDGener.getObjectId(); jb.put("relatedName",pModel.getName()); jb.put("relatedUrl",url); jsonArray1.add(jb.toJSONString()); @@ -3246,7 +3246,7 @@ public class ProcessPublishWeb extends ActionWeb { JSONObject jb = new JSONObject(); PALRepositoryModel pModel=PALRepositoryCache.getCache().get(relatedRowMap.get(b).getString("RELATIONFILEID")); if(pModel!=null){ - String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+ pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+_uc.getSessionId(); + String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+ pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+_uc.getSessionId() + "&browserId=" + UUIDGener.getObjectId(); jb.put("relatedName",pModel.getName()); jb.put("relatedUrl",url); jsonArray1.add(jb.toJSONString()); @@ -3525,7 +3525,7 @@ public class ProcessPublishWeb extends ActionWeb { JSONObject jb = new JSONObject(); PALRepositoryModel pModel=PALRepositoryCache.getCache().get(relatedRowMap.get(b).getString("RELATIONFILEID ")); if(pModel!=null){ - String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+_uc.getSessionId(); + String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+_uc.getSessionId() + "&browserId=" + UUIDGener.getObjectId(); jb.put("relatedName",pModel.getName()); jb.put("relatedUrl",url); jsonArray1.add(jb.toJSONString()); @@ -4009,7 +4009,7 @@ public class ProcessPublishWeb extends ActionWeb { JSONObject jb = new JSONObject(); PALRepositoryModel pModel=PALRepositoryCache.getCache().get(relatedRowMap.get(j).getString("RELATIONFILEID")); if(pModel!=null){ - String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+ pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+_uc.getSessionId(); + String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+ pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+_uc.getSessionId() + "&browserId=" + UUIDGener.getObjectId(); jb.put("relatedName",pModel.getName()); jb.put("relatedUrl",url); jsonArray1.add(jb.toJSONString()); @@ -5407,7 +5407,7 @@ public class ProcessPublishWeb extends ActionWeb { PALRepositoryModel pModel=PALRepositoryCache.getCache().get(relatedRowMap.get(i).getString("RELATIONFILEID")); if(pModel!=null){ String sessionId = new SSOUtil().registerClientSessionNoPassword("admin", LoginConst.DEFAULT_LANG, "localhost", LoginConst.DEVICE_PC); - String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+ pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+sessionId; + String url=SDK.getConfAPI().getPortalUrl() + "/r/w?uuid="+ pModel.getId()+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+sessionId + "&browserId=" + UUIDGener.getObjectId(); jb.put("relatedName",pModel.getName()); jb.put("relatedUrl",url); jsonArray1.add(jb.toJSONString()); diff --git a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.process.publish.js b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.process.publish.js index 58583892..887d3d8c 100644 --- a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.process.publish.js +++ b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.process.publish.js @@ -201,9 +201,10 @@ var CoEProcessPublish = { var nodeObj = nodes[index]; if (nodeObj.id.length > 16) { order++; + var browserId = (Math.random() + new Date().getTime()).toString(16).replace(".", ""); var hrefUrl = "./w?sid=" + $("#sid").val() + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&uuid=" - + nodeObj.id + "&openType=0&openAppType=1"; + + nodeObj.id + "&openType=0&openAppType=1&browserId=" + browserId; var content = '' + order + '' @@ -227,9 +228,10 @@ var CoEProcessPublish = { var nodeObj = jsonArr[index]; if (nodeObj.ID.length > 16) { order++; + var browserId = (Math.random() + new Date().getTime()).toString(16).replace(".", ""); var hrefUrl = "./w?sid=" + $("#sid").val() + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&uuid=" - + nodeObj.PUBLISHFILEID + "&openType=0&openAppType=1"; + + nodeObj.PUBLISHFILEID + "&openType=0&openAppType=1&browserId=" + browserId; content += '' + order + '' @@ -254,9 +256,10 @@ var CoEProcessPublish = { var nodeObj = jsonArr[index]; if (nodeObj.ID.length > 16) { order++; + var browserId = (Math.random() + new Date().getTime()).toString(16).replace(".", ""); var hrefUrl = "./w?sid=" + $("#sid").val() + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&uuid=" - + nodeObj.CHANGEFILEID + "&openType=0&openAppType=1"; + + nodeObj.CHANGEFILEID + "&openType=0&openAppType=1&browserId=" + browserId; content += '' + order + '' @@ -281,9 +284,10 @@ var CoEProcessPublish = { var nodeObj = jsonArr[index]; if (nodeObj.ID.length > 16) { order++; + var browserId = (Math.random() + new Date().getTime()).toString(16).replace(".", ""); var hrefUrl = "./w?sid=" + $("#sid").val() + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&uuid=" - + nodeObj.STOPFILEID + "&openType=0&openAppType=1"; + + nodeObj.STOPFILEID + "&openType=0&openAppType=1&browserId=" + browserId; content += '' + order + '' diff --git a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/publish.manage.home.js b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/publish.manage.home.js index 46cd84ed..fba90afb 100644 --- a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/publish.manage.home.js +++ b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/publish.manage.home.js @@ -50,12 +50,12 @@ function createProcessLevelv2(wd, wsid, parentid, plLevel, div_class) { } else { msg = msg.msg; } - + var browserId = (Math.random() + new Date().getTime()).toString(16).replace(".", ""); var url = "./w?sid=" + encodeURIComponent($('#sid').val()) + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&uuid=" + msg - + "&openType=0&perms=w,d,v&filePerms=-"; + + "&openType=0&perms=w,d,v&filePerms=-&browserId=" + browserId; $("#disignerIframe").attr("src", url).attr("uuid", msg); FrmDialog.close(); setTimeout( @@ -651,6 +651,7 @@ function openDesginer(uuid, openType, plName, appId, processVersionId, if(collaboration == undefined || collaboration == null) { collaboration = "0"; } + var browserId = (Math.random() + new Date().getTime()).toString(16).replace(".", ""); var params = { sid : encodeURIComponent(jQuery('#sid').val()), cmd : "com.actionsoft.apps.coe.pal_pl_repository_designer", @@ -660,7 +661,8 @@ function openDesginer(uuid, openType, plName, appId, processVersionId, collaboration : collaboration, teamId : "", perms: "w,d,v", - filePerms: "-" + filePerms: "-", + browserId: browserId }, url, options; if (typeof (isOpenDialog) == "boolean" && isOpenDialog) {// 打开与bpmn关联的多个版本 params = {