yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/apps_dev' into apps_dev

Browse Source
This commit is contained in:
chengli 2022-07-23 16:16:07 +08:00
commit 0b5d3521bc
5 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
View File

Binary file not shown.

2
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java
View File

@ -1076,7 +1076,7 @@ public class DesignerRelationShapeWeb extends ActionWeb {
*/
public String getTreeJson(String wsId, String pid,String attrId,String uuid) {
JSONArray list;
if(attrId.equals("Process_performance_metrics")){
if(attrId.equals("Process_performance_metrics") || attrId.equals("role")){
list= PALRepositoryQueryAPIManager.getInstance().getUsedPalRepositoryTreeDataByPidAnduuid(_uc, wsId,pid,attrId,uuid);
}else{
list= PALRepositoryQueryAPIManager.getInstance().getUsedPalRepositoryTreeDataByPid(_uc, wsId, pid);

2
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java
View File

@ -2284,7 +2284,6 @@ public class CoeProcessLevelUtil {
taskId=getLastPublishTaskIdByModelId(model.getId());
}
}
System.out.println("taskID==========="+taskId);
String url=SDK.getPortalAPI().getPortalUrl()+"/r/w?cmd=com.actionsoft.apps.coe.pal.publisher_publish_file_open&uuid="+relationFileId+""+"&sid="+sessionId+"&taskId="+taskId;
@ -2298,7 +2297,6 @@ public class CoeProcessLevelUtil {
}
}
appUrl="<a href='"+url+"' style='color:blue' target='_blank'>"+inputValue+"</a>";
System.out.println("appurl==============="+appUrl);
attribute.put("value", appUrl);
}
}else{

1
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.designer.shapes.js
View File

@ -238,7 +238,6 @@ function searchEdit() {
}
function loadData(treeNode) {
// attrId=attrId;
// 如果是父节点并且存在子节点执行加载
if (treeNode) {

2
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
View File

@ -1495,12 +1495,10 @@ function initProcessDesc() {
}
function autoClickAttr() {
debugger;
// 属性自动切换
if ($('#openTab').is(':hidden')) {
var name = '';
if (Utils.getSelected()[0] == null) {
debugger;
name = 'processDesc';
} else {
name = 'processAttr';