diff --git a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar index af77a297..749c6ccc 100644 Binary files a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar and b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar differ diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java index 6ed90069..3171c8e2 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java @@ -1,6 +1,7 @@ package com.actionsoft.apps.coe.pal.publisher.client.web; import java.io.File; +import java.sql.Array; import java.sql.Timestamp; import java.text.DateFormat; 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.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.sdk.local.api.BOQueryAPI; import org.apache.commons.lang.StringUtils; diff --git a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js index 603f0580..39877f63 100644 --- a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js +++ b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js @@ -259,7 +259,8 @@ function initHtml() { newHtml += ''; // newHtml += ''; newHtml += ''; - newHtml += ''; + newHtml += ''; + newHtml += ''; } //newHtml += ''; // newHtml += ''; @@ -291,7 +292,8 @@ function initHtml() { changeHtml += ''; // changeHtml += ''; changeHtml += ''; - changeHtml += ''; + changeHtml += ''; + changeHtml += ''; } //changeHtml += ''; // changeHtml += ''; @@ -458,7 +460,7 @@ function initPublishData(data, type, pageNumber, start){ // 初始化数据 function selectPublishData(data, type, pageNumber, start) { - + debugger; //渲染到前台的流程架构L1,L2,L3,L4 var param = { cmd: 'com.actionsoft.apps.coe.pal.publisher_getPublishNameByJs', @@ -1070,7 +1072,8 @@ function initChangedData(changeFileId) { } else { $('#report_' + changeFileId).html('无'); } - + //获取选中模型数据,更新架构数据 + updateFramework(changeTemp[i].changedFileIdNew); break; } } @@ -1121,8 +1124,6 @@ function refreshManual(processInstId,type) { data : param, success : function(r) { if (r.result == 'ok') { - - FormToolBarAction.BTN_SAVE(); 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); + } + } + }); + +}