From a00334acf394915c98ff3538c40543cc36fbbe9a Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 11 Jan 2021 11:38:24 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=97=B6=E8=B6=8A=E6=9D=83?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #1089
---
 .../main/java/io/metersphere/controller/UserController.java    | 3 +++
 backend/src/main/java/io/metersphere/xpack                     | 2 +-
 frontend/src/business/components/xpack                         | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/controller/UserController.java b/backend/src/main/java/io/metersphere/controller/UserController.java
index 0548ee872f..7b7da40432 100644
--- a/backend/src/main/java/io/metersphere/controller/UserController.java
+++ b/backend/src/main/java/io/metersphere/controller/UserController.java
@@ -168,6 +168,9 @@ public class UserController {
 
     @GetMapping("/info/{userId}")
     public UserDTO getUserInfo(@PathVariable(value = "userId") String userId) {
+        if (!StringUtils.equals(userId, SessionUtils.getUserId())) {
+            MSException.throwException(Translator.get("not_authorized"));
+        }
         return userService.getUserInfo(userId);
     }
 
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 9f4a9bbf46..068127ce59 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 9f4a9bbf46fc1333dbcccea21f83e27e3ec10b1f
+Subproject commit 068127ce59ea8b016434ed52a9de4a7a4b13bdb4
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 010ad7a5f0..7d43154a7c 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 010ad7a5f072a5e9d368c756a2473bbd20781433
+Subproject commit 7d43154a7c19732407a8e9ace8a7d1ea13c91f36

From 489b2b8f109a7a1f0a8e85e739d9a6cc649d5949 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 11 Jan 2021 13:46:56 +0800
Subject: [PATCH 2/8] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/definition/ApiTestCaseRequest.java    |   1 +
 .../mapper/ext/ExtApiDefinitionMapper.xml     |  19 +
 .../base/mapper/ext/ExtApiTestCaseMapper.xml  |  59 ++
 .../components/case/ApiCaseHeader.vue         |  44 +-
 .../components/case/ApiCaseItem.vue           |   2 +-
 .../components/case/ApiCaseList.vue           | 389 ++++----
 .../definition/components/list/ApiList.vue    | 867 +++++++++---------
 .../api/definition/model/JsonData.js          |   9 +
 .../components/search/MsTableAdvSearchBar.vue |   6 +-
 .../components/search/search-components.js    | 105 ++-
 frontend/src/i18n/en-US.js                    |   6 +
 frontend/src/i18n/zh-CN.js                    |   6 +
 frontend/src/i18n/zh-TW.js                    |   6 +
 13 files changed, 881 insertions(+), 638 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseRequest.java b/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseRequest.java
index d9028e23f2..c1ae7c9c5b 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseRequest.java
@@ -24,6 +24,7 @@ public class ApiTestCaseRequest {
     private List<String> moduleIds;
     private List<OrderRequest> orders;
     private Map<String, List<String>> filters;
+    private Map<String, Object> combine;
     private boolean isSelectThisWeedData;
     private long createTime = 0;
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
index c667ce9865..a73738cafe 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
@@ -147,6 +147,25 @@
                 <property name="object" value="${condition}.creator"/>
             </include>
         </if>
+        <if test="${condition}.path != null">
+            and api_definition.path
+            <include refid="condition">
+                <property name="object" value="${condition}.path"/>
+            </include>
+        </if>
+        <if test="${condition}.method != null">
+            and api_definition.method
+            <include refid="condition">
+                <property name="object" value="${condition}.method"/>
+            </include>
+        </if>
+        <if test="${condition}.tags != null">
+            and api_definition.tags
+            <include refid="condition">
+                <property name="object" value="${condition}.tags"/>
+            </include>
+        </if>
+
     </sql>
 
     <sql id="condition">
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index 5423d5be55..49b6655d76 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -144,7 +144,51 @@
             </otherwise>
         </choose>
     </sql>
+    <sql id="combine">
+        <if test='${condition}.name != null and (${name} == null or ${name} == "")'>
+            and atc.name
+            <include refid="condition">
+                <property name="object" value="${condition}.name"/>
+            </include>
+        </if>
+        <if test="${condition}.updateTime != null">
+            and atc.update_time
+            <include refid="condition">
+                <property name="object" value="${condition}.updateTime"/>
+            </include>
+        </if>
+         <if test="${condition}.createTime != null">
+            and atc.create_time
+            <include refid="condition">
+                <property name="object" value="${condition}.createTime"/>
+            </include>
+        </if>
+        <if test="${condition}.priority != null">
+            and atc.priority
+            <include refid="condition">
+                <property name="object" value="${condition}.priority"/>
+            </include>
+        </if>
+        <if test="${condition}.creator != null">
+            and atc.user_id
+            <include refid="condition">
+                <property name="object" value="${condition}.creator"/>
+            </include>
+        </if>
+        <if test="${condition}.tags != null">
+            and atc.tags
+            <include refid="condition">
+                <property name="object" value="${condition}.tags"/>
+            </include>
+        </if>
+        <if test="${condition}.status != null">
+            and ader.status
+            <include refid="condition">
+                <property name="object" value="${condition}.status"/>
+            </include>
+        </if>
 
+    </sql>
     <select id="list" resultType="io.metersphere.api.dto.definition.ApiTestCaseResult">
         select
             atc.id,
@@ -180,6 +224,13 @@
               resource_id) as ader
         on atc.id = ader.resource_id
         <where>
+            <if test="request.combine != null">
+                <include refid="combine">
+                    <property name="condition" value="request.combine"/>
+                    <property name="name" value="request.name"/>
+                </include>
+            </if>
+
             <if test="request.name != null and request.name!=''">
                 and atc.name like CONCAT('%', #{request.name},'%')
             </if>
@@ -196,6 +247,14 @@
                 AND atc.api_definition_id = #{request.apiDefinitionId}
             </if>
         </where>
+
+        <if test="request.orders != null and request.orders.size() > 0">
+            order by
+            <foreach collection="request.orders" separator="," item="order">
+                atc.${order.name} ${order.type}
+             </foreach>
+        </if>
+
     </select>
 
     <select id="listSimple" resultType="io.metersphere.api.dto.definition.ApiTestCaseDTO">
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseHeader.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseHeader.vue
index f973325c60..27b7d7a69b 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseHeader.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseHeader.vue
@@ -18,19 +18,26 @@
         </el-col>
         <el-col :span="3">
           <div>
-            <el-select size="small" :placeholder="$t('api_test.definition.request.grade_info')" v-model="condition.priority"
+            <el-select size="small" :placeholder="$t('api_test.definition.request.grade_order_asc')" v-model="condition.order"
                        :disabled="isCaseEdit"
-                       class="ms-api-header-select" @change="getApiTest" clearable>
-              <el-option v-for="grd in priorities" :key="grd.id" :label="grd.name" :value="grd.id"/>
+                       class="ms-api-header-select" @change="search" clearable>
+              <el-option v-for="grd in priorities" :key="grd.id" :label="$t(grd.label)" :value="grd.id"/>
             </el-select>
           </div>
         </el-col>
 
-        <el-col :span="3">
+        <el-col :span="4">
           <div class="ms-api-header-select" style="margin-right: 20px">
-            <el-input size="small" :placeholder="$t('api_test.definition.request.select_case')"
-                      :disabled="isCaseEdit"
-                      v-model="condition.name" @blur="getApiTest" @keyup.enter.native="getApiTest" />
+            <el-row>
+              <el-col :span="12">
+                <el-input size="small" :placeholder="$t('api_test.definition.request.select_case')"
+                          :disabled="isCaseEdit"
+                          v-model="condition.name" @blur="search" @keyup.enter.native="search"/>
+              </el-col>
+              <el-col :span="12">
+                <el-link type="primary" style="margin-left: 5px" @click="open">{{$t('commons.adv_search.title')}}</el-link>
+              </el-col>
+            </el-row>
           </div>
         </el-col>
 
@@ -43,7 +50,7 @@
           </div>
         </el-col>
 
-        <el-col :span="2" v-if="!(isReadOnly || isCaseEdit)">
+        <el-col :span="1" v-if="!(isReadOnly || isCaseEdit)">
           <el-dropdown size="small" split-button type="primary" class="ms-api-header-select" @click="addCase"
                        @command="handleCommand" v-tester>
             +{{$t('api_test.definition.request.case')}}
@@ -54,6 +61,10 @@
         </el-col>
       </el-row>
     </el-card>
+
+    <!--高级搜索-->
+    <ms-table-adv-search-bar :condition.sync="condition" :showLink="false" ref="searchBar" @search="search"/>
+
   </el-header>
 </template>
 
@@ -64,10 +75,11 @@
   import MsTag from "../../../../common/components/MsTag";
   import MsEnvironmentSelect from "./MsEnvironmentSelect";
   import {API_METHOD_COLOUR} from "../../model/JsonData";
+  import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
 
   export default {
     name: "ApiCaseHeader",
-    components: {MsEnvironmentSelect, MsTag, ApiEnvironmentConfig},
+    components: {MsEnvironmentSelect, MsTag, ApiEnvironmentConfig, MsTableAdvSearchBar},
     data() {
       return {
         environments: [],
@@ -86,7 +98,7 @@
         type: Object,
         default() {
           return {}
-        }
+        },
       }
     },
     created() {
@@ -132,9 +144,19 @@
       setEnvironment(data) {
         this.$emit('setEnvironment', data);
       },
-      getApiTest() {
+      search() {
+        if (this.priorities && this.condition.order) {
+          for (let index in this.priorities) {
+            if (this.priorities[index].id === this.condition.order) {
+              this.condition.orders = [this.priorities[index]];
+            }
+          }
+        }
         this.$emit('getApiTest');
       },
+      open() {
+        this.$refs.searchBar.open();
+      },
       addCase() {
         this.$emit('addCase');
       },
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
index 4387c8a728..20d60597b8 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
@@ -24,7 +24,7 @@
 
 
         <label class="ms-api-label" style="padding-left: 20px; padding-right: 20px;">{{ $t('commons.tag') }}</label>
-        <ms-input-tag :currentScenario="apiCase" ref="tag" style="float: right;margin-right: 215px;margin-top: -3px;"/>
+        <ms-input-tag :currentScenario="apiCase" ref="tag" style="float: right;margin-right: 215px;margin-top: -3px;" @keyup.enter.native="saveTestCase(apiCase)"/>
 
         <div v-if="apiCase.id" style="color: #999999;font-size: 12px">
                   <span>
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
index 6b94fda754..3d18694bff 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
@@ -43,222 +43,225 @@
 </template>
 <script>
 
-import ApiCaseHeader from "./ApiCaseHeader";
-import ApiCaseItem from "./ApiCaseItem";
-import MsRun from "../Run";
-import {getCurrentProjectID, getUUID} from "@/common/js/utils";
-import MsDrawer from "../../../../common/components/MsDrawer";
-import {PRIORITY} from "../../model/JsonData";
+  import ApiCaseHeader from "./ApiCaseHeader";
+  import ApiCaseItem from "./ApiCaseItem";
+  import MsRun from "../Run";
+  import {getCurrentProjectID, getUUID} from "@/common/js/utils";
+  import MsDrawer from "../../../../common/components/MsDrawer";
+  import {CASE_ORDER} from "../../model/JsonData";
+  import {API_CASE_CONFIGS} from "@/business/components/common/components/search/search-components";
 
-export default {
-  name: 'ApiCaseList',
-  components: {
-    MsDrawer,
-    MsRun,
-    ApiCaseHeader,
-    ApiCaseItem,
-
-  },
-  props: {
-    createCase: String,
-    loaded: Boolean,
-    refreshSign: String,
-    currentApi: {
-      type: Object
+  export default {
+    name: 'ApiCaseList',
+    components: {
+      MsDrawer,
+      MsRun,
+      ApiCaseHeader,
+      ApiCaseItem,
     },
-  },
-  data() {
-    return {
-      result: {},
-      grades: [],
-      environment: {},
-      isReadOnly: false,
-      selectedEvent: Object,
-      priorities: PRIORITY,
-      apiCaseList: [],
-      batchLoading: false,
-      singleLoading: false,
-      singleRunId: "",
-      runData: [],
-      reportId: "",
-      projectId: "",
-      testCaseId: "",
-      checkedCases: new Set(),
-      visible: false,
-      condition: {},
-      api: {}
-    }
-  },
-  watch: {
-    refreshSign() {
+    props: {
+      createCase: String,
+      loaded: Boolean,
+      refreshSign: String,
+      currentApi: {
+        type: Object
+      },
+    },
+    data() {
+      return {
+        result: {},
+        grades: [],
+        environment: {},
+        isReadOnly: false,
+        selectedEvent: Object,
+        priorities: CASE_ORDER,
+        apiCaseList: [],
+        batchLoading: false,
+        singleLoading: false,
+        singleRunId: "",
+        runData: [],
+        reportId: "",
+        projectId: "",
+        testCaseId: "",
+        checkedCases: new Set(),
+        visible: false,
+        condition: {
+          components: API_CASE_CONFIGS
+        },
+        api: {}
+      }
+    },
+    watch: {
+      refreshSign() {
+        this.api = this.currentApi;
+        this.getApiTest();
+      },
+      createCase() {
+        this.api = this.currentApi;
+        this.sysAddition();
+      }
+    },
+    created() {
       this.api = this.currentApi;
-      this.getApiTest();
+      this.projectId = getCurrentProjectID();
+      if (this.createCase) {
+        this.sysAddition();
+      } else {
+        this.getApiTest();
+      }
     },
-    createCase() {
-      this.api = this.currentApi;
-      this.sysAddition();
-    }
-  },
-  created() {
-    this.api = this.currentApi;
-    this.projectId = getCurrentProjectID();
-    if (this.createCase) {
-      this.sysAddition();
-    } else {
-      this.getApiTest();
-    }
-  },
-  computed: {
-    isCaseEdit() {
-      return this.testCaseId ? true : false;
-    }
-  },
-  methods: {
-    open(api, testCaseId) {
-      this.api = api;
-      // testCaseId 不为空则为用例编辑页面
-      this.testCaseId = testCaseId;
-      this.getApiTest();
-      this.visible = true;
+    computed: {
+      isCaseEdit() {
+        return this.testCaseId ? true : false;
+      }
     },
-    setEnvironment(environment) {
-      this.environment = environment;
-    },
-    sysAddition() {
-      this.condition.projectId = this.projectId;
-      this.condition.apiDefinitionId = this.api.id;
-      this.$post("/api/testcase/list", this.condition, response => {
-        for (let index in response.data) {
-          let test = response.data[index];
-          test.request = JSON.parse(test.request);
-        }
-        this.apiCaseList = response.data;
-        this.addCase();
-      });
-    },
-
-    apiCaseClose() {
-      this.apiCaseList = [];
-      this.visible = false;
-    },
-
-    runRefresh(data) {
-      this.batchLoading = false;
-      this.singleLoading = false;
-      this.singleRunId = "";
-      this.$success(this.$t('schedule.event_success'));
-      this.getApiTest();
-      this.$emit('refresh');
-    },
-
-    refresh(data) {
-      this.getApiTest();
-      this.$emit('refresh');
-    },
-
-    getApiTest() {
-      if (this.api) {
+    methods: {
+      open(api, testCaseId) {
+        this.api = api;
+        // testCaseId 不为空则为用例编辑页面
+        this.testCaseId = testCaseId;
+        this.condition = {components: API_CASE_CONFIGS};
+        this.getApiTest();
+        this.visible = true;
+      },
+      setEnvironment(environment) {
+        this.environment = environment;
+      },
+      sysAddition() {
         this.condition.projectId = this.projectId;
-        if (this.isCaseEdit) {
-          this.condition.id = this.testCaseId;
-        } else {
-          this.condition.apiDefinitionId = this.api.id;
-        }
-        this.result = this.$post("/api/testcase/list", this.condition, response => {
+        this.condition.apiDefinitionId = this.api.id;
+        this.$post("/api/testcase/list", this.condition, response => {
           for (let index in response.data) {
             let test = response.data[index];
             test.request = JSON.parse(test.request);
-            if (!test.request.hashTree) {
-              test.request.hashTree = [];
-            }
           }
           this.apiCaseList = response.data;
-          if (this.apiCaseList.length == 0 && !this.loaded) {
-            this.addCase();
+          this.addCase();
+        });
+      },
+
+      apiCaseClose() {
+        this.apiCaseList = [];
+        this.visible = false;
+      },
+
+      runRefresh(data) {
+        this.batchLoading = false;
+        this.singleLoading = false;
+        this.singleRunId = "";
+        this.$success(this.$t('schedule.event_success'));
+        this.getApiTest();
+        this.$emit('refresh');
+      },
+
+      refresh(data) {
+        this.getApiTest();
+        this.$emit('refresh');
+      },
+
+      getApiTest() {
+        if (this.api) {
+          this.condition.projectId = this.projectId;
+          if (this.isCaseEdit) {
+            this.condition.id = this.testCaseId;
+          } else {
+            this.condition.apiDefinitionId = this.api.id;
           }
-          this.apiCaseList.forEach(apiCase => {
-            if (apiCase.tags && apiCase.tags.length > 0) {
-              apiCase.tags = JSON.parse(apiCase.tags);
+          this.result = this.$post("/api/testcase/list", this.condition, response => {
+            for (let index in response.data) {
+              let test = response.data[index];
+              test.request = JSON.parse(test.request);
+              if (!test.request.hashTree) {
+                test.request.hashTree = [];
+              }
+            }
+            this.apiCaseList = response.data;
+            // if (this.apiCaseList.length == 0 && !this.loaded) {
+            //   this.addCase();
+            // }
+            this.apiCaseList.forEach(apiCase => {
+              if (apiCase.tags && apiCase.tags.length > 0) {
+                apiCase.tags = JSON.parse(apiCase.tags);
+              }
+            })
+
+          });
+        }
+      },
+      addCase() {
+        if (this.api.request) {
+          // 初始化对象
+          let request = {};
+          if (this.api.request instanceof Object) {
+            request = this.api.request;
+          } else {
+            request = JSON.parse(this.api.request);
+          }
+          let obj = {apiDefinitionId: this.api.id, name: '', priority: 'P0', active: true, tags: []};
+          obj.request = request;
+          this.apiCaseList.unshift(obj);
+        }
+      },
+
+      copyCase(data) {
+        this.apiCaseList.unshift(data);
+      },
+
+      handleClose() {
+        this.visible = false;
+      },
+      showExecResult(row) {
+        this.visible = false;
+        this.$emit('showExecResult', row);
+      },
+
+      singleRun(row) {
+        if (!this.environment || !this.environment) {
+          this.$warning(this.$t('api_test.environment.select_environment'));
+          return;
+        }
+        this.runData = [];
+        this.singleLoading = true;
+        this.singleRunId = row.id;
+        row.request.name = row.id;
+        row.request.useEnvironment = this.environment.id;
+        this.runData.push(row.request);
+        /*触发执行操作*/
+        this.reportId = getUUID().substring(0, 8);
+      },
+
+      batchRun() {
+        if (!this.environment) {
+          this.$warning(this.$t('api_test.environment.select_environment'));
+          return;
+        }
+        if (this.apiCaseList.length > 0) {
+          this.apiCaseList.forEach(item => {
+            if (item.id) {
+              item.request.name = item.id;
+              item.request.useEnvironment = this.environment.id;
+              this.runData.push(item.request);
             }
           })
-
-        });
-      }
-    },
-    addCase() {
-      if (this.api.request) {
-        // 初始化对象
-        let request = {};
-        if (this.api.request instanceof Object) {
-          request = this.api.request;
-        } else {
-          request = JSON.parse(this.api.request);
-        }
-        let obj = {apiDefinitionId: this.api.id, name: '', priority: 'P0', active: true, tags: []};
-        obj.request = request;
-        this.apiCaseList.unshift(obj);
-      }
-    },
-
-    copyCase(data) {
-      this.apiCaseList.unshift(data);
-    },
-
-    handleClose() {
-      this.visible = false;
-    },
-    showExecResult(row) {
-      this.visible = false;
-      this.$emit('showExecResult', row);
-    },
-
-    singleRun(row) {
-      if (!this.environment || !this.environment) {
-        this.$warning(this.$t('api_test.environment.select_environment'));
-        return;
-      }
-      this.runData = [];
-      this.singleLoading = true;
-      this.singleRunId = row.id;
-      row.request.name = row.id;
-      row.request.useEnvironment = this.environment.id;
-      this.runData.push(row.request);
-      /*触发执行操作*/
-      this.reportId = getUUID().substring(0, 8);
-    },
-
-    batchRun() {
-      if (!this.environment) {
-        this.$warning(this.$t('api_test.environment.select_environment'));
-        return;
-      }
-      if (this.apiCaseList.length > 0) {
-        this.apiCaseList.forEach(item => {
-          if (item.id) {
-            item.request.name = item.id;
-            item.request.useEnvironment = this.environment.id;
-            this.runData.push(item.request);
+          if (this.runData.length > 0) {
+            this.batchLoading = true;
+            /*触发执行操作*/
+            this.reportId = getUUID().substring(0, 8);
+          } else {
+            this.$warning("没有可执行的用例！");
           }
-        })
-        if (this.runData.length > 0) {
-          this.batchLoading = true;
-          /*触发执行操作*/
-          this.reportId = getUUID().substring(0, 8);
         } else {
           this.$warning("没有可执行的用例！");
         }
-      } else {
-        this.$warning("没有可执行的用例！");
-      }
+      },
     }
   }
-}
 </script>
 
 <style scoped>
 
-.ms-drawer >>> .ms-drawer-body {
-  margin-top: 80px;
-}
+  .ms-drawer >>> .ms-drawer-body {
+    margin-top: 80px;
+  }
 
 </style>
diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue
index f7285407f2..7cdb89802f 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -4,7 +4,8 @@
       :is-api-list-enable="isApiListEnable"
       @isApiListEnableChange="isApiListEnableChange">
 
-      <el-input placeholder="搜索" @blur="search" class="search-input" size="small" @keyup.enter.native="search"
+      <el-link type="primary" @click="open" style="float: right;margin-top: 5px">{{$t('commons.adv_search.title')}}</el-link>
+      <el-input :placeholder="$t('api_monitor.please_search')" @blur="search" class="search-input" size="small" @keyup.enter.native="search"
                 v-model="condition.name"/>
 
       <el-table v-loading="result.loading"
@@ -33,13 +34,13 @@
                          sortable="custom"/>
         <el-table-column prop="name" :label="$t('api_test.definition.api_name')"
                          show-overflow-tooltip
-                         sortable="custom"/>
+                         sortable="custom" min-width="120px"/>
         <el-table-column
           prop="status"
           column-key="status"
           sortable="custom"
           :filters="statusFilters"
-          :label="$t('api_test.definition.api_status')">
+          :label="$t('api_test.definition.api_status')" min-width="120px">
           <template v-slot:default="scope">
             <span class="el-dropdown-link">
               <api-status :value="scope.row.status"/>
@@ -53,7 +54,7 @@
           column-key="method"
           :filters="methodFilters"
           :label="$t('api_test.definition.api_type')"
-          show-overflow-tooltip>
+          show-overflow-tooltip min-width="120px">
           <template v-slot:default="scope" class="request-method">
             <el-tag size="mini" :style="{'background-color': getColor(true, scope.row.method), border: getColor(true, scope.row.method)}"
                     class="api-el-tag">
@@ -62,17 +63,17 @@
           </template>
         </el-table-column>
 
-        <el-table-column
-          prop="path"
-          :label="$t('api_test.definition.api_path')"
-          show-overflow-tooltip/>
-
         <el-table-column
           prop="userName"
           sortable="custom"
           :filters="userFilters"
           column-key="user_id"
           :label="$t('api_test.definition.api_principal')"
+          show-overflow-tooltip min-width="100px"/>
+
+        <el-table-column
+          prop="path"
+          :label="$t('api_test.definition.api_path')"
           show-overflow-tooltip/>
 
         <el-table-column prop="tags" :label="$t('commons.tag')">
@@ -124,461 +125,469 @@
     <ms-api-case-list @refresh="initTable" @showExecResult="showExecResult" :currentApi="selectApi" ref="caseList"/>
     <!--批量编辑-->
     <ms-batch-edit ref="batchEdit" @batchEdit="batchEdit" :typeArr="typeArr" :value-arr="valueArr"/>
+    <!--高级搜索-->
+    <ms-table-adv-search-bar :condition.sync="condition" :showLink="false" ref="searchBar" @search="search"/>
+
   </div>
 
 </template>
 
 <script>
 
-import MsTableHeader from '../../../../common/components/MsTableHeader';
-import MsTableOperator from "../../../../common/components/MsTableOperator";
-import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
-import MsTableButton from "../../../../common/components/MsTableButton";
-import MsTablePagination from "../../../../common/pagination/TablePagination";
-import MsTag from "../../../../common/components/MsTag";
-import MsApiCaseList from "../case/ApiCaseList";
-import MsContainer from "../../../../common/components/MsContainer";
-import MsBottomContainer from "../BottomContainer";
-import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
-import MsBatchEdit from "../basis/BatchEdit";
-import {API_METHOD_COLOUR, API_STATUS, REQ_METHOD} from "../../model/JsonData";
-import {_filter, _sort, getCurrentProjectID} from "@/common/js/utils";
-import {WORKSPACE_ID} from '@/common/js/constants';
-import ApiListContainer from "./ApiListContainer";
-import MsTableSelectAll from "../../../../common/components/table/MsTableSelectAll";
-import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus";
+  import MsTableHeader from '../../../../common/components/MsTableHeader';
+  import MsTableOperator from "../../../../common/components/MsTableOperator";
+  import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
+  import MsTableButton from "../../../../common/components/MsTableButton";
+  import MsTablePagination from "../../../../common/pagination/TablePagination";
+  import MsTag from "../../../../common/components/MsTag";
+  import MsApiCaseList from "../case/ApiCaseList";
+  import MsContainer from "../../../../common/components/MsContainer";
+  import MsBottomContainer from "../BottomContainer";
+  import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
+  import MsBatchEdit from "../basis/BatchEdit";
+  import {API_METHOD_COLOUR, API_STATUS, REQ_METHOD} from "../../model/JsonData";
+  import {_filter, _sort, getCurrentProjectID} from "@/common/js/utils";
+  import {WORKSPACE_ID} from '@/common/js/constants';
+  import ApiListContainer from "./ApiListContainer";
+  import MsTableSelectAll from "../../../../common/components/table/MsTableSelectAll";
+  import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus";
+  import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
+  import {API_DEFINITION_CONFIGS} from "@/business/components/common/components/search/search-components";
 
-export default {
-  name: "ApiList",
-  components: {
-    ApiStatus,
-    MsTableSelectAll,
-    ApiListContainer,
-    MsTableButton,
-    MsTableOperatorButton,
-    MsTableOperator,
-    MsTableHeader,
-    MsTablePagination,
-    MsTag,
-    MsApiCaseList,
-    MsContainer,
-    MsBottomContainer,
-    ShowMoreBtn,
-    MsBatchEdit
-  },
-  data() {
-    return {
-      condition: {},
-      selectApi: {},
-      result: {},
-      moduleId: "",
-      selectDataRange: "all",
-      deletePath: "/test/case/delete",
-      selectRows: new Set(),
-      buttons: [
-        {name: this.$t('api_test.definition.request.batch_delete'), handleClick: this.handleDeleteBatch},
-        {name: this.$t('api_test.definition.request.batch_edit'), handleClick: this.handleEditBatch}
-      ],
-      typeArr: [
-        {id: 'status', name: this.$t('api_test.definition.api_status')},
-        {id: 'method', name: this.$t('api_test.definition.api_type')},
-        {id: 'userId', name: this.$t('api_test.definition.api_principal')},
-      ],
-      statusFilters: [
-        {text: this.$t('test_track.plan.plan_status_prepare'), value: 'Prepare'},
-        {text: this.$t('test_track.plan.plan_status_running'), value: 'Underway'},
-        {text: this.$t('test_track.plan.plan_status_completed'), value: 'Completed'},
-        {text: this.$t('test_track.plan.plan_status_trash'), value: 'Trash'},
-      ],
-      methodFilters: [
-        {text: 'GET', value: 'GET'},
-        {text: 'POST', value: 'POST'},
-        {text: 'PUT', value: 'PUT'},
-        {text: 'PATCH', value: 'PATCH'},
-        {text: 'DELETE', value: 'DELETE'},
-        {text: 'OPTIONS', value: 'OPTIONS'},
-        {text: 'HEAD', value: 'HEAD'},
-        {text: 'CONNECT', value: 'CONNECT'},
-        {text: 'DUBBO', value: 'DUBBO'},
-        {text: 'dubbo://', value: 'dubbo://'},
-        {text: 'SQL', value: 'SQL'},
-        {text: 'TCP', value: 'TCP'},
-      ],
-      userFilters: [],
-      valueArr: {
-        status: API_STATUS,
-        method: REQ_METHOD,
-        userId: [],
+  export default {
+    name: "ApiList",
+    components: {
+      ApiStatus,
+      MsTableSelectAll,
+      ApiListContainer,
+      MsTableButton,
+      MsTableOperatorButton,
+      MsTableOperator,
+      MsTableHeader,
+      MsTablePagination,
+      MsTag,
+      MsApiCaseList,
+      MsContainer,
+      MsBottomContainer,
+      ShowMoreBtn,
+      MsBatchEdit,
+      MsTableAdvSearchBar
+    },
+    data() {
+      return {
+        condition: {
+          components: API_DEFINITION_CONFIGS
+        },
+        selectApi: {},
+        result: {},
+        moduleId: "",
+        selectDataRange: "all",
+        deletePath: "/test/case/delete",
+        selectRows: new Set(),
+        buttons: [
+          {name: this.$t('api_test.definition.request.batch_delete'), handleClick: this.handleDeleteBatch},
+          {name: this.$t('api_test.definition.request.batch_edit'), handleClick: this.handleEditBatch}
+        ],
+        typeArr: [
+          {id: 'status', name: this.$t('api_test.definition.api_status')},
+          {id: 'method', name: this.$t('api_test.definition.api_type')},
+          {id: 'userId', name: this.$t('api_test.definition.api_principal')},
+        ],
+        statusFilters: [
+          {text: this.$t('test_track.plan.plan_status_prepare'), value: 'Prepare'},
+          {text: this.$t('test_track.plan.plan_status_running'), value: 'Underway'},
+          {text: this.$t('test_track.plan.plan_status_completed'), value: 'Completed'},
+          {text: this.$t('test_track.plan.plan_status_trash'), value: 'Trash'},
+        ],
+        methodFilters: [
+          {text: 'GET', value: 'GET'},
+          {text: 'POST', value: 'POST'},
+          {text: 'PUT', value: 'PUT'},
+          {text: 'PATCH', value: 'PATCH'},
+          {text: 'DELETE', value: 'DELETE'},
+          {text: 'OPTIONS', value: 'OPTIONS'},
+          {text: 'HEAD', value: 'HEAD'},
+          {text: 'CONNECT', value: 'CONNECT'},
+          {text: 'DUBBO', value: 'DUBBO'},
+          {text: 'dubbo://', value: 'dubbo://'},
+          {text: 'SQL', value: 'SQL'},
+          {text: 'TCP', value: 'TCP'},
+        ],
+        userFilters: [],
+        valueArr: {
+          status: API_STATUS,
+          method: REQ_METHOD,
+          userId: [],
+        },
+        methodColorMap: new Map(API_METHOD_COLOUR),
+        tableData: [],
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        screenHeight: document.documentElement.clientHeight - 330,//屏幕高度,
+        environmentId: undefined,
+        selectAll: false,
+        unSelection: [],
+        selectDataCounts: 0,
+      }
+    },
+    props: {
+      currentProtocol: String,
+      selectNodeIds: Array,
+      isSelectThisWeek: String,
+      visible: {
+        type: Boolean,
+        default: false,
+      },
+      isCaseRelevance: {
+        type: Boolean,
+        default: false,
+      },
+      trashEnable: {
+        type: Boolean,
+        default: false,
+      },
+      isApiListEnable: Boolean,
+      isReadOnly: {
+        type: Boolean,
+        default: false
       },
-      methodColorMap: new Map(API_METHOD_COLOUR),
-      tableData: [],
-      currentPage: 1,
-      pageSize: 10,
-      total: 0,
-      screenHeight: document.documentElement.clientHeight - 330,//屏幕高度,
-      environmentId: undefined,
-      selectAll: false,
-      unSelection: [],
-      selectDataCounts: 0,
-    }
-  },
-  props: {
-    currentProtocol: String,
-    selectNodeIds: Array,
-    isSelectThisWeek: String,
-    visible: {
-      type: Boolean,
-      default: false,
     },
-    isCaseRelevance: {
-      type: Boolean,
-      default: false,
-    },
-    trashEnable: {
-      type: Boolean,
-      default: false,
-    },
-    isApiListEnable: Boolean,
-    isReadOnly: {
-      type: Boolean,
-      default: false
-    },
-  },
-  created: function () {
-    this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
-    this.initTable();
-    this.getMaintainerOptions();
-  },
-  watch: {
-    selectNodeIds() {
+    created: function () {
+      this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
       this.initTable();
+      this.getMaintainerOptions();
     },
-    currentProtocol() {
-      this.initTable();
-    },
-    trashEnable() {
-      if (this.trashEnable) {
-        this.condition.filters = {status: ["Trash"]};
-        this.condition.moduleIds = [];
-      } else {
-        this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
-      }
-      this.initTable();
-    }
-  },
-  methods: {
-    isApiListEnableChange(data) {
-      this.$emit('isApiListEnableChange', data);
-    },
-    initTable() {
-      this.selectRows = new Set();
-
-      this.selectAll = false;
-      this.unSelection = [];
-      this.selectDataCounts = 0;
-
-
-      this.condition.moduleIds = this.selectNodeIds;
-      this.condition.projectId = getCurrentProjectID();
-      if (this.currentProtocol != null) {
-        this.condition.protocol = this.currentProtocol;
-      }
-
-      //检查是否只查询本周数据
-      this.getSelectDataRange();
-      this.condition.selectThisWeedData = false;
-      this.condition.apiCaseCoverage = null;
-      switch (this.selectDataRange) {
-        case 'thisWeekCount':
-          this.condition.selectThisWeedData = true;
-          break;
-        case 'uncoverage':
-          this.condition.apiCaseCoverage = 'uncoverage';
-          break;
-        case 'coverage':
-          this.condition.apiCaseCoverage = 'coverage';
-          break;
-      }
-      if (this.condition.projectId) {
-        this.result = this.$post("/api/definition/list/" + this.currentPage + "/" + this.pageSize, this.condition, response => {
-          this.total = response.data.itemCount;
-          this.tableData = response.data.listObject;
-          this.unSelection = response.data.listObject.map(s => s.id);
-
-          this.tableData.forEach(item => {
-            if (item.tags && item.tags.length > 0) {
-              item.tags = JSON.parse(item.tags);
-            }
-          })
-        });
-      }
-    },
-    getMaintainerOptions() {
-      let workspaceId = localStorage.getItem(WORKSPACE_ID);
-      this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
-        this.valueArr.userId = response.data;
-        this.userFilters = response.data.map(u => {
-          return {text: u.name, value: u.id}
-        });
-      });
-    },
-    handleSelect(selection, row) {
-      row.hashTree = [];
-      if (this.selectRows.has(row)) {
-        this.$set(row, "showMore", false);
-        this.selectRows.delete(row);
-      } else {
-        this.$set(row, "showMore", true);
-        this.selectRows.add(row);
-      }
-      let arr = Array.from(this.selectRows);
-      // 选中1个以上的用例时显示更多操作
-      if (this.selectRows.size === 1) {
-        this.$set(arr[0], "showMore", true);
-      } else if (this.selectRows.size === 2) {
-        arr.forEach(row => {
-          this.$set(row, "showMore", true);
-        })
-      }
-      this.selectRowsCount(this.selectRows)
-    },
-    handleSelectAll(selection) {
-      if (selection.length > 0) {
-        if (selection.length === 1) {
-          selection.hashTree = [];
-          this.selectRows.add(selection[0]);
+    watch: {
+      selectNodeIds() {
+        this.initTable();
+      },
+      currentProtocol() {
+        this.initTable();
+      },
+      trashEnable() {
+        if (this.trashEnable) {
+          this.condition.filters = {status: ["Trash"]};
+          this.condition.moduleIds = [];
         } else {
-          this.tableData.forEach(item => {
-            item.hashTree = [];
-            this.$set(item, "showMore", true);
-            this.selectRows.add(item);
+          this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
+        }
+        this.initTable();
+      }
+    },
+    methods: {
+      isApiListEnableChange(data) {
+        this.$emit('isApiListEnableChange', data);
+      },
+      initTable() {
+        this.selectRows = new Set();
+        this.selectAll = false;
+        this.unSelection = [];
+        this.selectDataCounts = 0;
+        this.condition.moduleIds = this.selectNodeIds;
+        this.condition.projectId = getCurrentProjectID();
+        if (this.currentProtocol != null) {
+          this.condition.protocol = this.currentProtocol;
+        }
+
+        //检查是否只查询本周数据
+        this.getSelectDataRange();
+        this.condition.selectThisWeedData = false;
+        this.condition.apiCaseCoverage = null;
+        switch (this.selectDataRange) {
+          case 'thisWeekCount':
+            this.condition.selectThisWeedData = true;
+            break;
+          case 'uncoverage':
+            this.condition.apiCaseCoverage = 'uncoverage';
+            break;
+          case 'coverage':
+            this.condition.apiCaseCoverage = 'coverage';
+            break;
+        }
+        if (this.condition.projectId) {
+          this.result = this.$post("/api/definition/list/" + this.currentPage + "/" + this.pageSize, this.condition, response => {
+            this.total = response.data.itemCount;
+            this.tableData = response.data.listObject;
+            this.unSelection = response.data.listObject.map(s => s.id);
+
+            this.tableData.forEach(item => {
+              if (item.tags && item.tags.length > 0) {
+                item.tags = JSON.parse(item.tags);
+              }
+            })
           });
         }
-      } else {
-        this.selectRows.clear();
-        this.tableData.forEach(row => {
-          this.$set(row, "showMore", false);
-        })
-      }
-      this.selectRowsCount(this.selectRows)
-    },
-    search() {
-      this.changeSelectDataRangeAll();
-      this.initTable();
-    },
-    buildPagePath(path) {
-      return path + "/" + this.currentPage + "/" + this.pageSize;
-    },
-
-    editApi(row) {
-      this.$emit('editApi', row);
-    },
-    reductionApi(row) {
-      let tmp = JSON.parse(JSON.stringify(row));
-      tmp.request = null;
-      tmp.response = null;
-      if (tmp.tags instanceof Array) {
-        tmp.tags = JSON.stringify(tmp.tags);
-      }
-      let rows = [tmp];
-      this.$post('/api/definition/reduction/', rows, () => {
-        this.$success(this.$t('commons.save_success'));
-        this.search();
-      });
-    },
-    handleDeleteBatch() {
-      if (this.trashEnable) {
-        this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
-          confirmButtonText: this.$t('commons.confirm'),
-          callback: (action) => {
-            if (action === 'confirm') {
-              let deleteParam = {};
-              let ids = Array.from(this.selectRows).map(row => row.id);
-              deleteParam.dataIds = ids;
-              deleteParam.projectId = getCurrentProjectID();
-              deleteParam.selectAllDate = this.isSelectAllDate;
-              deleteParam.unSelectIds = this.unSelection;
-              deleteParam = Object.assign(deleteParam, this.condition);
-              this.$post('/api/definition/deleteBatchByParams/', deleteParam, () => {
-                this.selectRows.clear();
-                this.initTable();
-                this.$success(this.$t('commons.delete_success'));
-              });
-            }
-          }
+      },
+      getMaintainerOptions() {
+        let workspaceId = localStorage.getItem(WORKSPACE_ID);
+        this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+          this.valueArr.userId = response.data;
+          this.userFilters = response.data.map(u => {
+            return {text: u.name, value: u.id}
+          });
         });
-      } else {
-        this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
+      },
+      handleSelect(selection, row) {
+        row.hashTree = [];
+        if (this.selectRows.has(row)) {
+          this.$set(row, "showMore", false);
+          this.selectRows.delete(row);
+        } else {
+          this.$set(row, "showMore", true);
+          this.selectRows.add(row);
+        }
+        let arr = Array.from(this.selectRows);
+        // 选中1个以上的用例时显示更多操作
+        if (this.selectRows.size === 1) {
+          this.$set(arr[0], "showMore", true);
+        } else if (this.selectRows.size === 2) {
+          arr.forEach(row => {
+            this.$set(row, "showMore", true);
+          })
+        }
+        this.selectRowsCount(this.selectRows)
+      },
+      handleSelectAll(selection) {
+        if (selection.length > 0) {
+          if (selection.length === 1) {
+            selection.hashTree = [];
+            this.selectRows.add(selection[0]);
+          } else {
+            this.tableData.forEach(item => {
+              item.hashTree = [];
+              this.$set(item, "showMore", true);
+              this.selectRows.add(item);
+            });
+          }
+        } else {
+          this.selectRows.clear();
+          this.tableData.forEach(row => {
+            this.$set(row, "showMore", false);
+          })
+        }
+        this.selectRowsCount(this.selectRows)
+      },
+      search() {
+        this.changeSelectDataRangeAll();
+        this.initTable();
+      },
+      buildPagePath(path) {
+        return path + "/" + this.currentPage + "/" + this.pageSize;
+      },
+
+      editApi(row) {
+        this.$emit('editApi', row);
+      },
+      reductionApi(row) {
+        let tmp = JSON.parse(JSON.stringify(row));
+        tmp.request = null;
+        tmp.response = null;
+        if (tmp.tags instanceof Array) {
+          tmp.tags = JSON.stringify(tmp.tags);
+        }
+        let rows = [tmp];
+        this.$post('/api/definition/reduction/', rows, () => {
+          this.$success(this.$t('commons.save_success'));
+          this.search();
+        });
+      },
+      handleDeleteBatch() {
+        if (this.trashEnable) {
+          this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
+            confirmButtonText: this.$t('commons.confirm'),
+            callback: (action) => {
+              if (action === 'confirm') {
+                let deleteParam = {};
+                let ids = Array.from(this.selectRows).map(row => row.id);
+                deleteParam.dataIds = ids;
+                deleteParam.projectId = getCurrentProjectID();
+                deleteParam.selectAllDate = this.isSelectAllDate;
+                deleteParam.unSelectIds = this.unSelection;
+                deleteParam = Object.assign(deleteParam, this.condition);
+                this.$post('/api/definition/deleteBatchByParams/', deleteParam, () => {
+                  this.selectRows.clear();
+                  this.initTable();
+                  this.$success(this.$t('commons.delete_success'));
+                });
+              }
+            }
+          });
+        } else {
+          this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
+            confirmButtonText: this.$t('commons.confirm'),
+            callback: (action) => {
+              if (action === 'confirm') {
+                let ids = Array.from(this.selectRows).map(row => row.id);
+                let deleteParam = {};
+                deleteParam.dataIds = ids;
+                deleteParam.projectId = getCurrentProjectID();
+                deleteParam.selectAllDate = this.isSelectAllDate;
+                deleteParam.unSelectIds = this.unSelection;
+                deleteParam = Object.assign(deleteParam, this.condition);
+                this.$post('/api/definition/removeToGcByParams/', deleteParam, () => {
+                  this.selectRows.clear();
+                  this.initTable();
+                  this.$success(this.$t('commons.delete_success'));
+                  this.$refs.caseList.apiCaseClose();
+                });
+              }
+            }
+          });
+        }
+      },
+      handleEditBatch() {
+        this.$refs.batchEdit.open();
+      },
+      batchEdit(form) {
+        let arr = Array.from(this.selectRows);
+        let ids = arr.map(row => row.id);
+        let param = {};
+        param[form.type] = form.value;
+        param.ids = ids;
+
+        param.projectId = getCurrentProjectID();
+        param.selectAllDate = this.isSelectAllDate;
+        param.unSelectIds = this.unSelection;
+        param = Object.assign(param, this.condition);
+
+        this.$post('/api/definition/batch/editByParams', param, () => {
+          this.$success(this.$t('commons.save_success'));
+          this.initTable();
+        });
+      },
+      handleTestCase(api) {
+        this.selectApi = api;
+        let request = {};
+        if (Object.prototype.toString.call(api.request).match(/\[object (\w+)\]/)[1].toLowerCase() === 'object') {
+          request = api.request;
+        } else {
+          request = JSON.parse(api.request);
+        }
+        if (!request.hashTree) {
+          request.hashTree = [];
+        }
+        this.selectApi.url = request.path;
+        this.$refs.caseList.open(this.selectApi);
+      },
+      handleDelete(api) {
+        if (this.trashEnable) {
+          this.$get('/api/definition/delete/' + api.id, () => {
+            this.$success(this.$t('commons.delete_success'));
+            this.initTable();
+          });
+          return;
+        }
+        this.$alert(this.$t('api_test.definition.request.delete_confirm') + ' ' + api.name + " ？", '', {
           confirmButtonText: this.$t('commons.confirm'),
           callback: (action) => {
             if (action === 'confirm') {
-              let ids = Array.from(this.selectRows).map(row => row.id);
-              let deleteParam = {};
-              deleteParam.dataIds = ids;
-              deleteParam.projectId = getCurrentProjectID();
-              deleteParam.selectAllDate = this.isSelectAllDate;
-              deleteParam.unSelectIds = this.unSelection;
-              deleteParam = Object.assign(deleteParam, this.condition);
-              this.$post('/api/definition/removeToGcByParams/', deleteParam, () => {
-                this.selectRows.clear();
-                this.initTable();
+              let ids = [api.id];
+              this.$post('/api/definition/removeToGc/', ids, () => {
                 this.$success(this.$t('commons.delete_success'));
+                this.initTable();
                 this.$refs.caseList.apiCaseClose();
               });
             }
           }
         });
-      }
-    },
-    handleEditBatch() {
-      this.$refs.batchEdit.open();
-    },
-    batchEdit(form) {
-      let arr = Array.from(this.selectRows);
-      let ids = arr.map(row => row.id);
-      let param = {};
-      param[form.type] = form.value;
-      param.ids = ids;
-
-      param.projectId = getCurrentProjectID();
-      param.selectAllDate = this.isSelectAllDate;
-      param.unSelectIds = this.unSelection;
-      param = Object.assign(param, this.condition);
-
-      this.$post('/api/definition/batch/editByParams', param, () => {
-        this.$success(this.$t('commons.save_success'));
-        this.initTable();
-      });
-    },
-    handleTestCase(api) {
-      this.selectApi = api;
-      let request = {};
-      if (Object.prototype.toString.call(api.request).match(/\[object (\w+)\]/)[1].toLowerCase() === 'object') {
-        request = api.request;
-      } else {
-        request = JSON.parse(api.request);
-      }
-      if (!request.hashTree) {
-        request.hashTree = [];
-      }
-      this.selectApi.url = request.path;
-      this.$refs.caseList.open(this.selectApi);
-    },
-    handleDelete(api) {
-      if (this.trashEnable) {
-        this.$get('/api/definition/delete/' + api.id, () => {
-          this.$success(this.$t('commons.delete_success'));
-          this.initTable();
-        });
-        return;
-      }
-      this.$alert(this.$t('api_test.definition.request.delete_confirm') + ' ' + api.name + " ？", '', {
-        confirmButtonText: this.$t('commons.confirm'),
-        callback: (action) => {
-          if (action === 'confirm') {
-            let ids = [api.id];
-            this.$post('/api/definition/removeToGc/', ids, () => {
-              this.$success(this.$t('commons.delete_success'));
-              this.initTable();
-              this.$refs.caseList.apiCaseClose();
-            });
-          }
+      },
+      getColor(enable, method) {
+        if (enable) {
+          return this.methodColorMap.get(method);
         }
-      });
-    },
-    getColor(enable, method) {
-      if (enable) {
-        return this.methodColorMap.get(method);
+      },
+      showExecResult(row) {
+        this.$emit('showExecResult', row);
+      },
+      selectRowsCount(selection) {
+        let selectedIDs = this.getIds(selection);
+        let allIDs = this.tableData.map(s => s.id);
+        this.unSelection = allIDs.filter(function (val) {
+          return selectedIDs.indexOf(val) === -1
+        });
+        if (this.isSelectAllDate) {
+          this.selectDataCounts = this.total - this.unSelection.length;
+        } else {
+          this.selectDataCounts = selection.size;
+        }
+      },
+      isSelectDataAll(dataType) {
+        this.isSelectAllDate = dataType;
+        this.selectRowsCount(this.selectRows)
+        //如果已经全选，不需要再操作了
+        if (this.selectRows.size != this.tableData.length) {
+          this.$refs.apiDefinitionTable.toggleAllSelection(true);
+        }
+      },
+      //判断是否只显示本周的数据。  从首页跳转过来的请求会带有相关参数
+      getSelectDataRange() {
+        let dataRange = this.$route.params.dataSelectRange;
+        let dataType = this.$route.params.dataType;
+        if (dataType === 'api') {
+          this.selectDataRange = dataRange;
+        } else {
+          this.selectDataRange = 'all';
+        }
+      },
+      changeSelectDataRangeAll() {
+        this.$emit("changeSelectDataRangeAll", "api");
+      },
+      getIds(rowSets) {
+        let rowArray = Array.from(rowSets)
+        let ids = rowArray.map(s => s.id);
+        return ids;
+      },
+      sort(column) {
+        // 每次只对一个字段排序
+        if (this.condition.orders) {
+          this.condition.orders = [];
+        }
+        _sort(column, this.condition);
+        this.initTable();
+      },
+      filter(filters) {
+        _filter(filters, this.condition);
+        this.initTable();
+      },
+      open() {
+        this.$refs.searchBar.open();
       }
     },
-    showExecResult(row) {
-      this.$emit('showExecResult', row);
-    },
-    selectRowsCount(selection) {
-      let selectedIDs = this.getIds(selection);
-      let allIDs = this.tableData.map(s => s.id);
-      this.unSelection = allIDs.filter(function (val) {
-        return selectedIDs.indexOf(val) === -1
-      });
-      if (this.isSelectAllDate) {
-        this.selectDataCounts = this.total - this.unSelection.length;
-      } else {
-        this.selectDataCounts = selection.size;
-      }
-    },
-    isSelectDataAll(dataType) {
-      this.isSelectAllDate = dataType;
-      this.selectRowsCount(this.selectRows)
-      //如果已经全选，不需要再操作了
-      if (this.selectRows.size != this.tableData.length) {
-        this.$refs.apiDefinitionTable.toggleAllSelection(true);
-      }
-    },
-    //判断是否只显示本周的数据。  从首页跳转过来的请求会带有相关参数
-    getSelectDataRange() {
-      let dataRange = this.$route.params.dataSelectRange;
-      let dataType = this.$route.params.dataType;
-      if (dataType === 'api') {
-        this.selectDataRange = dataRange;
-      } else {
-        this.selectDataRange = 'all';
-      }
-    },
-    changeSelectDataRangeAll() {
-      this.$emit("changeSelectDataRangeAll", "api");
-    },
-    getIds(rowSets) {
-      let rowArray = Array.from(rowSets)
-      let ids = rowArray.map(s => s.id);
-      return ids;
-    },
-    sort(column) {
-      // 每次只对一个字段排序
-      if (this.condition.orders) {
-        this.condition.orders = [];
-      }
-      _sort(column, this.condition);
-      this.initTable();
-    },
-    filter(filters) {
-      _filter(filters, this.condition);
-      this.initTable();
-    },
-  },
-}
+  }
 </script>
 
 <style scoped>
-.operate-button > div {
-  display: inline-block;
-  margin-left: 10px;
-}
+  .operate-button > div {
+    display: inline-block;
+    margin-left: 10px;
+  }
 
-.request-method {
-  padding: 0 5px;
-  color: #1E90FF;
-}
+  .request-method {
+    padding: 0 5px;
+    color: #1E90FF;
+  }
 
-.api-el-tag {
-  color: white;
-}
+  .api-el-tag {
+    color: white;
+  }
 
-.search-input {
-  float: right;
-  width: 300px;
-  margin-right: 20px;
-}
+  .search-input {
+    float: right;
+    width: 300px;
+    margin-right: 10px;
+  }
 
-.el-tag {
-  margin-left: 10px;
-}
+  .el-tag {
+    margin-left: 10px;
+  }
 
-.ms-select-all >>> th:first-child {
-  margin-top: 20px;
-}
+  .ms-select-all >>> th:first-child {
+    margin-top: 20px;
+  }
 
-.ms-select-all >>> th:nth-child(2) .el-icon-arrow-down {
-  top: -2px;
-}
+  .ms-select-all >>> th:nth-child(2) .el-icon-arrow-down {
+    top: -2px;
+  }
 
 </style>
diff --git a/frontend/src/business/components/api/definition/model/JsonData.js b/frontend/src/business/components/api/definition/model/JsonData.js
index 3b700369f9..75fa446ac5 100644
--- a/frontend/src/business/components/api/definition/model/JsonData.js
+++ b/frontend/src/business/components/api/definition/model/JsonData.js
@@ -6,6 +6,15 @@ export const PRIORITY = [
   {name: 'P3', id: 'P3'}
 ]
 
+export const CASE_ORDER = [
+  {label: 'api_test.definition.request.grade_order_asc', name: 'priority', type: 'desc', id: 'grade_order_asc'},
+  {label: 'api_test.definition.request.grade_order_desc', name: 'priority', type: 'asc', id: 'grade_order_desc'},
+  {label: 'api_test.definition.request.create_time_order_asc', name: 'create_time', type: 'asc', id: 'create_time_order_asc'},
+  {label: 'api_test.definition.request.create_time_order_desc', name: 'create_time', type: 'desc', id: 'create_time_order_desc'},
+  {label: 'api_test.definition.request.update_time_order_asc', name: 'update_time', type: 'asc', id: 'update_time_order_asc'},
+  {label: 'api_test.definition.request.update_time_order_desc', name: 'update_time', type: 'desc', id: 'update_time_order_desc'}
+]
+
 export const OPTIONS = [
   {value: 'HTTP', name: 'HTTP'},
   {value: 'TCP', name: 'TCP'},
diff --git a/frontend/src/business/components/common/components/search/MsTableAdvSearchBar.vue b/frontend/src/business/components/common/components/search/MsTableAdvSearchBar.vue
index c2545c9502..451965d1df 100644
--- a/frontend/src/business/components/common/components/search/MsTableAdvSearchBar.vue
+++ b/frontend/src/business/components/common/components/search/MsTableAdvSearchBar.vue
@@ -1,6 +1,6 @@
 <template>
   <span class="adv-search-bar">
-    <el-link type="primary" @click="open">{{$t('commons.adv_search.title')}}</el-link>
+    <el-link type="primary" @click="open" v-if="showLink">{{$t('commons.adv_search.title')}}</el-link>
     <el-dialog :title="$t('commons.adv_search.combine')" :visible.sync="visible" custom-class="adv-dialog"
                :append-to-body="true">
       <div>
@@ -28,6 +28,10 @@
     name: "MsTableAdvSearchBar",
     props: {
       condition: Object,
+      showLink: {
+        type: Boolean,
+        default: true,
+      }
     },
     data() {
       return {
diff --git a/frontend/src/business/components/common/components/search/search-components.js b/frontend/src/business/components/common/components/search/search-components.js
index e7bcad4b0d..9dd685456f 100644
--- a/frontend/src/business/components/common/components/search/search-components.js
+++ b/frontend/src/business/components/common/components/search/search-components.js
@@ -115,6 +115,101 @@ export const STATUS = {
   }
 }
 
+export const API_STATUS = {
+  key: "status",
+  name: 'MsTableSearchSelect',
+  label: 'commons.status',
+  operator: {
+    options: [OPERATORS.IN, OPERATORS.NOT_IN]
+  },
+  options: [
+    {value: 'Prepare', label: '未开始'},
+    {value: 'Underway', label: '进行中'},
+    {value: 'Completed', label: '已完成'}
+  ],
+  props: { // 尾部控件的props，一般为element ui控件的props
+    multiple: true
+  }
+}
+export const API_CASE_PRIORITY = {
+  key: "priority",
+  name: 'MsTableSearchSelect',
+  label: 'test_track.case.priority',
+  operator: {
+    options: [OPERATORS.IN, OPERATORS.NOT_IN]
+  },
+  options: [
+    {value: 'P0', label: 'P0'},
+    {value: 'P1', label: 'P1'},
+    {value: 'P2', label: 'P2'},
+    {value: 'P3', label: 'P3'}
+  ],
+  props: { // 尾部控件的props，一般为element ui控件的props
+    multiple: true
+  }
+}
+export const API_CASE_RESULT = {
+  key: "status",
+  name: 'MsTableSearchSelect',
+  label: 'test_track.plan_view.execute_result',
+  operator: {
+    options: [OPERATORS.IN, OPERATORS.NOT_IN]
+  },
+  options: [
+    {value: 'success', label: 'api_test.automation.success'},
+    {value: 'error', label: 'api_test.automation.fail'}
+  ],
+  props: { // 尾部控件的props，一般为element ui控件的props
+    multiple: true
+  }
+}
+
+export const API_METHOD = {
+  key: "method",
+  name: 'MsTableSearchSelect',
+  label: 'api_test.definition.api_type',
+  operator: {
+    options: [OPERATORS.IN, OPERATORS.NOT_IN]
+  },
+  options: [
+    {value: 'GET', label: 'GET'},
+    {value: 'POST', label: 'POST'},
+    {value: 'PUT', label: 'PUT'},
+    {value: 'PATCH', label: 'PATCH'},
+    {value: 'DELETE', label: 'DELETE'},
+    {value: 'OPTIONS', label: 'OPTIONS'},
+    {value: 'HEAD', label: 'HEAD'},
+    {value: 'CONNECT', label: 'CONNECT'},
+    {value: 'DUBBO', label: 'DUBBO'},
+    {value: 'dubbo://', label: 'dubbo://'},
+    {value: 'SQL', label: 'SQL'},
+    {value: 'TCP', label: 'TCP'}
+  ],
+  props: { // 尾部控件的props，一般为element ui控件的props
+    multiple: true
+  }
+}
+
+export const API_PATH = {
+  key: "path", // 返回结果Map的key
+  name: 'MsTableSearchInput', // Vue控件名称
+  label: 'api_test.definition.api_path', // 显示名称
+  operator: { // 运算符设置
+    value: OPERATORS.LIKE.value, // 如果未设置value初始值，则value初始值为options[0]
+    options: [OPERATORS.LIKE, OPERATORS.NOT_LIKE] // 运算符候选项
+  },
+}
+
+export const API_TAGS = {
+  key: "tags", // 返回结果Map的key
+  name: 'MsTableSearchInput', // Vue控件名称
+  label: 'commons.tag', // 显示名称
+  operator: { // 运算符设置
+    value: OPERATORS.LIKE.value, // 如果未设置value初始值，则value初始值为options[0]
+    options: [OPERATORS.LIKE, OPERATORS.NOT_LIKE] // 运算符候选项
+  },
+}
+
 export const CREATOR = {
   key: "creator",
   name: 'MsTableSearchSelect',
@@ -311,10 +406,14 @@ export const TEST_PLAN_STATUS = {
   }
 };
 
-export const TEST_CONFIGS = [NAME, UPDATE_TIME, PROJECT_NAME, CREATE_TIME, STATUS, CREATOR];
+export const TEST_CONFIGS = [NAME, UPDATE_TIME, CREATE_TIME, STATUS, CREATOR];
 
-export const REPORT_CONFIGS = [NAME, TEST_NAME, PROJECT_NAME, CREATE_TIME, STATUS, CREATOR, TRIGGER_MODE];
+export const REPORT_CONFIGS = [NAME, TEST_NAME, CREATE_TIME, STATUS, CREATOR, TRIGGER_MODE];
 
 export const TEST_CASE_CONFIGS = [NAME, MODULE, PRIORITY, CREATE_TIME, TYPE, UPDATE_TIME, METHOD, CREATOR, EXECUTOR];
 
-export const TEST_PLAN_CONFIGS = [NAME, UPDATE_TIME, PROJECT_NAME, CREATE_TIME, PRINCIPAL, TEST_PLAN_STATUS, STAGE];
+export const TEST_PLAN_CONFIGS = [NAME, UPDATE_TIME, CREATE_TIME, PRINCIPAL, TEST_PLAN_STATUS, STAGE];
+
+export const API_DEFINITION_CONFIGS = [NAME, API_METHOD, API_PATH, API_STATUS, API_TAGS, UPDATE_TIME, CREATE_TIME, CREATOR];
+
+export const API_CASE_CONFIGS = [NAME, API_CASE_PRIORITY, API_TAGS,API_CASE_RESULT, UPDATE_TIME, CREATE_TIME, CREATOR];
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index d7e9bb243d..2ba6cd5f6b 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -517,6 +517,12 @@ export default {
       },
       request: {
         grade_info: "Filter by rank",
+        grade_order_asc: "from high to low by use case level",
+        grade_order_desc: "from high to low by use case level,",
+        create_time_order_asc: "by creation time from front to back",
+        create_time_order_desc: "from back to front by creation time,",
+        update_time_order_asc: "by update time from front to back",
+        update_time_order_desc: "from back to front by update time,",
         run_env: "Operating environment",
         select_case: "Search use cases",
         case: "Case",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 7aa1dfeb64..e83f4ebf27 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -515,6 +515,12 @@ export default {
       },
       request: {
         grade_info: "按等级筛选",
+        grade_order_asc: "按用例等级从高到低",
+        grade_order_desc: "按用例等级从高到低",
+        create_time_order_asc: "按创建时间从前到后",
+        create_time_order_desc: "按创建时间从后到前",
+        update_time_order_asc: "按更新时间从前到后",
+        update_time_order_desc: "按更新时间从后到前",
         run_env: "运行环境",
         select_case: "搜索用例",
         case: "用例",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 8a4e0202bd..719de09a8f 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -515,6 +515,12 @@ export default {
       },
       request: {
         grade_info: "按等級篩選",
+        grade_order_asc: "按用例等級從高到低",
+        grade_order_desc: "按用例等級從高到低",
+        create_time_order_asc: "按創建時間從前到後",
+        create_time_order_desc: "按創建時間從後到前",
+        update_time_order_asc: "按更新時間從前到後",
+        update_time_order_desc: "按更新時間從後到前",
         run_env: "運行環境",
         select_case: "搜索用例",
         case: "用例",

From d64691fe9a28fdebc9a5344f1fcbc9014318fab9 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 11 Jan 2021 14:08:48 +0800
Subject: [PATCH 3/8] =?UTF-8?q?refactor:=20=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=A1=A8=E5=A4=B4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtLoadTestMapper.xml     | 49 +++++++++++--------
 .../performance/test/PerformanceTestList.vue  | 19 +++++--
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
index 3ee03e4735..6e5806ac28 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="io.metersphere.base.mapper.ext.ExtLoadTestMapper">
-
     <resultMap id="BaseResultMap" type="io.metersphere.dto.LoadTestDTO"
                extends="io.metersphere.base.mapper.LoadTestMapper.BaseResultMap">
         <result column="project_name" property="projectName"/>
@@ -14,37 +13,37 @@
 
     <sql id="combine">
         <if test='${condition}.name != null and (${name} == null or ${name} == "")'>
-            and load_test.name
+            AND load_test.name
             <include refid="condition">
                 <property name="object" value="${condition}.name"/>
             </include>
         </if>
         <if test="${condition}.updateTime != null">
-            and load_test.update_time
+            AND load_test.update_time
             <include refid="condition">
                 <property name="object" value="${condition}.updateTime"/>
             </include>
         </if>
         <if test="${condition}.projectName != null">
-            and project.name
+            AND project.name
             <include refid="condition">
                 <property name="object" value="${condition}.projectName"/>
             </include>
         </if>
         <if test="${condition}.createTime != null">
-            and load_test.create_time
+            AND load_test.create_time
             <include refid="condition">
                 <property name="object" value="${condition}.createTime"/>
             </include>
         </if>
         <if test="${condition}.status != null">
-            and load_test.status
+            AND load_test.status
             <include refid="condition">
                 <property name="object" value="${condition}.status"/>
             </include>
         </if>
         <if test="${condition}.creator != null">
-            and load_test.user_id
+            AND load_test.user_id
             <include refid="condition">
                 <property name="object" value="${condition}.creator"/>
             </include>
@@ -53,10 +52,10 @@
 
     <select id="list" resultMap="BaseResultMap"
             parameterType="io.metersphere.track.request.testplan.QueryTestPlanRequest">
-        select load_test.*, project.name as project_name, user.name as user_name
-        from load_test
-        left join project on load_test.project_id = project.id
-        left join user on load_test.user_id = user.id
+        SELECT load_test.*, project.name AS project_name, user.name AS user_name
+        FROM load_test
+                     LEFT JOIN project ON load_test.project_id = project.id
+                     LEFT JOIN user ON load_test.user_id = user.id
         <where>
             <if test="request.combine != null">
                 <include refid="combine">
@@ -65,10 +64,10 @@
                 </include>
             </if>
             <if test="request.name != null">
-                and load_test.name like CONCAT('%', #{request.name},'%')
+                and load_test.name LIKE CONCAT('%', #{request.name}, '%')
             </if>
             <if test="request.userId != null">
-                and load_test.user_id= #{request.userId}
+                AND load_test.user_id = #{request.userId}
             </if>
             <if test="request.workspaceId != null">
                 AND project.workspace_id = #{request.workspaceId}
@@ -82,23 +81,33 @@
             <if test="request.filters != null and request.filters.size() > 0">
                 <foreach collection="request.filters.entrySet()" index="key" item="values">
                     <if test="values != null and values.size() > 0">
-                        and load_test.status in
-                        <foreach collection="values" item="value" separator="," open="(" close=")">
-                            #{value}
-                        </foreach>
+                        <choose>
+                            <when test="key == 'status'">
+                                AND load_test.status IN
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
+                            <when test="key == 'user_id'">
+                                AND load_test.user_id IN
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
+                        </choose>
                     </if>
                 </foreach>
             </if>
         </where>
         <if test="request.orders != null and request.orders.size() > 0">
-            order by
+            ORDER BY
             <foreach collection="request.orders" separator="," item="order">
                 load_test.${order.name} ${order.type}
             </foreach>
         </if>
     </select>
     <select id="getLoadTestByProjectId" resultType="io.metersphere.base.domain.LoadTest">
-        SELECT id,name
+        SELECT id, name
         FROM load_test
         WHERE project_id = #{projectId}
     </select>
@@ -106,7 +115,7 @@
     <select id="checkLoadTestOwner" resultType="int">
         SELECT COUNT(1)
         FROM load_test
-        LEFT JOIN project ON load_test.project_id = project.id
+                     LEFT JOIN project ON load_test.project_id = project.id
         <where>
             <if test="testId != null">
                 and load_test.id = #{testId}
diff --git a/frontend/src/business/components/performance/test/PerformanceTestList.vue b/frontend/src/business/components/performance/test/PerformanceTestList.vue
index b309eee0a2..80d3210f0d 100644
--- a/frontend/src/business/components/performance/test/PerformanceTestList.vue
+++ b/frontend/src/business/components/performance/test/PerformanceTestList.vue
@@ -27,6 +27,9 @@
           </el-table-column>
           <el-table-column
             prop="userName"
+            sortable="custom"
+            :filters="userFilters"
+            column-key="user_id"
             :label="$t('load_test.user_name')"
             width="150"
             show-overflow-tooltip>
@@ -80,11 +83,11 @@ import MsContainer from "../../common/components/MsContainer";
 import MsMainContainer from "../../common/components/MsMainContainer";
 import MsPerformanceTestStatus from "./PerformanceTestStatus";
 import MsTableOperators from "../../common/components/MsTableOperators";
-import {_filter, _sort} from "@/common/js/utils";
+import {_filter, _sort, getCurrentProjectID} from "@/common/js/utils";
 import MsTableHeader from "../../common/components/MsTableHeader";
 import {TEST_CONFIGS} from "../../common/components/search/search-components";
 import {LIST_CHANGE, PerformanceEvent} from "@/business/components/common/head/ListEvent";
-import {getCurrentProjectID} from "../../../../common/js/utils";
+import {WORKSPACE_ID} from "@/common/js/constants";
 
 export default {
   components: {
@@ -131,7 +134,8 @@ export default {
         {text: 'Reporting', value: 'Reporting'},
         {text: 'Completed', value: 'Completed'},
         {text: 'Error', value: 'Error'}
-      ]
+      ],
+      userFilters: [],
     }
   },
   watch: {
@@ -143,8 +147,17 @@ export default {
   created: function () {
     this.projectId = this.$route.params.projectId;
     this.initTableData();
+    this.getMaintainerOptions();
   },
   methods: {
+    getMaintainerOptions() {
+      let workspaceId = localStorage.getItem(WORKSPACE_ID);
+      this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+        this.userFilters = response.data.map(u => {
+          return {text: u.name, value: u.id}
+        });
+      });
+    },
     initTableData() {
       if (this.projectId !== 'all') {
         this.condition.projectId = this.projectId;

From fa53228f9770e3a2418ba5870e6cbba3cfdd49e8 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 11 Jan 2021 14:45:11 +0800
Subject: [PATCH 4/8] =?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=8DSQL=E7=B1=BB=E5=9E=8B=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E6=97=A0=E6=B3=95=E5=88=87=E6=8D=A2=E7=8E=AF=E5=A2=83?=
 =?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   | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 6587cdbc44..f76c65e929 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -524,8 +524,7 @@
         }
         this.sort();
         this.reload();
-      }
-      ,
+      },
       nodeClick(e) {
         if (e.referenced != 'REF' && e.referenced != 'Deleted') {
           this.operatingElements = ELEMENTS.get(e.type);
@@ -533,8 +532,7 @@
           this.operatingElements = [];
         }
         this.selectedTreeNode = e;
-      }
-      ,
+      },
       suggestClick(node) {
         this.response = {};
         if (node.parent && node.parent.data.requestResult) {
@@ -544,13 +542,11 @@
       showAll() {
         this.operatingElements = ELEMENTS.get("ALL");
         this.selectedTreeNode = undefined;
-        this.reload();
-      }
-      ,
+        //this.reload();
+      },
       apiListImport() {
         this.$refs.scenarioApiRelevance.open();
-      }
-      ,
+      },
       recursiveSorting(arr) {
         for (let i in arr) {
           arr[i].index = Number(i) + 1;
@@ -558,8 +554,7 @@
             this.recursiveSorting(arr[i].hashTree);
           }
         }
-      }
-      ,
+      },
       sort() {
         for (let i in this.scenarioDefinition) {
           this.scenarioDefinition[i].index = Number(i) + 1;
@@ -567,8 +562,7 @@
             this.recursiveSorting(this.scenarioDefinition[i].hashTree);
           }
         }
-      }
-      ,
+      },
       addCustomizeApi(request) {
         this.customizeVisible = false;
         request.enable === undefined ? request.enable = true : request.enable;
@@ -1034,5 +1028,6 @@
   .ms-opt-btn {
     position: fixed;
     right: 50px;
+    z-index: 1;
   }
 </style>

From 60374f6094463ab8d2517b3ed4e1c431c9f4023b Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 11 Jan 2021 14:55:03 +0800
Subject: [PATCH 5/8] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E5=86=8D=E6=AC=A1=E6=89=A7=E8=A1=8C=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=97=B6avgTransactions=E6=9C=AA=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/performance/report/components/TestOverview.vue    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/business/components/performance/report/components/TestOverview.vue b/frontend/src/business/components/performance/report/components/TestOverview.vue
index f84fb0e043..c648e96962 100644
--- a/frontend/src/business/components/performance/report/components/TestOverview.vue
+++ b/frontend/src/business/components/performance/report/components/TestOverview.vue
@@ -499,6 +499,7 @@ export default {
         } else {
           this.maxUsers = '0';
           this.avgThroughput = '0';
+          this.avgTransactions = '0';
           this.errors = '0';
           this.avgResponseTime = '0';
           this.responseTime90 = '0';

From 869b66e551f82344ed1547b22fd89e7c5546a41d Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 11 Jan 2021 15:11:24 +0800
Subject: [PATCH 6/8] =?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=8DJSON=20=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=AF=B7=E6=B1=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/api/dto/scenario/Body.java     |  4 +++-
 .../java/io/metersphere/api/dto/scenario/KeyValue.java | 10 +++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/Body.java b/backend/src/main/java/io/metersphere/api/dto/scenario/Body.java
index bfc0729c12..4a71274612 100644
--- a/backend/src/main/java/io/metersphere/api/dto/scenario/Body.java
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/Body.java
@@ -42,11 +42,13 @@ public class Body {
             return true;
         } else return false;
     }
+
     public boolean isOldKV() {
         if (StringUtils.equals(type, KV)) {
             return true;
         } else return false;
     }
+
     public List<KeyValue> getBodyParams(HTTPSamplerProxy sampler, String requestId) {
         List<KeyValue> body = new ArrayList<>();
         if (this.isKV() || this.isBinary()) {
@@ -65,7 +67,7 @@ public class Body {
                     this.raw = JSONSchemaGenerator.getJson(com.alibaba.fastjson.JSON.toJSONString(this.getJsonSchema()));
                 }
             }
-            KeyValue keyValue = new KeyValue("", this.getRaw());
+            KeyValue keyValue = new KeyValue("", "JSON-SCHEMA", this.getRaw(), true, true);
             keyValue.setEnable(true);
             keyValue.setEncode(false);
             body.add(keyValue);
diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java b/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
index 5a7e978ac6..85153d2bcd 100644
--- a/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
@@ -31,6 +31,14 @@ public class KeyValue {
         this(name, value, description, null);
     }
 
+    public KeyValue(String name, String type, String value, boolean required, boolean enable) {
+        this.name = name;
+        this.type = type;
+        this.value = value;
+        this.required = required;
+        this.enable = enable;
+    }
+
     public KeyValue(String name, String value, String description, String contentType) {
         this(name, value, description, contentType, true);
     }
@@ -49,7 +57,7 @@ public class KeyValue {
     }
 
     public boolean isValid() {
-        return (StringUtils.isNotBlank(name) && StringUtils.isNotBlank(value)) && !StringUtils.equalsIgnoreCase(type, "file");
+        return ((StringUtils.isNotBlank(name) && StringUtils.isNotBlank(value)) || "JSON-SCHEMA".equals(type)) && !StringUtils.equalsIgnoreCase(type, "file");
     }
 
     public boolean isFile() {

From 6ab9e3ade853bffd1096df4760365d3b25232dc0 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 11 Jan 2021 15:54:30 +0800
Subject: [PATCH 7/8] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92):=20=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E5=88=97=E8=A1=A8i18n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../comonents/load/TestPlanLoadCaseList.vue   | 33 +++++++++----------
 frontend/src/i18n/en-US.js                    | 10 ++++++
 frontend/src/i18n/zh-CN.js                    | 10 ++++++
 frontend/src/i18n/zh-TW.js                    | 10 ++++++
 4 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
index b6f39381f9..11ea445db5 100644
--- a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
@@ -48,14 +48,14 @@
             <span>{{ scope.row.createTime | timestampFormatDate }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          sortable
-          prop="updateTime"
-          :label="$t('commons.update_time')">
-          <template v-slot:default="scope">
-            <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
-          </template>
-        </el-table-column>
+<!--        <el-table-column-->
+<!--          sortable-->
+<!--          prop="updateTime"-->
+<!--          :label="$t('commons.update_time')">-->
+<!--          <template v-slot:default="scope">-->
+<!--            <span>{{ scope.row.updateTime | timestampFormatDate }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column
           prop="status"
           column-key="status"
@@ -67,7 +67,7 @@
         </el-table-column>
         <el-table-column
           prop="caseStatus"
-          label="执行状态">
+          :label="$t('test_track.plan.load_case.execution_status')">
           <template v-slot:default="{row}">
             <el-tag size="mini" type="danger" v-if="row.caseStatus === 'error'">
               {{ row.caseStatus }}
@@ -79,11 +79,11 @@
           </template>
         </el-table-column>
         <el-table-column
-          label="报告"
+          :label="$t('test_track.plan.load_case.report')"
           show-overflow-tooltip>
           <template v-slot:default="scope">
             <div v-loading="loading === scope.row.id">
-              <el-link type="info" @click="getReport(scope.row)" v-if="scope.row.loadReportId">查看报告</el-link>
+              <el-link type="info" @click="getReport(scope.row)" v-if="scope.row.loadReportId">{{ $t('test_track.plan.load_case.view_report') }}</el-link>
               <span v-else> - </span>
             </div>
           </template>
@@ -141,10 +141,10 @@ export default {
         //   name: "批量编辑用例", handleClick: this.handleBatchEdit
         // },
         {
-          name: "批量取消关联", handleClick: this.handleDeleteBatch
+          name: this.$t('test_track.plan.load_case.unlink_in_bulk'), handleClick: this.handleDeleteBatch
         },
         {
-          name: "批量执行用例", handleClick: this.handleRunBatch
+          name: this.$t('test_track.plan.load_case.batch_exec_cases'), handleClick: this.handleRunBatch
         }
       ],
       statusFilters: [
@@ -200,7 +200,6 @@ export default {
         if (arr.length > 0) {
           this.initTable();
         } else {
-          setTimeout(this.initTable, 3000);
           clearInterval(this.refreshScheduler);
         }
       }, 4000);
@@ -263,7 +262,7 @@ export default {
       }).then(() => {
         this.$notify({
           title: loadCase.caseName,
-          message: '正在执行....',
+          message: this.$t('test_track.plan.load_case.exec'),
           type: 'success'
         });
         this.initTable();
@@ -274,7 +273,7 @@ export default {
         });
         this.$notify.error({
           title: loadCase.caseName,
-          message: '用例执行错误，请单独调试该用例！'
+          message: this.$t('test_track.plan.load_case.error')
         });
       })
     },
@@ -310,7 +309,7 @@ export default {
         if (exist) {
           this.$refs.loadCaseReport.drawer = true;
         } else {
-          this.$warning("报告不存在");
+          this.$warning(this.$t('test_track.plan.load_case.report_not_found'));
           // this.initTable();
         }
       })
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 2ba6cd5f6b..46b74f7012 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1103,6 +1103,16 @@ export default {
       plan_delete_confirm: "All use cases under this plan will be deleted,confirm delete test plan: ",
       plan_delete_tip: "The test plan is under way, please confirm and delete it!",
       plan_delete: "Delete test plan",
+      load_case: {
+        execution_status: "Execution status",
+        report: "report",
+        view_report: "View report",
+        unlink_in_bulk: "Unlink in bulk",
+        batch_exec_cases: "Batch execution use cases",
+        exec: "Executing....",
+        error: "Use case execution error, please debug this use case separately!",
+        report_not_found: "Report does not exist",
+      }
     },
     review: {
       test_review: "Test Review",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index e83f4ebf27..9f7ebec1d7 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1104,6 +1104,16 @@ export default {
       plan_delete_confirm: "将删除该测试计划下所有用例，确认删除测试计划: ",
       plan_delete_tip: "该测试计划正在进行中，请确认再删除！",
       plan_delete: "删除计划",
+      load_case: {
+        execution_status: "执行状态",
+        report: "报告",
+        view_report: "查看报告",
+        unlink_in_bulk: "批量取消关联",
+        batch_exec_cases: "批量执行用例",
+        exec: "正在执行....",
+        error: "用例执行错误，请单独调试该用例！",
+        report_not_found: "报告不存在",
+      }
     },
     review: {
       test_review: "用例评审",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 719de09a8f..e16fea582f 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1104,6 +1104,16 @@ export default {
       plan_delete_confirm: "將刪除該測試計劃下所有用例，確認刪除測試計劃: ",
       plan_delete_tip: "該測試計劃正在進行中，請確認再刪除！",
       plan_delete: "刪除計劃",
+      load_case: {
+        execution_status: "執行狀態",
+        report: "報告",
+        view_report: "查看報告",
+        unlink_in_bulk: "批量取消關聯",
+        batch_exec_cases: "批量執行用例",
+        exec: "正在執行....",
+        error: "用例執行錯誤，請單獨調試該用例！",
+        report_not_found: "報告不存在",
+      }
     },
     review: {
       test_review: "用例評審",

From 6b57e3a3e2a50cb4cfb20ee385e48a29796f9790 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 11 Jan 2021 15:54:49 +0800
Subject: [PATCH 8/8] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E6=89=80=E6=9C=89=E9=AB=98=E7=BA=A7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=A2=9E=E5=8A=A0TAGS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtApiScenarioMapper.xml  |  94 ++
 .../base/mapper/ext/ExtApiTestCaseMapper.xml  |  93 +-
 .../base/mapper/ext/ExtTestCaseMapper.xml     |   7 +
 .../automation/scenario/ApiScenarioList.vue   | 639 ++++++-------
 .../components/list/ApiCaseSimpleList.vue     | 887 +++++++++---------
 .../components/search/search-components.js    |   4 +-
 6 files changed, 920 insertions(+), 804 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
index 0958a12dd2..0de6fad92b 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
@@ -7,7 +7,94 @@
         <result column="project_name" property="projectName"/>
         <result column="user_name" property="userName"/>
     </resultMap>
+    <sql id="condition">
+        <choose>
+            <when test='${object}.operator == "like"'>
+                like CONCAT('%', #{${object}.value},'%')
+            </when>
+            <when test='${object}.operator == "not like"'>
+                not like CONCAT('%', #{${object}.value},'%')
+            </when>
+            <when test='${object}.operator == "in"'>
+                in
+                <foreach collection="${object}.value" item="v" separator="," open="(" close=")">
+                    #{v}
+                </foreach>
+            </when>
+            <when test='${object}.operator == "not in"'>
+                not in
+                <foreach collection="${object}.value" item="v" separator="," open="(" close=")">
+                    #{v}
+                </foreach>
+            </when>
+            <when test='${object}.operator == "between"'>
+                between #{${object}.value[0]} and #{${object}.value[1]}
+            </when>
+            <when test='${object}.operator == "gt"'>
+                &gt; #{${object}.value}
+            </when>
+            <when test='${object}.operator == "lt"'>
+                &lt; #{${object}.value}
+            </when>
+            <when test='${object}.operator == "ge"'>
+                &gt;= #{${object}.value}
+            </when>
+            <when test='${object}.operator == "le"'>
+                &lt;= #{${object}.value}
+            </when>
+            <when test='${object}.operator == "current user"'>
+                = '${@io.metersphere.commons.utils.SessionUtils@getUserId()}'
+            </when>
+            <otherwise>
+                = #{${object}.value}
+            </otherwise>
+        </choose>
+    </sql>
+    <sql id="combine">
+        <if test='${condition}.name != null and (${name} == null or ${name} == "")'>
+            and api_scenario.name
+            <include refid="condition">
+                <property name="object" value="${condition}.name"/>
+            </include>
+        </if>
+        <if test="${condition}.updateTime != null">
+            and api_scenario.update_time
+            <include refid="condition">
+                <property name="object" value="${condition}.updateTime"/>
+            </include>
+        </if>
+        <if test="${condition}.createTime != null">
+            and api_scenario.create_time
+            <include refid="condition">
+                <property name="object" value="${condition}.createTime"/>
+            </include>
+        </if>
+        <if test="${condition}.priority != null">
+            and api_scenario.level
+            <include refid="condition">
+                <property name="object" value="${condition}.priority"/>
+            </include>
+        </if>
+        <if test="${condition}.creator != null">
+            and api_scenario.user_id
+            <include refid="condition">
+                <property name="object" value="${condition}.creator"/>
+            </include>
+        </if>
+        <if test="${condition}.tags != null">
+            and api_scenario.tags
+            <include refid="condition">
+                <property name="object" value="${condition}.tags"/>
+            </include>
+        </if>
+        <if test="${condition}.status != null">
+            and api_scenario.last_result
+            <include refid="condition">
+                <property name="object" value="${condition}.status"/>
+            </include>
+        </if>
 
+    </sql>
     <select id="list" resultMap="BaseResultMap">
         select api_scenario.id, api_scenario.project_id, api_scenario.tags, api_scenario.user_id, api_scenario.num,
         api_scenario.api_scenario_module_id,api_scenario.module_path, api_scenario.name, api_scenario.level,
@@ -19,6 +106,13 @@
         left join project on api_scenario.project_id = project.id
         left join user on api_scenario.user_id = user.id
         <where>
+            <if test="request.combine != null">
+                <include refid="combine">
+                    <property name="condition" value="request.combine"/>
+                    <property name="name" value="request.name"/>
+                </include>
+            </if>
+
             <if test="request.name != null">
                 and api_scenario.name like CONCAT('%', #{request.name},'%')
             </if>
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index 49b6655d76..7471e449ca 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -259,14 +259,14 @@
 
     <select id="listSimple" resultType="io.metersphere.api.dto.definition.ApiTestCaseDTO">
         select
-          c.id, c.project_id, c.name, c.api_definition_id, c.priority, c.description, c.create_user_id, c.update_user_id, c.create_time, c.update_time, c.num,
+          atc.id, atc.project_id, atc.name, atc.api_definition_id, atc.priority, atc.description, atc.create_user_id, atc.update_user_id, atc.create_time, atc.update_time, atc.num,
           a.module_id, a.path, a.protocol
         from
-          api_test_case c
+          api_test_case atc
         inner join
           api_definition a
         on
-          c.api_definition_id = a.id
+          atc.api_definition_id = a.id
             <if test="request.protocol != null and request.protocol!=''">
                 and a.protocol = #{request.protocol}
             </if>
@@ -278,48 +278,55 @@
                     and a.status != 'Trash'
                 </otherwise>
             </choose>
-        where
-        <if test="request.projectId != null and request.projectId!=''">
-            c.project_id = #{request.projectId}
-        </if>
-        <if test="request.id != null and request.id!=''">
-            and c.id = #{request.id}
-        </if>
-        <if test="request.ids != null and request.ids.size() > 0">
-            <if test="request.projectId != null and request.projectId!=''">
-                and
+        <where>
+            <if test="request.combine != null">
+                <include refid="combine">
+                    <property name="condition" value="request.combine"/>
+                    <property name="name" value="request.name"/>
+                </include>
             </if>
-            c.id in
-            <foreach collection="request.ids" item="caseId" separator="," open="(" close=")">
-                #{caseId}
-            </foreach>
-        </if>
-        <if test="request.name != null and request.name!=''">
-            and c.name like CONCAT('%', #{request.name},'%')
-        </if>
-        <if test="request.createTime > 0">
-            and c.create_time >= #{request.createTime}
-        </if>
-        <if test="request.moduleIds != null and request.moduleIds.size() > 0">
-            and a.module_id in
-            <foreach collection="request.moduleIds" item="nodeId" separator="," open="(" close=")">
-                #{nodeId}
-            </foreach>
-        </if>
-        <if test="request.filters != null and request.filters.size() > 0">
-            <foreach collection="request.filters.entrySet()" index="key" item="values">
-                <if test="values != null and values.size() > 0">
-                    <choose>
-                        <when test="key == 'priority'">
-                            and c.priority in
-                            <foreach collection="values" item="value" separator="," open="(" close=")">
-                                #{value}
-                            </foreach>
-                        </when>
-                    </choose>
+            <if test="request.projectId != null and request.projectId!=''">
+                and atc.project_id = #{request.projectId}
+            </if>
+            <if test="request.id != null and request.id!=''">
+                and atc.id = #{request.id}
+            </if>
+            <if test="request.ids != null and request.ids.size() > 0">
+                <if test="request.projectId != null and request.projectId!=''">
+                    and
                 </if>
-            </foreach>
-        </if>
+                atc.id in
+                <foreach collection="request.ids" item="caseId" separator="," open="(" close=")">
+                    #{caseId}
+                </foreach>
+            </if>
+            <if test="request.name != null and request.name!=''">
+                and atc.name like CONCAT('%', #{request.name},'%')
+            </if>
+            <if test="request.createTime > 0">
+                and atc.create_time >= #{request.createTime}
+            </if>
+            <if test="request.moduleIds != null and request.moduleIds.size() > 0">
+                and a.module_id in
+                <foreach collection="request.moduleIds" item="nodeId" separator="," open="(" close=")">
+                    #{nodeId}
+                </foreach>
+            </if>
+            <if test="request.filters != null and request.filters.size() > 0">
+                <foreach collection="request.filters.entrySet()" index="key" item="values">
+                    <if test="values != null and values.size() > 0">
+                        <choose>
+                            <when test="key == 'priority'">
+                                and atc.priority in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
+                        </choose>
+                    </if>
+                </foreach>
+            </if>
+        </where>
         <if test="request.orders != null and request.orders.size() > 0">
             order by
             <foreach collection="request.orders" separator="," item="order">
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index c864587ea3..e37e83af06 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -95,6 +95,13 @@
                 <property name="object" value="${condition}.creator"/>
             </include>
         </if>
+        <if test="${condition}.tags != null">
+            and test_case.tags
+            <include refid="condition">
+                <property name="object" value="${condition}.tags"/>
+            </include>
+        </if>
+
     </sql>
 
     <select id="getTestCaseByNotInReview" resultType="io.metersphere.base.domain.TestCase">
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index 9b49b62998..66bd39b490 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -3,7 +3,7 @@
     <el-card class="table-card" v-loading="loading">
       <template v-slot:header>
         <ms-table-header :condition.sync="condition" @search="selectByParam" title=""
-                         :show-create="false"/>
+                         :show-create="false" />
       </template>
 
       <el-table ref="scenarioTable" border :data="tableData" class="adjust-table ms-select-all" @select-all="select" @select="select"
@@ -12,10 +12,10 @@
         <el-table-column type="selection" width="50"/>
 
         <ms-table-select-all v-if="!referenced"
-          :page-size="pageSize"
-          :total="total"
-          @selectPageAll="isSelectDataAll(false)"
-          @selectAll="isSelectDataAll(true)"/>
+                             :page-size="pageSize"
+                             :total="total"
+                             @selectPageAll="isSelectDataAll(false)"
+                             @selectAll="isSelectDataAll(true)"/>
 
         <el-table-column v-if="!referenced" width="30" :resizable="false" align="center">
           <template v-slot:default="scope">
@@ -93,335 +93,338 @@
         </el-drawer>
       </div>
     </el-card>
+
   </div>
 </template>
 
 <script>
-import MsTableHeader from "@/business/components/common/components/MsTableHeader";
-import MsTablePagination from "@/business/components/common/pagination/TablePagination";
-import ShowMoreBtn from "@/business/components/track/case/components/ShowMoreBtn";
-import MsTag from "../../../common/components/MsTag";
-import {getUUID, getCurrentProjectID} from "@/common/js/utils";
-import MsApiReportDetail from "../report/ApiReportDetail";
-import MsTableMoreBtn from "./TableMoreBtn";
-import MsScenarioExtendButtons from "@/business/components/api/automation/scenario/ScenarioExtendBtns";
-import MsTestPlanList from "./testplan/TestPlanList";
-import MsTableSelectAll from "../../../common/components/table/MsTableSelectAll";
+  import MsTableHeader from "@/business/components/common/components/MsTableHeader";
+  import MsTablePagination from "@/business/components/common/pagination/TablePagination";
+  import ShowMoreBtn from "@/business/components/track/case/components/ShowMoreBtn";
+  import MsTag from "../../../common/components/MsTag";
+  import {getUUID, getCurrentProjectID} from "@/common/js/utils";
+  import MsApiReportDetail from "../report/ApiReportDetail";
+  import MsTableMoreBtn from "./TableMoreBtn";
+  import MsScenarioExtendButtons from "@/business/components/api/automation/scenario/ScenarioExtendBtns";
+  import MsTestPlanList from "./testplan/TestPlanList";
+  import MsTableSelectAll from "../../../common/components/table/MsTableSelectAll";
+  import {API_CASE_CONFIGS} from "@/business/components/common/components/search/search-components";
 
-export default {
-  name: "MsApiScenarioList",
-  components: {
-    MsTableSelectAll,
-    MsTablePagination,
-    MsTableMoreBtn,
-    ShowMoreBtn,
-    MsTableHeader,
-    MsTag,
-    MsApiReportDetail,
-    MsScenarioExtendButtons,
-    MsTestPlanList
-  },
-  props: {
-    referenced: {
-      type: Boolean,
-      default: false,
+  export default {
+    name: "MsApiScenarioList",
+    components: {
+      MsTableSelectAll,
+      MsTablePagination,
+      MsTableMoreBtn,
+      ShowMoreBtn,
+      MsTableHeader,
+      MsTag,
+      MsApiReportDetail,
+      MsScenarioExtendButtons,
+      MsTestPlanList
     },
-    selectNodeIds: Array,
-    trashEnable: {
-      type: Boolean,
-      default: false,
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      condition: {},
-      currentScenario: {},
-      schedule: {},
-      selection: [],
-      tableData: [],
-      selectDataRange: 'all',
-      currentPage: 1,
-      pageSize: 10,
-      total: 0,
-      reportId: "",
-      batchReportId: "",
-      content: {},
-      infoDb: false,
-      runVisible: false,
-      planVisible: false,
-      projectId: "",
-      runData: [],
-      report: {},
-      selectDataSize: 0,
-      selectAll: false,
-      buttons: [
-        {
-          name: this.$t('api_test.automation.batch_add_plan'), handleClick: this.handleBatchAddCase
-        }, {
-          name: this.$t('api_test.automation.batch_execute'), handleClick: this.handleBatchExecute
-        }
-      ],
-      isSelectAllDate: false,
-      unSelection: [],
-      selectDataCounts: 0,
-    }
-  },
-  created() {
-    this.projectId = getCurrentProjectID();
-    this.search();
-  },
-  watch: {
-    selectNodeIds() {
+    props: {
+      referenced: {
+        type: Boolean,
+        default: false,
+      },
+      selectNodeIds: Array,
+      trashEnable: {
+        type: Boolean,
+        default: false,
+      }
+    },
+    data() {
+      return {
+        loading: false,
+        condition: {
+          components: API_CASE_CONFIGS
+        },
+        currentScenario: {},
+        schedule: {},
+        selection: [],
+        tableData: [],
+        selectDataRange: 'all',
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        reportId: "",
+        batchReportId: "",
+        content: {},
+        infoDb: false,
+        runVisible: false,
+        planVisible: false,
+        projectId: "",
+        runData: [],
+        report: {},
+        selectDataSize: 0,
+        selectAll: false,
+        buttons: [
+          {
+            name: this.$t('api_test.automation.batch_add_plan'), handleClick: this.handleBatchAddCase
+          }, {
+            name: this.$t('api_test.automation.batch_execute'), handleClick: this.handleBatchExecute
+          }
+        ],
+        isSelectAllDate: false,
+        unSelection: [],
+        selectDataCounts: 0,
+      }
+    },
+    created() {
+      this.projectId = getCurrentProjectID();
       this.search();
     },
-    trashEnable() {
-      if (this.trashEnable) {
+    watch: {
+      selectNodeIds() {
         this.search();
-      }
-    },
-    batchReportId() {
-      this.loading = true;
-      this.getReport();
-    }
-  },
-  computed: {
-    isNotRunning() {
-      return "Running" !== this.report.status;
-    }
-  },
-  methods: {
-    selectByParam() {
-      this.changeSelectDataRangeAll();
-      this.search();
-    },
-    search() {
-      this.condition.filters = ["Prepare", "Underway", "Completed"];
-      this.condition.moduleIds = this.selectNodeIds;
-      if (this.trashEnable) {
-        this.condition.filters = ["Trash"];
-        this.condition.moduleIds = [];
-      }
-
-      if (this.projectId != null) {
-        this.condition.projectId = this.projectId;
-      }
-
-      //检查是否只查询本周数据
-      this.condition.selectThisWeedData = false;
-      this.condition.executeStatus = null;
-      this.isSelectThissWeekData();
-      switch (this.selectDataRange){
-        case 'thisWeekCount':
-          this.condition.selectThisWeedData = true;
-          break;
-        case 'unExecute':
-          this.condition.executeStatus = 'unExecute';
-          break;
-        case 'executeFailed':
-          this.condition.executeStatus = 'executeFailed';
-          break;
-        case 'executePass':
-          this.condition.executeStatus = 'executePass';
-          break;
-      }
-      this.selection = [];
-
-      this.selectAll = false;
-      this.unSelection = [];
-      this.selectDataCounts = 0;
-      let url = "/api/automation/list/" + this.currentPage + "/" + this.pageSize;
-      if (this.condition.projectId) {
+      },
+      trashEnable() {
+        if (this.trashEnable) {
+          this.search();
+        }
+      },
+      batchReportId() {
         this.loading = true;
-        this.$post(url, this.condition, response => {
-          let data = response.data;
-          this.total = data.itemCount;
-          this.tableData = data.listObject;
-          this.tableData.forEach(item => {
-            if (item.tags && item.tags.length > 0) {
-              item.tags = JSON.parse(item.tags);
+        this.getReport();
+      }
+    },
+    computed: {
+      isNotRunning() {
+        return "Running" !== this.report.status;
+      }
+    },
+    methods: {
+      selectByParam() {
+        this.changeSelectDataRangeAll();
+        this.search();
+      },
+      search() {
+        this.condition.filters = ["Prepare", "Underway", "Completed"];
+        this.condition.moduleIds = this.selectNodeIds;
+        if (this.trashEnable) {
+          this.condition.filters = ["Trash"];
+          this.condition.moduleIds = [];
+        }
+
+        if (this.projectId != null) {
+          this.condition.projectId = this.projectId;
+        }
+
+        //检查是否只查询本周数据
+        this.condition.selectThisWeedData = false;
+        this.condition.executeStatus = null;
+        this.isSelectThissWeekData();
+        switch (this.selectDataRange) {
+          case 'thisWeekCount':
+            this.condition.selectThisWeedData = true;
+            break;
+          case 'unExecute':
+            this.condition.executeStatus = 'unExecute';
+            break;
+          case 'executeFailed':
+            this.condition.executeStatus = 'executeFailed';
+            break;
+          case 'executePass':
+            this.condition.executeStatus = 'executePass';
+            break;
+        }
+        this.selection = [];
+        this.selectAll = false;
+        this.unSelection = [];
+        this.selectDataCounts = 0;
+        let url = "/api/automation/list/" + this.currentPage + "/" + this.pageSize;
+        if (this.condition.projectId) {
+          this.loading = true;
+          this.$post(url, this.condition, response => {
+            let data = response.data;
+            this.total = data.itemCount;
+            this.tableData = data.listObject;
+            this.tableData.forEach(item => {
+              if (item.tags && item.tags.length > 0) {
+                item.tags = JSON.parse(item.tags);
+              }
+            });
+            this.loading = false;
+            this.unSelection = data.listObject.map(s => s.id);
+          });
+        }
+      },
+      handleCommand(cmd) {
+        let table = this.$refs.scenarioTable;
+        switch (cmd) {
+          case "table":
+            this.selectAll = false;
+            table.toggleAllSelection();
+            break;
+          case "all":
+            this.selectAll = true;
+            break
+        }
+      },
+      handleBatchAddCase() {
+        this.planVisible = true;
+      },
+      addTestPlan(plans) {
+        let obj = {planIds: plans, scenarioIds: this.selection};
+
+        obj.projectId = getCurrentProjectID();
+        obj.selectAllDate = this.isSelectAllDate;
+        obj.unSelectIds = this.unSelection;
+        obj = Object.assign(obj, this.condition);
+
+        this.planVisible = false;
+        this.$post("/api/automation/scenario/plan", obj, response => {
+          this.$success(this.$t("commons.save_success"));
+        });
+      },
+      getReport() {
+        if (this.batchReportId) {
+          let url = "/api/scenario/report/get/" + this.batchReportId;
+          this.$get(url, response => {
+            this.report = response.data || {};
+            if (response.data) {
+              if (this.isNotRunning) {
+                try {
+                  this.content = JSON.parse(this.report.content);
+                } catch (e) {
+                  throw e;
+                }
+                this.loading = false;
+                this.$success("批量执行成功，请到报告页面查看详情！");
+              } else {
+                setTimeout(this.getReport, 2000)
+              }
+            } else {
+              this.loading = false;
+              this.$error(this.$t('api_report.not_exist'));
             }
           });
-          this.loading = false;
-          this.unSelection = data.listObject.map(s => s.id);
-        });
-      }
-    },
-    handleCommand(cmd) {
-      let table = this.$refs.scenarioTable;
-      switch (cmd) {
-        case "table":
-          this.selectAll = false;
-          table.toggleAllSelection();
-          break;
-        case "all":
-          this.selectAll = true;
-          break
-      }
-    },
-    handleBatchAddCase() {
-      this.planVisible = true;
-    },
-    addTestPlan(plans) {
-      let obj = {planIds: plans, scenarioIds: this.selection};
-
-      obj.projectId = getCurrentProjectID();
-      obj.selectAllDate = this.isSelectAllDate;
-      obj.unSelectIds = this.unSelection;
-      obj = Object.assign(obj, this.condition);
-
-      this.planVisible = false;
-      this.$post("/api/automation/scenario/plan", obj, response => {
-        this.$success(this.$t("commons.save_success"));
-      });
-    },
-    getReport() {
-      if (this.batchReportId) {
-        let url = "/api/scenario/report/get/" + this.batchReportId;
-        this.$get(url, response => {
-          this.report = response.data || {};
-          if (response.data) {
-            if (this.isNotRunning) {
-              try {
-                this.content = JSON.parse(this.report.content);
-              } catch (e) {
-                throw e;
-              }
-              this.loading = false;
-              this.$success("批量执行成功，请到报告页面查看详情！");
-            } else {
-              setTimeout(this.getReport, 2000)
-            }
-          } else {
-            this.loading = false;
-            this.$error(this.$t('api_report.not_exist'));
-          }
-        });
-      }
-    },
-    handleBatchExecute() {
-      this.infoDb = false;
-      let url = "/api/automation/run/batch";
-      let run = {};
-      let scenarioIds = this.selection;
-      run.id = getUUID();
-      run.scenarioIds = scenarioIds;
-      run.projectId = getCurrentProjectID();
-      run.selectAllDate = this.isSelectAllDate;
-      run.unSelectIds = this.unSelection;
-
-      run = Object.assign(run, this.condition);
-      this.$post(url, run, response => {
-        let data = response.data;
-        this.runVisible = false;
-        this.batchReportId = run.id;
-      });
-    },
-    select(selection) {
-      this.selection = selection.map(s => s.id);
-
-      //统计应当展示选择了多少行
-      this.selectRowsCount(this.selection)
-
-      this.$emit('selection', selection);
-    },
-    isSelect(row) {
-      return this.selection.includes(row.id)
-    },
-    edit(row) {
-      this.$emit('edit', row);
-    },
-    reductionApi(row) {
-      row.scenarioDefinition = null;
-      row.tags = null;
-      let rows = [row];
-      this.$post("/api/automation/reduction", rows, response => {
-        this.$success(this.$t('commons.save_success'));
-        this.search();
-      })
-    },
-    execute(row) {
-      this.infoDb = false;
-      let url = "/api/automation/run";
-      let run = {};
-      let scenarioIds = [];
-      scenarioIds.push(row.id);
-      run.id = getUUID();
-      run.projectId = getCurrentProjectID();
-      run.scenarioIds = scenarioIds;
-      this.$post(url, run, response => {
-        let data = response.data;
-        this.runVisible = true;
-        this.reportId = run.id;
-      });
-    },
-    copy(row) {
-      row.copy = true;
-      this.$emit('edit', row);
-    },
-    showReport(row) {
-      this.runVisible = true;
-      this.infoDb = true;
-      this.reportId = row.reportId;
-    },
-    //是否选择了全部数据
-    isSelectDataAll(dataType) {
-      this.isSelectAllDate = dataType;
-      this.selectRowsCount(this.selection);
-      //如果已经全选，不需要再操作了
-      if (this.selection.length != this.tableData.length) {
-        this.$refs.scenarioTable.toggleAllSelection(true);
-      }
-    },
-    //选择数据数量统计
-    selectRowsCount(selection) {
-      let selectedIDs = selection;
-      let allIDs = this.tableData.map(s => s.id);
-      this.unSelection = allIDs.filter(function (val) {
-        return selectedIDs.indexOf(val) === -1
-      });
-      if (this.isSelectAllDate) {
-        this.selectDataCounts = this.total - this.unSelection.length;
-      } else {
-        this.selectDataCounts = this.selection.length;
-      }
-    },
-    //判断是否只显示本周的数据。  从首页跳转过来的请求会带有相关参数
-    isSelectThissWeekData() {
-      let dataRange = this.$route.params.dataSelectRange;
-      this.selectDataRange = dataRange;
-    },
-    changeSelectDataRangeAll() {
-      this.$emit("changeSelectDataRangeAll");
-    },
-    remove(row) {
-      if (this.trashEnable) {
-        this.$get('/api/automation/delete/' + row.id, () => {
-          this.$success(this.$t('commons.delete_success'));
-          this.search();
-        });
-        return;
-      }
-      this.$alert(this.$t('api_test.definition.request.delete_confirm') + ' ' + row.name + " ？", '', {
-        confirmButtonText: this.$t('commons.confirm'),
-        callback: (action) => {
-          if (action === 'confirm') {
-            let ids = [row.id];
-            this.$post('/api/automation/removeToGc/', ids, () => {
-              this.$success(this.$t('commons.delete_success'));
-              this.search();
-            });
-          }
         }
-      });
-    },
+      },
+      handleBatchExecute() {
+        this.infoDb = false;
+        let url = "/api/automation/run/batch";
+        let run = {};
+        let scenarioIds = this.selection;
+        run.id = getUUID();
+        run.scenarioIds = scenarioIds;
+        run.projectId = getCurrentProjectID();
+        run.selectAllDate = this.isSelectAllDate;
+        run.unSelectIds = this.unSelection;
+
+        run = Object.assign(run, this.condition);
+        this.$post(url, run, response => {
+          let data = response.data;
+          this.runVisible = false;
+          this.batchReportId = run.id;
+        });
+      },
+      select(selection) {
+        this.selection = selection.map(s => s.id);
+
+        //统计应当展示选择了多少行
+        this.selectRowsCount(this.selection)
+
+        this.$emit('selection', selection);
+      },
+      isSelect(row) {
+        return this.selection.includes(row.id)
+      },
+      edit(row) {
+        this.$emit('edit', row);
+      },
+      reductionApi(row) {
+        row.scenarioDefinition = null;
+        row.tags = null;
+        let rows = [row];
+        this.$post("/api/automation/reduction", rows, response => {
+          this.$success(this.$t('commons.save_success'));
+          this.search();
+        })
+      },
+      execute(row) {
+        this.infoDb = false;
+        let url = "/api/automation/run";
+        let run = {};
+        let scenarioIds = [];
+        scenarioIds.push(row.id);
+        run.id = getUUID();
+        run.projectId = getCurrentProjectID();
+        run.scenarioIds = scenarioIds;
+        this.$post(url, run, response => {
+          let data = response.data;
+          this.runVisible = true;
+          this.reportId = run.id;
+        });
+      },
+      copy(row) {
+        row.copy = true;
+        this.$emit('edit', row);
+      },
+      showReport(row) {
+        this.runVisible = true;
+        this.infoDb = true;
+        this.reportId = row.reportId;
+      },
+      //是否选择了全部数据
+      isSelectDataAll(dataType) {
+        this.isSelectAllDate = dataType;
+        this.selectRowsCount(this.selection);
+        //如果已经全选，不需要再操作了
+        if (this.selection.length != this.tableData.length) {
+          this.$refs.scenarioTable.toggleAllSelection(true);
+        }
+      },
+      //选择数据数量统计
+      selectRowsCount(selection) {
+        let selectedIDs = selection;
+        let allIDs = this.tableData.map(s => s.id);
+        this.unSelection = allIDs.filter(function (val) {
+          return selectedIDs.indexOf(val) === -1
+        });
+        if (this.isSelectAllDate) {
+          this.selectDataCounts = this.total - this.unSelection.length;
+        } else {
+          this.selectDataCounts = this.selection.length;
+        }
+      },
+      //判断是否只显示本周的数据。  从首页跳转过来的请求会带有相关参数
+      isSelectThissWeekData() {
+        let dataRange = this.$route.params.dataSelectRange;
+        this.selectDataRange = dataRange;
+      },
+      changeSelectDataRangeAll() {
+        this.$emit("changeSelectDataRangeAll");
+      },
+      remove(row) {
+        if (this.trashEnable) {
+          this.$get('/api/automation/delete/' + row.id, () => {
+            this.$success(this.$t('commons.delete_success'));
+            this.search();
+          });
+          return;
+        }
+        this.$alert(this.$t('api_test.definition.request.delete_confirm') + ' ' + row.name + " ？", '', {
+          confirmButtonText: this.$t('commons.confirm'),
+          callback: (action) => {
+            if (action === 'confirm') {
+              let ids = [row.id];
+              this.$post('/api/automation/removeToGc/', ids, () => {
+                this.$success(this.$t('commons.delete_success'));
+                this.search();
+              });
+            }
+          }
+        });
+      },
+    }
   }
-}
 </script>
 
 <style scoped>
-/deep/ .el-drawer__header {
-  margin-bottom: 0px;
-}
+  /deep/ .el-drawer__header {
+    margin-bottom: 0px;
+  }
 
 </style>
diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index a01146c305..71ba30950a 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -3,6 +3,7 @@
     <api-list-container
       :is-api-list-enable="isApiListEnable"
       @isApiListEnableChange="isApiListEnableChange">
+      <el-link type="primary" style="float:right;margin-top: 5px" @click="open">{{$t('commons.adv_search.title')}}</el-link>
 
       <el-input placeholder="搜索" @blur="search" @keyup.enter.native="search" class="search-input" size="small"
                 v-model="condition.name"/>
@@ -89,480 +90,484 @@
     <ms-set-environment ref="setEnvironment" :testCase="clickRow" @createPerformance="createPerformance"/>
     <!--查看引用-->
     <ms-reference-view ref="viewRef"/>
+    <!--高级搜索-->
+    <ms-table-adv-search-bar :condition.sync="condition" :showLink="false" ref="searchBar" @search="initTable"/>
+
   </div>
 
 </template>
 
 <script>
 
-import MsTableOperator from "../../../../common/components/MsTableOperator";
-import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
-import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
-import MsTablePagination from "../../../../common/pagination/TablePagination";
-import MsTag from "../../../../common/components/MsTag";
-import MsApiCaseList from "../case/ApiCaseList";
-import MsContainer from "../../../../common/components/MsContainer";
-import MsBottomContainer from "../BottomContainer";
-import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
-import MsBatchEdit from "../basis/BatchEdit";
-import {API_METHOD_COLOUR, CASE_PRIORITY, REQ_METHOD} from "../../model/JsonData";
+  import MsTableOperator from "../../../../common/components/MsTableOperator";
+  import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
+  import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
+  import MsTablePagination from "../../../../common/pagination/TablePagination";
+  import MsTag from "../../../../common/components/MsTag";
+  import MsApiCaseList from "../case/ApiCaseList";
+  import MsContainer from "../../../../common/components/MsContainer";
+  import MsBottomContainer from "../BottomContainer";
+  import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
+  import MsBatchEdit from "../basis/BatchEdit";
+  import {API_METHOD_COLOUR, CASE_PRIORITY, REQ_METHOD} from "../../model/JsonData";
 
-import {getBodyUploadFiles,getCurrentProjectID} from "@/common/js/utils";
-import ApiListContainer from "./ApiListContainer";
-import PriorityTableItem from "../../../../track/common/tableItems/planview/PriorityTableItem";
-import ApiCaseList from "../case/ApiCaseList";
-import {_filter, _sort} from "../../../../../../common/js/utils";
-import {_handleSelect, _handleSelectAll} from "../../../../../../common/js/tableUtils";
-import MsApiCaseTableExtendBtns from "../reference/ApiCaseTableExtendBtns";
-import MsReferenceView from "../reference/ReferenceView";
-import MsSetEnvironment from "@/business/components/api/definition/components/basis/SetEnvironment";
-import TestPlan from "@/business/components/api/definition/components/jmeter/components/test-plan";
-import ThreadGroup from "@/business/components/api/definition/components/jmeter/components/thread-group";
-import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel";
-import MsTableSelectAll from "../../../../common/components/table/MsTableSelectAll";
+  import {getBodyUploadFiles, getCurrentProjectID} from "@/common/js/utils";
+  import ApiListContainer from "./ApiListContainer";
+  import PriorityTableItem from "../../../../track/common/tableItems/planview/PriorityTableItem";
+  import ApiCaseList from "../case/ApiCaseList";
+  import {_filter, _sort} from "../../../../../../common/js/utils";
+  import {_handleSelect, _handleSelectAll} from "../../../../../../common/js/tableUtils";
+  import MsApiCaseTableExtendBtns from "../reference/ApiCaseTableExtendBtns";
+  import MsReferenceView from "../reference/ReferenceView";
+  import MsSetEnvironment from "@/business/components/api/definition/components/basis/SetEnvironment";
+  import TestPlan from "@/business/components/api/definition/components/jmeter/components/test-plan";
+  import ThreadGroup from "@/business/components/api/definition/components/jmeter/components/thread-group";
+  import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel";
+  import MsTableSelectAll from "../../../../common/components/table/MsTableSelectAll";
+  import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
+  import {API_CASE_CONFIGS} from "@/business/components/common/components/search/search-components";
 
-export default {
-  name: "ApiCaseSimpleList",
-  components: {
-    MsTableSelectAll,
-    MsSetEnvironment,
-    ApiCaseList,
-    PriorityTableItem,
-    ApiListContainer,
-    MsTableOperatorButton,
-    MsTableOperator,
-    MsTablePagination,
-    MsTag,
-    MsApiCaseList,
-    MsContainer,
-    MsBottomContainer,
-    ShowMoreBtn,
-    MsBatchEdit,
-    MsApiCaseTableExtendBtns,
-    MsReferenceView,
-  },
-  data() {
-    return {
-      condition: {},
-      selectCase: {},
-      result: {},
-      moduleId: "",
-      selectDataRange: "all",
-      deletePath: "/test/case/delete",
-      selectRows: new Set(),
-      clickRow: {},
-      buttons: [
-        {name: this.$t('api_test.definition.request.batch_delete'), handleClick: this.handleDeleteBatch},
-        {name: this.$t('api_test.definition.request.batch_edit'), handleClick: this.handleEditBatch}
-      ],
-      typeArr: [
-        {id: 'priority', name: this.$t('test_track.case.priority')},
-        {id: 'method', name: this.$t('api_test.definition.api_type')},
-        {id: 'path', name: this.$t('api_test.request.path')},
-      ],
-      priorityFilters: [
-        {text: 'P0', value: 'P0'},
-        {text: 'P1', value: 'P1'},
-        {text: 'P2', value: 'P2'},
-        {text: 'P3', value: 'P3'}
-      ],
-      valueArr: {
-        priority: CASE_PRIORITY,
-        method: REQ_METHOD,
-      },
-      methodColorMap: new Map(API_METHOD_COLOUR),
-      tableData: [],
-      currentPage: 1,
-      pageSize: 10,
-      total: 0,
-      screenHeight: document.documentElement.clientHeight - 330,//屏幕高度
-      environmentId: undefined,
-      selectAll: false,
-      unSelection: [],
-      selectDataCounts: 0,
-      environments: [],
-    }
-  },
-  props: {
-    currentProtocol: String,
-    selectNodeIds: Array,
-    visible: {
-      type: Boolean,
-      default: false,
+  export default {
+    name: "ApiCaseSimpleList",
+    components: {
+      MsTableSelectAll,
+      MsSetEnvironment,
+      ApiCaseList,
+      PriorityTableItem,
+      ApiListContainer,
+      MsTableOperatorButton,
+      MsTableOperator,
+      MsTablePagination,
+      MsTag,
+      MsApiCaseList,
+      MsContainer,
+      MsBottomContainer,
+      ShowMoreBtn,
+      MsBatchEdit,
+      MsApiCaseTableExtendBtns,
+      MsReferenceView,
+      MsTableAdvSearchBar
     },
-    trashEnable: {
-      type: Boolean,
-      default: false,
-    },
-    isApiListEnable: {
-      type: Boolean,
-      default: false,
-    },
-    isReadOnly: {
-      type: Boolean,
-      default: false
-    },
-    isCaseRelevance: {
-      type: Boolean,
-      default: false,
-    },
-    relevanceProjectId: String,
-    model: {
-      type: String,
-      default() {
-        'api'
+    data() {
+      return {
+        condition: {
+          components: API_CASE_CONFIGS
+        },
+        selectCase: {},
+        result: {},
+        moduleId: "",
+        selectDataRange: "all",
+        deletePath: "/test/case/delete",
+        selectRows: new Set(),
+        clickRow: {},
+        buttons: [
+          {name: this.$t('api_test.definition.request.batch_delete'), handleClick: this.handleDeleteBatch},
+          {name: this.$t('api_test.definition.request.batch_edit'), handleClick: this.handleEditBatch}
+        ],
+        typeArr: [
+          {id: 'priority', name: this.$t('test_track.case.priority')},
+          {id: 'method', name: this.$t('api_test.definition.api_type')},
+          {id: 'path', name: this.$t('api_test.request.path')},
+        ],
+        priorityFilters: [
+          {text: 'P0', value: 'P0'},
+          {text: 'P1', value: 'P1'},
+          {text: 'P2', value: 'P2'},
+          {text: 'P3', value: 'P3'}
+        ],
+        valueArr: {
+          priority: CASE_PRIORITY,
+          method: REQ_METHOD,
+        },
+        methodColorMap: new Map(API_METHOD_COLOUR),
+        tableData: [],
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        screenHeight: document.documentElement.clientHeight - 330,//屏幕高度
+        environmentId: undefined,
+        selectAll: false,
+        unSelection: [],
+        selectDataCounts: 0,
+        environments: [],
       }
     },
-    planId: String
-  },
-  created: function () {
-    this.initTable();
-  },
-  watch: {
-    selectNodeIds() {
+    props: {
+      currentProtocol: String,
+      selectNodeIds: Array,
+      visible: {
+        type: Boolean,
+        default: false,
+      },
+      trashEnable: {
+        type: Boolean,
+        default: false,
+      },
+      isApiListEnable: {
+        type: Boolean,
+        default: false,
+      },
+      isReadOnly: {
+        type: Boolean,
+        default: false
+      },
+      isCaseRelevance: {
+        type: Boolean,
+        default: false,
+      },
+      relevanceProjectId: String,
+      model: {
+        type: String,
+        default() {
+          'api'
+        }
+      },
+      planId: String
+    },
+    created: function () {
       this.initTable();
     },
-    currentProtocol() {
-      this.initTable();
-    },
-    trashEnable() {
-      if (this.trashEnable) {
+    watch: {
+      selectNodeIds() {
+        this.initTable();
+      },
+      currentProtocol() {
+        this.initTable();
+      },
+      trashEnable() {
+        if (this.trashEnable) {
+          this.initTable();
+        }
+      },
+      relevanceProjectId() {
         this.initTable();
       }
     },
-    relevanceProjectId() {
-      this.initTable();
-    }
-  },
-  computed: {
+    computed: {
 
-    // 接口定义用例列表
-    isApiModel() {
-      return this.model === 'api'
+      // 接口定义用例列表
+      isApiModel() {
+        return this.model === 'api'
+      },
     },
-  },
-  methods: {
-    isApiListEnableChange(data) {
-      this.$emit('isApiListEnableChange', data);
-    },
-    initTable() {
-      this.selectRows = new Set();
-      this.condition.status = "";
-      this.condition.moduleIds = this.selectNodeIds;
-      if (this.trashEnable) {
-        this.condition.status = "Trash";
-        this.condition.moduleIds = [];
-      }
-      this.selectAll = false;
-      this.unSelection = [];
-      this.selectDataCounts = 0;
-      this.condition.projectId = getCurrentProjectID();
-
-      if (this.currentProtocol != null) {
-        this.condition.protocol = this.currentProtocol;
-      }
-
-      //检查是否只查询本周数据
-      this.isSelectThissWeekData();
-      this.condition.selectThisWeedData = false;
-      this.condition.id = null;
-      if (this.selectDataRange == 'thisWeekCount') {
-        this.condition.selectThisWeedData = true;
-      } else if (this.selectDataRange != null) {
-        let selectParamArr = this.selectDataRange.split("single:");
-
-        if (selectParamArr.length == 2) {
-          this.condition.id = selectParamArr[1];
+    methods: {
+      isApiListEnableChange(data) {
+        this.$emit('isApiListEnableChange', data);
+      },
+      initTable() {
+        this.selectRows = new Set();
+        this.condition.status = "";
+        this.condition.moduleIds = this.selectNodeIds;
+        if (this.trashEnable) {
+          this.condition.status = "Trash";
+          this.condition.moduleIds = [];
         }
-      }
+        this.selectAll = false;
+        this.unSelection = [];
+        this.selectDataCounts = 0;
+        this.condition.projectId = getCurrentProjectID();
 
-      if (this.condition.projectId) {
-        this.result = this.$post('/api/testcase/list/' + this.currentPage + "/" + this.pageSize, this.condition, response => {
-          this.total = response.data.itemCount;
-          this.tableData = response.data.listObject;
-          this.unSelection = response.data.listObject.map(s => s.id);
-        });
-      }
-    },
-    // getMaintainerOptions() {
-    //   let workspaceId = localStorage.getItem(WORKSPACE_ID);
-    //   this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
-    //     this.valueArr.userId = response.data;
-    //   });
-    // },
-    handleSelect(selection, row) {
-      _handleSelect(this, selection, row, this.selectRows);
-      this.selectRowsCount(this.selectRows)
-    },
-    showExecResult(row) {
-      this.visible = false;
-      this.$emit('showExecResult', row);
-    },
-    filter(filters) {
-      _filter(filters, this.condition);
-      this.initTable();
-    },
-    sort(column) {
-      // 每次只对一个字段排序
-      if (this.condition.orders) {
-        this.condition.orders = [];
-      }
-      _sort(column, this.condition);
-      this.initTable();
-    },
-    handleSelectAll(selection) {
-      _handleSelectAll(this, selection, this.tableData, this.selectRows);
-      this.selectRowsCount(this.selectRows)
-    },
-    search() {
-      this.changeSelectDataRangeAll();
-      this.initTable();
-    },
-    buildPagePath(path) {
-      return path + "/" + this.currentPage + "/" + this.pageSize;
-    },
+        if (this.currentProtocol != null) {
+          this.condition.protocol = this.currentProtocol;
+        }
 
-    handleTestCase(testCase) {
-      this.$get('/api/definition/get/' + testCase.apiDefinitionId, (response) => {
-        let api = response.data;
-        let selectApi = api;
-        let request = {};
-        if (Object.prototype.toString.call(api.request).match(/\[object (\w+)\]/)[1].toLowerCase() === 'object') {
-          request = api.request;
-        } else {
-          request = JSON.parse(api.request);
-        }
-        if (!request.hashTree) {
-          request.hashTree = [];
-        }
-        selectApi.url = request.path;
-        this.$refs.caseList.open(selectApi, testCase.id);
-      });
-    },
-    reductionApi(row) {
-      let ids = [row.id];
-      this.$post('/api/testcase/reduction/', ids, () => {
-        this.$success(this.$t('commons.save_success'));
-        this.search();
-      });
-    },
-    handleDeleteBatch() {
-      // if (this.trashEnable) {
-      this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
-        confirmButtonText: this.$t('commons.confirm'),
-        callback: (action) => {
-          if (action === 'confirm') {
-            let obj = {};
-            obj.projectId = getCurrentProjectID();
-            obj.selectAllDate = this.isSelectAllDate;
-            obj.unSelectIds = this.unSelection;
-            obj.ids = Array.from(this.selectRows).map(row => row.id);
-            obj = Object.assign(obj, this.condition);
-            this.$post('/api/testcase/deleteBatchByParam/', obj, () => {
-              this.selectRows.clear();
-              this.initTable();
-              this.$success(this.$t('commons.delete_success'));
-            });
+        //检查是否只查询本周数据
+        this.isSelectThissWeekData();
+        this.condition.selectThisWeedData = false;
+        this.condition.id = null;
+        if (this.selectDataRange == 'thisWeekCount') {
+          this.condition.selectThisWeedData = true;
+        } else if (this.selectDataRange != null) {
+          let selectParamArr = this.selectDataRange.split("single:");
+
+          if (selectParamArr.length == 2) {
+            this.condition.id = selectParamArr[1];
           }
         }
-      });
-      // } else {
-      //   this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
-      //     confirmButtonText: this.$t('commons.confirm'),
-      //     callback: (action) => {
-      //       if (action === 'confirm') {
-      //         let ids = Array.from(this.selectRows).map(row => row.id);
-      //         this.$post('/api/testcase/removeToGc/', ids, () => {
-      //           this.selectRows.clear();
-      //           this.initTable();
-      //           this.$success(this.$t('commons.delete_success'));
-      //         });
-      //       }
-      //     }
-      //   });
-      // }
-    },
-    handleEditBatch() {
-      this.$refs.batchEdit.open();
-    },
-    batchEdit(form) {
-      let arr = Array.from(this.selectRows);
-      let ids = arr.map(row => row.id);
-      let param = {};
-      param[form.type] = form.value;
-      param.ids = ids;
-      param.projectId = getCurrentProjectID();
-      param.selectAllDate = this.isSelectAllDate;
-      param.unSelectIds = this.unSelection;
-      param = Object.assign(param, this.condition);
-      this.$post('/api/testcase/batch/editByParam', param, () => {
-        this.$success(this.$t('commons.save_success'));
-        this.initTable();
-      });
-    },
-    handleDelete(apiCase) {
-      // if (this.trashEnable) {
-      this.$get('/api/testcase/delete/' + apiCase.id, () => {
-        this.$success(this.$t('commons.delete_success'));
-        this.initTable();
-      });
-      return;
-      // }
-      // this.$alert(this.$t('api_test.definition.request.delete_confirm') + ' ' + apiCase.name + " ？", '', {
-      //   confirmButtonText: this.$t('commons.confirm'),
-      //   callback: (action) => {
-      //     if (action === 'confirm') {
-      //       let ids = [apiCase.id];
-      //       this.$post('/api/testcase/removeToGc/', ids, () => {
-      //         this.$success(this.$t('commons.delete_success'));
-      //         this.initTable();
-      //       });
-      //     }
-      //   }
-      // });
-    },
-    setEnvironment(data) {
-      this.environmentId = data.id;
-    },
-    selectRowsCount(selection) {
-      let selectedIDs = this.getIds(selection);
-      let allIDs = this.tableData.map(s => s.id);
-      this.unSelection = allIDs.filter(function (val) {
-        return selectedIDs.indexOf(val) === -1
-      });
-      if (this.isSelectAllDate) {
-        this.selectDataCounts = this.total - this.unSelection.length;
-      } else {
-        this.selectDataCounts = selection.size;
-      }
-    },
-    isSelectDataAll(dataType) {
-      this.isSelectAllDate = dataType;
-      this.selectRowsCount(this.selectRows)
-      //如果已经全选，不需要再操作了
-      if (this.selectRows.size != this.tableData.length) {
-        this.$refs.caseTable.toggleAllSelection(true);
-      }
-    },
-    //判断是否只显示本周的数据。  从首页跳转过来的请求会带有相关参数
-    isSelectThissWeekData() {
-      this.selectDataRange = "all";
-      let routeParam = this.$route.params.dataSelectRange;
-      let dataType = this.$route.params.dataType;
-      if (dataType === 'apiTestCase') {
-        this.selectDataRange = routeParam;
-      }
-    },
-    changeSelectDataRangeAll() {
-      this.$emit("changeSelectDataRangeAll", "testCase");
-    },
-    getIds(rowSets) {
-      let rowArray = Array.from(rowSets)
-      let ids = rowArray.map(s => s.id);
-      return ids;
-    },
-    showCaseRef(row) {
-      this.$refs.viewRef.open(row);
-    },
-    showEnvironment(row) {
-
-      let projectID = getCurrentProjectID();
-      if (this.projectId) {
-        this.$get('/api/environment/list/' + this.projectId, response => {
-          this.environments = response.data;
-          this.environments.forEach(environment => {
-            parseEnvironment(environment);
+        if (this.condition.projectId) {
+          this.result = this.$post('/api/testcase/list/' + this.currentPage + "/" + this.pageSize, this.condition, response => {
+            this.total = response.data.itemCount;
+            this.tableData = response.data.listObject;
+            this.unSelection = response.data.listObject.map(s => s.id);
           });
+        }
+      },
+      open() {
+        this.$refs.searchBar.open();
+      },
+      handleSelect(selection, row) {
+        _handleSelect(this, selection, row, this.selectRows);
+        this.selectRowsCount(this.selectRows)
+      },
+      showExecResult(row) {
+        this.visible = false;
+        this.$emit('showExecResult', row);
+      },
+      filter(filters) {
+        _filter(filters, this.condition);
+        this.initTable();
+      },
+      sort(column) {
+        // 每次只对一个字段排序
+        if (this.condition.orders) {
+          this.condition.orders = [];
+        }
+        _sort(column, this.condition);
+        this.initTable();
+      },
+      handleSelectAll(selection) {
+        _handleSelectAll(this, selection, this.tableData, this.selectRows);
+        this.selectRowsCount(this.selectRows)
+      },
+      search() {
+        this.changeSelectDataRangeAll();
+        this.initTable();
+      },
+      buildPagePath(path) {
+        return path + "/" + this.currentPage + "/" + this.pageSize;
+      },
+
+      handleTestCase(testCase) {
+        this.$get('/api/definition/get/' + testCase.apiDefinitionId, (response) => {
+          let api = response.data;
+          let selectApi = api;
+          let request = {};
+          if (Object.prototype.toString.call(api.request).match(/\[object (\w+)\]/)[1].toLowerCase() === 'object') {
+            request = api.request;
+          } else {
+            request = JSON.parse(api.request);
+          }
+          if (!request.hashTree) {
+            request.hashTree = [];
+          }
+          selectApi.url = request.path;
+          this.$refs.caseList.open(selectApi, testCase.id);
         });
-      } else {
-        this.environment = undefined;
-      }
-      this.clickRow = row;
-      this.$refs.setEnvironment.open(row);
-    },
-    createPerformance(row, environment) {
-      /**
-       * 思路：调用后台创建性能测试的方法，把当前案例的hashTree在后台转化为jmx并文件创建性能测试。
-       * 然后跳转到修改性能测试的页面
-       *
-       * 性能测试保存地址： performance/save
-       *
-       */
-      if (!environment) {
-        this.$warning(this.$t('api_test.environment.select_environment'));
-        return;
-      }
-      let runData = [];
-      let singleLoading = true;
-      row.request = JSON.parse(row.request);
-      row.request.name = row.id;
-      row.request.useEnvironment = environment.id;
-      runData.push(row.request);
-      /*触发执行操作*/
-      let testPlan = new TestPlan();
-      let threadGroup = new ThreadGroup();
-      threadGroup.hashTree = [];
-      testPlan.hashTree = [threadGroup];
-      runData.forEach(item => {
-        threadGroup.hashTree.push(item);
-      })
-      let reqObj = {
-        id: row.id,
-        testElement: testPlan,
-        name: row.name,
-        projectId: getCurrentProjectID(),
-      };
-      let bodyFiles = getBodyUploadFiles(reqObj, runData);
-      reqObj.reportId = "run";
-
-      let url = "/api/genPerformanceTestXml";
-
-      this.$fileUpload(url, null, bodyFiles, reqObj, response => {
-        let jmxObj = {};
-        jmxObj.name = response.data.name;
-        jmxObj.xml = response.data.xml;
-        this.$store.commit('setTest', {
-          name: row.name,
-          jmx: jmxObj
-        })
-        this.$router.push({
-          path: "/performance/test/create"
-        })
-        // let performanceId = response.data;
-        // if(performanceId!=null){
-        //   this.$router.push({
-        //     path: "/performance/test/edit/"+performanceId,
-        //   })
+      },
+      reductionApi(row) {
+        let ids = [row.id];
+        this.$post('/api/testcase/reduction/', ids, () => {
+          this.$success(this.$t('commons.save_success'));
+          this.search();
+        });
+      },
+      handleDeleteBatch() {
+        // if (this.trashEnable) {
+        this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
+          confirmButtonText: this.$t('commons.confirm'),
+          callback: (action) => {
+            if (action === 'confirm') {
+              let obj = {};
+              obj.projectId = getCurrentProjectID();
+              obj.selectAllDate = this.isSelectAllDate;
+              obj.unSelectIds = this.unSelection;
+              obj.ids = Array.from(this.selectRows).map(row => row.id);
+              obj = Object.assign(obj, this.condition);
+              this.$post('/api/testcase/deleteBatchByParam/', obj, () => {
+                this.selectRows.clear();
+                this.initTable();
+                this.$success(this.$t('commons.delete_success'));
+              });
+            }
+          }
+        });
+        // } else {
+        //   this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
+        //     confirmButtonText: this.$t('commons.confirm'),
+        //     callback: (action) => {
+        //       if (action === 'confirm') {
+        //         let ids = Array.from(this.selectRows).map(row => row.id);
+        //         this.$post('/api/testcase/removeToGc/', ids, () => {
+        //           this.selectRows.clear();
+        //           this.initTable();
+        //           this.$success(this.$t('commons.delete_success'));
+        //         });
+        //       }
+        //     }
+        //   });
         // }
-      }, erro => {
-        this.$emit('runRefresh', {});
-      });
+      },
+      handleEditBatch() {
+        this.$refs.batchEdit.open();
+      },
+      batchEdit(form) {
+        let arr = Array.from(this.selectRows);
+        let ids = arr.map(row => row.id);
+        let param = {};
+        param[form.type] = form.value;
+        param.ids = ids;
+        param.projectId = getCurrentProjectID();
+        param.selectAllDate = this.isSelectAllDate;
+        param.unSelectIds = this.unSelection;
+        param = Object.assign(param, this.condition);
+        this.$post('/api/testcase/batch/editByParam', param, () => {
+          this.$success(this.$t('commons.save_success'));
+          this.initTable();
+        });
+      },
+      handleDelete(apiCase) {
+        // if (this.trashEnable) {
+        this.$get('/api/testcase/delete/' + apiCase.id, () => {
+          this.$success(this.$t('commons.delete_success'));
+          this.initTable();
+        });
+        return;
+        // }
+        // this.$alert(this.$t('api_test.definition.request.delete_confirm') + ' ' + apiCase.name + " ？", '', {
+        //   confirmButtonText: this.$t('commons.confirm'),
+        //   callback: (action) => {
+        //     if (action === 'confirm') {
+        //       let ids = [apiCase.id];
+        //       this.$post('/api/testcase/removeToGc/', ids, () => {
+        //         this.$success(this.$t('commons.delete_success'));
+        //         this.initTable();
+        //       });
+        //     }
+        //   }
+        // });
+      },
+      setEnvironment(data) {
+        this.environmentId = data.id;
+      },
+      selectRowsCount(selection) {
+        let selectedIDs = this.getIds(selection);
+        let allIDs = this.tableData.map(s => s.id);
+        this.unSelection = allIDs.filter(function (val) {
+          return selectedIDs.indexOf(val) === -1
+        });
+        if (this.isSelectAllDate) {
+          this.selectDataCounts = this.total - this.unSelection.length;
+        } else {
+          this.selectDataCounts = selection.size;
+        }
+      },
+      isSelectDataAll(dataType) {
+        this.isSelectAllDate = dataType;
+        this.selectRowsCount(this.selectRows)
+        //如果已经全选，不需要再操作了
+        if (this.selectRows.size != this.tableData.length) {
+          this.$refs.caseTable.toggleAllSelection(true);
+        }
+      },
+      //判断是否只显示本周的数据。  从首页跳转过来的请求会带有相关参数
+      isSelectThissWeekData() {
+        this.selectDataRange = "all";
+        let routeParam = this.$route.params.dataSelectRange;
+        let dataType = this.$route.params.dataType;
+        if (dataType === 'apiTestCase') {
+          this.selectDataRange = routeParam;
+        }
+      },
+      changeSelectDataRangeAll() {
+        this.$emit("changeSelectDataRangeAll", "testCase");
+      },
+      getIds(rowSets) {
+        let rowArray = Array.from(rowSets)
+        let ids = rowArray.map(s => s.id);
+        return ids;
+      },
+      showCaseRef(row) {
+        this.$refs.viewRef.open(row);
+      },
+      showEnvironment(row) {
+
+        let projectID = getCurrentProjectID();
+        if (this.projectId) {
+          this.$get('/api/environment/list/' + this.projectId, response => {
+            this.environments = response.data;
+            this.environments.forEach(environment => {
+              parseEnvironment(environment);
+            });
+          });
+        } else {
+          this.environment = undefined;
+        }
+        this.clickRow = row;
+        this.$refs.setEnvironment.open(row);
+      },
+      createPerformance(row, environment) {
+        /**
+         * 思路：调用后台创建性能测试的方法，把当前案例的hashTree在后台转化为jmx并文件创建性能测试。
+         * 然后跳转到修改性能测试的页面
+         *
+         * 性能测试保存地址： performance/save
+         *
+         */
+        if (!environment) {
+          this.$warning(this.$t('api_test.environment.select_environment'));
+          return;
+        }
+        let runData = [];
+        let singleLoading = true;
+        row.request = JSON.parse(row.request);
+        row.request.name = row.id;
+        row.request.useEnvironment = environment.id;
+        runData.push(row.request);
+        /*触发执行操作*/
+        let testPlan = new TestPlan();
+        let threadGroup = new ThreadGroup();
+        threadGroup.hashTree = [];
+        testPlan.hashTree = [threadGroup];
+        runData.forEach(item => {
+          threadGroup.hashTree.push(item);
+        })
+        let reqObj = {
+          id: row.id,
+          testElement: testPlan,
+          name: row.name,
+          projectId: getCurrentProjectID(),
+        };
+        let bodyFiles = getBodyUploadFiles(reqObj, runData);
+        reqObj.reportId = "run";
+
+        let url = "/api/genPerformanceTestXml";
+
+        this.$fileUpload(url, null, bodyFiles, reqObj, response => {
+          let jmxObj = {};
+          jmxObj.name = response.data.name;
+          jmxObj.xml = response.data.xml;
+          this.$store.commit('setTest', {
+            name: row.name,
+            jmx: jmxObj
+          })
+          this.$router.push({
+            path: "/performance/test/create"
+          })
+          // let performanceId = response.data;
+          // if(performanceId!=null){
+          //   this.$router.push({
+          //     path: "/performance/test/edit/"+performanceId,
+          //   })
+          // }
+        }, erro => {
+          this.$emit('runRefresh', {});
+        });
+      },
     },
-  },
-}
+  }
 </script>
 
 <style scoped>
-.operate-button > div {
-  display: inline-block;
-  margin-left: 10px;
-}
+  .operate-button > div {
+    display: inline-block;
+    margin-left: 10px;
+  }
 
-.request-method {
-  padding: 0 5px;
-  color: #1E90FF;
-}
+  .request-method {
+    padding: 0 5px;
+    color: #1E90FF;
+  }
 
-.api-el-tag {
-  color: white;
-}
+  .api-el-tag {
+    color: white;
+  }
 
-.search-input {
-  float: right;
-  width: 300px;
-  /*margin-bottom: 20px;*/
-  margin-right: 20px;
-}
+  .search-input {
+    float: right;
+    width: 300px;
+    /*margin-bottom: 20px;*/
+    margin-right: 10px;
+  }
 
   .ms-select-all >>> th:first-child {
     margin-top: 20px;
diff --git a/frontend/src/business/components/common/components/search/search-components.js b/frontend/src/business/components/common/components/search/search-components.js
index 9dd685456f..932a434f85 100644
--- a/frontend/src/business/components/common/components/search/search-components.js
+++ b/frontend/src/business/components/common/components/search/search-components.js
@@ -410,10 +410,10 @@ export const TEST_CONFIGS = [NAME, UPDATE_TIME, CREATE_TIME, STATUS, CREATOR];
 
 export const REPORT_CONFIGS = [NAME, TEST_NAME, CREATE_TIME, STATUS, CREATOR, TRIGGER_MODE];
 
-export const TEST_CASE_CONFIGS = [NAME, MODULE, PRIORITY, CREATE_TIME, TYPE, UPDATE_TIME, METHOD, CREATOR, EXECUTOR];
+export const TEST_CASE_CONFIGS = [NAME, API_TAGS, MODULE, PRIORITY, CREATE_TIME, TYPE, UPDATE_TIME, METHOD, CREATOR, EXECUTOR];
 
 export const TEST_PLAN_CONFIGS = [NAME, UPDATE_TIME, CREATE_TIME, PRINCIPAL, TEST_PLAN_STATUS, STAGE];
 
 export const API_DEFINITION_CONFIGS = [NAME, API_METHOD, API_PATH, API_STATUS, API_TAGS, UPDATE_TIME, CREATE_TIME, CREATOR];
 
-export const API_CASE_CONFIGS = [NAME, API_CASE_PRIORITY, API_TAGS,API_CASE_RESULT, UPDATE_TIME, CREATE_TIME, CREATOR];
+export const API_CASE_CONFIGS = [NAME, API_CASE_PRIORITY, API_TAGS, API_CASE_RESULT, UPDATE_TIME, CREATE_TIME, CREATOR];