From 983faa8168aeedeb2ae1ab019db8a1e880b41bfa Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 28 Aug 2023 16:24:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E5=9C=BA=E6=99=AF=E8=A2=AB=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=90=8E=E5=AD=90=E6=AD=A5=E9=AA=A4=E7=A6=81=E7=94=A8=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1029088 --user=赵勇 【接口测试】场景详情-引用原场景被删除-单步骤调试引用场景下子步骤-一直测试中-无法停止 https://www.tapd.cn/55049933/s/1408973

Signed-off-by: fit2-zhao <yong.zhao@fit2cloud.com>
---
 .../scenario/component/ApiComponent.vue       |  2 +-
 .../component/ApiScenarioComponent.vue        | 19 +++++++---
 .../scenario/component/LoopController.vue     | 38 +++++++++----------
 .../scenario/component/PluginComponent.vue    |  2 +-
 4 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/api-test/frontend/src/business/automation/scenario/component/ApiComponent.vue b/api-test/frontend/src/business/automation/scenario/component/ApiComponent.vue
index e867b78113..462241e24e 100644
--- a/api-test/frontend/src/business/automation/scenario/component/ApiComponent.vue
+++ b/api-test/frontend/src/business/automation/scenario/component/ApiComponent.vue
@@ -89,7 +89,7 @@
       <template v-slot:button v-if="!ifFromVariableAdvance">
         <el-tooltip :content="$t('api_test.run')" placement="top" v-if="!request.testing">
           <el-button
-            :disabled="!request.enable"
+            :disabled="!request.enable || request.deleted"
             @click="run"
             icon="el-icon-video-play"
             class="ms-btn"
diff --git a/api-test/frontend/src/business/automation/scenario/component/ApiScenarioComponent.vue b/api-test/frontend/src/business/automation/scenario/component/ApiScenarioComponent.vue
index 530c586380..3b3d0785ad 100644
--- a/api-test/frontend/src/business/automation/scenario/component/ApiScenarioComponent.vue
+++ b/api-test/frontend/src/business/automation/scenario/component/ApiScenarioComponent.vue
@@ -75,7 +75,7 @@
     <template v-slot:button v-if="!ifFromVariableAdvance">
       <el-tooltip :content="$t('api_test.run')" placement="top" v-if="!scenario.run">
         <el-button
-          :disabled="!scenario.enable"
+          :disabled="stepDisabled()"
           @click="run"
           icon="el-icon-video-play"
           style="padding: 5px"
