From f300f75679b5a6f84b9b7ae60001836668f4e815 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 3 Nov 2021 10:36:35 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E6=A0=A1=E9=AA=8C=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/datasource/form.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue index aafbd3f839..2a0c1f4f6c 100644 --- a/frontend/src/views/system/datasource/form.vue +++ b/frontend/src/views/system/datasource/form.vue @@ -285,7 +285,7 @@ export default { } else { this.$error(this.$t(res.message)) } - this.refreshTree() + this.refreshType(data) }).catch(res => { this.$error(res.message) }) From 50b57081b6b481ff5ec6410a4a9620189f11dcb8 Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 3 Nov 2021 11:12:08 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E9=98=BB=E6=AD=A2=E5=9B=9E=E8=BD=A6=E4=BA=8B=E4=BB=B6=E6=8F=90?= =?UTF-8?q?=E4=BA=A4form?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/group/Group.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue index d91abbe70c..6a8645ba27 100644 --- a/frontend/src/views/chart/group/Group.vue +++ b/frontend/src/views/chart/group/Group.vue @@ -267,7 +267,7 @@ class="dialog-css" > - + From 95f849b6505f62be99f0677e38efe712675b9e8f Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 3 Nov 2021 11:12:52 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E5=BC=B9=E6=A1=86=E6=B8=85=E7=A9=BA=E4=B8=8A?= =?UTF-8?q?=E6=AC=A1=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/data/UnionView.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/views/dataset/data/UnionView.vue b/frontend/src/views/dataset/data/UnionView.vue index fcc08d37e2..b2a09cc388 100644 --- a/frontend/src/views/dataset/data/UnionView.vue +++ b/frontend/src/views/dataset/data/UnionView.vue @@ -270,6 +270,7 @@ export default { targetUnionRelation: '' } this.targetTable = {} + this.targetFieldOption = [] }, edit(item) { From e39306ec812c70a2534522a4c2d09867e1854bd3 Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 3 Nov 2021 11:14:14 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E7=9B=B4=E8=BF=9Esql=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81=E6=95=B0=E6=8D=AE=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/data/ViewTable.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue index 0769e19aa5..c60d7c8d53 100644 --- a/frontend/src/views/dataset/data/ViewTable.vue +++ b/frontend/src/views/dataset/data/ViewTable.vue @@ -53,7 +53,7 @@ - + From 4eff68ad4474e54522ac666aceb935c401f0ef57 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 3 Nov 2021 11:57:26 +0800 Subject: [PATCH 5/6] fix: redshift sql --- .../dataease/provider/query/redshift/RedshiftQueryProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java index 27226985a1..81d9502382 100644 --- a/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java @@ -182,7 +182,7 @@ public class RedshiftQueryProvider extends QueryProvider { @Override public String createQuerySQLWithPage(String sql, List fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) { - return createQuerySQL(sql, fields, isGroup, null) + " LIMIT " + realSize + " offset " + (page - 1) * pageSize; + return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT " + realSize + " offset " + (page - 1) * pageSize; } @Override From 330d5370d688da3f9584deed2864bc7d8a6725cf Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 3 Nov 2021 14:08:31 +0800 Subject: [PATCH 6/6] =?UTF-8?q?refactor:=20cron=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/cron/cron.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/cron/cron.vue b/frontend/src/components/cron/cron.vue index d694fc9715..56e9df57cc 100644 --- a/frontend/src/components/cron/cron.vue +++ b/frontend/src/components/cron/cron.vue @@ -126,9 +126,9 @@ export default { }) } const v = `${this.sVal} ${this.mVal} ${this.hVal} ${this.dVal} ${this.monthVal} ${this.weekVal} ${this.yearVal}` - if (v !== this.value) { - this.$emit('input', v) - } + // if (v !== this.value) { + this.$emit('input', v) + // } return v } },