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

泳道图图形调整

Browse Source
This commit is contained in:
lihongyu 2022-09-23 11:06:53 +08:00
parent 8aad23428d
commit 00cde76469
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js
View File

@ -568,7 +568,7 @@ function showlist(data, type, pageNumber, start){
var outputName = getOutputName(curr.category, curr.methodId);
var reportName = '<a href="javascript:void(0);" onclick="openReportFile(\'' + curr.taskId + '\')">' + fileName + "-" + outputName + '</a><span id="download_output_' + curr.publishFileId + '" style="cursor: pointer;" onclick="downloadReport(\'' + curr.publishFileId + '\',\'' + curr.taskId + '\')"><i class="awsui-iconfont" style="font-size: 12px;">&#xe653;</i></span>';
var quickCreate = "<a href='javascript:void(0);' onclick='quickCreateReport(" + JSON.stringify(curr) + ", $(this), \"new\")'>立即创建</a>";
var processNumber = '';
var processNumber = '提交后生成文件编号';
if(curr.processNumber != undefined){
processNumber = curr.processNumber;
}
@ -583,7 +583,11 @@ function showlist(data, type, pageNumber, start){
html += '<td ' + tableTdCss + '><input name="check" ' + checkboxPerm + ' class="awsui-checkbox" data-id="' + curr.publishFileId + '" type="checkbox" type="awsui-checkbox"></td>';
html += '<td ' + tableTdCss + '>' + s + '</td>';
html += '<td ' + tableTdCss + '><a href="javascript:void(0);" onclick="openPortalPage(\'' + curr.publishFileId + '\', \'' + curr.taskId + '\')">' + fileName + '</a></td>';
html += '<td ' + tableTdCss + '></p>' + reportName + fName+'</td>';
if(fName!=''){
html += '<td ' + tableTdCss + '></p>' + reportName + fName+'</td>';
}else{
html += '<td ' + tableTdCss + '>' + reportName +'</td>';
}
//html += '<td ' + tableTdCss + '>' + fName + '</td>';
//html += '<td style="padding:1px;"><textarea onblur="changeDesc(\'new\',\'' + curr.publishFileId + '\', this)" style="width:100%;height:30px;" ' + textareaPerm + ' class="awsui-input">' + curr.publishDesc + '</textarea></td>';
html += '<td style="padding:1px;"><span>'+ processNumber +'</span></td>';
@ -608,7 +612,7 @@ function showlist(data, type, pageNumber, start){
var fName = '';
var upFileId = curr.upfileId;
var changNumer = '';
var changNumer = '提交后生成文件编号';
if(curr.changedNumber != undefined){
changNumer = curr.changedNumber;
}
@ -657,10 +661,14 @@ function showlist(data, type, pageNumber, start){
html += '<td ' + tableTdCss + '>' + sourceFileName + '</td>';
var selectPerm = editPerm ? '<select id="change_' + curr.changeFileId + '"></select>' : '<a href="javascript:void(0);" onclick="openPortalPage(\'' + targetId + '\', \'' + curr.taskId + '\')">' + targetFileName + '</a>';
html += '<td ' + tableTdCss + '>' + selectPerm + '</td>';
html += '<td ' + tableTdCss + '></p>' + reportName + fName +'</td>';
if(fName!=''){
html += '<td ' + tableTdCss + '></p>' + reportName + fName +'</td>';
}else{
html += '<td ' + tableTdCss + '>' + reportName +'</td>';
}
//html += '<td ' + tableTdCss + '></p>' + reportName + fName +'</td>';
//html += '<td ' + tableTdCss + ' id="report_' + curr.changeFileId + '">' + reportName + '</td>';
//html += '<td ' + tableTdCss + '>' + fName + '</td>';
html += '<td ' + tableTdCss + '>' + changNumer + '</td>';
//html += '<td style="padding:1px;"><textarea onblur="changeDesc(\'change\',\'' + curr.changeFileId + '\', this)" style="width:100%;height:30px;" ' + textareaPerm + ' class="awsui-input">' + curr.changedDesc + '</textarea></td>';
html += '</tr>';
// select2下拉框处理

1
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java
View File

@ -576,7 +576,6 @@ public class OutputWordUtil {
if (!shapeModelMap.containsKey(repositoryShape.getRelationShapeId())) {
continue;
}
String relationFileId = repositoryShape.getRelationFileId();
List<Map<String, Object>> relationFileElements = CoeDesignerUtil.getShapeMessageJson2(relationFileId); // 关联流程文件内容
if (relationFileElements != null) {