From 93fd073d70b07ae46094a5bcee02f9ea6be19d7c Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Tue, 1 Aug 2023 10:12:33 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-3020=20feat=EF=BC=9Aagent=20scrape=20endpoi?=
 =?UTF-8?q?nt=20=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/common/deleteButton.scss   |  2 ++
 .../table/settings/scrapeEndpointTable.vue    | 36 +++++++++++--------
 .../src/components/page/config/agent.vue      |  1 +
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/deleteButton.scss b/nezha-fronted/src/assets/css/components/common/deleteButton.scss
index 7926efef8..1d6be9cd2 100644
--- a/nezha-fronted/src/assets/css/components/common/deleteButton.scss
+++ b/nezha-fronted/src/assets/css/components/common/deleteButton.scss
@@ -10,6 +10,7 @@
   .dialog-header {
     margin-bottom: 10px;
     word-wrap: break-word;
+    color: $--color-text-primary;
     span{
       word-break: break-word;
     }
@@ -49,6 +50,7 @@
     margin-bottom: 10px;
     padding-left: 10px;
     box-sizing: border-box;
+    line-height: 22px;
     .nz-icon{
       vertical-align: middle;
     }
diff --git a/nezha-fronted/src/components/common/table/settings/scrapeEndpointTable.vue b/nezha-fronted/src/components/common/table/settings/scrapeEndpointTable.vue
index 2fc541e65..971735358 100644
--- a/nezha-fronted/src/components/common/table/settings/scrapeEndpointTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/scrapeEndpointTable.vue
@@ -6,7 +6,6 @@
   :height="height"
   border
   @header-dragend="dragend"
-  @sort-change="tableDataSort"
   @selection-change="selectionChange"
   >
   <el-table-column
@@ -35,7 +34,7 @@
     </template>
     <template slot-scope="scope" :column="item">
       <template v-if="item.prop === 'endpoint'">{{scope.row.discoveredLabels.endpoint ? scope.row.discoveredLabels.endpoint : '-'}}</template>
-      <template v-else-if="item.prop === 'lastScrape'">{{time}}</template>
+      <template v-else-if="item.prop === 'lastScrape'">{{lastScrapeFormate(scope.row.lastScrape)}}</template>
       <template v-else-if="item.prop === 'labels'" class="labels">
           <span v-for="(item, i) in labelsSort(scope.row.labels)" :key="i">
             <span>
@@ -122,15 +121,18 @@ export default {
         }, {
           label: this.$t('config.scrapeEndpoint.lastScrape'),
           prop: 'lastScrape',
-          show: true
+          show: true,
+          sortable: true
         }, {
           label: this.$t('config.scrapeEndpoint.scrapeDuration'),
           prop: 'lastScrapeDuration',
-          show: true
+          show: true,
+          sortable: true
         }, {
           label: this.$t('overall.state'),
           prop: 'health',
-          show: true
+          show: true,
+          sortable: true
         }, {
           label: this.$t('ERROR'),
           prop: 'lastError',
@@ -153,16 +155,16 @@ export default {
     }
   },
   watch: {
-    currentTableData: {
-      immediate: true,
-      deep: true,
-      handler (n) {
-        n.forEach(e => {
-          const lastScrape = new Date(e.lastScrape).getTime()
-          this.time = bus.timeFormate(lastScrape, this.timeFormatMain)
-        })
-      }
-    }
+    // currentTableData: {
+    //   immediate: true,
+    //   deep: true,
+    //   handler (n) {
+    //     n.forEach(e => {
+    //       const lastScrape = new Date(e.lastScrape).getTime()
+    //       this.time = bus.timeFormate(lastScrape, this.timeFormatMain)
+    //     })
+    //   }
+    // }
   },
   methods: {
     // 对于 labels 传入数据做处理
@@ -219,6 +221,10 @@ export default {
       }
       this.$set(item[type], 'loading', loading)
     },
+    lastScrapeFormate (time) {
+      const lastScrape = new Date(time).getTime()
+      return bus.timeFormate(lastScrape, this.timeFormatMain)
+    },
     // scrape duration
     lastScrapeDurationTimer (time) {
       const date = (time * 1000).toFixed(3)
diff --git a/nezha-fronted/src/components/page/config/agent.vue b/nezha-fronted/src/components/page/config/agent.vue
index 521b7473d..407e7c1ad 100644
--- a/nezha-fronted/src/components/page/config/agent.vue
+++ b/nezha-fronted/src/components/page/config/agent.vue
@@ -136,6 +136,7 @@ export default {
     return {
       url: 'agent',
       tableId: 'promTable', // 需要分页的table的id，用于记录每页数量
+      detailType: 'list',
       blankObject: {
         id: '',
         name: '',