From 4cabc0f701eeb4cc98b6090907ee2f0547bef0d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E9=BE=99=E9=91=AB?= <lilongxinya@163.com>
Date: Thu, 29 Apr 2021 15:56:30 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E7=9B=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/project/EnvironmentList.vue      | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/frontend/src/business/components/settings/project/EnvironmentList.vue b/frontend/src/business/components/settings/project/EnvironmentList.vue
index ccf9519870..a1c93f4c45 100644
--- a/frontend/src/business/components/settings/project/EnvironmentList.vue
+++ b/frontend/src/business/components/settings/project/EnvironmentList.vue
@@ -1,6 +1,6 @@
 <template>
-  <div v-loading="result.loading">
-    <el-card class="table-card">
+  <div>
+    <el-card class="table-card" v-loading="result.loading">
       <!-- 表头 -->
       <template v-slot:header>
         <ms-table-header :title="$t('api_test.environment.environment_list')" :create-tip="btnTips"
@@ -14,10 +14,10 @@
         </ms-table-header>
       </template>
       <!-- 环境列表内容 -->
-      <el-table border :data="environments"
+      <el-table border :data="environments" @filter-change="filter"
                 @selection-change="handleSelectionChange" class="adjust-table" style="width: 100%" ref="table">
         <el-table-column type="selection"></el-table-column>
-        <el-table-column :label="$t('commons.project')" width="250" show-overflow-tooltip>
+        <el-table-column :label="$t('commons.project')" width="250" :filters="projectFilters" column-key="projectId" show-overflow-tooltip>
           <template v-slot="scope">
             <span>{{idNameMap.get(scope.row.projectId)}}</span>
           </template>
@@ -140,6 +140,7 @@
         pageSize: 10,
         total: 0,
         projectIds: [],   //当前工作空间所拥有的所有项目id
+        projectFilters: [],
       }
     },
     created() {
@@ -208,6 +209,10 @@
             this.projectList.forEach(project => {
               this.idNameMap.set(project.id, project.name);
               this.projectIds.push(project.id);
+              this.projectFilters.push({
+                text: project.name,
+                value: project.id,
+              })
             });
             this.getEnvironments();
           })
@@ -215,9 +220,13 @@
           this.getEnvironments()
         }
       },
-      getEnvironments(){
+      getEnvironments(projectIds){
         this.environments = [];
-        this.condition.projectIds = this.projectIds;
+        if (projectIds && projectIds.length > 0) {
+          this.condition.projectIds = projectIds;
+        } else {
+          this.condition.projectIds = this.projectIds;
+        }
         let url = '/api/environment/list/' + this.currentPage + '/' + this.pageSize;
         this.result = this.$post(url, this.condition, response => {
           this.environments = response.data.listObject;
@@ -281,6 +290,11 @@
         return name;
       },
 
+      //筛选指定项目下的环境
+      filter(filters) {
+        this.getEnvironments(filters.projectId)
+      },
+
       //对话框取消按钮
       close() {
         this.dialogVisible = false;