From 5424f9b505414bb9ca2f9382f0a81aaa19afc1c9 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 25 Aug 2020 17:31:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E5=89=8D=E7=BD=AE=E8=84=9A=E6=9C=AC=E7=A6=81=E7=94=A8=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=93=8D=E5=BA=94=E4=BB=A3=E7=A0=81=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processor/BeanShellProcessor.vue          | 19 +++++++++++++------
 .../components/request/ApiHttpRequestForm.vue |  2 +-
 .../components/track/common/NodeTree.vue      |  1 -
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/processor/BeanShellProcessor.vue b/frontend/src/business/components/api/test/components/processor/BeanShellProcessor.vue
index a15fc33513..6e1882c092 100644
--- a/frontend/src/business/components/api/test/components/processor/BeanShellProcessor.vue
+++ b/frontend/src/business/components/api/test/components/processor/BeanShellProcessor.vue
@@ -7,7 +7,7 @@
       <el-col :span="4" class="script-index">
         <div class="template-title">{{$t('api_test.request.processor.code_template')}}</div>
         <div v-for="(template, index) in codeTemplates" :key="index" class="code-template">
-          <el-link @click="addTemplate(template)">{{template.title}}</el-link>
+          <el-link :disabled="template.disabled" @click="addTemplate(template)">{{template.title}}</el-link>
         </div>
         <div class="document-url">
           <el-link href="https://jmeter.apache.org/usermanual/component_reference.html#BeanShell_PostProcessor" type="primary">{{$t('commons.reference_documentation')}}</el-link>
@@ -29,23 +29,26 @@
           codeTemplates: [
             {
               title: this.$t('api_test.request.processor.code_template_get_variable'),
-              value: 'vars.get("variable_name");'
+              value: 'vars.get("variable_name");',
             },
             {
               title: this.$t('api_test.request.processor.code_template_set_variable'),
-              value: 'vars.put("variable_name", "variable_value");'
+              value: 'vars.put("variable_name", "variable_value");',
             },
             {
               title: this.$t('api_test.request.processor.code_template_get_response_header'),
-              value: 'prev.getResponseHeaders();'
+              value: 'prev.getResponseHeaders();',
+              disabled: this.isPreProcessor
             },
             {
               title: this.$t('api_test.request.processor.code_template_get_response_code'),
-              value: 'prev.getResponseCode();'
+              value: 'prev.getResponseCode();',
+              disabled: this.isPreProcessor
             },
             {
               title: this.$t('api_test.request.processor.code_template_get_response_result'),
-              value: 'prev.getResponseDataAsString();'
+              value: 'prev.getResponseDataAsString();',
+              disabled: this.isPreProcessor
             }
           ],
           isCodeEditAlive: true
@@ -61,6 +64,10 @@
         },
         beanShellProcessor: {
           type: Object,
+        },
+        isPreProcessor: {
+          type: Boolean,
+          default: false
         }
       },
       methods: {
diff --git a/frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue b/frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue
index c8050d0748..18c63d8c0e 100644
--- a/frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue
+++ b/frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue
@@ -68,7 +68,7 @@
         <ms-api-extract :is-read-only="isReadOnly" :extract="request.extract"/>
       </el-tab-pane>
       <el-tab-pane :label="$t('api_test.request.processor.pre_exec_script')" name="beanShellPreProcessor">
-        <ms-bean-shell-processor :is-read-only="isReadOnly" :bean-shell-processor="request.beanShellPreProcessor"/>
+        <ms-bean-shell-processor :is-pre-processor="true" :is-read-only="isReadOnly" :bean-shell-processor="request.beanShellPreProcessor"/>
       </el-tab-pane>
       <el-tab-pane :label="$t('api_test.request.processor.post_exec_script')" name="beanShellPostProcessor">
         <ms-bean-shell-processor :is-read-only="isReadOnly" :bean-shell-processor="request.beanShellPostProcessor"/>
diff --git a/frontend/src/business/components/track/common/NodeTree.vue b/frontend/src/business/components/track/common/NodeTree.vue
index c1762f8506..aa87b401bd 100644
--- a/frontend/src/business/components/track/common/NodeTree.vue
+++ b/frontend/src/business/components/track/common/NodeTree.vue
@@ -108,7 +108,6 @@ export default {
   methods: {
     handleDragEnd(draggingNode, dropNode, dropType, ev) {
       let param = this.buildParam(draggingNode, dropNode, dropType);
-      console.log(this.treeNodes);
       this.$post("/case/node/drag", param, () => {
         draggingNode.data.level = param.level;
         this.refreshTable();