From 6db6419c12f7d930c3f86f1b40f233e32b7aa2ed Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Wed, 3 Aug 2022 15:05:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20input=20border=E8=89=B2=E5=80=BC?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=9B=BF=E6=8D=A2=E4=B8=BAcss=E5=8F=98?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/user/index.vue | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue index 2d534cfe58..8b8c47ef42 100644 --- a/frontend/src/views/system/user/index.vue +++ b/frontend/src/views/system/user/index.vue @@ -719,8 +719,8 @@ export default { } .normal { - color: #1f2329; - border: 1px solid #bbbfc4; + color: var(----deTextPrimary, #1F2329); + border: 1px solid var(--deBorderBase, #BBBFC4); margin-left: 12px; } @@ -755,9 +755,6 @@ export default { .name-email-search { width: 240px; - ::v-deep input { - border-color: #bbbfc4; - } } .active-btn { From 7b1be5836d59ce0381798f156581a57d9a33d661 Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Wed, 3 Aug 2022 15:05:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20input=20border=E8=89=B2=E5=80=BC?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=9B=BF=E6=8D=A2=E4=B8=BAcss=E5=8F=98?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/user/index.vue | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue index 2d534cfe58..8b8c47ef42 100644 --- a/frontend/src/views/system/user/index.vue +++ b/frontend/src/views/system/user/index.vue @@ -719,8 +719,8 @@ export default { } .normal { - color: #1f2329; - border: 1px solid #bbbfc4; + color: var(----deTextPrimary, #1F2329); + border: 1px solid var(--deBorderBase, #BBBFC4); margin-left: 12px; } @@ -755,9 +755,6 @@ export default { .name-email-search { width: 240px; - ::v-deep input { - border-color: #bbbfc4; - } } .active-btn { From fef0881b51ca1e6d09908489cae21f8b6615bcf4 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 3 Aug 2022 15:26:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=8F=98=E9=87=8F=E6=94=AF=E6=8C=81?= =?UTF-8?q?=20between=20and?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/dataset/DataSetTableService.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 234ac51990..6c3b5e20b0 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -2620,6 +2620,15 @@ public class DataSetTableService { } } + @Override + public void visit(Between between) { + if(hasVarible(between.getBetweenExpressionStart().toString()) || hasVarible(between.getBetweenExpressionEnd().toString())){ + getBuffer().append(SubstitutedSql); + }else { + getBuffer().append(between.getLeftExpression()).append(" BETWEEN ").append(between.getBetweenExpressionStart()).append(" AND ").append(between.getBetweenExpressionEnd()); + } + } + @Override public void visit(LikeExpression likeExpression) { if (hasVarible(likeExpression.toString())) {