From 06d5e913f7e6660d07f81d883cf057f3f406a2e2 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 1 Dec 2021 11:31:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E7=BB=84=E4=BB=B6=E6=97=A0=E6=B3=95=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/widget/DeWidget/DeDate.vue | 24 ++++++++++++++----- frontend/src/utils/index.js | 3 +++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/widget/DeWidget/DeDate.vue b/frontend/src/components/widget/DeWidget/DeDate.vue index 4018dd5110..94eeb76d41 100644 --- a/frontend/src/components/widget/DeWidget/DeDate.vue +++ b/frontend/src/components/widget/DeWidget/DeDate.vue @@ -2,7 +2,7 @@ @@ -42,11 +43,13 @@ export default { }, created() { this.options = this.element.options - if ((this.options.attrs.type === 'date' || this.options.attrs.type === 'daterange') && Array.isArray(this.options.value) && this.options.value.length === 0) { - this.options.value = null - } - if (!!this.options && !!this.options.value && Object.keys(this.options.value).length === 0) { - this.options.value = null + + if (this.options.value) { + if (this.options.attrs.type !== 'daterange') { + this.values = Array.isArray(this.options.value) ? this.options.value[0] : this.options.value + } else { + this.values = this.options.value + } } }, methods: { @@ -54,6 +57,15 @@ export default { this.setCondition() }, setCondition() { + if (this.values) { + if (this.options.attrs.type !== 'daterange') { + this.options.value = Array.isArray(this.values) ? this.values[0] : this.values + } else { + this.options.value = this.values + } + } else { + this.options.value = [] + } const param = { component: this.element, value: Array.isArray(this.options.value) ? this.options.value : [this.options.value], diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js index 7cc1eae425..75644be2ed 100644 --- a/frontend/src/utils/index.js +++ b/frontend/src/utils/index.js @@ -4,6 +4,9 @@ export function timeSection(date, type) { if (!date) { return null } + if (!(date instanceof Date)) { + date = new Date(date) + } const timeRanger = new Array(2) date.setHours(0) From 7f949fbc835a34360db065975d63cc7575c53bc7 Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 1 Dec 2021 11:45:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E9=9B=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dataset/DataSetTableService.java | 81 +++++++++++-------- .../resources/i18n/messages_en_US.properties | 3 +- .../resources/i18n/messages_zh_CN.properties | 1 + .../resources/i18n/messages_zh_TW.properties | 3 +- 4 files changed, 51 insertions(+), 37 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 85bba76a30..40c15f1b63 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -7,6 +7,7 @@ import io.dataease.base.mapper.*; import io.dataease.base.mapper.ext.ExtDataSetGroupMapper; import io.dataease.base.mapper.ext.ExtDataSetTableMapper; import io.dataease.base.mapper.ext.UtilMapper; +import io.dataease.commons.constants.DatasourceTypes; import io.dataease.commons.constants.JobStatus; import io.dataease.commons.constants.ScheduleType; import io.dataease.commons.constants.TaskStatus; @@ -15,16 +16,16 @@ import io.dataease.commons.utils.*; import io.dataease.controller.request.dataset.DataSetGroupRequest; import io.dataease.controller.request.dataset.DataSetTableRequest; import io.dataease.controller.request.dataset.DataSetTaskRequest; -import io.dataease.controller.response.DataSetDetail; -import io.dataease.commons.constants.DatasourceTypes; -import io.dataease.dto.datasource.TableFiled; -import io.dataease.provider.datasource.DatasourceProvider; -import io.dataease.provider.datasource.JdbcProvider; -import io.dataease.provider.ProviderFactory; import io.dataease.controller.request.datasource.DatasourceRequest; +import io.dataease.controller.response.DataSetDetail; import io.dataease.dto.dataset.*; +import io.dataease.dto.datasource.TableFiled; import io.dataease.exception.DataEaseException; import io.dataease.i18n.Translator; +import io.dataease.plugins.loader.ClassloaderResponsity; +import io.dataease.provider.ProviderFactory; +import io.dataease.provider.datasource.DatasourceProvider; +import io.dataease.provider.datasource.JdbcProvider; import io.dataease.provider.query.DDLProvider; import io.dataease.provider.query.QueryProvider; import org.apache.commons.collections4.CollectionUtils; @@ -39,6 +40,8 @@ import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -93,6 +96,8 @@ public class DataSetTableService { @Value("${upload.file.path}") private String path; + private static Logger logger = LoggerFactory.getLogger(ClassloaderResponsity.class); + public void batchInsert(List datasetTable) throws Exception { for (DataSetTableRequest table : datasetTable) { save(table); @@ -469,8 +474,8 @@ public class DataSetTableService { datasourceRequest.setPageable(true); data.addAll(datasourceProvider.getData(datasourceRequest)); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } try { @@ -478,8 +483,8 @@ public class DataSetTableService { datasourceRequest.setPageable(false); dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size()); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } } else { // check doris table @@ -497,15 +502,15 @@ public class DataSetTableService { try { data.addAll(jdbcProvider.getData(datasourceRequest)); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } try { datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds)); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } } @@ -532,16 +537,16 @@ public class DataSetTableService { datasourceRequest.setPageable(true); data.addAll(datasourceProvider.getData(datasourceRequest)); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } try { datasourceRequest.setPageable(false); datasourceRequest.setQuery(qp.createQuerySqlWithLimit(sql, fields, Integer.valueOf(dataSetTableRequest.getRow()), false)); dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size()); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } } else { // check doris table @@ -559,15 +564,15 @@ public class DataSetTableService { try { data.addAll(jdbcProvider.getData(datasourceRequest)); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } try { datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds)); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } } } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "excel")) { @@ -586,15 +591,15 @@ public class DataSetTableService { try { data.addAll(jdbcProvider.getData(datasourceRequest)); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } try { datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds)); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "custom")) { if (datasetTable.getMode() == 0) { @@ -609,7 +614,13 @@ public class DataSetTableService { DataTableInfoDTO dt = new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class); List list = dataSetTableUnionService.listByTableId(dt.getList().get(0).getTableId()); - String sql = getCustomSQLDatasource(dt, list, ds); + String sql = ""; + try { + sql = getCustomSQLDatasource(dt, list, ds); + } catch (Exception e) { + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); + } QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); datasourceRequest.setQuery(qp.createQuerySQLWithPage(sql, fields, page, pageSize, realSize, false)); map.put("sql", datasourceRequest.getQuery()); @@ -622,16 +633,16 @@ public class DataSetTableService { datasourceRequest.setPageable(true); data.addAll(datasourceProvider.getData(datasourceRequest)); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } try { datasourceRequest.setPageable(false); datasourceRequest.setQuery(qp.createQuerySqlWithLimit(sql, fields, Integer.valueOf(dataSetTableRequest.getRow()), false)); dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size()); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } } else { Datasource ds = (Datasource) CommonBeanFactory.getBean("DorisDatasource"); @@ -645,16 +656,16 @@ public class DataSetTableService { try { data.addAll(jdbcProvider.getData(datasourceRequest)); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } try { datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds)); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } } } diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 1ef2d89426..ab583bd2b4 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -288,4 +288,5 @@ i18n_Stopped=END i18n_Exec=Running i18n_no_trigger=The current setting does not trigger task generation. i18n_dataset_field_delete=Union field deleted,please set again and redo. -i18n_es_limit=Elasticsearch version cannot be less than 6.3 \ No newline at end of file +i18n_es_limit=Elasticsearch version cannot be less than 6.3 +i18n_ds_error=Preview fail：Execute SQL error。Cause field、table、dataset changed，please check \ No newline at end of file diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index 7c51906b79..6bafb1da79 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -288,3 +288,4 @@ i18n_Exec=运行中 i18n_no_trigger=当前设置没有触发任务生成 i18n_dataset_field_delete=该自定义数据集有关联字段被删除，请重新确认关联关系并重做该数据集 i18n_es_limit=Elasticsearch 版本不能小于6.3 +i18n_ds_error=预览数据错误：执行SQL失败。可能因相关字段、表、数据集等元素发生变更，请检查 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 8e0c9b58dc..4c40206670 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -290,4 +290,5 @@ i18n_Stopped=執行結束 i18n_Exec=運行中 i18n_no_trigger=当前设置没有触发任务生成 當前設置沒有觸發任務生成. i18n_dataset_field_delete=該自定義數據集有關聯字段被刪除，請重新確認關聯關系並重做該數據集 -i18n_es_limit=Elasticsearch 版本不能小於6.3 \ No newline at end of file +i18n_es_limit=Elasticsearch 版本不能小於6.3 +i18n_ds_error=預覽數據錯誤：執行SQL失敗。可能因相關字段、表、數據集等元素發生變更，請檢查 \ No newline at end of file From cbc46be67c8008c64e27004df54ec126a6ca712e Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 1 Dec 2021 11:45:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E9=9B=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dataset/DataSetTableService.java | 81 +++++++++++-------- .../resources/i18n/messages_en_US.properties | 3 +- .../resources/i18n/messages_zh_CN.properties | 1 + .../resources/i18n/messages_zh_TW.properties | 3 +- 4 files changed, 51 insertions(+), 37 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 85bba76a30..40c15f1b63 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -7,6 +7,7 @@ import io.dataease.base.mapper.*; import io.dataease.base.mapper.ext.ExtDataSetGroupMapper; import io.dataease.base.mapper.ext.ExtDataSetTableMapper; import io.dataease.base.mapper.ext.UtilMapper; +import io.dataease.commons.constants.DatasourceTypes; import io.dataease.commons.constants.JobStatus; import io.dataease.commons.constants.ScheduleType; import io.dataease.commons.constants.TaskStatus; @@ -15,16 +16,16 @@ import io.dataease.commons.utils.*; import io.dataease.controller.request.dataset.DataSetGroupRequest; import io.dataease.controller.request.dataset.DataSetTableRequest; import io.dataease.controller.request.dataset.DataSetTaskRequest; -import io.dataease.controller.response.DataSetDetail; -import io.dataease.commons.constants.DatasourceTypes; -import io.dataease.dto.datasource.TableFiled; -import io.dataease.provider.datasource.DatasourceProvider; -import io.dataease.provider.datasource.JdbcProvider; -import io.dataease.provider.ProviderFactory; import io.dataease.controller.request.datasource.DatasourceRequest; +import io.dataease.controller.response.DataSetDetail; import io.dataease.dto.dataset.*; +import io.dataease.dto.datasource.TableFiled; import io.dataease.exception.DataEaseException; import io.dataease.i18n.Translator; +import io.dataease.plugins.loader.ClassloaderResponsity; +import io.dataease.provider.ProviderFactory; +import io.dataease.provider.datasource.DatasourceProvider; +import io.dataease.provider.datasource.JdbcProvider; import io.dataease.provider.query.DDLProvider; import io.dataease.provider.query.QueryProvider; import org.apache.commons.collections4.CollectionUtils; @@ -39,6 +40,8 @@ import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -93,6 +96,8 @@ public class DataSetTableService { @Value("${upload.file.path}") private String path; + private static Logger logger = LoggerFactory.getLogger(ClassloaderResponsity.class); + public void batchInsert(List datasetTable) throws Exception { for (DataSetTableRequest table : datasetTable) { save(table); @@ -469,8 +474,8 @@ public class DataSetTableService { datasourceRequest.setPageable(true); data.addAll(datasourceProvider.getData(datasourceRequest)); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } try { @@ -478,8 +483,8 @@ public class DataSetTableService { datasourceRequest.setPageable(false); dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size()); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } } else { // check doris table @@ -497,15 +502,15 @@ public class DataSetTableService { try { data.addAll(jdbcProvider.getData(datasourceRequest)); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } try { datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds)); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } } @@ -532,16 +537,16 @@ public class DataSetTableService { datasourceRequest.setPageable(true); data.addAll(datasourceProvider.getData(datasourceRequest)); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } try { datasourceRequest.setPageable(false); datasourceRequest.setQuery(qp.createQuerySqlWithLimit(sql, fields, Integer.valueOf(dataSetTableRequest.getRow()), false)); dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size()); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } } else { // check doris table @@ -559,15 +564,15 @@ public class DataSetTableService { try { data.addAll(jdbcProvider.getData(datasourceRequest)); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } try { datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds)); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } } } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "excel")) { @@ -586,15 +591,15 @@ public class DataSetTableService { try { data.addAll(jdbcProvider.getData(datasourceRequest)); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } try { datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds)); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "custom")) { if (datasetTable.getMode() == 0) { @@ -609,7 +614,13 @@ public class DataSetTableService { DataTableInfoDTO dt = new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class); List list = dataSetTableUnionService.listByTableId(dt.getList().get(0).getTableId()); - String sql = getCustomSQLDatasource(dt, list, ds); + String sql = ""; + try { + sql = getCustomSQLDatasource(dt, list, ds); + } catch (Exception e) { + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); + } QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); datasourceRequest.setQuery(qp.createQuerySQLWithPage(sql, fields, page, pageSize, realSize, false)); map.put("sql", datasourceRequest.getQuery()); @@ -622,16 +633,16 @@ public class DataSetTableService { datasourceRequest.setPageable(true); data.addAll(datasourceProvider.getData(datasourceRequest)); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } try { datasourceRequest.setPageable(false); datasourceRequest.setQuery(qp.createQuerySqlWithLimit(sql, fields, Integer.valueOf(dataSetTableRequest.getRow()), false)); dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size()); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } } else { Datasource ds = (Datasource) CommonBeanFactory.getBean("DorisDatasource"); @@ -645,16 +656,16 @@ public class DataSetTableService { try { data.addAll(jdbcProvider.getData(datasourceRequest)); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } try { datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds)); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); } catch (Exception e) { - e.printStackTrace(); - DEException.throwException(e.getMessage()); + logger.error(e.getMessage()); + DEException.throwException(Translator.get("i18n_ds_error")); } } } diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 1ef2d89426..ab583bd2b4 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -288,4 +288,5 @@ i18n_Stopped=END i18n_Exec=Running i18n_no_trigger=The current setting does not trigger task generation. i18n_dataset_field_delete=Union field deleted,please set again and redo. -i18n_es_limit=Elasticsearch version cannot be less than 6.3 \ No newline at end of file +i18n_es_limit=Elasticsearch version cannot be less than 6.3 +i18n_ds_error=Preview fail：Execute SQL error。Cause field、table、dataset changed，please check \ No newline at end of file diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index 7c51906b79..6bafb1da79 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -288,3 +288,4 @@ i18n_Exec=运行中 i18n_no_trigger=当前设置没有触发任务生成 i18n_dataset_field_delete=该自定义数据集有关联字段被删除，请重新确认关联关系并重做该数据集 i18n_es_limit=Elasticsearch 版本不能小于6.3 +i18n_ds_error=预览数据错误：执行SQL失败。可能因相关字段、表、数据集等元素发生变更，请检查 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 8e0c9b58dc..4c40206670 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -290,4 +290,5 @@ i18n_Stopped=執行結束 i18n_Exec=運行中 i18n_no_trigger=当前设置没有触发任务生成 當前設置沒有觸發任務生成. i18n_dataset_field_delete=該自定義數據集有關聯字段被刪除，請重新確認關聯關系並重做該數據集 -i18n_es_limit=Elasticsearch 版本不能小於6.3 \ No newline at end of file +i18n_es_limit=Elasticsearch 版本不能小於6.3 +i18n_ds_error=預覽數據錯誤：執行SQL失敗。可能因相關字段、表、數據集等元素發生變更，請檢查 \ No newline at end of file From 0c97b7b9b382083c0ab809a2b60bcd6a087b3ca7 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 1 Dec 2021 11:46:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E6=BB=91=E5=9D=97=E5=88=A0=E9=99=A4=E6=9C=80=E5=90=8E=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E4=B8=BB=E9=A2=98=EF=BC=8C=E6=BB=91=E5=9D=97=E7=AE=AD?= =?UTF-8?q?=E5=A4=B4=E6=8C=87=E5=90=91=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../panel/SubjectSetting/PreSubject/Slider.vue | 13 +++++++++---- frontend/src/views/panel/SubjectSetting/index.vue | 10 ++++++++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue b/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue index 48f0109df6..4f7c4b209e 100644 --- a/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue +++ b/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue @@ -154,11 +154,16 @@ export default { }) }, querySubjectWithGroup() { - this.slidersLoading = true + const _this = this + _this.slidersLoading = true querySubjectWithGroup({}).then(response => { - this.sliders = [] - this.sliders = response.data - this.slidersLoading = false + _this.sliders = [] + _this.sliders = response.data + _this.slidersLoading = false + if (_this.sliders.length < _this.currentIndex) { + _this.currentIndex = 1 + this.$emit('reload') + } }).catch(() => { this.slidersLoading = false }) diff --git a/frontend/src/views/panel/SubjectSetting/index.vue b/frontend/src/views/panel/SubjectSetting/index.vue index ac7bca73a1..50eed2e0c1 100644 --- a/frontend/src/views/panel/SubjectSetting/index.vue +++ b/frontend/src/views/panel/SubjectSetting/index.vue @@ -9,7 +9,7 @@ style="height: 1px; position: absolute; left: 15px; right: 15px; top: 40px; box-sizing:border-box;border-bottom: 1px solid #e8eaed" />
- +
@@ -83,6 +83,7 @@ export default { }, data() { return { + sliderShow: true, panelInfo: this.$store.state.panel.panelInfo, activeNames: ['panel'], chart: null, @@ -110,7 +111,12 @@ export default { }, methods: { - + sliderReload() { + this.sliderShow = false + this.$nextTick(() => { + this.sliderShow = true + }) + }, init() { // 初始化赋值 const chart = deepCopy(this.canvasStyleData.chart)