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-18 19:05:35 +08:00
commit e82a344bb9
4 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
com.actionsoft.apps.coe.pal/i18n/resource.xml
View File

@ -37,22 +37,22 @@
<big5><![CDATA[BPMN圖]]></big5>
</item>
<item key="process.evc">
<cn><![CDATA[价值链图]]></cn>
<cn><![CDATA[架构图]]></cn>
<en><![CDATA[Process.Evc]]></en>
<big5><![CDATA[價值鏈圖]]></big5>
</item>
<item key="process.flowchart">
<cn><![CDATA[流程图]]></cn>
<cn><![CDATA[泳道图]]></cn>
<en><![CDATA[Process.Flowchart]]></en>
<big5><![CDATA[流程圖]]></big5>
</item>
<item key="control.kpi">
<cn><![CDATA[流程KPI图]]></cn>
<cn><![CDATA[流程绩效]]></cn>
<en><![CDATA[Process.Kpi]]></en>
<big5><![CDATA[流程KPI图]]></big5>
</item>
<item key="process.epc">
<cn><![CDATA[过程链图]]></cn>
<cn><![CDATA[EPC]]></cn>
<en><![CDATA[Process.Epc]]></en>
<big5><![CDATA[過程鏈圖]]></big5>
</item>

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

@ -115,7 +115,8 @@ public class PALMethodCache {
return list;
} else {
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"};
for (String method : methodArray) {
if (list.contains(method)) {
result.add(method);

16
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(true);
List<String> palMethodCategoryList = PALMethodCache.getPALMethodList(false);
for (String c : palMethodCategoryList) {
List<PALMethodModel> 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<PALMethodAttributeModel> 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);
// 设置画布大小

30
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
View File

@ -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 = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
@ -305,23 +306,23 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
// 目前支持到文本的输入 ,需求定下了再改
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+':' + obj.value + '</td>';
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+'&nbsp;'+ obj.value + '</td>';
constr += '</tr>';
} else if (!obj.readonly && obj.type == "link") {
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
// constr += '<td id="' + shape.id + obj.id + '" colspan="2" class="tableContent">' + obj.value + '</td>';
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+':' + '<a href="' + obj.value + '" target="_blank">' + obj.value + '</a>' + '</td>';
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+'&nbsp;'+ '<a href="' + obj.value + '" target="_blank">' + obj.value + '</a>' + '</td>';
constr += '</tr>';
} else if (!obj.readonly && obj.type == "number") {
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+':' + obj.value + '</td>';
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+'&nbsp;'+ obj.value + '</td>';
constr += '</tr>';
} else if (!obj.readonly && obj.type == "boolean") {
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+ ':' + '</td>';
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+'&nbsp;'+ '</td>';
constr += '</tr>';
} else if (!obj.readonly && obj.type == "textarea") {
constr = '<tr>';
@ -329,7 +330,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
if (obj.value == undefined) {
obj.value = '';
}
constr += '<td id="' + shape.id + obj.id + '"class="tableContent">' + '【' + obj.name + '】'+ ':' + obj.value.replace(/\n/g, '<br>') + '</td>';
constr += '<td id="' + shape.id + obj.id + '"class="tableContent">' + '【' + obj.name + '】'+'&nbsp;'+ obj.value.replace(/\n/g, '<br>') + '</td>';
constr += '</tr>';
} else if (obj.readonly && obj.type == "relation") {
var relationValue = "";
@ -338,12 +339,12 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
}
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+ ':' + relationValue + '</td>';
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+'&nbsp;'+ relationValue + '</td>';
constr += '</tr>';
} else if (obj.type == "select" || obj.type == "select_m") {
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+ ':' + obj.value + '</td>';
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+'&nbsp;'+ obj.value + '</td>';
constr += '</tr>';
selectFlag = true;
@ -362,7 +363,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
}
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name +'】'+ ':' + relationValue + '</td>';
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name +'】'+'&nbsp;'+ relationValue + '</td>';
constr += '</tr>';
} else if (obj.readonly && obj.type == "deptAddress") {
deptAddress = true;
@ -374,7 +375,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
}
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name +'】'+ ':' + relationValue + '</td>';
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name +'】'+'&nbsp;'+ relationValue + '</td>';
constr += '</tr>';
} else if (obj.readonly && obj.type == "awsorg") {
var relationValue = "";
@ -383,7 +384,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
}
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name +'】'+ ':' + relationValue + '</td>';
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name +'】'+'&nbsp;'+ relationValue + '</td>';
constr += '</tr>';
} else if (obj.readonly && obj.type == "hidden") {
constr = '<tr ' + mouseout + mouseover + ' objid="' + obj.id + '" class="tagContentTableTr" style="display:none;">'
@ -399,12 +400,13 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
}
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name +'】'+':' + '<span id="' + obj.id + ' " onclick="openDialog(' + JSON.stringify(obj.value).replace(/\"/g, "'") + ')"> ' + tableInput + '</span>' + '</td>';
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name +'】'+'&nbsp;'+ '<span id="' + obj.id + ' " onclick="openDialog(' + JSON.stringify(obj.value).replace(/\"/g, "'") + ')"> ' + tableInput + '</span>' + '</td>';
constr += '</tr>';
}
}
$('#' + 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 += '<tr><td>';
t += '<div class="tableContent">' + "【"+obj.name +"】"+ '：</div>';
t += '<div class="tableContent">' + "【"+obj.name +"】"+ '</div>';
var value = obj.value;
if (value == undefined) {
value = '';