From d655a77ece364e8939971f0d27b19f1e40ef5fc9 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 28 Nov 2024 11:47:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=20fix:=20=E3=80=90=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E3=80=91=E6=9B=BF=E6=8D=A2=20excel=20=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/datasource/server/DatasourceServer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java index 04493c2f74..de19b8bb6b 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java @@ -703,7 +703,7 @@ public class DatasourceServer implements DatasourceApi { String datasourceId = req.get("datasourceId"); DatasetTableDTO datasetTableDTO = new DatasetTableDTO(); datasetTableDTO.setDatasourceId(Long.valueOf(datasourceId)); - if (!getTables(datasetTableDTO).stream().map(DatasetTableDTO::getTableName).collect(Collectors.toList()).contains("tableName")) { + if (!getTables(datasetTableDTO).stream().map(DatasetTableDTO::getTableName).collect(Collectors.toList()).contains(tableName)) { DEException.throwException("无效的表名！"); } CoreDatasource coreDatasource = datasourceMapper.selectById(datasourceId); @@ -817,7 +817,7 @@ public class DatasourceServer implements DatasourceApi { sheet.setDeTableName(datasetTableDTO.getTableName()); datasourceRequest.setTable(datasetTableDTO.getTableName()); List oldTableFields = ExcelUtils.getTableFields(datasourceRequest); - mergeFields(sheet.getFields(), oldTableFields); + mergeFields(oldTableFields, sheet.getFields()); } } if (!find) { @@ -866,7 +866,7 @@ public class DatasourceServer implements DatasourceApi { } private void mergeFields(List oldFields, List newFields) { - oldFields.forEach(tableField -> tableField.setChecked(false)); + newFields.forEach(tableField -> tableField.setChecked(false)); for (TableField newField : newFields) { for (TableField oldField : oldFields) { if (oldField.getName().equals(newField.getName())) { From 87d31f6907664671453c0560b62bfbc518a667a8 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 28 Nov 2024 11:48:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=20fix:=20excel=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=20=E5=88=B7=E6=96=B0=E6=95=B0=E6=8D=AE=20=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/visualized/data/datasource/form/ExcelDetail.vue | 8 -------- 1 file changed, 8 deletions(-) diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue index b6858766e3..fa20846a58 100644 --- a/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue +++ b/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue @@ -653,14 +653,6 @@ defineExpose({ {{ t('data_set.field_selection') }} - - - {{ t('data_set.refresh_data') }} -
From 5205972eb706f5d00ebe3d0e95bf1afa9cfd2d79 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 28 Nov 2024 12:19:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=20fix:=20=E3=80=90=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E3=80=91=E6=95=B0=E6=8D=AE=E6=BA=90=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E4=BF=A1=E6=81=AFAES=E5=8A=A0=E5=AF=86=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/chart/charts/impl/table/TableInfoHandler.java | 1 - .../src/main/java/io/dataease/config/MybatisConfig.java | 2 ++ .../io/dataease/datasource/manage/DataSourceManage.java | 7 +++++++ .../io/dataease/listener/DataSourceInitStartListener.java | 5 ++++- .../src/custom-component/de-time-clock/CustomAttr.vue | 7 ++++++- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java index 38b25d90c4..0d87d54348 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java @@ -97,7 +97,6 @@ public class TableInfoHandler extends DefaultChartHandler { fieldDTO = allField; } } - assert fieldDTO != null; if (fieldDTO != null && fieldDTO.isAgg()) { sqlMeta.getXFields().get(i).setFieldName("'-'"); } diff --git a/core/core-backend/src/main/java/io/dataease/config/MybatisConfig.java b/core/core-backend/src/main/java/io/dataease/config/MybatisConfig.java index efee728872..bf8ec58902 100644 --- a/core/core-backend/src/main/java/io/dataease/config/MybatisConfig.java +++ b/core/core-backend/src/main/java/io/dataease/config/MybatisConfig.java @@ -2,6 +2,7 @@ package io.dataease.config; import io.dataease.commons.utils.MybatisInterceptorConfig; +import io.dataease.datasource.dao.auto.entity.CoreDatasource; import io.dataease.datasource.dao.auto.entity.CoreDeEngine; import io.dataease.interceptor.MybatisInterceptor; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -22,6 +23,7 @@ public class MybatisConfig { MybatisInterceptor interceptor = new MybatisInterceptor(); List configList = new ArrayList<>(); configList.add(new MybatisInterceptorConfig(CoreDeEngine.class, "configuration")); + configList.add(new MybatisInterceptorConfig(CoreDatasource.class, "configuration")); interceptor.setInterceptorConfigList(configList); return interceptor; } diff --git a/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java b/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java index a5c0a94e14..0a79c72d9b 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java @@ -156,6 +156,13 @@ public class DataSourceManage { coreOptRecentManage.saveOpt(sourceData.getId(), OptConstants.OPT_RESOURCE_TYPE.DATASOURCE, OptConstants.OPT_TYPE.UPDATE); } + + public void encryptDsConfig(){ + coreDatasourceMapper.selectList(null).forEach(dataSource -> { + coreDatasourceMapper.updateById(dataSource); + }); + } + public DatasourceDTO getDs(Long id) { CoreDatasource coreDatasource = coreDatasourceMapper.selectById(id); DatasourceDTO dto = new DatasourceDTO(); diff --git a/core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java b/core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java index 2e618ad5bd..a473a371f8 100644 --- a/core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java +++ b/core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java @@ -1,6 +1,7 @@ package io.dataease.listener; import io.dataease.datasource.dao.auto.entity.CoreDatasourceTask; +import io.dataease.datasource.manage.DataSourceManage; import io.dataease.datasource.manage.DatasourceSyncManage; import io.dataease.datasource.manage.EngineManage; import io.dataease.datasource.provider.CalciteProvider; @@ -26,6 +27,8 @@ public class DataSourceInitStartListener implements ApplicationListener