From 90a0750acda813c74c2aaa12df15f0471b30a0a4 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 15 Apr 2022 17:33:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?NEZ-1813=20fix=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20chart-stat=20=E5=9B=A0=E4=B8=BA=E9=AB=98=E5=BA=A6=E4=B8=8D?= =?UTF-8?q?=E5=A4=9F=20=E5=AF=BC=E8=87=B4hidden=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/css/components/chart/chart.scss | 6 +++--- nezha-fronted/src/components/chart/chart/chartStat.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/chart/chart.scss b/nezha-fronted/src/assets/css/components/chart/chart.scss index 8b058daea..61b981a61 100644 --- a/nezha-fronted/src/assets/css/components/chart/chart.scss +++ b/nezha-fronted/src/assets/css/components/chart/chart.scss @@ -425,10 +425,10 @@ } .chart-stat{ width: 100%; - height: calc(100% - 20px); + height: 100%; display: flex; flex-wrap: wrap; - padding: 5px; + padding: 2px; box-sizing: border-box; flex-direction: row; align-items: center; @@ -441,7 +441,7 @@ word-break: break-all; border-radius: 2px; box-sizing: border-box; - padding: 2px; + //padding: 2px; overflow: hidden; color: $--color-text-regular; flex-grow: 1 diff --git a/nezha-fronted/src/components/chart/chart/chartStat.vue b/nezha-fronted/src/components/chart/chart/chartStat.vue index 9f6f2fee8..694440782 100644 --- a/nezha-fronted/src/components/chart/chart/chartStat.vue +++ b/nezha-fronted/src/components/chart/chart/chartStat.vue @@ -63,7 +63,7 @@ export default { statData: [], boxWidth: 0, boxHeight: 0, - boxPadding: 5, + boxPadding: 2, statTimer: null, tooltip: { x: 0, From 4a658570b972d8275ef6221de28ce9e2e571ef2c Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 15 Apr 2022 17:57:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=20chart=20?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB=E4=B8=8D?= =?UTF-8?q?=E6=94=B6=E5=9B=9E=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/chart/chartHeader.vue | 2 +- nezha-fronted/src/components/chart/chartHeaderMixin.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/chart/chartHeader.vue b/nezha-fronted/src/components/chart/chartHeader.vue index 930301870..a349c9198 100644 --- a/nezha-fronted/src/components/chart/chartHeader.vue +++ b/nezha-fronted/src/components/chart/chartHeader.vue @@ -73,7 +73,7 @@ {{$t('dashboard.duplicate')}} -
  • +
  • {{$t('overall.syncChart')}}
  • diff --git a/nezha-fronted/src/components/chart/chartHeaderMixin.js b/nezha-fronted/src/components/chart/chartHeaderMixin.js index afa6e32a5..393ee1a94 100644 --- a/nezha-fronted/src/components/chart/chartHeaderMixin.js +++ b/nezha-fronted/src/components/chart/chartHeaderMixin.js @@ -43,18 +43,25 @@ export default { chart: this.chartInfo, type: 'edit' }) + this.dropdownMenuShow = false }, removeChart () { this.$store.dispatch('dispatchDelChart', { chart: this.chartInfo, type: 'delete' }) + this.dropdownMenuShow = false }, duplicate () { this.$store.dispatch('dispatchEditChart', { chart: this.chartInfo, type: 'duplicate' }) + this.dropdownMenuShow = false + }, + sync () { + this.$emit('sync') + this.dropdownMenuShow = false }, clickos () { this.dropdownMenuShow = false