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

修复移动文件判断

Browse Source
This commit is contained in:
zhal 2022-09-27 12:32:45 +08:00
parent 033567c81b
commit 61f8e1b76f
8 changed files with 50 additions and 9 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.

1
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynRoleNameJob.java
View File

@ -33,6 +33,7 @@ public class SynRoleNameJob implements IJob {
int r = DBSql.update("update APP_ACT_COE_PAL_REPOSITORY set PLNAME=? where ID=? and PLMETHODID='org.role'", new Object[] { finalRoleName, id }); int r = DBSql.update("update APP_ACT_COE_PAL_REPOSITORY set PLNAME=? where ID=? and PLMETHODID='org.role'", new Object[] { finalRoleName, id });
} }
} }
if (k > 0) { if (k > 0) {

48
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/RepositoryTreeUtil.java
View File

@ -12,6 +12,7 @@ import com.actionsoft.apps.coe.pal.pal.method.cache.PALMethodCache;
import com.actionsoft.apps.coe.pal.pal.method.model.PALMethodModel; import com.actionsoft.apps.coe.pal.pal.method.model.PALMethodModel;
import com.actionsoft.apps.coe.pal.pal.repository.web.CoeProcessLevelWeb; import com.actionsoft.apps.coe.pal.pal.repository.web.CoeProcessLevelWeb;
import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil; import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil;
import com.actionsoft.apps.coe.pal.util.BpmOrgUtil;
import com.actionsoft.apps.coe.pal.util.HighSecurityUtil; import com.actionsoft.apps.coe.pal.util.HighSecurityUtil;
import com.actionsoft.bpms.commons.mvc.view.ResponseObject; import com.actionsoft.bpms.commons.mvc.view.ResponseObject;
import com.actionsoft.bpms.org.model.DepartmentModel; import com.actionsoft.bpms.org.model.DepartmentModel;
@ -182,6 +183,7 @@ public class RepositoryTreeUtil {
object.setDutyDept(repository.getDutyDept()); object.setDutyDept(repository.getDutyDept());
object.setDutyUser(repository.getDutyUser()); object.setDutyUser(repository.getDutyUser());
object.setParentId(repository.getParentId()); object.setParentId(repository.getParentId());
list.add(object); list.add(object);
} }
Collections.sort(list, new Comparator1()); Collections.sort(list, new Comparator1());
@ -218,11 +220,49 @@ public class RepositoryTreeUtil {
palObject.put("icon", "../apps/com.actionsoft.apps.coe.method.process.flowchart/img/method/process.flowchart/16.png"); palObject.put("icon", "../apps/com.actionsoft.apps.coe.method.process.flowchart/img/method/process.flowchart/16.png");
} }
} else { } else {
if (palModel.getMethodId().equals("default")) { if (palModel.getMethodId().equals("default")) {
palObject.put("iconFont", "&#59179"); palObject.put("iconFont", "&#59179");
} else { } else {
palObject.put("iconFont", "&#59101");
}
/*if (palModel.getMethodId().equals("default")) {
JSONObject iconFont = new JSONObject();
iconFont.put("code", "&#59179");
iconFont.put("color", "#FFB718");
palObject.put("iconFont", iconFont);
} else if (palModel.getMethodId().equals("process.epc")) {
JSONObject iconFont = new JSONObject();
iconFont.put("code", "&#xe605");
iconFont.put("color", "#5882F9");
palObject.put("iconFont", iconFont);
} else if (palModel.getMethodId().equals("process.bpmn2")) {
JSONObject iconFont = new JSONObject();
iconFont.put("code", "&#xe665");
iconFont.put("color", "#5882F9");
palObject.put("iconFont", iconFont);
} else if (palModel.getMethodId().equals("control.policy")) {
palObject.put("iconFont", "&#xe69c");
} else if (palModel.getMethodId().equals("process.flowchart")) {
palObject.put("iconFont", "&#xe75b");
} else if (palModel.getMethodId().equals("process.evc")) {
palObject.put("iconFont", "&#xe75b");
} else if (palModel.getMethodId().equals("data.form")) {
JSONObject iconFont = new JSONObject();
iconFont.put("code", "&#xe80b");
iconFont.put("color", "#FFB718");
palObject.put("iconFont", iconFont);
}else if(palModel.getMethodId().equals("process.framework")){
JSONObject iconFont = new JSONObject();
iconFont.put("code", "&#xe610");
iconFont.put("color", "#5882F9");
palObject.put("iconFont", iconFont);
}else {
palObject.put("iconFont", "&#59101"); palObject.put("iconFont", "&#59101");
} }*/
} }
List<PALRepositoryModel> children = PALRepositoryQueryAPIManager.getInstance().getUsedPalRepositoryModelsByPid(palModel.getWsId(), palModel.getId()); List<PALRepositoryModel> children = PALRepositoryQueryAPIManager.getInstance().getUsedPalRepositoryModelsByPid(palModel.getWsId(), palModel.getId());
if (children == null || children.size() == 0) { if (children == null || children.size() == 0) {

2
com.actionsoft.apps.coe.pal/template/page/main.htm
View File

@ -13,4 +13,4 @@
var mainType = "<#mainType>"; var mainType = "<#mainType>";
var uid = "<#uid>"; var uid = "<#uid>";
var wHref = "./w"; var wHref = "./w";
var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-18ba0bf3.b9b5de63.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-1fd5b92a.9170273e.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-25c1c630.dc8349fb.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-3a7599c6.bb861d84.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-532765fe.0cca68dd.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-6c83edf4.6c467910.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-7cc4d288.1140fb8d.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-9d1e04c4.d1caea12.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-f3e4ff48.721c4dc9.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-18ba0bf3.d0d27872.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-1fd5b92a.07c16352.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-25c1c630.8933349a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.ca03ae9d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0b25b0.3ebfc816.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.3038704d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.96ada280.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.e62adedc.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.44cb7f2b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-3a7599c6.5d555915.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-532765fe.9bb04323.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-5ca06e36.c64d879b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-6c83edf4.93b8726a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-7cc4d288.df0abe9e.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-9d1e04c4.ddede9a0.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-bf7921b8.1d6eee48.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-f3e4ff48.6d7f9787.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.634e376c.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal/main/js/app.8757c583.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.bd2b52b4.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.634e376c.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.bd2b52b4.js></script><script src=../apps/com.actionsoft.apps.coe.pal/main/js/app.8757c583.js></script></body></html> var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-18ba0bf3.b9b5de63.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-1fd5b92a.9170273e.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-20319d2c.36813ab8.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-25c1c630.dc8349fb.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-3a7599c6.bb861d84.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-532765fe.0cca68dd.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-6c83edf4.6c467910.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-9d1e04c4.d1caea12.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-f3e4ff48.721c4dc9.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-18ba0bf3.d0d27872.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-1fd5b92a.07c16352.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-20319d2c.49f2364f.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-25c1c630.8933349a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.ca03ae9d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0b25b0.3ebfc816.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.3038704d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.96ada280.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.e62adedc.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.44cb7f2b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-3a7599c6.5d555915.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-532765fe.9bb04323.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-5ca06e36.c64d879b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-6c83edf4.93b8726a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-9d1e04c4.ddede9a0.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-bf7921b8.1d6eee48.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-f3e4ff48.6d7f9787.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.634e376c.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal/main/js/app.147ee572.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.bd2b52b4.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.634e376c.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.bd2b52b4.js></script><script src=../apps/com.actionsoft.apps.coe.pal/main/js/app.147ee572.js></script></body></html>

2
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/chunk-7cc4d288.1140fb8d.css → com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/chunk-20319d2c.36813ab8.css
View File

File diff suppressed because one or more lines are too long

4
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/app.8757c583.js → com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/app.147ee572.js
View File

File diff suppressed because one or more lines are too long

1
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-20319d2c.49f2364f.js Normal file
View File

File diff suppressed because one or more lines are too long

1
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-7cc4d288.df0abe9e.js
View File

File diff suppressed because one or more lines are too long