diff --git a/.typos.toml b/.typos.toml index a8df7036c2..224a0de64e 100644 --- a/.typos.toml +++ b/.typos.toml @@ -12,6 +12,10 @@ Wheres = "Wheres" Parenthesed = "Parenthesed" pogress = "pogress" Pogress = "Pogress" +yoy = "yoy" +YOY = "YOY" +Leafs = "Leafs" +leafs = "leafs" [files] extend-exclude = [ 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 7b22212f9c..ac5055635b 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 @@ -1094,7 +1094,7 @@ public class DorisQueryProvider extends QueryProvider { whereValue = "''"; } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "in")) { whereValue = "('" + StringUtils.join(value, "','") + "')"; - } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "like")) { + } else if (StringUtils.containsIgnoreCase(item.getTerm(), "like")) { whereValue = "'%" + value + "%'"; } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "begin_with")) { whereValue = "'" + value + "%'"; @@ -1173,7 +1173,7 @@ public class DorisQueryProvider extends QueryProvider { whereValue = "''"; } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "in")) { whereValue = "('" + StringUtils.join(value, "','") + "')"; - } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "like")) { + } else if (StringUtils.containsIgnoreCase(item.getTerm(), "like")) { whereValue = "'%" + value + "%'"; } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "begin_with")) { whereValue = "'" + value + "%'"; 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 50e6864457..6638f06f5c 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 @@ -1040,7 +1040,7 @@ public class MysqlQueryProvider extends QueryProvider { whereValue = "''"; } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "in")) { whereValue = "('" + StringUtils.join(value, "','") + "')"; - } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "like")) { + } else if (StringUtils.containsIgnoreCase(item.getTerm(), "like")) { whereValue = "'%" + value + "%'"; } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "begin_with")) { whereValue = "'" + value + "%'"; @@ -1119,7 +1119,7 @@ public class MysqlQueryProvider extends QueryProvider { whereValue = "''"; } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "in")) { whereValue = "('" + StringUtils.join(value, "','") + "')"; - } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "like")) { + } else if (StringUtils.containsIgnoreCase(item.getTerm(), "like")) { whereValue = "'%" + value + "%'"; } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "begin_with")) { whereValue = "'" + value + "%'"; 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 f7cd5d8111..a0e0c1acd1 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 @@ -1090,7 +1090,7 @@ public class CKQueryProvider extends QueryProvider { whereValue = "''"; } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "in")) { whereValue = "('" + StringUtils.join(value, "','") + "')"; - } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "like")) { + } else if (StringUtils.containsIgnoreCase(item.getTerm(), "like")) { whereValue = "'%" + value + "%'"; } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "begin_with")) { whereValue = "'" + value + "%'"; @@ -1186,7 +1186,7 @@ public class CKQueryProvider extends QueryProvider { whereValue = "''"; } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "in")) { whereValue = "('" + StringUtils.join(value, "','") + "')"; - } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "like")) { + } else if (StringUtils.containsIgnoreCase(item.getTerm(), "like")) { whereValue = "'%" + value + "%'"; } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "begin_with")) { whereValue = "'" + value + "%'"; diff --git a/core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java b/core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java index e19a4c9a8f..4146af01ff 100644 --- a/core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java +++ b/core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java @@ -715,7 +715,7 @@ public class DataFillDataService { if (StringUtils.equalsIgnoreCase(field.getType(), "checkbox") || StringUtils.equalsIgnoreCase(field.getType(), "select") && field.getSettings().isMultiple()) { List list = new ArrayList<>(); - String[] strArr = excelRowData.split(","); + String[] strArr = excelRowData.split(";"); for (String str : strArr) { if (StringUtils.isNotBlank(str)) { list.add(str); diff --git a/core/frontend/src/api/dataset/dataset.js b/core/frontend/src/api/dataset/dataset.js index 6a74a4eb22..52904932f9 100644 --- a/core/frontend/src/api/dataset/dataset.js +++ b/core/frontend/src/api/dataset/dataset.js @@ -289,7 +289,7 @@ export function exportDataset(data) { url: 'dataset/table/exportDataset', method: 'post', data: data, - loading: true, + loading: true }) } diff --git a/core/frontend/src/components/canvas/DeCanvas.vue b/core/frontend/src/components/canvas/DeCanvas.vue index e5a3a65bdd..61e3370276 100644 --- a/core/frontend/src/components/canvas/DeCanvas.vue +++ b/core/frontend/src/components/canvas/DeCanvas.vue @@ -93,7 +93,6 @@ diff --git a/core/frontend/src/components/widget/deWidget/TabStyle.vue b/core/frontend/src/components/widget/deWidget/TabStyle.vue index db1e25ce23..c80b5f73d3 100644 --- a/core/frontend/src/components/widget/deWidget/TabStyle.vue +++ b/core/frontend/src/components/widget/deWidget/TabStyle.vue @@ -14,7 +14,12 @@ label="选项卡标题" prop="titleShow" > - 隐藏 + + 隐藏 + - - +} + - \ No newline at end of file diff --git a/core/frontend/src/layout/components/Topbar.vue b/core/frontend/src/layout/components/Topbar.vue index 57bbb690f1..60349c50a3 100644 --- a/core/frontend/src/layout/components/Topbar.vue +++ b/core/frontend/src/layout/components/Topbar.vue @@ -47,8 +47,8 @@ >
- + - + { state.arrowSide = arrowSide - }, + } } const actions = { diff --git a/core/frontend/src/utils/index.js b/core/frontend/src/utils/index.js index 6a01dce9e8..29fa97da2c 100644 --- a/core/frontend/src/utils/index.js +++ b/core/frontend/src/utils/index.js @@ -11,7 +11,7 @@ export function timeSection(date, type, labelFormat = 'yyyy-MM-dd') { return null } if (typeof date === 'string') { - date = parseInt(date); + date = parseInt(date) } if (!(date instanceof Date)) { date = new Date(date) diff --git a/core/frontend/src/views/background/index.vue b/core/frontend/src/views/background/index.vue index 80ffb48e98..bd8b82f583 100644 --- a/core/frontend/src/views/background/index.vue +++ b/core/frontend/src/views/background/index.vue @@ -236,74 +236,74 @@ -