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

refactor: 优化数据源类型展示

Browse Source
This commit is contained in:
junjun 2022-11-18 10:52:21 +08:00
parent eee3c25d63
commit ab59dfdda1
2 changed files with 10 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -2242,6 +2242,13 @@ public class DataSetTableService {
if (ObjectUtils.isNotEmpty(table)) {
Datasource datasource = datasourceMapper.selectByPrimaryKey(table.getDataSourceId());
Optional.ofNullable(datasource).orElse(new Datasource()).setConfiguration(null);
Collection<DataSourceType> types = datasourceService.types();
for (DataSourceType type : types) {
if (ObjectUtils.isNotEmpty(datasource) && StringUtils.equalsIgnoreCase(datasource.getType(), type.getType())) {
datasource.setType(type.getName());
break;
}
}
dataSetDetail.setDatasource(datasource);
}
return dataSetDetail;

49
frontend/src/views/dataset/common/DatasetChartDetail.vue
View File

@ -27,7 +27,7 @@
</el-col>
<el-col class="info-item">
<p class="info-title">{{ $t('chart.title') }}</p>
<p class="info-content">{{ detail.chart.title || 'N/A' }}</p>
<p class="info-content">{{ detail.chart.title || '-' }}</p>
</el-col>
<el-col class="info-item">
<p class="info-title">{{ $t('dataset.create_by') }}</p>
@ -113,54 +113,11 @@
</el-col>
<el-col class="info-item">
<p class="info-title">{{ $t('commons.description') }}</p>
<p class="info-content">{{ detail.datasource.desc || 'N/A' }}</p>
<p class="info-content">{{ detail.datasource.desc || '-' }}</p>
</el-col>
<el-col class="info-item">
<p class="info-title">{{ $t('datasource.type') }}</p>
<p
v-if="detail.datasource.type === 'mysql'"
class="info-content"
>MySQL</p>
<p
v-if="detail.datasource.type === 'sqlServer'"
class="info-content"
>SQL Server</p>
<p
v-if="detail.datasource.type === 'oracle'"
class="info-content"
>Oracle</p>
<p
v-if="detail.datasource.type === 'hive'"
class="info-content"
>Apache Hive</p>
<p
v-if="detail.datasource.type === 'pg'"
class="info-content"
>PostgreSQL</p>
<p
v-if="detail.datasource.type === 'es'"
class="info-content"
>Elasticsearch</p>
<p
v-if="detail.datasource.type === 'mariadb'"
class="info-content"
>MariaDB</p>
<p
v-if="detail.datasource.type === 'ds_doris'"
class="info-content"
>Doris</p>
<p
v-if="detail.datasource.type === 'ck'"
class="info-content"
>ClickHouse</p>
<p
v-if="detail.datasource.type === 'redshift'"
class="info-content"
>AWS Redshift</p>
<p
v-if="detail.datasource.type === 'mongo'"
class="info-content"
>MongoDB</p>
<p class="info-content">{{ detail.datasource.type }}</p>
</el-col>
<el-col class="info-item">
<p class="info-title">{{ $t('dataset.create_time') }}</p>