@@ -160,11 +160,13 @@ export default {
     },
   },
   created() {
-    this.isShowNum = this.scenario.num ? true : false;
-    if (this.scenario.id && this.scenario.referenced === 'REF' && !this.scenario.loaded && this.scenario.hashTree) {
+    this.isShowNum = !!this.scenario.num;
+    if (
+      (this.scenario.id && this.scenario.referenced === 'REF' && !this.scenario.loaded && this.scenario.hashTree) ||
+      this.refStepDeleted
+    ) {
       this.scenario.disabled = true;
-      this.scenario.showExtend =
-        this.node.parent && this.node.parent.data && this.node.parent.data.disabled ? false : true;
+      this.scenario.showExtend = !(this.node.parent && this.node.parent.data && this.node.parent.data.disabled);
       this.recursiveEnable(this.scenario.hashTree);
     }
     if (this.scenario.id && this.scenario.referenced === 'Copy' && !this.scenario.isCopy && !this.scenario.disabled) {
@@ -191,8 +193,14 @@ export default {
     isDeletedOrRef() {
       return (this.scenario.referenced && this.scenario.referenced === 'Deleted') || this.scenario.referenced === 'REF';
     },
+    refStepDeleted() {
+      return this.scenario.referenced === 'REF' && !this.isShowNum;
+    },
   },
   methods: {
+    stepDisabled() {
+      return !this.scenario.enable || this.refStepDeleted || this.scenario.deleted === 'Deleted';
+    },
     run() {
       if (!this.scenario.enable) {
         this.$warning(this.$t('api_test.automation.debug_message'));
@@ -283,6 +291,7 @@ export default {
       for (let i in arr) {
         arr[i].disabled = true;
         arr[i].caseEnable = true;
+        arr[i].deleted = this.refStepDeleted;
         if (arr[i].hashTree && arr[i].hashTree.length > 0) {
           this.recursiveEnable(arr[i].hashTree);
         }
diff --git a/api-test/frontend/src/business/automation/scenario/component/LoopController.vue b/api-test/frontend/src/business/automation/scenario/component/LoopController.vue
index 6294ba94b8..891e08190a 100644
--- a/api-test/frontend/src/business/automation/scenario/component/LoopController.vue
+++ b/api-test/frontend/src/business/automation/scenario/component/LoopController.vue
@@ -63,7 +63,7 @@
 
       <template v-slot:button>
         <el-button
-          :disabled="!controller.enable"
+          :disabled="!controller.enable || controller.deleted"
           :tip="$t('api_test.run')"
           @click="conn"
           icon="el-icon-video-play"
@@ -75,7 +75,7 @@
         <el-row>
           <el-col :span="9">
             <span class="ms-span ms-radio">{{ $t('loop.loops') }}</span>
-            <el-input size="small" v-model="controller.countController.loops" style="width: auto"/>
+            <el-input size="small" v-model="controller.countController.loops" style="width: auto" />
             <span class="ms-span ms-radio">次</span>
           </el-col>
           <el-col :span="9">
@@ -91,13 +91,13 @@
             <span class="ms-span ms-radio">ms</span>
           </el-col>
           <el-col :span="6">
-              <el-switch
-                :inactive-text="$t('loop.proceed')"
-                :disabled="controller.disabled"
-                v-model="controller.countController.proceed"
-                class="ms-span ms-radio"
-                style="margin-top: 6px"
-                @change="switchChange" />
+            <el-switch
+              :inactive-text="$t('loop.proceed')"
+              :disabled="controller.disabled"
+              v-model="controller.countController.proceed"
+              class="ms-span ms-radio"
+              style="margin-top: 6px"
+              @change="switchChange" />
           </el-col>
         </el-row>
       </div>
@@ -177,17 +177,13 @@
         <span
           class="ms-step-debug-code"
           :class="'ms-req-error-report'"
-          v-if="
-            !loading && !node.data.testing && node.data.debug &&
-            node.data.code === 'FAKE_ERROR'
-          ">
+          v-if="!loading && !node.data.testing && node.data.debug && node.data.code === 'FAKE_ERROR'">
           FakeError
         </span>
         <span
           class="ms-step-debug-code"
           :class="node.data.code && node.data.code.toUpperCase() === 'ERROR' ? 'ms-req-error' : 'ms-req-success'"
-          v-if="!loading && !node.data.testing && node.data.debug &&
-                  node.data.code !== 'FAKE_ERROR'">
+          v-if="!loading && !node.data.testing && node.data.debug && node.data.code !== 'FAKE_ERROR'">
           {{ getCode() }}
         </span>
       </template>
@@ -345,12 +341,14 @@ export default {
         if (!this.node.data.code) {
           this.node.data.code = 'SUCCESS';
         }
-        if (this.node.data.code ==='SUCCESS' && data.status && data.status === 'SUCCESS') {
+        if (this.node.data.code === 'SUCCESS' && data.status && data.status === 'SUCCESS') {
           this.node.data.code = 'SUCCESS';
         }
-        if ((this.node.data.code ==='SUCCESS' ||
-            this.node.data.code === 'FAKE_ERROR') &&
-          data.status && data.status === 'FAKE_ERROR') {
+        if (
+          (this.node.data.code === 'SUCCESS' || this.node.data.code === 'FAKE_ERROR') &&
+          data.status &&
+          data.status === 'FAKE_ERROR'
+        ) {
           this.node.data.code = 'FAKE_ERROR';
         }
         if (data.status && data.status === 'ERROR') {
@@ -513,7 +511,7 @@ export default {
   font-size: 13px;
   font-weight: normal;
 }
-:deep(.el-switch__label *){
+:deep(.el-switch__label *) {
   color: #606266;
   font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', Arial, sans-serif;
   font-size: 13px;
diff --git a/api-test/frontend/src/business/automation/scenario/component/PluginComponent.vue b/api-test/frontend/src/business/automation/scenario/component/PluginComponent.vue
index b217fc5c5c..ea5659d770 100644
--- a/api-test/frontend/src/business/automation/scenario/component/PluginComponent.vue
+++ b/api-test/frontend/src/business/automation/scenario/component/PluginComponent.vue
@@ -105,7 +105,7 @@
       <template v-slot:button v-if="allSampler.indexOf(request.type) !== -1">
         <el-tooltip :content="$t('api_test.run')" placement="top" v-if="!loading">
           <el-button
-            :disabled="!request.enable"
+            :disabled="!request.enable || request.deleted"
             @click="run"
             icon="el-icon-video-play"
             style="padding: 5px"