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

Merge branch 'apps_dev' of https://e.coding.net/yilidev/yilipalkaifa/apps into apps_dev

Browse Source
This commit is contained in:
Mr-wang 2022-08-30 12:53:04 +08:00
commit 8f479d3793
6 changed files with 54 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar
View File

Binary file not shown.

13
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java
View File

@ -3203,15 +3203,28 @@ public class ProcessPublishWeb extends ActionWeb {
String taskId = "";
if (model.getMethodId().contains("process.")) {
taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportPr(wsId, userId, teamId, uuid);
JSONObject object = JSONObject.parseObject(taskId);
if ("ok".equals(object.getString("result"))) {
taskId = object.getJSONObject("data").getString("taskId");
}
} else if ("data.form".equals(model.getMethodId())) {
taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportBd(wsId, userId, teamId, uuid);
JSONObject object = JSONObject.parseObject(taskId);
if ("ok".equals(object.getString("result"))) {
taskId = object.getJSONObject("data").getString("taskId");
}
} else if ("control.policy".equals(model.getMethodId())) {
taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportZd(wsId, userId, teamId, uuid);
JSONObject object = JSONObject.parseObject(taskId);
if ("ok".equals(object.getString("result"))) {
taskId = object.getJSONObject("data").getString("taskId");
}
}
return taskId;
}
/**
* 对未创建手册的流程进行创建流程手册
*/

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

