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

Merge branch 'main' of https://github.com/metersphere/metersphere

This commit is contained in:
liqiang-fit2cloud 2022-12-14 11:23:51 +08:00
parent 71a5b00a20 fb33703695
commit dabb338d92
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-test/frontend/src/business/automation/report/ApiReportList.vue
View File

@ -326,7 +326,7 @@ export default {
let selectDataType = 'all';
let routeParamObj = this.$route.params;
let redirectVersionId = this.$route.params.versionId;
if (redirectVersionId !== 'default') {
if (redirectVersionId && redirectVersionId !== 'default') {
this.condition.versionId = redirectVersionId;
}
if (routeParamObj) {

2
api-test/frontend/src/business/automation/scenario/ApiScenarioList.vue
View File

@ -1325,7 +1325,7 @@ export default {
this.selectDataType = 'all';
let routeParamObj = this.$route.params;
let redirectVersionId = this.$route.params.versionId;
if (redirectVersionId !== 'default') {
if (redirectVersionId && redirectVersionId !== 'default') {
this.condition.versionId = redirectVersionId;
}
if (routeParamObj) {

2
api-test/frontend/src/business/definition/components/list/ApiCaseSimpleList.vue
View File

@ -1280,7 +1280,7 @@ export default {
let routeParam = this.$route.params.dataSelectRange;
let dataType = this.$route.params.dataType;
let redirectVersionId = this.$route.params.versionId;
if (redirectVersionId !== 'default') {
if (redirectVersionId && redirectVersionId !== 'default') {
this.condition.versionId = redirectVersionId;
}
if (dataType === 'apiTestCase') {

3
api-test/frontend/src/business/definition/components/list/ApiList.vue
View File

@ -1047,7 +1047,6 @@ export default {
});
}
},
getColor(enable, method) {
if (enable) {
return this.methodColorMap.get(method);
@ -1061,7 +1060,7 @@ export default {
let dataRange = this.$route.params.dataSelectRange;
let dataType = this.$route.params.dataType;
let redirectVersionId = this.$route.params.versionId;
if (redirectVersionId !== 'default') {
if (redirectVersionId && redirectVersionId !== 'default') {
this.condition.versionId = redirectVersionId;
}
this.selectDataRange = dataType === 'api' ? dataRange : 'all';

2
system-setting/frontend/src/business/system/SystemWorkspace.vue
View File

@ -68,7 +68,7 @@
width="30%" @close="close" v-loading="workspaceUpdateLoading">
<el-form :model="form" :rules="rules" ref="updateForm" label-position="right" label-width="100px" size="small">
<el-form-item :label="$t('commons.name')" prop="name">
<el-input v-model="form.name" autocomplete="off" class="form-input"/>
<el-input v-model="form.name" autocomplete="off" class="form-input" show-word-limit maxlength="100"/>
</el-form-item>
<el-form-item :label="$t('commons.description')" prop="description">
<el-input type="textarea" v-model="form.description" class="form-input"></el-input>