Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
98eeb7bc
M
metersphere
项目概览
MeterSphere
/
metersphere
上一次同步 3 年多
通知
25
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
metersphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
98eeb7bc
编写于
7月 13, 2020
作者:
S
shiziyuan9527
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/metersphere/metersphere
上级
2bd46f80
c98c8bd3
变更
17
展开全部
显示空白变更内容
内联
并排
Showing
17 changed file
with
1644 addition
and
1015 deletion
+1644
-1015
backend/src/main/java/io/metersphere/commons/constants/APITestStatus.java
.../java/io/metersphere/commons/constants/APITestStatus.java
+1
-1
backend/src/main/java/io/metersphere/ldap/dao/PersonRepoImpl.java
...src/main/java/io/metersphere/ldap/dao/PersonRepoImpl.java
+11
-19
frontend/src/business/components/api/report/ApiReportList.vue
...tend/src/business/components/api/report/ApiReportList.vue
+19
-11
frontend/src/business/components/api/test/ApiTestList.vue
frontend/src/business/components/api/test/ApiTestList.vue
+7
-4
frontend/src/business/components/api/test/components/extract/ApiExtractCommon.vue
...mponents/api/test/components/extract/ApiExtractCommon.vue
+1
-1
frontend/src/business/components/common/components/MsTableHeader.vue
...c/business/components/common/components/MsTableHeader.vue
+44
-36
frontend/src/business/components/common/components/search/MsTableAdvSearchBar.vue
...mponents/common/components/search/MsTableAdvSearchBar.vue
+109
-0
frontend/src/business/components/common/components/search/MsTableSearchComponet.vue
...onents/common/components/search/MsTableSearchComponet.vue
+72
-0
frontend/src/business/components/common/components/search/MsTableSearchDatePicker.vue
...ents/common/components/search/MsTableSearchDatePicker.vue
+50
-0
frontend/src/business/components/common/components/search/MsTableSearchDateTimePicker.vue
.../common/components/search/MsTableSearchDateTimePicker.vue
+49
-0
frontend/src/business/components/common/components/search/MsTableSearchInput.vue
...omponents/common/components/search/MsTableSearchInput.vue
+31
-0
frontend/src/business/components/common/components/search/MsTableSearchSelect.vue
...mponents/common/components/search/MsTableSearchSelect.vue
+53
-0
frontend/src/business/components/common/components/search/search-components.js
.../components/common/components/search/search-components.js
+143
-0
frontend/src/business/components/common/tableItem/ReportTriggerModeItem.vue
...ess/components/common/tableItem/ReportTriggerModeItem.vue
+3
-3
frontend/src/i18n/en-US.js
frontend/src/i18n/en-US.js
+350
-313
frontend/src/i18n/zh-CN.js
frontend/src/i18n/zh-CN.js
+351
-314
frontend/src/i18n/zh-TW.js
frontend/src/i18n/zh-TW.js
+350
-313
未找到文件。
backend/src/main/java/io/metersphere/commons/constants/APITestStatus.java
浏览文件 @
98eeb7bc
package
io.metersphere.commons.constants
;
public
enum
APITestStatus
{
Saved
,
Starting
,
Running
,
Completed
,
Error
Saved
,
Starting
,
Running
,
Reporting
,
Completed
,
Error
}
backend/src/main/java/io/metersphere/ldap/dao/PersonRepoImpl.java
浏览文件 @
98eeb7bc
...
...
@@ -57,16 +57,11 @@ public class PersonRepoImpl implements PersonRepo {
LdapTemplate
ldapTemplate
=
getConnection
();
String
filter
=
getUserFilter
();
String
[]
arr
=
getUserOu
();
String
ou
=
getUserOu
();
List
<
Person
>
result
=
null
;
for
(
String
ou
:
arr
)
{
try
{
result
=
ldapTemplate
.
search
(
query
().
base
(
ou
.
trim
()).
filter
(
filter
,
username
),
getContextMapper
());
if
(
result
.
size
()
==
1
)
{
return
result
.
get
(
0
);
}
result
=
ldapTemplate
.
search
(
query
().
base
(
ou
).
filter
(
filter
,
username
),
getContextMapper
());
}
catch
(
NameNotFoundException
e
)
{
MSException
.
throwException
(
Translator
.
get
(
"login_fail_ou_error"
));
}
catch
(
InvalidNameException
e
)
{
...
...
@@ -74,7 +69,6 @@ public class PersonRepoImpl implements PersonRepo {
}
catch
(
InvalidSearchFilterException
e
)
{
MSException
.
throwException
(
Translator
.
get
(
"login_fail_filter_error"
));
}
}
if
(
result
.
size
()
!=
1
)
{
MSException
.
throwException
(
Translator
.
get
(
"user_not_found_or_not_unique"
));
...
...
@@ -93,16 +87,14 @@ public class PersonRepoImpl implements PersonRepo {
return
filter
;
}
private
String
[]
getUserOu
()
{
private
String
getUserOu
()
{
String
ou
=
service
.
getValue
(
ParamConstants
.
LDAP
.
OU
.
getValue
());
if
(
StringUtils
.
isBlank
(
ou
))
{
MSException
.
throwException
(
Translator
.
get
(
"ldap_ou_is_null"
));
}
String
[]
arr
=
ou
.
split
(
"\\|"
);
return
arr
;
return
ou
;
}
protected
ContextMapper
getContextMapper
()
{
...
...
frontend/src/business/components/api/report/ApiReportList.vue
浏览文件 @
98eeb7bc
...
...
@@ -4,7 +4,7 @@
<el-card
class=
"table-card"
v-loading=
"result.loading"
>
<template
v-slot:header
>
<ms-table-header
:is-tester-permission=
"true"
:condition.sync=
"condition"
@
search=
"search"
:title=
"$t('api_report.title')"
:title=
"$t('api_report.title')"
:advanced=
"advanced"
:show-create=
"false"
/>
</
template
>
<el-table
:data=
"tableData"
class=
"table-content"
@
sort-change=
"sort"
...
...
@@ -14,13 +14,13 @@
<el-table-column
prop=
"testName"
:label=
"$t('api_report.test_name')"
width=
"200"
show-overflow-tooltip
/>
<el-table-column
prop=
"projectName"
:label=
"$t('load_test.project_name')"
width=
"150"
show-overflow-tooltip
/>
<el-table-column
prop=
"userName"
:label=
"$t('api_test.creator')"
width=
"150"
show-overflow-tooltip
/>
<el-table-column
width=
"250"
:label=
"$t('commons.create_time')"
sortable
prop=
"createTime"
>
<el-table-column
prop=
"createTime"
width=
"250"
:label=
"$t('commons.create_time')"
sortable
>
<
template
v-slot:default=
"scope"
>
<span>
{{
scope
.
row
.
createTime
|
timestampFormatDate
}}
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
"triggerMode"
width=
"150"
:label=
"'触发方式'"
column-key=
"triggerMode"
:filters=
"triggerFilters"
>
<el-table-column
prop=
"triggerMode"
width=
"150"
:label=
"$t('commons.trigger_mode.name')"
column-key=
"triggerMode"
:filters=
"triggerFilters"
>
<
template
v-slot:default=
"scope"
>
<report-trigger-mode-item
:trigger-mode=
"scope.row.triggerMode"
/>
</
template
>
...
...
@@ -34,8 +34,10 @@
</el-table-column>
<el-table-column
width=
"150"
:label=
"$t('commons.operating')"
>
<
template
v-slot:default=
"scope"
>
<ms-table-operator-button
:tip=
"$t('api_report.detail')"
icon=
"el-icon-s-data"
@
exec=
"handleView(scope.row)"
type=
"primary"
/>
<ms-table-operator-button
:is-tester-permission=
"true"
:tip=
"$t('api_report.delete')"
icon=
"el-icon-delete"
@
exec=
"handleDelete(scope.row)"
type=
"danger"
/>
<ms-table-operator-button
:tip=
"$t('api_report.detail')"
icon=
"el-icon-s-data"
@
exec=
"handleView(scope.row)"
type=
"primary"
/>
<ms-table-operator-button
:is-tester-permission=
"true"
:tip=
"$t('api_report.delete')"
icon=
"el-icon-delete"
@
exec=
"handleDelete(scope.row)"
type=
"danger"
/>
</
template
>
</el-table-column>
</el-table>
...
...
@@ -55,16 +57,21 @@
import
{
_filter
,
_sort
}
from
"
../../../../common/js/utils
"
;
import
MsTableOperatorButton
from
"
../../common/components/MsTableOperatorButton
"
;
import
ReportTriggerModeItem
from
"
../../common/tableItem/ReportTriggerModeItem
"
;
import
{
REPORT_CONFIGS
}
from
"
../../common/components/search/search-components
"
;
export
default
{
components
:
{
ReportTriggerModeItem
,
MsTableOperatorButton
,
MsApiReportStatus
,
MsMainContainer
,
MsContainer
,
MsTableHeader
,
MsTablePagination
},
MsApiReportStatus
,
MsMainContainer
,
MsContainer
,
MsTableHeader
,
MsTablePagination
},
data
()
{
return
{
result
:
{},
condition
:
{},
advanced
:
{
components
:
REPORT_CONFIGS
},
tableData
:
[],
multipleSelection
:
[],
currentPage
:
1
,
...
...
@@ -80,9 +87,9 @@
{
text
:
'
Error
'
,
value
:
'
Error
'
}
],
triggerFilters
:
[
{
text
:
'
手动
'
,
value
:
'
MANUAL
'
},
{
text
:
'
定时任务
'
,
value
:
'
SCHEDULE
'
},
{
text
:
'
API
'
,
value
:
'
API
'
}
{
text
:
this
.
$t
(
'
commons.trigger_mode.manual
'
)
,
value
:
'
MANUAL
'
},
{
text
:
this
.
$t
(
'
commons.trigger_mode.schedule
'
)
,
value
:
'
SCHEDULE
'
},
{
text
:
this
.
$t
(
'
commons.trigger_mode.api
'
)
,
value
:
'
API
'
}
],
}
},
...
...
@@ -92,7 +99,8 @@
},
methods
:
{
search
()
{
search
(
advanced
)
{
console
.
log
(
advanced
)
if
(
this
.
testId
!==
'
all
'
)
{
this
.
condition
.
testId
=
this
.
testId
;
}
...
...
frontend/src/business/components/api/test/ApiTestList.vue
浏览文件 @
98eeb7bc
...
...
@@ -4,7 +4,7 @@
<el-card
class=
"table-card"
v-loading=
"result.loading"
>
<template
v-slot:header
>
<ms-table-header
:is-tester-permission=
"true"
:condition.sync=
"condition"
@
search=
"search"
:title=
"$t('commons.test')"
:title=
"$t('commons.test')"
:advanced=
"advanced"
@
create=
"create"
:createTip=
"$t('load_test.create')"
/>
</
template
>
<el-table
:data=
"tableData"
class=
"table-content"
@
sort-change=
"sort"
@
row-click=
"handleView"
...
...
@@ -54,6 +54,7 @@
import
MsApiTestStatus
from
"
./ApiTestStatus
"
;
import
MsTableOperators
from
"
../../common/components/MsTableOperators
"
;
import
{
_filter
,
_sort
}
from
"
../../../../common/js/utils
"
;
import
{
TEST_CONFIGS
}
from
"
../../common/components/search/search-components
"
;
export
default
{
components
:
{
...
...
@@ -64,6 +65,9 @@
return
{
result
:
{},
condition
:
{},
advanced
:
{
components
:
TEST_CONFIGS
},
projectId
:
null
,
tableData
:
[],
multipleSelection
:
[],
...
...
@@ -102,9 +106,8 @@
create
()
{
this
.
$router
.
push
(
'
/api/test/create
'
);
},
search
()
{
search
(
advanced
)
{
console
.
log
(
advanced
)
if
(
this
.
projectId
!==
'
all
'
)
{
this
.
condition
.
projectId
=
this
.
projectId
;
}
...
...
frontend/src/business/components/api/test/components/extract/ApiExtractCommon.vue
浏览文件 @
98eeb7bc
<
template
>
<div>
<el-row
:gutter=
"10"
type=
"flex"
justify=
"space-between"
align=
"middle"
>
<el-col
v-if=
"extractType == 'Regex'"
:span=
"5"
>
<el-col
v-if=
"extractType ==
=
'Regex'"
:span=
"5"
>
<el-select
:disabled=
"isReadOnly"
class=
"extract-item"
v-model=
"common.useHeaders"
:placeholder=
"$t('api_test.request.assertions.select_subject')"
size=
"small"
>
<el-option
v-for=
"item in useHeadersOption"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
/>
</el-select>
...
...
frontend/src/business/components/common/components/MsTableHeader.vue
浏览文件 @
98eeb7bc
...
...
@@ -8,11 +8,13 @@
</el-row>
<el-row
type=
"flex"
justify=
"space-between"
align=
"middle"
>
<span
class=
"operate-button"
>
<ms-table-button
:is-tester-permission=
"isTesterPermission"
v-if=
"showCreate"
icon=
"el-icon-circle-plus-outline"
:content=
"createTip"
@
click=
"create"
/>
<ms-table-button
:is-tester-permission=
"isTesterPermission"
v-if=
"showCreate"
icon=
"el-icon-circle-plus-outline"
:content=
"createTip"
@
click=
"create"
/>
<slot
name=
"button"
></slot>
</span>
<span>
<ms-table-search-bar
:condition.sync=
"condition"
@
change=
"search"
/>
<ms-table-search-bar
:condition.sync=
"condition"
@
change=
"search"
class=
"search-bar"
/>
<ms-table-adv-search-bar
:condition=
"advanced"
@
search=
"search"
v-if=
"advanced"
/>
</span>
</el-row>
</div>
...
...
@@ -22,10 +24,11 @@
<
script
>
import
MsTableSearchBar
from
'
./MsTableSearchBar
'
;
import
MsTableButton
from
'
./MsTableButton
'
;
import
MsTableAdvSearchBar
from
"
./search/MsTableAdvSearchBar
"
;
export
default
{
name
:
"
MsTableHeader
"
,
components
:
{
MsTableSearchBar
,
MsTableButton
},
components
:
{
MsTableAdvSearchBar
,
MsTableSearchBar
,
MsTableButton
},
props
:
{
title
:
{
type
:
String
,
...
...
@@ -40,6 +43,7 @@
condition
:
{
type
:
Object
},
advanced
:
Object
,
createTip
:
{
type
:
String
,
default
()
{
...
...
@@ -52,9 +56,9 @@
}
},
methods
:
{
search
(
)
{
search
(
value
)
{
this
.
$emit
(
'
update:condition
'
,
this
.
condition
);
this
.
$emit
(
'
search
'
);
this
.
$emit
(
'
search
'
,
value
);
},
create
()
{
this
.
$emit
(
'
create
'
);
...
...
@@ -79,4 +83,8 @@
margin-bottom
:
-5px
;
}
.search-bar
{
width
:
200px
}
</
style
>
frontend/src/business/components/common/components/search/MsTableAdvSearchBar.vue
0 → 100644
浏览文件 @
98eeb7bc
<
template
>
<span
class=
"adv-search-bar"
>
<el-link
type=
"primary"
@
click=
"open"
>
{{
$t
(
'
commons.adv_search.title
'
)
}}
</el-link>
<el-dialog
:title=
"$t('commons.adv_search.combine')"
:visible.sync=
"visible"
width=
"70%"
>
<div>
<div
class=
"search-label"
>
{{
$t
(
'
commons.adv_search.combine
'
)
}}
:
</div>
<el-select
v-model=
"logic"
:placeholder=
"$t('commons.please_select')"
size=
"small"
class=
"search-combine"
>
<el-option
v-for=
"o in options"
:key=
"o.value"
:label=
"o.label"
:value=
"o.value"
/>
</el-select>
<div
class=
"search-items"
>
<component
class=
"search-item"
v-for=
"(component, index) in condition.components"
:key=
"index"
:is=
"component.name"
:component=
"component"
/>
</div>
</div>
<template
v-slot:footer
>
<div
class=
"dialog-footer"
>
<el-button
@
click=
"visible = false"
>
{{
$t
(
'
commons.cancel
'
)
}}
</el-button>
<el-button
type=
"primary"
@
click=
"search"
>
{{
$t
(
'
commons.adv_search.search
'
)
}}
</el-button>
</div>
</
template
>
</el-dialog>
</span>
</template>
<
script
>
import
components
from
"
./search-components
"
;
export
default
{
components
:
{...
components
},
name
:
"
MsTableAdvSearchBar
"
,
props
:
{
condition
:
Object
,
},
data
()
{
return
{
visible
:
false
,
options
:
[{
label
:
this
.
$t
(
"
commons.adv_search.and
"
),
value
:
"
and
"
},
{
label
:
this
.
$t
(
"
commons.adv_search.or
"
),
value
:
"
or
"
}],
logic
:
this
.
condition
.
logic
||
"
and
"
}
},
methods
:
{
search
()
{
let
condition
=
{
logic
:
this
.
logic
}
this
.
condition
.
components
.
forEach
(
component
=>
{
if
(
Array
.
isArray
(
component
.
value
))
{
if
(
component
.
value
.
length
>
0
)
{
condition
[
component
.
key
]
=
{
operator
:
component
.
operator
,
value
:
component
.
value
}
}
}
else
{
if
(
component
.
value
!==
undefined
&&
component
.
value
!==
null
)
{
condition
[
component
.
key
]
=
{
operator
:
component
.
operator
,
value
:
component
.
value
}
}
}
});
this
.
$emit
(
'
search
'
,
condition
);
},
open
()
{
this
.
visible
=
true
;
}
}
}
</
script
>
<
style
scoped
>
.adv-search-bar
{
margin-left
:
5px
;
}
.dialog-footer
{
text-align
:
center
;
}
.search-label
{
display
:
inline-block
;
width
:
80px
;
box-sizing
:
border-box
;
padding-left
:
5px
;
}
.search-combine
{
width
:
160px
;
}
.search-items
{
width
:
100%
;
}
.search-item
{
display
:
inline-block
;
width
:
50%
;
max-width
:
50%
;
margin-top
:
10px
;
}
</
style
>
frontend/src/business/components/common/components/search/MsTableSearchComponet.vue
0 → 100644
浏览文件 @
98eeb7bc
<
template
>
<div>
<div
class=
"search-label"
>
{{
component
.
label
}}
:
</div>
<el-select
class=
"search-operator"
v-model=
"operator"
:placeholder=
"$t('commons.please_select')"
size=
"small"
@
change=
"change"
@
input=
"input"
>
<el-option
v-for=
"o in operators"
:key=
"o.value"
:label=
"o.label"
:value=
"o.value"
/>
</el-select>
<div
class=
"search-content"
v-if=
"showContent(operator)"
>
<slot
v-bind:component=
"component"
></slot>
</div>
</div>
</
template
>
<
script
>
export
default
{
name
:
"
MsTableSearchComponent
"
,
props
:
[
'
component
'
],
data
()
{
return
{
operators
:
this
.
component
.
operators
||
[],
operator
:
(()
=>
{
if
(
this
.
component
.
operator
===
undefined
&&
this
.
component
.
operators
.
length
>
0
)
{
this
.
$emit
(
'
input
'
,
this
.
component
.
operators
[
0
].
value
);
return
this
.
component
.
operators
[
0
].
value
;
}
else
{
this
.
component
.
operator
}
})()
}
},
methods
:
{
change
(
value
)
{
this
.
$emit
(
'
change
'
,
value
);
},
input
(
value
)
{
this
.
$emit
(
'
input
'
,
value
);
}
},
computed
:
{
showContent
()
{
return
operator
=>
{
if
(
this
.
component
.
showContent
)
{
return
this
.
component
.
showContent
(
operator
);
}
return
true
;
}
}
}
}
</
script
>
<
style
scoped
>
.search-label
{
display
:
inline-block
;
width
:
80px
;
box-sizing
:
border-box
;
padding-left
:
5px
;
}
.search-operator
{
display
:
inline-block
;
width
:
160px
;
}
.search-content
{
display
:
inline-block
;
margin
:
0
5px
0
10px
;
width
:
calc
(
100%
-
255px
);
}
</
style
>
frontend/src/business/components/common/components/search/MsTableSearchDatePicker.vue
0 → 100644
浏览文件 @
98eeb7bc
<
template
>
<ms-table-search-component
v-model=
"component.operator"
:component=
"component"
>
<template
v-slot=
"scope"
>
<el-date-picker
v-model=
"scope.component.value"
v-bind=
"scope.component.props"
:placeholder=
"$t('commons.date.select_date')"
size=
"small"
:type=
"type"
:key=
"type"
value-format=
"timestamp"
:range-separator=
"$t('commons.date.range_separator')"
:start-placeholder=
"$t('commons.date.start_date')"
:end-placeholder=
"$t('commons.date.end_date')"
>
</el-date-picker>
</
template
>
</ms-table-search-component>
</template>
<
script
>
import
MsTableSearchComponent
from
"
./MsTableSearchComponet
"
;
import
{
OPERATORS
}
from
"
./search-components
"
export
default
{
name
:
"
MsTableSearchDatePicker
"
,
components
:
{
MsTableSearchComponent
},
props
:
[
'
component
'
],
data
()
{
return
{
type
:
"
daterange
"
}
},
methods
:
{
change
(
value
)
{
if
(
value
===
OPERATORS
.
BETWEEN
.
value
)
{
if
(
!
Array
.
isArray
(
this
.
component
.
value
))
{
this
.
component
.
value
=
[];
}
this
.
type
=
"
daterange
"
;
}
else
{
if
(
Array
.
isArray
(
this
.
component
.
value
))
{
this
.
component
.
value
=
""
;
}
this
.
type
=
"
date
"
;
}
}
}
}
</
script
>
<
style
scoped
>
</
style
>
frontend/src/business/components/common/components/search/MsTableSearchDateTimePicker.vue
0 → 100644
浏览文件 @
98eeb7bc
<
template
>
<ms-table-search-component
v-model=
"component.operator"
:component=
"component"
@
change=
"change"
>
<template
v-slot=
"scope"
>
<el-date-picker
v-model=
"scope.component.value"
v-bind=
"scope.component.props"
:placeholder=
"$t('commons.date.select_date_time')"
size=
"small"
:type=
"type"
:key=
"type"
value-format=
"timestamp"
:range-separator=
"$t('commons.date.range_separator')"
:start-placeholder=
"$t('commons.date.start_date_time')"
:end-placeholder=
"$t('commons.date.end_date_time')"
>
</el-date-picker>
</
template
>
</ms-table-search-component>
</template>
<
script
>
import
MsTableSearchComponent
from
"
./MsTableSearchComponet
"
;
import
{
OPERATORS
}
from
"
./search-components
"
export
default
{
name
:
"
MsTableSearchDateTimePicker
"
,
components
:
{
MsTableSearchComponent
},
props
:
[
'
component
'
],
data
()
{
return
{
type
:
"
datetimerange
"
}
},
methods
:
{
change
(
value
)
{
if
(
value
===
OPERATORS
.
BETWEEN
.
value
)
{
if
(
!
Array
.
isArray
(
this
.
component
.
value
))
{
this
.
component
.
value
=
[];
}
this
.
type
=
"
datetimerange
"
;
}
else
{
if
(
Array
.
isArray
(
this
.
component
.
value
))
{
this
.
component
.
value
=
""
;
}
this
.
type
=
"
datetime
"
;
}
}
}
}
</
script
>
<
style
scoped
>
</
style
>
frontend/src/business/components/common/components/search/MsTableSearchInput.vue
0 → 100644
浏览文件 @
98eeb7bc
<
template
>
<ms-table-search-component
v-model=
"component.operator"
:component=
"component"
>
<template
v-slot=
"scope"
>
<el-input
v-model=
"scope.component.value"
v-bind=
"props"
:placeholder=
"$t('commons.input_content')"
size=
"small"
/>
</
template
>
</ms-table-search-component>
</template>
<
script
>
import
MsTableSearchComponent
from
"
./MsTableSearchComponet
"
;
export
default
{
name
:
"
MsTableSearchInput
"
,
components
:
{
MsTableSearchComponent
},
props
:
[
'
component
'
],
data
()
{
return
{
props
:
{
maxlength
:
"
60
"
,
showWordLimit
:
true
,
...
this
.
component
.
props
}
}
}
}
</
script
>
<
style
scoped
>
</
style
>
frontend/src/business/components/common/components/search/MsTableSearchSelect.vue
0 → 100644
浏览文件 @
98eeb7bc
<
template
>
<ms-table-search-component
v-model=
"component.operator"
:component=
"component"
>
<template
v-slot=
"scope"
>
<el-select
v-model=
"scope.component.value"
:placeholder=
"$t('commons.please_select')"
size=
"small"
filterable
v-bind=
"scope.component.props"
class=
"search-select"
>
<el-option
v-for=
"op in options"
:key=
"op.value"
:label=
"label(op)"
:value=
"op.value"
></el-option>
</el-select>
</
template
>
</ms-table-search-component>
</template>
<
script
>
import
MsTableSearchComponent
from
"
./MsTableSearchComponet
"
;
export
default
{
name
:
"
MsTableSearchSelect
"
,
components
:
{
MsTableSearchComponent
},
props
:
[
'
component
'
],
data
()
{
return
{
options
:
!
(
this
.
component
.
options
instanceof
Array
)
?
[]
:
this
.
component
.
options
||
[]
}
},
created
()
{
if
(
!
(
this
.
component
.
options
instanceof
Array
)
&&
this
.
component
.
options
.
url
)
{
this
.
$get
(
this
.
component
.
options
.
url
,
response
=>
{
if
(
response
.
data
)
{
response
.
data
.
forEach
(
item
=>
{
this
.
options
.
push
({
label
:
item
[
this
.
component
.
options
.
labelKey
],
value
:
item
[
this
.
component
.
options
.
valueKey
]})
})
}
})
}
},
computed
:
{
label
()
{
return
op
=>
{
if
(
this
.
component
.
options
.
showLabel
)
{
return
this
.
component
.
options
.
showLabel
(
op
);
}
return
op
.
label
;
}
}
}
}
</
script
>
<
style
scoped
>
.search-select
{
display
:
inline-block
;
width
:
100%
;
}
</
style
>
frontend/src/business/components/common/components/search/search-components.js
0 → 100644
浏览文件 @
98eeb7bc
import
MsTableSearchInput
from
"
./MsTableSearchInput
"
;
import
MsTableSearchDateTimePicker
from
"
./MsTableSearchDateTimePicker
"
;
import
MsTableSearchDatePicker
from
"
./MsTableSearchDatePicker
"
;
import
MsTableSearchSelect
from
"
./MsTableSearchSelect
"
;
import
i18n
from
"
../../../../../i18n/i18n
"
;
export
default
{
MsTableSearchInput
,
MsTableSearchDatePicker
,
MsTableSearchDateTimePicker
,
MsTableSearchSelect
}
export
const
OPERATORS
=
{
LIKE
:
{
label
:
i18n
.
t
(
"
commons.adv_search.operators.like
"
),
value
:
"
like
"
},
NOT_LIKE
:
{
label
:
i18n
.
t
(
"
commons.adv_search.operators.not_like
"
),
value
:
"
not like
"
},
IN
:
{
label
:
i18n
.
t
(
"
commons.adv_search.operators.in
"
),
value
:
"
in
"
},
NOT_IN
:
{
label
:
i18n
.
t
(
"
commons.adv_search.operators.not_in
"
),
value
:
"
not in
"
},
GT
:
{
label
:
i18n
.
t
(
"
commons.adv_search.operators.gt
"
),
value
:
"
>
"
},
GE
:
{
label
:
i18n
.
t
(
"
commons.adv_search.operators.ge
"
),
value
:
"
>=
"
},
LT
:
{
label
:
i18n
.
t
(
"
commons.adv_search.operators.lt
"
),
value
:
"
<
"
},
LE
:
{
label
:
i18n
.
t
(
"
commons.adv_search.operators.le
"
),
value
:
"
<=
"
},
EQ
:
{
label
:
i18n
.
t
(
"
commons.adv_search.operators.equals
"
),
value
:
"
==
"
},
BETWEEN
:
{
label
:
i18n
.
t
(
"
commons.adv_search.operators.between
"
),
value
:
"
between
"
},
CURRENT_USER
:
{
label
:
i18n
.
t
(
"
commons.adv_search.operators.current_user
"
),
value
:
"
current user
"
},
}
export
const
NAME
=
{
key
:
"
name
"
,
name
:
'
MsTableSearchInput
'
,
label
:
i18n
.
t
(
'
commons.name
'
),
operators
:
[
OPERATORS
.
LIKE
,
OPERATORS
.
NOT_LIKE
],
}
export
const
UPDATE_TIME
=
{
key
:
"
updateTime
"
,
name
:
'
MsTableSearchDateTimePicker
'
,
label
:
i18n
.
t
(
'
commons.update_time
'
),
operators
:
[
OPERATORS
.
BETWEEN
,
OPERATORS
.
GT
,
OPERATORS
.
GE
,
OPERATORS
.
LT
,
OPERATORS
.
LE
,
OPERATORS
.
EQ
],
}
export
const
PROJECT_NAME
=
{
key
:
"
projectName
"
,
name
:
'
MsTableSearchInput
'
,
label
:
i18n
.
t
(
'
commons.adv_search.project
'
),
operators
:
[
OPERATORS
.
LIKE
,
OPERATORS
.
NOT_LIKE
],
}
export
const
TEST_NAME
=
{
key
:
"
testName
"
,
name
:
'
MsTableSearchInput
'
,
label
:
i18n
.
t
(
'
commons.adv_search.test
'
),
operators
:
[
OPERATORS
.
LIKE
,
OPERATORS
.
NOT_LIKE
],
}
export
const
CREATE_TIME
=
{
key
:
"
createTime
"
,
name
:
'
MsTableSearchDateTimePicker
'
,
label
:
i18n
.
t
(
'
commons.create_time
'
),
operators
:
[
OPERATORS
.
BETWEEN
,
OPERATORS
.
GT
,
OPERATORS
.
GE
,
OPERATORS
.
LT
,
OPERATORS
.
LE
,
OPERATORS
.
EQ
],
}
export
const
STATUS
=
{
key
:
"
status
"
,
name
:
'
MsTableSearchSelect
'
,
label
:
i18n
.
t
(
'
commons.status
'
),
operators
:
[
OPERATORS
.
IN
,
OPERATORS
.
NOT_IN
],
options
:
[
{
label
:
"
Saved
"
,
value
:
"
Saved
"
},
{
label
:
"
Starting
"
,
value
:
"
Starting
"
},
{
label
:
"
Running
"
,
value
:
"
Running
"
},
{
label
:
"
Reporting
"
,
value
:
"
Reporting
"
},
{
label
:
"
Completed
"
,
value
:
"
Completed
"
},
{
label
:
"
Error
"
,
value
:
"
Error
"
}
],
props
:
{
multiple
:
true
}
}
export
const
CREATOR
=
{
key
:
"
creator
"
,
name
:
'
MsTableSearchSelect
'
,
label
:
i18n
.
t
(
'
api_test.creator
'
),
operators
:
[
OPERATORS
.
IN
,
OPERATORS
.
NOT_IN
,
OPERATORS
.
CURRENT_USER
],
options
:
{
url
:
"
/user/list
"
,
labelKey
:
"
name
"
,
valueKey
:
"
id
"
,
showLabel
:
option
=>
{
return
option
.
label
+
"
(
"
+
option
.
value
+
"
)
"
;
}
},
props
:
{
multiple
:
true
},
showContent
:
operator
=>
{
return
operator
!==
OPERATORS
.
CURRENT_USER
.
value
;
}
}
export
const
TRIGGER_MODE
=
{
key
:
"
triggerMode
"
,
name
:
'
MsTableSearchSelect
'
,
label
:
i18n
.
t
(
'
commons.trigger_mode.name
'
),
operators
:
[
OPERATORS
.
IN
,
OPERATORS
.
NOT_IN
],
options
:
[
{
label
:
i18n
.
t
(
"
commons.trigger_mode.manual
"
),
value
:
"
MANUAL
"
},
{
label
:
i18n
.
t
(
"
commons.trigger_mode.schedule
"
),
value
:
"
SCHEDULE
"
},
{
label
:
i18n
.
t
(
"
commons.trigger_mode.api
"
),
value
:
"
API
"
}
],
props
:
{
multiple
:
true
}
}
export
const
TEST_CONFIGS
=
[
NAME
,
UPDATE_TIME
,
PROJECT_NAME
,
CREATE_TIME
,
STATUS
,
CREATOR
]
export
const
REPORT_CONFIGS
=
[
NAME
,
TEST_NAME
,
PROJECT_NAME
,
CREATE_TIME
,
STATUS
,
CREATOR
,
TRIGGER_MODE
]
frontend/src/business/components/common/tableItem/ReportTriggerModeItem.vue
浏览文件 @
98eeb7bc
<
template
>
<span>
<span
v-if=
"triggerMode ==
'MANUAL'"
>
手动
</span>
<span
v-if=
"triggerMode ==
'SCHEDULE'"
>
定时任务
</span>
<span
v-if=
"triggerMode ==
'API'"
>
API
</span>
<span
v-if=
"triggerMode ==
= 'MANUAL'"
>
{{
$t
(
'
commons.trigger_mode.manual
'
)
}}
</span>
<span
v-if=
"triggerMode ==
= 'SCHEDULE'"
>
{{
$t
(
'
commons.trigger_mode.schedule
'
)
}}
</span>
<span
v-if=
"triggerMode ==
= 'API'"
>
{{
$t
(
'
commons.trigger_mode.api
'
)
}}
</span>
</span>
</
template
>
...
...
frontend/src/i18n/en-US.js
浏览文件 @
98eeb7bc
此差异已折叠。
点击以展开。
frontend/src/i18n/zh-CN.js
浏览文件 @
98eeb7bc
此差异已折叠。
点击以展开。
frontend/src/i18n/zh-TW.js
浏览文件 @
98eeb7bc
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录