yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决角色图删除图形后无法跳转模型问题/移动端阅览样式修改

Browse Source
This commit is contained in:
zhal 2022-09-13 16:44:16 +08:00
parent d5a6413a10
commit e124d86664
4 changed files with 65 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.mobile.html
View File

@ -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;
}
</style>
</head>
@ -1006,28 +1022,13 @@
<div class="toolbar_info2">
<div id="tab" style="display: none;font-size: 1.7rem;">
<div id="pic" class="headerTab" onclick="clickTab('pic');">图形</div>
<div id="processDesc" class="headerTab" onclick="clickTab('processDesc');">流程属性</div>
<div id="processFile" class="headerTab" onclick="clickTab('processFile');">文件下载</div>
<div id="fileheaderTab" class="headerTab" onclick="clickTab('fileheaderTab');">支持文件</div>
</div>
</div>
<!-- 流程描述 -->
<div class="dock_view_portalDescShow newadd_portalAttr" id="portalDescDock">
<table class="awsui-table awsui-table-bordered">
</table>
</div>
<!-- 步骤说明 -->
<div class="dock_view_portalFileShow newadd_portalAttr" id="processFileDock">
<!-- <ul class="processfiledown">
<li>asdfsaf:asdfsaf</li>
<li>asdfsaf:asdfsaf</li>
</ul>-->
</div>
<div class="dock_view_portalwjFileShow newadd_portalAttr" id="portalFileDock"></div>
</div>
</div>
<div class="newadd_card" id="piccardshow">
<div class="title"><span></span></div>
<div id="designer_layout" class="" >
@ -1072,6 +1073,30 @@
</div>
</div>
<div class="clearfix"></div>
<!--<div class="newadd_nav" id="newaddfile">-->
<div class="newadd_wen">
<div id="processAttr" class="headerTab">流程属性 </div>
<div class="dock_view_portalAttrShow" id="portalAttrDock"></div>
</div>
<!--</div>-->
<div class="npd">
<div id="processDesc" class="headerTab " >活动属性</div>
<!-- 流程描述 -->
<div class="dock_view_portalDescShow newadd_portalAttr" id="portalDescDock">
<table class="awsui-table awsui-table-bordered">
</table>
</div>
</div>
<div class="npd">
<div id="processFile" class="headerTab" >文件预览</div>
<!-- 步骤说明 -->
<div class="dock_view_portalFileShow newadd_portalAttr" id="processFileDock">
</div>
</div>
<div class="npd">
<div id="fileheaderTab" class="headerTab" >相关/支持文件</div>
<div class="dock_view_portalwjFileShow newadd_portalAttr" id="relevantDocument"></div>
</div>
<div id="pinglunfix"></div>
<div class="newadd_card" id="pinglunopen">
<div id="pinglun">
@ -1130,16 +1155,7 @@
</div>
</div>
<div class="newadd_nav" id="newaddfile">
<div class="newadd_wen">
<!-- <div id="relevantDocument" class="fileheaderTab">相关/支持文件</div>-->
<div id="processAttr" class="headerTab">活动属性 <i onclick="closewen()">x</i></div>
<!-- 制度/操作指导 -->
<!--<div class="dock_view_portalFileShow" id="portalFileDock"></div>-->
<div class="dock_view_portalAttrShow" id="portalAttrDock"></div>
</div>
</div>
<div class="clearfix"></div>
<!-- 弹框表格 -->
<div id="attribute-table-window2" style="width:50rem;height:32.5rem;display:none;">

6
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.designer.shapes.js
View File

@ -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;
}

3
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js
View File

@ -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();

8
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.ui.mobile.js
View File

@ -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") {