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 
# Conflicts:
#	com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java
This commit is contained in:
wangpf 2023-06-07 15:52:20 +08:00
commit f73e6abdec
3 changed files with 46 additions and 6 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.

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

@ -1,6 +1,7 @@
package com.actionsoft.apps.coe.pal.publisher.client.web; package com.actionsoft.apps.coe.pal.publisher.client.web;
import java.io.File; import java.io.File;
import java.sql.Array;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@ -22,6 +23,9 @@ import java.util.stream.Collectors;
import com.actionsoft.apps.coe.pal.pal.repository.designer.manage.CoeDesignerAPIManager; import com.actionsoft.apps.coe.pal.pal.repository.designer.manage.CoeDesignerAPIManager;
import com.actionsoft.apps.coe.pal.pal.repository.designer.model.BaseModel; import com.actionsoft.apps.coe.pal.pal.repository.designer.model.BaseModel;
import com.actionsoft.apps.coe.pal.system.util.StringUtil;
import com.actionsoft.exception.AWSDataAccessException;
import com.actionsoft.sdk.local.api.BOAPI;
import com.actionsoft.exception.AWSDataAccessException; import com.actionsoft.exception.AWSDataAccessException;
import com.actionsoft.sdk.local.api.BOQueryAPI; import com.actionsoft.sdk.local.api.BOQueryAPI;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;

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

@ -259,7 +259,8 @@ function initHtml() {
newHtml += '<button name="add" type="button" class="awsui-btn awsui-btn-blue" onclick="addProcess(\'new\');">新增</button>'; 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="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 += '<button name="delete" type="button" class="awsui-btn awsui-btn-danger" onclick="deleteFile(\'new\');">删除</button>';
newHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn-green" onclick="refreshManual('+$("#processInstId").val()+','+"1"+');">重新生成手册</button>'; newHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn" onclick="refreshManual('+$("#processInstId").val()+','+"1"+');">重新生成手册</button>';
newHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn" onclick="getFiles();">生成附件</button>';
} }
//newHtml += '<button name="add" type="button" class="awsui-btn awsui-btn-blue" onclick="addProcess(\'new\');">新增</button>'; //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="save" type="button" class="awsui-btn" onclick="saveFormData(\'new\');">保存</button>';
@ -291,7 +292,8 @@ function initHtml() {
changeHtml += '<button name="add" type="button" class="awsui-btn awsui-btn-blue" onclick="addProcess(\'change\');">新增</button>'; 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="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 += '<button name="delete" type="button" class="awsui-btn awsui-btn-danger" onclick="deleteFile(\'change\');">删除</button>';
changeHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn-green" onclick="refreshManual(\'+$("#processInstId").val()+"2"+\');">重新生成手册</button>'; changeHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn" onclick="refreshManual(\'+$("#processInstId").val()+"2"+\');">重新生成手册</button>';
changeHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn" onclick="getFiles()">生成附件</button>';
} }
//changeHtml += '<button name="add" type="button" class="awsui-btn awsui-btn-blue" onclick="addProcess(\'change\');">新增</button>'; //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="save" type="button" class="awsui-btn" onclick="saveFormData(\'change\');">保存</button>';
@ -458,7 +460,7 @@ function initPublishData(data, type, pageNumber, start){
// 初始化数据 // 初始化数据
function selectPublishData(data, type, pageNumber, start) { function selectPublishData(data, type, pageNumber, start) {
debugger;
//渲染到前台的流程架构L1，L2，L3，L4 //渲染到前台的流程架构L1，L2，L3，L4
var param = { var param = {
cmd: 'com.actionsoft.apps.coe.pal.publisher_getPublishNameByJs', cmd: 'com.actionsoft.apps.coe.pal.publisher_getPublishNameByJs',
@ -1070,7 +1072,8 @@ function initChangedData(changeFileId) {
} else { } else {
$('#report_' + changeFileId).html('无'); $('#report_' + changeFileId).html('无');
} }
//获取选中模型数据，更新架构数据
updateFramework(changeTemp[i].changedFileIdNew);
break; break;
} }
} }
@ -1121,8 +1124,6 @@ function refreshManual(processInstId,type) {
data : param, data : param,
success : function(r) { success : function(r) {
if (r.result == 'ok') { if (r.result == 'ok') {
FormToolBarAction.BTN_SAVE();
AWSFormUtil.refreshPage(); AWSFormUtil.refreshPage();
} }
@ -2586,3 +2587,38 @@ function downloadReport(uuid, taskId) {
} }
//刷新页面
function getFiles() {
FormToolBarAction.BTN_SAVE();
AWSFormUtil.refreshPage();
}
//下拉获取最新架构进行赋值操作
function updateFramework(uuid) {
awsui.ajax.request({
type: "POST",
url: "./jd",
async: false,
data: {
sid: sid,
cmd: "com.actionsoft.apps.coe.pal.publisher_publish_updateFramework",
uuid: uuid,
processInstId:processInstId
},
success : function(r) {
if (r.result == "ok") {
var L1 = r.data.data.Process_Architecture_L1;
var L2 = r.data.data.Process_Architecture_L2;
var L3 = r.data.data.Process_Architecture_L3;
var L4 = r.data.data.Process_Architecture_L4;
ui("LEVEL_1_PROCESS_NAME",L1);
ui("LEVEL_2_PROCESS_NAME",L2);
ui("LEVEL_3_PROCESS_NAME",L3);
ui("LEVEL_4_PROCESS_NAME",L4);
}
}
});
}