From 85342cee7d9e8d87c217f6dd96b220e81dba5627 Mon Sep 17 00:00:00 2001
From: zhal <15900249928@163.com>
Date: Thu, 4 Aug 2022 11:04:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=9E=E6=80=A7=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BAundefined?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/extend/js/designer.extend.link.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 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 a546b27d..7c754bd9 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
@@ -1441,6 +1441,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
 				requiredSpan = '<span style="color: #f04134;float:right">*</span>'
 			}
 
+			var isdesc=obj.desc==undefined?"":obj.desc;
 			var constr = '<tr ' + mouseout + mouseover + ' objid="' + obj.id + '" class="tagContentTableTr">'
 				+ '	<td>' + objName + requiredSpan + '</td>'
 				+ '	<td>'
@@ -1451,13 +1452,13 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
 				constr = '<tr ' + mouseout + mouseover + ' objid="' + obj.id + '" class="tagContentTableTr">'
 					+ '	<td>' + objName + requiredSpan +  '</td>'
 					+ '	<td class="tagContentTableTrTd">'
-					+ ' <input placeholder="' + obj.desc + '"  objid="' + obj.id + '" class="attribute_input_css" name="attribute_name_input_' + obj.id + '" value="' + obj.value + '"  onblur="saveInputContent(this,' + JSON.stringify(obj).replace(/\"/g,"'") +');" onclick="showEditButton(this);" data-shapeId="' + shape.id + '"/>'
+					+ ' <input placeholder="' + isdesc + '"  objid="' + obj.id + '" class="attribute_input_css" name="attribute_name_input_' + obj.id + '" value="' + obj.value + '"  onblur="saveInputContent(this,' + JSON.stringify(obj).replace(/\"/g,"'") +');" onclick="showEditButton(this);" data-shapeId="' + shape.id + '"/>'
 					+ '	</td></tr>';
 			} else if (!objReadonly && objType == "number") {
 				constr = '<tr ' + mouseout + mouseover + ' objid="' + obj.id + '" class="tagContentTableTr">'
 					+ '	<td>' + objName + requiredSpan +   '</td>'
 					+ '	<td class="tagContentTableTrTd">'
-					+ '		<input placeholder="' + obj.desc + '"   inputType="number"  objid="' + obj.id + '" class="attribute_input_css" name="attribute_name_input_' + obj.id + '" value="' + obj.value + '" onblur="saveInputContent(this,' + JSON.stringify(obj).replace(/\"/g,"'") +');" data-shapeId="' + shape.id + '"/>'
+					+ '		<input placeholder="' + isdesc + '"   inputType="number"  objid="' + obj.id + '" class="attribute_input_css" name="attribute_name_input_' + obj.id + '" value="' + obj.value + '" onblur="saveInputContent(this,' + JSON.stringify(obj).replace(/\"/g,"'") +');" data-shapeId="' + shape.id + '"/>'
 					//+ '		<div objid="' + obj.id + '" onclick="removeTrAttribute(this)" id= "ico_attribute_delete_"' + obj.id + ' class="ico_attribute_delete"></div>'
 					+ '</td></tr>';
 			} else if (!objReadonly && objType == "boolean") {
@@ -1481,7 +1482,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
 				constr = '<tr ' + mouseout + mouseover + ' objid="' + obj.id + '" class="tagContentTableTr">'
 					+ '<td>' + objName + requiredSpan + '</td>'
 					+ '<td class="tagContentTableTrTd">'
-					+ '<textarea placeholder="' + obj.desc + '"  objid="' + obj.id + '" class="awsui-textarea" style="float:left; width: 95%;" rows="3" name="attribute_name_input_' + obj.id + ' " value="' + obj.value
+					+ '<textarea placeholder="' + isdesc + '"  objid="' + obj.id + '" class="awsui-textarea" style="float:left; width: 95%;" rows="3" name="attribute_name_input_' + obj.id + ' " value="' + obj.value
 					+ '" onblur="saveInputContent(this);" onclick="showAttributedEditWindow(this);" data-shapeId="' + shape.id + '">' + obj.value + '</textarea>'
 					//+ '<div objid="' + obj.id + '" onclick="removeTrAttribute(this)" id= "ico_attribute_delete_"' + obj.id + ' class="ico_attribute_delete"></div>'
 					+ '</td>'
@@ -1490,11 +1491,12 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
 				flag = true;
 				// 形状的关联
 				objIds.push(obj.id);
+
 				constr = '<tr ' + mouseout + mouseover + ' objid="' + obj.id + '" class="tagContentTableTr">'
 					+ '	<td>' + objName + requiredSpan + '</td>'
 					+ '	<td class="tagContentTableTrTd">'
-					+ '		<input placeholder="' + obj.desc + '"  objid="' + obj.id + '" class="attribute_input_css" name="attribute_name_input_' + obj.id + '" value="" scope="' + obj.groupPath + '" onclick="openRelationDig(this,' + JSON.stringify(obj).replace(/\"/g,"'") +');" />'
-					+ '		<input placeholder="' + obj.desc + '"  ref="" value="' + obj.value + '" style="border:1px solid #ccc;margin-left:-55px;width: 25px;height: 23px;display: none;" objid_shapeId="' + obj.id + '" />'
+					+ '		<input placeholder="' + isdesc+ '"  objid="' + obj.id + '" class="attribute_input_css" name="attribute_name_input_' + obj.id + '" value="" scope="' + obj.groupPath + '" onclick="openRelationDig(this,' + JSON.stringify(obj).replace(/\"/g,"'") +');" />'
+					+ '		<input placeholder="' + isdesc+ '"  ref="" value="' + obj.value + '" style="border:1px solid #ccc;margin-left:-55px;width: 25px;height: 23px;display: none;" objid_shapeId="' + obj.id + '" />'
 					+ '</td></tr>';
 
 			} else if (objType == "select" || objType == "select_m") {
@@ -1520,14 +1522,14 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
 				constr = '<tr ' + mouseout + mouseover + ' objid="' + obj.id + '" class="tagContentTableTr">'
 					+ '	<td>' + objName  + requiredSpan +  '</td>'
 					+ '	<td class="tagContentTableTrTd">'
-					+ '		<input placeholder="' + obj.desc + '"  objid="' + obj.id + '" class="attribute_input_css" name="attribute_name_input_' + obj.id + '" value="" scope="' + obj.groupPath + '" onclick="openOrganizationRelationDig(this,' + JSON.stringify(obj).replace(/\"/g,"'") +');" />'
-					+ '		<input placeholder="' + obj.desc + '"  ref="" value="' + obj.value + '" style="border:1px solid #ccc;margin-left:-55px;width: 25px;height: 23px;display: none;" objid_shapeId="' + obj.id + '" />'
+					+ '		<input placeholder="' + isdesc + '"  objid="' + obj.id + '" class="attribute_input_css" name="attribute_name_input_' + obj.id + '" value="" scope="' + obj.groupPath + '" onclick="openOrganizationRelationDig(this,' + JSON.stringify(obj).replace(/\"/g,"'") +');" />'
+					+ '		<input placeholder="' + isdesc + '"  ref="" value="' + obj.value + '" style="border:1px solid #ccc;margin-left:-55px;width: 25px;height: 23px;display: none;" objid_shapeId="' + obj.id + '" />'
 					+ '</td></tr>';
 			} else if (objReadonly && objType == "hidden") {
 				constr = '<tr ' + mouseout + mouseover + ' objid="' + obj.id + '" class="tagContentTableTr" style="display:none;">'
 					+ '	<td>' + objName + requiredSpan +  '</td>'
 					+ '	<td class="tagContentTableTrTd">'
-					+ '		<input placeholder="' + obj.desc + '"   objid="' + obj.id + '" class="attribute_input_css" name="attribute_name_input_' + obj.id + '" value="'+obj.value +'" scope="' + obj.groupPath + '" readonly="'+objReadonly+'"  />'
+					+ '		<input placeholder="' + isdesc + '"   objid="' + obj.id + '" class="attribute_input_css" name="attribute_name_input_' + obj.id + '" value="'+obj.value +'" scope="' + obj.groupPath + '" readonly="'+objReadonly+'"  />'
 					//+ '<div objid="' + obj.id + '" onclick="removeTrAttribute(this)" id= "ico_attribute_delete_"' + obj.id + ' class="ico_attribute_delete"></div>'
 					+ '</td></tr>';
 			} else if (!objReadonly && objType == "DateTimePicker") {