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-20 10:17:01 +08:00
parent a742c34d5a
commit 6c2b68184b
3 changed files with 36 additions and 1 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.

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

@ -8431,7 +8431,36 @@ public class CoeProcessLevelWeb extends ActionWeb {
shape.put("id", shapeId);
shape.put("text",title);
}
//图形的数据属性配置
List<PALMethodAttributeModel> attributeModels = CoeDesignerShapeAPIManager.getInstance().getAllValidShapeAttributeModels("0285ff6a-e418-4d8b-a5b1-22240296f769", plModel.getMethodId());
for (PALMethodAttributeModel attributeModel : attributeModels) {
//todo：根据importProperty的类型获取具体保存数据值
JSONObject arributeObj = new JSONObject();
arributeObj.put("key", attributeModel.getKey());
arributeObj.put("isRequired", attributeModel.getIsRequired());
arributeObj.put("ref", attributeModel.getRef());
arributeObj.put("readonly", attributeModel.getReadonly());
arributeObj.put("scope", attributeModel.getScope());
arributeObj.put("name", attributeModel.getTitle());
arributeObj.put("id", attributeModel.getKey());
arributeObj.put("type", attributeModel.getType());
arributeObj.put("groupPath", attributeModel.getGroupPath());
arributeObj.put("desc", attributeModel.getDesc());
arributeObj.put("value", attributeModel.getValue());
JSONArray dataAttributes = shape.getJSONArray("dataAttributes");
if (!dataAttributes.isEmpty() && dataAttributes.size() > 0) {
for (Object attribute : dataAttributes) {
JSONObject obj = (JSONObject) attribute;
if (obj.containsKey("attributesJsonArray")) {
obj.getJSONArray("attributesJsonArray").add(arributeObj);
break;
}
}
}
}
JSONObject props = shape.getJSONObject("props");// 位置大小

8
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.ui.js
View File

@ -15,6 +15,8 @@ var UI = {
$.simpleAlert("该模型不允许修改名称！", 'error');
return;
}*/
$(this).hide();
$("#title_container").append("<input type='text' maxlength='400'/>");
$("#title_container").children("input").val(title.replace(/(^\s+)|(\s+$)/g, "")).select();
@ -34,9 +36,13 @@ var UI = {
* @constructor
*/
function Nameverify() {
var newTitle = $.trim($("#title_container").children("input").val());
newTitle = newTitle.replace(/(^\s+)|(\s+$)/g, "");
var judgeFn = new RegExp(/\s+/g);
if (judgeFn.test(newTitle)) {
$.simpleAlert("模型名称不允许包含空格！", 'error');
return;
}
var oldTitle = $(".diagram_title").text();
oldTitle = oldTitle.replace(/(^\s+)|(\s+$)/g, "");
if (newTitle != oldTitle && chartId != "") {