From 7e4c7303c498a4ad1bc5493d94a0a81c636bb222 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 26 Feb 2021 14:06:13 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E8=B0=83=E8=AF=95=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/definition/components/Run.vue   |  4 ++--
 frontend/src/common/js/utils.js                    | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/Run.vue b/frontend/src/business/components/api/definition/components/Run.vue
index d8d6d9ae85..a260e67618 100644
--- a/frontend/src/business/components/api/definition/components/Run.vue
+++ b/frontend/src/business/components/api/definition/components/Run.vue
@@ -2,7 +2,7 @@
   <span></span>
 </template>
 <script>
-import {getUUID, getBodyUploadFiles, getCurrentProjectID, strMapToObj} from "@/common/js/utils";
+  import {getUUID, getBodyUploadFiles, getCurrentProjectID, strMapToObj} from "@/common/js/utils";
   import ThreadGroup from "./jmeter/components/thread-group";
   import TestPlan from "./jmeter/components/test-plan";
 
@@ -74,7 +74,7 @@ import {getUUID, getBodyUploadFiles, getCurrentProjectID, strMapToObj} from "@/c
           // 场景步骤下接口调用
           projectId = this.runData.projectId;
         }
-        let reqObj = {id: this.reportId, testElement: testPlan, type: this.type,projectId:getCurrentProjectID(), environmentMap: strMapToObj(this.envMap)};
+        let reqObj = {id: this.reportId, testElement: testPlan, type: this.type, projectId: getCurrentProjectID(), environmentMap: strMapToObj(this.envMap)};
         let bodyFiles = getBodyUploadFiles(reqObj, this.runData);
         let url = "";
         if (this.debug) {
diff --git a/frontend/src/common/js/utils.js b/frontend/src/common/js/utils.js
index 4faaccda89..67a25feb32 100644
--- a/frontend/src/common/js/utils.js
+++ b/frontend/src/common/js/utils.js
@@ -319,6 +319,7 @@ export function _getBodyUploadFiles(request, bodyUploadFiles, obj) {
     }
   }
 }
+
 export function handleCtrlSEvent(event, func) {
   if (event.keyCode === 83 && event.ctrlKey) {
     // console.log('拦截到 ctrl + s');//ctrl+s
@@ -329,10 +330,13 @@ export function handleCtrlSEvent(event, func) {
   }
 }
 
-export function strMapToObj(strMap){
-  let obj= Object.create(null);
-  for (let[k,v] of strMap) {
-    obj[k] = v;
+export function strMapToObj(strMap) {
+  if (strMap) {
+    let obj = Object.create(null);
+    for (let [k, v] of strMap) {
+      obj[k] = v;
+    }
+    return obj;
   }
-  return obj;
+  return null;
 }

From 10861c56dfebf71acdd386ae249b2899c1f576ba Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 26 Feb 2021 14:19:23 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E6=A8=A1=E5=9D=97=E6=A0=91=EF=BC=8C=E6=A3=80=E7=B4=A2?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/business/components/track/common/NodeTree.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/track/common/NodeTree.vue b/frontend/src/business/components/track/common/NodeTree.vue
index 327deab4ab..c61b16f5d3 100644
--- a/frontend/src/business/components/track/common/NodeTree.vue
+++ b/frontend/src/business/components/track/common/NodeTree.vue
@@ -132,7 +132,7 @@ export default {
     filterNode(value, data) {
       if (!value) return true;
       if (data.label) {
-        return data.label.indexOf(value) !== -1;
+        return data.label.indexOf(value.toLowerCase()) !== -1;
       }
       return false;
     },

From ab56e2f7bedc693566dfc132ce439afdb25024fc Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 26 Feb 2021 17:15:08 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E6=96=AD=E8=A8=80=E8=84=9A=E6=9C=AC=E8=A7=84=E5=88=99=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20python=20=E6=8E=A8=E8=8D=90=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/Jsr233ProcessorContent.vue         |  1 +
 .../assertion/ApiAssertionJsr223.vue          | 68 ++++++++++++++++++-
 2 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue b/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue
index dd809d1d68..e00edd4aaa 100644
--- a/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue
@@ -124,6 +124,7 @@
         },
         languageChange(language) {
           this.jsr223ProcessorData.scriptLanguage = language;
+          this.$emit("languageChange");
         },
       }
     }
diff --git a/frontend/src/business/components/api/definition/components/assertion/ApiAssertionJsr223.vue b/frontend/src/business/components/api/definition/components/assertion/ApiAssertionJsr223.vue
index 26762a67b0..b1294b679d 100644
--- a/frontend/src/business/components/api/definition/components/assertion/ApiAssertionJsr223.vue
+++ b/frontend/src/business/components/api/definition/components/assertion/ApiAssertionJsr223.vue
@@ -44,7 +44,7 @@
       <el-input size="small" v-model="assertion.desc" :placeholder="$t('api_test.request.assertions.script_name')"
                 class="quick-script-block"/>
       <ms-jsr233-processor ref="jsr233" :is-read-only="isReadOnly" :jsr223-processor="assertion" :templates="templates"
-                           :height="300"/>
+                           :height="300" @languageChange="quickScript"/>
       <template v-slot:footer v-if="!edit">
         <ms-dialog-footer
           @cancel="close"
@@ -145,7 +145,7 @@
         }
         this.quickScript();
       },
