From 40c03b0a992ea2664bee84d1a37ba45deb43c7ce Mon Sep 17 00:00:00 2001
From: wenyann <wenyan.yang@fit2cloud.com>
Date: Thu, 17 Jun 2021 16:41:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E3=80=90=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96=E3=80=91=E5=85=A8=E5=B1=8F=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E2=80=9C=E5=A4=B1=E8=B4=A5=E7=BB=A7=E7=BB=AD=E2=80=9D=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/EditApiScenario.vue   | 13 ++++++++--
 .../scenario/maximize/ScenarioHeader.vue      | 24 +++++++++++++------
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 1e14b025b1..b5f4e05cf4 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -237,8 +237,14 @@
       <!--步骤最大化-->
       <ms-drawer :visible="drawer" :size="100" @close="close" direction="default" :show-full-screen="false" :is-show-close="false" style="overflow: hidden">
         <template v-slot:header>
-          <scenario-header :currentScenario="currentScenario" :projectEnvMap="projectEnvMap" :projectIds.sync="projectIds" :projectList="projectList" :scenarioDefinition="scenarioDefinition" :enableCookieShare="enableCookieShare"
-                           :isFullUrl.sync="isFullUrl" @closePage="close" @unFullScreen="unFullScreen" @showAllBtn="showAllBtn" @runDebug="runDebug" @setProjectEnvMap="setProjectEnvMap" @showScenarioParameters="showScenarioParameters" @setCookieShare="setCookieShare"
+          <scenario-header :currentScenario="currentScenario" :projectEnvMap="projectEnvMap"
+                           :projectIds.sync="projectIds" :projectList="projectList"
+                           :scenarioDefinition="scenarioDefinition" :enableCookieShare="enableCookieShare"
+                           :onSampleError="onSampleError"
+                           :isFullUrl.sync="isFullUrl" @closePage="close" @unFullScreen="unFullScreen"
+                           @showAllBtn="showAllBtn" @runDebug="runDebug" @setProjectEnvMap="setProjectEnvMap"
+                           @showScenarioParameters="showScenarioParameters"
+                           @setCookieShare="setCookieShare" @setSampleError="setSampleError"
                            ref="maximizeHeader"/>
         </template>
 
@@ -539,6 +545,9 @@ export default {
     setCookieShare(cookie) {
       this.enableCookieShare = cookie;
     },
+    setSampleError(sampleError) {
+      this.onSampleError = sampleError;
+    },
     showAllBtn() {
       this.$refs.maximizeScenario.showAll();
     },
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue b/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
index 91229fe25c..7734c6a8bc 100644
--- a/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
+++ b/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
@@ -18,12 +18,16 @@
       </el-row>
     </div>
     <div class="ms-header-right">
-      <el-checkbox v-model="cookieShare" @change="setCookieShare" style="margin-right: 20px">共享cookie</el-checkbox>
+      <el-checkbox v-model="cookieShare" @change="setCookieShare">共享cookie</el-checkbox>
+      <el-checkbox v-model="sampleError" @change="setOnSampleError" style="margin-right: 10px">失败继续</el-checkbox>
+      <env-popover :disabled="scenarioDefinition.length < 1" :isReadOnly="scenarioDefinition.length < 1"
+                   :env-map="envMap" :project-ids="projectIds" @setProjectEnvMap="setProjectEnvMap"
+                   @showPopover="showPopover" :project-list="projectList" ref="envPopover" class="ms-right"
+                   :result="envResult"/>
 
-      <env-popover :disabled="scenarioDefinition.length < 1" :isReadOnly="scenarioDefinition.length < 1" :env-map="envMap" :project-ids="projectIds" @setProjectEnvMap="setProjectEnvMap"
-                   @showPopover="showPopover" :project-list="projectList" ref="envPopover" class="ms-right" :result="envResult"/>
-
-      <el-button :disabled="scenarioDefinition.length < 1" size="mini" type="primary" v-prevent-re-click @click="runDebug">{{$t('api_test.request.debug')}}</el-button>
+      <el-button :disabled="scenarioDefinition.length < 1" size="mini" type="primary" v-prevent-re-click
+                 @click="runDebug">{{ $t('api_test.request.debug') }}
+      </el-button>
 
       <font-awesome-icon class="ms-alt-ico" :icon="['fa', 'compress-alt']" size="lg" @click="unFullScreen"/>
       <!-- <i class="el-icon-close alt-ico-close" @click="close"/>-->
@@ -39,7 +43,8 @@ import html2canvas from 'html2canvas';
   export default {
     name: "ScenarioHeader",
     components: {EnvPopover},
-    props: {currentScenario: {}, scenarioDefinition: Array, enableCookieShare: Boolean,
+    props: {
+      currentScenario: {}, scenarioDefinition: Array, enableCookieShare: Boolean, onSampleError: Boolean,
       projectEnvMap: Map,
       projectIds: Set,
       projectList: Array,
@@ -51,6 +56,7 @@ import html2canvas from 'html2canvas';
         loading: false,
         varSize: 0,
         cookieShare: false,
+        sampleError: true,
         envResult: {
           loading: false
         }
@@ -65,6 +71,7 @@ import html2canvas from 'html2canvas';
       this.envMap = this.projectEnvMap;
       this.getVariableSize();
       this.cookieShare = this.enableCookieShare;
+      this.sampleError = this.onSampleError;
     },
     methods: {
       handleExport() {
@@ -94,6 +101,9 @@ import html2canvas from 'html2canvas';
       setCookieShare() {
         this.$emit('setCookieShare', this.cookieShare);
       },
+      setOnSampleError() {
+        this.$emit('setSampleError', this.sampleError);
+      },
       showScenarioParameters() {
         this.$emit('showScenarioParameters');
       },
@@ -159,7 +169,7 @@ import html2canvas from 'html2canvas';
 
   .ms-header-right {
     float: right;
-    width: 380px;
+    width: 500px;
     margin-top: 4px;
     z-index: 1;
   }