From b90307c1e28b1f71c0d16f240665650fd8ae7e4d Mon Sep 17 00:00:00 2001
From: teukkk <mengyuan.lv@fit2cloud.com>
Date: Mon, 24 Jun 2024 15:55:52 +0800
Subject: [PATCH] =?UTF-8?q?style(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E8=AF=A6=E6=83=85-?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97=E7=AB=96=E6=9D=A0=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1042895 --user=吕梦园
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001042895
---
 frontend/src/api/modules/test-plan/testPlan.ts         |  5 -----
 frontend/src/api/requrls/test-plan/testPlan.ts         |  2 --
 .../testPlan/detail/apiCase/components/caseTable.vue   | 10 +++++++---
 .../detail/apiScenario/components/scenarioTable.vue    | 10 +++++++---
 .../detail/featureCase/components/caseTable.vue        | 10 +++++++---
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/frontend/src/api/modules/test-plan/testPlan.ts b/frontend/src/api/modules/test-plan/testPlan.ts
index 005e5b6374..6c7fa1140f 100644
--- a/frontend/src/api/modules/test-plan/testPlan.ts
+++ b/frontend/src/api/modules/test-plan/testPlan.ts
@@ -7,7 +7,6 @@ import {
   ApiScenarioReportDetailStepUrl,
   ApiScenarioReportDetailUrl,
   archivedPlanUrl,
-  associationCaseToPlanUrl,
   batchArchivedPlanUrl,
   batchCopyPlanUrl,
   batchDeletePlanUrl,
@@ -221,10 +220,6 @@ export function generateReport(data: TestPlanBaseParams) {
 export function followPlanRequest(data: FollowPlanParams) {
   return MSR.post({ url: followPlanUrl, data });
 }
-// 关联用例到测试计划
-export function associationCaseToPlan(data: AssociateCaseRequestType) {
-  return MSR.post({ url: associationCaseToPlanUrl, data });
-}
 // 测试计划通过率执行进度
 export function getPlanPassRate(data: (string | undefined)[]) {
   return MSR.post<PassRateCountDetail[]>({ url: planPassRateUrl, data });
diff --git a/frontend/src/api/requrls/test-plan/testPlan.ts b/frontend/src/api/requrls/test-plan/testPlan.ts
index fdc2561753..c3d642014d 100644
--- a/frontend/src/api/requrls/test-plan/testPlan.ts
+++ b/frontend/src/api/requrls/test-plan/testPlan.ts
@@ -44,8 +44,6 @@ export const followPlanUrl = '/test-plan/edit/follower';
 export const GenerateReportUrl = '/test-plan/report/gen';
 // 复制测试计划
 export const copyTestPlanUrl = '/test-plan/copy';
-// 关联测试计划
-export const associationCaseToPlanUrl = '/test-plan/association';
 // 测试计划通过率执行进度
 export const planPassRateUrl = '/test-plan/statistics';
 // 计划详情-功能用例列表
diff --git a/frontend/src/views/test-plan/testPlan/detail/apiCase/components/caseTable.vue b/frontend/src/views/test-plan/testPlan/detail/apiCase/components/caseTable.vue
index 2f339b026f..36f54c65ff 100644
--- a/frontend/src/views/test-plan/testPlan/detail/apiCase/components/caseTable.vue
+++ b/frontend/src/views/test-plan/testPlan/detail/apiCase/components/caseTable.vue
@@ -60,7 +60,11 @@
           >
             {{ t('common.execute') }}
           </MsButton>
-          <a-divider v-permission="['PROJECT_TEST_PLAN:READ+ASSOCIATION']" direction="vertical" :margin="8"></a-divider>
+          <a-divider
+            v-if="hasAllPermission(['PROJECT_TEST_PLAN:READ+EXECUTE', 'PROJECT_TEST_PLAN:READ+ASSOCIATION'])"
+            direction="vertical"
+            :margin="8"
+          ></a-divider>
           <MsPopconfirm
             :title="t('testPlan.featureCase.disassociateTip', { name: characterLimit(record.name) })"
             :sub-title-tip="t('testPlan.featureCase.disassociateTipContent')"
@@ -133,7 +137,7 @@
   import useOpenNewPage from '@/hooks/useOpenNewPage';
   import useTableStore from '@/hooks/useTableStore';
   import { characterLimit } from '@/utils';
-  import { hasAnyPermission } from '@/utils/permission';
+  import { hasAllPermission, hasAnyPermission } from '@/utils/permission';
 
   import { DragSortParams, ModuleTreeNode } from '@/models/common';
   import type { PlanDetailApiCaseItem, PlanDetailApiCaseQueryParams } from '@/models/testPlan/testPlan';
@@ -295,7 +299,7 @@
       slotName: 'operation',
       dataIndex: 'operation',
       fixed: 'right',
-      width: hasOperationPermission.value ? 200 : 50,
+      width: hasOperationPermission.value ? 150 : 50,
     },
   ]);
 
diff --git a/frontend/src/views/test-plan/testPlan/detail/apiScenario/components/scenarioTable.vue b/frontend/src/views/test-plan/testPlan/detail/apiScenario/components/scenarioTable.vue
index f7a8e5743c..c7a95ddefa 100644
--- a/frontend/src/views/test-plan/testPlan/detail/apiScenario/components/scenarioTable.vue
+++ b/frontend/src/views/test-plan/testPlan/detail/apiScenario/components/scenarioTable.vue
@@ -57,7 +57,11 @@
           >
             {{ t('common.execute') }}
           </MsButton>
-          <a-divider v-permission="['PROJECT_TEST_PLAN:READ+ASSOCIATION']" direction="vertical" :margin="8"></a-divider>
+          <a-divider
+            v-if="hasAllPermission(['PROJECT_TEST_PLAN:READ+EXECUTE', 'PROJECT_TEST_PLAN:READ+ASSOCIATION'])"
+            direction="vertical"
+            :margin="8"
+          ></a-divider>
           <MsPopconfirm
             :title="t('testPlan.featureCase.disassociateTip', { name: characterLimit(record.name) })"
             :sub-title-tip="t('testPlan.featureCase.disassociateTipContent')"
@@ -130,7 +134,7 @@
   import useOpenNewPage from '@/hooks/useOpenNewPage';
   import useTableStore from '@/hooks/useTableStore';
   import { characterLimit } from '@/utils';
-  import { hasAnyPermission } from '@/utils/permission';
+  import { hasAllPermission, hasAnyPermission } from '@/utils/permission';
 
   import { DragSortParams, ModuleTreeNode } from '@/models/common';
   import type { PlanDetailApiScenarioItem, PlanDetailApiScenarioQueryParams } from '@/models/testPlan/testPlan';
@@ -276,7 +280,7 @@
       slotName: 'operation',
       dataIndex: 'operation',
       fixed: 'right',
-      width: hasOperationPermission.value ? 200 : 50,
+      width: hasOperationPermission.value ? 150 : 50,
     },
   ]);
 
