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

Merge branch 'dev' into pr@dev_st_fix

Browse Source
This commit is contained in:
dataeaseShu 2023-05-25 16:15:40 +08:00
commit 89304ac9af
6 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
View File

@ -1158,11 +1158,11 @@ public class DorisQueryProvider extends QueryProvider {
case "y": case "y":
return "%Y"; return "%Y";
case "y_Q": case "y_Q":
return "CONCAT(%s,'" + split + "',%s)"; return "CONCAT(%s,'" + split + "','Q',%s)";
case "y_M": case "y_M":
return "%Y" + split + "%m"; return "%Y" + split + "%m";
case "y_W": case "y_W":
return "%Y" + split + "%u"; return "%Y" + split + "W%u";
case "y_M_d": case "y_M_d":
return "%Y" + split + "%m" + split + "%d"; return "%Y" + split + "%m" + split + "%d";
case "H_m_s": case "H_m_s":

4
backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java
View File

@ -1145,11 +1145,11 @@ public class MysqlQueryProvider extends QueryProvider {
case "y": case "y":
return "%Y"; return "%Y";
case "y_Q": case "y_Q":
return "CONCAT(%s,'" + split + "',%s)"; return "CONCAT(%s,'" + split + "','Q',%s)";
case "y_M": case "y_M":
return "%Y" + split + "%m"; return "%Y" + split + "%m";
case "y_W": case "y_W":
return "%Y" + split + "%u"; return "%Y" + split + "W%u";
case "y_M_d": case "y_M_d":
return "%Y" + split + "%m" + split + "%d"; return "%Y" + split + "%m" + split + "%d";
case "H_m_s": case "H_m_s":

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

@ -1178,11 +1178,11 @@ public class MysqlQueryProvider extends QueryProvider {
case "y": case "y":
return "%Y"; return "%Y";
case "y_Q": case "y_Q":
return "CONCAT(%s,'" + split + "',%s)"; return "CONCAT(%s,'" + split + "','Q',%s)";
case "y_M": case "y_M":
return "%Y" + split + "%m"; return "%Y" + split + "%m";
case "y_W": case "y_W":
return "%Y" + split + "%u"; return "%Y" + split + "W%u";
case "y_M_d": case "y_M_d":
return "%Y" + split + "%m" + split + "%d"; return "%Y" + split + "%m" + split + "%d";
case "H_m_s": case "H_m_s":

16
backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
View File

@ -899,7 +899,7 @@ public class SqlserverQueryProvider extends QueryProvider {
} else if (StringUtils.equalsIgnoreCase(item.getTerm(), "not_empty")) { } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "not_empty")) {
whereValue = "''"; whereValue = "''";
} else if (StringUtils.containsIgnoreCase(item.getTerm(), "in") || StringUtils.containsIgnoreCase(item.getTerm(), "not in")) { } else if (StringUtils.containsIgnoreCase(item.getTerm(), "in") || StringUtils.containsIgnoreCase(item.getTerm(), "not in")) {
if(field.getType().equals("NVARCHAR")){ if(field.getType().equalsIgnoreCase("NVARCHAR")){
whereValue = Arrays.asList(value.split(",")).stream().map(str ->{return "N"+ str;}).collect(Collectors.joining(",")); whereValue = Arrays.asList(value.split(",")).stream().map(str ->{return "N"+ str;}).collect(Collectors.joining(","));
}else { }else {
whereValue = "('" + String.join("','", value.split(",")) + "')"; whereValue = "('" + String.join("','", value.split(",")) + "')";
@ -907,7 +907,7 @@ public class SqlserverQueryProvider extends QueryProvider {
} else if (StringUtils.containsIgnoreCase(item.getTerm(), "like")) { } else if (StringUtils.containsIgnoreCase(item.getTerm(), "like")) {
whereValue = "'%" + value + "%'"; whereValue = "'%" + value + "%'";
} else { } else {
if(field.getType().equals("NVARCHAR")){ if(field.getType().equalsIgnoreCase("NVARCHAR")){
whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, value); whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, value);
}else { }else {
whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, value); whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, value);
@ -1034,7 +1034,7 @@ public class SqlserverQueryProvider extends QueryProvider {
} else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_empty")) { } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_empty")) {
whereValue = "''"; whereValue = "''";
} else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "in") || StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "not in")) { } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "in") || StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "not in")) {
if(field.getType().equals("NVARCHAR")){ if(field.getType().equalsIgnoreCase("NVARCHAR")){
whereValue = Arrays.asList(value.split(",")).stream().map(str ->{return "N"+ str;}).collect(Collectors.joining(",")); whereValue = Arrays.asList(value.split(",")).stream().map(str ->{return "N"+ str;}).collect(Collectors.joining(","));
}else { }else {
whereValue = "('" + String.join("','", value.split(",")) + "')"; whereValue = "('" + String.join("','", value.split(",")) + "')";
@ -1042,7 +1042,7 @@ public class SqlserverQueryProvider extends QueryProvider {
} else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "like")) { } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "like")) {
whereValue = "'%" + value + "%'"; whereValue = "'%" + value + "%'";
} else { } else {
if(field.getType().equals("NVARCHAR")){ if(field.getType().equalsIgnoreCase("NVARCHAR")){
whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, value); whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, value);
}else { }else {
whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, value); whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, value);
@ -1146,7 +1146,7 @@ public class SqlserverQueryProvider extends QueryProvider {
String whereValue = ""; String whereValue = "";
if (StringUtils.containsIgnoreCase(request.getOperator(), "in")) { if (StringUtils.containsIgnoreCase(request.getOperator(), "in")) {
if(request.getDatasetTableField().getType().equals("NVARCHAR")){ if(request.getDatasetTableField().getType().equalsIgnoreCase("NVARCHAR")){
whereValue = value.stream().map(str ->{return "N"+ str;}).collect(Collectors.joining(",")); whereValue = value.stream().map(str ->{return "N"+ str;}).collect(Collectors.joining(","));
}else { }else {
whereValue = "('" + StringUtils.join(value, "','") + "')"; whereValue = "('" + StringUtils.join(value, "','") + "')";
@ -1166,7 +1166,7 @@ public class SqlserverQueryProvider extends QueryProvider {
} }
} else { } else {
if(request.getDatasetTableField().getType().equals("NVARCHAR")){ if(request.getDatasetTableField().getType().equalsIgnoreCase("NVARCHAR")){
whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, value.get(0)); whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, value.get(0));
}else { }else {
whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, value.get(0)); whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, value.get(0));
@ -1328,7 +1328,7 @@ public class SqlserverQueryProvider extends QueryProvider {
} else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_empty")) { } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_empty")) {
whereValue = "''"; whereValue = "''";
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) { } else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) {
if(y.getType().equals("NVARCHAR")){ if(y.getType().equalsIgnoreCase("NVARCHAR")){
whereValue = Arrays.asList(f.getValue().split(",")).stream().map(str ->{return "N"+ str;}).collect(Collectors.joining(",")); whereValue = Arrays.asList(f.getValue().split(",")).stream().map(str ->{return "N"+ str;}).collect(Collectors.joining(","));
}else { }else {
whereValue = "('" + String.join("','", f.getValue().split(",")) + "')"; whereValue = "('" + String.join("','", f.getValue().split(",")) + "')";
@ -1336,7 +1336,7 @@ public class SqlserverQueryProvider extends QueryProvider {
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) { } else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) {
whereValue = "'%" + f.getValue() + "%'"; whereValue = "'%" + f.getValue() + "%'";
} else { } else {
if(y.getType().equals("NVARCHAR")){ if(y.getType().equalsIgnoreCase("NVARCHAR")){
whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, f.getValue()); whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, f.getValue());
}else { }else {
whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, f.getValue()); whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, f.getValue());

6
frontend/src/api/map/map.js
View File

@ -4,7 +4,7 @@ export const areaMapping = () => {
return request({ return request({
url: '/api/map/globalEntitys/0', url: '/api/map/globalEntitys/0',
method: 'get', method: 'get',
loading: true loading: false
}) })
} }
@ -12,7 +12,7 @@ export const globalMapping = () => {
return request({ return request({
url: '/api/map/globalEntitys/0', url: '/api/map/globalEntitys/0',
method: 'get', method: 'get',
loading: true loading: false
}) })
} }
@ -21,7 +21,7 @@ export function geoJson(areaCode) {
return request({ return request({
url: '/geo/full/' + countryCode + '/' + areaCode + '_full.json', url: '/geo/full/' + countryCode + '/' + areaCode + '_full.json',
method: 'get', method: 'get',
loading: true loading: false
}) })
} }

2
frontend/src/components/deDrag/index.vue
View File

@ -1544,8 +1544,6 @@ export default {
} else { } else {
this.element.style.left = 0 this.element.style.left = 0
this.element.style.top = 0 this.element.style.top = 0
this.element.style.width = this.element.style.width * this.curCanvasScaleSelf.matrixStyleWidth / targetCanvasScale.matrixStyleWidth
this.element.style.height = this.element.style.height * this.curCanvasScaleSelf.matrixStyleHeight / targetCanvasScale.matrixStyleHeight
} }
this.element.canvasId = targetCanvasId this.element.canvasId = targetCanvasId
} }