sourceList, JSONObject targetObj) {
- //根据targetObj 获取出L1 L2 L3的数据
+ //根据targetObj 获取出L1 L2 L3 L4的数据
String targetId = targetObj.getString("id");
String L1 = null;
String L2 = null;
String L3 = null;
+ String L4 = null;
String L=null;
JSONArray pathArray = CoeProcessLevelUtil.getRepositoryPath(targetId);
String updateSql = "update APP_ACT_COE_PAL_PROP set PROPERTYVALUE ='%s' where PLID ='%s' and PROPERTYID='%s'";
@@ -10787,8 +10788,8 @@ public String deleteReply(String replyid, String messageid) {
}*/
// 一级架构默认值处理
if(pathArray.size()>0){
- //设置三级架构，如果没有填充值为/
- for(int i=1;i<=3;i++){
+ //设置四级架构，如果没有填充值为/
+ for(int i=1;i<=4;i++){
if(i<=pathArray.size()-1){
String name1=((JSONObject) pathArray.get(i)).getString("name");
String str1=name1.substring(0, name1.lastIndexOf(".")+1);
@@ -10812,10 +10813,13 @@ public String deleteReply(String replyid, String messageid) {
if (i == 3) {
L3 = L;
}
+ if (i == 4) {
+ L4 = L;
+ }
}
}
- //遍历source并设置这三个的属性值
+ //遍历source并设置这四个的属性值
for (PALRepositoryModel palRepositoryModel : sourceList) {
String id = palRepositoryModel.getId();
if (L1 != null) {
@@ -10827,6 +10831,9 @@ public String deleteReply(String replyid, String messageid) {
if (L3 != null) {
DBSql.update(String.format(updateSql, L3.trim(), id, "Process_Architecture_L3"));
}
+ if (L4 != null) {
+ DBSql.update(String.format(updateSql, L4.trim(), id, "Process_Architecture_L4"));
+ }
/**
* 查看改流程是否关联流程绩效
* 如果有，要更新关联流程的这三个参数
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js
index 1dd1c101..1ebb91fb 100644
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js
@@ -256,19 +256,32 @@ $(function() {
});
-
/**
* 快捷发布
*/
$("#QuickPublishing").off("click").on("click", function () {
+ $.ajax({
+ type : "POST",
+ url : "./jd",
+ data : {
+ sid : CLB.sid,
+ cmd:"com.awspaas.user.apps.publish.createProcess",
+ processDefId:"obj_fb1c7a54b98b412187388c8bab407362",
+ },
+ success:function(r) {
+ window.open(r.url);
+ },
+ error:function(r) {
+ }
+ });
- var url="https://bpm.yili.com:8088/portal/r/w?sid="+$("#sid").val()+"&wsId="+$("#wsId").val()+"&teamId=&clazzName=com.actionsoft.apps.coe.pal.publisher.client.web.ProcessPublishWeb&cmd=com.actionsoft.apps.coe.pal_app_page#/";
-
- window.open(url,'fullscreen');
+ /*var url="https://bpm.yili.com:8088/portal/r/w?sid="+$("#sid").val()+"&wsId="+$("#wsId").val()+"&teamId=&clazzName=com.actionsoft.apps.coe.pal.publisher.client.web.ProcessPublishWeb&cmd=com.actionsoft.apps.coe.pal_app_page#/";
+ window.open(url,'fullscreen');*/
});
+
/**
* 流程清单列表按钮
*/
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/css/designer.extend.css b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/css/designer.extend.css
index 9a368350..66b2678a 100755
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/css/designer.extend.css
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/css/designer.extend.css
@@ -210,7 +210,12 @@
background: url(../images/QualityInspection.png) no-repeat;
background-size: contain;
}
-
+.ico.quickPublish{
+ width: 40px;
+ background-position: 0px 0px;
+ background: url(../images/quickPublish.png) no-repeat;
+ background-size: contain;
+}
.ico.extend_activityNoDisable{
background-position: 0px 0px;
background: url(../images/activityNoDisable.png) no-repeat;
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
index e1bc2cd9..99904a50 100755
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
@@ -1795,7 +1795,7 @@ function initUpfileData(obj) {
t += '';
t +='文件附件:';
var appendFlag=true;
- processFile=processFile.sort(function(x,y){
+ processFile.sort(function(x,y){
if(x.name.substr(0,2)=='附件' && y.name.substr(0,2)=='附件') {
return parseInt(x.name.substr(2)) - parseInt(y.name.substr(2));
}
@@ -1993,26 +1993,6 @@ function initUpfileData(obj) {
}
-function maopao(array){
- if(Array.isArray(array)){
- if (array.length == 1) {
- return array;
- }
- var temp = null;
- for (var i = 0; i < array.length; i++) {
- for (var j = 0; j < array.length - i - 1; j++) {
- if (array[j] > array[j + 1]) {
- temp = array[j];
- array[j] = array[j + 1];
- array[j + 1] = temp;
- }
- }
- }
- return array;
- }
-}
-
-
//根据节点名称排序
function sortModelByName1() {
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.ui.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.ui.js
index 53be4bb8..ce04b98b 100755
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.ui.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.ui.js
@@ -66,6 +66,7 @@ var UI = {
method:methodId
},
success: function (r, textStatus, jqXHR) {
+ debugger;
if (r.data.result == 'ok') {
changeTitle(newTitle);
} else {