From a595d28a5bfe3a8375799ccf92da9df23fbe418d Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Mon, 8 Mar 2021 15:56:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=9B=B4=E5=A4=9A=E6=93=8D=E4=BD=9C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AssetUserTable/index.vue                       | 2 +-
 src/components/ListTable/TableAction/LeftSide.vue             | 4 ++++
 src/views/applications/DatabaseApp/DatabaseAppList.vue        | 2 +-
 src/views/applications/KubernetesApp/KubernetesAppList.vue    | 2 +-
 src/views/xpack/ChangeAuthPlan/ChangeAuthPlanList.vue         | 3 +--
 .../xpack/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue     | 2 +-
 src/views/xpack/Org/OrganizationList.vue                      | 2 +-
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/components/AssetUserTable/index.vue b/src/components/AssetUserTable/index.vue
index 240edd26c..12ba2a820 100644
--- a/src/components/AssetUserTable/index.vue
+++ b/src/components/AssetUserTable/index.vue
@@ -211,7 +211,7 @@ export default {
       },
       headerActions: {
         hasLeftActions: this.hasLeftActions,
-        hasBulkDelete: false,
+        hasMoreActions: false,
         hasImport: this.hasImport,
         hasExport: this.hasExport,
         hasSearch: true,
diff --git a/src/components/ListTable/TableAction/LeftSide.vue b/src/components/ListTable/TableAction/LeftSide.vue
index 187c43d98..1217d5610 100644
--- a/src/components/ListTable/TableAction/LeftSide.vue
+++ b/src/components/ListTable/TableAction/LeftSide.vue
@@ -25,6 +25,7 @@ export default {
     canCreate: defaultTrue,
     hasBulkDelete: defaultTrue,
     hasBulkUpdate: defaultFalse,
+    hasMoreActions: defaultTrue,
     tableUrl: {
       type: String,
       default: ''
@@ -123,6 +124,9 @@ export default {
       })
     },
     moreAction() {
+      if (!this.hasMoreActions) {
+        return
+      }
       let dropdown = [...this.defaultMoreActions, ...this.extraMoreActions]
       dropdown = cleanActions(dropdown, true, {
         selectedRows: this.selectedRows,
diff --git a/src/views/applications/DatabaseApp/DatabaseAppList.vue b/src/views/applications/DatabaseApp/DatabaseAppList.vue
index fb79ca6ca..8f12abef7 100644
--- a/src/views/applications/DatabaseApp/DatabaseAppList.vue
+++ b/src/views/applications/DatabaseApp/DatabaseAppList.vue
@@ -60,7 +60,7 @@ export default {
         hasCreate: false,
         hasExport: false,
         hasImport: false,
-        hasBulkDelete: false,
+        hasMoreActions: false,
         createRoute: 'DatabaseAppCreate',
         moreCreates: {
           dropdown: [
diff --git a/src/views/applications/KubernetesApp/KubernetesAppList.vue b/src/views/applications/KubernetesApp/KubernetesAppList.vue
index a01ceaca5..c784fbe21 100644
--- a/src/views/applications/KubernetesApp/KubernetesAppList.vue
+++ b/src/views/applications/KubernetesApp/KubernetesAppList.vue
@@ -49,7 +49,7 @@ export default {
         }
       },
       headerActions: {
-        hasBulkDelete: false,
+        hasMoreActions: false,
         hasExport: false,
         hasImport: false,
         createRoute: 'KubernetesAppCreate'
diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanList.vue b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanList.vue
index 14b718595..27ab404b7 100644
--- a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanList.vue
+++ b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanList.vue
@@ -82,8 +82,7 @@ export default {
         hasRefresh: true,
         hasExport: false,
         hasImport: false,
-        hasBulkDelete: false,
-        hasBulkUpdate: false
+        hasMoreActions: false
       }
     }
   }
diff --git a/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue b/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue
index aa499e5dc..0e0db5cab 100644
--- a/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue
+++ b/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue
@@ -80,7 +80,7 @@ export default {
         }
       },
       headerActions: {
-        hasBulkDelete: false,
+        hasMoreActions: false,
         hasImport: false,
         hasExport: false,
         createRoute: 'SyncInstanceTaskCreate'
diff --git a/src/views/xpack/Org/OrganizationList.vue b/src/views/xpack/Org/OrganizationList.vue
index 883a838f6..24c5bfc43 100644
--- a/src/views/xpack/Org/OrganizationList.vue
+++ b/src/views/xpack/Org/OrganizationList.vue
@@ -87,7 +87,7 @@ export default {
       },
       headerActions: {
         hasRightActions: false,
-        hasBulkDelete: false
+        hasMoreActions: false
       }
     }
   }