From 5d78d510912f35af965110462965339b770f47f8 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Tue, 30 Mar 2021 19:54:18 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96):=20=E6=A3=80=E6=9F=A5=E5=9C=BA=E6=99=AF=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4=E6=98=AF=E5=90=A6=E9=83=BD=E6=98=AF=E5=85=A8=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../automation/scenario/EditApiScenario.vue | 2 +- .../api/automation/scenario/EnvPopover.vue | 4 +- .../api/automation/scenario/EnvSelect.vue | 336 ++++++++++++------ 3 files changed, 233 insertions(+), 109 deletions(-) diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue index 09d3cdf8ce..48fc69aa8d 100644 --- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue +++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue @@ -767,7 +767,7 @@ }, runDebug() { /*触发执行操作*/ - let sign = this.$refs.envPopover.checkEnv(); + let sign = this.$refs.envPopover.checkEnv(this.scenarioDefinition); if (!sign) { return; } diff --git a/frontend/src/business/components/api/automation/scenario/EnvPopover.vue b/frontend/src/business/components/api/automation/scenario/EnvPopover.vue index bc7296c026..32580f3be9 100644 --- a/frontend/src/business/components/api/automation/scenario/EnvPopover.vue +++ b/frontend/src/business/components/api/automation/scenario/EnvPopover.vue @@ -44,8 +44,8 @@ export default { setProjectEnvMap(map) { this.$emit("setProjectEnvMap", map); }, - checkEnv() { - return this.$refs.envSelect.checkEnv(); + checkEnv(data) { + return this.$refs.envSelect.checkEnv(data); } } diff --git a/frontend/src/business/components/api/automation/scenario/EnvSelect.vue b/frontend/src/business/components/api/automation/scenario/EnvSelect.vue index 87c62495f0..eb202c6082 100644 --- a/frontend/src/business/components/api/automation/scenario/EnvSelect.vue +++ b/frontend/src/business/components/api/automation/scenario/EnvSelect.vue @@ -29,133 +29,257 @@