diff --git a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java index 5e558dd700..5dd5dcba00 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java @@ -175,7 +175,13 @@ public class JdbcProvider extends DatasourceProvider { } catch (SQLException e) { DataEaseException.throwException(e); } catch (Exception e) { - DataEaseException.throwException(Translator.get("i18n_datasource_connect_error") + e.getMessage()); + if(datasourceRequest.getDatasource().getType().equalsIgnoreCase("ds_doris")){ + datasourceRequest.setQuery("select * from " + datasourceRequest.getTable()); + return fetchResultField(datasourceRequest); + }else { + DataEaseException.throwException(Translator.get("i18n_datasource_connect_error") + e.getMessage()); + } + } return list; } diff --git a/frontend/src/components/canvas/components/Editor/PreviewEject.vue b/frontend/src/components/canvas/components/Editor/PreviewEject.vue index 2783113a36..51948a88c0 100644 --- a/frontend/src/components/canvas/components/Editor/PreviewEject.vue +++ b/frontend/src/components/canvas/components/Editor/PreviewEject.vue @@ -32,6 +32,11 @@ export default { } } }, + watch: { + '$route.params.reportId': function() { + this.restore() + } + }, mounted() { this.restore() }, diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue index bf041dbdcd..0d1bc81ec0 100644 --- a/frontend/src/views/dataset/data/UpdateInfo.vue +++ b/frontend/src/views/dataset/data/UpdateInfo.vue @@ -537,12 +537,19 @@ export default { getIncrementalConfig() { post('/dataset/table/incrementalConfig', { tableId: this.table.id }).then(response => { this.incrementalConfig = response.data - this.incrementalUpdateType = 'incrementalAdd' - if (this.incrementalConfig.incrementalAdd) { + if (this.incrementalConfig.incrementalAdd.length === 0 && this.incrementalConfig.incrementalDelete.length === 0 ) { + this.incrementalUpdateType = 'incrementalAdd' + this.sql = '' + return + } + if (this.incrementalConfig.incrementalAdd.length > 0) { + this.incrementalUpdateType = 'incrementalAdd' this.sql = this.incrementalConfig.incrementalAdd } else { - this.sql = '' + this.incrementalUpdateType = 'incrementalDelete' + this.sql = this.incrementalConfig.incrementalDelete } + }) }, saveIncrementalConfig() { diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue index 238f21c9ad..9021126c82 100644 --- a/frontend/src/views/system/task/DatasetTaskList.vue +++ b/frontend/src/views/system/task/DatasetTaskList.vue @@ -601,11 +601,18 @@ export default { getIncrementalConfig(tableId) { post('/dataset/table/incrementalConfig', { tableId: tableId }).then(response => { this.incrementalConfig = response.data - this.incrementalUpdateType = 'incrementalAdd' - if (this.incrementalConfig.incrementalAdd) { + + if (this.incrementalConfig.incrementalAdd.length === 0 && this.incrementalConfig.incrementalDelete.length === 0 ) { + this.incrementalUpdateType = 'incrementalAdd' + this.sql = '' + return + } + if (this.incrementalConfig.incrementalAdd.length > 0) { + this.incrementalUpdateType = 'incrementalAdd' this.sql = this.incrementalConfig.incrementalAdd } else { - this.sql = '' + this.incrementalUpdateType = 'incrementalDelete' + this.sql = this.incrementalConfig.incrementalDelete } }) },