From da2e85e9ecb9fbf8916fd0f04a8f65ac3d80131c Mon Sep 17 00:00:00 2001
From: labbomb <739955946@qq.com>
Date: Thu, 24 Mar 2022 14:43:02 +0800
Subject: [PATCH] [BUG][UI Next]fix the problem about Batch delete not working
 (#9080)

* fix the problem about Batch delete not working while click the border of the button

* try to fix e2e

Co-authored-by: Jiajie Zhong <zhongjiajie955@hotmail.com>
---
 .../project/workflow/WorkflowDefinitionTab.java  |  1 -
 .../views/projects/workflow/definition/index.tsx | 16 ++++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowDefinitionTab.java b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowDefinitionTab.java
index 7040a531e7..9707dee596 100644
--- a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowDefinitionTab.java
+++ b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowDefinitionTab.java
@@ -47,7 +47,6 @@ public final class WorkflowDefinitionTab extends NavBarPage implements ProjectDe
     @FindBys({
             @FindBy(className = "btn-delete-all"),
             @FindBy(className = "n-button__content"),
-            @FindBy(tagName = "span")
     })
     private WebElement buttonDeleteAll;
 
diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/index.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/index.tsx
index e1deedc0ca..c3486daa37 100644
--- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/index.tsx
+++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/index.tsx
@@ -176,19 +176,19 @@ export default defineComponent({
               {{
                 default: () => t('project.workflow.delete'),
                 trigger: () => (
-                  <NButton
-                    tag='div'
-                    type='primary'
-                    disabled={this.checkedRowKeys.length <= 0}
-                    class='btn-delete-all'
-                  >
                     <NPopconfirm onPositiveClick={this.batchDeleteWorkflow}>
                       {{
                         default: () => t('project.workflow.delete_confirm'),
-                        trigger: () => t('project.workflow.delete')
+                        trigger: () => (
+                          <NButton
+                            tag='div'
+                            type='primary'
+                            disabled={this.checkedRowKeys.length <= 0}
+                            class='btn-delete-all'
+                          >{t('project.workflow.delete')}</NButton>
+                        )
                       }}
                     </NPopconfirm>
-                  </NButton>
                 )
               }}
             </NTooltip>