-      quickScript() {
+      beanShellOrGroovyScript() {
         if (this.assertion.variable && this.assertion.operator) {
           let variable = this.assertion.variable;
           let operator = this.assertion.operator;
@@ -184,7 +184,7 @@
               script += "result = value != void && value.length() > 0;\n";
               break;
           }
-          let msg = "assertion [" + desc + "]: false;"
+          let msg = (operator != "is empty" && operator != "is not empty") ? "assertion [" + desc + "]: false;" : "value " + operator
           script += "if (!result){\n" +
             "\tmsg = \"" + msg + "\";\n" +
             "\tAssertionResult.setFailureMessage(msg);\n" +
@@ -197,6 +197,68 @@
         }
 
       },
+      pythonScript() {
+        if (this.assertion.variable && this.assertion.operator) {
+          let variable = this.assertion.variable;
+          let operator = this.assertion.operator;
+          let value = this.assertion.value || "";
+          let desc = "${" + variable + "} " + operator + " '" + value + "'";
+          let msg = "";
+          let script = "value = vars.get(\"" + variable + "\");\n"
+          switch (this.assertion.operator) {
+            case "==":
+              script += "if value != \"" + value + "\" :\n";
+              break;
+            case "!=":
+              script += "if value == \"" + value + "\" :\n";
+              break;
+            case "contains":
+              script += "if value.find(\"" + value + "\") != -1:\n";
+              msg = "value " + operator + " " + value + ": false;";
+              break;
+            case "not contains":
+              script += "if value.find(\"" + value + "\") == -1:\n";
+              msg = "value " + operator + " " + ": false;";
+              break;
+            case ">":
+              desc = "${" + variable + "} " + operator + " " + value;
+              script += "if value is None or int(value) < " + value + ":\n";
+              msg = "value " + operator + " " + value + ": false;";
+              break;
+            case "<":
+              desc = "${" + variable + "} " + operator + " " + value;
+              script += "if value is None or int(value) > " + value + ":\n";
+              msg = "value " + operator + " " + value + ": false;";
+              break;
+            case "is empty":
+              desc = "${" + variable + "} " + operator
+              script += "if value is not None:\n";
+              msg = "value " + operator + ": false;";
+              break;
+            case "is not empty":
+              desc = "${" + variable + "} " + operator
+              script += "if value is None:\n";
+              msg = "value " + operator + ": false;";
+              break;
+          }
+          script +=
+            "\tmsg = \" " + msg + "\";" +
+            "\tAssertionResult.setFailureMessage(msg);" +
+            "\tAssertionResult.setFailure(true);";
+
+          this.assertion.desc = desc;
+          this.assertion.script = script;
+          this.$refs.jsr233.reload();
+        }
+
+      },
+      quickScript() {
+        if (this.assertion.scriptLanguage == 'beanshell' || this.assertion.scriptLanguage == 'groovy' || this.assertion.scriptLanguage == 'javascript') {
+          this.beanShellOrGroovyScript();
+        } else {
+          this.pythonScript();
+        }
+      },
       detail() {
         this.visible = true;
       },

