From 12cbbbb5c1ec4db0c9c70829d3eac5acca0cbcc3 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Mon, 19 Jul 2021 20:38:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=86=85=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8C=87=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../clusters/cluster/settings/metrics/createPopup.go      | 1 +
 .../default/clusters/cluster/settings/metrics/index.go    | 1 +
 internal/web/actions/default/servers/metrics/index.go     | 1 +
 .../actions/default/servers/metrics/metricutils/utils.go  | 1 +
 .../clusters/cluster/settings/metrics/createPopup.html    | 5 +++--
 .../@default/clusters/cluster/settings/metrics/index.html | 5 +++--
 web/views/@default/servers/metrics/index.html             | 8 +++++---
 web/views/@default/servers/metrics/item.html              | 7 +++++++
 8 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/internal/web/actions/default/clusters/cluster/settings/metrics/createPopup.go b/internal/web/actions/default/clusters/cluster/settings/metrics/createPopup.go
index d5b52ddb..79c17b2a 100644
--- a/internal/web/actions/default/clusters/cluster/settings/metrics/createPopup.go
+++ b/internal/web/actions/default/clusters/cluster/settings/metrics/createPopup.go
@@ -62,6 +62,7 @@ func (this *CreatePopupAction) RunGet(params struct {
 		itemMaps = append(itemMaps, maps.Map{
 			"id":             item.Id,
 			"name":           item.Name,
+			"code":           item.Code,
 			"isOn":           item.IsOn,
 			"period":         item.Period,
 			"periodUnit":     item.PeriodUnit,
diff --git a/internal/web/actions/default/clusters/cluster/settings/metrics/index.go b/internal/web/actions/default/clusters/cluster/settings/metrics/index.go
index 37b0f278..dc3ee760 100644
--- a/internal/web/actions/default/clusters/cluster/settings/metrics/index.go
+++ b/internal/web/actions/default/clusters/cluster/settings/metrics/index.go
@@ -41,6 +41,7 @@ func (this *IndexAction) RunGet(params struct {
 		itemMaps = append(itemMaps, maps.Map{
 			"id":             item.Id,
 			"name":           item.Name,
+			"code":           item.Code,
 			"isOn":           item.IsOn,
 			"period":         item.Period,
 			"periodUnit":     item.PeriodUnit,
diff --git a/internal/web/actions/default/servers/metrics/index.go b/internal/web/actions/default/servers/metrics/index.go
index 8f72c5ee..b644609c 100644
--- a/internal/web/actions/default/servers/metrics/index.go
+++ b/internal/web/actions/default/servers/metrics/index.go
@@ -48,6 +48,7 @@ func (this *IndexAction) RunGet(params struct {
 		itemMaps = append(itemMaps, maps.Map{
 			"id":             item.Id,
 			"name":           item.Name,
+			"code":           item.Code,
 			"isOn":           item.IsOn,
 			"period":         item.Period,
 			"periodUnit":     item.PeriodUnit,
diff --git a/internal/web/actions/default/servers/metrics/metricutils/utils.go b/internal/web/actions/default/servers/metrics/metricutils/utils.go
index 5a263e40..8b2201b5 100644
--- a/internal/web/actions/default/servers/metrics/metricutils/utils.go
+++ b/internal/web/actions/default/servers/metrics/metricutils/utils.go
@@ -35,6 +35,7 @@ func InitItem(parent *actionutils.ParentAction, itemId int64) (*pb.MetricItem, e
 	parent.Data["item"] = maps.Map{
 		"id":             item.Id,
 		"name":           item.Name,
+		"code":           item.Code,
 		"isOn":           item.IsOn,
 		"keys":           item.Keys,
 		"value":          item.Value,
diff --git a/web/views/@default/clusters/cluster/settings/metrics/createPopup.html b/web/views/@default/clusters/cluster/settings/metrics/createPopup.html
index 19d8547a..8210a1a0 100644
--- a/web/views/@default/clusters/cluster/settings/metrics/createPopup.html
+++ b/web/views/@default/clusters/cluster/settings/metrics/createPopup.html
@@ -16,8 +16,9 @@
     </thead>
     <tr v-for="item in items">
         <td>{{item.name}}
-            <div style="margin-top: 0.3em" v-if="item.isPublic">
-                <span class="ui label olive tiny basic">公用</span>
+            <div style="margin-top: 0.3em" v-if="item.isPublic || item.code.length > 0">
+                <span class="ui label olive tiny basic" v-if="item.isPublic">公用</span>
+                <span class="ui label olive tiny basic" v-if="item.code.length > 0">内置</span>
             </div>
         </td>
         <td>
diff --git a/web/views/@default/clusters/cluster/settings/metrics/index.html b/web/views/@default/clusters/cluster/settings/metrics/index.html
index 3d59d83b..98c7152f 100644
--- a/web/views/@default/clusters/cluster/settings/metrics/index.html
+++ b/web/views/@default/clusters/cluster/settings/metrics/index.html
@@ -27,8 +27,9 @@
         </thead>
         <tr v-for="item in items">
             <td>{{item.name}}
-                <div style="margin-top: 0.3em" v-if="item.isPublic">
-                    <span class="ui label olive tiny basic">公用</span>
+                <div style="margin-top: 0.3em" v-if="item.isPublic || item.code.length > 0">
+                    <span class="ui label olive tiny basic" v-if="item.isPublic">公用</span>
+                    <span class="ui label olive tiny basic" v-if="item.code.length > 0">内置</span>
                 </div>
             </td>
             <td>
diff --git a/web/views/@default/servers/metrics/index.html b/web/views/@default/servers/metrics/index.html
index ffed7b15..8ec349d5 100644
--- a/web/views/@default/servers/metrics/index.html
+++ b/web/views/@default/servers/metrics/index.html
@@ -23,9 +23,11 @@
         </tr>
     </thead>
     <tr v-for="item in items">
-        <td>{{item.name}}
-            <div style="margin-top: 0.3em" v-if="item.isPublic">
-                <span class="ui label olive tiny basic">公用</span>
+        <td>
+            {{item.name}}
+            <div style="margin-top: 0.3em" v-if="item.isPublic || item.code.length > 0">
+                <span class="ui label olive tiny basic" v-if="item.isPublic">公用</span>
+                <span class="ui label olive tiny basic" v-if="item.code.length > 0">内置</span>
             </div>
         </td>
         <td>
diff --git a/web/views/@default/servers/metrics/item.html b/web/views/@default/servers/metrics/item.html
index 5385f133..502170cd 100644
--- a/web/views/@default/servers/metrics/item.html
+++ b/web/views/@default/servers/metrics/item.html
@@ -37,6 +37,13 @@
             <span class="disabled" v-else>非公用</span>
         </td>
     </tr>
+    <tr>
+        <td>是否内置</td>
+        <td>
+            <span class="green" v-if="item.code.length > 0">内置</span>
+            <span class="disabled" v-else>自建</span>
+        </td>
+    </tr>
 </table>
 
 <!-- 使用此指标的集群 -->