From 8d1b7ffd5c263a25479dcfb8f9c9e630ccbf0231 Mon Sep 17 00:00:00 2001 From: zhal <15900249928@163.com> Date: Mon, 15 Aug 2022 14:42:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96teamid/=E7=BB=A9=E6=95=88?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=A2=9E=E5=8A=A0=E8=B7=B3=E8=BD=AC=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/com.actionsoft.apps.coe.pal.jar | Bin 1704290 -> 1704290 bytes .../js/coe.pal.processlevel.create.js | 31 +++++++++++++++++- .../extend/js/designer.extend.link.js | 3 +- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar index f1462e4d8561a23da927d916282a24f436985bd8..28693ca80027add7abfcaa9182970844bb63c45f 100644 GIT binary patch delta 7249 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 Uw{FWX2}jVyI}9z@o3!}<0D04kx&QzG diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js index e6e9aa31..25d232b5 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js @@ -986,7 +986,7 @@ function openRelationDialog(obj, callback) { methodName="新建绩效模型"; } - var getteamId=$('#teamId').val()==undefined?"":$('#teamId').val(); + var getteamId=parent.$("#teamId").val()==undefined?"":parent.$('#teamId').val(); if(method=="control.kpi") { //根据角色 @@ -1021,6 +1021,21 @@ function openRelationDialog(obj, callback) { id: "relationDialog", buttons: [ + { + text : '跳转模型', + cls : "blue", + handler : function() { + var clickNodeId=parent.document.getElementById("id-awsui-win-frm-2013-frmrelationDialog").contentWindow.getClickNodeId(); + if(clickNodeId==''){ + $.simpleAlert("请选择需要打开的流程", 'warning'); + }else{ + var url="./w?uuid=" +clickNodeId+"&teamId="+getteamId + + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid=" + encodeURIComponent($('#sid').val()); + window.open(url); + } + + } + }, { text: '确定', cls: "blue", handler: function () { var attrId = obj.attr("id"); @@ -1094,6 +1109,20 @@ function openRelationDialog(obj, callback) { // 刷新页面 parent.document.getElementById("id-awsui-win-frm-2013-frmrelationDialog").contentWindow.location.reload(true); } + },{ + text : '跳转模型', + cls : "blue", + handler : function() { + var clickNodeId=parent.document.getElementById("id-awsui-win-frm-2013-frmrelationDialog").contentWindow.getClickNodeId(); + if(clickNodeId==''){ + $.simpleAlert("请选择需要打开的流程", 'warning'); + }else{ + var url="./w?uuid=" +clickNodeId+"&teamId="+getteamId + + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid=" + encodeURIComponent($('#sid').val()); + window.open(url); + } + + } }, { text: methodName, cls: "green", diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js index 2b873ae7..5e9cc06e 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js @@ -1381,7 +1381,6 @@ function attributeShowTabContent(currentShape) { var tableObj = {} var curTableId = '' function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { - debugger; // 属性排序 var defaultMoreAttr = $('#defaultMoreAttrSort').val(); if (shape.category != undefined) { @@ -3468,7 +3467,7 @@ function openRelationDig(obj,value) { var str = ''; conObj.append(str); - var getteamId=$('#teamId').val()==undefined?"":$('#teamId').val(); + var getteamId=parent.$('#teamId').val()==undefined?"":parent.$('#teamId').val(); $("#attr_dialog_normal_relevance_shapes_div").attr("title", title); $('#attr_content_iframe_relevance_shapes').attr(