diff --git a/framework/sdk-parent/frontend/src/components/MsDialogHeader.vue b/framework/sdk-parent/frontend/src/components/MsDialogHeader.vue index a623321c7d..51f2769567 100644 --- a/framework/sdk-parent/frontend/src/components/MsDialogHeader.vue +++ b/framework/sdk-parent/frontend/src/components/MsDialogHeader.vue @@ -3,6 +3,13 @@
{{ title }} +
+ + + +
+
@@ -39,6 +46,9 @@ export default { }, confirm() { this.$emit("confirm"); + }, + fullScreen() { + this.$emit("fullScreen"); } } } @@ -53,4 +63,9 @@ export default { .msDialogHeader { margin-bottom: 5px; } + +.alt-ico { + font-size: 13px; + color: #8c939d; +} diff --git a/project-management/frontend/src/business/menu/environment/EnvironmentList.vue b/project-management/frontend/src/business/menu/environment/EnvironmentList.vue index d040dd2afa..91eba967d2 100644 --- a/project-management/frontend/src/business/menu/environment/EnvironmentList.vue +++ b/project-management/frontend/src/business/menu/environment/EnvironmentList.vue @@ -59,11 +59,12 @@ - + - + @@ -139,7 +141,7 @@ import EnvironmentEdit from "metersphere-frontend/src/components/environment/Env import MsAsideItem from "metersphere-frontend/src/components/MsAsideItem"; import MsAsideContainer from "metersphere-frontend/src/components/MsAsideContainer"; import ProjectSwitch from "metersphere-frontend/src/components/head/ProjectSwitch"; -import {downloadFile} from "metersphere-frontend/src/utils"; +import {downloadFile, operationConfirm} from "metersphere-frontend/src/utils"; import {getCurrentProjectID} from "metersphere-frontend/src/utils/token"; import EnvironmentImport from "./EnvironmentImport"; import MsMainContainer from "metersphere-frontend/src/components/MsMainContainer"; @@ -147,7 +149,6 @@ import MsContainer from "metersphere-frontend/src/components/MsContainer"; import MsDialogHeader from "metersphere-frontend/src/components/MsDialogHeader"; import {listAllProject} from "../../../api/project"; import {delEnvironmentById, getEnvironmentPages} from "../../../api/environment"; -import {operationConfirm} from "metersphere-frontend/src/utils"; export default { name: "EnvironmentList", @@ -191,6 +192,7 @@ export default { projectFilters: [], screenHeight: 'calc(100vh - 155px)', ifCreate: false, //是否是创建环境 + isFullScreen: false //是否全屏 } }, created() { @@ -201,6 +203,9 @@ export default { }, methods: { + fullScreen() { + this.isFullScreen = !this.isFullScreen; + }, showInfo(row) { const config = JSON.parse(row.config); this.conditions = config.httpConfig.conditions; diff --git a/system-setting/frontend/src/business/workspace/environment/EnvironmentList.vue b/system-setting/frontend/src/business/workspace/environment/EnvironmentList.vue index c0e261c0ed..900f0ee7d4 100644 --- a/system-setting/frontend/src/business/workspace/environment/EnvironmentList.vue +++ b/system-setting/frontend/src/business/workspace/environment/EnvironmentList.vue @@ -64,11 +64,12 @@ - + 1) { + } else if (config.httpConfig && config.httpConfig.conditions.length > 1) { return "SHOW_INFO"; } else if (config.tcpConfig && config.tcpConfig.server) { return config.tcpConfig.server;