From e124d866642f4463c33df5bfaeaa5c7116f0838a Mon Sep 17 00:00:00 2001
From: zhal <15900249928@163.com>
Date: Tue, 13 Sep 2022 16:44:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=A7=92=E8=89=B2=E5=9B=BE?=
=?UTF-8?q?=E5=88=A0=E9=99=A4=E5=9B=BE=E5=BD=A2=E5=90=8E=E6=97=A0=E6=B3=95?=
=?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=A8=A1=E5=9E=8B=E9=97=AE=E9=A2=98/?=
=?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=98=85=E8=A7=88=E6=A0=B7=E5=BC=8F?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...epository.designer.view.portal.mobile.html | 96 +++++++++++--------
.../js/coe.pal.designer.shapes.js | 6 +-
.../extend/js/designer.extend.link.js | 3 -
.../scripts/diagraming/designer.ui.mobile.js | 8 +-
4 files changed, 65 insertions(+), 48 deletions(-)
diff --git a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.mobile.html b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.mobile.html
index b464532a..36045fb1 100644
--- a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.mobile.html
+++ b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.mobile.html
@@ -669,6 +669,15 @@
initPl();
// Dock.showView('pic');
// changeArributeByShape()
+
+ Dock.showView('portalDescShow');
+
+ Dock.showView('portalAttrShow');
+
+ Dock.showView('portalFileShow');
+
+ Dock.showView('portalwjFileShow');
+
});
@@ -702,7 +711,7 @@
$('#pinglunfix').click(function (){
$('#pinglunfix').hide();
$('#pinglunopen').hide();
- $('.newadd_wen').hide();
+ // $('.newadd_wen').hide();
})
}
function closewen(){
@@ -758,7 +767,7 @@
isClickTab = true;
$('#tab').find('div').removeClass('selected');
$('#' + obj).addClass('selected');
- $('.newadd_portalAttr').hide();
+ // $('.newadd_portalAttr').hide();
if(obj == "processDesc") {
Dock.showView('portalDescShow');
}
@@ -876,15 +885,15 @@
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
- width:20rem;
- }
+ }
+ .tablefileContent a{font-size: 3.6rem; padding-top: 10px}
.tableleft{float:left; width:38%;}
.tableright{width:59%;padding-left:2%!important; float: left}
#designer_canvas{background: none!important;}
.task-box {
- border: .1rem solid #dddddd;border-top:0.4rem solid #dddddd; padding: 1.0rem;
+ border: .1rem solid #dddddd;padding: 1.0rem;
clear: both;
overflow: hidden;
margin: 0 .5rem 1.0rem 0;
@@ -901,9 +910,9 @@
position: absolute;right:1.0rem;top:1.0rem; font-size: 3.6rem;
}
#processAttr{
- position: fixed;
- z-index: 30;
- height: 8rem;
+ /*position: fixed;*/
+ /*z-index: 30;*/
+ /*height: 8rem;*/
width: 91%;
text-align: left;
clear: both;
@@ -930,13 +939,13 @@
background-clip: border-box;
border-radius: .4rem;
box-shadow: 0 .2rem .4rem rgb(0, 0, 0, 0.2);
- display: none;
- top: 10%;width: 92%;z-index: 20;width: 92%;
- height: 120rem;
- overflow-y: auto;
- position: absolute;
+ /*display: none;*/
+ /*top: 10%;width: 92%;z-index: 20;width: 92%;*/
+ /*height: 120rem;*/
+ /*overflow-y: auto;*/
+ /*position: absolute;*/
}
- .dock_view_portalAttrShow{ margin-top: 6rem;}
+
.fileheaderTab{font-size: 3.4rem; line-height: 6.0rem;}
.filetableHeader{float: left;line-height: 3.5rem;padding: 2rem 0;
font-size: 3.4rem;}
@@ -983,11 +992,18 @@
}
.reply-title{font-size: 3.6rem!important;}
.awsui-iconfont{font-size: 3.6rem;}
+ .awsui-btn-blue{border:0;color:#999999;background: #FFFFFF;}
.awsui-btn-blue:focus, .awsui-btn-blue:hover{
border: 1px solid #ffffff!important;
color: #999999!important;
background-color: #ffffff!important;
}
+ .npd{
+ background: #FFFFFF;
+ padding: 15px;
+ border: 1px solid #999999;
+ margin-bottom: 15px;
+ }
@@ -1006,28 +1022,13 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.designer.shapes.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.designer.shapes.js
index a25c47e3..840b74d0 100755
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.designer.shapes.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.designer.shapes.js
@@ -6,6 +6,8 @@ var setting1 = {};// 普通关联，例如raci
var setting2 = {};// 流程关联，例如前后置流程
var setting3 = {};// 关联形状和属性
+var clickRoleNodeId="";
+
var checkTree;
@@ -308,6 +310,8 @@ function clickNode(treeNode) {
return;
}
var title = treeNode.name;
+
+ clickRoleNodeId=treeNode.id;
$.ajax({
url : url,
data : {
@@ -336,7 +340,7 @@ function clickNode(treeNode) {
}
function getClickNodeId() {
- return clickNodeId;
+ return clickRoleNodeId;
}
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 0e0401dd..aef1ebce 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
@@ -3506,7 +3506,6 @@ function openRelationDig(obj,value) {
window.open(url);
}
-
}
},
{
@@ -3542,7 +3541,6 @@ function openRelationDig(obj,value) {
{
text : '刷新',
cls : "yellow",
-
handler : function() {
// 刷新页面
document.getElementById("attr_content_iframe_relevance_shapes").contentWindow.location.reload(true);
@@ -3594,7 +3592,6 @@ function openRelationDig(obj,value) {
},
async:false,
success : function(msg) {
- debugger;
if (msg.result == "ok") {
//关闭新建按钮
$(".dlg-button button").eq(2).hide();
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.ui.mobile.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.ui.mobile.js
index b0fdbaa7..461031a5 100644
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.ui.mobile.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.ui.mobile.js
@@ -2831,11 +2831,11 @@ var Dock = {
update : function(drawNav) {
if(drawNav == true){
//图形点击
- $('.newadd_wen').hide();
- $('#pinglunfix').hide()
+ // $('.newadd_wen').hide();
+ // $('#pinglunfix').hide()
}else{
- $('#pinglunfix').show()
- $('.newadd_wen').show();
+ // $('#pinglunfix').show()
+ // $('.newadd_wen').show();
changeArributeByShape();
}
if (this.currentView == "portalDescShow" || this.currentView == "portalFileShow" || this.currentView == "portalwjFileShow") {