From e7ef08f1f924411b0a5be4e76e077aecfa31c55e Mon Sep 17 00:00:00 2001 From: UncleNine Date: Mon, 7 Oct 2024 16:24:57 +0800 Subject: [PATCH] use regex for uuid (#12509) Co-authored-by: jianxuan gan --- .../io/dataease/provider/engine/doris/DorisQueryProvider.java | 2 +- .../io/dataease/provider/engine/mysql/MysqlQueryProvider.java | 2 +- .../java/io/dataease/provider/query/ck/CKQueryProvider.java | 2 +- .../java/io/dataease/provider/query/db2/Db2QueryProvider.java | 2 +- .../java/io/dataease/provider/query/es/EsQueryProvider.java | 2 +- .../java/io/dataease/provider/query/hive/HiveQueryProvider.java | 2 +- .../io/dataease/provider/query/impala/ImpalaQueryProvider.java | 2 +- .../io/dataease/provider/query/mongodb/MongoQueryProvider.java | 2 +- .../io/dataease/provider/query/mysql/MysqlQueryProvider.java | 2 +- .../io/dataease/provider/query/oracle/OracleQueryProvider.java | 2 +- .../java/io/dataease/provider/query/pg/PgQueryProvider.java | 2 +- .../dataease/provider/query/redshift/RedshiftQueryProvider.java | 2 +- .../provider/query/sqlserver/SqlserverQueryProvider.java | 2 +- core/frontend/src/views/dataset/data/CalcFieldEdit.vue | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java index ac5055635b..f082c6090a 100644 --- a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java @@ -1691,7 +1691,7 @@ public class DorisQueryProvider extends QueryProvider { } originField = originField.replaceAll("[\\t\\n\\r]]", ""); // 正则提取[xxx] - String regex = "\\[(.*?)]"; + String regex = "\\[([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})\\]"; Pattern pattern = Pattern.compile(regex); Matcher matcher = pattern.matcher(originField); Set ids = new HashSet<>(); diff --git a/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java index 6638f06f5c..0c42a81841 100644 --- a/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java @@ -1630,7 +1630,7 @@ public class MysqlQueryProvider extends QueryProvider { } originField = originField.replaceAll("[\\t\\n\\r]]", ""); // 正则提取[xxx] - String regex = "\\[(.*?)]"; + String regex = "\\[([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})\\]"; Pattern pattern = Pattern.compile(regex); Matcher matcher = pattern.matcher(originField); Set ids = new HashSet<>(); diff --git a/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java index a0e0c1acd1..47f2b6d682 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java @@ -1742,7 +1742,7 @@ public class CKQueryProvider extends QueryProvider { } originField = originField.replaceAll("[\\t\\n\\r]]", ""); // 正则提取[xxx] - String regex = "\\[(.*?)]"; + String regex = "\\[([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})\\]"; Pattern pattern = Pattern.compile(regex); Matcher matcher = pattern.matcher(originField); Set ids = new HashSet<>(); diff --git a/core/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java index 2dd9ea9ce1..0500d2db1e 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java @@ -1687,7 +1687,7 @@ public class Db2QueryProvider extends QueryProvider { } originField = originField.replaceAll("[\\t\\n\\r]]", ""); // 正则提取[xxx] - String regex = "\\[(.*?)]"; + String regex = "\\[([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})\\]"; Pattern pattern = Pattern.compile(regex); Matcher matcher = pattern.matcher(originField); Set ids = new HashSet<>(); diff --git a/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java index 90de48bbaf..d053e7cf11 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java @@ -1593,7 +1593,7 @@ public class EsQueryProvider extends QueryProvider { } originField = originField.replaceAll("[\\t\\n\\r]]", ""); // 正则提取[xxx] - String regex = "\\[(.*?)]"; + String regex = "\\[([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})\\]"; Pattern pattern = Pattern.compile(regex); Matcher matcher = pattern.matcher(originField); Set ids = new HashSet<>(); diff --git a/core/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java index c5bbb6fbea..20aad89592 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java @@ -1589,7 +1589,7 @@ public class HiveQueryProvider extends QueryProvider { } originField = originField.replaceAll("[\\t\\n\\r]]", ""); // 正则提取[xxx] - String regex = "\\[(.*?)]"; + String regex = "\\[([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})\\]"; Pattern pattern = Pattern.compile(regex); Matcher matcher = pattern.matcher(originField); Set ids = new HashSet<>(); diff --git a/core/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java index 3950fac6a3..a2d7c7fde1 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java @@ -1584,7 +1584,7 @@ public class ImpalaQueryProvider extends QueryProvider { } originField = originField.replaceAll("[\\t\\n\\r]]", ""); // 正则提取[xxx] - String regex = "\\[(.*?)]"; + String regex = "\\[([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})\\]"; Pattern pattern = Pattern.compile(regex); Matcher matcher = pattern.matcher(originField); Set ids = new HashSet<>(); diff --git a/core/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java index 324a71fcdf..7677a271f8 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java @@ -1403,7 +1403,7 @@ public class MongoQueryProvider extends QueryProvider { } originField = originField.replaceAll("[\\t\\n\\r]]", ""); // 正则提取[xxx] - String regex = "\\[(.*?)]"; + String regex = "\\[([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})\\]"; Pattern pattern = Pattern.compile(regex); Matcher matcher = pattern.matcher(originField); Set ids = new HashSet<>(); diff --git a/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java index 2eabd491f4..745524885e 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java @@ -1720,7 +1720,7 @@ public class MysqlQueryProvider extends QueryProvider { } originField = originField.replaceAll("[\\t\\n\\r]]", ""); // 正则提取[xxx] - String regex = "\\[(.*?)]"; + String regex = "\\[([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})\\]"; Pattern pattern = Pattern.compile(regex); Matcher matcher = pattern.matcher(originField); Set ids = new HashSet<>(); diff --git a/core/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java index 79de4ee9c5..0baf047c84 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java @@ -1821,7 +1821,7 @@ public class OracleQueryProvider extends QueryProvider { } originField = originField.replaceAll("[\\t\\n\\r]]", ""); // 正则提取[xxx] - String regex = "\\[(.*?)]"; + String regex = "\\[([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})\\]"; Pattern pattern = Pattern.compile(regex); Matcher matcher = pattern.matcher(originField); Set ids = new HashSet<>(); diff --git a/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java index d6d8859b84..4cb4254471 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java @@ -1587,7 +1587,7 @@ public class PgQueryProvider extends QueryProvider { } originField = originField.replaceAll("[\\t\\n\\r]]", ""); // 正则提取[xxx] - String regex = "\\[(.*?)]"; + String regex = "\\[([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})\\]"; Pattern pattern = Pattern.compile(regex); Matcher matcher = pattern.matcher(originField); Set ids = new HashSet<>(); diff --git a/core/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java index 78c4ef1355..2960105861 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java @@ -1567,7 +1567,7 @@ public class RedshiftQueryProvider extends QueryProvider { } originField = originField.replaceAll("[\\t\\n\\r]]", ""); // 正则提取[xxx] - String regex = "\\[(.*?)]"; + String regex = "\\[([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})\\]"; Pattern pattern = Pattern.compile(regex); Matcher matcher = pattern.matcher(originField); Set ids = new HashSet<>(); diff --git a/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java index 37b0e78a00..07a476f59c 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java @@ -1764,7 +1764,7 @@ public class SqlserverQueryProvider extends QueryProvider { } originField = originField.replaceAll("[\\t\\n\\r]]", ""); // 正则提取[xxx] - String regex = "\\[(.*?)]"; + String regex = "\\[([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})\\]"; Pattern pattern = Pattern.compile(regex); Matcher matcher = pattern.matcher(originField); Set ids = new HashSet<>(); diff --git a/core/frontend/src/views/dataset/data/CalcFieldEdit.vue b/core/frontend/src/views/dataset/data/CalcFieldEdit.vue index bc2219e963..318a1be281 100644 --- a/core/frontend/src/views/dataset/data/CalcFieldEdit.vue +++ b/core/frontend/src/views/dataset/data/CalcFieldEdit.vue @@ -549,7 +549,7 @@ export default { if (name2Auto) { name2Auto.push(nameIdMap[ele]) } - name2Id = name2Id.replace(`[${ele}]`, `[${nameIdMap[ele]}]`) + name2Id = name2Id.replace(`[${ele}]`, nameIdMap[ele] ? `[${nameIdMap[ele]}]` : `[${ele}]`) }) } return name2Id