From 2713969db0393aff6e237fb104e0e819efa6d938 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 14 Mar 2023 10:47:12 +0800 Subject: [PATCH 01/13] =?UTF-8?q?NEZ-2682=20fix=EF=BC=9AExplore=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E8=A1=A8=E8=BE=BE=E5=BC=8F=E6=9C=AA=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=83=85=E5=86=B5=E4=B8=8B=E5=BF=AB=E7=85=A7?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=AF=E4=BD=BF=E7=94=A8=E4=B8=94=E6=9C=89?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/page/dashboard/explore/exploreItem.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue index f10991a84..3f3bdf1b0 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue @@ -4242,6 +4242,10 @@ export default { return letter }, exportToHtml (name) { + if (this.showIntroduce) { + this.$message.error(this.$t('explore.queryExpression')) + return + } const params = { type: this.showMetrics ? 1 : 2, start: this.momentStrToTimestamp(this.filterTime[0]) / 1000, From 19d3f4dc8d780284e99c9e6fca8bff6c2a07167b Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 14 Mar 2023 10:47:30 +0800 Subject: [PATCH 02/13] =?UTF-8?q?NEZ-2685=20fix=EF=BC=9AExplore=E7=82=B9?= =?UTF-8?q?=E5=87=BBSelect=20columns=E6=A0=87=E9=A2=98=E4=BC=9A=E5=AF=BC?= =?UTF-8?q?=E8=87=B4Table=E5=B1=95=E5=BC=80=E6=94=B6=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/page/dashboard/explore/exploreItem.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue index 3f3bdf1b0..4dc47d173 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue @@ -132,7 +132,7 @@ Date: Tue, 14 Mar 2023 10:47:48 +0800 Subject: [PATCH 03/13] =?UTF-8?q?NEZ-2687=20fix=EF=BC=9AExplore=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=9F=A5=E8=AF=A2=E8=A1=A8=E8=BE=BE=E5=BC=8F=E5=90=8E?= =?UTF-8?q?Save=20chart=E6=8C=89=E9=92=AE=E6=9C=AA=E7=BD=AE=E7=81=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/page/dashboard/explore/exploreItem.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue index 4dc47d173..76d25bc36 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue @@ -4331,6 +4331,7 @@ export default { }) if (!temp) { this.showIntroduce = true + this.saveDisabled = true } } } From 5393484c5eb2313a4e996f3ed03752b738bfc7b9 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 14 Mar 2023 10:52:30 +0800 Subject: [PATCH 04/13] =?UTF-8?q?NEZ-2685=20fix=EF=BC=9AExplore=E7=82=B9?= =?UTF-8?q?=E5=87=BBSelect=20columns=E6=A0=87=E9=A2=98=E4=BC=9A=E5=AF=BC?= =?UTF-8?q?=E8=87=B4Table=E5=B1=95=E5=BC=80=E6=94=B6=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/common/elementSet.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nezha-fronted/src/components/common/elementSet.vue b/nezha-fronted/src/components/common/elementSet.vue index 5f491dee1..e367633db 100644 --- a/nezha-fronted/src/components/common/elementSet.vue +++ b/nezha-fronted/src/components/common/elementSet.vue @@ -1,7 +1,7 @@