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

fix(环境管理): 修复环境条件切换显示问题

This commit is contained in:
fit2-zhao 2021-05-21 15:17:10 +08:00 committed by fit2-zhao
parent bfd47a0d95
commit 56393743aa
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue
View File

@ -46,7 +46,7 @@
</el-form-item> </el-form-item>
</div> </div>
<div class="ms-border"> <div class="ms-border">
<el-table :data="httpConfig.conditions" highlight-current-row @current-change="selectRow" v-if="!loading"> <el-table :data="httpConfig.conditions" highlight-current-row @current-change="selectRow">
<el-table-column prop="socket" :label="$t('load_test.domain')" show-overflow-tooltip width="180"> <el-table-column prop="socket" :label="$t('load_test.domain')" show-overflow-tooltip width="180">
<template v-slot:default="{row}"> <template v-slot:default="{row}">
{{getUrl(row)}} {{getUrl(row)}}
@ -203,6 +203,7 @@
} }
} }
this.beforeCondition = JSON.parse(JSON.stringify(this.condition)); this.beforeCondition = JSON.parse(JSON.stringify(this.condition));
this.reload();
}, },
typeChange() { typeChange() {
if (this.condition.type === "NONE" && this.condition.id && this.checkNode(this.condition.id)) { if (this.condition.type === "NONE" && this.condition.id && this.checkNode(this.condition.id)) {

11
frontend/src/business/components/common/select-tree/SelectTree.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div> <div v-loading="loading">
<div class="mask" v-show="isShowSelect"></div> <div class="mask" v-show="isShowSelect"></div>
<el-popover placement="bottom-start" :width="popoverWidth" trigger="manual" v-model="isShowSelect" @hide="popoverHide" v-outside-click="outsideClick"> <el-popover placement="bottom-start" :width="popoverWidth" trigger="manual" v-model="isShowSelect" @hide="popoverHide" v-outside-click="outsideClick">
<el-input <el-input
@ -145,6 +145,7 @@
returnDatas: [],//返回给父组件数组对象 returnDatas: [],//返回给父组件数组对象
returnDataKeys: [],//返回父组件数组主键值 returnDataKeys: [],//返回父组件数组主键值
filterText: "", filterText: "",
loading:false,
}; };
}, },
computed: { computed: {
@ -256,6 +257,7 @@
thisKeys.map((item) => {//设置option选项 thisKeys.map((item) => {//设置option选项
let node = this.$refs.tree.getNode(item); // 所有被选中的节点对应的node let node = this.$refs.tree.getNode(item); // 所有被选中的节点对应的node
t.push(node.data); t.push(node.data);
this.options.push({label: node.label, value: node.key});
return {label: node.label, value: node.key}; return {label: node.label, value: node.key};
}); });
this.returnDatas = t; this.returnDatas = t;
@ -338,7 +340,14 @@
} }
return false; return false;
}, },
reload() {
this.loading = true
this.$nextTick(() => {
this.loading = false
});
},
}, },
watch: { watch: {
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
isShowSelect(val) { isShowSelect(val) {