From 6426f866957243498e99133ae2bcce1b2ba69533 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 24 Nov 2023 11:56:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E3=80=91=E6=9B=BF=E6=8D=A2=E6=95=B0=E6=8D=AE=E9=9B=86=EF=BC=8C?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E5=AD=97=E6=AE=B5=E5=AF=BC=E5=85=A5=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/dataset/DataSetTableService.java | 9 +++++---- .../io/dataease/service/dataset/ExtractDataService.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 7e52ef1a6d..73efecfc45 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -2436,10 +2436,11 @@ public class DataSetTableService { }); data = (isPreview && noModelDataListener.getData().size() > 1000 ? new ArrayList<>(data.subList(0, 1000)) : data); if (isPreview) { - for (List datum : data) { - for (int i = 0; i < datum.size(); i++) { - if (i < fields.size()) { - cellType(datum.get(i), i, fields.get(i)); + for (int i = 0; i < data.size(); i++) { + List datum = data.get(i); + for (int j = 0; j < datum.size(); j++) { + if (j < fields.size()) { + cellType(datum.get(j), i, fields.get(j)); } } } diff --git a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index ea634adeb7..d8a0f693b1 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -223,7 +223,7 @@ public class ExtractDataService { for (DatasetTableField datasetTableField : datasetTableFields) { boolean add = true; for (DatasetTableField oldField : oldFields) { - if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName())) { + if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName()) && oldField.getType().equalsIgnoreCase(datasetTableField.getType())) { add = false; } } From a5e8a72c7a34ed4d05f893bdebad843b6c68797c Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 24 Nov 2023 12:17:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20API=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/system/datasource/DsConfiguration.vue | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/core/frontend/src/views/system/datasource/DsConfiguration.vue b/core/frontend/src/views/system/datasource/DsConfiguration.vue index 270e2aa8d9..0b59837c3d 100644 --- a/core/frontend/src/views/system/datasource/DsConfiguration.vue +++ b/core/frontend/src/views/system/datasource/DsConfiguration.vue @@ -998,6 +998,7 @@ export default { 'apiQueryTimeout': [ { required: true, + validator: this.isNumber, message: i18n.t('datasource.please_input_query_timeout'), trigger: 'blur' } @@ -1158,6 +1159,21 @@ export default { } callback() }, + isNumber(rule, value, callback) { + console.log(value) + if (!value) { + callback(new Error(i18n.t('datasource.please_input_query_timeout'))) + return + } + let isNumber = false + var reg = /^\d+$/; + isNumber = reg.test(value); + if (!isNumber) { + callback(new Error(i18n.t('chart.value_error'))) + return + } + callback() + }, next() { if (this.active === 1) { let hasRepeatName = false From 597d897473fa20c3155e9ede0c3bc251f9edf8ea Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 24 Nov 2023 12:19:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20Excel=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=87=8D=E5=A4=8D=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=A4=9A=E4=BA=86=E4=B8=80=E4=B8=AA=E2=80=9C=EF=BC=9A?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/dataset/DataSetTableService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 73efecfc45..d5561c0148 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -2760,7 +2760,7 @@ public class DataSetTableService { } } if(CollectionUtils.isNotEmpty(repeat)){ - DataEaseException.throwException(Translator.get("i18n_excel_field_repeat") + ": " + String.valueOf(repeat)); + DataEaseException.throwException(Translator.get("i18n_excel_field_repeat") + "" + String.valueOf(repeat)); } }