From bd5821acf204c79c39da16f786a913b9efc9ff90 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 12 Apr 2024 13:00:10 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/pure/ms-table/batchAction.vue       | 6 +++---
 frontend/src/components/pure/ms-table/type.ts               | 1 +
 .../project-management/taskCenter/component/apiCase.vue     | 2 +-
 .../taskCenter/component/scheduledTask.vue                  | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/pure/ms-table/batchAction.vue b/frontend/src/components/pure/ms-table/batchAction.vue
index d31c7ea59a..fee8b3370b 100644
--- a/frontend/src/components/pure/ms-table/batchAction.vue
+++ b/frontend/src/components/pure/ms-table/batchAction.vue
@@ -4,7 +4,7 @@
     <template v-for="(element, idx) in baseAction" :key="element.label">
       <a-divider v-if="element.isDivider" class="divider mx-0 my-[6px]" />
       <a-button
-        v-if="!element.isDivider && !element.children && hasAllPermission(element.permission as string[])"
+        v-if="!element.isDivider && !element.children && hasAllPermission(element.permission as string[]) && hasAnyPermission(element.anyPermission as string[])"
         class="ml-[12px]"
         :class="{
           'arco-btn-outline--danger': element.danger,
@@ -16,7 +16,7 @@
       >
       <!-- baseAction多菜单选择 -->
       <a-dropdown
-        v-if="!element.isDivider && element.children && hasAllPermission(element.permission as string[])"
+        v-if="!element.isDivider && element.children && hasAllPermission(element.permission as string[]) && hasAnyPermission(element.anyPermission as string[])"
         position="tr"
         @select="handleSelect"
       >
@@ -67,7 +67,7 @@
 
   import { useI18n } from '@/hooks/useI18n';
   import { getNodeWidth } from '@/utils/dom';
-  import { hasAllPermission } from '@/utils/permission';
+  import { hasAllPermission, hasAnyPermission } from '@/utils/permission';
 
   import { BatchActionConfig, BatchActionParams } from './type';
   import ResizeObserver from 'resize-observer-polyfill';
diff --git a/frontend/src/components/pure/ms-table/type.ts b/frontend/src/components/pure/ms-table/type.ts
index 62ee0fd6e2..068efacf2e 100644
--- a/frontend/src/components/pure/ms-table/type.ts
+++ b/frontend/src/components/pure/ms-table/type.ts
@@ -131,6 +131,7 @@ export interface BatchActionParams {
   danger?: boolean;
   children?: BatchActionParams[];
   permission?: string[];
+  anyPermission?: string[];
 }
 export interface BatchActionConfig {
   baseAction: BatchActionParams[];
diff --git a/frontend/src/views/project-management/taskCenter/component/apiCase.vue b/frontend/src/views/project-management/taskCenter/component/apiCase.vue
index a974da3ac9..edaf5b59bb 100644
--- a/frontend/src/views/project-management/taskCenter/component/apiCase.vue
+++ b/frontend/src/views/project-management/taskCenter/component/apiCase.vue
@@ -419,7 +419,7 @@
       {
         label: 'project.taskCenter.batchStop',
         eventTag: 'batchStop',
-        permission: permissionsMap[props.group][props.moduleType].stop,
+        anyPermission: permissionsMap[props.group][props.moduleType].stop,
       },
       // {
       // label: 'project.taskCenter.batchExecution',
diff --git a/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue b/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue
index cb0c51c4d7..8e2ccaa217 100644
--- a/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue
+++ b/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue
@@ -340,12 +340,12 @@
       {
         label: 'project.taskCenter.batchEnable',
         eventTag: 'batchEnable',
-        // permission: permissionsMap[props.group][props.moduleType].edit,
+        anyPermission: permissionsMap[props.group][props.moduleType].edit,
       },
       {
         label: 'project.taskCenter.batchDisable',
         eventTag: 'batchDisable',
-        // permission: permissionsMap[props.group][props.moduleType].edit,
+        anyPermission: permissionsMap[props.group][props.moduleType].edit,
       },
     ],
   };