From 5c37472dab759248244dda6f207fe2cb55c6558b Mon Sep 17 00:00:00 2001 From: zyh Date: Fri, 18 Aug 2023 14:09:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?NEZ-3077=20feat=EF=BC=9Achart=20timeseries?= =?UTF-8?q?=20=E7=BB=84=E4=BB=B6=E5=A2=9E=E5=8A=A0=E9=BC=A0=E6=A0=87?= =?UTF-8?q?=E6=BB=9A=E8=BD=AE=E7=BC=A9=E6=94=BE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/chart/chart/options/chartTimeSeries.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js b/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js index 6698e3118..236d4071a 100644 --- a/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js +++ b/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js @@ -48,6 +48,12 @@ export const chartTimeSeriesLineOption = { } } }, + dataZoom: [ + { + type: 'inside', + zoomOnMouseWheel: 'ctrl' + } + ], color: initColor(), grid: { left: 20, From 4d7968194e0f38354713c1c92556a1a6d835b2c0 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 18 Aug 2023 14:15:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?NEZ-3065=20=20fix=EF=BC=9A=20label=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/alert/alertMessageInfoDetail.vue | 1 + .../src/components/common/alert/alertMessageInfoTimeLine.vue | 3 ++- .../src/components/common/table/alert/alertSilenceTable.vue | 1 + .../src/components/common/table/settings/recordRuleTable.vue | 1 + .../components/common/table/settings/scrapeEndpointTable.vue | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/common/alert/alertMessageInfoDetail.vue b/nezha-fronted/src/components/common/alert/alertMessageInfoDetail.vue index cfd7027e7..ffb919431 100644 --- a/nezha-fronted/src/components/common/alert/alertMessageInfoDetail.vue +++ b/nezha-fronted/src/components/common/alert/alertMessageInfoDetail.vue @@ -15,6 +15,7 @@ :label="item.label" :type="tagType(item.label)" style="margin: 5px 0 5px 5px;" + :title="item.value" > {{item.value}} diff --git a/nezha-fronted/src/components/common/alert/alertMessageInfoTimeLine.vue b/nezha-fronted/src/components/common/alert/alertMessageInfoTimeLine.vue index b91968a10..6b872eb58 100644 --- a/nezha-fronted/src/components/common/alert/alertMessageInfoTimeLine.vue +++ b/nezha-fronted/src/components/common/alert/alertMessageInfoTimeLine.vue @@ -75,6 +75,7 @@ :cursor-point="tagType(label.label) !== 'info'" :label="label.label" :type="tagType(label.label)" + :title="label.value" style="margin: 5px 0 5px 5px" > {{ label.value }} @@ -328,4 +329,4 @@ export default { } } } - \ No newline at end of file + diff --git a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue index 7c22d5ba3..1ba431be3 100644 --- a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue @@ -72,6 +72,7 @@ :label="item1.name" :type="tagType(item1.name)" :regex="item1.regex" + :title="item1.value" style="margin: 5px 0 5px 5px" > {{ item1.value }} diff --git a/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue b/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue index 493b1db5b..50f5ebc3f 100644 --- a/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue +++ b/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue @@ -79,6 +79,7 @@ :type="'info'" :label="item1.label" :regex="item1.regex" + :title="item1.value" style="margin: 5px 0 5px 5px"> {{ item1.value }} diff --git a/nezha-fronted/src/components/common/table/settings/scrapeEndpointTable.vue b/nezha-fronted/src/components/common/table/settings/scrapeEndpointTable.vue index 6ae1d61ce..2a7becc98 100644 --- a/nezha-fronted/src/components/common/table/settings/scrapeEndpointTable.vue +++ b/nezha-fronted/src/components/common/table/settings/scrapeEndpointTable.vue @@ -46,6 +46,7 @@ :label="item.label" :type="'info'" style="margin: 5px 0 5px 5px;" + :title="item.value" > {{item.value}}