From f84fc654679741f2d4d74c1343bcbe852e39d3a1 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Wed, 14 Jun 2023 19:06:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1027038 --user=王孝刚 【接口测试】只读用户-快捷调试-可点击另存为新用例-进入创建用例页面-但是无法填名称
https://www.tapd.cn/55049933/s/1382020
--bug=1027033 --user=王孝刚
【接口测试】只读用户-接口定义-环境配置-可编辑环境
https://www.tapd.cn/55049933/s/1382022
--bug=1027012 --user=王孝刚
【接口测试】只读用户开启场景调试权限-场景详情-点击调试没反应
https://www.tapd.cn/55049933/s/1382025
--bug=1026828 --user=王孝刚
【系统设置】用户组和权限-项目管理员未开启性能测试报告的“删除权限”，导致用户不能修改性能测试的报告名称。
https://www.tapd.cn/55049933/s/1382027
---
 .../automation/scenario/EditApiScenario.vue   |  4 +--
 .../scenario/common/ApiBaseComponent.vue      | 31 +++++++++++++-----
 .../scenario/component/ApiComponent.vue       | 12 +++++--
 .../component/ApiScenarioComponent.vue        | 32 ++++++++++++-------
 .../components/debug/DebugHttpPage.vue        |  2 +-
 .../components/runtest/RunTestHTTPPage.vue    |  2 +-
 .../environment/EnvironmentCommonConfig.vue   |  2 +-
 .../environment/EnvironmentEdit.vue           |  2 +-
 .../environment/EnvironmentHttpConfig.vue     | 14 ++++----
 .../environment/database/DatabaseConfig.vue   |  2 +-
 .../database/DatabaseConfigList.vue           |  4 +--
 11 files changed, 69 insertions(+), 38 deletions(-)

diff --git a/api-test/frontend/src/business/automation/scenario/EditApiScenario.vue b/api-test/frontend/src/business/automation/scenario/EditApiScenario.vue
index 6f9d69b1b8..21d5bc423e 100644
--- a/api-test/frontend/src/business/automation/scenario/EditApiScenario.vue
+++ b/api-test/frontend/src/business/automation/scenario/EditApiScenario.vue
@@ -568,7 +568,7 @@ import { KeyValue } from '@/business/definition/model/ApiTestModel';
 
 import { getCurrentProjectID, getCurrentUser } from 'metersphere-frontend/src/utils/token';
 import { getUUID, objToStrMap, strMapToObj } from 'metersphere-frontend/src/utils';
-import { hasLicense, hasPermission } from 'metersphere-frontend/src/utils/permission';
+import { hasLicense, hasPermissions } from 'metersphere-frontend/src/utils/permission';
 import OutsideClick from './common/outside-click';
 import {
   getReportMessageSocket,
@@ -1723,7 +1723,7 @@ export default {
       });
     },
     runDebug(runScenario) {
-      if (!hasPermission('PROJECT_API_SCENARIO:READ+EDIT')) {
+      if (!hasPermissions('PROJECT_API_SCENARIO:READ+DEBUG','PROJECT_API_SCENARIO:READ+RUN')) {
         return;
       }
       this.mergeScenario(this.scenarioDefinition);
diff --git a/api-test/frontend/src/business/automation/scenario/common/ApiBaseComponent.vue b/api-test/frontend/src/business/automation/scenario/common/ApiBaseComponent.vue
index be28ba5bb1..b815c9bec6 100644
--- a/api-test/frontend/src/business/automation/scenario/common/ApiBaseComponent.vue
+++ b/api-test/frontend/src/business/automation/scenario/common/ApiBaseComponent.vue
@@ -65,18 +65,18 @@
       <div
         v-if="!ifFromVariableAdvance"
         class="header-right"
-        @click.stop
-        v-permission="[
-          'PROJECT_API_SCENARIO:READ+EDIT',
-          'PROJECT_API_SCENARIO:READ+CREATE',
-          'PROJECT_API_SCENARIO:READ+COPY',
-        ]">
+        @click.stop>
         <slot name="message" v-show="!isMax"></slot>
         <slot name="debugStepCode"></slot>
 
         <slot name="button" v-if="showVersion"></slot>
 
-        <el-tooltip :content="$t('test_resource_pool.enable_disable')" placement="top" v-if="showBtn">
+        <el-tooltip :content="$t('test_resource_pool.enable_disable')" placement="top" v-if="showBtn"
+                    v-permission="[
+          'PROJECT_API_SCENARIO:READ+EDIT',
+          'PROJECT_API_SCENARIO:READ+CREATE',
+          'PROJECT_API_SCENARIO:READ+COPY',
+        ]">
           <el-switch
             v-model="data.enable"
             class="enable-switch"
