From 8f77654e1c6d8ac66c955f05ed912444b743f224 Mon Sep 17 00:00:00 2001
From: zhal <15900249928@163.com>
Date: Thu, 21 Jul 2022 19:13:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E9=98=85=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ....repository.designer.view.portal.framework.html |  7 +++++--
 .../extend/js/designer.extend.link.view.portal.js  | 14 +++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.framework.html b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.framework.html
index a7b65656..7daab501 100644
--- a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.framework.html
+++ b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.framework.html
@@ -532,7 +532,7 @@
     <!--HTML5设计器核心js-->
     <script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/collaboration.js'></script>
     <script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.plugs.js'></script>
-    <script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.js'></script>
+    <script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.framework.js'></script>
     <script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.methods.js'></script>
     <script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.events.js'></script>
     <script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.ui.js'></script>
@@ -566,6 +566,8 @@
             cursor: pointer;
         }
         #canvas_container{
+            width:  100%;
+            height: 100% !important;
             padding:0px;
         }
         .awsui-message-page .content{
@@ -575,6 +577,7 @@
             top: 10%;
             text-align: center;
         }
+
     </style>
     <script type="text/javascript">
         if (navigator.userAgent.toLowerCase().match(/chrome/) != null) {
@@ -716,7 +719,7 @@
         .newadd_body{ margin: 0;color: #333333; text-align: left;background-color: #f1f5f7;}
         .newadd_title{font-size: 18px;font-weight: bold; margin-bottom:20px;display: block }
         .newadd_card {
-            float: left;
+           /* float: left;*/
             width:100%;
             height:100%;
             background-color: #fff;
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 595d9a4d..b0522fd8 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
@@ -1877,21 +1877,13 @@ function initShapeAttribute(obj) {
 		for(var sortIndex = 0; sortIndex < sortNumShapeArr.length; sortIndex++) {
 			var temp = sortNumShapeArr[sortIndex];
 			var shape = elements[temp.id];
+			if(shape.title=="线上审批" || shape.title=="线下审批" || shape.title=="系统任务" ||shape.title=="人工任务") {
+
 			if(obj==shape.id){
 				 continue;
 			}
-			/*var no = "";
-			var array=shape.attributesJsonArray;
-			for (var i = 0; i < array.length; i++) {
-				var id = array[i].id;
-				if (id == "activity_number") {
-					var numberValue = array[i].value;
-					if (numberValue != "") {
-						no = numberValue;
-					}
-				}
-			}*/
 			document.getElementById("box"+shape.id).style.display="none";
+			}
 			//document.getElementById("span"+shape.id).innerHTML=no+"."+shape.text;
 		}
 	}