From 4f87dae714263061e2aa4b54a13c25a584b6e8be Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Thu, 17 Mar 2022 19:59:58 +0800
Subject: [PATCH] Update components.js

---
 web/public/js/components.js | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/web/public/js/components.js b/web/public/js/components.js
index 4ef956c3..2a2639d5 100755
--- a/web/public/js/components.js
+++ b/web/public/js/components.js
@@ -3460,8 +3460,11 @@ Vue.component("metric-chart", {
 							case "byte":
 								value = teaweb.formatBytes(value)
 								break
+							case "count":
+								value = teaweb.formatNumber(value)
+								break
 						}
-						return stat.keys[0] + ": " + value + "，占比：" + percent + "%"
+						return stat.keys[0] + "<br/>" + that.valueTypeName + ": " + value + "<br/>占比：" + percent + "%"
 					}
 				},
 				series: [
@@ -3669,8 +3672,11 @@ Vue.component("metric-chart", {
 							case "byte":
 								value = teaweb.formatBytes(value)
 								break
+							case "count":
+								value = teaweb.formatNumber(value)
+								break
 						}
-						return stat.keys[0] + ": " + value + "，占比：" + percent + "%"
+						return stat.keys[0] + "<br/>" + that.valueTypeName + "：" + value + "<br/>占比：" + percent + "%"
 					}
 				},
 				yAxis: {
@@ -4505,14 +4511,11 @@ Vue.component("origin-list-table", {
 	</thead>
 	<tr v-for="origin in vOrigins">
 		<td :class="{disabled:!origin.isOn}"><a href="" @click.prevent="updateOrigin(origin.id)">{{origin.addr}} &nbsp;<i class="icon clone outline small"></i></a>
-			<div v-if="origin.name.length > 0" style="margin-top: 0.5em">
-				<tiny-basic-label>{{origin.name}}</tiny-basic-label>
-			</div>
-			<div v-if="origin.domains != null && origin.domains.length > 0">
-				<grey-label v-for="domain in origin.domains">{{domain}}</grey-label>
-			</div>
-			<div v-if="origin.hasCert">
-				<tiny-basic-label>证书</tiny-basic-label>
+			<div style="margin-top: 0.3em" v-if="origin.name.length > 0 || origin.hasCert || (origin.host != null && origin.host.length > 0) || (origin.domains != null && origin.domains.length > 0)">
+				<tiny-basic-label v-if="origin.name.length > 0">{{origin.name}}</tiny-basic-label>
+				<tiny-basic-label v-if="origin.hasCert">证书</tiny-basic-label>
+				<tiny-basic-label v-if="origin.host != null && origin.host.length > 0">主机名: {{origin.host}}</tiny-basic-label>
+				<span v-if="origin.domains != null && origin.domains.length > 0"><tiny-basic-label v-for="domain in origin.domains">匹配: {{domain}}</tiny-basic-label></span>
 			</div>
 		</td>
 		<td :class="{disabled:!origin.isOn}">{{origin.weight}}</td>
@@ -11487,6 +11490,10 @@ Vue.component("grey-label", {
 	template: `<span class="ui label basic tiny" :class="labelColor" style="margin-top: 0.4em; font-size: 0.7em; border: 1px solid #ddd!important; font-weight: normal;"><slot></slot></span>`
 })
 
+// 可选标签
+Vue.component("optional-label", {
+	template: `<em><span class="grey">（可选）</span></em>`
+})
 
 /**
  * 一级菜单