From b2fc30bed395ca72fc12beb50c5ff9012aa270b0 Mon Sep 17 00:00:00 2001 From: Wangjiahao <1522128093@qq.com> Date: Thu, 25 May 2023 13:22:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=82=AC=E6=B5=AE=E7=BB=84=E4=BB=B6=E7=A7=BB?= =?UTF-8?q?=E5=85=A5tab=E7=BB=84=E4=BB=B6=E5=8F=AF=E8=83=BD=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=B5=8F=E8=A7=88=E5=99=A8=E5=8D=A1=E9=A1=BF=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/map/map.js | 6 +++--- frontend/src/components/deDrag/index.vue | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/frontend/src/api/map/map.js b/frontend/src/api/map/map.js index 6d79a3cfbb..bbc8a2f83b 100644 --- a/frontend/src/api/map/map.js +++ b/frontend/src/api/map/map.js @@ -4,7 +4,7 @@ export const areaMapping = () => { return request({ url: '/api/map/globalEntitys/0', method: 'get', - loading: true + loading: false }) } @@ -12,7 +12,7 @@ export const globalMapping = () => { return request({ url: '/api/map/globalEntitys/0', method: 'get', - loading: true + loading: false }) } @@ -21,7 +21,7 @@ export function geoJson(areaCode) { return request({ url: '/geo/full/' + countryCode + '/' + areaCode + '_full.json', method: 'get', - loading: true + loading: false }) } diff --git a/frontend/src/components/deDrag/index.vue b/frontend/src/components/deDrag/index.vue index 47b96e2c9c..9b5a2d2d5d 100644 --- a/frontend/src/components/deDrag/index.vue +++ b/frontend/src/components/deDrag/index.vue @@ -1544,8 +1544,6 @@ export default { } else { this.element.style.left = 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 } From 69598d0530e002137242550017cec7f96e39d58d Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 25 May 2023 13:23:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=E5=AD=A3=E5=BA=A6=E3=80=81?= =?UTF-8?q?=E5=91=A8=E6=A0=BC=E5=BC=8F=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AF=8D?= =?UTF-8?q?=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/provider/engine/doris/DorisQueryProvider.java | 4 ++-- .../io/dataease/provider/engine/mysql/MysqlQueryProvider.java | 4 ++-- .../io/dataease/provider/query/mysql/MysqlQueryProvider.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java index 5c6cc33712..cd1af62e89 100644 --- a/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java @@ -1158,11 +1158,11 @@ public class DorisQueryProvider extends QueryProvider { case "y": return "%Y"; case "y_Q": - return "CONCAT(%s,'" + split + "',%s)"; + return "CONCAT(%s,'" + split + "','Q',%s)"; case "y_M": return "%Y" + split + "%m"; case "y_W": - return "%Y" + split + "%u"; + return "%Y" + split + "W%u"; case "y_M_d": return "%Y" + split + "%m" + split + "%d"; case "H_m_s": diff --git a/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java index 070dc44f76..3caac20d8f 100644 --- a/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java @@ -1145,11 +1145,11 @@ public class MysqlQueryProvider extends QueryProvider { case "y": return "%Y"; case "y_Q": - return "CONCAT(%s,'" + split + "',%s)"; + return "CONCAT(%s,'" + split + "','Q',%s)"; case "y_M": return "%Y" + split + "%m"; case "y_W": - return "%Y" + split + "%u"; + return "%Y" + split + "W%u"; case "y_M_d": return "%Y" + split + "%m" + split + "%d"; case "H_m_s": diff --git a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java index 1d6d357b7e..bad34ddb82 100644 --- a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java @@ -1178,11 +1178,11 @@ public class MysqlQueryProvider extends QueryProvider { case "y": return "%Y"; case "y_Q": - return "CONCAT(%s,'" + split + "',%s)"; + return "CONCAT(%s,'" + split + "','Q',%s)"; case "y_M": return "%Y" + split + "%m"; case "y_W": - return "%Y" + split + "%u"; + return "%Y" + split + "W%u"; case "y_M_d": return "%Y" + split + "%m" + split + "%d"; case "H_m_s": From db016e2c5e3ac3db0c0efc900d9702805ae5db73 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 25 May 2023 14:26:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20sqlserver=20=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E4=B8=AD=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../query/sqlserver/SqlserverQueryProvider.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java index 4d5db44726..f71fb3d4dd 100644 --- a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java @@ -899,7 +899,7 @@ public class SqlserverQueryProvider extends QueryProvider { } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "not_empty")) { whereValue = "''"; } 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(",")); }else { whereValue = "('" + String.join("','", value.split(",")) + "')"; @@ -907,7 +907,7 @@ public class SqlserverQueryProvider extends QueryProvider { } else if (StringUtils.containsIgnoreCase(item.getTerm(), "like")) { whereValue = "'%" + value + "%'"; } else { - if(field.getType().equals("NVARCHAR")){ + if(field.getType().equalsIgnoreCase("NVARCHAR")){ whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, value); }else { 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")) { whereValue = "''"; } 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(",")); }else { whereValue = "('" + String.join("','", value.split(",")) + "')"; @@ -1042,7 +1042,7 @@ public class SqlserverQueryProvider extends QueryProvider { } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "like")) { whereValue = "'%" + value + "%'"; } else { - if(field.getType().equals("NVARCHAR")){ + if(field.getType().equalsIgnoreCase("NVARCHAR")){ whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, value); }else { whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, value); @@ -1146,7 +1146,7 @@ public class SqlserverQueryProvider extends QueryProvider { String whereValue = ""; 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(",")); }else { whereValue = "('" + StringUtils.join(value, "','") + "')"; @@ -1166,7 +1166,7 @@ public class SqlserverQueryProvider extends QueryProvider { } } else { - if(request.getDatasetTableField().getType().equals("NVARCHAR")){ + if(request.getDatasetTableField().getType().equalsIgnoreCase("NVARCHAR")){ whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, value.get(0)); }else { 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")) { whereValue = "''"; } 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(",")); }else { whereValue = "('" + String.join("','", f.getValue().split(",")) + "')"; @@ -1336,7 +1336,7 @@ public class SqlserverQueryProvider extends QueryProvider { } else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) { whereValue = "'%" + f.getValue() + "%'"; } else { - if(y.getType().equals("NVARCHAR")){ + if(y.getType().equalsIgnoreCase("NVARCHAR")){ whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, f.getValue()); }else { whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, f.getValue());