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 d9b0ad64..f37d5396 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/manifest.xml b/com.actionsoft.apps.coe.pal/manifest.xml
index eaee7746..ab70da4b 100644
--- a/com.actionsoft.apps.coe.pal/manifest.xml
+++ b/com.actionsoft.apps.coe.pal/manifest.xml
@@ -81,7 +81,8 @@ AWS PAL(Process Asset Library)流程资产库是AWS CoE平台的重要产品组
true
false
- close
+ close
+ [{"name":"分类1","url":"","children":[{"name":"百度链接","url":"http://www.baidu.com"},{"name":"腾讯链接","url":"https://www.tencent.com/zh-cn/"}]},{"name":"分类2","url":"","children":[{"name":"搜狐网链接","url":"https://www.sohu.com/"},{"name":"人民网链接","url":"http://www.people.com.cn/"}]},{"name":"凤凰网链接","url":"https://www.ifeng.com/"}]
diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java
index ba93bc3d..fb7f77ed 100644
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java
@@ -595,6 +595,8 @@ public class CoeDesignerWeb extends ActionWeb {
} else {
macroLibraries.put("processOutput", false);
}
+ // 帮助工具栏扩展
+ getHelptoolExtUrl(macroLibraries);
// 操作行为日志记录
if (SDK.getAppAPI().getPropertyBooleanValue(CoEConstant.APP_ID, "IS_RECORD_OP_LOG", false)) {
CoEOpLogAPI.auditOkOp(_uc, CoEOpLogConst.MODULE_CATEGORY_REPOSITORY, CoEOpLogConst.OP_ACCESS, CoEOpLogConst.INFO_REPOSITORY_ACCESS);
@@ -615,6 +617,15 @@ public class CoeDesignerWeb extends ActionWeb {
}
}
+ /**
+ * 帮助工具栏扩展
+ * @param macroLibraries
+ */
+ private void getHelptoolExtUrl(Map macroLibraries) {
+ JSONArray propVal = SDK.getAppAPI().getPropertyJSONArrayValue(CoEConstant.APP_ID, "CUSTOM_HELP_TOOL_EXT_MENU_URL");
+ macroLibraries.put("customHelpToolExtMenuUrl", propVal);
+ }
+
// 串联分析应用片段
public void getPalProcessLinkTag(PALRepositoryModel plModel, Map macroLibraries) {
String processlinkAppId = "com.actionsoft.apps.coe.pal.processlink";
@@ -1002,7 +1013,7 @@ public class CoeDesignerWeb extends ActionWeb {
getLinker(model, macroLibraries);
return sortList;
}
-
+
protected void getBpmnDesginerUI(PALRepositoryModel plModel, Map macroLibraries, boolean isView, boolean isLock) {
// 属性过滤
String schemeId = SDK.getAppAPI().getProperty(CoEConstant.APP_ID, "FILTER_SCHEME");
@@ -1020,14 +1031,14 @@ public class CoeDesignerWeb extends ActionWeb {
if (CoeProcessLevelUtil.queryCorrelateType(plModel.getId()) == 1) { // PAL推送至BPMS，且BPMS端已分配
bpmnJs.append(baseScript.replace("$js$", "bpmn.designer.extend.core.js"));
if (plModel.isApproval() || plModel.isPublish() || plModel.isStop() || isView) {
-
+
} else {
- saveUI += "";
+ saveUI += "";
}
if (flag) {
if (CoeProcessLevelUtil.isPalManage() && !"show".equals(CoeProcessLevelCorrelateCache.getCache().get(plModel.getId()).getExt1()) && CoeProcessLevelCorrelateCache.getCache().get(plModel.getId()).getCorrelateType() == 1) {
if (CoeProcessLevelUtil.showBpmRunButton(plModel)) {// 显示在bpm运行按钮
- saveUI += "";
+ saveUI += "";
}
} else {
saveUI += "";
@@ -1040,27 +1051,27 @@ public class CoeDesignerWeb extends ActionWeb {
} else if (CoeProcessLevelUtil.hasMarked(plModel.getId())) { // PAL推送至BPMS，但BPMS端未分配
if (isSysAutoSave.equals("0")) {
if (plModel.isApproval() || plModel.isPublish() || plModel.isStop() || isView) {
-
+
} else {
- saveUI += "";
+ saveUI += "";
}
if (flag) {
- saveUI += "";
+ saveUI += "";
}
} else {
if (flag) {
- saveUI = "";
+ saveUI = "";
}
}
} else if (CoeProcessLevelUtil.queryCorrelateType(plModel.getId()) == 0) { // BPMS流程关联到PAL
bpmnJs.append(baseScript.replace("$js$", "bpmn.designer.extend.core.js"));
if (plModel.isApproval() || plModel.isPublish() || plModel.isStop() || isView) {
-
+
} else {
- saveUI += "";
+ saveUI += "";
}
if (flag) {
- saveUI += "";
+ saveUI += "";
if(UtilString.isNotEmpty(schemeId)) { //配置了属性过滤参数
saveUI += "";
saveUI += "";
@@ -1068,11 +1079,11 @@ public class CoeDesignerWeb extends ActionWeb {
}
} else if (plModel.getMethodId().equals("process.bpmn2")) { // 未标记关联，实时保存
if (isSysAutoSave.equals("0")) {
-
+
if (plModel.isApproval() || plModel.isPublish() || plModel.isStop() || isView) {
if (flag) {
if (CoeProcessLevelUtil.showBpmRunButton(plModel) && !isLock) {// 显示在bpm运行按钮
- saveUI += "";
+ saveUI += "";
}
}
} else {
@@ -1080,7 +1091,7 @@ public class CoeDesignerWeb extends ActionWeb {
if (flag) {
if (CoeProcessLevelUtil.showBpmRunButton(plModel)) {// 显示在bpm运行按钮
saveUI += "";
- saveUI += "";
+ saveUI += "";
}
}
}
@@ -1188,7 +1199,7 @@ public class CoeDesignerWeb extends ActionWeb {
definModel.setUpdateTime(new SimpleDateFormat(CoeDesignerConstant.DATE_TIME_STYLE_YYYY_MM_DD_HH_MM_SS).format(new Date()));
} else {
// 注释掉下面这段代码，不生成历史文件
- /*
+ /*
* String updateTimeFormat = "yyyy-MM-dd HH:mm:ss";
DateTime lastDateTime = new DateTime(UtilDate.getTimes(definModel.getUpdateTime(), updateTimeFormat));
Date newDate = new Date();
@@ -1200,7 +1211,7 @@ public class CoeDesignerWeb extends ActionWeb {
} else {
// 存入到运行版本里
definModel.setCreateHistory(false);
-
+
}*/
definModel.setCreateHistory(false);
}
@@ -1332,7 +1343,7 @@ public class CoeDesignerWeb extends ActionWeb {
mapNewUUID.put(oldIdT, oldIdT);
}
}
-
+
// 处理流程属性
String property = CoePropertyUtil.getPropertyValue(oldUUID + "_attr");
if (!UtilString.isEmpty(property)) {
@@ -1348,7 +1359,7 @@ public class CoeDesignerWeb extends ActionWeb {
}
return ro.toString();
}
-
+
public String definitionOfBpmnSave(String uuid, int ver, String appId, String processDefId, String op, String define, String drawMessage) {
ResponseObject responseObject = ResponseObject.newOkResponse().msg("");
String rs = "";
@@ -1492,7 +1503,7 @@ public class CoeDesignerWeb extends ActionWeb {
}
/**
- * 创建节点关系
+ * 创建节点关系
* @param oldModel
* @param createNewShapeId true 返回map中key为文件节点id，value为新创建的id； false 返回map中key为文件节点id，value与key相同
* @return map key:oldShapeId value:newShapeId/oldShapeId
@@ -1536,7 +1547,7 @@ public class CoeDesignerWeb extends ActionWeb {
}
return map;
}
-
+
/**
* 复制出现的时候-已无出现复制功能
* @param uuId
@@ -2059,7 +2070,7 @@ public class CoeDesignerWeb extends ActionWeb {
pdfContext.setSession(_uc);
return pdfContext.getDownloadURL() + "&isInline=false";
}
-
+
/*
* 锁定 解锁当前流程 xuwp
* */
@@ -2221,7 +2232,7 @@ public class CoeDesignerWeb extends ActionWeb {
List pModels = dao.getRepositoryByVersionId(pModel.getParentId());
pModel = pModels != null && pModels.size() > 0 ? pModels.get(0) : null;
if (pModel != null) {
- expendIds.add(0, pModel.getId());
+ expendIds.add(0, pModel.getId());
}
} else {
expendIds.add(0, pModel.getParentId());
@@ -2644,7 +2655,7 @@ public class CoeDesignerWeb extends ActionWeb {
String lockUser = PALRepositoryCache.getCache().get(uuid).getLockUser();
if (!UtilString.isEmpty(lockUser) && !_uc.getUID().equals(lockUser)) {
} else {
- setCurrentCheckoutRight(uuid, _uc.getUID());
+ setCurrentCheckoutRight(uuid, _uc.getUID());
}
return ro.toString();
}
@@ -2799,7 +2810,7 @@ public class CoeDesignerWeb extends ActionWeb {
}
return ro.toString();
}
-
+
/**
* 平台与PAL是否存在共享状态
* @param processDefId
@@ -2810,7 +2821,7 @@ public class CoeDesignerWeb extends ActionWeb {
PALRepositoryQueryAPIManager queryManager = PALRepositoryQueryAPIManager.getInstance();
String plid = queryManager.queryPlIdByPlAwsId(processDefId);
if( !UtilString.isEmpty(plid) ) {
- PALRepository palRepository = new PALRepository();
+ PALRepository palRepository = new PALRepository();
PALRepositoryModel plModel = palRepository.getInstance(plid);
if(plModel!=null) {
checkCorrelate = true;
@@ -2826,7 +2837,7 @@ public class CoeDesignerWeb extends ActionWeb {
}
/******************************************新版门户流程详情start********************************************************/
-
+
/**
* 门户流程详情详情
* @param rUUID 流程ID
@@ -2844,7 +2855,7 @@ public class CoeDesignerWeb extends ActionWeb {
if (plModel == null) {
return AlertWindow.getNotFoundMessagePage("未找到文件", "该文件已被删除");
}
-
+
macroLibraries.put("taskId", "");
// 增加三员管理模式taskid为new，change判断
if ("process".equals(plModel.getMethodCategory()) && !UtilString.isEmpty(taskId) && !"submit_create".equals(taskId) && !"new".equals(taskId) && !"change".equals(taskId)) {
@@ -2865,7 +2876,7 @@ public class CoeDesignerWeb extends ActionWeb {
} else {
type = CoeDesignerConstant.DESIGNER_DIFINITION_DEFAULT;
}
-
+
boolean isCorrelateBpms = PALRepositoryQueryAPIManager.getInstance().isCorrelateBpms(plModel.getId(), true);
macroLibraries.put("isMarked", false);
//默认排序
@@ -3049,12 +3060,12 @@ public class CoeDesignerWeb extends ActionWeb {
ids.add(plModel.getId());
getFilePath(sb, ids, (PALRepositoryModel)plModel);
macroLibraries.put("toolbarName", sb.toString());
-
+
List shapeIds = new ArrayList<>();// 当前流程所有节点
List> shapeList = CoeDesignerUtil.getShapeMessageJson2(rUUID);//获取所有节点
if (shapeList != null && shapeList.size() > 0) {
for (Map map : shapeList) {
- shapeIds.add((String)map.get("id"));
+ shapeIds.add((String)map.get("id"));
}
}
@@ -3089,12 +3100,12 @@ public class CoeDesignerWeb extends ActionWeb {
if (upFileObject.getJSONArray(upfileModel.getShape_uuid()) == null) {
continue;
}
-
+
upFileObject.getJSONArray(upfileModel.getShape_uuid()).add(object);
}
}
}
-
+
// 文件或节点的关联节点的附件
//查询流程和节点附件
List relationList = null;
@@ -3272,14 +3283,14 @@ public class CoeDesignerWeb extends ActionWeb {
if ("%".equals(scope) || scope.contains("%")) {
PALRepositoryAttributeModel attrModel = PALRepositoryAttributeCache.getAttributeByMethodIdAndAttrId(model.getWsId(), model.getMethodId(), attributeModel.getKey());
if (attrModel != null && "0".equals(attrModel.getIsDelete())) {
- tempList.add(attributeModel);
+ tempList.add(attributeModel);
}
}
}
}
return tempList;
}
-
+
/**
* 更多属性
*
@@ -3320,7 +3331,7 @@ public class CoeDesignerWeb extends ActionWeb {
}
return null;
}
-
+
private void getFilePath(StringBuilder sb, Set ids, PALRepositoryModel plModel) {
if (plModel.getParentId().length() >= 36) {
PALRepositoryModel parentModel = PALRepositoryCache.getCache().get(plModel.getParentId());
@@ -3334,7 +3345,7 @@ public class CoeDesignerWeb extends ActionWeb {
}
}
}
-
+
/**
* 门户打开之前的校验
* 对已发布的流程只能打开
diff --git a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm
index 305c8761..53e337e9 100644
--- a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm
+++ b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm
@@ -189,7 +189,10 @@
var ext2 = "<#ext2>";
var ext3 = "<#ext3>";
var ext4 = "<#ext4>";
-
+
+ // 帮助工具栏扩展url
+ var customHelpToolExtMenuUrl = <#customHelpToolExtMenuUrl>;
+
//是否需要保存提示
var isSave = true;
var isNeedPutMessage = true;
@@ -292,7 +295,60 @@
}