dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8062 from dataease/pr@dev@feat_permissions

Browse Source 
feat(数据源): 数据集行权限支持设置左右模糊查询
This commit is contained in:
taojinlong 2024-02-19 17:28:46 +08:00 committed by GitHub
commit d3e22e0988
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
View File

@ -1095,6 +1095,10 @@ public class MysqlQueryProvider extends QueryProvider {
whereValue = "('" + String.join("','", value.split(",")) + "')";
} else if (StringUtils.containsIgnoreCase(item.getTerm(), "like")) {
whereValue = "'%" + value + "%'";
} else if (StringUtils.containsIgnoreCase(item.getTerm(), "begin_with")) {
whereValue = "'%" + value;
} else if (StringUtils.containsIgnoreCase(item.getTerm(), "end_with")) {
whereValue = value + "%'";
} else {
whereValue = String.format(MySQLConstants.WHERE_VALUE_VALUE, value);
}
@ -1170,6 +1174,10 @@ public class MysqlQueryProvider extends QueryProvider {
whereValue = "('" + String.join("','", value.split(",")) + "')";
} else if (StringUtils.containsIgnoreCase(item.getTerm(), "like")) {
whereValue = "'%" + value + "%'";
} else if (StringUtils.containsIgnoreCase(item.getTerm(), "begin_with")) {
whereValue = "'%" + value;
} else if (StringUtils.containsIgnoreCase(item.getTerm(), "end_with")) {
whereValue = value + "%'";
} else {
whereValue = String.format(MySQLConstants.WHERE_VALUE_VALUE, value);
}
@ -1206,6 +1214,8 @@ public class MysqlQueryProvider extends QueryProvider {
case "not in":
return " NOT IN ";
case "like":
case "begin_with":
case "end_with":
return " LIKE ";
case "not like":
return " NOT LIKE ";
@ -1295,6 +1305,10 @@ public class MysqlQueryProvider extends QueryProvider {
whereValue = "('" + String.join("','", value.split(",")) + "')";
} else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "like")) {
whereValue = "'%" + value + "%'";
} else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "begin_with")) {
whereValue = "'%" + value;
} else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "end_with")) {
whereValue = value + "%'";
} else {
whereValue = String.format(MySQLConstants.WHERE_VALUE_VALUE, value);
}
@ -1591,6 +1605,10 @@ public class MysqlQueryProvider extends QueryProvider {
whereValue = "('" + StringUtils.join(f.getValue(), "','") + "')";
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) {
whereValue = "'%" + f.getValue() + "%'";
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "begin_with")) {
whereValue = "'%" + f.getValue();
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "end_with")) {
whereValue = f.getValue() + "%'";
} else {
whereValue = String.format(MySQLConstants.WHERE_VALUE_VALUE, f.getValue());
}
@ -1655,6 +1673,10 @@ public class MysqlQueryProvider extends QueryProvider {
whereValue = "('" + StringUtils.join(f.getValue(), "','") + "')";
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) {
whereValue = "'%" + f.getValue() + "%'";
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "begin_with")) {
whereValue = "'%" + f.getValue();
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "end_with")) {
whereValue = f.getValue() + "%'";
} else {
whereValue = String.format(MySQLConstants.WHERE_VALUE_VALUE, f.getValue());
}

2
core/frontend/src/lang/en.js
View File

@ -1137,6 +1137,8 @@ export default {
filter_not_empty: 'Not Empty String',
filter_include: 'Contain',
filter_not_include: 'Not Contain',
filter_end_with: 'End With',
filter_begin_with: 'Begin With',
rose_type: 'Rose pattern',
radius_mode: 'Radius',
area_mode: 'Area',

2
core/frontend/src/lang/tw.js
View File

@ -1136,6 +1136,8 @@ export default {
filter_not_empty: '非空字符串',
filter_include: '包含',
filter_not_include: '不包含',
filter_end_with: '结尾是',
filter_begin_with: '开头是',
rose_type: '玫瑰圖模式',
radius_mode: '半徑',
area_mode: '面積',

2
core/frontend/src/lang/zh.js
View File

@ -1135,6 +1135,8 @@ export default {
filter_not_empty: '非空字符串',
filter_include: '包含',
filter_not_include: '不包含',
filter_end_with: '结尾是',
filter_begin_with: '开头是',
rose_type: '玫瑰图模式',
radius_mode: '半径',
area_mode: '面积',