This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 6c9ac84 [PROPOSAL-3139] Datasource selection changes from radio to
select (#3142)
6c9ac84 is described below
commit 6c9ac84f73a20717ab1014fe8c09e98668262baa
Author: wuchunfu <[email protected]>
AuthorDate: Mon Jul 13 17:31:49 2020 +0800
[PROPOSAL-3139] Datasource selection changes from radio to select (#3142)
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [PROPOSAL-3139] Datasource selection changes from radio to select
Co-authored-by: dailidong <[email protected]>
---
.../pages/list/_source/createDataSource.vue | 50 +++++++++++++++++-----
1 file changed, 39 insertions(+), 11 deletions(-)
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
index 0d05205..1e15688 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
@@ -24,16 +24,10 @@
<m-list-box-f>
<template
slot="name"><strong>*</strong>{{$t('Datasource')}}</template>
<template slot="content">
- <x-radio-group v-model="type" size="small">
- <x-radio :label="'MYSQL'">MYSQL</x-radio>
- <x-radio :label="'POSTGRESQL'">POSTGRESQL</x-radio>
- <x-radio :label="'HIVE'">HIVE/IMPALA</x-radio>
- <x-radio :label="'SPARK'">SPARK</x-radio>
- <x-radio :label="'CLICKHOUSE'">CLICKHOUSE</x-radio>
- <x-radio :label="'ORACLE'">ORACLE</x-radio>
- <x-radio :label="'SQLSERVER'">SQLSERVER</x-radio>
- <x-radio :label="'DB2'" class="radio-label-last" >DB2</x-radio>
- </x-radio-group>
+ <x-select style="width: 100%;" v-model="type">
+ <x-option v-for="item in datasourceTypeList" :key="item.value"
:value="item.value" :label="item.label">
+ </x-option>
+ </x-select>
</template>
</m-list-box-f>
<m-list-box-f>
@@ -200,7 +194,41 @@
showdDatabase: false,
showConnectType: false,
isShowPrincipal:true,
- prePortMapper:{}
+ prePortMapper:{},
+ datasourceTypeList: [
+ {
+ value: 'MYSQL',
+ label: 'MYSQL'
+ },
+ {
+ value: 'POSTGRESQL',
+ label: 'POSTGRESQL'
+ },
+ {
+ value: 'HIVE',
+ label: 'HIVE/IMPALA'
+ },
+ {
+ value: 'SPARK',
+ label: 'SPARK'
+ },
+ {
+ value: 'CLICKHOUSE',
+ label: 'CLICKHOUSE'
+ },
+ {
+ value: 'ORACLE',
+ label: 'ORACLE'
+ },
+ {
+ value: 'SQLSERVER',
+ label: 'SQLSERVER'
+ },
+ {
+ value: 'DB2',
+ label: 'DB2'
+ }
+ ]
}
},
props: {