From f525d9154a47589f659a2a4aa1cb1228b3c769a6 Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 19 May 2021 16:21:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:fontsize=20fix;=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/provider/mysql/MysqlQueryProvider.java | 2 +- frontend/src/views/chart/components/shape-attr/SizeSelector.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java index f182c6109a..2fe0d6c0b4 100644 --- a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java @@ -184,7 +184,7 @@ public class MysqlQueryProvider extends QueryProvider { StringUtils.join(groupField, ","), StringUtils.join(field, ","), table, - xFilter.length > 0 ? StringUtils.join(xFilter, " ") : "" + transMysqlExtFilter(extFilterRequestList),// origin field filter and panel field filter + (xFilter.length > 0 ? StringUtils.join(xFilter, " ") : "") + transMysqlExtFilter(extFilterRequestList),// origin field filter and panel field filter StringUtils.join(group, ","), StringUtils.join(order, ",")); if (sql.endsWith(",")) { diff --git a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue index 2b7a2df6b4..fb65863e19 100644 --- a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue +++ b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue @@ -194,7 +194,7 @@ export default { methods: { init() { const arr = [] - for (let i = 10; i <= 30; i = i + 2) { + for (let i = 10; i <= 60; i = i + 2) { arr.push({ name: i + '', value: i + ''