From 3667587e3967393bef0cc6d2f923c60b970275a1 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 29 Jun 2020 21:11:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BB=8E=E5=93=8D=E5=BA=94?=
 =?UTF-8?q?=E5=A4=B4=E7=AD=89=E5=AF=B9=E8=B1=A1=E4=B8=AD=E6=8F=90=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/scenario/extract/ExtractRegex.java    |  1 +
 .../test/components/extract/ApiExtract.vue    |  4 ++--
 .../components/extract/ApiExtractCommon.vue   | 19 +++++++++++++++++--
 .../api/test/model/ScenarioModel.js           |  3 ++-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractRegex.java b/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractRegex.java
index 3a2216fa27..d5d6160bf5 100644
--- a/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractRegex.java
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractRegex.java
@@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class ExtractRegex extends ExtractCommon {
+    private String useHeaders;
     public ExtractRegex() {
         setType(ExtractType.REGEX);
     }
diff --git a/frontend/src/business/components/api/test/components/extract/ApiExtract.vue b/frontend/src/business/components/api/test/components/extract/ApiExtract.vue
index ab006a56c2..d8f57981cd 100644
--- a/frontend/src/business/components/api/test/components/extract/ApiExtract.vue
+++ b/frontend/src/business/components/api/test/components/extract/ApiExtract.vue
@@ -4,7 +4,7 @@
       {{$t('api_test.request.extract.description')}}
     </div>
     <el-row :gutter="10">
-      <el-col :span="4">
+      <el-col :span="2">
         <el-select :disabled="isReadOnly" class="extract-item" v-model="type" :placeholder="$t('api_test.request.extract.select_type')"
                    size="small">
           <el-option :label="$t('api_test.request.extract.regex')" :value="options.REGEX"/>
@@ -12,7 +12,7 @@
           <el-option label="XPath" :value="options.XPATH"/>
         </el-select>
       </el-col>
-      <el-col :span="20">
+      <el-col :span="22">
         <ms-api-extract-common :is-read-only="isReadOnly" :extract-type="type" :list="list" v-if="type" :callback="after"/>
       </el-col>
     </el-row>
diff --git a/frontend/src/business/components/api/test/components/extract/ApiExtractCommon.vue b/frontend/src/business/components/api/test/components/extract/ApiExtractCommon.vue
index f2607bb9af..178f37e362 100644
--- a/frontend/src/business/components/api/test/components/extract/ApiExtractCommon.vue
+++ b/frontend/src/business/components/api/test/components/extract/ApiExtractCommon.vue
@@ -1,7 +1,12 @@
 <template>
   <div>
     <el-row :gutter="10" type="flex" justify="space-between" align="middle">
-      <el-col :span="10">
+      <el-col v-if="extractType == 'Regex'" :span="5">
+        <el-select :disabled="isReadOnly" class="extract-item" v-model="common.useHeaders" :placeholder="$t('api_test.request.assertions.select_subject')" size="small">
+          <el-option v-for="item in useHeadersOption" :key="item.value" :label="item.label" :value="item.value"/>
+        </el-select>
+      </el-col>
+      <el-col>
         <ms-api-variable-input :is-read-only="isReadOnly" v-model="common.variable" size="small" maxlength="60"
                                @change="change" show-word-limit :placeholder="$t('api_test.variable_name')"/>
       </el-col>
@@ -53,7 +58,17 @@
 
     data() {
       return {
-        visible: false
+        visible: false,
+        useHeadersOption: [
+          {label: 'Body',value:'false'},
+          {label: 'Request Headers',value:'request_headers'},
+          {label: 'Body (unescaped)', value:'unescaped'},
+          {label: 'Body as a Document', value:'as_document'},
+          {label: 'Response Headers', value:'true'},
+          {label: 'URL', value:'URL'},
+          {label: 'Response Code', value:'code'},
+          {label: 'Response Message', value:'message'}
+        ]
       }
     },
 
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index 8455e4eceb..8b84423be5 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -343,6 +343,7 @@ export class ExtractCommon extends ExtractType {
   constructor(type, options) {
     super(type);
     this.variable = undefined;
+    this.useHeaders = undefined;
     this.value = ""; // ${variable}
     this.expression = undefined;
     this.description = undefined;
@@ -561,7 +562,7 @@ class JMXGenerator {
     switch (extractCommon.type) {
       case EXTRACT_TYPE.REGEX:
         testName += " RegexExtractor";
-        props.headers = "false"; // 对应jMeter body
+        props.headers = extractCommon.useHeaders; // 对应jMeter body
         props.template = "$1$";
         return new RegexExtractor(testName, props);
       case EXTRACT_TYPE.JSON_PATH: