center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
wangjiahao 2022-08-03 15:46:56 +08:00
commit 5b53aeb514
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -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())) {

7
frontend/src/views/system/user/index.vue
View File

@ -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 {