From 3fa0f29648784899ca7c36d47d16a5abd9833bf4 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 20 Oct 2023 18:09:48 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8DlicenseMange=20?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E4=B8=8B=E8=BD=BD=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bottomBox/tabs/licenseManagementTab.vue   |  5 +++--
 .../page/dashboard/explore/promqlInput.vue    | 22 ++++++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/licenseManagementTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/licenseManagementTab.vue
index 41830e81c..f1aa7d149 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/licenseManagementTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/licenseManagementTab.vue
@@ -167,16 +167,17 @@ export default {
       }
       params.saId = this.obj.id
       axios.get('/license/downloadC2V', { responseType: 'blob', params: params }).then(res => {
+        const filename = params.name ? params.name : (this.obj.name + '.csv')
         if (window.navigator.msSaveOrOpenBlob) {
           // 兼容ie11
           const blobObject = new Blob([res.data])
-          window.navigator.msSaveOrOpenBlob(blobObject, params.name)
+          window.navigator.msSaveOrOpenBlob(blobObject, filename)
         } else {
           const url = URL.createObjectURL(new Blob([res.data]))
           const a = document.createElement('a')
           document.body.appendChild(a) // 此处增加了将创建的添加到body当中
           a.href = url
-          a.download = params.name
+          a.download = filename
           a.target = '_blank'
           a.click()
           a.remove() // 将a标签移除
diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
index 4c45dc0d7..c6652d0c2 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
@@ -415,13 +415,9 @@ export default {
       if (!baseUrl || baseUrl == '/') {
         baseUrl = window.location.protocol + '//' + window.location.host
       }
-      // let metadataOptions = await this.$get('prom/api/v1/metadata')
-      // console.log(metadataOptions)
-      // metadataOptions = metadataOptions.data
-      // let metricsdataOptions = await this.$get('prom//api/v1/label/__name__/values')
-      // console.log(metricsdataOptions)
-      // metricsdataOptions = metricsdataOptions.data
-
+      const defaultHeaders = {
+        Authorization: localStorage.getItem('nz-token')
+      }
       const promqlExtension = new PromQLExtension()
         .activateCompletion(true)
         .activateLinter(true)
@@ -430,7 +426,16 @@ export default {
             newCompleteStrategy({
               remote: {
                 url: baseUrl + '/prom/',
-                fetchFn: self.fetchFn
+                fetchFn: (resource, options = {}) => {
+                  const params = options.body?.toString()
+                  const search = params ? `?${params}` : ''
+                  return fetch(resource + search, {
+                    method: 'Get',
+                    headers: new Headers(
+                      defaultHeaders
+                    )
+                  })
+                }
               },
               maxMetricsMetadata: 99999
             })
@@ -462,6 +467,7 @@ export default {
               })),
               span: /^[a-zA-Z0-9_:]+$/
             }
+            // 过滤 非logs的函数
             if (res !== null) {
               historyItems.options = historyItems.options.concat(res.options)
             }