From 21c0f25b25d4fe8d94e9c4fd80017401d8175737 Mon Sep 17 00:00:00 2001 From: zyh Date: Tue, 23 May 2023 14:45:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8DdashboardTab?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/bottomBox/tabs/dashboardTab.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue index eb10fab8c..20e18bdff 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue @@ -880,8 +880,10 @@ export default { }, showPanel: { handler () { - this.setDefaultTimeRange() - this.setDefaultRefresh() + if (this.from !== this.fromRoute.dashboardTemp) { + this.setDefaultTimeRange() + this.setDefaultRefresh() + } } }, // 监听图表联动配置 From 010a75c45cb606b47bcd6a1132608f6684335c33 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Thu, 25 May 2023 15:37:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?NEZ-2840=20fix=EF=BC=9A=E5=BD=93=20endpoint?= =?UTF-8?q?=20=E9=85=8D=E7=BD=AE=E8=81=94=E9=82=A6=E6=97=B6=EF=BC=8CMetric?= =?UTF-8?q?=20target=20=E8=AE=BF=E9=97=AE=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/common/mixin/dataList.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js index 5ea3af2d8..e36ffb0b1 100644 --- a/nezha-fronted/src/components/common/mixin/dataList.js +++ b/nezha-fronted/src/components/common/mixin/dataList.js @@ -345,7 +345,14 @@ export default { let str = '' if (!lodash.isEmpty(params)) { for (const key in params) { - str += key + '=' + params[key] + '&' + const arr = params[key] + if (arr.length > 1) { + arr.forEach(item => { + str += key + '=' + item + '&' + }) + } else { + str += key + '=' + params[key][0] + '&' + } } } const linkTarget = `${protocol}://${host}:${port + metricsPath}${str ? '?' + str.slice(0, str.length - 1) : ''}`