From d961a96081ea18dc5ef8c707fbacdd5a6e988367 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 26 Feb 2021 18:15:04 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E5=BE=AA=E7=8E=AF=E4=B8=8B?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/EditApiScenario.vue   | 122 +++++++++---------
 1 file changed, 62 insertions(+), 60 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index c6dfaeb66e..3400e7e644 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -113,23 +113,23 @@
                 </el-col>
                 <el-col :span="7" class="ms-col-one ms-font">
                   <el-link type="primary" @click="handleEnv">环境配置</el-link>
-<!--                  <el-select v-model="currentEnvironmentId" size="small" class="ms-htt-width"-->
-<!--                             :placeholder="$t('api_test.definition.request.run_env')"-->
-<!--                             clearable>-->
-<!--                    <el-option v-for="(environment, index) in environments" :key="index"-->
-<!--                               :label="environment.name + (environment.config.httpConfig.socket ? (': ' + environment.config.httpConfig.protocol + '://' + environment.config.httpConfig.socket) : '')"-->
-<!--                               :value="environment.id"/>-->
-<!--                    <el-button class="ms-scenario-button" size="mini" type="primary" @click="openEnvironmentConfig">-->
-<!--                      {{ $t('api_test.environment.environment_config') }}-->
-<!--                    </el-button>-->
-<!--                    <template v-slot:empty>-->
-<!--                      <div class="empty-environment">-->
-<!--                        <el-button class="ms-scenario-button" size="mini" type="primary" @click="openEnvironmentConfig">-->
-<!--                          {{ $t('api_test.environment.environment_config') }}-->
-<!--                        </el-button>-->
-<!--                      </div>-->
-<!--                    </template>-->
-<!--                  </el-select>-->
+                  <!--                  <el-select v-model="currentEnvironmentId" size="small" class="ms-htt-width"-->
+                  <!--                             :placeholder="$t('api_test.definition.request.run_env')"-->
+                  <!--                             clearable>-->
+                  <!--                    <el-option v-for="(environment, index) in environments" :key="index"-->
+                  <!--                               :label="environment.name + (environment.config.httpConfig.socket ? (': ' + environment.config.httpConfig.protocol + '://' + environment.config.httpConfig.socket) : '')"-->
+                  <!--                               :value="environment.id"/>-->
+                  <!--                    <el-button class="ms-scenario-button" size="mini" type="primary" @click="openEnvironmentConfig">-->
+                  <!--                      {{ $t('api_test.environment.environment_config') }}-->
+                  <!--                    </el-button>-->
+                  <!--                    <template v-slot:empty>-->
+                  <!--                      <div class="empty-environment">-->
+                  <!--                        <el-button class="ms-scenario-button" size="mini" type="primary" @click="openEnvironmentConfig">-->
+                  <!--                          {{ $t('api_test.environment.environment_config') }}-->
+                  <!--                        </el-button>-->
+                  <!--                      </div>-->
+                  <!--                    </template>-->
+                  <!--                  </el-select>-->
 
                 </el-col>
                 <el-col :span="2">
@@ -208,47 +208,47 @@
 </template>
 
 <script>
