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

Merge pull request #127 from dataease/pr@dev@oracle

Browse Source 
feat: 显示 oracle 分类
This commit is contained in:
taojinlong 2021-07-01 15:14:09 +08:00 committed by GitHub
commit 652964a24c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,9 +100,7 @@ public class JdbcProvider extends DatasourceProvider {
private List<String[]> fetchResult(ResultSet rs) throws Exception { private List<String[]> fetchResult(ResultSet rs) throws Exception {
List<String[]> list = new LinkedList<>(); List<String[]> list = new LinkedList<>();
ResultSetMetaData metaData = rs.getMetaData(); ResultSetMetaData metaData = rs.getMetaData();
System.out.println(metaData.getColumnName(1));
int columnCount = metaData.getColumnCount(); int columnCount = metaData.getColumnCount();
System.out.println(columnCount);
while (rs.next()) { while (rs.next()) {
String[] row = new String[columnCount]; String[] row = new String[columnCount];
for (int j = 0; j < columnCount; j++) { for (int j = 0; j < columnCount; j++) {

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

@ -68,6 +68,7 @@
<p class="info-title">{{ $t('datasource.type') }}</p> <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 === '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 === 'sqlServer'" class="info-content">SQL Server</p>
<p v-if="detail.datasource.type === 'oracle'" class="info-content">Oracle</p>
</el-col> </el-col>
<el-col class="info-item"> <el-col class="info-item">
<p class="info-title">{{ $t('dataset.create_time') }}</p> <p class="info-title">{{ $t('dataset.create_time') }}</p>

2
frontend/src/views/system/datasource/DsTree.vue
View File

@ -154,6 +154,8 @@ export default {
return 'MySQL' return 'MySQL'
} else if (type === 'sqlServer') { } else if (type === 'sqlServer') {
return 'SQL Server' return 'SQL Server'
}else if (type === 'oracle') {
return 'Oracle'
} }
}, },