From 9da5383c1a14c915bf1b8469eed066e36b8dbec5 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Mon, 27 May 2024 11:20:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=93=8D=E4=BD=9C=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

---
 .../src/components/pure/ms-table-more-action/index.vue    | 8 +++++++-
 .../src/views/test-plan/testPlan/components/planTable.vue | 5 ++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/pure/ms-table-more-action/index.vue b/frontend/src/components/pure/ms-table-more-action/index.vue
index f314645206..4a4314fcb9 100644
--- a/frontend/src/components/pure/ms-table-more-action/index.vue
+++ b/frontend/src/components/pure/ms-table-more-action/index.vue
@@ -21,6 +21,7 @@
             :class="beforeDividerHasAction && afterDividerHasAction ? '' : 'hidden'"
             margin="4px"
           />
+
           <a-doption
             v-else
             :key="item.label"
@@ -93,7 +94,12 @@
 
   // 判断是否有所有权限
   const isHasAllPermission = computed(() => {
-    return props.list.some((item: ActionsItem) => hasAnyPermission(item.permission || []));
+    return props.list.some((item: ActionsItem) => {
+      if (item.permission) {
+        return hasAnyPermission(item.permission);
+      }
+      return false;
+    });
   });
 
   function selectHandler(value: SelectedValue) {
diff --git a/frontend/src/views/test-plan/testPlan/components/planTable.vue b/frontend/src/views/test-plan/testPlan/components/planTable.vue
index ab404f8eec..5824ef2572 100644
--- a/frontend/src/views/test-plan/testPlan/components/planTable.vue
+++ b/frontend/src/views/test-plan/testPlan/components/planTable.vue
@@ -194,12 +194,12 @@
           class="flex items-center"
         >
           <MsButton class="!mx-0" @click="openDetail(record.id)">{{ t('testPlan.testPlanIndex.execution') }}</MsButton>
-          <a-divider direction="vertical" :margin="8"></a-divider>
         </div>
         <div
           v-if="hasAnyPermission(['PROJECT_TEST_PLAN:READ+UPDATE']) && record.status !== 'ARCHIVED'"
           class="flex items-center"
         >
+          <a-divider direction="vertical" :margin="8"></a-divider>
           <MsButton class="!mx-0" @click="emit('editOrCopy', record.id, false)">{{ t('common.edit') }}</MsButton>
           <a-divider direction="vertical" :margin="8"></a-divider>
         </div>
@@ -212,9 +212,8 @@
           class="flex items-center"
         >
           <MsButton class="!mx-0" @click="emit('editOrCopy', record.id, true)">{{ t('common.copy') }}</MsButton>
-          <a-divider v-if="record.functionalCaseCount < 1" direction="vertical" :margin="8"></a-divider>
+          <a-divider direction="vertical" :margin="8"></a-divider>
         </div>
-
         <MsTableMoreAction
           :list="getMoreActions(record.status, record.functionalCaseCount)"
           @select="handleMoreActionSelect($event, record)"