Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
njgzx
dataease
Commits
7c391ed8
提交
7c391ed8
authored
8月 16, 2021
作者:
taojinlong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: 代码格式化
上级
386d15b7
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
21 行增加
和
21 行删除
+21
-21
DatasourceService.java
...ava/io/dataease/datasource/service/DatasourceService.java
+0
-1
form.vue
frontend/src/views/system/datasource/form.vue
+21
-20
没有找到文件。
backend/src/main/java/io/dataease/datasource/service/DatasourceService.java
浏览文件 @
7c391ed8
...
...
@@ -28,7 +28,6 @@ import org.springframework.stereotype.Service;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.annotation.Resource
;
import
javax.xml.crypto.Data
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
...
...
frontend/src/views/system/datasource/form.vue
浏览文件 @
7c391ed8
...
...
@@ -11,7 +11,7 @@
<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"
:disabled=
"formType=='modify' || (formType==='add' && params && !!params.type)"
@
change=
"changeType()"
>
...
...
@@ -61,26 +61,26 @@
/>
</el-select>
</el-form-item>
<el-collapse
>
<el-collapse>
<el-collapse-item
:title=
"$t('datasource.priority')"
name=
"1"
>
<el-form-item
v-if=
"form.configuration.dataSourceType=='jdbc'"
:label=
"$t('datasource.initial_pool_size')"
prop=
"configuration.initialPoolSize"
>
<el-input
v-model=
"form.configuration.initialPoolSize"
autocomplete=
"off"
type=
"number"
min=
"0"
size=
"small"
/>
<el-input
v-model=
"form.configuration.initialPoolSize"
autocomplete=
"off"
type=
"number"
min=
"0"
size=
"small"
/>
</el-form-item>
<el-form-item
v-if=
"form.configuration.dataSourceType=='jdbc'"
:label=
"$t('datasource.min_pool_size')"
prop=
"configuration.minPoolSize"
>
<el-input
v-model=
"form.configuration.minPoolSize"
autocomplete=
"off"
type=
"number"
min=
"0"
/>
<el-input
v-model=
"form.configuration.minPoolSize"
autocomplete=
"off"
type=
"number"
min=
"0"
/>
</el-form-item>
<el-form-item
v-if=
"form.configuration.dataSourceType=='jdbc'"
:label=
"$t('datasource.max_pool_size')"
prop=
"configuration.maxPoolSize"
>
<el-input
v-model=
"form.configuration.maxPoolSize"
autocomplete=
"off"
type=
"number"
min=
"0"
/>
<el-input
v-model=
"form.configuration.maxPoolSize"
autocomplete=
"off"
type=
"number"
min=
"0"
/>
</el-form-item>
<el-form-item
v-if=
"form.configuration.dataSourceType=='jdbc'"
:label=
"$t('datasource.max_idle_time')"
prop=
"configuration.maxIdleTime"
>
<el-input
v-model=
"form.configuration.maxIdleTime"
autocomplete=
"off"
type=
"number"
min=
"0"
/>
<el-input
v-model=
"form.configuration.maxIdleTime"
autocomplete=
"off"
type=
"number"
min=
"0"
/>
</el-form-item>
<el-form-item
v-if=
"form.configuration.dataSourceType=='jdbc'"
:label=
"$t('datasource.acquire_increment')"
prop=
"configuration.acquireIncrement"
>
<el-input
v-model=
"form.configuration.acquireIncrement"
autocomplete=
"off"
type=
"number"
min=
"0"
/>
<el-input
v-model=
"form.configuration.acquireIncrement"
autocomplete=
"off"
type=
"number"
min=
"0"
/>
</el-form-item>
<el-form-item
v-if=
"form.configuration.dataSourceType=='jdbc'"
:label=
"$t('datasource.connect_timeout')"
prop=
"configuration.connectTimeout"
>
<el-input
v-model=
"form.configuration.connectTimeout"
autocomplete=
"off"
type=
"number"
min=
"0"
/>
<el-input
v-model=
"form.configuration.connectTimeout"
autocomplete=
"off"
type=
"number"
min=
"0"
/>
</el-form-item>
</el-collapse-item>
...
...
@@ -114,7 +114,8 @@ export default {
},
data
()
{
return
{
form
:
{
configuration
:
{
form
:
{
configuration
:
{
initialPoolSize
:
5
,
minPoolSize
:
5
,
maxPoolSize
:
50
,
...
...
@@ -122,7 +123,8 @@ export default {
acquireIncrement
:
5
,
idleConnectionTestPeriod
:
5
,
connectTimeout
:
5
}},
}
},
rule
:
{
name
:
[{
required
:
true
,
message
:
this
.
$t
(
'datasource.input_name'
),
trigger
:
'blur'
},
{
min
:
2
,
max
:
25
,
message
:
this
.
$t
(
'datasource.input_limit_2_25'
,
[
2
,
25
]),
trigger
:
'blur'
}],
...
...
@@ -191,29 +193,28 @@ export default {
this
.
form
=
Object
.
assign
({},
row
)
this
.
originConfiguration
=
this
.
form
.
configuration
this
.
form
.
configuration
=
JSON
.
parse
(
this
.
form
.
configuration
)
if
(
!
this
.
form
.
configuration
.
initialPoolSize
)
{
if
(
!
this
.
form
.
configuration
.
initialPoolSize
)
{
this
.
form
.
configuration
.
initialPoolSize
=
5
}
if
(
!
this
.
form
.
configuration
.
minPoolSize
)
{
if
(
!
this
.
form
.
configuration
.
minPoolSize
)
{
this
.
form
.
configuration
.
minPoolSize
=
5
}
if
(
!
this
.
form
.
configuration
.
maxPoolSize
)
{
if
(
!
this
.
form
.
configuration
.
maxPoolSize
)
{
this
.
form
.
configuration
.
maxPoolSize
=
50
}
if
(
!
this
.
form
.
configuration
.
maxIdleTime
)
{
if
(
!
this
.
form
.
configuration
.
maxIdleTime
)
{
this
.
form
.
configuration
.
maxIdleTime
=
30
}
if
(
!
this
.
form
.
configuration
.
acquireIncrement
)
{
if
(
!
this
.
form
.
configuration
.
acquireIncrement
)
{
this
.
form
.
configuration
.
acquireIncrement
=
5
}
if
(
!
this
.
form
.
configuration
.
idleConnectionTestPeriod
)
{
if
(
!
this
.
form
.
configuration
.
idleConnectionTestPeriod
)
{
this
.
form
.
configuration
.
idleConnectionTestPeriod
=
5
}
if
(
!
this
.
form
.
configuration
.
connectTimeout
)
{
if
(
!
this
.
form
.
configuration
.
connectTimeout
)
{
this
.
form
.
configuration
.
connectTimeout
=
5
}
},
reset
()
{
this
.
$refs
.
dsForm
.
resetFields
()
},
...
...
@@ -222,8 +223,8 @@ export default {
this
.
$message
.
error
(
this
.
$t
(
'datasource.please_choose_schema'
))
return
}
if
(
this
.
form
.
configuration
.
initialPoolSize
<
0
||
this
.
form
.
configuration
.
minPoolSize
<
0
||
this
.
form
.
configuration
.
maxPoolSize
<
0
||
this
.
form
.
configuration
.
maxIdleTime
<
0
||
this
.
form
.
configuration
.
acquireIncrement
<
0
||
this
.
form
.
configuration
.
idleConnectionTestPeriod
<
0
||
this
.
form
.
configuration
.
connectTimeout
<
0
){
if
(
this
.
form
.
configuration
.
initialPoolSize
<
0
||
this
.
form
.
configuration
.
minPoolSize
<
0
||
this
.
form
.
configuration
.
maxPoolSize
<
0
||
this
.
form
.
configuration
.
maxIdleTime
<
0
||
this
.
form
.
configuration
.
acquireIncrement
<
0
||
this
.
form
.
configuration
.
idleConnectionTestPeriod
<
0
||
this
.
form
.
configuration
.
connectTimeout
<
0
)
{
this
.
$message
.
error
(
this
.
$t
(
'datasource.no_less_then_0'
))
return
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论