Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
52fcd983
提交
52fcd983
authored
2月 24, 2022
作者:
taojinlong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: 显示api数据表的状态
上级
3c5c98dd
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
159 行增加
和
66 行删除
+159
-66
DatasourceController.java
.../dataease/controller/datasource/DatasourceController.java
+1
-1
ApiDefinition.java
...dataease/controller/request/datasource/ApiDefinition.java
+1
-0
ApiProvider.java
...ain/java/io/dataease/provider/datasource/ApiProvider.java
+11
-17
DatasourceService.java
...ava/io/dataease/service/datasource/DatasourceService.java
+84
-26
V32__1.8.sql
backend/src/main/resources/db/migration/V32__1.8.sql
+3
-0
en.js
frontend/src/lang/en.js
+5
-1
tw.js
frontend/src/lang/tw.js
+5
-1
zh.js
frontend/src/lang/zh.js
+5
-1
form.vue
frontend/src/views/system/datasource/form.vue
+44
-19
没有找到文件。
backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java
浏览文件 @
52fcd983
...
@@ -50,7 +50,7 @@ public class DatasourceController {
...
@@ -50,7 +50,7 @@ public class DatasourceController {
@DePermission
(
type
=
DePermissionType
.
DATASOURCE
,
value
=
"id"
)
@DePermission
(
type
=
DePermissionType
.
DATASOURCE
,
value
=
"id"
)
@ApiOperation
(
"验证数据源"
)
@ApiOperation
(
"验证数据源"
)
@PostMapping
(
"/validate"
)
@PostMapping
(
"/validate"
)
public
ResultHolder
validate
(
@RequestBody
Datasource
datasource
)
throws
Exception
{
public
ResultHolder
validate
(
@RequestBody
Datasource
DTO
datasource
)
throws
Exception
{
return
datasourceService
.
validate
(
datasource
);
return
datasourceService
.
validate
(
datasource
);
}
}
...
...
backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinition.java
浏览文件 @
52fcd983
...
@@ -16,5 +16,6 @@ public class ApiDefinition {
...
@@ -16,5 +16,6 @@ public class ApiDefinition {
private
List
<
DatasetTableField
>
fields
;
private
List
<
DatasetTableField
>
fields
;
private
String
request
;
private
String
request
;
private
String
dataPath
;
private
String
dataPath
;
private
String
status
;
private
List
<
JSONObject
>
datas
=
new
ArrayList
<>();
private
List
<
JSONObject
>
datas
=
new
ArrayList
<>();
}
}
backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
浏览文件 @
52fcd983
...
@@ -12,15 +12,13 @@ import io.dataease.controller.request.datasource.ApiDefinitionRequest;
...
@@ -12,15 +12,13 @@ import io.dataease.controller.request.datasource.ApiDefinitionRequest;
import
io.dataease.controller.request.datasource.DatasourceRequest
;
import
io.dataease.controller.request.datasource.DatasourceRequest
;
import
io.dataease.dto.datasource.TableDesc
;
import
io.dataease.dto.datasource.TableDesc
;
import
io.dataease.dto.datasource.TableField
;
import
io.dataease.dto.datasource.TableField
;
import
io.dataease.exception.DataEaseException
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.http.HttpHeaders
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.sql.Connection
;
import
java.sql.ResultSet
;
import
java.sql.Statement
;
import
java.util.*
;
import
java.util.*
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
...
@@ -102,22 +100,18 @@ public class ApiProvider extends DatasourceProvider{
...
@@ -102,22 +100,18 @@ public class ApiProvider extends DatasourceProvider{
@Override
@Override
public
String
checkStatus
(
DatasourceRequest
datasourceRequest
)
throws
Exception
{
public
String
checkStatus
(
DatasourceRequest
datasourceRequest
)
throws
Exception
{
List
<
ApiDefinition
>
apiDefinitionList
=
JSONObject
.
parseArray
(
datasourceRequest
.
getDatasource
().
getConfiguration
(),
ApiDefinition
.
class
)
.
stream
().
filter
(
item
->
item
.
getName
().
equalsIgnoreCase
(
datasourceRequest
.
getTable
())).
collect
(
Collectors
.
toList
())
;
List
<
ApiDefinition
>
apiDefinitionList
=
JSONObject
.
parseArray
(
datasourceRequest
.
getDatasource
().
getConfiguration
(),
ApiDefinition
.
class
);
int
success
=
0
;
JSONObject
apiItemStatuses
=
new
JSONObject
()
;
for
(
ApiDefinition
apiDefinition
:
apiDefinitionList
)
{
for
(
ApiDefinition
apiDefinition
:
apiDefinitionList
)
{
datasourceRequest
.
setTable
(
apiDefinition
.
getName
());
datasourceRequest
.
setTable
(
apiDefinition
.
getName
());
try
{
try
{
getData
(
datasourceRequest
);
getData
(
datasourceRequest
);
success
++;
apiItemStatuses
.
put
(
apiDefinition
.
getName
(),
"Success"
);
}
catch
(
Exception
ignore
){}
}
catch
(
Exception
ignore
){
}
apiItemStatuses
.
put
(
apiDefinition
.
getName
(),
"Error"
);
if
(
success
==
apiDefinitionList
.
size
()){
}
return
"Success"
;
}
if
(
success
>
0
&&
success
<
apiDefinitionList
.
size
()
){
return
"Warning"
;
}
}
return
"Error"
;
return
JSONObject
.
toJSONString
(
apiItemStatuses
)
;
}
}
static
public
String
execHttpRequest
(
ApiDefinition
apiDefinition
)
throws
Exception
{
static
public
String
execHttpRequest
(
ApiDefinition
apiDefinition
)
throws
Exception
{
...
...
backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
浏览文件 @
52fcd983
package
io
.
dataease
.
service
.
datasource
;
package
io
.
dataease
.
service
.
datasource
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.google.gson.Gson
;
import
com.google.gson.Gson
;
import
com.jayway.jsonpath.JsonPath
;
import
com.jayway.jsonpath.JsonPath
;
...
@@ -110,12 +111,38 @@ public class DatasourceService {
...
@@ -110,12 +111,38 @@ public class DatasourceService {
datasourceDTO
.
setConfiguration
(
JSONObject
.
toJSONString
(
new
Gson
().
fromJson
(
datasourceDTO
.
getConfiguration
(),
CHConfiguration
.
class
))
);
datasourceDTO
.
setConfiguration
(
JSONObject
.
toJSONString
(
new
Gson
().
fromJson
(
datasourceDTO
.
getConfiguration
(),
CHConfiguration
.
class
))
);
break
;
break
;
case
api:
case
api:
datasourceDTO
.
setApiConfiguration
(
JSONObject
.
parseArray
(
datasourceDTO
.
getConfiguration
()));
JSONArray
apiDefinitionList
=
JSONObject
.
parseArray
(
datasourceDTO
.
getConfiguration
());
JSONArray
apiDefinitionListWithStatus
=
new
JSONArray
();
int
success
=
0
;
if
(
StringUtils
.
isNotEmpty
(
datasourceDTO
.
getStatus
())){
JSONObject
apiItemStatuses
=
JSONObject
.
parseObject
(
datasourceDTO
.
getStatus
());
for
(
Object
apiDefinition
:
apiDefinitionList
)
{
String
status
=
apiItemStatuses
.
getString
(
JSONObject
.
parseObject
(
apiDefinition
.
toString
()).
getString
(
"name"
)
);
JSONObject
object
=
JSONObject
.
parseObject
(
apiDefinition
.
toString
());
object
.
put
(
"status"
,
status
);
apiDefinitionListWithStatus
.
add
(
object
);
if
(
StringUtils
.
isNotEmpty
(
status
)
&&
status
.
equalsIgnoreCase
(
"Success"
)){
success
++;
}
}
}
datasourceDTO
.
setApiConfiguration
(
apiDefinitionListWithStatus
);
if
(
success
==
apiDefinitionList
.
size
()){
datasourceDTO
.
setStatus
(
"Success"
);
break
;
}
if
(
success
>
0
&&
success
<
apiDefinitionList
.
size
()
){
datasourceDTO
.
setStatus
(
"Warning"
);
break
;
}
datasourceDTO
.
setStatus
(
"Error"
);
break
;
break
;
default
:
default
:
break
;
break
;
}
}
}
catch
(
Exception
ignore
){}
}
catch
(
Exception
ignore
){
ignore
.
printStackTrace
();
}
});
});
return
datasourceDTOS
;
return
datasourceDTOS
;
...
@@ -156,22 +183,39 @@ public class DatasourceService {
...
@@ -156,22 +183,39 @@ public class DatasourceService {
handleConnectionPool
(
datasource
,
"edit"
);
handleConnectionPool
(
datasource
,
"edit"
);
}
}
public
ResultHolder
validate
(
Datasource
datasource
)
throws
Exception
{
public
ResultHolder
validate
(
Datasource
DTO
datasource
)
throws
Exception
{
try
{
try
{
DatasourceProvider
datasourceProvider
=
ProviderFactory
.
getProvider
(
datasource
.
getType
());
DatasourceProvider
datasourceProvider
=
ProviderFactory
.
getProvider
(
datasource
.
getType
());
DatasourceRequest
datasourceRequest
=
new
DatasourceRequest
();
DatasourceRequest
datasourceRequest
=
new
DatasourceRequest
();
datasourceRequest
.
setDatasource
(
datasource
);
datasourceRequest
.
setDatasource
(
datasource
);
String
status
=
datasourceProvider
.
checkStatus
(
datasourceRequest
);
String
datasourceStatus
=
datasourceProvider
.
checkStatus
(
datasourceRequest
);
if
(
status
.
equalsIgnoreCase
(
"Success"
))
{
if
(
datasource
.
getType
().
equalsIgnoreCase
(
"api"
)){
return
ResultHolder
.
success
(
"Success"
);
int
success
=
0
;
}
JSONArray
apiDefinitionList
=
JSONObject
.
parseArray
(
datasource
.
getConfiguration
());
if
(
status
.
equalsIgnoreCase
(
"Warning"
))
{
JSONArray
apiDefinitionListWithStatus
=
new
JSONArray
();
return
ResultHolder
.
error
(
"Datasource has invalid items"
);
if
(
StringUtils
.
isNotEmpty
(
datasourceStatus
)){
}
JSONObject
apiItemStatuses
=
JSONObject
.
parseObject
(
datasourceStatus
);
if
(
status
.
equalsIgnoreCase
(
"Error"
))
{
for
(
Object
apiDefinition
:
apiDefinitionList
)
{
return
ResultHolder
.
error
(
"Datasource is invalid"
);
String
status
=
apiItemStatuses
.
getString
(
JSONObject
.
parseObject
(
apiDefinition
.
toString
()).
getString
(
"name"
)
);
JSONObject
object
=
JSONObject
.
parseObject
(
apiDefinition
.
toString
());
object
.
put
(
"status"
,
status
);
apiDefinitionListWithStatus
.
add
(
object
);
if
(
StringUtils
.
isNotEmpty
(
status
)
&&
status
.
equalsIgnoreCase
(
"Success"
)){
success
++;
}
}
}
datasource
.
setApiConfiguration
(
apiDefinitionListWithStatus
);
if
(
success
==
apiDefinitionList
.
size
()){
return
ResultHolder
.
success
(
datasource
);
}
if
(
success
>
0
&&
success
<
apiDefinitionList
.
size
()
){
return
ResultHolder
.
error
(
"Datasource has invalid tables"
,
datasource
);
}
return
ResultHolder
.
error
(
"Datasource is invalid."
,
datasource
);
}
}
return
ResultHolder
.
success
(
"Success"
);
return
ResultHolder
.
success
(
datasource
);
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
return
ResultHolder
.
error
(
"Datasource is invalid: "
+
e
.
getMessage
());
return
ResultHolder
.
error
(
"Datasource is invalid: "
+
e
.
getMessage
());
}
}
...
@@ -187,17 +231,29 @@ public class DatasourceService {
...
@@ -187,17 +231,29 @@ public class DatasourceService {
DatasourceProvider
datasourceProvider
=
ProviderFactory
.
getProvider
(
datasource
.
getType
());
DatasourceProvider
datasourceProvider
=
ProviderFactory
.
getProvider
(
datasource
.
getType
());
DatasourceRequest
datasourceRequest
=
new
DatasourceRequest
();
DatasourceRequest
datasourceRequest
=
new
DatasourceRequest
();
datasourceRequest
.
setDatasource
(
datasource
);
datasourceRequest
.
setDatasource
(
datasource
);
String
status
=
datasourceProvider
.
checkStatus
(
datasourceRequest
);
String
datasourceStatus
=
datasourceProvider
.
checkStatus
(
datasourceRequest
);
datasource
.
setStatus
(
status
);
datasource
.
setStatus
(
datasourceStatus
);
if
(
status
.
equalsIgnoreCase
(
"Success"
))
{
return
ResultHolder
.
success
(
"Success"
);
if
(
datasource
.
getType
().
equalsIgnoreCase
(
"api"
)){
}
List
<
ApiDefinition
>
apiDefinitionList
=
JSONObject
.
parseArray
(
datasource
.
getConfiguration
(),
ApiDefinition
.
class
);
if
(
status
.
equalsIgnoreCase
(
"Warning"
))
{
JSONObject
apiItemStatuses
=
JSONObject
.
parseObject
(
datasourceStatus
);
return
ResultHolder
.
error
(
"Datasource has invalid items"
);
int
success
=
0
;
}
for
(
ApiDefinition
apiDefinition
:
apiDefinitionList
)
{
if
(
status
.
equalsIgnoreCase
(
"Error"
))
{
String
status
=
apiItemStatuses
.
getString
(
apiDefinition
.
getName
());
return
ResultHolder
.
error
(
"Datasource is invalid"
);
apiDefinition
.
setStatus
(
status
);
if
(
status
.
equalsIgnoreCase
(
"Success"
)){
success
++;
}
}
if
(
success
==
apiDefinitionList
.
size
()){
return
ResultHolder
.
success
(
datasource
);
}
if
(
success
>
0
&&
success
<
apiDefinitionList
.
size
()
){
return
ResultHolder
.
error
(
"Datasource has invalid tables"
,
datasource
);
}
return
ResultHolder
.
error
(
"Datasource is invalid."
,
datasource
);
}
}
return
ResultHolder
.
success
(
"Success"
);
return
ResultHolder
.
success
(
"Success"
);
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
datasource
.
setStatus
(
"Error"
);
datasource
.
setStatus
(
"Error"
);
...
@@ -219,12 +275,14 @@ public class DatasourceService {
...
@@ -219,12 +275,14 @@ public class DatasourceService {
DatasourceProvider
datasourceProvider
=
ProviderFactory
.
getProvider
(
ds
.
getType
());
DatasourceProvider
datasourceProvider
=
ProviderFactory
.
getProvider
(
ds
.
getType
());
DatasourceRequest
datasourceRequest
=
new
DatasourceRequest
();
DatasourceRequest
datasourceRequest
=
new
DatasourceRequest
();
datasourceRequest
.
setDatasource
(
ds
);
datasourceRequest
.
setDatasource
(
ds
);
datasourceProvider
.
checkStatus
(
datasourceRequest
);
if
(!
datasource
.
getType
().
equalsIgnoreCase
(
"api"
)){
datasourceProvider
.
checkStatus
(
datasourceRequest
);
}
List
<
TableDesc
>
tables
=
datasourceProvider
.
getTables
(
datasourceRequest
);
List
<
TableDesc
>
tables
=
datasourceProvider
.
getTables
(
datasourceRequest
);
// 获取当前数据源下的db类型数据集
// 获取当前数据源下的db
、api
类型数据集
DatasetTableExample
datasetTableExample
=
new
DatasetTableExample
();
DatasetTableExample
datasetTableExample
=
new
DatasetTableExample
();
datasetTableExample
.
createCriteria
().
andTypeIn
(
Arrays
.
asList
(
"db"
,
"api"
)).
andDataSourceIdEqualTo
(
datasource
.
getId
());
datasetTableExample
.
createCriteria
().
andTypeIn
(
Arrays
.
asList
(
"db"
,
"api"
)).
andDataSourceIdEqualTo
(
datasource
.
getId
());
List
<
DatasetTable
>
datasetTables
=
datasetTableMapper
.
selectByExampleWithBLOBs
(
datasetTableExample
);
List
<
DatasetTable
>
datasetTables
=
datasetTableMapper
.
selectByExampleWithBLOBs
(
datasetTableExample
);
List
<
DBTableDTO
>
list
=
new
ArrayList
<>();
List
<
DBTableDTO
>
list
=
new
ArrayList
<>();
...
...
backend/src/main/resources/db/migration/V32__1.8.sql
浏览文件 @
52fcd983
...
@@ -353,3 +353,6 @@ SET FOREIGN_KEY_CHECKS = 1;
...
@@ -353,3 +353,6 @@ SET FOREIGN_KEY_CHECKS = 1;
ALTER
TABLE
`panel_view`
ALTER
TABLE
`panel_view`
ADD
COLUMN
`position`
varchar
(
255
)
NULL
DEFAULT
'panel'
COMMENT
'视图位置 panel 仪表板中,tab Tab页中'
AFTER
`update_time`
;
ADD
COLUMN
`position`
varchar
(
255
)
NULL
DEFAULT
'panel'
COMMENT
'视图位置 panel 仪表板中,tab Tab页中'
AFTER
`update_time`
;
ALTER
TABLE
`datasource`
CHANGE
COLUMN
`status`
`status`
LONGTEXT
NULL
DEFAULT
NULL
COMMENT
'状态'
;
frontend/src/lang/en.js
浏览文件 @
52fcd983
...
@@ -1337,7 +1337,11 @@ export default {
...
@@ -1337,7 +1337,11 @@ export default {
auth_config_info
:
'Permission verification is required for the request'
,
auth_config_info
:
'Permission verification is required for the request'
,
verified
:
'Verified'
,
verified
:
'Verified'
,
verification_method
:
'Verification Method'
,
verification_method
:
'Verification Method'
,
username
:
'Username'
username
:
'Username'
,
api_table_not_empty
:
'API data table cannot be empty'
,
has_repeat_name
:
'Duplicate API data table name'
,
valid
:
'Valid'
,
invalid
:
'Invalid'
},
},
pblink
:
{
pblink
:
{
key_pwd
:
'Please enter the password to open the link'
,
key_pwd
:
'Please enter the password to open the link'
,
...
...
frontend/src/lang/tw.js
浏览文件 @
52fcd983
...
@@ -1338,7 +1338,11 @@ export default {
...
@@ -1338,7 +1338,11 @@ export default {
auth_config_info
:
'請求需要進行權限校驗'
,
auth_config_info
:
'請求需要進行權限校驗'
,
verified
:
'認證'
,
verified
:
'認證'
,
verification_method
:
'認證方式'
,
verification_method
:
'認證方式'
,
username
:
'用戶名'
username
:
'用戶名'
,
api_table_not_empty
:
'API 數據表不能為空'
,
has_repeat_name
:
'API 數據表名稱重複'
,
valid
:
'有效'
,
invalid
:
'無效'
},
},
pblink
:
{
pblink
:
{
key_pwd
:
'請輸入密碼打開鏈接'
,
key_pwd
:
'請輸入密碼打開鏈接'
,
...
...
frontend/src/lang/zh.js
浏览文件 @
52fcd983
...
@@ -1346,7 +1346,11 @@ export default {
...
@@ -1346,7 +1346,11 @@ export default {
auth_config_info
:
'请求需要进行权限校验'
,
auth_config_info
:
'请求需要进行权限校验'
,
verified
:
'认证'
,
verified
:
'认证'
,
verification_method
:
'认证方式'
,
verification_method
:
'认证方式'
,
username
:
'用户名'
username
:
'用户名'
,
api_table_not_empty
:
'API 数据表不能为空'
,
has_repeat_name
:
'API 数据表名称重复'
,
valid
:
'有效'
,
invalid
:
'无效'
},
},
pblink
:
{
pblink
:
{
key_pwd
:
'请输入密码打开链接'
,
key_pwd
:
'请输入密码打开链接'
,
...
...
frontend/src/views/system/datasource/form.vue
浏览文件 @
52fcd983
...
@@ -48,6 +48,18 @@
...
@@ -48,6 +48,18 @@
<el-table-column
prop=
"name"
:label=
"$t('datasource.data_table_name')"
width=
"150"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop=
"name"
:label=
"$t('datasource.data_table_name')"
width=
"150"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop=
"method"
:label=
"$t('datasource.method')"
width=
"150"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop=
"method"
:label=
"$t('datasource.method')"
width=
"150"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop=
"url"
:label=
"$t('datasource.url')"
width=
"150"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop=
"url"
:label=
"$t('datasource.url')"
width=
"150"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop=
"status"
:label=
"$t('commons.status')"
width=
"150"
>
<
template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.status === 'Success'"
style=
"color: green"
>
{{
$t
(
'datasource.valid'
)
}}
</span>
<span
v-if=
"scope.row.status === 'Error'"
style=
"color: red"
>
{{
$t
(
'datasource.invalid'
)
}}
</span>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('dataset.operate')"
>
<el-table-column
:label=
"$t('dataset.operate')"
>
<
template
slot-scope=
"scope"
style=
"float: right"
>
<
template
slot-scope=
"scope"
style=
"float: right"
>
<el-button
size=
"mini"
type=
"primary"
icon=
"el-icon-edit"
circle
@
click=
"addApiItem(scope.row)"
/>
<el-button
size=
"mini"
type=
"primary"
icon=
"el-icon-edit"
circle
@
click=
"addApiItem(scope.row)"
/>
...
@@ -409,7 +421,7 @@ export default {
...
@@ -409,7 +421,7 @@ export default {
canEdit
:
false
,
canEdit
:
false
,
originConfiguration
:
{},
originConfiguration
:
{},
edit_api_item
:
false
,
edit_api_item
:
false
,
add_api_item
:
fals
e
,
add_api_item
:
tru
e
,
active
:
0
,
active
:
0
,
defaultApiItem
:
{
defaultApiItem
:
{
name
:
''
,
name
:
''
,
...
@@ -426,6 +438,7 @@ export default {
...
@@ -426,6 +438,7 @@ export default {
fields
:
[]
fields
:
[]
},
},
apiItem
:
{
apiItem
:
{
status
:
''
,
name
:
''
,
name
:
''
,
url
:
''
,
url
:
''
,
method
:
'GET'
,
method
:
'GET'
,
...
@@ -571,6 +584,10 @@ export default {
...
@@ -571,6 +584,10 @@ export default {
const
method
=
this
.
formType
===
'add'
?
addDs
:
editDs
const
method
=
this
.
formType
===
'add'
?
addDs
:
editDs
const
form
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
form
))
const
form
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
form
))
if
(
form
.
type
===
'api'
){
if
(
form
.
type
===
'api'
){
if
(
this
.
form
.
apiConfiguration
.
length
<
1
){
this
.
$message
.
error
(
i18n
.
t
(
'datasource.api_table_not_empty'
))
return
}
form
.
configuration
=
JSON
.
stringify
(
form
.
apiConfiguration
)
form
.
configuration
=
JSON
.
stringify
(
form
.
apiConfiguration
)
}
else
{
}
else
{
form
.
configuration
=
JSON
.
stringify
(
form
.
configuration
)
form
.
configuration
=
JSON
.
stringify
(
form
.
configuration
)
...
@@ -655,6 +672,9 @@ export default {
...
@@ -655,6 +672,9 @@ export default {
if
(
res
.
success
)
{
if
(
res
.
success
)
{
this
.
$success
(
i18n
.
t
(
'datasource.validate_success'
))
this
.
$success
(
i18n
.
t
(
'datasource.validate_success'
))
}
else
{
}
else
{
if
(
data
.
type
===
'api'
)
{
this
.
form
.
apiConfiguration
=
res
.
data
.
apiConfiguration
}
if
(
res
.
message
.
length
<
2500
)
{
if
(
res
.
message
.
length
<
2500
)
{
this
.
$error
(
res
.
message
)
this
.
$error
(
res
.
message
)
}
else
{
}
else
{
...
@@ -686,6 +706,25 @@ export default {
...
@@ -686,6 +706,25 @@ export default {
},
},
next
()
{
next
()
{
if
(
this
.
active
===
1
){
if
(
this
.
active
===
1
){
let
hasRepeatName
=
false
if
(
this
.
add_api_item
){
this
.
form
.
apiConfiguration
.
forEach
(
item
=>
{
if
(
item
.
name
===
this
.
apiItem
.
name
){
hasRepeatName
=
true
}
})
}
else
{
let
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
}
}
}
if
(
hasRepeatName
){
this
.
$message
.
error
(
i18n
.
t
(
'datasource.has_repeat_name'
))
return
}
this
.
$refs
.
apiItem
.
validate
(
valid
=>
{
this
.
$refs
.
apiItem
.
validate
(
valid
=>
{
if
(
valid
)
{
if
(
valid
)
{
const
data
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
apiItem
))
const
data
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
apiItem
))
...
@@ -693,6 +732,7 @@ export default {
...
@@ -693,6 +732,7 @@ export default {
this
.
loading
=
true
this
.
loading
=
true
checkApiDatasource
(
data
).
then
(
res
=>
{
checkApiDatasource
(
data
).
then
(
res
=>
{
this
.
loading
=
false
this
.
loading
=
false
this
.
apiItem
.
status
=
'Success'
this
.
$success
(
i18n
.
t
(
'commons.success'
))
this
.
$success
(
i18n
.
t
(
'commons.success'
))
this
.
active
++
this
.
active
++
this
.
apiItem
.
fields
=
res
.
data
.
fields
this
.
apiItem
.
fields
=
res
.
data
.
fields
...
@@ -718,17 +758,17 @@ export default {
...
@@ -718,17 +758,17 @@ export default {
saveItem
()
{
saveItem
()
{
this
.
active
=
0
this
.
active
=
0
this
.
edit_api_item
=
false
this
.
edit_api_item
=
false
if
(
!
this
.
add_api_item
){
if
(
this
.
add_api_item
){
this
.
form
.
apiConfiguration
.
push
(
this
.
apiItem
)
this
.
form
.
apiConfiguration
.
push
(
this
.
apiItem
)
}
}
},
},
addApiItem
(
item
)
{
addApiItem
(
item
)
{
if
(
item
)
{
if
(
item
)
{
this
.
add_api_item
=
tru
e
this
.
add_api_item
=
fals
e
this
.
api_table_title
=
this
.
$t
(
'datasource.edit_api_table'
)
this
.
api_table_title
=
this
.
$t
(
'datasource.edit_api_table'
)
this
.
apiItem
=
item
this
.
apiItem
=
item
}
else
{
}
else
{
this
.
add_api_item
=
fals
e
this
.
add_api_item
=
tru
e
this
.
apiItem
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
defaultApiItem
))
this
.
apiItem
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
defaultApiItem
))
this
.
api_table_title
=
this
.
$t
(
'datasource.add_api_table'
)
this
.
api_table_title
=
this
.
$t
(
'datasource.add_api_table'
)
}
}
...
@@ -738,21 +778,6 @@ export default {
...
@@ -738,21 +778,6 @@ export default {
deleteItem
(
item
)
{
deleteItem
(
item
)
{
this
.
form
.
apiConfiguration
.
splice
(
this
.
form
.
apiConfiguration
.
indexOf
(
item
),
1
)
this
.
form
.
apiConfiguration
.
splice
(
this
.
form
.
apiConfiguration
.
indexOf
(
item
),
1
)
},
},
runDebug
()
{
this
.
$refs
[
'debugForm'
].
validate
((
valid
)
=>
{
if
(
valid
)
{
this
.
loading
=
true
;
this
.
isStop
=
true
;
this
.
request
.
url
=
this
.
debugForm
.
url
;
this
.
request
.
method
=
this
.
debugForm
.
method
;
this
.
request
.
name
=
getUUID
().
substring
(
0
,
8
);
this
.
runData
=
[];
this
.
runData
.
push
(
this
.
request
);
/*触发执行操作*/
this
.
reportId
=
getUUID
().
substring
(
0
,
8
);
}
})
},
validateApi
(
item
)
{
validateApi
(
item
)
{
if
(
undefined
){
if
(
undefined
){
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论