From 6ab16db89140b5ccac9ee5bbfe83a2cd916c4e71 Mon Sep 17 00:00:00 2001 From: wxg0103 <727495428@qq.com> Date: Thu, 20 Oct 2022 16:31:38 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8E=AF=E5=A2=83=E7=BC=96=E8=BE=91=E7=BC=BA?= =?UTF-8?q?=E5=B0=91=E5=85=A8=E5=B1=8F=E6=8C=89=E9=92=AE=E7=9A=84=E7=BC=BA?= =?UTF-8?q?=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1018538 --user=王孝刚 【项目设置】项目设置-项目环境-配置环境缺少全屏展示按钮 https://www.tapd.cn/55049933/s/1269812 --- .../frontend/src/components/MsDialogHeader.vue | 15 +++++++++++++++ .../business/menu/environment/EnvironmentList.vue | 15 ++++++++++----- .../workspace/environment/EnvironmentList.vue | 14 +++++++++----- 3 files changed, 34 insertions(+), 10 deletions(-) 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;