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:
3120626891@qq.com 2022-07-19 10:54:04 +08:00
commit d23d1fea1b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=../apps/com.actionsoft.apps.coe.pal.batch/main/favicon.ico><title>com.actionsoft.apps.coe.pal.batch</title><script>const settingParam =; <#settingParam>; <!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=../apps/com.actionsoft.apps.coe.pal.batch/main/favicon.ico><title>com.actionsoft.apps.coe.pal.batch</title><script>const settingParam = <#settingParam>;
const axiosBaseUrl = "./"; const axiosBaseUrl = "./";
const production = true;</script><script>var mainPage = '<#mainPage>';// create 批量创建 replace 批量替换 const production = true;</script><script>var mainPage = '<#mainPage>';// create 批量创建 replace 批量替换
var wsId = '<#wsId>'; var wsId = '<#wsId>';

2
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/method/cache/PALMethodCache.java vendored
View File

@ -116,7 +116,7 @@ public class PALMethodCache {
} else { } else {
List<String> result = new ArrayList<>(); List<String> result = new ArrayList<>();
//String[] methodArray = new String[] { "process", "org", "data", "itsystem", "control" }; //String[] methodArray = new String[] { "process", "org", "data", "itsystem", "control" };
String[] methodArray = new String[] { "process","control","data", "org","itsystem"}; String[] methodArray = new String[] { "process","data","control","org","itsystem"};
for (String method : methodArray) { for (String method : methodArray) {
if (list.contains(method)) { if (list.contains(method)) {
result.add(method); result.add(method);

4
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
View File

@ -7843,7 +7843,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
} }
// 内置/扩展建模方法 // 内置/扩展建模方法
List<String> palMethodCategoryList = PALMethodCache.getPALMethodList(false); List<String> palMethodCategoryList = PALMethodCache.getPALMethodList(true);
for (String c : palMethodCategoryList) { for (String c : palMethodCategoryList) {
List<PALMethodModel> list = PALMethodCache.getPALMethodModelListByMethod(c); List<PALMethodModel> list = PALMethodCache.getPALMethodModelListByMethod(c);
for (PALMethodModel model : list) { for (PALMethodModel model : list) {
@ -8146,7 +8146,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
// } // }
} }
// 保存文件属性 // 保存文件属性
PALRepositoryAPIManager.getInstance().updateRepositoryProperty(model.getId()); //PALRepositoryAPIManager.getInstance().updateRepositoryProperty(model.getId());
JSONArray repositoryPathData = CoeProcessLevelUtil.getRepositoryPath(parentId); JSONArray repositoryPathData = CoeProcessLevelUtil.getRepositoryPath(parentId);