From aaaf007385efa5093b6a97a991ab469c2cce2003 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Thu, 15 Sep 2022 18:26:24 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=EF=BC=9A=20=E4=BF=AE=E5=A4=8D=20explore?= =?UTF-8?q?=20=E5=BF=AB=E7=85=A7=20=E9=83=A8=E5=88=86=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=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/common.scss | 30 +++++++++++-------- .../page/dashboard/explore/exploreItem.vue | 3 ++ .../dashboard/explore/exploreItemHtml.vue | 12 ++++---- .../page/dashboard/explore/logTab.vue | 3 +- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index 91f2cac0a..dd8744f0c 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -561,17 +561,21 @@ textarea { border-radius: 3px; } } -.explore { - .el-icon-arrow-down{ - font-family: nz-icon!important; - } - .el-icon-arrow-down::before{ - content: '\e6b0'; - } - .el-icon-check{ - font-family: nz-icon!important; - } - .el-icon-check::before{ - content: '\e689'; - } +.el-icon-arrow-down{ + font-family: nz-icon!important; +} +.el-icon-arrow-down::before{ + content: '\e6b0'; +} +.el-icon-check{ + font-family: nz-icon!important; +} +.el-icon-check::before{ + content: '\e689'; +} +.el-icon-arrow-left{ + font-family: nz-icon!important; +} +.el-icon-check::before{ + content: '\e778'; } diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue index 4679db3e4..5a26831e6 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue @@ -1686,6 +1686,9 @@ export default { unit: this.chartUnit, expressions: this.expressions.map(item => encodeURIComponent(item)) } + if (!this.showMetrics) { + params.limit = this.$refs.logDetail ? this.$refs.logDetail.getLimit() : 100 + } this.$get('/visual/explore/snapshot', params, 'blob').then(res => { const self = this let fileName = this.showMetrics ? 'Metrics explore' : 'Logs explore' diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue index 68e247d64..7835306b5 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue @@ -28,12 +28,12 @@
{{$t('dashboard.panel.chartForm.typeVal.table.label')}} - + + + + + + Result: {{tableData.length}}
-
+
@@ -130,6 +130,7 @@ export default { const theme = localStorage.getItem(`nz-user-${localStorage.getItem('nz-user-id')}-theme`) || 'light' return { theme, + dataJson: window.dataJson, operations: { levels: [0, 1, 2, 3, 4, 5, 6], descending: true