Skip to content

D
dataease
Unverified 提交 9662fb72 authored 作者: fit2cloud-chenyw's avatar fit2cloud-chenyw 提交者： GitHub
浏览文件
操作

Merge pull request #2342 from dataease/pr@dev@style_dataset_union_form

style: 禁止数据源中修改全局控件样式，恢复关联数据集form中样式属性
上级 792a8666 f1be625f
隐藏空白字符变更
内嵌 并排
正在显示 包含 123 行增加 和 116 行删除
frontend/src/views/system/datasource/DriverForm.vue
浏览文件 @ 9662fb72
<template> <template>
<layout-content> <layout-content>
<template v-slot:header> <template v-slot:header>
<el-icon name="back" class="back-button" @click.native="backToList"/> <el-icon name="back" class="back-button" @click.native="backToList" />
{{ {{
params && params.id && params.showModel && params.showModel === 'show' && !canEdit ? $t('driver.show_info') : $t('driver.modify') params && params.id && params.showModel && params.showModel === 'show' && !canEdit ? $t('driver.show_info') : $t('driver.modify')
}} }}
<el-button v-if="canEdit" size="mini" style="float: right;"type="primary" @click="save">{{ $t('commons.save') }} <el-button v-if="canEdit" size="mini" style="float: right;"type="primary" @click="save">{{ $t('commons.save') }}
</el-button> </el-button>
<el-button v-else size="mini" style="float: right;" type="primary" @click="changeEdit">{{ $t('commons.edit') }} <el-button v-else size="mini" style="float: right;" type="primary" @click="changeEdit">{{ $t('commons.edit') }}
</el-button> </el-button>
</template> </template>
<div> <div>
...@@ -24,16 +23,17 @@ ...@@ -24,16 +23,17 @@
label-position="right" label-position="right"
> >
<el-form-item :label="$t('commons.name')" prop="name"> <el-form-item :label="$t('commons.name')" prop="name">
<el-input v-model="driverForm.name" autocomplete="off"/> <el-input v-model="driverForm.name" autocomplete="off" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('commons.description')"> <el-form-item :label="$t('commons.description')">
<el-input v-model="driverForm.desc" autocomplete="off"/> <el-input v-model="driverForm.desc" autocomplete="off" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('datasource.type')" prop="type"> <el-form-item :label="$t('datasource.type')" prop="type">
<el-select <el-select
v-model="driverForm.type" v-model="driverForm.type"
:placeholder="$t('datasource.please_choose_type')" :placeholder="$t('datasource.please_choose_type')"
class="select-width" class="select-width"
style="width: 100%"
disabled disabled
filterable filterable
> >
...@@ -46,27 +46,26 @@ ...@@ -46,27 +46,26 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item :label="$t('driver.driver')" >--> <!-- <el-form-item :label="$t('driver.driver')" >-->
<!-- <el-select--> <!-- <el-select-->
<!-- v-model="driverForm.driverClass"--> <!-- v-model="driverForm.driverClass"-->
<!-- :placeholder="$t('driver.please_choose_driver')"--> <!-- :placeholder="$t('driver.please_choose_driver')"-->
<!-- class="select-width"--> <!-- class="select-width"-->
<!-- filterable--> <!-- filterable-->
<!-- >--> <!-- >-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="item in driverClassList"--> <!-- v-for="item in driverClassList"-->
<!-- :key="item"--> <!-- :key="item"-->
<!-- :label="item"--> <!-- :label="item"-->
<!-- :value="item"--> <!-- :value="item"-->
<!-- />--> <!-- />-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item :label="$t('driver.driver')" prop="driverClass"> <el-form-item :label="$t('driver.driver')" prop="driverClass">
<el-input v-model="driverForm.driverClass" autocomplete="off"/> <el-input v-model="driverForm.driverClass" autocomplete="off" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-upload <el-upload
...@@ -83,16 +82,16 @@ ...@@ -83,16 +82,16 @@
:headers="headers" :headers="headers"
style="float: right;" style="float: right;"
> >
<el-button size="mini" type="primary" style="float: right;" :disabled="uploading"> <el-button size="mini" type="primary" style="float: right;" :disabled="uploading">
<span v-if="!uploading" style="font-size: 12px;">{{ $t('dataset.upload_file') }}</span> <span v-if="!uploading" style="font-size: 12px;">{{ $t('dataset.upload_file') }}</span>
<span v-if="uploading" style="font-size: 12px;"><i class="el-icon-loading" /> {{ $t('dataset.uploading') }}</span> <span v-if="uploading" style="font-size: 12px;"><i class="el-icon-loading" /> {{ $t('dataset.uploading') }}</span>
</el-button> </el-button>
</el-upload> </el-upload>
<fu-table :data="driverFiles"> <fu-table :data="driverFiles">
<el-table-column prop="fileName" :label="$t('driver.file_name')"/> <el-table-column prop="fileName" :label="$t('driver.file_name')" />
<!-- <el-table-column prop="version" :label="$t('driver.version')"/>--> <!-- <el-table-column prop="version" :label="$t('driver.version')"/>-->
<fu-table-operations :buttons="buttons" :label="$t('commons.operating')" fix/> <fu-table-operations :buttons="buttons" :label="$t('commons.operating')" fix />
</fu-table> </fu-table>
</div> </div>
</layout-content> </layout-content>
...@@ -102,13 +101,13 @@ ...@@ -102,13 +101,13 @@
import LayoutContent from '@/components/business/LayoutContent' import LayoutContent from '@/components/business/LayoutContent'
import i18n from '@/lang/index' import i18n from '@/lang/index'
import ApiHttpRequestForm from '@/views/system/datasource/ApiHttpRequestForm' import ApiHttpRequestForm from '@/views/system/datasource/ApiHttpRequestForm'
import DsConfiguration from "@/views/system/datasource/DsConfiguration"; import DsConfiguration from '@/views/system/datasource/DsConfiguration'
import PluginCom from '@/views/system/plugin/PluginCom' import PluginCom from '@/views/system/plugin/PluginCom'
import {deleteDriverFile, listDriverDetails, updateDriver} from "@/api/system/datasource"; import { deleteDriverFile, listDriverDetails, updateDriver } from '@/api/system/datasource'
import {delUser} from "@/api/system/user"; import { delUser } from '@/api/system/user'
import {$alert} from "@/utils/message"; import { $alert } from '@/utils/message'
import store from "@/store"; import store from '@/store'
import {getToken} from "@/utils/auth"; import { getToken } from '@/utils/auth'
const token = getToken() const token = getToken()
...@@ -138,7 +137,7 @@ export default { ...@@ -138,7 +137,7 @@ export default {
return { return {
disabled: false, disabled: false,
driverForm: { driverForm: {
id:'', id: '',
name: '', name: '',
desc: '', desc: '',
type: '', type: '',
...@@ -147,12 +146,12 @@ export default { ...@@ -147,12 +146,12 @@ export default {
datasourceType: {}, datasourceType: {},
driverClassList: [], driverClassList: [],
rule: { rule: {
name: [{required: true, message: i18n.t('datasource.input_name'), trigger: 'blur'}, name: [{ required: true, message: i18n.t('datasource.input_name'), trigger: 'blur' },
{min: 2, max: 50, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur'}], { min: 2, max: 50, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur' }],
desc: [{required: true, message: i18n.t('datasource.input_name'), trigger: 'blur'}, desc: [{ required: true, message: i18n.t('datasource.input_name'), trigger: 'blur' },
{min: 2, max: 200, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur'}], { min: 2, max: 200, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur' }],
type: [{required: true, message: i18n.t('datasource.please_choose_type'), trigger: 'blur'}], type: [{ required: true, message: i18n.t('datasource.please_choose_type'), trigger: 'blur' }],
driverClass: [{required: true, message: i18n.t('driver.please_set_driverClass'), trigger: 'blur'}] driverClass: [{ required: true, message: i18n.t('driver.please_set_driverClass'), trigger: 'blur' }]
}, },
canEdit: false, canEdit: false,
driverFiles: [], driverFiles: [],
...@@ -179,7 +178,6 @@ export default { ...@@ -179,7 +178,6 @@ export default {
mounted() { mounted() {
}, },
methods: { methods: {
beforeUpload(file) { beforeUpload(file) {
this.uploading = true this.uploading = true
...@@ -191,7 +189,7 @@ export default { ...@@ -191,7 +189,7 @@ export default {
uploadFail(response, file, fileList) { uploadFail(response, file, fileList) {
let myError = response.toString() let myError = response.toString()
myError = myError.replace('Error: ', '') myError = myError.replace('Error: ', '')
if(myError.indexOf('AuthenticationException') >= 0){ if (myError.indexOf('AuthenticationException') >= 0) {
const message = i18n.t('login.tokenError') const message = i18n.t('login.tokenError')
$alert(message, () => { $alert(message, () => {
store.dispatch('user/logout').then(() => { store.dispatch('user/logout').then(() => {
...@@ -211,13 +209,13 @@ export default { ...@@ -211,13 +209,13 @@ export default {
showClose: true showClose: true
}) })
}, },
deleteDriverFile(row){ deleteDriverFile(row) {
deleteDriverFile(row).then(res => { deleteDriverFile(row).then(res => {
this.$success(this.$t('commons.delete_success')) this.$success(this.$t('commons.delete_success'))
this.listDriverDetails() this.listDriverDetails()
}) })
}, },
listDriverDetails(){ listDriverDetails() {
listDriverDetails(this.driverForm.id).then(res => { listDriverDetails(this.driverForm.id).then(res => {
this.driverFiles = res.data this.driverFiles = res.data
this.driverClassList = [] this.driverClassList = []
...@@ -231,11 +229,11 @@ export default { ...@@ -231,11 +229,11 @@ export default {
this.formType = 'modify' this.formType = 'modify'
this.disabled = this.params && this.params.id && this.params.showModel && this.params.showModel === 'show' && !this.canEdit this.disabled = this.params && this.params.id && this.params.showModel && this.params.showModel === 'show' && !this.canEdit
}, },
save(){ save() {
this.$refs.driverForm.validate(valid => { this.$refs.driverForm.validate(valid => {
if (!valid) { if (!valid) {
return false return false
} }
updateDriver(this.driverForm).then(res => { updateDriver(this.driverForm).then(res => {
this.$success(i18n.t('commons.success')) this.$success(i18n.t('commons.success'))
this.canEdit = false this.canEdit = false
...@@ -256,13 +254,13 @@ export default { ...@@ -256,13 +254,13 @@ export default {
} }
</script> </script>
<style scoped> <style scoped>
.el-input { /* .el-input {
width: 300px; width: 300px;
} }
.el-select { .el-select {
width: 300px; width: 300px;
} } */
.ms-http-input { .ms-http-input {
width: 500px; width: 500px;
......
frontend/src/views/system/datasource/DsForm.vue
浏览文件 @ 9662fb72
<template> <template>
<layout-content :header="formType=='add' ? $t('datasource.create') : $t('datasource.modify')"> <layout-content :header="formType=='add' ? $t('datasource.create') : $t('datasource.modify')">
<template v-slot:header> <template v-slot:header>
<el-icon name="back" class="back-button" @click.native="backToList"/> <el-icon name="back" class="back-button" @click.native="backToList" />
{{ {{
params && params.id && params.showModel && params.showModel === 'show' && !canEdit ? $t('datasource.show_info') : formType == 'add' ? $t('datasource.create') : $t('datasource.modify') params && params.id && params.showModel && params.showModel === 'show' && !canEdit ? $t('datasource.show_info') : formType == 'add' ? $t('datasource.create') : $t('datasource.modify')
}} }}
...@@ -18,19 +18,20 @@ ...@@ -18,19 +18,20 @@
label-position="right" label-position="right"
> >
<el-form-item :label="$t('commons.name')" prop="name"> <el-form-item :label="$t('commons.name')" prop="name">
<el-input v-model="form.name" autocomplete="off"/> <el-input v-model="form.name" autocomplete="off" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('commons.description')" prop="desc"> <el-form-item :label="$t('commons.description')" prop="desc">
<el-input v-model="form.desc" autocomplete="off"/> <el-input v-model="form.desc" autocomplete="off" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('datasource.type')" prop="type"> <el-form-item :label="$t('datasource.type')" prop="type">
<el-select <el-select
v-model="form.type" v-model="form.type"
:placeholder="$t('datasource.please_choose_type')" :placeholder="$t('datasource.please_choose_type')"
class="select-width" class="select-width"
style="width: 100%"
:disabled="formType=='modify' || (formType==='add' && params && !!params.type)" :disabled="formType=='modify' || (formType==='add' && params && !!params.type)"
@change="changeType()"
filterable filterable
@change="changeType()"
> >
<el-option <el-option
v-for="item in dsTypes" v-for="item in dsTypes"
...@@ -41,11 +42,12 @@ ...@@ -41,11 +42,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="datasourceType.isJdbc" :label="$t('driver.driver')"> <el-form-item v-if="datasourceType.isJdbc" :label="$t('driver.driver')">
<el-select <el-select
v-model="form.configuration.customDriver" v-model="form.configuration.customDriver"
:placeholder="$t('driver.please_choose_driver')" :placeholder="$t('driver.please_choose_driver')"
class="select-width" class="select-width"
style="width: 100%"
filterable filterable
> >
<el-option <el-option
...@@ -58,27 +60,35 @@ ...@@ -58,27 +60,35 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<ds-configuration ref="dsConfig" v-if="!datasourceType.isPlugin" :datasource-type='datasourceType' :form="form" :disabled="params && params.id && params.showModel && params.showModel === 'show' && !canEdit"></ds-configuration> <ds-configuration v-if="!datasourceType.isPlugin" ref="dsConfig" :datasource-type="datasourceType" :form="form" :disabled="params && params.id && params.showModel && params.showModel === 'show' && !canEdit" />
<plugin-com ref="pluginDsConfig" v-if="datasourceType.isPlugin" :component-name="datasourceType.type" :obj="{form, disabled }" /> <plugin-com v-if="datasourceType.isPlugin" ref="pluginDsConfig" :component-name="datasourceType.type" :obj="{form, disabled }" />
</el-form> </el-form>
<div v-if="canEdit" slot="footer" class="dialog-footer"> <div v-if="canEdit" slot="footer" class="dialog-footer">
<el-button v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)" <el-button
@click="validaDatasource">{{ $t('commons.validate') }} v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
@click="validaDatasource"
>{{ $t('commons.validate') }}
</el-button> </el-button>
<el-button v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)" type="primary" <el-button
@click="save">{{ $t('commons.save') }} v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
type="primary"
@click="save"
>{{ $t('commons.save') }}
</el-button> </el-button>
</div> </div>
<div v-else slot="footer" class="dialog-footer"> <div v-else slot="footer" class="dialog-footer">
<el-button v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)" <el-button
@click="validaDatasource">{{ $t('commons.validate') }} v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
@click="validaDatasource"
>{{ $t('commons.validate') }}
</el-button> </el-button>
<el-button v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)" type="primary" <el-button
@click="changeEdit">{{ $t('commons.edit') }} v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
type="primary"
@click="changeEdit"
>{{ $t('commons.edit') }}
</el-button> </el-button>
</div> </div>
</div> </div>
...@@ -96,10 +106,10 @@ import { ...@@ -96,10 +106,10 @@ import {
checkApiDatasource, checkApiDatasource,
listDriverByType listDriverByType
} from '@/api/system/datasource' } from '@/api/system/datasource'
import {$confirm} from '@/utils/message' import { $confirm } from '@/utils/message'
import i18n from '@/lang/index' import i18n from '@/lang/index'
import ApiHttpRequestForm from '@/views/system/datasource/ApiHttpRequestForm' import ApiHttpRequestForm from '@/views/system/datasource/ApiHttpRequestForm'
import DsConfiguration from "@/views/system/datasource/DsConfiguration"; import DsConfiguration from '@/views/system/datasource/DsConfiguration'
import PluginCom from '@/views/system/plugin/PluginCom' import PluginCom from '@/views/system/plugin/PluginCom'
export default { export default {
...@@ -143,10 +153,10 @@ export default { ...@@ -143,10 +153,10 @@ export default {
}, },
datasourceType: {}, datasourceType: {},
rule: { rule: {
name: [{required: true, message: i18n.t('datasource.input_name'), trigger: 'blur'}, name: [{ required: true, message: i18n.t('datasource.input_name'), trigger: 'blur' },
{min: 2, max: 25, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur'}], { min: 2, max: 25, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur' }],
desc: [{min: 2, max: 50, message: i18n.t('datasource.input_limit_2_50'), trigger: 'blur'}], desc: [{ min: 2, max: 50, message: i18n.t('datasource.input_limit_2_50'), trigger: 'blur' }],
type: [{required: true, message: i18n.t('datasource.please_choose_type'), trigger: 'blur'}], type: [{ required: true, message: i18n.t('datasource.please_choose_type'), trigger: 'blur' }],
'configuration.dataBase': [{ 'configuration.dataBase': [{
required: true, required: true,
message: i18n.t('datasource.please_input_data_base'), message: i18n.t('datasource.please_input_data_base'),
...@@ -167,9 +177,9 @@ export default { ...@@ -167,9 +177,9 @@ export default {
message: i18n.t('datasource.please_input_password'), message: i18n.t('datasource.please_input_password'),
trigger: 'blur' trigger: 'blur'
}], }],
'configuration.host': [{required: true, message: i18n.t('datasource.please_input_host'), trigger: 'blur'}], 'configuration.host': [{ required: true, message: i18n.t('datasource.please_input_host'), trigger: 'blur' }],
'configuration.url': [{required: true, message: i18n.t('datasource.please_input_url'), trigger: 'blur'}], 'configuration.url': [{ required: true, message: i18n.t('datasource.please_input_url'), trigger: 'blur' }],
'configuration.port': [{required: true, message: i18n.t('datasource.please_input_port'), trigger: 'blur'}], 'configuration.port': [{ required: true, message: i18n.t('datasource.please_input_port'), trigger: 'blur' }],
'configuration.initialPoolSize': [{ 'configuration.initialPoolSize': [{
required: true, required: true,
message: i18n.t('datasource.please_input_initial_pool_size'), message: i18n.t('datasource.please_input_initial_pool_size'),
...@@ -200,8 +210,8 @@ export default { ...@@ -200,8 +210,8 @@ export default {
message: i18n.t('datasource.please_input_connect_timeout'), message: i18n.t('datasource.please_input_connect_timeout'),
trigger: 'blur' trigger: 'blur'
}], }],
'url': [{required: true, message: i18n.t('datasource.please_input_url'), trigger: 'blur'}], 'url': [{ required: true, message: i18n.t('datasource.please_input_url'), trigger: 'blur' }],
'dataPath': [{required: true, message: i18n.t('datasource.please_input_dataPath'), trigger: 'blur'}] 'dataPath': [{ required: true, message: i18n.t('datasource.please_input_dataPath'), trigger: 'blur' }]
}, },
schemas: [], schemas: [],
canEdit: false, canEdit: false,
...@@ -216,9 +226,9 @@ export default { ...@@ -216,9 +226,9 @@ export default {
request: { request: {
headers: [{}], headers: [{}],
body: { body: {
"type": "", 'type': '',
"raw": "", 'raw': '',
"kvs": [] 'kvs': []
} }
}, },
fields: [] fields: []
...@@ -232,25 +242,25 @@ export default { ...@@ -232,25 +242,25 @@ export default {
request: { request: {
headers: [], headers: [],
body: { body: {
"type": "", 'type': '',
"raw": "", 'raw': '',
"kvs": [] 'kvs': []
}, },
authManager: {} authManager: {}
}, },
fields: [] fields: []
}, },
reqOptions: [{id: 'GET', label: 'GET'}, {id: 'POST', label: 'POST'}], reqOptions: [{ id: 'GET', label: 'GET' }, { id: 'POST', label: 'POST' }],
loading: false, loading: false,
responseData: {type: 'HTTP', responseResult: {}, subRequestResults: []}, responseData: { type: 'HTTP', responseResult: {}, subRequestResults: [] },
api_table_title: '', api_table_title: '',
api_step2_active_name: 'first', api_step2_active_name: 'first',
fieldTypes: [ fieldTypes: [
{label: this.$t('dataset.text'), value: 0}, { label: this.$t('dataset.text'), value: 0 },
{label: this.$t('dataset.time'), value: 1}, { label: this.$t('dataset.time'), value: 1 },
{label: this.$t('dataset.value'), value: 2}, { label: this.$t('dataset.value'), value: 2 },
{label: this.$t('dataset.value') + '(' + this.$t('dataset.float') + ')', value: 3}, { label: this.$t('dataset.value') + '(' + this.$t('dataset.float') + ')', value: 3 },
{label: this.$t('dataset.location'), value: 5} { label: this.$t('dataset.location'), value: 5 }
], ],
height: 500, height: 500,
disabledNext: false, disabledNext: false,
...@@ -288,7 +298,6 @@ export default { ...@@ -288,7 +298,6 @@ export default {
connectTimeout: 5, connectTimeout: 5,
customDriver: 'default' customDriver: 'default'
} }
}, },
changeEdit() { changeEdit() {
this.canEdit = true this.canEdit = true
...@@ -328,15 +337,15 @@ export default { ...@@ -328,15 +337,15 @@ export default {
return return
} }
let repeat = false let repeat = false
let repeatDsName = [] const repeatDsName = []
this.tData.forEach(item => { this.tData.forEach(item => {
if (item.id === this.form.type) { if (item.id === this.form.type) {
item.children.forEach(child => { item.children.forEach(child => {
if (this.formType === 'modify' && child.id === this.form.id) { if (this.formType === 'modify' && child.id === this.form.id) {
return return
} }
let configuration = JSON.parse(child.configuration) const configuration = JSON.parse(child.configuration)
if(!configuration){ if (!configuration) {
return return
} }
switch (this.form.type) { switch (this.form.type) {
...@@ -378,16 +387,16 @@ export default { ...@@ -378,16 +387,16 @@ export default {
} }
}) })
let status = null; let status = null
if(this.datasourceType.isPlugin){ if (this.datasourceType.isPlugin) {
status = this.$refs['pluginDsConfig'].callPluginInner({methodName: 'validate'}) status = this.$refs['pluginDsConfig'].callPluginInner({ methodName: 'validate' })
}else { } else {
this.$refs['dsConfig'].$refs['DsConfig'].validate(valid => { this.$refs['dsConfig'].$refs['DsConfig'].validate(valid => {
status = valid status = valid
}) })
} }
if(!status){ if (!status) {
return; return
} }
this.$refs.dsForm.validate(valid => { this.$refs.dsForm.validate(valid => {
...@@ -462,19 +471,19 @@ export default { ...@@ -462,19 +471,19 @@ export default {
this.$message.error(i18n.t('datasource.port_no_less_then_0')) this.$message.error(i18n.t('datasource.port_no_less_then_0'))
return return
} }
let status = null; let status = null
if(this.datasourceType.isPlugin){ if (this.datasourceType.isPlugin) {
status = this.$refs['pluginDsConfig'].callPluginInner({methodName: 'validate'}) status = this.$refs['pluginDsConfig'].callPluginInner({ methodName: 'validate' })
}else { } else {
this.$refs['dsConfig'].$refs['DsConfig'].validate(valid => { this.$refs['dsConfig'].$refs['DsConfig'].validate(valid => {
status = valid status = valid
if(!valid){ if (!valid) {
return return
} }
}) })
} }
if(!status){ if (!status) {
return; return
} }
this.$refs.dsForm.validate(valid => { this.$refs.dsForm.validate(valid => {
if (valid) { if (valid) {
...@@ -523,15 +532,15 @@ export default { ...@@ -523,15 +532,15 @@ export default {
changeType(init) { changeType(init) {
for (let i = 0; i < this.dsTypes.length; i++) { for (let i = 0; i < this.dsTypes.length; i++) {
if (this.dsTypes[i].type === this.form.type) { if (this.dsTypes[i].type === this.form.type) {
if(this.form.type !== 'api' && !init){ if (this.form.type !== 'api' && !init) {
this.form.configuration.extraParams = this.dsTypes[i].extraParams this.form.configuration.extraParams = this.dsTypes[i].extraParams
this.form.configuration.customDriver = 'default' this.form.configuration.customDriver = 'default'
} }
this.datasourceType = this.dsTypes[i] this.datasourceType = this.dsTypes[i]
if(this.datasourceType.isJdbc){ if (this.datasourceType.isJdbc) {
listDriverByType(this.datasourceType.type).then(res => { listDriverByType(this.datasourceType.type).then(res => {
this.driverList = [] this.driverList = []
this.driverList.push({id: 'default', name: 'Default', driverClass:'Default'}) this.driverList.push({ id: 'default', name: 'Default', driverClass: 'Default' })
this.driverList = this.driverList.concat(res.data) this.driverList = this.driverList.concat(res.data)
}) })
} }
...@@ -554,7 +563,7 @@ export default { ...@@ -554,7 +563,7 @@ export default {
} }
}) })
} else { } else {
let index = this.form.apiConfiguration.indexOf(this.apiItem) const index = this.form.apiConfiguration.indexOf(this.apiItem)
for (let i = 0; i < this.form.apiConfiguration.length; i++) { for (let i = 0; i < this.form.apiConfiguration.length; i++) {
if (i !== index && this.form.apiConfiguration[i].name === this.apiItem.name) { if (i !== index && this.form.apiConfiguration[i].name === this.apiItem.name) {
hasRepeatName = true hasRepeatName = true
...@@ -652,13 +661,13 @@ export default { ...@@ -652,13 +661,13 @@ export default {
} }
</script> </script>
<style scoped> <style scoped>
.el-input { /* .el-input {
width: 300px; width: 300px;
} }
.el-select { .el-select {
width: 300px; width: 300px;
} } */
.ms-http-input { .ms-http-input {
width: 500px; width: 500px;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论