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

fix(项目设置): 修复环境相关问题 

--bug=1025127 --user=王孝刚 【项目设置】项目环境-创建环境页面显示错误
https://www.tapd.cn/55049933/s/1359460
This commit is contained in:
wxg0103 2023-04-04 17:19:02 +08:00 committed by fit2-zhao
parent 8047f12387
commit 7212bf4b8c
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api-test/frontend/src/business/automation/scenario/variable/VariableList.vue
View File

@ -148,7 +148,7 @@
{{ $t('commons.confirm') }} {{ $t('commons.confirm') }}
</el-button> </el-button>
<el-button size="small" style="margin-left: 10px" @click="cancelVariable" <el-button size="small" style="margin-left: 10px" @click="cancelVariable"
>{{ $t('commons.cancel') }} >{{ $t('commons.cancel') }}
</el-button> </el-button>
<el-button v-if="showDelete" size="small" style="margin-left: 10px" @click="deleteVariable"> <el-button v-if="showDelete" size="small" style="margin-left: 10px" @click="deleteVariable">
{{ $t('commons.delete') }} {{ $t('commons.delete') }}
@ -167,7 +167,7 @@
placement="top-start" placement="top-start"
slot="label"> slot="label">
<span <span
>{{ $t('api_test.request.headers') }} >{{ $t('api_test.request.headers') }}
<div class="el-step__icon is-text ms-api-col ms-header" v-if="headers.length > 1"> <div class="el-step__icon is-text ms-api-col ms-header" v-if="headers.length > 1">
<div class="el-step__icon-inner"> <div class="el-step__icon-inner">
{{ headers.length - 1 }} {{ headers.length - 1 }}
@ -468,10 +468,10 @@ export default {
if (messages !== '') { if (messages !== '') {
this.$alert( this.$alert(
this.$t('api_test.scenario.variables') + this.$t('api_test.scenario.variables') +
'【' + '【' +
messages.substr(0, messages.length - 1) + messages.substr(0, messages.length - 1) +
'】' + '】' +
this.$t('load_test.param_is_duplicate') this.$t('load_test.param_is_duplicate')
); );
} }
}); });
@ -485,6 +485,7 @@ export default {
this.variables.forEach((item) => { this.variables.forEach((item) => {
item.hidden = undefined; item.hidden = undefined;
if (item.name && item.name != '') { if (item.name && item.name != '') {
item.showMore = false;
saveVariables.push(item); saveVariables.push(item);
} }
}); });

1
framework/sdk-parent/frontend/src/components/MsDialogHeader.vue
View File

@ -85,6 +85,7 @@ export default {
this.icon= ['fa', 'expand-alt']; this.icon= ['fa', 'expand-alt'];
} }
this.$emit("update:isFullScreen",bool); this.$emit("update:isFullScreen",bool);
this.$emit("fullScreen");
}, },
}, },
}; };

2
framework/sdk-parent/frontend/src/components/environment/commons/ApiScenarioVariables.vue
View File

@ -90,7 +90,7 @@
v-if="!scope.row.scope || scope.row.scope == 'api'" v-if="!scope.row.scope || scope.row.scope == 'api'"
:placeholder="$t('commons.please_select')" :placeholder="$t('commons.please_select')"
size="mini" size="mini"
@change="changeType(scope.row)"> @change="changeType(scope.row)">
<el-option v-for="item in typeSelectOptions" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in typeSelectOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>

4
framework/sdk-parent/frontend/src/components/environment/commons/variable/VariableImport.vue
View File

@ -1,10 +1,10 @@
<template> <template>
<el-dialog :visible="dialogVisible" :title="dialogTitle" <el-dialog :visible="dialogVisible" :title="dialogTitle"
@close="close" :close-on-click-modal="false" append-to-body @close="close" :close-on-click-modal="false" append-to-body
width="35%"> width="550px">
<el-form :rules="rules" label-width="80px" v-model="modeId"> <el-form :rules="rules" label-width="80px" v-model="modeId">
<el-form-item prop="modeId" :label="$t('commons.import_mode')"> <el-form-item prop="modeId" :label="$t('commons.import_mode')">
<el-select size="small" v-model="modeId"> <el-select size="small" v-model="modeId" style="width: 360px">
<el-option v-for="item in modeOptions" :key="item.id" :label="item.name" :value="item.id"/> <el-option v-for="item in modeOptions" :key="item.id" :label="item.name" :value="item.id"/>
</el-select> </el-select>
</el-form-item> </el-form-item>