@@ -91,6 +91,11 @@
           circle
           @click="copyRow"
           style="padding: 5px"
+          v-permission="[
+          'PROJECT_API_SCENARIO:READ+EDIT',
+          'PROJECT_API_SCENARIO:READ+CREATE',
+          'PROJECT_API_SCENARIO:READ+COPY',
+        ]"
           :disabled="(data.disabled && !data.root && !data.isCopy) || !showVersion || isDeleted" />
 
         <el-button
@@ -101,7 +106,12 @@
           style="padding: 5px"
           circle
           @click="remove"
-          :disabled="(data.disabled && !data.root && !data.isCopy) || !showVersion || isDeleted" />
+          :disabled="(data.disabled && !data.root && !data.isCopy) || !showVersion || isDeleted"
+          v-permission="[
+          'PROJECT_API_SCENARIO:READ+EDIT',
+          'PROJECT_API_SCENARIO:READ+CREATE',
+          'PROJECT_API_SCENARIO:READ+COPY',
+          ]"/>
 
         <step-extend-btns
           style="display: contents"
@@ -114,6 +124,11 @@
           @copy="copyRow"
           @remove="remove"
           @openScenario="openScenario"
+          v-permission="[
+          'PROJECT_API_SCENARIO:READ+EDIT',
+          'PROJECT_API_SCENARIO:READ+CREATE',
+          'PROJECT_API_SCENARIO:READ+COPY',
+        ]"
           v-show="isMoreButton" />
       </div>
     </div>
diff --git a/api-test/frontend/src/business/automation/scenario/component/ApiComponent.vue b/api-test/frontend/src/business/automation/scenario/component/ApiComponent.vue
index 35160905bc..22a5529e72 100644
--- a/api-test/frontend/src/business/automation/scenario/component/ApiComponent.vue
+++ b/api-test/frontend/src/business/automation/scenario/component/ApiComponent.vue
@@ -90,7 +90,11 @@
             icon="el-icon-video-play"
             class="ms-btn"
             size="mini"
-            circle />
+            circle
+            v-permission="[
+              'PROJECT_API_SCENARIO:READ+DEBUG',
+              'PROJECT_API_SCENARIO:READ+RUN'
+            ]"/>
         </el-tooltip>
         <el-tooltip :content="$t('report.stop_btn')" placement="top" :enterable="false" v-else>
           <el-button
@@ -98,7 +102,11 @@
             size="mini"
             style="color: white; padding: 0 0.1px; width: 24px; height: 24px"
             class="stop-btn"
-            circle>
+            circle
+            v-permission="[
+              'PROJECT_API_SCENARIO:READ+DEBUG',
+              'PROJECT_API_SCENARIO:READ+RUN'
+            ]">
             <div style="transform: scale(0.66)">
               <span style="margin-left: -4.5px; font-weight: bold">STOP</span>
             </div>
diff --git a/api-test/frontend/src/business/automation/scenario/component/ApiScenarioComponent.vue b/api-test/frontend/src/business/automation/scenario/component/ApiScenarioComponent.vue
index 7a20276d4c..5db364911f 100644
--- a/api-test/frontend/src/business/automation/scenario/component/ApiScenarioComponent.vue
+++ b/api-test/frontend/src/business/automation/scenario/component/ApiScenarioComponent.vue
@@ -29,7 +29,7 @@
       </span>
       <span v-else>
         <el-tooltip class="ms-num" effect="dark" :content="$t('api_test.automation.scenario.num_none')" placement="top">
