diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml index 8b51a258e0..1f1d6ad214 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml @@ -21,6 +21,12 @@ and mode = #{mode,jdbcType=INTEGER} + + and type in + + #{item,jdbcType=INTEGER} + + order by ${sort} diff --git a/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java b/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java index ac4119d714..a71b592fc4 100644 --- a/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java +++ b/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java @@ -19,4 +19,5 @@ public class DataSetTableRequest extends DatasetTable { private String userId; private Integer editType; private Boolean isRename; + private List typeFilter; } 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 0b6bbbeb47..0c822736fd 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -176,6 +176,7 @@ public class DataSetTableService { public List list(DataSetTableRequest dataSetTableRequest) { dataSetTableRequest.setUserId(String.valueOf(AuthUtils.getUser().getUserId())); + dataSetTableRequest.setTypeFilter(dataSetTableRequest.getTypeFilter()); return extDataSetTableMapper.search(dataSetTableRequest); } diff --git a/frontend/src/views/dataset/add/AddCustom.vue b/frontend/src/views/dataset/add/AddCustom.vue index c30c3ed23b..512b4029c0 100644 --- a/frontend/src/views/dataset/add/AddCustom.vue +++ b/frontend/src/views/dataset/add/AddCustom.vue @@ -23,7 +23,7 @@ - + @@ -83,7 +83,8 @@ export default { unionData: [], height: 500, data: [], - fields: [] + fields: [], + customType: ['db', 'sql', 'excel'] } }, watch: { diff --git a/frontend/src/views/dataset/common/DatasetGroupSelector.vue b/frontend/src/views/dataset/common/DatasetGroupSelector.vue index e44c6f0792..572974e556 100644 --- a/frontend/src/views/dataset/common/DatasetGroupSelector.vue +++ b/frontend/src/views/dataset/common/DatasetGroupSelector.vue @@ -108,6 +108,11 @@ import { isKettleRunning, post } from '@/api/dataset/dataset' export default { name: 'DatasetGroupSelector', props: { + customType: { + type: Array, + required: false, + default: null + }, mode: { type: Number, required: false, @@ -226,7 +231,8 @@ export default { post('/dataset/table/list', { sort: 'type asc,create_time desc,name asc', sceneId: this.currGroup.id, - mode: this.mode < 0 ? null : this.mode + mode: this.mode < 0 ? null : this.mode, + typeFilter: this.customType ? this.customType : null }, false).then(response => { this.tables = response.data for (let i = 0; i < this.tables.length; i++) {