center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'v1.7' into dev

Browse Source
This commit is contained in:
taojinlong 2022-01-28 20:01:36 +08:00
commit 501d455e05
4 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
View File

@ -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;
}

5
frontend/src/components/canvas/components/Editor/PreviewEject.vue
View File

@ -32,6 +32,11 @@ export default {
}
}
},
watch: {
'$route.params.reportId': function() {
this.restore()
}
},
mounted() {
this.restore()
},

13
frontend/src/views/dataset/data/UpdateInfo.vue
View File

@ -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() {

13
frontend/src/views/system/task/DatasetTaskList.vue
View File

@ -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
}
})
},