-          <i class="el-icon-warning" />
+          <i class="el-icon-warning"/>
         </el-tooltip>
       </span>
       <span v-xpack v-if="scenario.versionEnable">{{ $t('project.version.name') }}: {{ scenario.versionName }}</span>
@@ -39,9 +39,9 @@
       <el-tag size="small" class="ms-tag" v-if="scenario.referenced === 'Deleted'" type="danger">
         {{ $t('api_test.automation.reference_deleted') }}
       </el-tag>
-      <el-tag size="small" class="ms-tag" v-if="scenario.referenced === 'Copy'"> {{ $t('commons.copy') }} </el-tag>
+      <el-tag size="small" class="ms-tag" v-if="scenario.referenced === 'Copy'"> {{ $t('commons.copy') }}</el-tag>
       <el-tag size="small" class="ms-tag" v-if="scenario.referenced === 'REF'"
-        >{{ $t('api_test.scenario.reference') }}
+      >{{ $t('api_test.scenario.reference') }}
       </el-tag>
       <span class="ms-tag ms-step-name-api">{{ getProjectName(scenario.projectId) }}</span>
       <el-tooltip
@@ -51,12 +51,12 @@
         :content="$t('api_test.scenario.base_scenario_step_is_empty')"
         placement="top"
         style="margin-left: 5px">
-        <i class="el-icon-warning" />
+        <i class="el-icon-warning"/>
       </el-tooltip>
     </template>
     <template v-slot:debugStepCode>
       <span v-if="node.data.testing" class="ms-test-running">
-        <i class="el-icon-loading" style="font-size: 16px" />
+        <i class="el-icon-loading" style="font-size: 16px"/>
         {{ $t('commons.testing') }}
       </span>
       <span
@@ -84,7 +84,11 @@
           style="padding: 5px"
           class="ms-btn"
           size="mini"
-          circle />
+          circle
+          v-permission="[
+              'PROJECT_API_SCENARIO:READ+DEBUG',
+              'PROJECT_API_SCENARIO:READ+RUN'
+            ]"/>
       </el-tooltip>
       <el-tooltip :content="$t('report.stop_btn')" placement="top" :enterable="false" v-else>
         <el-button
@@ -93,7 +97,11 @@
           size="mini"
           style="color: white; padding: 0 0.1px; width: 24px; height: 24px"
           class="stop-btn"
-          circle>
+          circle
+          v-permission="[
+              'PROJECT_API_SCENARIO:READ+DEBUG',
+              'PROJECT_API_SCENARIO:READ+RUN'
+            ]">
           <div style="transform: scale(0.66)">
             <span style="margin-left: -4.5px; font-weight: bold">STOP</span>
           </div>
@@ -109,11 +117,11 @@ import MsTcpBasisParameters from '../../../definition/components/request/tcp/Tcp
 import MsDubboBasisParameters from '../../../definition/components/request/dubbo/BasisParameters';
 import MsApiRequestForm from '../../../definition/components/request/http/ApiHttpRequestForm';
 import ApiBaseComponent from '../common/ApiBaseComponent';
