From f1dcd2191afd407de6dadf55ad32731f9a9aa33b Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Wed, 23 Dec 2020 10:57:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9D=A1=E4=BB=B6=E6=8E=A7=E5=88=B6=E5=99=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8E=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/scenario/controller/IfController.java | 43 -------------------
 .../request/condition/ConditionLabel.vue      |  4 +-
 .../api/test/model/ScenarioModel.js           |  8 ++--
 3 files changed, 6 insertions(+), 49 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/controller/IfController.java b/backend/src/main/java/io/metersphere/api/dto/scenario/controller/IfController.java
index 0e7a89e69a..93833257fa 100644
--- a/backend/src/main/java/io/metersphere/api/dto/scenario/controller/IfController.java
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/controller/IfController.java
@@ -1,7 +1,6 @@
 package io.metersphere.api.dto.scenario.controller;
 
 import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
 
 @Data
 public class IfController {
@@ -11,46 +10,4 @@ public class IfController {
     private String variable;
     private String operator;
     private String value;
-
-    public boolean isValid() {
-        if (StringUtils.contains(operator, "empty")) {
-            return StringUtils.isNotBlank(variable);
-        }
-        return StringUtils.isNotBlank(variable) && StringUtils.isNotBlank(operator) && StringUtils.isNotBlank(value);
-    }
-
-    public String getLabel() {
-        if (isValid()) {
-            String label = variable + " " + operator;
-            if (StringUtils.isNotBlank(value)) {
-                label += " " + this.value;
-            }
-            return label;
-        }
-        return "";
-    }
-
-    public String getCondition() {
-        String variable = "\"" + this.variable + "\"";
-        String operator = this.operator;
-        String value = "\"" + this.value + "\"";
-
-        if (StringUtils.contains(operator, "~")) {
-            value = "\".*" + this.value + ".*\"";
-        }
-
-        if (StringUtils.equals(operator, "is empty")) {
-            variable = "empty(" + variable + ")";
-            operator = "";
-            value = "";
-        }
-
-        if (StringUtils.equals(operator, "is not empty")) {
-            variable = "!empty(" + variable + ")";
-            operator = "";
-            value = "";
-        }
-
-        return "${__jexl3(" + variable + operator + value + ")}";
-    }
 }
diff --git a/frontend/src/business/components/api/test/components/request/condition/ConditionLabel.vue b/frontend/src/business/components/api/test/components/request/condition/ConditionLabel.vue
index f2a59f40e8..45308d905f 100644
--- a/frontend/src/business/components/api/test/components/request/condition/ConditionLabel.vue
+++ b/frontend/src/business/components/api/test/components/request/condition/ConditionLabel.vue
@@ -7,7 +7,7 @@
                  v-if="request.controller && request.controller.isValid()">
         <el-row type="flex" align="middle">
           <font-awesome-icon :icon="['fas', 'random']"/>
-          <div class="condition-label">{{ request.controller.label() }}</div>
+          <div class="condition-label">{{ request.controller.getLabel() }}</div>
         </el-row>
       </el-button>
     </div>
@@ -19,7 +19,7 @@
                  v-if="request.timer && request.timer.isValid()">
         <el-row type="flex" align="middle">
           <font-awesome-icon :icon="['fas', 'clock']"/>
-          <div class="condition-label">{{ request.timer && request.timer.label() }}</div>
+          <div class="condition-label">{{ request.timer && request.timer.getLabel() }}</div>
         </el-row>
       </el-button>
     </div>
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index 031a84759d..0ff4466cb3 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -962,7 +962,7 @@ export class IfController extends Controller {
     return !!this.variable && !!this.operator && !!this.value;
   }
 
-  label() {
+  getLabel() {
     if (this.isValid()) {
       let label = this.variable;
       if (this.operator) label += " " + this.operator;
@@ -998,7 +998,7 @@ export class ConstantTimer extends Timer {
     return this.delay > 0;
   }
 
-  label() {
+  getLabel() {
     if (this.isValid()) {
       return this.delay + " ms";
     }
@@ -1362,14 +1362,14 @@ class JMXGenerator {
 
   addConstantsTimer(sampler, request) {
     if (request.timer && request.timer.isValid() && request.timer.enable) {
-      sampler.put(new JMXConstantTimer(request.timer.label(), request.timer));
+      sampler.put(new JMXConstantTimer(request.timer.getLabel(), request.timer));
     }
   }
 
   getController(sampler, request) {
     if (request.controller.isValid() && request.controller.enable) {
       if (request.controller instanceof IfController) {
-        let name = request.controller.label();
+        let name = request.controller.getLabel();
         let variable = "\"" + request.controller.variable + "\"";
         let operator = request.controller.operator;
         let value = "\"" + request.controller.value + "\"";