diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar index 154266fd..38472c35 100644 Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/RepositoryTreeUtil.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/RepositoryTreeUtil.java index 187fba7e..9662d016 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/RepositoryTreeUtil.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/RepositoryTreeUtil.java @@ -122,13 +122,59 @@ public class RepositoryTreeUtil { palObject.put("icon", "../apps/com.actionsoft.apps.coe.method.process.flowchart/img/method/process.flowchart/16.png"); } } else { - if (palModel.getMethodId().equals("default")) { + /*if (palModel.getMethodId().equals("default")) { palObject.put("iconFont", ""); // palObject.put("icon", "../apps/" + CoEConstant.APP_ID + "/img/icon/unprofessional_tree_folder.png"); } else { // palObject.put("icon", ""); palObject.put("iconFont", ""); + }*/ + + + if (palModel.getMethodId().equals("default")) { + JSONObject iconFont = new JSONObject(); + iconFont.put("code", ""); + iconFont.put("color", "#FFB718"); + palObject.put("iconFont", iconFont); + } else if (palModel.getMethodId().equals("process.epc")) { + JSONObject iconFont = new JSONObject(); + iconFont.put("code", ""); + iconFont.put("color", "#5882F9"); + palObject.put("iconFont", iconFont); + } else if (palModel.getMethodId().equals("process.bpmn2")) { + JSONObject iconFont = new JSONObject(); + iconFont.put("code", ""); + iconFont.put("color", "#5882F9"); + palObject.put("iconFont", iconFont); + } else if (palModel.getMethodId().equals("control.policy")) { + JSONObject iconFont = new JSONObject(); + iconFont.put("code", ""); + iconFont.put("color", "#349B53"); + palObject.put("iconFont", iconFont); + } else if (palModel.getMethodId().equals("process.flowchart")) { + JSONObject iconFont = new JSONObject(); + iconFont.put("code", ""); + iconFont.put("color", "#5882F9"); + palObject.put("iconFont", iconFont); + } else if (palModel.getMethodId().equals("process.evc")) { + JSONObject iconFont = new JSONObject(); + iconFont.put("code", ""); + iconFont.put("color", "#5882F9"); + palObject.put("iconFont", iconFont); + } else if (palModel.getMethodId().equals("data.form")) { + JSONObject iconFont = new JSONObject(); + iconFont.put("code", ""); + iconFont.put("color", "#FFB718"); + palObject.put("iconFont", iconFont); + }else if(palModel.getMethodId().equals("process.framework")){ + JSONObject iconFont = new JSONObject(); + iconFont.put("code", ""); + iconFont.put("color", "#FFB718"); + palObject.put("iconFont", iconFont); + }else { + palObject.put("iconFont", ""); } + } List children = PALRepositoryQueryAPIManager.getInstance().getUsedPalRepositoryModelsByPid(palModel.getWsId(), palModel.getId()); if (children == null || children.size() == 0) { diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js index 448534c4..39fec9cb 100644 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js @@ -200,7 +200,8 @@ $(function() { }); } }; - + + //在弹出“是否离开”的提示框后,选择离开,则触发onunload事件 window.onunload = function(){ //关闭页面时,释放编辑权