Skip to content

fix: datasource form incorrect parameter #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shuiqingliu wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix: datasource form incorrect parameter #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/api/datax-jdbcDatasource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export function test(data) {
return request({
url: '/api/jobJdbcDatasource/test',
method: 'post',
params: data
data
})
}

Expand Down
20 changes: 10 additions & 10 deletions src/views/datax/jdbc-datasource/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,15 @@
<el-input v-model="temp.datasourceGroup" placeholder="数据源分组" style="width: 40%" />
</el-form-item>
<el-form-item v-if="jdbc" label="用户名">
<el-input v-model="temp.userName" placeholder="用户名" style="width: 40%" />
<el-input v-model="temp.jdbcUsername" placeholder="用户名" style="width: 40%" />
</el-form-item>
<el-form-item v-if="visible" v-show="jdbc" label="密码">
<el-input v-model="temp.password" type="password" placeholder="密码" style="width: 40%">
<el-input v-model="temp.jdbcPassword" type="password" placeholder="密码" style="width: 40%">
<i slot="suffix" title="显示密码" style="cursor:pointer" class="el-icon-view" @click="changePass('show')" />
</el-input>
</el-form-item>
<el-form-item v-show="jdbc" v-else label="密码">
<el-input v-model="temp.password" type="text" placeholder="密码" style="width: 40%">
<el-input v-model="temp.jdbcPassword" type="text" placeholder="密码" style="width: 40%">
<i slot="suffix" title="隐藏密码" style="cursor:pointer" class="el-icon-check" @click="changePass('hide')" />
</el-input>
</el-form-item>
Expand Down Expand Up @@ -203,8 +203,8 @@ export default {
},
rules: {
datasourceName: [{ required: true, message: 'this is required', trigger: 'blur' }],
userName: [{ required: true, message: 'this is required', trigger: 'blur' }],
password: [{ required: true, message: 'this is required', trigger: 'blur' }],
jdbcUsername: [{ required: true, message: 'this is required', trigger: 'blur' }],
jdbcPassword: [{ required: true, message: 'this is required', trigger: 'blur' }],
jdbcUrl: [{ required: true, message: 'this is required', trigger: 'blur' }],
datasource: [{ required: true, message: 'this is required', trigger: 'change' }],
zkAdress: [{ required: true, message: 'this is required', trigger: 'blur' }],
Expand All @@ -214,8 +214,8 @@ export default {
id: undefined,
datasourceName: '',
datasourceGroup: 'Default',
userName: '',
password: '',
jdbcUsername: '',
jdbcPassword: '',
jdbcUrl: '',
comments: '',
datasource: '',
Expand All @@ -227,7 +227,7 @@ export default {
{ value: 'MYSQL', label: 'MYSQL' },
{ value: 'oracle', label: 'oracle' },
{ value: 'postgresql', label: 'postgresql' },
{ value: 'greenplum', label: 'greenplum' }
{ value: 'greenplum', label: 'greenplum' },
{ value: 'sqlserver', label: 'sqlserver' },
{ value: 'hive', label: 'hive' },
{ value: 'hbase', label: 'hbase' },
Expand Down Expand Up @@ -280,8 +280,8 @@ export default {
id: undefined,
datasourceName: '',
datasourceGroup: 'Default',
userName: '',
password: '',
jdbcUsername: '',
jdbcPassword: '',
jdbcUrl: '',
jdbcDriverClass: '',
comments: ''
Expand Down