Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
9662fb72
Unverified
提交
9662fb72
authored
5月 29, 2022
作者:
fit2cloud-chenyw
提交者:
GitHub
5月 29, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2342 from dataease/pr@dev@style_dataset_union_form
style: 禁止数据源中修改全局控件样式,恢复关联数据集form中样式属性
上级
792a8666
f1be625f
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
123 行增加
和
116 行删除
+123
-116
DriverForm.vue
frontend/src/views/system/datasource/DriverForm.vue
+50
-52
DsForm.vue
frontend/src/views/system/datasource/DsForm.vue
+73
-64
没有找到文件。
frontend/src/views/system/datasource/DriverForm.vue
浏览文件 @
9662fb72
<
template
>
<layout-content>
<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'
)
}}
<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
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>
</
template
>
<div>
...
...
@@ -24,16 +23,17 @@
label-position=
"right"
>
<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
: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
:label=
"$t('datasource.type')"
prop=
"type"
>
<el-select
v-model=
"driverForm.type"
:placeholder=
"$t('datasource.please_choose_type')"
class=
"select-width"
style=
"width: 100%"
disabled
filterable
>
...
...
@@ -46,27 +46,26 @@
</el-select>
</el-form-item>
<!-- <el-form-item :label="$t('driver.driver')" >-->
<!-- <el-select-->
<!-- v-model="driverForm.driverClass"-->
<!-- :placeholder="$t('driver.please_choose_driver')"-->
<!-- class="select-width"-->
<!-- filterable-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in driverClassList"-->
<!-- :key="item"-->
<!-- :label="item"-->
<!-- :value="item"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('driver.driver')" >-->
<!-- <el-select-->
<!-- v-model="driverForm.driverClass"-->
<!-- :placeholder="$t('driver.please_choose_driver')"-->
<!-- class="select-width"-->
<!-- filterable-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in driverClassList"-->
<!-- :key="item"-->
<!-- :label="item"-->
<!-- :value="item"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<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>
<el-upload
...
...
@@ -83,16 +82,16 @@
:headers=
"headers"
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;"
><i
class=
"el-icon-loading"
/>
{{ $t('dataset.uploading') }}
</span>
</el-button>
</el-upload>
<fu-table
:data=
"driverFiles"
>
<el-table-column
prop=
"fileName"
:label=
"$t('driver.file_name')"
/>
<!-- <el-table-column prop="version" :label="$t('driver.version')"/>-->
<fu-table-operations
:buttons=
"buttons"
:label=
"$t('commons.operating')"
fix
/>
</fu-table>
<fu-table
:data=
"driverFiles"
>
<el-table-column
prop=
"fileName"
:label=
"$t('driver.file_name')"
/>
<!-- <el-table-column prop="version" :label="$t('driver.version')"/>-->
<fu-table-operations
:buttons=
"buttons"
:label=
"$t('commons.operating')"
fix
/>
</fu-table>
</div>
</layout-content>
...
...
@@ -102,13 +101,13 @@
import
LayoutContent
from
'@/components/business/LayoutContent'
import
i18n
from
'@/lang/index'
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
{
deleteDriverFile
,
listDriverDetails
,
updateDriver
}
from
"@/api/system/datasource"
;
import
{
delUser
}
from
"@/api/system/user"
;
import
{
$alert
}
from
"@/utils/message"
;
import
store
from
"@/store"
;
import
{
getToken
}
from
"@/utils/auth"
;
import
{
deleteDriverFile
,
listDriverDetails
,
updateDriver
}
from
'@/api/system/datasource'
import
{
delUser
}
from
'@/api/system/user'
import
{
$alert
}
from
'@/utils/message'
import
store
from
'@/store'
import
{
getToken
}
from
'@/utils/auth'
const
token
=
getToken
()
...
...
@@ -138,7 +137,7 @@ export default {
return
{
disabled
:
false
,
driverForm
:
{
id
:
''
,
id
:
''
,
name
:
''
,
desc
:
''
,
type
:
''
,
...
...
@@ -147,12 +146,12 @@ export default {
datasourceType
:
{},
driverClassList
:
[],
rule
:
{
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'
}],
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'
}],
type
:
[{
required
:
true
,
message
:
i18n
.
t
(
'datasource.please_choose_type'
),
trigger
:
'blur'
}],
driverClass
:
[{
required
:
true
,
message
:
i18n
.
t
(
'driver.please_set_driverClass'
),
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'
}],
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'
}],
type
:
[{
required
:
true
,
message
:
i18n
.
t
(
'datasource.please_choose_type'
),
trigger
:
'blur'
}],
driverClass
:
[{
required
:
true
,
message
:
i18n
.
t
(
'driver.please_set_driverClass'
),
trigger
:
'blur'
}]
},
canEdit
:
false
,
driverFiles
:
[],
...
...
@@ -179,7 +178,6 @@ export default {
mounted
()
{
},
methods
:
{
beforeUpload
(
file
)
{
this
.
uploading
=
true
...
...
@@ -191,7 +189,7 @@ export default {
uploadFail
(
response
,
file
,
fileList
)
{
let
myError
=
response
.
toString
()
myError
=
myError
.
replace
(
'Error: '
,
''
)
if
(
myError
.
indexOf
(
'AuthenticationException'
)
>=
0
)
{
if
(
myError
.
indexOf
(
'AuthenticationException'
)
>=
0
)
{
const
message
=
i18n
.
t
(
'login.tokenError'
)
$alert
(
message
,
()
=>
{
store
.
dispatch
(
'user/logout'
).
then
(()
=>
{
...
...
@@ -211,13 +209,13 @@ export default {
showClose
:
true
})
},
deleteDriverFile
(
row
){
deleteDriverFile
(
row
)
{
deleteDriverFile
(
row
).
then
(
res
=>
{
this
.
$success
(
this
.
$t
(
'commons.delete_success'
))
this
.
listDriverDetails
()
})
},
listDriverDetails
(){
listDriverDetails
()
{
listDriverDetails
(
this
.
driverForm
.
id
).
then
(
res
=>
{
this
.
driverFiles
=
res
.
data
this
.
driverClassList
=
[]
...
...
@@ -231,11 +229,11 @@ export default {
this
.
formType
=
'modify'
this
.
disabled
=
this
.
params
&&
this
.
params
.
id
&&
this
.
params
.
showModel
&&
this
.
params
.
showModel
===
'show'
&&
!
this
.
canEdit
},
save
(){
save
()
{
this
.
$refs
.
driverForm
.
validate
(
valid
=>
{
if
(
!
valid
)
{
return
false
}
if
(
!
valid
)
{
return
false
}
updateDriver
(
this
.
driverForm
).
then
(
res
=>
{
this
.
$success
(
i18n
.
t
(
'commons.success'
))
this
.
canEdit
=
false
...
...
@@ -256,13 +254,13 @@ export default {
}
</
script
>
<
style
scoped
>
.el-input
{
/*
.el-input {
width: 300px;
}
.el-select {
width: 300px;
}
}
*/
.ms-http-input
{
width
:
500px
;
...
...
frontend/src/views/system/datasource/DsForm.vue
浏览文件 @
9662fb72
<
template
>
<layout-content
:header=
"formType=='add' ? $t('datasource.create') : $t('datasource.modify')"
>
<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'
)
}}
...
...
@@ -18,19 +18,20 @@
label-position=
"right"
>
<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
: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
:label=
"$t('datasource.type')"
prop=
"type"
>
<el-select
v-model=
"form.type"
:placeholder=
"$t('datasource.please_choose_type')"
class=
"select-width"
style=
"width: 100%"
:disabled=
"formType=='modify' || (formType==='add' && params && !!params.type)"
@
change=
"changeType()"
filterable
@
change=
"changeType()"
>
<el-option
v-for=
"item in dsTypes"
...
...
@@ -41,11 +42,12 @@
</el-select>
</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
v-model=
"form.configuration.customDriver"
:placeholder=
"$t('driver.please_choose_driver')"
class=
"select-width"
style=
"width: 100%"
filterable
>
<el-option
...
...
@@ -58,27 +60,35 @@
</el-select>
</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>
<plugin-com
ref=
"pluginDsConfig"
v-if=
"datasourceType.isPlugin"
:component-name=
"datasourceType.type"
:obj=
"{form, disabled }"
/>
<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
v-if=
"datasourceType.isPlugin"
ref=
"pluginDsConfig"
:component-name=
"datasourceType.type"
:obj=
"{form, disabled }"
/>
</el-form>
<div
v-if=
"canEdit"
slot=
"footer"
class=
"dialog-footer"
>
<el-button
v-if=
"formType==='add'?true: hasDataPermission('manage',params.privileges)"
@
click=
"validaDatasource"
>
{{ $t('commons.validate') }}
<el-button
v-if=
"formType==='add'?true: hasDataPermission('manage',params.privileges)"
@
click=
"validaDatasource"
>
{{ $t('commons.validate') }}
</el-button>
<el-button
v-if=
"formType==='add'?true: hasDataPermission('manage',params.privileges)"
type=
"primary"
@
click=
"save"
>
{{ $t('commons.save') }}
<el-button
v-if=
"formType==='add'?true: hasDataPermission('manage',params.privileges)"
type=
"primary"
@
click=
"save"
>
{{ $t('commons.save') }}
</el-button>
</div>
<div
v-else
slot=
"footer"
class=
"dialog-footer"
>
<el-button
v-if=
"formType==='add'?true: hasDataPermission('manage',params.privileges)"
@
click=
"validaDatasource"
>
{{ $t('commons.validate') }}
<el-button
v-if=
"formType==='add'?true: hasDataPermission('manage',params.privileges)"
@
click=
"validaDatasource"
>
{{ $t('commons.validate') }}
</el-button>
<el-button
v-if=
"formType==='add'?true: hasDataPermission('manage',params.privileges)"
type=
"primary"
@
click=
"changeEdit"
>
{{ $t('commons.edit') }}
<el-button
v-if=
"formType==='add'?true: hasDataPermission('manage',params.privileges)"
type=
"primary"
@
click=
"changeEdit"
>
{{ $t('commons.edit') }}
</el-button>
</div>
</div>
...
...
@@ -96,10 +106,10 @@ import {
checkApiDatasource
,
listDriverByType
}
from
'@/api/system/datasource'
import
{
$confirm
}
from
'@/utils/message'
import
{
$confirm
}
from
'@/utils/message'
import
i18n
from
'@/lang/index'
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'
export
default
{
...
...
@@ -143,10 +153,10 @@ export default {
},
datasourceType
:
{},
rule
:
{
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'
}],
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'
}],
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'
}],
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'
}],
'configuration.dataBase'
:
[{
required
:
true
,
message
:
i18n
.
t
(
'datasource.please_input_data_base'
),
...
...
@@ -167,9 +177,9 @@ export default {
message
:
i18n
.
t
(
'datasource.please_input_password'
),
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.port'
:
[{
required
:
true
,
message
:
i18n
.
t
(
'datasource.please_input_port'
),
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.port'
:
[{
required
:
true
,
message
:
i18n
.
t
(
'datasource.please_input_port'
),
trigger
:
'blur'
}],
'configuration.initialPoolSize'
:
[{
required
:
true
,
message
:
i18n
.
t
(
'datasource.please_input_initial_pool_size'
),
...
...
@@ -200,8 +210,8 @@ export default {
message
:
i18n
.
t
(
'datasource.please_input_connect_timeout'
),
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'
}]
'url'
:
[{
required
:
true
,
message
:
i18n
.
t
(
'datasource.please_input_url'
),
trigger
:
'blur'
}],
'dataPath'
:
[{
required
:
true
,
message
:
i18n
.
t
(
'datasource.please_input_dataPath'
),
trigger
:
'blur'
}]
},
schemas
:
[],
canEdit
:
false
,
...
...
@@ -216,9 +226,9 @@ export default {
request
:
{
headers
:
[{}],
body
:
{
"type"
:
""
,
"raw"
:
""
,
"kvs"
:
[]
'type'
:
''
,
'raw'
:
''
,
'kvs'
:
[]
}
},
fields
:
[]
...
...
@@ -232,25 +242,25 @@ export default {
request
:
{
headers
:
[],
body
:
{
"type"
:
""
,
"raw"
:
""
,
"kvs"
:
[]
'type'
:
''
,
'raw'
:
''
,
'kvs'
:
[]
},
authManager
:
{}
},
fields
:
[]
},
reqOptions
:
[{
id
:
'GET'
,
label
:
'GET'
},
{
id
:
'POST'
,
label
:
'POST'
}],
reqOptions
:
[{
id
:
'GET'
,
label
:
'GET'
},
{
id
:
'POST'
,
label
:
'POST'
}],
loading
:
false
,
responseData
:
{
type
:
'HTTP'
,
responseResult
:
{},
subRequestResults
:
[]
},
responseData
:
{
type
:
'HTTP'
,
responseResult
:
{},
subRequestResults
:
[]
},
api_table_title
:
''
,
api_step2_active_name
:
'first'
,
fieldTypes
:
[
{
label
:
this
.
$t
(
'dataset.text'
),
value
:
0
},
{
label
:
this
.
$t
(
'dataset.time'
),
value
:
1
},
{
label
:
this
.
$t
(
'dataset.value'
),
value
:
2
},
{
label
:
this
.
$t
(
'dataset.value'
)
+
'('
+
this
.
$t
(
'dataset.float'
)
+
')'
,
value
:
3
},
{
label
:
this
.
$t
(
'dataset.location'
),
value
:
5
}
{
label
:
this
.
$t
(
'dataset.text'
),
value
:
0
},
{
label
:
this
.
$t
(
'dataset.time'
),
value
:
1
},
{
label
:
this
.
$t
(
'dataset.value'
),
value
:
2
},
{
label
:
this
.
$t
(
'dataset.value'
)
+
'('
+
this
.
$t
(
'dataset.float'
)
+
')'
,
value
:
3
},
{
label
:
this
.
$t
(
'dataset.location'
),
value
:
5
}
],
height
:
500
,
disabledNext
:
false
,
...
...
@@ -288,7 +298,6 @@ export default {
connectTimeout
:
5
,
customDriver
:
'default'
}
},
changeEdit
()
{
this
.
canEdit
=
true
...
...
@@ -328,15 +337,15 @@ export default {
return
}
let
repeat
=
false
le
t
repeatDsName
=
[]
cons
t
repeatDsName
=
[]
this
.
tData
.
forEach
(
item
=>
{
if
(
item
.
id
===
this
.
form
.
type
)
{
item
.
children
.
forEach
(
child
=>
{
if
(
this
.
formType
===
'modify'
&&
child
.
id
===
this
.
form
.
id
)
{
return
}
le
t
configuration
=
JSON
.
parse
(
child
.
configuration
)
if
(
!
configuration
)
{
cons
t
configuration
=
JSON
.
parse
(
child
.
configuration
)
if
(
!
configuration
)
{
return
}
switch
(
this
.
form
.
type
)
{
...
...
@@ -378,16 +387,16 @@ export default {
}
})
let
status
=
null
;
if
(
this
.
datasourceType
.
isPlugin
)
{
status
=
this
.
$refs
[
'pluginDsConfig'
].
callPluginInner
({
methodName
:
'validate'
})
}
else
{
let
status
=
null
if
(
this
.
datasourceType
.
isPlugin
)
{
status
=
this
.
$refs
[
'pluginDsConfig'
].
callPluginInner
({
methodName
:
'validate'
})
}
else
{
this
.
$refs
[
'dsConfig'
].
$refs
[
'DsConfig'
].
validate
(
valid
=>
{
status
=
valid
})
}
if
(
!
status
)
{
return
;
if
(
!
status
)
{
return
}
this
.
$refs
.
dsForm
.
validate
(
valid
=>
{
...
...
@@ -462,19 +471,19 @@ export default {
this
.
$message
.
error
(
i18n
.
t
(
'datasource.port_no_less_then_0'
))
return
}
let
status
=
null
;
if
(
this
.
datasourceType
.
isPlugin
)
{
status
=
this
.
$refs
[
'pluginDsConfig'
].
callPluginInner
({
methodName
:
'validate'
})
}
else
{
let
status
=
null
if
(
this
.
datasourceType
.
isPlugin
)
{
status
=
this
.
$refs
[
'pluginDsConfig'
].
callPluginInner
({
methodName
:
'validate'
})
}
else
{
this
.
$refs
[
'dsConfig'
].
$refs
[
'DsConfig'
].
validate
(
valid
=>
{
status
=
valid
if
(
!
valid
)
{
if
(
!
valid
)
{
return
}
})
}
if
(
!
status
)
{
return
;
if
(
!
status
)
{
return
}
this
.
$refs
.
dsForm
.
validate
(
valid
=>
{
if
(
valid
)
{
...
...
@@ -523,15 +532,15 @@ export default {
changeType
(
init
)
{
for
(
let
i
=
0
;
i
<
this
.
dsTypes
.
length
;
i
++
)
{
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
.
customDriver
=
'default'
}
this
.
datasourceType
=
this
.
dsTypes
[
i
]
if
(
this
.
datasourceType
.
isJdbc
)
{
if
(
this
.
datasourceType
.
isJdbc
)
{
listDriverByType
(
this
.
datasourceType
.
type
).
then
(
res
=>
{
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
)
})
}
...
...
@@ -554,7 +563,7 @@ export default {
}
})
}
else
{
le
t
index
=
this
.
form
.
apiConfiguration
.
indexOf
(
this
.
apiItem
)
cons
t
index
=
this
.
form
.
apiConfiguration
.
indexOf
(
this
.
apiItem
)
for
(
let
i
=
0
;
i
<
this
.
form
.
apiConfiguration
.
length
;
i
++
)
{
if
(
i
!==
index
&&
this
.
form
.
apiConfiguration
[
i
].
name
===
this
.
apiItem
.
name
)
{
hasRepeatName
=
true
...
...
@@ -652,13 +661,13 @@ export default {
}
</
script
>
<
style
scoped
>
.el-input
{
/*
.el-input {
width: 300px;
}
.el-select {
width: 300px;
}
}
*/
.ms-http-input
{
width
:
500px
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论