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

修复数据属性设置必填不显示星号/搜索模型增加版本管理/pal打包

Browse Source
This commit is contained in:
zhal 2022-09-22 17:57:20 +08:00
parent 98e5af9d7b
commit 9f4f683f41
9 changed files with 70 additions and 5 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.

3
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/CoeDesignerShapeAPIManager.java
View File

@ -730,6 +730,7 @@ public class CoeDesignerShapeAPIManager {
if (attr.getKey().equals(object.getString("id"))) {
String title = attr.getNewTitle();
object.put("name", title);
object.put("isRequired",attr.getIsRequired());
}
}
});
@ -769,6 +770,7 @@ public class CoeDesignerShapeAPIManager {
if (object2 != null && object2.size() > 0 && object2.getString("id").equals(attr.getKey())) {
String title = attr.getNewTitle();
object2.put("name", title);
object2.put("isRequired",attr.getIsRequired());
}
}
});
@ -806,6 +808,7 @@ public class CoeDesignerShapeAPIManager {
map1.put("readonly", AttributeModel.getReadonly());
map1.put("groupPath", AttributeModel.getGroupPath());
map1.put("scope", AttributeModel.getScope());
map1.put("isRequired",AttributeModel.getIsRequired());
attributeMap.put(AttributeModel.getKey(), map1);
}
}

27
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java
View File

@ -556,8 +556,35 @@ public class CoeDesignerWeb extends ActionWeb {
/*************************************更新当前最新的属性设置 byzhaolei*******************************************************/
CoeDesignerShapeAPIManager manager = CoeDesignerShapeAPIManager.getInstance();
String define = PALRepositoryQueryAPIManager.getInstance().getProcessDefinition(_uc, plModel.getId());
JSONObject definition = JSONObject.parseObject(define);
BaseModel defineModel = CoeDesignerAPIManager.getInstance().getDefinition(rUUID, 0);
JSONObject localAttribute = definition.containsKey("localAttribute") ? definition.getJSONObject("localAttribute") : new com.alibaba.fastjson.JSONObject();
if (localAttribute.isEmpty()) {
//处理流程节点属性配置
manager.handlePlShapeAttrConfig(plModel.getWsId(), plModel.getMethodId(), localAttribute);
}
//获取最新属性的设置
List<PALMethodAttributeModel> attrList = CoeDesignerShapeAPIManager.getInstance().getAllValidShapeAttributeModels(plModel.getWsId(), plModel.getMethodId());
//更新当前最新的属性设置
manager.handleLatestLocalAttribute(localAttribute, plModel.getWsId(), plModel.getMethodId(), attrList);
//更新attributesJsonArray
List<String> sortList = manager.handleShapeAttrSortAndName(definition, plModel.getWsId(), plModel.getMethodId(), attrList);
JSONObject elements = definition.getJSONObject("elements");
for (String id: elements.keySet()) {
JSONObject shapeObj = elements.getJSONObject(id);

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

@ -10323,6 +10323,41 @@ public String deleteReply(String replyid, String messageid) {
if (methodModel != null) {
folder = methodModel.isFolder();
}
/*CoeDesignerShapeAPIManager manager = CoeDesignerShapeAPIManager.getInstance();
BaseModel defineModel = CoeDesignerAPIManager.getInstance().getDefinition(model.getId(), 0);
String define = defineModel.getDefinition();
if(UtilString.isNotEmpty(define)) {
JSONObject definition = JSONObject.parseObject(define);
JSONObject localAttribute = definition.containsKey("localAttribute") ? definition.getJSONObject("localAttribute") : new com.alibaba.fastjson.JSONObject();
if (localAttribute.isEmpty()) {
//处理流程节点属性配置
manager.handlePlShapeAttrConfig(wsId, model.getMethodId(), localAttribute);
}
//获取最新属性的设置
List<PALMethodAttributeModel> attrList = CoeDesignerShapeAPIManager.getInstance().getAllValidShapeAttributeModels(wsId, model.getMethodId());
//更新当前最新的属性设置
manager.handleLatestLocalAttribute(localAttribute, wsId, model.getMethodId(), attrList);
//更新attributesJsonArray
List<String> sortList = manager.handleShapeAttrSortAndName(definition, wsId, model.getMethodId(), attrList);
definition.put("localAttribute", localAttribute);
defineModel.setDefinition(definition.toString());
// 保存文件
CoeDesignerAPIManager.getInstance().storeDefinition(defineModel);// dao操作
}*/
object.put("folder", folder);
JSONObject iconObj = PALMethodManager.getInstance().getPALMethodIconById(model.getMethodId());
object.put("iconCode", iconObj.getString("code"));

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

@ -13,4 +13,4 @@
var mainType = "<#mainType>";
var uid = "<#uid>";
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-35023512.6aa11ffc.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-af1b24b0.222fcd29.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-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-35023512.c778bef2.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-af1b24b0.a6158eab.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.b7e86a60.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.b7e86a60.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-313598d4.c79e8e80.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-35023512.6aa11ffc.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-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-313598d4.7d662292.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-35023512.c778bef2.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.4ff9c5f8.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.4ff9c5f8.js></script></body></html>

2
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/chunk-af1b24b0.222fcd29.css → com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/chunk-313598d4.c79e8e80.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.b7e86a60.js → com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/app.4ff9c5f8.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-313598d4.7d662292.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-af1b24b0.a6158eab.js
View File

File diff suppressed because one or more lines are too long