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

fix(系统设置): 环境组中的环境预览，显示的跟环境域名里不一样 

--bug=1010325 --user=lyh 【系统设置】环境组中的环境预览，显示的跟环境域名里不一样
https://www.tapd.cn/55049933/s/1105786
This commit is contained in:
shiziyuan9527 2022-02-18 15:23:54 +08:00 committed by shiziyuan9527
parent e1919e8938
commit 90f4bed539
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/business/components/project/menu/EnvironmentList.vue
View File

@ -367,8 +367,8 @@ export default {
return "SHOW_INFO";
}
let obj = config.httpConfig.conditions[0];
if (obj.protocol && obj.domain) {
return obj.protocol + "://" + obj.domain;
if (obj.protocol && obj.socket) {
return obj.protocol + "://" + obj.socket;
}
} else if (config.httpConfig.conditions.length > 1) {
return "SHOW_INFO";

8
frontend/src/business/components/settings/workspace/environment/EnvironmentGroupRow.vue
View File

@ -207,8 +207,8 @@ export default {
return;
}
let obj = config.httpConfig.conditions[0];
if (obj.protocol && obj.domain) {
this.$set(item, "domainName", obj.protocol + "://" + obj.domain);
if (obj.protocol && obj.socket) {
this.$set(item, "domainName", obj.protocol + "://" + obj.socket);
this.$set(item, "domainDescription", obj.description ? obj.description : "");
return;
}
@ -302,8 +302,8 @@ export default {
return;
}
let obj = config.httpConfig.conditions[0];
if (obj.protocol && obj.domain) {
this.$set(item, "domainName", obj.protocol + "://" + obj.domain);
if (obj.protocol && obj.socket) {
this.$set(item, "domainName", obj.protocol + "://" + obj.socket);
this.$set(item, "domainDescription", obj.description ? obj.description : "");
}
} else if (config.httpConfig.conditions.length > 1) {

4
frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
View File

@ -413,8 +413,8 @@ export default {
return "SHOW_INFO";
}
let obj = config.httpConfig.conditions[0];
if (obj.protocol && obj.domain) {
return obj.protocol + "://" + obj.domain;
if (obj.protocol && obj.socket) {
return obj.protocol + "://" + obj.socket;
}
} else if (config.httpConfig.conditions.length > 1) {
return "SHOW_INFO";