test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: 合并代码

This commit is contained in:
q4speed 2020-07-14 11:24:50 +08:00
parent bc74a0a95e
commit e052927cda
2 changed files with 48 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
frontend/src/business/components/common/components/search/MsTableAdvSearchBar.vue
View File

@ -80,6 +80,33 @@
}
</script>
<style>
@media only screen and (min-width: 1800px) {
.el-dialog.adv-dialog {
width: 70%;
}
}
@media only screen and (min-width: 1560px) and (max-width: 1799px) {
.el-dialog.adv-dialog {
width: 80%;
}
}
@media only screen and (min-width: 1400px) and (max-width: 1559px) {
.el-dialog.adv-dialog {
width: 90%;
}
}
@media only screen and (max-width: 1399px) {
.el-dialog.adv-dialog {
width: 70%;
min-width: 695px;
}
}
</style>
<style scoped>
.adv-search-bar {
margin-left: 5px;
@ -104,10 +131,20 @@
width: 100%;
}
@media only screen and (max-width: 1399px) {
.search-item {
width: 100%;
}
}
@media only screen and (min-width: 1400px) {
.search-item {
width: 50%;
}
}
.search-item {
display: inline-block;
width: 50%;
max-width: 50%;
margin-top: 10px;
}
</style>

18
frontend/src/business/components/common/components/search/search-components.js
View File

@ -163,7 +163,7 @@ export const TRIGGER_MODE = {
export const PRIORITY = {
key: "priority",
name: 'MsTableSearchSelect',
label: i18n.t("test_track.case.priority"),
label: "test_track.case.priority",
operator: {
options: [OPERATORS.IN, OPERATORS.NOT_IN]
},
@ -181,14 +181,14 @@ export const PRIORITY = {
export const TYPE = {
key: "type",
name: 'MsTableSearchSelect',
label: i18n.t("test_track.case.type"),
label: "test_track.case.type",
operator: {
options: [OPERATORS.IN, OPERATORS.NOT_IN]
},
options: [
{label: i18n.t('commons.functional'), value: 'functional'},
{label: i18n.t('commons.performance'), value: 'performance'},
{label: i18n.t('commons.api'), value: 'api'}
{label: 'commons.functional', value: 'functional'},
{label: 'commons.performance', value: 'performance'},
{label: 'commons.api', value: 'api'}
],
props: {
multiple: true
@ -198,13 +198,13 @@ export const TYPE = {
export const METHOD = {
key: "method",
name: 'MsTableSearchSelect',
label: i18n.t("test_track.case.method"),
label: "test_track.case.method",
operator: {
options: [OPERATORS.IN, OPERATORS.NOT_IN]
},
options: [
{label: i18n.t('test_track.case.manual'), value: 'manual'},
{label: i18n.t('test_track.case.auto'), value: 'auto'}
{label: 'test_track.case.manual', value: 'manual'},
{label: 'test_track.case.auto', value: 'auto'}
],
props: {
multiple: true
@ -214,7 +214,7 @@ export const METHOD = {
export const MODULE = {
key: "module",
name: 'MsTableSearchInput',
label: i18n.t("test_track.case.module"),
label: "test_track.case.module",
operator: {
value: OPERATORS.LIKE.value, // 如果未设置value初始值，则value初始值为options[0]
options: [OPERATORS.LIKE, OPERATORS.NOT_LIKE] // 运算符候选项