-import { getCurrentProjectID, getCurrentWorkspaceId } from 'metersphere-frontend/src/utils/token';
-import { getUUID, strMapToObj } from 'metersphere-frontend/src/utils';
-import { STEP } from '@/business/automation/scenario/Setting';
-import { getOwnerProjectIds, getProject } from '@/api/project';
-import { checkScenarioEnv, getScenarioById, setScenarioDomain } from '@/api/scenario';
+import {getCurrentProjectID, getCurrentWorkspaceId} from 'metersphere-frontend/src/utils/token';
+import {getUUID, strMapToObj} from 'metersphere-frontend/src/utils';
+import {STEP} from '@/business/automation/scenario/Setting';
+import {getOwnerProjectIds, getProject} from '@/api/project';
+import {checkScenarioEnv, getScenarioById, setScenarioDomain} from '@/api/scenario';
 
 export default {
   name: 'ApiScenarioComponent',
diff --git a/api-test/frontend/src/business/definition/components/debug/DebugHttpPage.vue b/api-test/frontend/src/business/definition/components/debug/DebugHttpPage.vue
index f0f3443125..bfbfb618dd 100644
--- a/api-test/frontend/src/business/definition/components/debug/DebugHttpPage.vue
+++ b/api-test/frontend/src/business/definition/components/debug/DebugHttpPage.vue
@@ -33,7 +33,7 @@
               v-if="testCase === undefined && !scenario">
               {{ $t('commons.test') }}
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="save_as"
+                <el-dropdown-item command="save_as" v-permission="['PROJECT_API_DEFINITION:READ+CREATE_CASE']"
                   >{{ $t('api_test.definition.request.save_as_case') }}
                 </el-dropdown-item>
               </el-dropdown-menu>
diff --git a/api-test/frontend/src/business/definition/components/runtest/RunTestHTTPPage.vue b/api-test/frontend/src/business/definition/components/runtest/RunTestHTTPPage.vue
index 81ea505216..a3f0a0ef37 100644
--- a/api-test/frontend/src/business/definition/components/runtest/RunTestHTTPPage.vue
+++ b/api-test/frontend/src/business/definition/components/runtest/RunTestHTTPPage.vue
@@ -35,7 +35,7 @@
             @command="handleCommand"
             size="small"
             v-if="!runLoading"
-            v-permission="['PROJECT_API_DEFINITION:READ+EDIT_API']">
+            v-permission="['PROJECT_API_DEFINITION:READ+EDIT_API', 'PROJECT_API_DEFINITION:READ+CREATE_CASE']">
             {{ $t('commons.test') }}
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="load_case"
diff --git a/framework/sdk-parent/frontend/src/components/environment/EnvironmentCommonConfig.vue b/framework/sdk-parent/frontend/src/components/environment/EnvironmentCommonConfig.vue
index 831bc9b358..94549e1056 100644
--- a/framework/sdk-parent/frontend/src/components/environment/EnvironmentCommonConfig.vue
+++ b/framework/sdk-parent/frontend/src/components/environment/EnvironmentCommonConfig.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-form :model="commonConfig" :rules="rules" ref="commonConfig" :disabled="isReadOnly" label-width="30px">
-      <ms-api-scenario-variables :show-copy="false" :items="commonConfig.variables"/>
+      <ms-api-scenario-variables :show-copy="false" :items="commonConfig.variables" :is-read-only="isReadOnly"/>
       <el-form-item>
         <el-switch v-model="commonConfig.enableHost" active-text="Hosts"/>
       </el-form-item>
diff --git a/framework/sdk-parent/frontend/src/components/environment/EnvironmentEdit.vue b/framework/sdk-parent/frontend/src/components/environment/EnvironmentEdit.vue
index 3203f3274f..eb97f4f755 100644
--- a/framework/sdk-parent/frontend/src/components/environment/EnvironmentEdit.vue
+++ b/framework/sdk-parent/frontend/src/components/environment/EnvironmentEdit.vue
@@ -22,7 +22,7 @@
               <slot name="other"></slot>
             </div>
             <div class="ms_btn">
-              <el-button type="primary" @click="confirm" @keydown.enter.native.prevent size="small">
+              <el-button type="primary" @click="confirm" @keydown.enter.native.prevent size="small" :disabled="isReadOnly">
                 {{ $t('commons.confirm') }}
               </el-button>
             </div>
diff --git a/framework/sdk-parent/frontend/src/components/environment/EnvironmentHttpConfig.vue b/framework/sdk-parent/frontend/src/components/environment/EnvironmentHttpConfig.vue
index 0bbc7f5c9b..edc6889333 100644
--- a/framework/sdk-parent/frontend/src/components/environment/EnvironmentHttpConfig.vue
+++ b/framework/sdk-parent/frontend/src/components/environment/EnvironmentHttpConfig.vue
@@ -49,23 +49,23 @@
         <form-section :title="$t('commons.api')" :init-active=true>
           <p>{{ $t('api_test.request.headers') }}</p>
           <el-row>
-            <el-link class="ms-el-link" @click="batchAdd" style="color: #783887"> {{
+            <el-link class="ms-el-link" @click="batchAdd" style="color: #783887" :disabled="isReadOnly"> {{
                 $t("commons.batch_add")
               }}
             </el-link>
           </el-row>
-          <ms-api-key-value :items="condition.headers" :isShowEnable="true" :suggestions="headerSuggestions"/>
+          <ms-api-key-value :items="condition.headers" :isShowEnable="true" :suggestions="headerSuggestions" :is-read-only="isReadOnly"/>
         </form-section>
 
         <div style="margin-top: 20px">
-          <el-button v-if="!condition.id" type="primary" style="float: right" size="mini" @click="add">
+          <el-button v-if="!condition.id" type="primary" style="float: right" size="mini" @click="add" :disabled="isReadOnly">
             {{ $t('commons.add') }}
           </el-button>
           <div v-else>
-            <el-button type="primary" style="float: right;margin-left: 10px" size="mini" @click="clear">
+            <el-button type="primary" style="float: right;margin-left: 10px" size="mini" @click="clear" :disabled="isReadOnly">
               {{ $t('commons.clear') }}
             </el-button>
-            <el-button type="primary" style="float: right" size="mini" @click="update(condition)">{{
+            <el-button type="primary" style="float: right" size="mini" @click="update(condition)" :disabled="isReadOnly">{{
                 $t('commons.update')
               }}
             </el-button>
@@ -105,9 +105,9 @@
           <template v-slot:default="{row}">
             <div>
               <ms-table-operator-button :tip="$t('api_test.automation.copy')"
-                                        icon="el-icon-document-copy" @exec="copy(row)"/>
+                                        icon="el-icon-document-copy" @exec="copy(row)" :disabled="isReadOnly"/>
               <ms-table-operator-button :tip="$t('api_test.automation.remove')"
-                                        icon="el-icon-delete" @exec="remove(row)" type="danger"/>
+                                        icon="el-icon-delete" @exec="remove(row)" type="danger" :disabled="isReadOnly"/>
             </div>
           </template>
         </el-table-column>
diff --git a/framework/sdk-parent/frontend/src/components/environment/database/DatabaseConfig.vue b/framework/sdk-parent/frontend/src/components/environment/database/DatabaseConfig.vue
index 92bfc5b26a..17abcc1652 100644
--- a/framework/sdk-parent/frontend/src/components/environment/database/DatabaseConfig.vue
+++ b/framework/sdk-parent/frontend/src/components/environment/database/DatabaseConfig.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <ms-database-from :config="currentConfig" :callback="saveConfig" ref="databaseFrom" :is-read-only="isReadOnly"/>
-    <ms-database-config-list @rowSelect="rowSelect" v-if="configs.length > 0" :table-data="configs"/>
+    <ms-database-config-list @rowSelect="rowSelect" v-if="configs.length > 0" :table-data="configs" :is-read-only="isReadOnly"/>
   </div>
 </template>
 
diff --git a/framework/sdk-parent/frontend/src/components/environment/database/DatabaseConfigList.vue b/framework/sdk-parent/frontend/src/components/environment/database/DatabaseConfigList.vue
index c82724fd52..0001cd3968 100644
--- a/framework/sdk-parent/frontend/src/components/environment/database/DatabaseConfigList.vue
+++ b/framework/sdk-parent/frontend/src/components/environment/database/DatabaseConfigList.vue
@@ -17,9 +17,9 @@
         <template v-slot:default="scope">
           <div>
             <ms-table-operator-button :tip="$t('commons.copy')" icon="el-icon-document-copy" type="success"
-                                      @exec="handleCopy(scope.$index, scope.row)"/>
+                                      @exec="handleCopy(scope.$index, scope.row)" :disabled="isReadOnly"/>
             <ms-table-operator-button :tip="$t('commons.delete')" icon="el-icon-delete" type="danger"
-                                      @exec="handleDelete(scope.$index)"/>
+                                      @exec="handleDelete(scope.$index)" :disabled="isReadOnly"/>
           </div>
         </template>
       </el-table-column>