From b14abedb88993ce00cf04647436f9981b84c7050 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Thu, 10 Jun 2021 16:18:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B7=A8=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BC=95=E7=94=A8=E5=9C=BA=E6=99=AF=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90=E5=BC=95=E8=B5=B7?=
 =?UTF-8?q?=E7=9A=84=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

场景中存在引用无权限的项目，展开运行环境直接报错。现在改为没有权限的用户环境展开时只能进行选择，不能进行配置
---
 .../track/case/components/BatchEdit.vue       |  2 +
 .../components/track/common/EnvPopover.vue    |  7 ++++
 .../components/track/common/EnvSelect.vue     | 38 +++++++++++++++++--
 .../comonents/api/RelevanceScenarioList.vue   |  3 +-
 4 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/track/case/components/BatchEdit.vue b/frontend/src/business/components/track/case/components/BatchEdit.vue
index 12bfb34c06..0709023625 100644
--- a/frontend/src/business/components/track/case/components/BatchEdit.vue
+++ b/frontend/src/business/components/track/case/components/BatchEdit.vue
@@ -17,6 +17,7 @@
         </el-form-item>
         <el-form-item  v-if="form.type === 'projectEnv'" :label="$t('test_track.case.updated_attr_value')">
           <env-popover :env-map="projectEnvMap" :project-ids="projectIds" @setProjectEnvMap="setProjectEnvMap"
+                       :show-config-button-with-out-permission="showConfigButtonWithOutPermission"
                        :project-list="projectList" ref="envPopover"/>
         </el-form-item>
         <el-form-item v-else :label="$t('test_track.case.updated_attr_value')" prop="value">
@@ -61,6 +62,7 @@
     data() {
       return {
         dialogVisible: false,
+        showConfigButtonWithOutPermission:false,
         form: {},
         size: 0,
         rules: {
diff --git a/frontend/src/business/components/track/common/EnvPopover.vue b/frontend/src/business/components/track/common/EnvPopover.vue
index 1e89bfa545..3b826df056 100644
--- a/frontend/src/business/components/track/common/EnvPopover.vue
+++ b/frontend/src/business/components/track/common/EnvPopover.vue
@@ -7,6 +7,7 @@
     @show="showPopover"
     trigger="click">
     <env-select :project-ids="projectIds" :env-map="envMap" @close="visible = false"
+                :show-config-button-with-out-permission="showConfigButtonWithOutPermission"
                 ref="envSelect" @setProjectEnvMap="setProjectEnvMap" :project-list="projectList"/>
     <el-button type="primary" slot="reference" size="mini" style="margin-top: 2px;">
       {{ $t('api_test.definition.request.run_env') }}
@@ -25,6 +26,12 @@ export default {
     envMap: Map,
     projectIds: Set,
     projectList: Array,
+    showConfigButtonWithOutPermission:{
+      type: Boolean,
+      default() {
+        return true;
+      }
+    },
     isReadOnly: {
       type: Boolean,
       default() {
diff --git a/frontend/src/business/components/track/common/EnvSelect.vue b/frontend/src/business/components/track/common/EnvSelect.vue
index d1172e0894..a8c7ba5d7e 100644
--- a/frontend/src/business/components/track/common/EnvSelect.vue
+++ b/frontend/src/business/components/track/common/EnvSelect.vue
@@ -5,11 +5,11 @@
         <el-option v-for="(environment, index) in pe.envs" :key="index"
                    :label="environment.name"
                    :value="environment.id"/>
-        <el-button class="ms-scenario-button" size="mini" type="primary" @click="openEnvironmentConfig(pe.id)">
+        <el-button class="ms-scenario-button" v-if="isShowConfirmButton(pe.id)"  size="mini" type="primary" @click="openEnvironmentConfig(pe.id)">
           {{ $t('api_test.environment.environment_config') }}
         </el-button>
         <template v-slot:empty>
-          <div class="empty-environment">
+          <div v-if="isShowConfirmButton(pe.id)"  class="empty-environment">
             <el-button class="ms-scenario-button" size="mini" type="primary" @click="openEnvironmentConfig(pe.id)">
               {{ $t('api_test.environment.environment_config') }}
             </el-button>
@@ -38,6 +38,12 @@ export default {
   props: {
     envMap: Map,
     projectIds: Set,
+    showConfigButtonWithOutPermission:{
+      type: Boolean,
+      default() {
+        return true;
+      }
+    },
     projectList: Array
   },
   data() {
@@ -46,12 +52,33 @@ export default {
       result: {},
       projects: [],
       environments: [],
+      permissionProjectIds:[],
       dialogVisible: false,
       isFullUrl: true,
     };
   },
   methods: {
+    isShowConfirmButton(projectId){
+      if(this.showConfigButtonWithOutPermission === true){
+        return true;
+      }else{
+        if(this.permissionProjectIds){
+          if(this.permissionProjectIds.indexOf(projectId)<0){
+            return false;
+          }else {
+            return true;
+          }
+        }else{
+          return false;
+        }
+      }
+    },
     init() {
+      //获取当前用户有权限的ID
+      if(this.permissionProjectIds.length === 0){
+        this.getUserPermissionProjectIds();
+      }
+
       this.projectIds.forEach(id => {
         const project = this.projectList.find(p => p.id === id);
         if (project) {
@@ -138,7 +165,12 @@ export default {
     },
     environmentConfigClose() {
       // todo 关闭处理
-    }
+    },
+    getUserPermissionProjectIds(){
+      this.$get('/project/getOwnerProjectIds/', res => {
+        this.permissionProjectIds = res.data;
+      })
+    },
   }
 };
 </script>
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
index 32f7bd3474..6e72b8b534 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
@@ -8,8 +8,8 @@
             <el-input :placeholder="$t('api_test.definition.request.select_case')" @blur="search"
                       @keyup.enter.native="search" class="search-input" size="small" v-model="condition.name"/>
           </el-col>
-
           <env-popover :env-map="projectEnvMap" :project-ids="projectIds" @setProjectEnvMap="setProjectEnvMap"
+                       :show-config-button-with-out-permission="showConfigButtonWithOutPermission"
                        :project-list="projectList" ref="envPopover" class="env-popover"/>
         </el-row>
       </template>
@@ -92,6 +92,7 @@
     data() {
       return {
         result: {},
+        showConfigButtonWithOutPermission:false,
         condition: {},
         currentScenario: {},
         schedule: {},