diff --git a/frontend/src/views/test-plan/testPlan/detail/featureCase/components/caseTable.vue b/frontend/src/views/test-plan/testPlan/detail/featureCase/components/caseTable.vue
index 3f59147259..f101d5bfd0 100644
--- a/frontend/src/views/test-plan/testPlan/detail/featureCase/components/caseTable.vue
+++ b/frontend/src/views/test-plan/testPlan/detail/featureCase/components/caseTable.vue
@@ -66,7 +66,11 @@
         >
           {{ t('common.execute') }}
         </MsButton>
-        <a-divider v-permission="['PROJECT_TEST_PLAN:READ+ASSOCIATION']" direction="vertical" :margin="8"></a-divider>
+        <a-divider
+          v-if="hasAllPermission(['PROJECT_TEST_PLAN:READ+EXECUTE', 'PROJECT_TEST_PLAN:READ+ASSOCIATION'])"
+          direction="vertical"
+          :margin="8"
+        ></a-divider>
         <MsPopconfirm
           :title="t('testPlan.featureCase.disassociateTip', { name: characterLimit(record.name) })"
           :sub-title-tip="t('testPlan.featureCase.disassociateTipContent')"
@@ -164,7 +168,7 @@
   import useTableStore from '@/hooks/useTableStore';
   import useAppStore from '@/store/modules/app';
   import { characterLimit } from '@/utils';
-  import { hasAnyPermission } from '@/utils/permission';
+  import { hasAllPermission, hasAnyPermission } from '@/utils/permission';
 
   import { DragSortParams, ModuleTreeNode } from '@/models/common';
   import type {
@@ -311,7 +315,7 @@
       slotName: 'operation',
       dataIndex: 'operation',
       fixed: 'right',
-      width: hasOperationPermission.value ? 200 : 50,
+      width: hasOperationPermission.value ? 150 : 50,
     },
   ]);