+
|
+
From c2deee5393a6728498650d1a51326797975bdbcf Mon Sep 17 00:00:00 2001 From: zhal <15900249928@163.com> Date: Tue, 19 Jul 2022 14:49:53 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=A9=E6=95=88?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=8F=AF=E9=87=8D=E5=A4=8D=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/coe.pal.processlevel.create.js | 37 ++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) 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 4f948a8e..ddd8a786 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 @@ -971,7 +971,7 @@ function removeTr(obj) { //打开对象关联Dialog function openRelationDialog(obj, callback) { - ; + debugger; var title = obj.closest('tr').find('td:first').text(); if (title == undefined || title == '') { title = '选择模型对象'; @@ -1016,25 +1016,44 @@ function openRelationDialog(obj, callback) { text : methodName, cls : "green", handler : function() { - //跳转表单/绩效模型 + + //根据角色 $.ajax({ type : "POST", url : "./jd?sid=" + $("#sid").val() - + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer_relation_shape_createDialogModel", + + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer_relation_find_same_role", data : { uuid:uuid, - methodId:method, - wsId:$("#wsid").val() + methodId:method }, success : function(msg) { - if (msg.result == "ok") { - window.open("./w?uuid=" + msg.data.uuid+"&teamId" - + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid=" + encodeURIComponent($('#sid').val())); - } + if (msg.data.result == "ok") { + window.top.$.simpleAlert("请勿重复"+methodName+"!!!"); + }else{ + //跳转表单/绩效模型 + $.ajax({ + type : "POST", + url : "./jd?sid=" + + $("#sid").val() + + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer_relation_shape_createDialogModel", + data : { + uuid:uuid, + methodId:method, + wsId:$("#wsid").val() + }, + success : function(msg) { + if (msg.result == "ok") { + window.open("./w?uuid=" + msg.data.uuid+"&teamId" + + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid=" + encodeURIComponent($('#sid').val())); + } + } + }); + } } }); + } }, {text:'确定',cls:"blue",handler:function(){ From 694ccaf09ba45169169df3dd7662636535ac3e6a Mon Sep 17 00:00:00 2001 From: zhal <15900249928@163.com> Date: Tue, 19 Jul 2022 14:50:27 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=A8=A1=E5=9E=8B=E9=87=8D=E5=A4=8D=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/js/designer.extend.link.js | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) 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 3d8b4872..9828f035 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 @@ -3529,27 +3529,43 @@ function openRelationDig(obj,value) { text : "新建角色模型", cls : "green", handler : function() { - //跳转角色 + //根据角色 $.ajax({ type : "POST", url : "./jd?sid=" + CLB.sid - + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer_relation_shape_createDialogModel", + + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer_relation_find_same_role", data : { uuid:ruuid, - methodId:methodId, - wsId:wsId + methodId:methodId }, success : function(msg) { - if (msg.result == "ok") { - window.open("./w?uuid=" + msg.data.uuid+"&teamId" - + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid=" + encodeURIComponent($('#sid').val())); - + if (msg.data.result == "ok") { + window.top.$.simpleAlert("请勿重复新建角色模型!!!"); + }else{ + //跳转角色 + $.ajax({ + type : "POST", + url : "./jd?sid=" + + CLB.sid + + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer_relation_shape_createDialogModel", + data : { + uuid:ruuid, + methodId:methodId, + wsId:wsId + }, + success : function(msg) { + if (msg.result == "ok") { + window.open("./w?uuid=" + msg.data.uuid+"&teamId" + + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid=" + encodeURIComponent($('#sid').val())); + } + } + }); } - } }); + } }, { text : '确定', From 22860eae1ae7ee437b694eb4b2df2a5f455c0536 Mon Sep 17 00:00:00 2001 From: zhal <15900249928@163.com> Date: Tue, 19 Jul 2022 14:55:01 +0800 Subject: [PATCH 03/10] =?UTF-8?q?PAL=E9=87=8D=E5=A4=8D=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/coe.pal.processlevel.create.js | 280 ++++++++++++------ 1 file changed, 182 insertions(+), 98 deletions(-) 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 ddd8a786..f4dbbadb 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,118 +986,202 @@ function openRelationDialog(obj, callback) { methodName="新建绩效模型"; } if(title=="支持文件" || method=="control.kpi"){ - var relationDlg = parent.FrmDialog.open({ - title: title, - width:710, - height: 400, - url:"./w", - data:{ - sid: $("#sid").val(), - cmd: "com.actionsoft.apps.coe.pal_pl_repository_designer_shapes_tree", - wsId: $("#wsid").val(), - ref: ref, - shapeId: "", - attrId: obj.attr("id"), - relationShapeIds: obj.attr("relationShapeId"), - relationFileIds: obj.attr("relationFileId"), - modelId: $("#id").val(), - ruuid: uuid - }, - id:"relationDialog", - buttons: [ - { - text : '刷新', - cls : "yellow", - handler : function() { - // 刷新页面 - parent.document.getElementById("id-awsui-win-frm-2013-frmrelationDialog").contentWindow.location.reload(true); - } - },{ - text : methodName, - cls : "green", - handler : function() { - //根据角色 - $.ajax({ - type : "POST", - url : "./jd?sid=" - + $("#sid").val() - + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer_relation_find_same_role", - data : { - uuid:uuid, - methodId:method - }, - success : function(msg) { - if (msg.data.result == "ok") { - window.top.$.simpleAlert("请勿重复"+methodName+"!!!"); - }else{ - //跳转表单/绩效模型 + //根据角色 + $.ajax({ + type: "POST", + url: "./jd?sid=" + + $("#sid").val() + + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer_relation_find_same_role", + data: { + uuid: uuid, + methodId: method + }, + success: function (msg) { + if (msg.data.result == "ok") { + + var relationDlg = parent.FrmDialog.open({ + title: title, + width:710, + height: 400, + url:"./w", + data:{ + sid: $("#sid").val(), + cmd: "com.actionsoft.apps.coe.pal_pl_repository_designer_shapes_tree", + wsId: $("#wsid").val(), + ref: ref, + shapeId: "", + attrId: obj.attr("id"), + relationShapeIds: obj.attr("relationShapeId"), + relationFileIds: obj.attr("relationFileId"), + modelId: $("#id").val(), + ruuid: uuid + }, + id:"relationDialog", + + buttons: [ + {text:'确定',cls:"blue",handler:function(){ + var attrId = obj.attr("id"); + var relationFileId = ""; + var relationShapeId = ""; + var relationShapeText = ""; + var relations = relationDlg.win().getRelationShapeInfos(); + var isRequired = obj.attr('isRequired') + if (isRequired == 'true' && relations.length == 0) { + obj.val(''); + obj.attr('placeholder',title +'不能为空') + obj.addClass("required_input_css"); + parent.FrmDialog.close("relationDialog"); + return; + } + if (relations != undefined && relations.length > 0) { + for(var i = 0; i < relations.length; i++) { + var relationShape = relations[i]; + if(i == relations.length -1) { + relationFileId += relationShape.relationFileId; + relationShapeId += relationShape.relationShapeId; + relationShapeText += relationShape.relationShapeText; + } else { + relationFileId += relationShape.relationFileId + ","; + relationShapeId += relationShape.relationShapeId + ","; + relationShapeText += relationShape.relationShapeText + ","; + } + } + } + obj.attr("attrId", attrId); + obj.attr("relationFileId", relationFileId); + obj.attr("relationShapeId", relationShapeId); + obj.val(relationShapeText); + if (callback && callback == "saveContent") { + saveContent(obj); + } + parent.FrmDialog.close("relationDialog"); + }}, + {text:'取消',handler:function(){ + parent.FrmDialog.close("relationDialog"); + }} + ] + }); + }else{ + var relationDlg = parent.FrmDialog.open({ + title: title, + width:710, + height: 400, + url:"./w", + data:{ + sid: $("#sid").val(), + cmd: "com.actionsoft.apps.coe.pal_pl_repository_designer_shapes_tree", + wsId: $("#wsid").val(), + ref: ref, + shapeId: "", + attrId: obj.attr("id"), + relationShapeIds: obj.attr("relationShapeId"), + relationFileIds: obj.attr("relationFileId"), + modelId: $("#id").val(), + ruuid: uuid + }, + id:"relationDialog", + buttons: [ + { + text : '刷新', + cls : "yellow", + handler : function() { + // 刷新页面 + parent.document.getElementById("id-awsui-win-frm-2013-frmrelationDialog").contentWindow.location.reload(true); + } + },{ + text : methodName, + cls : "green", + handler : function() { + + //根据角色 $.ajax({ type : "POST", url : "./jd?sid=" + $("#sid").val() - + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer_relation_shape_createDialogModel", + + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer_relation_find_same_role", data : { uuid:uuid, - methodId:method, - wsId:$("#wsid").val() + methodId:method }, success : function(msg) { - if (msg.result == "ok") { - window.open("./w?uuid=" + msg.data.uuid+"&teamId" - + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid=" + encodeURIComponent($('#sid').val())); - } + if (msg.data.result == "ok") { + window.top.$.simpleAlert("请勿重复"+methodName+"!!!"); + }else{ + //跳转表单/绩效模型 + $.ajax({ + type : "POST", + url : "./jd?sid=" + + $("#sid").val() + + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer_relation_shape_createDialogModel", + data : { + uuid:uuid, + methodId:method, + wsId:$("#wsid").val() + }, + success : function(msg) { + if (msg.result == "ok") { + window.open("./w?uuid=" + msg.data.uuid+"&teamId" + + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid=" + encodeURIComponent($('#sid').val())); + } + } + }); + } } }); - } - } - }); - } - }, - {text:'确定',cls:"blue",handler:function(){ - var attrId = obj.attr("id"); - var relationFileId = ""; - var relationShapeId = ""; - var relationShapeText = ""; - var relations = relationDlg.win().getRelationShapeInfos(); - var isRequired = obj.attr('isRequired') - if (isRequired == 'true' && relations.length == 0) { - obj.val(''); - obj.attr('placeholder',title +'不能为空') - obj.addClass("required_input_css"); - parent.FrmDialog.close("relationDialog"); - return; - } - if (relations != undefined && relations.length > 0) { - for(var i = 0; i < relations.length; i++) { - var relationShape = relations[i]; - if(i == relations.length -1) { - relationFileId += relationShape.relationFileId; - relationShapeId += relationShape.relationShapeId; - relationShapeText += relationShape.relationShapeText; - } else { - relationFileId += relationShape.relationFileId + ","; - relationShapeId += relationShape.relationShapeId + ","; - relationShapeText += relationShape.relationShapeText + ","; } - } - } - obj.attr("attrId", attrId); - obj.attr("relationFileId", relationFileId); - obj.attr("relationShapeId", relationShapeId); - obj.val(relationShapeText); - if (callback && callback == "saveContent") { - saveContent(obj); - } - parent.FrmDialog.close("relationDialog"); - }}, - {text:'取消',handler:function(){ - parent.FrmDialog.close("relationDialog"); - }} - ] - }); + }, + {text:'确定',cls:"blue",handler:function(){ + var attrId = obj.attr("id"); + var relationFileId = ""; + var relationShapeId = ""; + var relationShapeText = ""; + var relations = relationDlg.win().getRelationShapeInfos(); + var isRequired = obj.attr('isRequired') + if (isRequired == 'true' && relations.length == 0) { + obj.val(''); + obj.attr('placeholder',title +'不能为空') + obj.addClass("required_input_css"); + parent.FrmDialog.close("relationDialog"); + return; + } + if (relations != undefined && relations.length > 0) { + for(var i = 0; i < relations.length; i++) { + var relationShape = relations[i]; + if(i == relations.length -1) { + relationFileId += relationShape.relationFileId; + relationShapeId += relationShape.relationShapeId; + relationShapeText += relationShape.relationShapeText; + } else { + relationFileId += relationShape.relationFileId + ","; + relationShapeId += relationShape.relationShapeId + ","; + relationShapeText += relationShape.relationShapeText + ","; + } + } + } + obj.attr("attrId", attrId); + obj.attr("relationFileId", relationFileId); + obj.attr("relationShapeId", relationShapeId); + obj.val(relationShapeText); + if (callback && callback == "saveContent") { + saveContent(obj); + } + parent.FrmDialog.close("relationDialog"); + }}, + {text:'取消',handler:function(){ + parent.FrmDialog.close("relationDialog"); + }} + ] + }); + } + + } + }); + + + }else{ var relationDlg = parent.FrmDialog.open({ title: title, From fe06430d4b005a9feaf645657b9fe038008fbe2b Mon Sep 17 00:00:00 2001 From: zhal <15900249928@163.com> Date: Tue, 19 Jul 2022 15:19:43 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/page/publish.home.history.html | 19 ++ .../template/page/publish.home.html | 230 ++++++++++++++++++ .../template/page/publish.home.newPage.html | 6 + .../main/css/app.f37b6b5a.css | 1 + .../main/css/chunk-8ab0b442.8d291593.css | 1 + .../main/js/app.1bf9b24e.js | 21 ++ .../main/js/chunk-2d224ef1.ab17ea19.js | 1 + .../main/js/chunk-8ab0b442.8140534f.js | 1 + .../main/js/chunk-vendors.060d0032.js | 23 ++ 9 files changed, 303 insertions(+) create mode 100644 com.actionsoft.apps.coe.pal.publisher/template/page/publish.home.history.html create mode 100644 com.actionsoft.apps.coe.pal.publisher/template/page/publish.home.html create mode 100644 com.actionsoft.apps.coe.pal.publisher/template/page/publish.home.newPage.html create mode 100644 com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/main/css/app.f37b6b5a.css create mode 100644 com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/main/css/chunk-8ab0b442.8d291593.css create mode 100644 com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/main/js/app.1bf9b24e.js create mode 100644 com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/main/js/chunk-2d224ef1.ab17ea19.js create mode 100644 com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/main/js/chunk-8ab0b442.8140534f.js create mode 100644 com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/main/js/chunk-vendors.060d0032.js diff --git a/com.actionsoft.apps.coe.pal.publisher/template/page/publish.home.history.html b/com.actionsoft.apps.coe.pal.publisher/template/page/publish.home.history.html new file mode 100644 index 00000000..6fad99e6 --- /dev/null +++ b/com.actionsoft.apps.coe.pal.publisher/template/page/publish.home.history.html @@ -0,0 +1,19 @@ + + +
+ + +
+
|
+