优化质量校验提示语/岗位增加属性悬浮显示

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java

@@ -9002,7 +9002,12 @@ public class CoeProcessLevelWeb extends ActionWeb {
 		Boolean flag2=true;
 		StringBuilder sb = new StringBuilder();
 		StringBuffer sb1=new StringBuffer();
+		StringBuffer sb2=new StringBuffer();
+		StringBuffer sb3=new StringBuffer();
 		sb.append("<span>质量校验<span><br/>");
+		sb1.append("<span>文件属性:<span>");
+		sb2.append("<span>节点名称:<span>");
+
 		for (PALRepositoryPropertyModel property : propertys) {
 			String id = property.getPropertyId();
 			if (!attributeModelMap.containsKey(id) || !attributeModelMap.get(id).getUse()) {
@@ -9019,17 +9024,20 @@ public class CoeProcessLevelWeb extends ActionWeb {
 				if (list == null || list.isEmpty()) {
 					flag1 = false;
 				}
-			} else {
+			} /*else {
 				flag1 = UtilString.isNotEmpty(property.getPropertyValue());
-			}
+			}*/
 			if (!flag1) {// 校验不通过
-				sb.append("''"+attributeModel.getTitle()+"''").append(",");
+				sb1.append("''"+attributeModel.getTitle()+"''").append(",");
 				flag1 = false;
 			}
 		}
 
 		/***************************************************数据属性校验*************************************************/
-
+		if(flag1==false){
+			sb.append(sb1.substring(0, sb1.length()-1));
+			sb.append("未填写，请检查！").append("</br>");
+		}
 
 		Map<String, PALMethodAttributeModel> methodAttributeModelMap = new HashMap<>();
 		// 校验形状
@@ -9065,23 +9073,23 @@ public class CoeProcessLevelWeb extends ActionWeb {
 						if (list == null || list.isEmpty()) {
 							flag2 = false;
 						}
-					} else {
+					} /*else {
 						flag2 = UtilString.isNotEmpty(value);
-					}
+					}*/
 					if (!flag2) {
-						sb.append("''"+attrModel.getNewTitle()+"''").append(",");
+						sb2.append("【"+o.get("text")+"】"+"''"+attrModel.getNewTitle()+"''").append(",");
 
 					}
 				}
 			}
 		}
 
-		if(flag1==false || flag2==false){
+		if( flag2==false){
-			sb1.append(sb.substring(0, sb.length()-1));
+			sb.append(sb2.substring(0, sb2.length()-1));
-			sb1.append("未填写，请检查！");
+			sb.append("未填写，请检查！");
 		}
 
-		int index=sb1.indexOf("未填写");
+		int index=sb.indexOf("未填写");
 		if(index==-1 ){
 			ro.put("result","ok");
 		}else{
@@ -9089,7 +9097,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
 		}
 
 
-		ro.put("sb",sb1);
+		ro.put("sb",sb);
 		return ro.toString();
 
 	}

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.designer.shapes.js

@@ -433,7 +433,7 @@ function writeRelationListHtml() {
 		relationShapeText = relationShapeText.replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;");
 		html += "<li>"
 			 + "		<div class=\"relation_div\" index=\"" + i + "\">"
-			 + "			<div class='text-overflow' fileId=\"" + relationShapeList[i].relationFileId + "\" shapeId=\"" + relationShapeList[i].relationShapeId + "\"  onclick=\"window.open('"+url+"')\">" + relationShapeText + "</div>"
+			 + "			<div class='text-overflow' title=\""+relationShapeText+"\" fileId=\"" + relationShapeList[i].relationFileId + "\" shapeId=\"" + relationShapeList[i].relationShapeId + "\"  onclick=\"window.open('"+url+"')\">" + relationShapeText + "</div>"
 			 + "			<img src=\"../apps/com.actionsoft.apps.coe.pal/lib/designer/extend/images/close_attr.jpg\" style=\"cursor: pointer; display: none;\"/>"
 			 + "		</div>"
 			 + "</li>";

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js

@@ -219,7 +219,6 @@ $(function() {
 	 */
 	$("#QualityInspection").off("click").on("click", function () {
         $.simpleAlert("正在校验", "loading");
-		debugger;
 		var obj=Model.define;
 		$.ajax({
 			type : "POST",