diff --git a/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java index 0189e64be2..0fd2fd1e80 100644 --- a/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java +++ b/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java @@ -51,7 +51,6 @@ import io.dataease.service.message.DeMsgutil; import io.dataease.service.sys.SysAuthService; import io.dataease.service.system.SystemParameterService; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; @@ -431,11 +430,7 @@ public class DatasourceService { } List tables = datasourceProvider.getTables(datasourceRequest); - - // 获取当前数据源下的db、api类型数据集 - DatasetTableExample datasetTableExample = new DatasetTableExample(); - datasetTableExample.createCriteria().andTypeIn(Arrays.asList(DatasetType.DB.name(), DatasetType.API.name())).andDataSourceIdEqualTo(ds.getId()); - List datasetTables = datasetTableMapper.selectByExample(datasetTableExample); + // 构造table节点 List list = new ArrayList<>(); for (TableDesc tableDesc : tables) { DBTableDTO dbTableDTO = new DBTableDTO(); @@ -444,22 +439,6 @@ public class DatasourceService { dbTableDTO.setRemark(tableDesc.getRemark()); dbTableDTO.setEnableCheck(true); dbTableDTO.setDatasetPath(null); - for (DatasetTable datasetTable : datasetTables) { - DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class); - if (StringUtils.equals(tableDesc.getName(), dataTableInfoDTO.getTable())) { - dbTableDTO.setEnableCheck(false); - List parents = dataSetGroupService.getParents(datasetTable.getSceneId()); - StringBuilder stringBuilder = new StringBuilder(); - parents.forEach(ele -> { - if (ObjectUtils.isNotEmpty(ele)) { - stringBuilder.append(ele.getName()).append("/"); - } - }); - stringBuilder.append(datasetTable.getName()); - dbTableDTO.setDatasetPath(stringBuilder.toString()); - break; - } - } list.add(dbTableDTO); } return list; diff --git a/core/frontend/src/views/dataset/add/AddApi.vue b/core/frontend/src/views/dataset/add/AddApi.vue index 3b930f4c16..31b4d0864b 100644 --- a/core/frontend/src/views/dataset/add/AddApi.vue +++ b/core/frontend/src/views/dataset/add/AddApi.vue @@ -73,43 +73,34 @@ v-model="checkTableList" size="small" > - -
+ + {{ showTableNameWithComment(t) }} + - - {{ showTableNameWithComment(t) }} - - - -
-
+ + diff --git a/core/frontend/src/views/dataset/add/AddDB.vue b/core/frontend/src/views/dataset/add/AddDB.vue index 62762efd2e..bdad3cf69f 100644 --- a/core/frontend/src/views/dataset/add/AddDB.vue +++ b/core/frontend/src/views/dataset/add/AddDB.vue @@ -73,44 +73,35 @@ v-model="checkTableList" size="small" > - -
+ + {{ showTableNameWithComment(t) }} + - - {{ showTableNameWithComment(t) }} - - - -
-
+ +