From e2221d3d0ee837046ff0e6e0a004b4b21c8ebe89 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Wed, 8 Jun 2022 18:36:59 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=BC=95=E7=94=A8=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E8=A2=AB=E5=88=A0=E9=99=A4=EF=BC=8C=E8=BF=98=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=9A=84=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1013861 --user=王孝刚 【接口自动化】A场景引用了B场景，删除B场景，引用的场景B还可以执行
https://www.tapd.cn/55049933/s/1176826
---
 backend/pom.xml                               |  2 +-
 .../scenario/common/ApiBaseComponent.vue      | 24 ++++++++++++-------
 .../scenario/component/ApiComponent.vue       |  8 ++++---
 .../component/ApiScenarioComponent.vue        |  1 +
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index ff3b739f1a..5d15b5f723 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -159,7 +159,7 @@
         <dependency>
             <groupId>io.metersphere</groupId>
             <artifactId>ms-jmeter-core</artifactId>
-            <version>1.1.9</version>
+            <version>1.2.0</version>
             <exclusions>
                 <exclusion>
                     <artifactId>netty</artifactId>
diff --git a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
index 6bd6040f83..1ff3c4d81c 100644
--- a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
@@ -39,15 +39,17 @@
         <slot name="button" v-if="showVersion"></slot>
 
         <el-tooltip :content="$t('test_resource_pool.enable_disable')" placement="top" v-if="showBtn">
-          <el-switch v-model="data.enable" class="enable-switch" size="mini" :disabled="(data.disabled && !data.root) || !showVersion"/>
+          <el-switch v-model="data.enable" class="enable-switch" size="mini"
+                     :disabled="(data.disabled && !data.root) || !showVersion || isDeleted"/>
         </el-tooltip>
 
         <el-button v-if="showVersion && showCopy" size="mini" icon="el-icon-copy-document" circle @click="copyRow"
                    style="padding: 5px"
-                   :disabled="(data.disabled && !data.root) || !showVersion "/>
+                   :disabled="(data.disabled && !data.root) || !showVersion || isDeleted"/>
 
-        <el-button v-show="isSingleButton" size="mini" icon="el-icon-delete" type="danger" style="padding: 5px" circle @click="remove"
-                   :disabled="(data.disabled && !data.root) || !showVersion "/>
+        <el-button v-show="isSingleButton" size="mini" icon="el-icon-delete" type="danger" style="padding: 5px" circle
+                   @click="remove"
+                   :disabled="(data.disabled && !data.root) || !showVersion || isDeleted"/>
 
         <step-extend-btns style="display: contents"
                           :data="data"
@@ -154,14 +156,18 @@ export default {
     environmentType: String,
     environmentGroupId: String,
     envMap: Map,
-    showEnable : {
+    showEnable: {
       type: Boolean,
-      default : true
+      default: true
     },
-    showCopy : {
+    showCopy: {
       type: Boolean,
-      default : true
+      default: true
     },
+    isDeleted: {
+      type: Boolean,
+      default: false
+    }
   },
   watch: {
     '$store.state.selectStep': function () {
@@ -198,7 +204,7 @@ export default {
       if (this.data.type === 'ConstantTimer' || this.data.type === 'Assertions') {
         return (!this.innerStep || this.showBtn && (!this.data.disabled || this.data.root) && this.showVersion && this.stepFilter.get('ALlSamplerStep').indexOf(this.data.type) === -1);
       }
-      return (this.showBtn && (!this.data.disabled || this.data.root) && this.showVersion && this.stepFilter.get('ALlSamplerStep').indexOf(this.data.type) === -1);
+      return (this.showBtn && (!this.data.disabled || this.data.root || this.isDeleted) && this.showVersion && this.stepFilter.get('ALlSamplerStep').indexOf(this.data.type) === -1);
     },
   },
   methods: {
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index 082c9301e3..034bbaa158 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -6,6 +6,7 @@
       @active="active"
       :is-show-name-input="!isDeletedOrRef"
       :data="request"
+      :is-deleted="request.referenced==='REF' && !isShowNum"
       :draggable="draggable"
       :color="displayColor.color"
       :background-color="displayColor.backgroundColor"
@@ -256,12 +257,13 @@ export default {
     if (this.request.hashTree) {
       this.setOwnEnvironment(this.request.hashTree);
     }
+    if (this.request.id && this.request.referenced === 'REF') {
+      this.request.disabled = true;
+    }
     if (this.request.num) {
       this.isShowNum = true;
       this.request.root = true;
-      if (this.request.id && this.request.referenced === 'REF') {
-        this.request.disabled = true;
-      }
+
     } else {
       this.isShowNum = false;
     }
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
index b894b0d66c..add3e4f4c1 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
@@ -11,6 +11,7 @@
     :is-disabled="true"
     :is-max="isMax"
     :show-btn="showBtn"
+    :is-deleted="scenario.referenced==='REF' && ! isShowNum"
     :show-version="showVersion"
     color="#606266"
     background-color="#F4F4F5"