-import {API_STATUS, PRIORITY} from "../../definition/model/JsonData";
-import {WORKSPACE_ID} from '@/common/js/constants';
-import {
-  Assertions,
-  ConstantTimer,
-  Extract,
-  IfController,
-  JSR223Processor,
-  LoopController
-} from "../../definition/model/ApiTestModel";
-import {parseEnvironment} from "../../definition/model/EnvironmentModel";
-import {ELEMENT_TYPE, ELEMENTS} from "./Setting";
-import MsApiCustomize from "./ApiCustomize";
-import {getCurrentProjectID, getUUID, objToStrMap, strMapToObj} from "@/common/js/utils";
-import ApiEnvironmentConfig from "../../definition/components/environment/ApiEnvironmentConfig";
-import MsInputTag from "./MsInputTag";
-import MsRun from "./DebugRun";
-import MsApiReportDetail from "../report/ApiReportDetail";
-import MsVariableList from "./variable/VariableList";
-import ApiImport from "../../definition/components/import/ApiImport";
-import "@/common/css/material-icons.css"
-import OutsideClick from "@/common/js/outside-click";
-import ScenarioApiRelevance from "./api/ApiRelevance";
-import ScenarioRelevance from "./api/ScenarioRelevance";
-import MsComponentConfig from "./component/ComponentConfig";
-import {handleCtrlSEvent} from "../../../../../common/js/utils";
-import {getProject} from "@/business/components/api/automation/scenario/event";
-import ApiScenarioEnv from "@/business/components/api/automation/scenario/ApiScenarioEnv";
+  import {API_STATUS, PRIORITY} from "../../definition/model/JsonData";
+  import {WORKSPACE_ID} from '@/common/js/constants';
+  import {
+    Assertions,
+    ConstantTimer,
+    Extract,
+    IfController,
+    JSR223Processor,
+    LoopController
+  } from "../../definition/model/ApiTestModel";
+  import {parseEnvironment} from "../../definition/model/EnvironmentModel";
+  import {ELEMENT_TYPE, ELEMENTS} from "./Setting";
+  import MsApiCustomize from "./ApiCustomize";
+  import {getCurrentProjectID, getUUID, objToStrMap, strMapToObj} from "@/common/js/utils";
+  import ApiEnvironmentConfig from "../../definition/components/environment/ApiEnvironmentConfig";
+  import MsInputTag from "./MsInputTag";
+  import MsRun from "./DebugRun";
+  import MsApiReportDetail from "../report/ApiReportDetail";
+  import MsVariableList from "./variable/VariableList";
+  import ApiImport from "../../definition/components/import/ApiImport";
+  import "@/common/css/material-icons.css"
+  import OutsideClick from "@/common/js/outside-click";
+  import ScenarioApiRelevance from "./api/ApiRelevance";
+  import ScenarioRelevance from "./api/ScenarioRelevance";
+  import MsComponentConfig from "./component/ComponentConfig";
+  import {handleCtrlSEvent} from "../../../../../common/js/utils";
+  import {getProject} from "@/business/components/api/automation/scenario/event";
+  import ApiScenarioEnv from "@/business/components/api/automation/scenario/ApiScenarioEnv";
 
-export default {
-  name: "EditApiScenario",
-  props: {
-    moduleOptions: Array,
-    currentScenario: {},
-  },
-  components: {
-    ApiScenarioEnv,
-    MsVariableList,
-    ScenarioRelevance,
-    ScenarioApiRelevance,
-    ApiEnvironmentConfig,
+  export default {
+    name: "EditApiScenario",
+    props: {
+      moduleOptions: Array,
+      currentScenario: {},
+    },
+    components: {
+      ApiScenarioEnv,
+      MsVariableList,
+      ScenarioRelevance,
+      ScenarioApiRelevance,
+      ApiEnvironmentConfig,
       MsApiReportDetail,
       MsInputTag, MsRun,
       MsApiCustomize,
@@ -321,7 +321,7 @@ export default {
         // this.projectEnvMap.set(projectId, projectEnv);
       })
     },
-  directives: {OutsideClick},
+    directives: {OutsideClick},
     computed: {
       buttons() {
         let buttons = [
@@ -543,8 +543,10 @@ export default {
         }
       },
       showAll() {
-        this.operatingElements = ELEMENTS.get("ALL");
-        this.selectedTreeNode = undefined;
+        if (!this.customizeVisible) {
+          this.operatingElements = ELEMENTS.get("ALL");
+          this.selectedTreeNode = undefined;
+        }
         //this.reload();
       },
       apiListImport() {