@ -15,6 +15,7 @@ var stopTemp;
var treeCheckedNewArr = [];
var treeCheckedChangeArr = [];
var treeCheckedStopArr = [];
var taskArr=[];
// 统一中文变量
var varDutyDept = "责任部门";
var varDutyUser = "责任人";
@ -228,9 +229,13 @@ function initHtml() {
newHtml += '<div id="publisher_new" border="1">';
newHtml += '<!-- 操作按钮 -->';
newHtml += '<div id="publish_new_button" style="padding:5px 10px 5px 10px;">';
newHtml += '<button name="add" type="button" class="awsui-btn awsui-btn-blue" onclick="addProcess(\'new\');">新增</button>';
// newHtml += '<button name="save" type="button" class="awsui-btn" onclick="saveFormData(\'new\');">保存</button>';
newHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn-danger" onclick="deleteFile(\'new\');">删除</button>';
if($("#userTaskDefId").val()=='obj_c9e5a2e257f00001e2a375d01f601518'){
newHtml += '<button name="add" type="button" class="awsui-btn awsui-btn-blue" onclick="addProcess(\'new\');">新增</button>';
// newHtml += '<button name="save" type="button" class="awsui-btn" onclick="saveFormData(\'new\');">保存</button>';
newHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn-danger" onclick="deleteFile(\'new\');">删除</button>';
}
newHtml += '</div>';
newHtml += '<div id="publish_new_content">';
newHtml += '<table class="awsui-table awsui-table-thin awsui-table-hover data-table">';
@ -254,9 +259,11 @@ function initHtml() {
changeHtml += '<div id="publisher_change" border="1">';
changeHtml += '<!-- 操作按钮 -->';
changeHtml += '<div id="publish_change_button" style="padding:5px 10px 5px 10px;">';
if($("#userTaskDefId").val()=='obj_c9e5a2e257f00001e2a375d01f601518'){
changeHtml += '<button name="add" type="button" class="awsui-btn awsui-btn-blue" onclick="addProcess(\'change\');">新增</button>';
// changeHtml += '<button name="save" type="button" class="awsui-btn" onclick="saveFormData(\'change\');">保存</button>';
changeHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn-danger" onclick="deleteFile(\'change\');">删除</button>';
}
changeHtml += '</div>';
changeHtml += '<div id="publish_change_content">';
changeHtml += '<table class="awsui-table awsui-table-thin awsui-table-hover data-table">';
@ -282,9 +289,11 @@ function initHtml() {
stopHtml += '<div id="publisher_stop" border="1">';
stopHtml += '<!-- 操作按钮 -->';
stopHtml += '<div id="publish_stop_button" style="padding:5px 10px 5px 10px;">';
stopHtml += '<button name="add" type="button" class="awsui-btn awsui-btn-blue" onclick="addProcess(\'stop\');">新增</button>';
// stopHtml += '<button name="save" type="button" class="awsui-btn" onclick="saveFormData(\'stop\');">保存</button>';
stopHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn-danger" onclick="deleteFile(\'stop\');">删除</button>';
if($("#userTaskDefId").val()=='obj_c9e5a2e257f00001e2a375d01f601518') {
stopHtml += '<button name="add" type="button" class="awsui-btn awsui-btn-blue" onclick="addProcess(\'stop\');">新增</button>';
// stopHtml += '<button name="save" type="button" class="awsui-btn" onclick="saveFormData(\'stop\');">保存</button>';
stopHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn-danger" onclick="deleteFile(\'stop\');">删除</button>';
}
stopHtml += '</div>';
stopHtml += '<div id="publish_stop_content">';
stopHtml += '<table class="awsui-table awsui-table-thin awsui-table-hover data-table">';
@ -509,12 +518,14 @@ function showlist(data, type, pageNumber, start){
}
// 加载数据
var html = '';
//var appendTask="";
for (var i = 0, s = start; i < pageLimit; i++, s++) {
var curr;
if ((curr = data[s - 1]) != undefined) {
//appendTask+=curr.taskId+',';
var fileName = curr.publishFileName + ' V' + curr.fileVersion;
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 reportName = '<a id="openReportFile'+curr.taskId+'" 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 = '';
if(curr.processNumber != undefined){
@ -535,9 +546,19 @@ function showlist(data, type, pageNumber, start){
//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>';
html += '</tr>';
}
}
//appendTask=appendTask.substring(0,appendTask.length-1);
$('#publish_new_tbody').empty().html(html);
/*var taskData=appendTask.split(",");
for(var i=0;i<taskData.length;i++){
taskArr.push(taskData[i]);
}*/
$("#publish_new_tbody .awsui-checkbox").check();
}
if (type == 'change') {
@ -680,6 +701,7 @@ function showlist(data, type, pageNumber, start){
}
}
function disabledButton() {
$('#publisher_dialog').find('div.dlg-button').find('button:first').prop('disabled', 'disabled');
}
@ -2135,7 +2157,6 @@ function downloadReport(uuid, taskId) {
},
success : function(r) {
if (r.result == "ok") {
debugger;
window.open (r.data.url);
} else {

BIN
com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
View File

Binary file not shown.

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

@ -2875,7 +2875,7 @@ public class CoeDesignerWeb extends ActionWeb {
return AlertWindow.getNotFoundMessagePage("未找到文件", "该文件已被删除");
}
macroLibraries.put("taskId", "");
macroLibraries.put("taskId", taskId);
// 增加三员管理模式taskid为new，change判断
if ("process".equals(plModel.getMethodCategory()) && !UtilString.isEmpty(taskId) && !"submit_create".equals(taskId) && !"new".equals(taskId) && !"change".equals(taskId)) {
macroLibraries.put("outputFileName", plModel.getName() + ".doc");
@ -3130,7 +3130,13 @@ public class CoeDesignerWeb extends ActionWeb {
continue;
}
upFileObject.getJSONArray(upfileModel.getShape_uuid()).add(object);
String filename=upfileModel.getFileName().substring(upfileModel.getFileName().lastIndexOf("."));
if(!filename.equals(".xml")){
upFileObject.getJSONArray(upfileModel.getShape_uuid()).add(object);
}
}
}
}

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

@ -10510,7 +10510,7 @@ public String deleteReply(String replyid, String messageid) {
List<DesignerShapeRelationModel> oldModelList = dao.getModelListByFileId(sourceId);
for (DesignerShapeRelationModel oldModel : oldModelList) {
//如果关联角色图，则同步复制角色图关联关系
//如果关联角色图，则同步复制角色图关联关系,由于角色图规定为本流程使用，所以获取一次
String methodIds = "";
if (oldModel.getAttrId().equals("role")) {
PALRepository coeProcessLevel = CoeProcessLevelDaoFacotory.createCoeProcessLevel();
@ -10523,8 +10523,10 @@ public String deleteReply(String replyid, String messageid) {
SDK.getLogAPI().consoleErr("复制文件[" + model.getName() + "][" + model.getId() + "]失败，" + moveRo.getString("msg"));
return ResponseObject.newErrResponse(moveRo.getString("msg")).toString();
}
break;
}
}
}
@ -10586,6 +10588,7 @@ public String deleteReply(String replyid, String messageid) {
}
break;
}
}