diff --git a/com.actionsoft.apps.coe.pal/i18n/resource.xml b/com.actionsoft.apps.coe.pal/i18n/resource.xml index 7c59209f..b48f5886 100755 --- a/com.actionsoft.apps.coe.pal/i18n/resource.xml +++ b/com.actionsoft.apps.coe.pal/i18n/resource.xml @@ -37,22 +37,22 @@ - + - + - + - + diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/method/cache/PALMethodCache.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/method/cache/PALMethodCache.java index 662ecbca..f020780a 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/method/cache/PALMethodCache.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/method/cache/PALMethodCache.java @@ -115,7 +115,8 @@ public class PALMethodCache { return list; } else { List 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"}; for (String method : methodArray) { if (list.contains(method)) { result.add(method); diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java index 64c83f41..9ffd05ce 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java @@ -7843,7 +7843,7 @@ public class CoeProcessLevelWeb extends ActionWeb { } // 内置/扩展建模方法 - List palMethodCategoryList = PALMethodCache.getPALMethodList(true); + List palMethodCategoryList = PALMethodCache.getPALMethodList(false); for (String c : palMethodCategoryList) { List list = PALMethodCache.getPALMethodModelListByMethod(c); for (PALMethodModel model : list) { @@ -8343,7 +8343,6 @@ public class CoeProcessLevelWeb extends ActionWeb { } - //先执行新建操作产生plid PALRepository coeProcessLevel = CoeProcessLevelDaoFacotory.createCoeProcessLevel(); @@ -8372,8 +8371,6 @@ public class CoeProcessLevelWeb extends ActionWeb { JSONObject elements = definition.getJSONObject("elements"); - - //新建一个uuid String shapeId = UUIDGener.getObjectId(); @@ -8419,20 +8416,11 @@ public class CoeProcessLevelWeb extends ActionWeb { } - - /************************************************文件属性*********************************************************/ //图形的数据属性配置 List attrLists=PALRepositoryAPIManager.getInstance().getValidAndUseAttributeModels(wsId, methodId); - - - - - shapes.add(shape); - - JSONArray newShapes = this.getMethodElementsJSONArray(shapes, 1); JSONObject newElements = new JSONObject(); for (int i = 0; i < newShapes.size(); i++) { @@ -8440,8 +8428,6 @@ public class CoeProcessLevelWeb extends ActionWeb { newElements.put(shapeObj.getString("id"), shapeObj); } - - definition.put("elements", newElements); // 设置画布大小 diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js index 7e60431d..267b624f 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js @@ -251,6 +251,7 @@ function showRelevanceShapesContent() { } function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { + debugger; // 属性排序 var defaultMoreAttr = $('#defaultMoreAttrSort').val(); if(defaultMoreAttr.length > 0) { @@ -294,7 +295,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { var obj = attributesJsonArray[index]; if (obj != null && obj != undefined && obj.value != undefined) { if(obj.name=="活动序号"){ - break; + continue; } var constr = ''; /*constr += '' + obj.name + '';*/ @@ -305,23 +306,23 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { // 目前支持到文本的输入 ,需求定下了再改 constr = ''; /*constr += '' + obj.name + '';*/ - constr += '' + '【' + obj.name + '】'+':' + obj.value + ''; + constr += '' + '【' + obj.name + '】'+' '+ obj.value + ''; constr += ''; } else if (!obj.readonly && obj.type == "link") { constr = ''; /*constr += '' + obj.name + '';*/ // constr += '' + obj.value + ''; - constr += '' + '【' + obj.name + '】'+':' + '' + obj.value + '' + ''; + constr += '' + '【' + obj.name + '】'+' '+ '' + obj.value + '' + ''; constr += ''; } else if (!obj.readonly && obj.type == "number") { constr = ''; /*constr += '' + obj.name + '';*/ - constr += '' + '【' + obj.name + '】'+':' + obj.value + ''; + constr += '' + '【' + obj.name + '】'+' '+ obj.value + ''; constr += ''; } else if (!obj.readonly && obj.type == "boolean") { constr = ''; /*constr += '' + obj.name + '';*/ - constr += '' + '【' + obj.name + '】'+ ':' + ''; + constr += '' + '【' + obj.name + '】'+' '+ ''; constr += ''; } else if (!obj.readonly && obj.type == "textarea") { constr = ''; @@ -329,7 +330,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { if (obj.value == undefined) { obj.value = ''; } - constr += '' + '【' + obj.name + '】'+ ':' + obj.value.replace(/\n/g, '
') + ''; + constr += '' + '【' + obj.name + '】'+' '+ obj.value.replace(/\n/g, '
') + ''; constr += ''; } else if (obj.readonly && obj.type == "relation") { var relationValue = ""; @@ -338,12 +339,12 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { } constr = ''; /*constr += '' + obj.name + '';*/ - constr += '' + '【' + obj.name + '】'+ ':' + relationValue + ''; + constr += '' + '【' + obj.name + '】'+' '+ relationValue + ''; constr += ''; } else if (obj.type == "select" || obj.type == "select_m") { constr = ''; /*constr += '' + obj.name + '';*/ - constr += '' + '【' + obj.name + '】'+ ':' + obj.value + ''; + constr += '' + '【' + obj.name + '】'+' '+ obj.value + ''; constr += ''; selectFlag = true; @@ -362,7 +363,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { } constr = ''; /*constr += '' + obj.name + '';*/ - constr += '' + '【' + obj.name +'】'+ ':' + relationValue + ''; + constr += '' + '【' + obj.name +'】'+' '+ relationValue + ''; constr += ''; } else if (obj.readonly && obj.type == "deptAddress") { deptAddress = true; @@ -374,7 +375,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { } constr = ''; /*constr += '' + obj.name + '';*/ - constr += '' + '【' + obj.name +'】'+ ':' + relationValue + ''; + constr += '' + '【' + obj.name +'】'+' '+ relationValue + ''; constr += ''; } else if (obj.readonly && obj.type == "awsorg") { var relationValue = ""; @@ -383,7 +384,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { } constr = ''; /*constr += '' + obj.name + '';*/ - constr += '' + '【' + obj.name +'】'+ ':' + relationValue + ''; + constr += '' + '【' + obj.name +'】'+' '+ relationValue + ''; constr += ''; } else if (obj.readonly && obj.type == "hidden") { constr = '' @@ -399,11 +400,12 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { } constr = ''; /*constr += '' + obj.name + '';*/ - constr += '' + '【' + obj.name +'】'+':' + ' ' + tableInput + '' + ''; + constr += '' + '【' + obj.name +'】'+' '+ ' ' + tableInput + '' + ''; constr += ''; } - } $('#' + tbodyId + ' table[name=' + shape.id + ']').append(constr); + } + } if (selectFlag) { getSelectOptions(shape.category, selectValues); //处理select类型 @@ -1457,7 +1459,7 @@ function initProcessDesc() { for(var i = 1; i <= length; i++) { var obj = processDesc[i]; t += ''; - t += '
' + "【"+obj.name +"】"+ ':
'; + t += '
' + "【"+obj.name +"】"+ '
'; var value = obj.value; if (value == undefined) { value = '';