1. Show Instance Number on AppGroup for Application/System Monitor

2. FIX build issue on com.creditease.uav.hook.redis
uavorg · Jan 4, 2018 · 30d34f3 · 30d34f3
1 parent a2fc22c
commit 30d34f3
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/com.creditease.uav.agent.heartbeat/.gitignore b/com.creditease.uav.agent.heartbeat/.gitignore
@@ -2,3 +2,4 @@
 /target
 /logs
 /metadata
+/bin/
diff --git a/com.creditease.uav.console/src/main/webapp/apphub/css/comp.tablist.css b/com.creditease.uav.console/src/main/webapp/apphub/css/comp.tablist.css
@@ -37,4 +37,17 @@
 	!text-shadow: rgba(0,0,0,0.5) 0px 1px 1px;
 	text-align:left;
 	background:#f8f8f8;
+	height:25px;
+}
+
+.GroupTag {
+	font-size: 12px;
+	color:#888;
+	display:inline-block;
+	background:#fff;
+	padding-left:5px;
+	padding-right:5px;
+	border:1px solid #a8a8a8;
+	border-radius:10px;
+    height:16px;
 }
diff --git a/com.creditease.uav.console/src/main/webapp/apphub/js/common/tablist.js b/com.creditease.uav.console/src/main/webapp/apphub/js/common/tablist.js
@@ -100,14 +100,16 @@ function AppHubTabList(_config) {
 					   if (groupObjs[groupId]==undefined) {
 						   var groupElemId=config["id"]+"-group-"+groupId;
 						   groupDiv=HtmlHelper.newElem("div",{"id":groupElemId,"class":"AppHubTabListGroup"});
-						   groupDiv.innerHTML="<div class='GroupTitle' id='"+groupElemId+"_title'>"+groupId+"</div>";
+						   groupDiv.innerHTML="<div class='GroupTitle' id='"+groupElemId+"_title'>"+groupId+"<span class='GroupTag' id='"+groupElemId+"_tag'></span></div>";
 						   groupObjs[groupId]={id:groupId,
 								   elem:function() {
 
 							   return HtmlHelper.id(groupElemId);
 
 						   },members:new Map(),elemTitle:function() {
 							   return HtmlHelper.id(groupElemId+"_title");
+						   },elemTag:function() {
+							 return HtmlHelper.id(groupElemId+"_tag");
 						   }};
 
 						   mdiv.appendChild(groupDiv);
@@ -160,7 +162,7 @@ function AppHubTabList(_config) {
 			}
 		}		
 
-		//delete group withour any member
+		//delete group without any member
 		for(var key in groupObjs) {
 
 			var gpElemId=config.id+"-group-"+key;
@@ -172,6 +174,20 @@ function AppHubTabList(_config) {
 				delete groupObjs[key];
 			}
 		}
+
+		//show group tag
+		for(var key in groupObjs) {
+
+			var gpElemId=config.id+"-group-"+key;
+
+			var gpElem=HtmlHelper.id(gpElemId);
+
+			var childNum=gpElem.children.length-1;
+
+			var groupObj=groupObjs[key];
+
+			groupObj.elemTag().innerHTML=childNum;
+		}
 	};
 
 	this.doGroupClick=function(groupId) {

diff --git a/com.creditease.uav.hook.redis/pom.xml b/com.creditease.uav.hook.redis/pom.xml
@@ -14,7 +14,7 @@
 	<dependencies>
 	<dependency>
 			<groupId>com.creditease.moniter</groupId>
-			<artifactId>com.creditease.uav.base</artifactId>
+			<artifactId>com.creditease.uav.monitorframework</artifactId>
 
 		</dependency>
 		<dependency>